Skip to content

Commit ba0f7f5

Browse files
vladimavladima
committed
Merge pull request #6362 from Microsoft/Revert6098
Revert "Merge pull request #6098 from guybedford/master"
2 parents aed73bd + dbe8489 commit ba0f7f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+85
-85
lines changed

‎src/compiler/emitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6990,7 +6990,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
69906990

69916991
write(text);
69926992
}
6993-
write(`], function(${exportFunctionForFile}, __moduleName) {`);
6993+
write(`], function(${exportFunctionForFile}) {`);
69946994
writeLine();
69956995
increaseIndent();
69966996
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);

‎tests/baselines/reference/aliasesInSystemModule1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module M {
1717

1818

1919
//// [aliasesInSystemModule1.js]
20-
System.register(['foo'], function(exports_1, __moduleName) {
20+
System.register(['foo'], function(exports_1) {
2121
"use strict";
2222
var alias;
2323
var cls, cls2, x, y, z, M;

‎tests/baselines/reference/aliasesInSystemModule2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module M {
1616
}
1717

1818
//// [aliasesInSystemModule2.js]
19-
System.register(["foo"], function(exports_1, __moduleName) {
19+
System.register(["foo"], function(exports_1) {
2020
"use strict";
2121
var foo_1;
2222
var cls, cls2, x, y, z, M;

‎tests/baselines/reference/allowSyntheticDefaultImports2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class Foo {
1010
}
1111

1212
//// [b.js]
13-
System.register([], function(exports_1, __moduleName) {
13+
System.register([], function(exports_1) {
1414
"use strict";
1515
var Foo;
1616
return {
@@ -26,7 +26,7 @@ System.register([], function(exports_1, __moduleName) {
2626
}
2727
});
2828
//// [a.js]
29-
System.register(["./b"], function(exports_1, __moduleName) {
29+
System.register(["./b"], function(exports_1) {
3030
"use strict";
3131
var b_1;
3232
var x;

‎tests/baselines/reference/allowSyntheticDefaultImports3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class Foo {
1111

1212

1313
//// [b.js]
14-
System.register([], function(exports_1, __moduleName) {
14+
System.register([], function(exports_1) {
1515
"use strict";
1616
var Foo;
1717
return {
@@ -27,7 +27,7 @@ System.register([], function(exports_1, __moduleName) {
2727
}
2828
});
2929
//// [a.js]
30-
System.register(["./b"], function(exports_1, __moduleName) {
30+
System.register(["./b"], function(exports_1) {
3131
"use strict";
3232
var b_1;
3333
var x;

‎tests/baselines/reference/allowSyntheticDefaultImports5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export var x = new Foo();
1212

1313

1414
//// [a.js]
15-
System.register(["./b"], function(exports_1, __moduleName) {
15+
System.register(["./b"], function(exports_1) {
1616
"use strict";
1717
var b_1;
1818
var x;

‎tests/baselines/reference/allowSyntheticDefaultImports6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export var x = new Foo();
1212

1313

1414
//// [a.js]
15-
System.register(["./b"], function(exports_1, __moduleName) {
15+
System.register(["./b"], function(exports_1) {
1616
"use strict";
1717
var b_1;
1818
var x;

‎tests/baselines/reference/anonymousDefaultExportsSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default class {}
77
export default function() {}
88

99
//// [a.js]
10-
System.register([], function(exports_1, __moduleName) {
10+
System.register([], function(exports_1) {
1111
"use strict";
1212
var default_1;
1313
return {
@@ -20,7 +20,7 @@ System.register([], function(exports_1, __moduleName) {
2020
}
2121
});
2222
//// [b.js]
23-
System.register([], function(exports_1, __moduleName) {
23+
System.register([], function(exports_1) {
2424
"use strict";
2525
function default_1() { }
2626
exports_1("default", default_1);

‎tests/baselines/reference/capturedLetConstInLoop4.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ for (const y = 0; y < 1;) {
144144

145145

146146
//// [capturedLetConstInLoop4.js]
147-
System.register([], function(exports_1, __moduleName) {
147+
System.register([], function(exports_1) {
148148
"use strict";
149149
var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
150150
//======let

‎tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var decorator: ClassDecorator;
1313
export default class {}
1414

1515
//// [a.js]
16-
System.register([], function(exports_1, __moduleName) {
16+
System.register([], function(exports_1) {
1717
"use strict";
1818
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
1919
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -35,7 +35,7 @@ System.register([], function(exports_1, __moduleName) {
3535
}
3636
});
3737
//// [b.js]
38-
System.register([], function(exports_1, __moduleName) {
38+
System.register([], function(exports_1) {
3939
"use strict";
4040
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
4141
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

‎tests/baselines/reference/defaultExportsGetExportedSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function foo() {}
88

99

1010
//// [a.js]
11-
System.register([], function(exports_1, __moduleName) {
11+
System.register([], function(exports_1) {
1212
"use strict";
1313
var Foo;
1414
return {
@@ -21,7 +21,7 @@ System.register([], function(exports_1, __moduleName) {
2121
}
2222
});
2323
//// [b.js]
24-
System.register([], function(exports_1, __moduleName) {
24+
System.register([], function(exports_1) {
2525
"use strict";
2626
function foo() { }
2727
exports_1("default", foo);

‎tests/baselines/reference/es5-system.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class A
1515

1616

1717
//// [es5-system.js]
18-
System.register([], function(exports_1, __moduleName) {
18+
System.register([], function(exports_1) {
1919
"use strict";
2020
var A;
2121
return {

‎tests/baselines/reference/exportNonInitializedVariablesSystem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export let h1: D = new D;
3535

3636

3737
//// [exportNonInitializedVariablesSystem.js]
38-
System.register([], function(exports_1, __moduleName) {
38+
System.register([], function(exports_1) {
3939
"use strict";
4040
var a, b, c, d, A, e, f, B, C, a1, b1, c1, d1, D, e1, f1, g1, h1;
4141
return {

‎tests/baselines/reference/exportStarForValues10.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export * from "file1";
1313
var x = 1;
1414

1515
//// [file0.js]
16-
System.register([], function(exports_1, __moduleName) {
16+
System.register([], function(exports_1) {
1717
"use strict";
1818
var v;
1919
return {
@@ -24,7 +24,7 @@ System.register([], function(exports_1, __moduleName) {
2424
}
2525
});
2626
//// [file1.js]
27-
System.register([], function(exports_1, __moduleName) {
27+
System.register([], function(exports_1) {
2828
"use strict";
2929
return {
3030
setters:[],
@@ -33,7 +33,7 @@ System.register([], function(exports_1, __moduleName) {
3333
}
3434
});
3535
//// [file2.js]
36-
System.register(["file0"], function(exports_1, __moduleName) {
36+
System.register(["file0"], function(exports_1) {
3737
"use strict";
3838
var x;
3939
function exportStar_1(m) {

‎tests/baselines/reference/exportStarForValues6.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export * from "file1"
99
export var x = 1;
1010

1111
//// [file1.js]
12-
System.register([], function(exports_1, __moduleName) {
12+
System.register([], function(exports_1) {
1313
"use strict";
1414
return {
1515
setters:[],
@@ -18,7 +18,7 @@ System.register([], function(exports_1, __moduleName) {
1818
}
1919
});
2020
//// [file2.js]
21-
System.register([], function(exports_1, __moduleName) {
21+
System.register([], function(exports_1) {
2222
"use strict";
2323
var x;
2424
return {

‎tests/baselines/reference/exportStarForValuesInSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export * from "file1"
99
var x = 1;
1010

1111
//// [file1.js]
12-
System.register([], function(exports_1, __moduleName) {
12+
System.register([], function(exports_1) {
1313
"use strict";
1414
return {
1515
setters:[],
@@ -18,7 +18,7 @@ System.register([], function(exports_1, __moduleName) {
1818
}
1919
});
2020
//// [file2.js]
21-
System.register([], function(exports_1, __moduleName) {
21+
System.register([], function(exports_1) {
2222
"use strict";
2323
var x;
2424
return {

‎tests/baselines/reference/isolatedModulesPlainFile-System.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ run(1);
55

66

77
//// [isolatedModulesPlainFile-System.js]
8-
System.register([], function(exports_1, __moduleName) {
8+
System.register([], function(exports_1) {
99
"use strict";
1010
return {
1111
setters:[],

‎tests/baselines/reference/modulePrologueSystem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
export class Foo {}
55

66
//// [modulePrologueSystem.js]
7-
System.register([], function(exports_1, __moduleName) {
7+
System.register([], function(exports_1) {
88
"use strict";
99
var Foo;
1010
return {

‎tests/baselines/reference/outFilerootDirModuleNamesSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function foo() { new Foo(); }
1111

1212

1313
//// [output.js]
14-
System.register("b", ["a"], function(exports_1, __moduleName) {
14+
System.register("b", ["a"], function(exports_1) {
1515
"use strict";
1616
var a_1;
1717
function foo() { new a_1.default(); }
@@ -25,7 +25,7 @@ System.register("b", ["a"], function(exports_1, __moduleName) {
2525
}
2626
}
2727
});
28-
System.register("a", ["b"], function(exports_2, __moduleName) {
28+
System.register("a", ["b"], function(exports_2) {
2929
"use strict";
3030
var b_1;
3131
var Foo;

‎tests/baselines/reference/outModuleConcatSystem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || function (d, b) {
1414
function __() { this.constructor = d; }
1515
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
1616
};
17-
System.register("ref/a", [], function(exports_1, __moduleName) {
17+
System.register("ref/a", [], function(exports_1) {
1818
"use strict";
1919
var A;
2020
return {
@@ -29,7 +29,7 @@ System.register("ref/a", [], function(exports_1, __moduleName) {
2929
}
3030
}
3131
});
32-
System.register("b", ["ref/a"], function(exports_2, __moduleName) {
32+
System.register("b", ["ref/a"], function(exports_2) {
3333
"use strict";
3434
var a_1;
3535
var B;

‎tests/baselines/reference/outModuleConcatSystem.sourcemap.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
1313
>>> function __() { this.constructor = d; }
1414
>>> d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
1515
>>>};
16-
>>>System.register("ref/a", [], function(exports_1, __moduleName) {
16+
>>>System.register("ref/a", [], function(exports_1) {
1717
>>> "use strict";
1818
>>> var A;
1919
>>> return {
@@ -82,7 +82,7 @@ sourceFile:tests/cases/compiler/b.ts
8282
>>> }
8383
>>> }
8484
>>>});
85-
>>>System.register("b", ["ref/a"], function(exports_2, __moduleName) {
85+
>>>System.register("b", ["ref/a"], function(exports_2) {
8686
>>> "use strict";
8787
>>> var a_1;
8888
>>> var B;

‎tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if (++y) {
3131
}
3232

3333
//// [prefixUnaryOperatorsOnExportedVariables.js]
34-
System.register([], function(exports_1, __moduleName) {
34+
System.register([], function(exports_1) {
3535
"use strict";
3636
var x, y;
3737
return {

‎tests/baselines/reference/systemExportAssignment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as a from "a";
1010

1111

1212
//// [b.js]
13-
System.register([], function(exports_1, __moduleName) {
13+
System.register([], function(exports_1) {
1414
"use strict";
1515
return {
1616
setters:[],

‎tests/baselines/reference/systemExportAssignment2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as a from "a";
1010

1111

1212
//// [a.js]
13-
System.register([], function(exports_1, __moduleName) {
13+
System.register([], function(exports_1) {
1414
"use strict";
1515
var a;
1616
return {
@@ -21,7 +21,7 @@ System.register([], function(exports_1, __moduleName) {
2121
}
2222
});
2323
//// [b.js]
24-
System.register([], function(exports_1, __moduleName) {
24+
System.register([], function(exports_1) {
2525
"use strict";
2626
return {
2727
setters:[],

‎tests/baselines/reference/systemExportAssignment3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import * as a from "a";
1212

1313

1414
//// [b.js]
15-
System.register([], function(exports_1, __moduleName) {
15+
System.register([], function(exports_1) {
1616
"use strict";
1717
return {
1818
setters:[],

‎tests/baselines/reference/systemModule1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export var x = 1;
44

55
//// [systemModule1.js]
6-
System.register([], function(exports_1, __moduleName) {
6+
System.register([], function(exports_1) {
77
"use strict";
88
var x;
99
return {

‎tests/baselines/reference/systemModule10.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export {n2}
1010
export {n2 as n3}
1111

1212
//// [systemModule10.js]
13-
System.register(['file1', 'file2'], function(exports_1, __moduleName) {
13+
System.register(['file1', 'file2'], function(exports_1) {
1414
"use strict";
1515
var file1_1, n2;
1616
return {

‎tests/baselines/reference/systemModule10_ES5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export {n2}
1010
export {n2 as n3}
1111

1212
//// [systemModule10_ES5.js]
13-
System.register(['file1', 'file2'], function(exports_1, __moduleName) {
13+
System.register(['file1', 'file2'], function(exports_1) {
1414
"use strict";
1515
var file1_1, n2;
1616
return {

0 commit comments

Comments
 (0)