diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 5f55c04c9f9..37383082983 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -60,3 +60,4 @@ compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 1421b53a00c..cc57b184960 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -117,3 +117,4 @@ fileNames.forEach(function (fileName) {
     // delint it
     delint(sourceFile);
 });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index 75ab80d3f23..d97acbdc14f 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/tests/baselines/reference/APISample_parseConfig.js
@@ -68,3 +68,4 @@ function createProgram(rootFiles, compilerOptionsJson) {
     return ts.createProgram(rootFiles, settings.options);
 }
 exports.createProgram = createProgram;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 7aef6de22e6..7a69de02cfe 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -21,6 +21,7 @@ var someClass = (function () {
     return someClass;
 }());
 exports.someClass = someClass;
+exports.__esModule = true;
 //// [aliasAssignments_1.js]
 "use strict";
 var moduleA = require("./aliasAssignments_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 41a2bb06664..0b05a0c3c63 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -35,6 +35,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -56,6 +57,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_main.js]
 "use strict";
 var moduleA = require("./aliasUsage1_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 1f3e1490332..5e864df3d0f 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -29,6 +29,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInArray_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInArray_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInArray_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index a6fc0e97f68..d84253f7992 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -28,6 +28,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index a991207971c..53e702ba227 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInGenericFunction_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInGenericFunction_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index d57b2f6379d..0a53d6605dd 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -34,6 +34,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -55,6 +56,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 15818c82cb9..f9202b02067 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -29,6 +29,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 99360ea648d..a40d3679b63 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInOrExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 47f0c30d28b..de566b4dd53 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index 666e32e1546..dbee5562266 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -28,6 +28,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInVarAssignment_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
 var i;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index 9495f8890b6..5febf4b90e7 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -24,6 +24,7 @@ export var a = function () {
 "use strict";
 function b(a) { return null; }
 exports.b = b;
+exports.__esModule = true;
 //// [aliasUsedAsNameValue_2.js]
 "use strict";
 ///<reference path='aliasUsedAsNameValue_0.ts' />
@@ -34,3 +35,4 @@ exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index 3789410a54b..dceecdd4001 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -18,7 +18,9 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 var b_1 = require("./b");
 exports.x = new b_1["default"].Foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 747f59dc904..69bfedadc49 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -15,3 +15,4 @@ export var x = new Foo();
 "use strict";
 var b_1 = require("./b");
 exports.x = new b_1["default"]();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 1444f351bbd..7ca68d85000 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/tests/baselines/reference/alwaysStrictModule4.js
@@ -7,3 +7,4 @@ export const a = 1
 "use strict";
 // Module commonjs
 exports.a = 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 9a603926169..161e341ba79 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/tests/baselines/reference/alwaysStrictModule6.js
@@ -7,3 +7,4 @@ export const a = 1;
 "use strict";
 // Targeting ES5
 exports.a = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index bdfc0ee0821..0d9a14c0f15 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -20,12 +20,14 @@ x($);
 "use strict";
 var jquery_1 = require("jquery");
 exports.x = jquery_1.x;
+exports.__esModule = true;
 //// [reExportAll.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("jquery"));
+exports.__esModule = true;
 //// [reExportUser.js]
 "use strict";
 var reExportX_1 = require("./reExportX");
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index a0bd7c83d64..781142b4061 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -48,6 +48,7 @@ define(["require", "exports"], function (require, exports) {
         E1[E1["B"] = 1] = "B";
         E1[E1["C"] = 2] = "C";
     })(E1 = exports.E1 || (exports.E1 = {}));
+    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index bb5cd587a83..a3b8b7cd98a 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js
@@ -11,13 +11,13 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     function default_1() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index 754ffdb7c9b..dbfdfd0f420 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
@@ -10,10 +10,10 @@ export default function() {}
 "use strict";
 class default_1 {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 function default_1() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index 85ed1d30444..a8984434c9c 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js
@@ -19,8 +19,8 @@ export default function() {}
     "use strict";
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -34,6 +34,6 @@ export default function() {}
 })(function (require, exports) {
     "use strict";
     function default_1() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index 41edf92416b..672d311a702 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -16,6 +16,7 @@ import { foo } from './foo';
 "use strict";
 function foo() { }
 exports.foo = foo;
+exports.__esModule = true;
 //// [bar.js]
 "use strict";
 var foo_1 = require("./foo");
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 280e8a87916..ceabda58899 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -29,6 +29,7 @@ var Task = (function (_super) {
     return Task;
 }(Promise));
 exports.Task = Task;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index 6c6e34e7b1d..923af2e55cd 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -14,6 +14,7 @@ class Test {
 class Task extends Promise {
 }
 exports.Task = Task;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 65525e8187e..32111846162 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -13,4 +13,5 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1d0f918bf98..1c8c6ec0168 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/tests/baselines/reference/cacheResolutions.js
@@ -14,14 +14,17 @@ export let x = 1;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [lib1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [lib2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index a9cf0925c34..28f43fa7985 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/tests/baselines/reference/circularReferenceInImport.js
@@ -21,6 +21,7 @@ function foo() {
     return new Object();
 }
 exports.foo = foo;
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 8ba50dcee1c..298395a232c 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/tests/baselines/reference/classAbstractManyKeywords.js
@@ -6,7 +6,6 @@ import abstract class D {}
 
 //// [classAbstractManyKeywords.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = abstract;
 var A = (function () {
     function A() {
@@ -30,3 +29,4 @@ var D = (function () {
     }
     return D;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 6fcce5c5982..8a648cc62cd 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -49,6 +49,7 @@ exports.b = {
         a_1.a.f();
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [a.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -79,3 +80,4 @@ exports.a = {
         b_1.b.f();
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index d310ccd53bc..ce46e75bed8 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
@@ -33,3 +33,4 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 161bceca04d..49f5f916cd3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -29,3 +29,4 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index d7785dc73cf..b6d3159b0f9 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) {
     function bar() {
     }
     exports.bar = bar;
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file3333.js]
 define(["require", "exports"], function (require, exports) {
@@ -30,6 +31,7 @@ define(["require", "exports"], function (require, exports) {
     function bar2() {
     }
     exports.bar2 = bar2;
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file2.js]
 define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
@@ -42,4 +44,5 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio
         exports.bar2();
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 7f0a5c82d9a..045e7dcb796 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -109,6 +109,7 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientModule_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index 962df0344ed..ca16128e9cd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.js
@@ -79,6 +79,7 @@ define(["require", "exports"], function (require, exports) {
         }());
         m2.exports = exports;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndClass_globalFile.js]
 var require = (function () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 0fe5405cfb3..7e538d462b2 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js
@@ -53,4 +53,5 @@ define(["require", "exports"], function (require, exports) {
         }
         m2.require = require;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index b29364aebe3..d1ca4d3a75c 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.js
@@ -162,6 +162,7 @@ define(["require", "exports"], function (require, exports) {
             exports.C = C;
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
 var require;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index 6270cf65c02..ba1926dd965 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
@@ -25,4 +25,5 @@ define(["require", "exports"], function (require, exports) {
         return null;
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 0686b932921..9c7a24b176f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.js
@@ -44,6 +44,7 @@ define(["require", "exports"], function (require, exports) {
         m2.exports = 0;
         m2.require = "require";
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndVar_globalFile.js]
 var exports = 0;
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 18f3564ec7f..7b403061199 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -132,6 +132,7 @@ define(["require", "exports", "commentsExternalModules2_0"], function (require,
     exports.newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     exports.newVar2 = new extMod.m4.m2.c();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 85fbcfe019f..68ec3be48bd 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -131,6 +131,7 @@ extMod.m1.fooExport();
 exports.newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
 exports.newVar2 = new extMod.m4.m2.c();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [commentsExternalModules2_0.d.ts]
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 9cfd75c0211..6feff1bd813 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -20,9 +20,11 @@ export {subject1} from './1';
 //// [0.js]
 "use strict";
 exports.subject = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [1.js]
 "use strict";
 exports.subject1 = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 /* blah0 */
@@ -34,3 +36,4 @@ exports.subject = _0_1.subject;
 /* blah1 */
 var _1_1 = require("./1");
 exports.subject1 = _1_1.subject1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index b8cf42ea762..212f5869744 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -23,6 +23,7 @@ var C1 = (function () {
 }());
 C1.s1 = true;
 exports.C1 = C1;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index eb77d1baa3c..76610c2d56d 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -47,6 +47,7 @@ var E1;
     E1[E1["B"] = 1] = "B";
     E1[E1["C"] = 2] = "C";
 })(E1 = exports.E1 || (exports.E1 = {}));
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var i;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index 1e404b26e13..f1ec275cf73 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/tests/baselines/reference/commonSourceDir5.js
@@ -21,13 +21,16 @@ define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require,
     "use strict";
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
+    exports.__esModule = true;
 });
 define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) {
     "use strict";
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
+    exports.__esModule = true;
 });
 define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) {
     "use strict";
     exports.x = foo_2.z + foo_2.z;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index 88f5828a500..d52fde52cf2 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/tests/baselines/reference/commonSourceDir6.js
@@ -20,13 +20,16 @@ define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, expor
     "use strict";
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
+    exports.__esModule = true;
 });
 define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) {
     "use strict";
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
+    exports.__esModule = true;
 });
 define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) {
     "use strict";
     exports.x = foo_2.z + foo_2.z;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index 8aa0bd04e11..e49192dbe2f 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -14,6 +14,7 @@ export const x = y;
 "use strict";
 /// <reference path="../lib/bar.d.ts" />
 exports.x = y;
+exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index 93439a418f6..5af2c56b5ef 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -14,6 +14,7 @@ Foo();
 "use strict";
 function Foo() { }
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var _10_lib_1 = require("./10_lib");
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 0a137f5d793..5c665a52cb3 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/tests/baselines/reference/complexNarrowingWithAny.js
@@ -1025,3 +1025,4 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) {
     return new _View_AppComponent0(viewUtils, parentInjector, declarationEl);
 }
 exports.viewFactory_AppComponent0 = viewFactory_AppComponent0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 1da0cf40fcd..282581fbdb8 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -52,6 +52,7 @@ m.x.toString();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 0;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [constDeclarations_access_2.js]
 define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index 748f63ea858..be61fc2c75a 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -289,3 +289,4 @@ var StyleParser = (function () {
     return StyleParser;
 }());
 exports.StyleParser = StyleParser;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index f7dbc0a2324..d1422112fff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -203,5 +203,5 @@ function md5(string) {
         b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
     }
 }
-exports.__esModule = true;
 exports["default"] = md5;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 549d7948fcb..67eba038d46 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 00f4dbdc377..48fe4dad45f 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) {
         return BuildWorkspaceService;
     }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
+    exports.__esModule = true;
 });