mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-05-26 20:14:05 -05:00
Put AMD dependency list inline with define call in UMD modules
Fixes #4952.
This commit is contained in:
@@ -15,14 +15,14 @@ export class A
|
||||
|
||||
|
||||
//// [es5-umd2.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
var A = (function () {
|
||||
function A() {
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@ export default class A
|
||||
|
||||
|
||||
//// [es5-umd3.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
var A = (function () {
|
||||
function A() {
|
||||
}
|
||||
|
||||
@@ -17,14 +17,14 @@ export = A;
|
||||
|
||||
|
||||
//// [es5-umd4.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
var A = (function () {
|
||||
function A() {
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@ export class A
|
||||
}
|
||||
|
||||
//// [es6-umd2.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
class A {
|
||||
constructor() {
|
||||
}
|
||||
|
||||
@@ -35,14 +35,14 @@ export let h1: D = new D;
|
||||
|
||||
|
||||
//// [exportNonInitializedVariablesUMD.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
var ;
|
||||
let;
|
||||
var ;
|
||||
|
||||
@@ -5,13 +5,13 @@ run(1);
|
||||
|
||||
|
||||
//// [isolatedModulesPlainFile-UMD.js]
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports"], factory);
|
||||
}
|
||||
})(["require", "exports"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
run(1);
|
||||
});
|
||||
|
||||
@@ -7,14 +7,14 @@ m1.f();
|
||||
|
||||
//// [umdDependencyComment2.js]
|
||||
///<amd-dependency path='bar'/>
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports", "bar", "m2"], factory);
|
||||
}
|
||||
})(["require", "exports", "bar", "m2"], function (require, exports) {
|
||||
})(function (require, exports) {
|
||||
var m1 = require("m2");
|
||||
m1.f();
|
||||
});
|
||||
|
||||
@@ -7,14 +7,14 @@ m1.f();
|
||||
|
||||
//// [umdDependencyCommentName1.js]
|
||||
///<amd-dependency path='bar' name='b'/>
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports", "bar", "m2"], factory);
|
||||
}
|
||||
})(["require", "exports", "bar", "m2"], function (require, exports, b) {
|
||||
})(function (require, exports, b) {
|
||||
var m1 = require("m2");
|
||||
m1.f();
|
||||
});
|
||||
|
||||
@@ -11,14 +11,14 @@ m1.f();
|
||||
///<amd-dependency path='bar' name='b'/>
|
||||
///<amd-dependency path='foo'/>
|
||||
///<amd-dependency path='goo' name='c'/>
|
||||
(function (deps, factory) {
|
||||
(function (factory) {
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
var v = factory(require, exports); if (v !== undefined) module.exports = v;
|
||||
}
|
||||
else if (typeof define === 'function' && define.amd) {
|
||||
define(deps, factory);
|
||||
define(["require", "exports", "bar", "goo", "foo", "m2"], factory);
|
||||
}
|
||||
})(["require", "exports", "bar", "goo", "foo", "m2"], function (require, exports, b, c) {
|
||||
})(function (require, exports, b, c) {
|
||||
var m1 = require("m2");
|
||||
m1.f();
|
||||
});
|
||||
|
||||
@@ -202,14 +202,14 @@ var x = 0;`,
|
||||
`declare function use(a: any);\n` +
|
||||
`use(foo);`
|
||||
let output =
|
||||
`(function (deps, factory) {\n` +
|
||||
`(function (factory) {\n` +
|
||||
` if (typeof module === 'object' && typeof module.exports === 'object') {\n` +
|
||||
` var v = factory(require, exports); if (v !== undefined) module.exports = v;\n` +
|
||||
` }\n` +
|
||||
` else if (typeof define === 'function' && define.amd) {\n` +
|
||||
` define(deps, factory);\n` +
|
||||
` define(["require", "exports", "SomeOtherName"], factory);\n` +
|
||||
` }\n` +
|
||||
`})(["require", "exports", "SomeOtherName"], function (require, exports) {\n` +
|
||||
`})(function (require, exports) {\n` +
|
||||
` var SomeName_1 = require("SomeOtherName");\n` +
|
||||
` use(SomeName_1.foo);\n` +
|
||||
`});\n`;
|
||||
|
||||
Reference in New Issue
Block a user