maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14493 from Microsoft/master-fixEmitExtraESModuleMark

Browse source 
[Master] Do not emit ESModule marker if file is not external module
This commit is contained in:
Yui 2017-03-06 14:09:14 -08:00 committed by GitHub
parent f7242f3983 6a2d2608c3
commit 0425175b3a
69 changed files with 11 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/compiler/transformers/module/module.ts
View file

@ -55,9 +55,7 @@ namespace ts {
* @param node The SourceFile node.
*/
function transformSourceFile(node: SourceFile) {
if (isDeclarationFile(node)
|| !(isExternalModule(node)
|| compilerOptions.isolatedModules)) {
if (isDeclarationFile(node) || !(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());
}

1
tests/baselines/reference/importHelpersInIsolatedModules.js
View file

@ -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() {

1
tests/baselines/reference/isolatedModulesPlainFile-AMD.js
View file

@ -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);
});

1
tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
View file

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

1
tests/baselines/reference/isolatedModulesPlainFile-UMD.js
View file

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

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

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

1
tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
View file

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

1
tests/baselines/reference/transpile/Generates module output.js
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1
tests/baselines/reference/transpile/Supports setting allowJs.js
View file

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

1
tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
View file

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

1
tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
View file

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

1
tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
View file

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

1
tests/baselines/reference/transpile/Supports setting alwaysStrict.js
View file

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

1
tests/baselines/reference/transpile/Supports setting baseUrl.js
View file

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

1
tests/baselines/reference/transpile/Supports setting charset.js
View file

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

1
tests/baselines/reference/transpile/Supports setting declaration.js
View file

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

1
tests/baselines/reference/transpile/Supports setting declarationDir.js
View file

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

1
tests/baselines/reference/transpile/Supports setting emitBOM.js
View file

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

1
tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
View file

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

1
tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
View file

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

1
tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
View file

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

1
tests/baselines/reference/transpile/Supports setting isolatedModules.js
View file

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

1
tests/baselines/reference/transpile/Supports setting jsx.js
View file

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

1
tests/baselines/reference/transpile/Supports setting jsxFactory.js
View file

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

1
tests/baselines/reference/transpile/Supports setting lib.js
View file

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

1
tests/baselines/reference/transpile/Supports setting locale.js
View file

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

1
tests/baselines/reference/transpile/Supports setting module.js
View file

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

1
tests/baselines/reference/transpile/Supports setting moduleResolution.js
View file

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

1
tests/baselines/reference/transpile/Supports setting newLine.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noEmit.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noEmitOnError.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noImplicitAny.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noImplicitThis.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noLib.js
View file

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

1
tests/baselines/reference/transpile/Supports setting noResolve.js
View file

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

1
tests/baselines/reference/transpile/Supports setting out.js
View file

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

1
tests/baselines/reference/transpile/Supports setting outDir.js
View file

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

1
tests/baselines/reference/transpile/Supports setting outFile.js
View file

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

1
tests/baselines/reference/transpile/Supports setting paths.js
View file

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

1
tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
View file

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

1
tests/baselines/reference/transpile/Supports setting reactNamespace.js
View file

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

1
tests/baselines/reference/transpile/Supports setting removeComments.js
View file

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

1
tests/baselines/reference/transpile/Supports setting rootDir.js
View file

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

1
tests/baselines/reference/transpile/Supports setting rootDirs.js
View file

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

1
tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
View file

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

1
tests/baselines/reference/transpile/Supports setting skipLibCheck.js
View file

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

1
tests/baselines/reference/transpile/Supports setting strictNullChecks.js
View file

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

1
tests/baselines/reference/transpile/Supports setting stripInternal.js
View file

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

1
tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
View file

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

1
tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
View file

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

1
tests/baselines/reference/transpile/Supports setting typeRoots.js
View file

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

1
tests/baselines/reference/transpile/Supports setting types.js
View file

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

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

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

1
tests/baselines/reference/transpile/Uses correct newLine character.js
View file

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

1
tests/baselines/reference/transpile/transpile .js files.js
View file

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

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

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