Merge pull request #14493 from Microsoft/master-fixEmitExtraESModuleMark

[Master] Do not emit ESModule marker if file is not external module

src/compiler/transformers/module/module.ts

@@ -55,9 +55,7 @@ namespace ts {
          * @param node The SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)
+            if (isDeclarationFile(node) || !(isExternalModule(node) || compilerOptions.isolatedModules)) {
-                || !(isExternalModule(node)
-                    || compilerOptions.isolatedModules)) {
                 return node;
             }
 
@@ -74,6 +72,14 @@ namespace ts {
             return aggregateTransformFlags(updated);
         }
 
+
+        function shouldEmitUnderscoreUnderscoreESModule() {
+            if (!currentModuleInfo.exportEquals && isExternalModule(currentSourceFile)) {
+                return true;
+            }
+            return false;
+        }
+
         /**
          * Transforms a SourceFile into a CommonJS module.
          *
@@ -85,7 +91,7 @@ namespace ts {
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
-            if (!currentModuleInfo.exportEquals) {
+            if (shouldEmitUnderscoreUnderscoreESModule()) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
@@ -378,7 +384,7 @@ namespace ts {
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
-            if (!currentModuleInfo.exportEquals) {
+            if (shouldEmitUnderscoreUnderscoreESModule()) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 

tests/baselines/reference/importHelpersInIsolatedModules.js

@@ -69,7 +69,6 @@ C = tslib_1.__decorate([
 ], C);
 //// [script.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {

tests/baselines/reference/isolatedModulesPlainFile-AMD.js

@@ -7,6 +7,5 @@ run(1);
 //// [isolatedModulesPlainFile-AMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     run(1);
 });

tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js

@@ -6,5 +6,4 @@ run(1);
 
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 run(1);

tests/baselines/reference/isolatedModulesPlainFile-UMD.js

@@ -15,6 +15,5 @@ run(1);
     }
 })(function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     run(1);
 });

tests/baselines/reference/transpile/Does not generate semantic diagnostics.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js

@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 a;
 b;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Generates module output.js

@@ -1,6 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.__esModule = true;
     var x = 0;
 });
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js

@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 /// <reference path="file2.ts" />
 var x = 0;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/No extra errors for file without extension.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js

@@ -1,3 +1,2 @@
 "use strict";
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js

@@ -1,3 +1,2 @@
 "use strict";
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Support options with lib values.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Support options with types values.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports backslashes in file name.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x;
 //# sourceMappingURL=b.js.map

tests/baselines/reference/transpile/Supports setting allowJs.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting alwaysStrict.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting baseUrl.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting charset.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting declaration.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting declarationDir.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting emitBOM.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting experimentalDecorators.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting isolatedModules.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting jsx.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting jsxFactory.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting lib.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting locale.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting module.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting moduleResolution.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting newLine.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noEmit.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noEmitHelpers.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noEmitOnError.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noErrorTruncation.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noImplicitAny.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noImplicitReturns.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noImplicitThis.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js

@@ -1,3 +1,2 @@
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noLib.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting noResolve.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting out.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting outDir.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting outFile.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting paths.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting preserveConstEnums.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting reactNamespace.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting removeComments.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting rootDir.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting rootDirs.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting skipLibCheck.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting strictNullChecks.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting stripInternal.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting typeRoots.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports setting types.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/Supports urls in file name.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/Uses correct newLine character.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map

tests/baselines/reference/transpile/transpile .js files.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map

tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js

@@ -1,4 +1,3 @@
 "use strict";
-exports.__esModule = true;
 var x = React.createElement("div", null);
 //# sourceMappingURL=file.js.map