diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js
index 461631e0e7d..66cb5909075 100644
--- a/tests/baselines/reference/ExportAssignment7.js
+++ b/tests/baselines/reference/ExportAssignment7.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js
index d0963008012..8e29d7914fd 100644
--- a/tests/baselines/reference/ExportAssignment8.js
+++ b/tests/baselines/reference/ExportAssignment8.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index 5febf4b90e7..b86051d7b19 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -20,6 +20,7 @@ export var a = function () {
 
 //// [aliasUsedAsNameValue_0.js]
 "use strict";
+exports.__esModule = true;
 //// [aliasUsedAsNameValue_1.js]
 "use strict";
 function b(a) { return null; }
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 49f5f916cd3..890d2bbd500 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -17,6 +17,7 @@ export class Test1 {
 
 //// [classMemberInitializerWithLamdaScoping3_0.js]
 "use strict";
+exports.__esModule = true;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
 var Test1 = (function () {
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js
index f172c40cc0d..9a06a3e7c22 100644
--- a/tests/baselines/reference/commentsBeforeVariableStatement1.js
+++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js
@@ -6,4 +6,5 @@ export var b: number;
 //// [commentsBeforeVariableStatement1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index 2bd51bfbfb2..b0cc0c8fbaa 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -185,6 +185,7 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
 var c2 = (function () {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index e5219508329..f89863a3029 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -16,10 +16,12 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
 function bar(a) { }
 exports.bar = bar;
+exports.__esModule = true;
 
 
 //// [declFileAliasUseBeforeDeclaration_foo.d.ts]
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index f98e2f6aafb..6d626e2963d 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -21,6 +21,7 @@ export var x: SubModule.m.m3.c;
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.js]
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 844559232e4..218157185af 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -17,6 +17,7 @@ var Enhancement = (function () {
     return Enhancement;
 }());
 exports.Enhancement = Enhancement;
+exports.__esModule = true;
 
 
 //// [declFileClassWithStaticMethodReturningConstructor.d.ts]
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 44e816712fb..87cf77e733e 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -162,6 +162,7 @@ var ConstructorWithParameterInitializer = (function () {
     return ConstructorWithParameterInitializer;
 }());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
     /** This comment should appear for foo*/
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index c54c3c7e731..4103ac6976e 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x.a;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index 99affd5eb4d..5f583d2b6e1 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -59,6 +59,7 @@ define(["require", "exports", "declFileExportImportChain_b1"], function (require
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 27c61e9e43d..5fe546663e4 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -51,6 +51,7 @@ define(["require", "exports", "declFileExportImportChain2_b"], function (require
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 6870e16f941..8e07b99c8af 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -13,6 +13,7 @@ var z = b.x;
 
 //// [declFileForExportedImport_0.js]
 "use strict";
+exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
 ///<reference path='declFileForExportedImport_0.ts'/>
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index e4f674d43c0..c93dee4e30e 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -145,6 +145,7 @@ function nonExportedFooWithRestParameters(a) {
 function nonExportedFooWithOverloads(a) {
     return a;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileFunctions_1.js]
 /** This comment should appear for foo*/
 function globalfoo() {
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index c17463a6d15..ab3fc63f450 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -102,6 +102,7 @@ var h = (function (_super) {
 }(C.A));
 exports.h = h;
 exports.j = C.F6;
+exports.__esModule = true;
 
 
 //// [declFileGenericType.d.ts]
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index a733e1332a7..d1d9589e8c7 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -36,6 +36,7 @@ module.exports = m2;
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
+exports.__esModule = true;
 
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index 4a317a4e720..dee10473f2c 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -274,6 +274,7 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileMethods_1.js]
 var c2 = (function () {
     function c2() {
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 23c83276201..35a861a6046 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -91,6 +91,7 @@ var C4 = (function () {
     return C4;
 }());
 exports.C4 = C4;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitClassMemberNameConflict.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 8c97ef8eb07..5557ff71020 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -16,6 +16,7 @@ function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index dfbed90742d..e019203030e 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -19,12 +19,14 @@ function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [utils.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index 960a7af6780..a1e3aac8823 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -104,3 +104,4 @@ var MyClass4 = (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 73141eb9af9..87141cfb699 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -10,6 +10,7 @@ function f(x) {
     return typeof x === "number";
 }
 exports.f = f;
+exports.__esModule = true;
 
 
 //// [declarationEmitIdentifierPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index 234542d8d99..f20654d508c 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -14,3 +14,4 @@ function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
index 608f172cd1f..55500652830 100644
--- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
@@ -9,13 +9,13 @@ export default {
 
 //// [declarationEmitInferedDefaultExportType.js]
 "use strict";
-exports.__esModule = true;
 // test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
     baz: null
 };
+exports.__esModule = true;
 
 
 //// [declarationEmitInferedDefaultExportType.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index 05ce74e3bad..5afadf8723a 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -21,6 +21,7 @@ export { v }
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 307a9b82d67..130122ac840 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -28,6 +28,7 @@ function bar() {
     return v;
 }
 exports.bar = bar;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index c99e5c429dd..44d086abac6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -20,8 +20,8 @@ export default x;
 //// [1.js]
 "use strict";
 var x = "hi" || 5;
-exports.__esModule = true;
 exports["default"] = x;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 79d28d3d181..3c136865c53 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -19,6 +19,7 @@ var obj = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index 924f73d0ed9..d5d455c35e3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -21,6 +21,7 @@ export { v }
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2fba057fc91..e3493762072 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -16,6 +16,7 @@ var obj = true;
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 667acdff49c..70560f5a54d 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -14,6 +14,7 @@ function returnSomeGlobalValue() {
     return x;
 }
 exports.returnSomeGlobalValue = returnSomeGlobalValue;
+exports.__esModule = true;
 
 
 //// [declarationEmitInferedTypeAlias9.d.ts]
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 9e820a789c9..4f56ad91864 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -53,6 +53,7 @@ function runSampleBreaks(a, b, c, d, e) {
     });
 }
 exports.runSampleBreaks = runSampleBreaks;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitPromise.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 04c49422c5c..2845a120b74 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -38,6 +38,7 @@ var D = (function (_super) {
     return D;
 }(C));
 exports.D = D;
+exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index e938a615b6d..b9a81b2fb8e 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -21,6 +21,7 @@ exports.obj = {
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
+exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates02.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 79156f795ea..16ae267bc3c 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -37,3 +37,4 @@ var D = (function (_super) {
     }
     return D;
 }(C));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index df0d5b7903a..fcc373ccbe8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -21,3 +21,4 @@ exports.obj = {
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 6079de35964..303959f5504 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -7,6 +7,7 @@ export const y = (x: Foo<string>) => 1
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
 exports.y = function (x) { return 1; };
+exports.__esModule = true;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index d5bf31bd755..52f696a9448 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -8,6 +8,7 @@ export const y = (x: Baa<number>) => 1
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
 exports.y = function (x) { return 1; };
+exports.__esModule = true;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index bccf2337e08..686ed8dce2c 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -7,3 +7,4 @@ export {Foo}
 "use strict";
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 08afa34f8c8..10b8b1b9886 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -7,5 +7,5 @@ export default Foo
 "use strict";
 var Foo = From;
 './Foo'; // Syntax error
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index 3157445fa36..5e03b2d9b51 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index 7ef4369f975..d0e8504713d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -22,3 +22,4 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 994178cbb79..3e24af5f427 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -20,3 +20,4 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index 14ede865a2f..bf5e9e5dcfc 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) {
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -46,6 +46,6 @@ define(["require", "exports"], function (require, exports) {
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index ecc04859234..fe62d15c27f 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -27,8 +27,8 @@ let Foo = class Foo {
 Foo = __decorate([
     decorator
 ], Foo);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -43,5 +43,5 @@ let default_1 = class {
 default_1 = __decorate([
     decorator
 ], default_1);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index 47f9a524432..e6f4773df7d 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -36,8 +36,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -62,6 +62,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index fc8dc1c5515..8c7f16c3743 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -25,6 +25,7 @@ class Wat {
 "use strict";
 // from #3108
 exports.test = 'abc';
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index cb253d43c16..8076c72e391 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -25,8 +25,8 @@ var Service = (function () {
     }
     return Service;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Service;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [component.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 43cdaa79ab8..653bc911ed4 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -38,3 +38,4 @@ __decorate([
     __metadata("design:type", Object)
 ], B.prototype, "x", void 0);
 exports.B = B;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index be249800d57..9cbc514d932 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -48,6 +48,7 @@ var SomeClass = (function () {
     return SomeClass;
 }());
 exports.SomeClass = SomeClass;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux1.js]
 "use strict";
 var SomeClass1 = (function () {
@@ -56,6 +57,7 @@ var SomeClass1 = (function () {
     return SomeClass1;
 }());
 exports.SomeClass1 = SomeClass1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux2.js]
 "use strict";
 var SomeClass2 = (function () {
@@ -64,6 +66,7 @@ var SomeClass2 = (function () {
     return SomeClass2;
 }());
 exports.SomeClass2 = SomeClass2;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -110,3 +113,4 @@ ClassA = __decorate([
     __metadata("design:paramtypes", [aux_1.SomeClass])
 ], ClassA);
 exports.ClassA = ClassA;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 2c14c9b5bda..91c3814774c 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -38,3 +38,4 @@ __decorate([
     __metadata("design:type", A)
 ], B.prototype, "x", void 0);
 exports.B = B;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index 258635a5f3a..e2cd357f14a 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 104e449bc0c..19c8bafa4c1 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 2925cad6afe..63177201f1d 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 33eb93f380f..1979adf9c82 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db"); // error no default export
@@ -52,3 +53,4 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index b99621fd7e2..f3f82342fad 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 4970dca3201..34f63af38ea 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 28d403044bb..4b0d77b9d2f 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index dd5cee66f8b..a587baf1d05 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var database = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 4d9c2007ad0..6ec7a58da66 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -22,3 +22,4 @@ C = __decorate([
     dec
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index dd6209b6d64..0e289d51c71 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -24,6 +24,7 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -58,3 +59,4 @@ C = __decorate([
     __param(0, _0_ts_2.foo)
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index a1a3e331f36..518ddee0a81 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -26,6 +26,7 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -61,3 +62,4 @@ C = __decorate([
     __param(0, _0_2.foo)
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js
index 5e6b6b4a623..b506f474b0b 100644
--- a/tests/baselines/reference/decoratorOnImportEquals2.js
+++ b/tests/baselines/reference/decoratorOnImportEquals2.js
@@ -11,5 +11,6 @@ declare function dec<T>(target: T): T;
 
 //// [decoratorOnImportEquals2_0.js]
 "use strict";
+exports.__esModule = true;
 //// [decoratorOnImportEquals2_1.js]
 "use strict";
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 66d100ad07d..1b603623776 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -24,8 +24,8 @@ import x from './a';
 })(function (require, exports) {
     "use strict";
     const x = new Promise((resolve, reject) => { resolve({}); });
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = x;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 8499164f675..d57f4c7ad9e 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -15,8 +15,8 @@ import x from './a';
 //// [a.js]
 "use strict";
 const x = new Promise((resolve, reject) => { resolve({}); });
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index 770b685378d..d74cc416e28 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -13,5 +13,5 @@ function f() {
         args[_i] = arguments[_i];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index 24a37cad2c3..28b30b5989b 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -35,13 +35,13 @@ Entity.y;
 function Decl() {
     return 0;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 var Decl;
 (function (Decl) {
     Decl.x = 10;
     Decl.y = 20;
 })(Decl = exports.Decl || (exports.Decl = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index f327c62e571..e686b58a4ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -32,8 +32,8 @@ var Decl = (function () {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 4369392c6e9..d2662c1256f 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -32,8 +32,8 @@ var Decl = (function () {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index 7c9bd88bc16..baade857296 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -17,8 +17,8 @@ export interface Foo {
 "use strict";
 function Foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index fc0385254c0..214522a56c8 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -12,13 +12,13 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     function foo() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index 1290404099d..c31174a5acd 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -11,10 +11,10 @@ export default function foo() {}
 "use strict";
 class Foo {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 function foo() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 71aa347ce32..8eb92f872bb 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -20,8 +20,8 @@ export default function foo() {}
     "use strict";
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -35,6 +35,6 @@ export default function foo() {}
 })(function (require, exports) {
     "use strict";
     function foo() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index 8e12bb9bd2c..fd2f277c71a 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [B.js]
 define(["require", "exports", "A"], function (require, exports, a) {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 707218b41e2..37eed711067 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -11,3 +11,4 @@ exports.toString = (1).toString;
 {
     let { toFixed } = 1;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 8da039fe98e..11e242da1a2 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 94530d8d258..6c799d10803 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -20,4 +20,5 @@ export let { toString } = 1;
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b6baf850800..b1983c82d15 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -37,3 +37,4 @@ var M;
     M.bar7 = { a: 1 }.a;
     M.bar8 = { a: 1 }.a;
 })(M = exports.M || (exports.M = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 734b01eaed7..c348443fb29 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -636,3 +636,4 @@ exports.tests = (function () {
     }, "Codepoint at index: 3 has control value: 8"));
     return testRunner;
 })();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index d6f5c26d628..3e89e88fd3c 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -77,4 +77,5 @@ define(["require", "exports"], function (require, exports) {
         }));
         return testRunner;
     })();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index ef39270c9d1..9fc3f440414 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -14,3 +14,4 @@ exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 94fa1f7e852..2fff5988d89 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -18,9 +18,11 @@ export var main = 10;
 //// [elidingImportNames_main.js]
 "use strict";
 exports.main = 10;
+exports.__esModule = true;
 //// [elidingImportNames_main1.js]
 "use strict";
 exports.main = 10;
+exports.__esModule = true;
 //// [elidingImportNames_test.js]
 "use strict";
 var a = require("./elidingImportNames_main"); // alias used in typeof
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
index 88762e7e846..58ab920d177 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
@@ -6,3 +6,4 @@ export = {};
 //// [errorForConflictingExportEqualsValue.js]
 "use strict";
 module.exports = {};
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 89fd0c47a7e..de92a5e40c3 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -27,8 +27,8 @@ function assert(value) {
     if (!value)
         throw new Error("Assertion failed!");
 }
-exports.__esModule = true;
 exports["default"] = assert;
+exports.__esModule = true;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 6a301f9a2ac..72c954b02f2 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -24,5 +24,5 @@ var A = (function () {
     };
     return A;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js
index 2c38edef6ae..ce15d3a5ce4 100644
--- a/tests/baselines/reference/es5-commonjs2.js
+++ b/tests/baselines/reference/es5-commonjs2.js
@@ -5,5 +5,5 @@ export default 1;
 
 //// [es5-commonjs2.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 73c859bb778..93a0ed94a5c 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -10,5 +10,5 @@ export default function () {
 function default_1() {
     return "test";
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js
index 87d2f7d62a6..33015271d7a 100644
--- a/tests/baselines/reference/es5-commonjs6.js
+++ b/tests/baselines/reference/es5-commonjs6.js
@@ -6,6 +6,6 @@ var __esModule = 1;
 
 //// [es5-commonjs6.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 var __esModule = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 71c4af8d559..5bb6f87e4e5 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -28,6 +28,7 @@ function foo() {
     });
 }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 76333572abe..6f129f5e58d 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -34,4 +34,5 @@ export class A
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 0689ef19da3..1291c739fcb 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -33,6 +33,6 @@ export default class A
         };
         return A;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index fc8acfb95ea..f6817129fb3 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -13,8 +13,8 @@ var C = (function () {
     C.prototype.method = function () { };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 0f60a104a7e..5cf3405c437 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -13,8 +13,8 @@ var default_1 = (function () {
     default_1.prototype.method = function () { };
     return default_1;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index 00af2676a0d..d28148d1416 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -25,10 +25,10 @@ var C = (function () {
     };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var after = new C();
 var t = C;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js
index 0821543134c..6ebab2a4b0d 100644
--- a/tests/baselines/reference/es5ExportDefaultExpression.js
+++ b/tests/baselines/reference/es5ExportDefaultExpression.js
@@ -5,8 +5,8 @@ export default (1 + 2);
 
 //// [es5ExportDefaultExpression.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (1 + 2);
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultExpression.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 55de6b62b83..1060607886a 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -6,8 +6,8 @@ export default function f() { }
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
 function f() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index e6007cc9147..13f9e014be6 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -6,8 +6,8 @@ export default function () { }
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
 function default_1() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 54a2658470e..47ed66880e6 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -14,9 +14,9 @@ var before = func();
 function func() {
     return func;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = func;
 var after = func();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index b3840caf145..1102eab997d 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -9,8 +9,8 @@ export default f;
 "use strict";
 function f() { }
 exports.f = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultIdentifier.d.ts]
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 7060153f0d0..02774139add 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index e5f995fb5e0..4c58c0bd20f 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -22,3 +22,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 34ad74818b2..4479259a523 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -22,3 +22,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index dc094122d9d..6f1d083ebe8 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -32,4 +32,5 @@ export class A
         }
     }
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 73de2e7cce3..80d31b41695 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -29,12 +29,14 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("./server"));
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index f602f1ff609..98940523143 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -32,6 +32,7 @@ var m;
 exports.instantiatedModule = m;
 var x = 10;
 exports.x = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index 5add71a06f2..f1cb97ad0f6 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -34,3 +34,4 @@ exports.bizz = bizz;
 exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1
 exports.bizz = bizz -= 1; // similarly
 exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index ab9bd3d98c8..5891de57310 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -33,6 +33,7 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -43,6 +44,7 @@ var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
 var server_4 = require("./server");
 exports.x = server_4.x;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 49a8a7e435a..c84c76839ee 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -304,3 +304,4 @@ __export(require("function"));
 __export(require("function-module"));
 __export(require("class"));
 __export(require("class-module"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 9de16453c6e..3148d9b028d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -15,8 +15,8 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index dbc90cb80a3..6f4836a6680 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -18,12 +18,13 @@ var c = (function () {
     }
     return c;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
 exports.x = new server_1.default();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 4bff2abf82d..703e0a7a7bb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -27,8 +27,8 @@ var x1: number = m;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {};
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index fde7556edea..58d5399c99d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -23,8 +23,8 @@ var x: number = defaultBinding6;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 6131ff40624..5d2518bb774 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -23,8 +23,8 @@ export var x1: number = defaultBinding6;
 //// [server.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -39,6 +39,7 @@ var server_5 = require("./server");
 exports.x1 = server_5.default;
 var server_6 = require("./server");
 exports.x1 = server_6.default;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index a0916932d4c..0556d872480 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -62,6 +62,7 @@ var x11 = (function () {
     return x11;
 }());
 exports.x11 = x11;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -75,6 +76,7 @@ var server_4 = require("./server");
 exports.x3 = new server_4.x11();
 var server_5 = require("./server");
 exports.x6 = new server_5.m();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index b588c9516e9..f52c590f44e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -26,8 +26,8 @@ var a = (function () {
     }
     return a;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -42,6 +42,7 @@ var server_5 = require("./server");
 exports.x5 = new server_5.default();
 var server_6 = require("./server");
 exports.x6 = new server_6.default();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index c075c5c934f..c6887efba36 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -26,6 +26,7 @@ var x1: number = m;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index aa89c8d4380..247c64c3e7f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) {
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = {};
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
@@ -40,6 +40,7 @@ define(["require", "exports", "server", "server", "server", "server", "server"],
     exports.x1 = server_3.a;
     exports.x1 = server_4.x;
     exports.x1 = server_5.m;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 0a0e028b696..95c1485e5c1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -12,8 +12,8 @@ var x: number = defaultBinding;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index 5f2cb4e97e0..fbd045e81de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -13,13 +13,14 @@ export var x: number = defaultBinding;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 60bdc654842..8b430e2cf46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -16,10 +16,12 @@ var a = (function () {
     return a;
 }());
 exports.a = a;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 8752157eddd..09caf0db18a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -17,13 +17,14 @@ define(["require", "exports"], function (require, exports) {
         }
         return a;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = new server_1.default();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 9d11e154755..385e65f3f67 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -11,6 +11,7 @@ var x: number = nameSpaceBinding.a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index e16ebf99957..0b5670b18a9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -11,10 +11,12 @@ export var x: number = nameSpaceBinding.a;
 //// [server.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index e686c3f33c9..e6daf77e4e9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -19,8 +19,8 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 5513ae565f2..a40dff3c317 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -11,5 +11,6 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index cc90d280914..6ea0812d40b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -14,13 +14,14 @@ export import defaultBinding2 from "server"; // non referenced
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 8e109779f45..8ef828435f0 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index 093e8385bae..0e795db4c01 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -14,6 +14,7 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index cf66c08331e..20b9d3af20b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -18,10 +18,12 @@ var c = (function () {
 }());
 exports.c = c;
 ;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 252d131f824..9e05e95244e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 9bdd0318310..357f0f05e7f 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -18,6 +18,7 @@ var nameSpaceBinding3 = 10;
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
 var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index e21ab603f82..1663d7ec923 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -14,11 +14,13 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
     exports.x = nameSpaceBinding.a;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 8dbdf7ce6f1..f60477a73cb 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -51,6 +51,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImport_1.js]
 "use strict";
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 278e4ee07d2..33ea02fd94f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -52,6 +52,7 @@ define(["require", "exports"], function (require, exports) {
     exports.z1 = 10;
     exports.z2 = 10;
     exports.aaaa = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index 7fdf620164b..f8fdf461644 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -132,6 +132,7 @@ var aaaa1 = (function () {
     return aaaa1;
 }());
 exports.aaaa1 = aaaa1;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -155,6 +156,7 @@ var server_8 = require("./server");
 exports.z111 = new server_8.z1();
 var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 3f3e4694758..85952247395 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -51,6 +51,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 38766d32cd9..0743f1658b4 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -11,6 +11,7 @@ export = a;
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
 const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 002aa5a49ce..f3f76ff0184 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -26,6 +26,7 @@ exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
+exports.__esModule = true;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
 var x = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 71159983b9a..a3bd672c6f3 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -13,5 +13,6 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 "use strict";
 exports.a = 10;
 exports.x = exports.a;
+exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 21ccb29a57b..7377f737e47 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -50,6 +50,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -73,6 +74,7 @@ var server_8 = require("./server");
 exports.z111 = server_8.z1;
 var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 583a008f0ac..1bbab226ae8 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -36,10 +36,12 @@ var C2 = (function () {
     return C2;
 }());
 exports.C2 = C2;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index ea533a9a963..726efa849c2 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -17,11 +17,13 @@ var _b = 10;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.b = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index d0f7c9fbe65..9d844a8ca8f 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -10,6 +10,7 @@ import "es6ImportWithoutFromClauseInEs5_0";
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
 require("es6ImportWithoutFromClauseInEs5_0");
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 5ff5b62d8ec..b78466485f9 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -10,6 +10,7 @@ export import "server";
 //// [server.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 require("server");
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index 172ce2a8729..bd45a62e2f4 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index f932bb7072f..a7cf0599e54 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -21,3 +21,4 @@ class A {
     }
 }
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index 5f37f0f0220..b2a01bbb552 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function f1() {
     }
-    exports.__esModule = true;
     exports["default"] = f1;
+    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
@@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1["default"]();
     }
-    exports.__esModule = true;
     exports["default"] = f2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index ee1f562258f..898261ef7fe 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -16,13 +16,13 @@ export default function f2() {
 "use strict";
 function f1() {
 }
-exports.__esModule = true;
 exports["default"] = f1;
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
-exports.__esModule = true;
 exports["default"] = f2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index 0e2cb890d2a..fcc918bb8ce 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function f1() {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
@@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1.default();
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index 1d2511735c7..fa1652c603e 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -16,13 +16,13 @@ export default function f2() {
 "use strict";
 function f1() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f2;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 386419e5725..641500fa09d 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -9,3 +9,4 @@ export { a, b };
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
 exports.b = b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index c9c3ffa80c4..a39a7aa04cd 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -16,6 +16,7 @@ function x() {
     return true;
 }
 exports.x = x;
+exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index a469e90b619..265d082ca35 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -20,6 +20,7 @@ function x() {
     return true;
 }
 exports.x = x;
+exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js
index 8441b7b4320..0aea8ec80fc 100644
--- a/tests/baselines/reference/exportAssignmentWithExports.js
+++ b/tests/baselines/reference/exportAssignmentWithExports.js
@@ -16,3 +16,4 @@ var D = (function () {
     return D;
 }());
 module.exports = D;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 19f872bad27..9a03aaae595 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -23,17 +23,21 @@ export { x as a, } from
 //// [t1.js]
 "use strict";
 exports.x = "x";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 //// [t4.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
+exports.__esModule = true;
 //// [t5.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 2dcef41d761..4ccdba88556 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -55,12 +55,12 @@ var A;
         B.b = 0;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
-exports.__esModule = true;
 exports["default"] = A.B;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = "foo".length;
+exports.__esModule = true;
 //// [index.js]
 "use strict";
 /// <reference path="declarations.d.ts" />
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 2b0a5dce526..b5d3e2c053b 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -25,8 +25,8 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C.B;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index 8f785282080..6ca5b6411ff 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -38,6 +38,7 @@ define(["require", "exports", "./exporter"], function (require, exports, e) {
         return new e.w();
     }
     exports.w = w;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 345d2a6885a..e84e661517b 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function add(a, b) { return a + b; }
     exports.add = add;
+    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 401183a5ead..adcdeda7850 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
         return { name: 'value' };
     }
     exports.w = w;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index d8dd17a562c..ba7f9380865 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -67,4 +67,5 @@ define(["require", "exports"], function (require, exports) {
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index f986ef7f36b..bf30e45f1ca 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -66,3 +66,4 @@ exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
 exports.h1 = new D;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 796818c650c..1b26cfe3c1a 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -75,4 +75,5 @@ export let h1: D = new D;
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index b1e2e200634..a9ec4591c6c 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -7,3 +7,4 @@ export function Foo(): any {}
 "use strict";
 function Foo() { }
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index 2bc77e079fb..e5fa8913ffd 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) {
     function a() {
     }
     exports.a = a;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index ac79a9bf69d..b117972450e 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -19,6 +19,7 @@ function f() {
     return x;
 }
 exports.f = f;
+exports.__esModule = true;
 
 
 //// [b.d.ts]
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index bd4c112ff2e..2ef8560a38a 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -34,14 +34,15 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
     exports.y = 2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
@@ -52,6 +53,7 @@ define(["require", "exports"], function (require, exports) {
     exports.y = y;
     var z = "z";
     exports.z = z;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t4.js]
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
@@ -62,6 +64,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index a2bc44720fb..460984a2b13 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -33,12 +33,13 @@ foo;
 "use strict";
 exports.x = 1;
 exports.y = 2;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 var x = "x";
@@ -47,6 +48,7 @@ var y = "y";
 exports.y = y;
 var z = "z";
 exports.z = z;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
 function __export(m) {
@@ -55,6 +57,7 @@ function __export(m) {
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var t4_1 = require("./t4");
diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js
index dc4d4c8b68e..21f2b4c2f09 100644
--- a/tests/baselines/reference/exportStarForValues5.js
+++ b/tests/baselines/reference/exportStarForValues5.js
@@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 39a152fdc89..d0c1f85582c 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -29,4 +30,5 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     }
     __export(file2_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index f8e7678a40c..cb3f66fbaf6 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -32,11 +32,13 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
@@ -47,6 +49,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
@@ -56,4 +59,5 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     }
     __export(file4_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index e057e4d4027..fdcb0e5583a 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -28,6 +28,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     }
     __export(file2_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
@@ -37,4 +38,5 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     }
     __export(file3_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index afb4d2f10c1..bb9867725b0 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -31,6 +31,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module2.js]
 // empty
 //// [exportStarFromEmptyModule_module3.js]
@@ -46,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
 var X = require("./exportStarFromEmptyModule_module3");
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index 190d1693c24..ee9482c655f 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -7,3 +7,4 @@ export { toString };
 "use strict";
 var toString = 0;
 exports.toString = toString;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index a49cd744441..d66cf543124 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -22,3 +22,4 @@ function test(foo) {
     return true;
 }
 exports.test = test;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 3e77c3c684b..357e7dc25f4 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -38,4 +38,5 @@ define(["require", "exports"], function (require, exports) {
     (function (NS1) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index da472fc8790..11737e21e73 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -8,4 +8,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index f2d78fe9a88..5e9d0f2edf2 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -27,4 +27,5 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.x = 5;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index 9e04b3485d2..f6456368e33 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -60,6 +60,7 @@ define(["require", "exports"], function (require, exports) {
     exports.M = M;
     var a = M.x;
     exports.a = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -70,6 +71,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -80,4 +82,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 3ac5aeb0dc5..968cd185378 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -56,6 +56,7 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -65,6 +66,7 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
@@ -74,3 +76,4 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index 46eda0656ad..a6f97be0677 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -59,6 +59,7 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -68,6 +69,7 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -77,3 +79,4 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index 18803de4004..d67dd92707d 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -18,16 +18,19 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = "x";
     exports.y = "y";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     exports.y = t1_1.x;
     exports.x = t1_1.y;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     exports.y = t1_1.x;
     exports.x = t1_1.y;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 56639bdbecf..59ee55defd8 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -17,13 +17,16 @@ export { x as y, y as x };
 "use strict";
 exports.x = "x";
 exports.y = "y";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 3790510979c..672d7161e74 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -17,13 +17,16 @@ export { x as y, y as x };
 "use strict";
 exports.x = "x";
 exports.y = "y";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index cbf30735182..1f74addddec 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -62,6 +62,7 @@ define(["require", "exports"], function (require, exports) {
     exports.M1 = M;
     exports.a = M.x;
     exports.a1 = exports.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -72,6 +73,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -82,4 +84,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index 85daa3f0f5c..b4152cab778 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -58,6 +58,7 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -67,6 +68,7 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
@@ -76,3 +78,4 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index dbcd9486215..2bc4c828fe1 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -61,6 +61,7 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -70,6 +71,7 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -79,3 +81,4 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index 3ed3f9bf910..ddacb1eec94 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -42,8 +42,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
@@ -65,4 +65,5 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f
     exports.f2 = t1_4.default;
     t1_4.default;
     t1_4.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 8a8d4f81225..5f0c37ab04f 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const a = require("./t1");
@@ -67,3 +67,4 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 361d1305bda..6a78862e55e 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 var a = require("./t1");
@@ -67,3 +67,4 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index fb6946ce928..838a6ae9326 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -28,6 +28,7 @@ var set = {
 exports.set = set;
 var get = 10;
 exports.get = get;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 //// [t3.js]
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 219916b3047..4af17d71653 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -22,6 +22,7 @@ import { as } from "./t1";
 var as = 100;
 exports.return = as;
 exports.as = as;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var as = require("./t1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index d14eab3c251..7cdfbe79ebe 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -17,12 +17,12 @@ const { __, _, ___ } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
     "___": 30
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 5d1dcbb9322..890e32937a1 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -16,11 +16,11 @@ const { __esmodule, __proto__ } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 477f870742d..3514652db65 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -17,12 +17,12 @@ const { ___, ___hello, _hi } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
     "_hi": 40
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index 22cd7c2e71a..25130664b74 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -64,6 +64,7 @@ function ___hello() {
     console.log("___hello");
 }
 exports.___hello = ___hello;
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 2d1add18ae0..2e26d67db39 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -40,6 +40,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -61,6 +62,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -82,6 +84,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 47958ddd2ff..4d60625115b 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
 //// [externalModuleAssignToVar_core_require2.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index b50845024f4..646b4471859 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -54,6 +54,7 @@ for ((stuff[n]) of []) {}
 //// [f1.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 // all mutations below are illegal and should be fixed
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index 5b0de7324ac..9c9861d7c28 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -23,6 +23,7 @@ file1.bar();
 function foo() { }
 exports.foo = foo;
 ;
+exports.__esModule = true;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index eb5171acd75..959a3ffffcf 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 0c6f1c8034d..793f4ab6c06 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -18,6 +18,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return c;
     }());
     exports.c = c;
+    exports.__esModule = true;
 });
 function foo() {
 }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 8391823aa3a..3b1644e7ac1 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -14,8 +14,10 @@ export function f() {
 function f() {
 }
 exports.f = f;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 function f() {
 }
 exports.f = f;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index bf1d887b435..d794cded0f4 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -50,3 +50,4 @@ function baz3(func) {
     var foo = "in";
 }
 exports.baz3 = baz3;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 594d2c3263c..426697dfa8d 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) {
         yield;
     }
     exports.foo = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index a17d9272c5b..1b008c90860 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -41,4 +41,5 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 4f3895a33b8..2cbb4485e31 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) {
         foo(fn); // Invocation is necessary to repro (!)
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index c15868e20c4..9704fe5d148 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -59,4 +59,5 @@ define(["require", "exports"], function (require, exports) {
         return BuildResult;
     }());
     exports.BuildResult = BuildResult;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 56367ca9c5e..457158faee1 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         return DbSet;
     }());
     exports.DbSet = DbSet;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 5498d3d1fad..0ed35307d2d 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -56,4 +56,5 @@ define(["require", "exports"], function (require, exports) {
         return ListItem;
     }(CollectionItem));
     exports.ListItem = ListItem;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 5c865321691..783ec2bf947 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -9,6 +9,7 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile3.js
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 149a975d413..434835a59d3 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -1107,6 +1107,7 @@ define(["require", "exports"], function (require, exports) {
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index 75d6e68d4c5..c676d8caa62 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -19,6 +19,7 @@ var Greeter = (function () {
     return Greeter;
 }());
 exports.Greeter = Greeter;
+exports.__esModule = true;
 //// [importAsBaseClass_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index 47bf5a1b2a1..a33b758df7d 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -91,6 +91,7 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require1.js]
 "use strict";
 var d = (function () {
@@ -102,6 +103,7 @@ exports.d = d;
 var x;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require2.js]
 "use strict";
 var d = (function () {
@@ -112,6 +114,7 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require3.js]
 "use strict";
 var d = (function () {
@@ -122,10 +125,12 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require4.js]
 "use strict";
 function foo2() { return null; }
 exports.foo2 = foo2;
+exports.__esModule = true;
 //// [importDecl_1.js]
 "use strict";
 ///<reference path='importDecl_require.ts'/>
@@ -169,6 +174,7 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+exports.__esModule = true;
 
 
 //// [importDecl_require.d.ts]
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index c2cc0b8ea7a..ee4e8f1dc8c 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -19,8 +19,10 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [importDeclarationUsedAsTypeQuery_require.d.ts]
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index fea4ee2db27..7f2c4ad4036 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -66,6 +66,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 6054e147386..03a4e6393d7 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
@@ -37,4 +38,5 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 429a71c1ab8..52e5aac62e0 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -66,6 +66,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 "use strict";
 var tslib_1 = require("tslib");
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 29e43e191e8..2883a7aaa53 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -23,6 +23,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 "use strict";
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 53b4b326819..4747e017ff5 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -68,6 +68,7 @@ C = tslib_1.__decorate([
 var o = { a: 1 };
 var y = tslib_1.__assign({}, o);
 var x = tslib_1.__rest(y, []);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index f84666ae198..efcd4827257 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -58,6 +58,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 572115ba4bb..233b12208c1 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -29,6 +29,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
@@ -40,6 +41,7 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
@@ -51,4 +53,5 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return C;
     }(a_2.A));
     exports.C = C;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 013999321f9..2d3713ffaf4 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
     }());
     C1.s1 = true;
     exports.C1 = C1;
+    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index b57df504993..e15a3337dfd 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -16,6 +16,7 @@ var z2 = foo.y + 10; // Should resolve
 //// [foo_0.js]
 "use strict";
 exports.y = 42;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 4075719c9c5..de5ee2a22bd 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -19,6 +19,7 @@ var Super = (function () {
     return Super;
 }());
 exports.Super = Super;
+exports.__esModule = true;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index 7118dd95bb8..807d684b5b1 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -22,12 +22,12 @@ aIndex.aIndex;
 
 //// [a.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = { a: 0 };
+exports.__esModule = true;
 //// [index.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = { aIndex: 0 };
+exports.__esModule = true;
 //// [test.js]
 "use strict";
 var _1 = require(".");
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index d67c53c6349..423a3546d31 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) {
         return Host;
     }());
     exports.Host = Host;
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index 4630de598cc..632483866be 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -26,6 +26,7 @@ a3.y = 1;
 exports.x = 1;
 var y = 1;
 exports.y = y;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index 84f0989e987..7a530fdb1df 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -79,3 +79,4 @@ class BrokenClass {
     }
 }
 exports.BrokenClass = BrokenClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 540549aef52..da0be4c0e95 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index 6726971d208..dde6b1632f1 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return C1;
     }());
     exports.C1 = C1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 642300d9160..5fb3996134b 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -50,4 +50,5 @@ define(["require", "exports"], function (require, exports) {
         return Test;
     }());
     exports.Test = Test;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index aa274838529..20ce33035e6 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -41,6 +41,7 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index c15ca69e13f..d9f47a05d9e 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -41,3 +41,4 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index f881032fa1e..52a2e0b3fed 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -28,6 +28,7 @@ var x;
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index ac5004a7606..640b533f151 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -28,6 +28,7 @@ var x;
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index 8e11f60dcc7..d3e9fdf8349 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = exports.b.Sunday;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 8ec0dcea815..99b9156c0c9 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = b.Sunday;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index be096720e5e..88765f267e6 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) {
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index ec702b7e021..160b4047849 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -22,6 +22,7 @@ var a;
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;
+exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 02181f04f8d..77dbbab235a 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -33,3 +33,4 @@ var c;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 26915043496..05fe46f1eb5 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -25,6 +25,7 @@ var a;
 })(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
+exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index a8a1d9ee047..63f6b8c1422 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
index 1d6cb8c07e9..4434670366c 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
@@ -10,6 +10,7 @@ export var x: b;
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
index fb666a9cad2..5645c76ed2a 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
@@ -11,6 +11,7 @@ export var x: b;
 //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 1015e2a1d63..efbb156bed8 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
     (function (c) {
         c.x.foo();
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index dac3821a30d..ac52f94db72 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -16,6 +16,7 @@ x.foo();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x.foo();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index dc1029c6664..45af4536151 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -15,6 +15,7 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
 exports.x.foo();
+exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index aa61fc77216..962e34c4a3e 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -22,3 +22,4 @@ var c;
     c.bVal = b;
 })(c = exports.c || (exports.c = {}));
 exports.z = c.b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 5427dbf026f..732257b93e5 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.x;
     exports.bVal = exports.b;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index 7c7c2cd327e..f0d02aa709c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -16,6 +16,7 @@ var a;
 })(a = exports.a || (exports.a = {}));
 var b = a.x;
 exports.bVal = b;
+exports.__esModule = true;
 
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index f4ad4da608b..27a75a64be6 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -15,3 +15,4 @@ function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
 exports.Form3 = brokenFunction(parameterFn)({ store: "hello" });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 80f47941e60..f9590d70dd3 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -40,3 +40,4 @@ var y = ns.value;
 var module_3 = require("module");
 exports.c1 = module_3.c1;
 exports.z = x;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index e1675ff7131..cbb97e43d72 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -46,6 +46,6 @@ define("_apply", ["require", "exports"], function (require, exports) {
         }
         return func.apply(thisArg, args);
     }
-    exports.__esModule = true;
     exports["default"] = apply;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index 1acead2801d..f47b1b52cc6 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 0a6402ca70c..a9a925c3e4f 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 82c8f6410e6..592675086b1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index ffec40ff7b6..3ab40dee5eb 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -21,4 +21,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 23f6f44e0c7..12ea8b96602 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -21,4 +21,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 90bb675442a..e2fe0c52c90 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 let c;
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 0bc0c6e57c5..a9a718a4b2a 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 let c;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 80a77d35302..4d1cc513918 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 6714b68a093..60c8ca80212 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -20,4 +20,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index cb1de5fdc61..731e0e2e70b 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -67,6 +67,7 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; });
 // Length 6
 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6];
 exports.h = numNumNumNumNum.map(function (n) { return n * n; });
+exports.__esModule = true;
 
 
 //// [mapOnTupleTypes01.d.ts]
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 97ffc9510db..0906c6df189 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -12,6 +12,7 @@ function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
 exports.increment = increment;
+exports.__esModule = true;
 
 
 //// [mapOnTupleTypes02.d.ts]
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index 00f913219a4..94f65168198 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
+    exports.__esModule = true;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 4452165c3e6..17aeccbc769 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [b.js]
 var __extends = (this && this.__extends) || (function () {
@@ -59,4 +60,5 @@ define(["require", "exports", "./a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index 8a22a90bc2e..fa93f2f2143 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -36,3 +36,4 @@ __decorate([
     __metadata("design:type", Object)
 ], SomeClass.prototype, "event", void 0);
 exports.SomeClass = SomeClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index d9ab942cfc8..87e1fdd8f58 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -162,3 +162,4 @@ var N12;
     function m(a) { }
     N12.m = m;
 })(N12 || (N12 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 069849ffb83..76138193938 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -11,6 +11,7 @@ import {x} from "./a"
 //// [a.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 (function () { return 1; }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index b75161da458..c6fb35e3737 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -17,6 +17,7 @@ fn(a); // Error: property 'x' is missing from 'a'
 //// [moduleAliasAsFunctionArgument_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index 8c497d63c42..0f884f26756 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -50,6 +50,7 @@ import "./x";
 //// [x0.js]
 "use strict";
 exports.a = 1;
+exports.__esModule = true;
 //// [x.js]
 "use strict";
 var N1;
@@ -59,9 +60,11 @@ var N1;
 //// [observable.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [test.js]
 "use strict";
 exports.b = 1;
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 99351642a18..4f1eb3bde6b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -26,6 +26,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var x = [1];
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 90e8373302e..03334d17cb8 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -27,6 +27,7 @@ var A = (function () {
 }());
 exports.A = A;
 ;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var x = [1];
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index caa080a558c..21be25c6373 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -30,6 +30,7 @@ var A = (function () {
 }());
 exports.A = A;
 ;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 //// [f3.js]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 8e0b7dad19d..d0b1592da39 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -35,6 +35,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -43,6 +44,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 498df8ab90e..dfb71d81497 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 8d9e69c5076..312a56792b6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -45,6 +45,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -53,6 +54,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 53095555815..690ec91226a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index c3cba4c01f8..efb3fc04f9f 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index f5aff705eb4..228320ec9c6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index 504c015bcb8..a55585e6ace 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -64,6 +64,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return Cls;
     }());
     exports.Cls = Cls;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
@@ -84,6 +85,7 @@ define("m3", ["require", "exports"], function (require, exports) {
         return C2;
     }());
     exports.C2 = C2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 922bb61d952..26a04928440 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -51,6 +51,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -60,6 +61,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 605a07e29e1..82858bcada0 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 0a946f42be3..8bdbb647421 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -55,6 +55,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -64,6 +65,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index a48bbb04631..82b8624c35c 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 6a7113c0368..8c396d4fcdd 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -53,3 +53,4 @@ var E2;
     E2[E2["B"] = 0] = "B";
 })(E2 || (E2 = {}));
 var v = E2.B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 64b82f82500..1af231a9a62 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -76,3 +76,4 @@ var Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(Utensils = exports.Utensils || (exports.Utensils = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index a590e23f71e..8c18060d506 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -19,6 +19,7 @@ var Promise = (function () {
     return Promise;
 }());
 exports.Promise = Promise;
+exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
 var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index c18f11d24b3..3ed09d2cd7a 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -12,3 +12,4 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index c3512734f94..cb53b78f038 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 4a9594d254b..2f2cf9d9148 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -11,3 +11,4 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 18edf1ef4af..7b39a9d12e3 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -20,4 +20,5 @@ export class Foo {}
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index c73be6b6981..e3c323bba71 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -13,3 +13,4 @@ export var c = '';
 //// [b.js]
 "use strict";
 exports.c = '';
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index a17f108d872..554f8110994 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -23,11 +23,11 @@ import z2 from "./z";
 
 //// [x.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [y.jsx]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [user.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index 16d176872ca..1f241c1ed96 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -27,8 +27,8 @@ import j from "./jquery.js"
 
 //// [a.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index 177321c7d08..afd5ce5a578 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -12,7 +12,7 @@ import b from "./b";
 
 //// [index.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index fbf97fa3ba0..f326ab9231a 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -49,10 +49,12 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
+exports.__esModule = true;
 //// [/src/library-b/index.js]
 "use strict";
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
+exports.__esModule = true;
 //// [/src/app.js]
 "use strict";
 var x;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index a927a496a96..f88665c6808 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -19,12 +19,14 @@ x + x2;
 // See GH#10364. 
 "use strict";
 exports.x = 0;
+exports.__esModule = true;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
 exports.x = 0;
+exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
 var abc_1 = require("./shared/abc");
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index 312bcf4c174..7d778942524 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -28,10 +28,12 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
+exports.__esModule = true;
 //// [/src/bin/library-b/index.js]
 "use strict";
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
+exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
 var x;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 4061a32b49f..0b50be0e5e4 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -13,12 +13,14 @@ export var foo = 42;
 //// [c.js]
 "use strict";
 exports.foo = 42;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("./c"));
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
@@ -26,3 +28,4 @@ function __export(m) {
 }
 __export(require("./b"));
 __export(require("./c"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 208e90c69d8..7411123a872 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -25,6 +25,7 @@ var Animals;
 "use strict";
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
@@ -32,3 +33,4 @@ function __export(m) {
 }
 __export(require("./b"));
 __export(require("./c"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index f987c0c652d..20a518e2511 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -31,6 +31,7 @@ var v4 = function () { return 5; };
 "use strict";
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
+exports.__esModule = true;
 //// [file4.js]
 "use strict";
 var file3 = require("./file3");
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index e15f8fc879c..a0e06a40da5 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -25,15 +25,13 @@ var foo = (function () {
     }
     return foo;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
 var x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 0e9fed272cd..210fa21e803 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -19,12 +19,11 @@ Entity();
 "use strict";
 function foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 748837baceb..436232c145e 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -13,12 +13,11 @@ var C = (function () {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index 020f9b758bb..b2c37ec5f0e 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -10,9 +10,8 @@ export default function f() {
 "use strict";
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index bec4fb48969..4817012ab75 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -12,9 +12,8 @@ export default {
 "use strict";
 function Foo() {
 }
-exports.__esModule = true;
 exports["default"] = Foo;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index dc82500a1d9..e979b96fe71 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -9,10 +9,9 @@ export default function Foo() { }
 
 //// [multipleExportDefault2.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
-exports.__esModule = true;
 exports["default"] = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index 5d7ad48e0ca..e889edc907a 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -9,7 +9,6 @@ export default class C { }
 
 //// [multipleExportDefault3.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
@@ -18,5 +17,5 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index 1199fa91c9c..d46cda4d8b3 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -12,9 +12,8 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 7ae33aee9f4..5c10a1be95a 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -5,12 +5,11 @@ export default class C {}
 //// [multipleExportDefault5.js]
 "use strict";
 function bar() { }
-exports.__esModule = true;
 exports["default"] = bar;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index a8b93459e4e..3d990277993 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -9,11 +9,10 @@ export default {
 
 //// [multipleExportDefault6.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
-exports.__esModule = true;
 exports["default"] = {
     lol: 2
 };
+exports.__esModule = true;