Skip to content

Commit 86784a5

Browse files
committed
Get rid of ES6 completely
1 parent a500fd9 commit 86784a5

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/compiler/commandLineParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ namespace ts {
101101
"amd": ModuleKind.AMD,
102102
"system": ModuleKind.System,
103103
"umd": ModuleKind.UMD,
104-
"es6": ModuleKind.ES6,
104+
"es6": ModuleKind.ES2015,
105105
"es2015": ModuleKind.ES2015,
106106
}),
107107
description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
@@ -261,7 +261,7 @@ namespace ts {
261261
type: createMap({
262262
"es3": ScriptTarget.ES3,
263263
"es5": ScriptTarget.ES5,
264-
"es6": ScriptTarget.ES6,
264+
"es6": ScriptTarget.ES2015,
265265
"es2015": ScriptTarget.ES2015,
266266
"es2016": ScriptTarget.ES2016,
267267
"es2017": ScriptTarget.ES2017,

src/compiler/types.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3019,8 +3019,7 @@ namespace ts {
30193019
AMD = 2,
30203020
UMD = 3,
30213021
System = 4,
3022-
ES6 = 5,
3023-
ES2015 = ES6,
3022+
ES2015 = 5,
30243023
}
30253024

30263025
export const enum JsxEmit {
@@ -3053,8 +3052,7 @@ namespace ts {
30533052
export const enum ScriptTarget {
30543053
ES3 = 0,
30553054
ES5 = 1,
3056-
ES6 = 2,
3057-
ES2015 = ES6,
3055+
ES2015 = 2,
30583056
ES2016 = 3,
30593057
ES2017 = 4,
30603058
Latest = ES2017,

tests/baselines/reference/APISample_linter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function delint(sourceFile: ts.SourceFile) {
5858
const fileNames: string[] = process.argv.slice(2);
5959
fileNames.forEach(fileName => {
6060
// Parse a file
61-
let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
61+
let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES2015, /*setParentNodes */ true);
6262

6363
// delint it
6464
delint(sourceFile);
@@ -113,7 +113,7 @@ exports.delint = delint;
113113
var fileNames = process.argv.slice(2);
114114
fileNames.forEach(function (fileName) {
115115
// Parse a file
116-
var sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
116+
var sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES2015, /*setParentNodes */ true);
117117
// delint it
118118
delint(sourceFile);
119119
});

tests/cases/compiler/APISample_linter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function delint(sourceFile: ts.SourceFile) {
6161
const fileNames: string[] = process.argv.slice(2);
6262
fileNames.forEach(fileName => {
6363
// Parse a file
64-
let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
64+
let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES2015, /*setParentNodes */ true);
6565

6666
// delint it
6767
delint(sourceFile);

0 commit comments

Comments
 (0)