diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index 90603ae3652..ccbbc89465d 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -24,7 +24,7 @@ sourceFile:index.ts
 4 >         ^^^
 5 >            ^
 6 >             ^
-7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^->
 1 >
   >export const 
 2 >
@@ -39,4 +39,5 @@ sourceFile:index.ts
 5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
 6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
 ---
+>>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index a4ddc8c050b..26e68d04f1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -333,13 +333,14 @@ sourceFile:Element.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index c7867fc54e0..68f39e67ddd 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -75,6 +75,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
@@ -84,4 +85,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index f1ebaf49870..b1b8db46eaa 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -69,6 +69,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render() {
@@ -78,4 +79,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 98517620c73..c075bc5e839 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -333,13 +333,14 @@ sourceFile:Element.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 2616efcf63b..0e8d7ec51f3 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -75,6 +75,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
@@ -84,4 +85,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index a95ca740a61..fa822fc1825 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index a8a11fcadc0..c2d000629a5 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -68,6 +68,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
 1->Emitted(18, 5) Source(2, 14) + SourceIndex(0)
@@ -77,29 +78,30 @@ sourceFile:tests/cases/compiler/ref/a.ts
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
 >>>    var B = (function (_super) {
-1 >^^^^
+1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >import {A} from "./ref/a";
+1->import {A} from "./ref/a";
   >
-1 >Emitted(22, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(23, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(23, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(23, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(24, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(24, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(25, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -108,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(26, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(26, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(27, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(27, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(28, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -133,20 +135,22 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(28, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(28, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(28, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(28, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(28, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(28, 15) Source(2, 29) + SourceIndex(1)
+1 >Emitted(29, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(29, 6) Source(2, 29) + SourceIndex(1)
+3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(29, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(29, 12) Source(2, 25) + SourceIndex(1)
+6 >Emitted(29, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(29, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(29, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(30, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(30, 19) Source(2, 15) + SourceIndex(1)
 ---
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index e91088c249c..a55c177680d 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index f2076c34482..5f71c12c2a3 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -142,6 +142,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
 1->Emitted(25, 5) Source(3, 14) + SourceIndex(1)
@@ -151,29 +152,30 @@ sourceFile:tests/cases/compiler/ref/a.ts
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
 >>>    var B = (function (_super) {
-1 >^^^^
+1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >import {A} from "./ref/a";
+1->import {A} from "./ref/a";
   >
-1 >Emitted(29, 5) Source(2, 1) + SourceIndex(2)
+1->Emitted(30, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(30, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(30, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(31, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(31, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(31, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(32, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -182,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(33, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(33, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(34, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(34, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(35, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -207,20 +209,22 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(35, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(35, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(35, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(35, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(35, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(35, 15) Source(2, 29) + SourceIndex(2)
+1 >Emitted(36, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(36, 6) Source(2, 29) + SourceIndex(2)
+3 >Emitted(36, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(36, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(36, 12) Source(2, 25) + SourceIndex(2)
+6 >Emitted(36, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(36, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(36, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(37, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(37, 19) Source(2, 15) + SourceIndex(2)
 ---
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index 15e68b22c90..235557adfba 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -228,7 +228,7 @@ sourceFile:sourceMapValidationImport.ts
 6 >            ^^^^^^^^^
 7 >                     ^^
 8 >                       ^
-9 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+9 >                        ^^^->
 1->
   >
 2 >var 
@@ -247,4 +247,5 @@ sourceFile:sourceMapValidationImport.ts
 7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0)
 8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0)
 ---
+>>>exports.__esModule = true;
 >>>//# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file