Skip to content

Commit 1aa6992

Browse files
committed
Makes transforms the default
1 parent 018a0d1 commit 1aa6992

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

Jakefile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
309309
options += " --stripInternal"
310310
}
311311

312-
if (useBuiltCompiler && Boolean(process.env.USE_TRANSFORMS)) {
313-
console.warn("\u001b[93mwarning: Found 'USE_TRANSFORMS' environment variable. Experimental transforms will be enabled by default.\u001b[0m");
312+
if (useBuiltCompiler && !/^(no?|f(alse)?|0|-)$/i.test(process.env.USE_TRANSFORMS)) {
313+
console.warn("\u001b[93mwarning: 'USE_TRANSFORMS' environment variable is not set to 'false'. Experimental transforms will be enabled by default.\u001b[0m");
314314
}
315315

316316
var cmd = host + " " + compilerPath + " " + options + " ";

src/compiler/commandLineParser.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,10 @@ namespace ts {
333333
description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
334334
},
335335
{
336-
// this option will be removed when this is merged with master and exists solely
337-
// to enable the tree transforming emitter side-by-side with the existing emitter.
338-
name: "experimentalTransforms",
336+
name: "useLegacyEmitter",
339337
type: "boolean",
340-
experimental: true
338+
experimental: true,
339+
description: Diagnostics.Use_the_legacy_emitter_instead_of_the_transforming_emitter
341340
}
342341
];
343342

src/compiler/core.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,11 +1105,11 @@ namespace ts {
11051105
return currentAssertionLevel;
11061106
}
11071107

1108-
const developmentMode = sys && /^development$/i.test(sys.getEnvironmentVariable("NODE_ENV"));
1109-
if (developmentMode === undefined) {
1108+
if (sys === undefined) {
11101109
return AssertionLevel.None;
11111110
}
11121111

1112+
const developmentMode = /^development$/i.test(getEnvironmentVariable("NODE_ENV"));
11131113
currentAssertionLevel = developmentMode
11141114
? AssertionLevel.Normal
11151115
: AssertionLevel.None;

src/compiler/diagnosticMessages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,6 +2604,10 @@
26042604
"category": "Message",
26052605
"code": 6112
26062606
},
2607+
"Use the legacy emitter instead of the transforming emitter.": {
2608+
"category": "Message",
2609+
"code": 6113
2610+
},
26072611
"Variable '{0}' implicitly has an '{1}' type.": {
26082612
"category": "Error",
26092613
"code": 7005

src/compiler/program.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ namespace ts {
645645
readFile: fileName => sys.readFile(fileName),
646646
trace: (s: string) => sys.write(s + newLine),
647647
directoryExists: directoryName => sys.directoryExists(directoryName),
648-
getEnvironmentVariable: sys.getEnvironmentVariable
648+
getEnvironmentVariable: name => getEnvironmentVariable(name, /*host*/ undefined)
649649
};
650650
}
651651

@@ -996,11 +996,12 @@ namespace ts {
996996
const start = new Date().getTime();
997997

998998
// TODO(rbuckton): remove USE_TRANSFORMS condition when we switch to transforms permanently.
999-
if (/^(y(es)?|t(rue|ransforms?)?|1|\+)$/i.test(getEnvironmentVariable("USE_TRANSFORMS", host))) {
1000-
options.experimentalTransforms = true;
999+
let useLegacyEmitter = options.useLegacyEmitter;
1000+
if (/^(no?|f(alse)?|0|-)$/i.test(getEnvironmentVariable("USE_TRANSFORMS", host))) {
1001+
useLegacyEmitter = true;
10011002
}
10021003

1003-
const fileEmitter = options.experimentalTransforms ? printFiles : emitFiles;
1004+
const fileEmitter = useLegacyEmitter ? emitFiles : printFiles;
10041005
const emitResult = fileEmitter(
10051006
emitResolver,
10061007
getEmitHost(writeFileCallback),

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2498,7 +2498,7 @@ namespace ts {
24982498
noImplicitUseStrict?: boolean;
24992499
lib?: string[];
25002500
/* @internal */ stripInternal?: boolean;
2501-
/* @internal */ experimentalTransforms?: boolean;
2501+
/* @internal */ useLegacyEmitter?: boolean;
25022502

25032503
// Skip checking lib.d.ts to help speed up tests.
25042504
/* @internal */ skipDefaultLibCheck?: boolean;

0 commit comments

Comments
 (0)