Revert "Merge pull request #6098 from guybedford/master"

src/compiler/emitter.ts

@@ -6990,7 +6990,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                     write(text);
                 }
-                write(`], function(${exportFunctionForFile}, __moduleName) {`);
+                write(`], function(${exportFunctionForFile}) {`);
                 writeLine();
                 increaseIndent();
                 const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);

tests/baselines/reference/aliasesInSystemModule1.js

@@ -17,7 +17,7 @@ module M {
 
 
 //// [aliasesInSystemModule1.js]
-System.register(['foo'], function(exports_1, __moduleName) {
+System.register(['foo'], function(exports_1) {
     "use strict";
     var alias;
     var cls, cls2, x, y, z, M;

tests/baselines/reference/aliasesInSystemModule2.js

@@ -16,7 +16,7 @@ module M {
 }
 
 //// [aliasesInSystemModule2.js]
-System.register(["foo"], function(exports_1, __moduleName) {
+System.register(["foo"], function(exports_1) {
     "use strict";
     var foo_1;
     var cls, cls2, x, y, z, M;

tests/baselines/reference/allowSyntheticDefaultImports2.js

@@ -10,7 +10,7 @@ export class Foo {
 }
 
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var Foo;
     return {
@@ -26,7 +26,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [a.js]
-System.register(["./b"], function(exports_1, __moduleName) {
+System.register(["./b"], function(exports_1) {
     "use strict";
     var b_1;
     var x;

tests/baselines/reference/allowSyntheticDefaultImports3.js

@@ -11,7 +11,7 @@ export class Foo {
 
 
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var Foo;
     return {
@@ -27,7 +27,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [a.js]
-System.register(["./b"], function(exports_1, __moduleName) {
+System.register(["./b"], function(exports_1) {
     "use strict";
     var b_1;
     var x;

tests/baselines/reference/allowSyntheticDefaultImports5.js

@@ -12,7 +12,7 @@ export var x = new Foo();
 
 
 //// [a.js]
-System.register(["./b"], function(exports_1, __moduleName) {
+System.register(["./b"], function(exports_1) {
     "use strict";
     var b_1;
     var x;

tests/baselines/reference/allowSyntheticDefaultImports6.js

@@ -12,7 +12,7 @@ export var x = new Foo();
 
 
 //// [a.js]
-System.register(["./b"], function(exports_1, __moduleName) {
+System.register(["./b"], function(exports_1) {
     "use strict";
     var b_1;
     var x;

tests/baselines/reference/anonymousDefaultExportsSystem.js

@@ -7,7 +7,7 @@ export default class {}
 export default function() {}
 
 //// [a.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var default_1;
     return {
@@ -20,7 +20,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     function default_1() { }
     exports_1("default", default_1);

tests/baselines/reference/capturedLetConstInLoop4.js

@@ -144,7 +144,7 @@ for (const y = 0; y < 1;) {
 
 
 //// [capturedLetConstInLoop4.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     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;
     //======let

tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js

@@ -13,7 +13,7 @@ var decorator: ClassDecorator;
 export default class {}
 
 //// [a.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         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) {
     }
 });
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

tests/baselines/reference/defaultExportsGetExportedSystem.js

@@ -8,7 +8,7 @@ export default function foo() {}
 
 
 //// [a.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var Foo;
     return {
@@ -21,7 +21,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     function foo() { }
     exports_1("default", foo);

tests/baselines/reference/es5-system.js

@@ -15,7 +15,7 @@ export default class A
 
 
 //// [es5-system.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var A;
     return {

tests/baselines/reference/exportNonInitializedVariablesSystem.js

@@ -35,7 +35,7 @@ export let h1: D = new D;
 
 
 //// [exportNonInitializedVariablesSystem.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var a, b, c, d, A, e, f, B, C, a1, b1, c1, d1, D, e1, f1, g1, h1;
     return {

tests/baselines/reference/exportStarForValues10.js

@@ -13,7 +13,7 @@ export * from "file1";
 var x = 1;
 
 //// [file0.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var v;
     return {
@@ -24,7 +24,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [file1.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],
@@ -33,7 +33,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [file2.js]
-System.register(["file0"], function(exports_1, __moduleName) {
+System.register(["file0"], function(exports_1) {
     "use strict";
     var x;
     function exportStar_1(m) {

tests/baselines/reference/exportStarForValues6.js

@@ -9,7 +9,7 @@ export * from "file1"
 export var x = 1;
 
 //// [file1.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],
@@ -18,7 +18,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [file2.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var x;
     return {

tests/baselines/reference/exportStarForValuesInSystem.js

@@ -9,7 +9,7 @@ export * from "file1"
 var x = 1;
 
 //// [file1.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],
@@ -18,7 +18,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [file2.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var x;
     return {

tests/baselines/reference/isolatedModulesPlainFile-System.js

@@ -5,7 +5,7 @@ run(1);
 
 
 //// [isolatedModulesPlainFile-System.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],

tests/baselines/reference/modulePrologueSystem.js

@@ -4,7 +4,7 @@
 export class Foo {}
 
 //// [modulePrologueSystem.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var Foo;
     return {

tests/baselines/reference/outFilerootDirModuleNamesSystem.js

@@ -11,7 +11,7 @@ export default function foo() { new Foo(); }
 
 
 //// [output.js]
-System.register("b", ["a"], function(exports_1, __moduleName) {
+System.register("b", ["a"], function(exports_1) {
     "use strict";
     var a_1;
     function foo() { new a_1.default(); }
@@ -25,7 +25,7 @@ System.register("b", ["a"], function(exports_1, __moduleName) {
         }
     }
 });
-System.register("a", ["b"], function(exports_2, __moduleName) {
+System.register("a", ["b"], function(exports_2) {
     "use strict";
     var b_1;
     var Foo;

tests/baselines/reference/outModuleConcatSystem.js

@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-System.register("ref/a", [], function(exports_1, __moduleName) {
+System.register("ref/a", [], function(exports_1) {
     "use strict";
     var A;
     return {
@@ -29,7 +29,7 @@ System.register("ref/a", [], function(exports_1, __moduleName) {
         }
     }
 });
-System.register("b", ["ref/a"], function(exports_2, __moduleName) {
+System.register("b", ["ref/a"], function(exports_2) {
     "use strict";
     var a_1;
     var B;

tests/baselines/reference/outModuleConcatSystem.sourcemap.txt

@@ -13,7 +13,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    function __() { this.constructor = d; }
 >>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 >>>};
->>>System.register("ref/a", [], function(exports_1, __moduleName) {
+>>>System.register("ref/a", [], function(exports_1) {
 >>>    "use strict";
 >>>    var A;
 >>>    return {
@@ -82,7 +82,7 @@ sourceFile:tests/cases/compiler/b.ts
 >>>        }
 >>>    }
 >>>});
->>>System.register("b", ["ref/a"], function(exports_2, __moduleName) {
+>>>System.register("b", ["ref/a"], function(exports_2) {
 >>>    "use strict";
 >>>    var a_1;
 >>>    var B;

tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js

@@ -31,7 +31,7 @@ if (++y) {
 }
 
 //// [prefixUnaryOperatorsOnExportedVariables.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var x, y;
     return {

tests/baselines/reference/systemExportAssignment.js

@@ -10,7 +10,7 @@ import * as a from "a";
 
 
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],

tests/baselines/reference/systemExportAssignment2.js

@@ -10,7 +10,7 @@ import * as a from "a";
 
 
 //// [a.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var a;
     return {
@@ -21,7 +21,7 @@ System.register([], function(exports_1, __moduleName) {
     }
 });
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],

tests/baselines/reference/systemExportAssignment3.js

@@ -12,7 +12,7 @@ import * as a from "a";
 
 
 //// [b.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     return {
         setters:[],

tests/baselines/reference/systemModule1.js

@@ -3,7 +3,7 @@
 export var x = 1;
 
 //// [systemModule1.js]
-System.register([], function(exports_1, __moduleName) {
+System.register([], function(exports_1) {
     "use strict";
     var x;
     return {

tests/baselines/reference/systemModule10.js

@@ -10,7 +10,7 @@ export {n2}
 export {n2 as n3}
 
 //// [systemModule10.js]
-System.register(['file1', 'file2'], function(exports_1, __moduleName) {
+System.register(['file1', 'file2'], function(exports_1) {
     "use strict";
     var file1_1, n2;
     return {

tests/baselines/reference/systemModule10_ES5.js

@@ -10,7 +10,7 @@ export {n2}
 export {n2 as n3}
 
 //// [systemModule10_ES5.js]
-System.register(['file1', 'file2'], function(exports_1, __moduleName) {
+System.register(['file1', 'file2'], function(exports_1) {
     "use strict";
     var file1_1, n2;
     return {