Skip to content

Commit 7753eae

Browse files
committed
Bump target up to ES2015
1 parent 966e732 commit 7753eae

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

scripts/importDefinitelyTypedTests/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"module": "commonjs",
4-
"target": "ES5",
4+
"target": "ES2015",
55
"outDir": "./",
66
"rootDir": ".",
77
"newLine": "lf",
@@ -15,4 +15,4 @@
1515
],
1616
"exclude": [
1717
]
18-
}
18+
}

src/compiler/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27009,10 +27009,10 @@ namespace ts {
2700927009
case AssignmentDeclarationKind.ExportsProperty:
2701027010
case AssignmentDeclarationKind.Prototype:
2701127011
case AssignmentDeclarationKind.PrototypeProperty:
27012-
let valueDeclaration = binaryExpression.left.symbol?.valueDeclaration;
27013-
// falls through
2701427012
case AssignmentDeclarationKind.ModuleExports:
27015-
valueDeclaration ||= binaryExpression.symbol?.valueDeclaration;
27013+
const valueDeclaration = kind !== AssignmentDeclarationKind.ModuleExports
27014+
? binaryExpression.left.symbol?.valueDeclaration
27015+
: binaryExpression.symbol?.valueDeclaration;
2701627016
const annotated = valueDeclaration && getEffectiveTypeAnnotationNode(valueDeclaration);
2701727017
return annotated ? getTypeFromTypeNode(annotated) : undefined;
2701827018
case AssignmentDeclarationKind.ObjectDefinePropertyValue:

src/instrumenter/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"module": "commonjs",
4-
"target": "es5",
4+
"target": "ES2015",
55
"lib": [
66
"es6",
77
"dom",
@@ -13,4 +13,4 @@
1313
"files": [
1414
"instrumenter.ts"
1515
]
16-
}
16+
}

src/services/services.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,8 @@ namespace ts {
13631363
onUnRecoverableConfigFileDiagnostic: noop,
13641364
};
13651365

1366+
const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
1367+
13661368
// If the program is already up-to-date, we can reuse it
13671369
if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), fileName => compilerHost!.fileExists(fileName), hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
13681370
return;
@@ -1374,7 +1376,6 @@ namespace ts {
13741376
// the program points to old source files that have been invalidated because of
13751377
// incremental parsing.
13761378

1377-
const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
13781379
const options: CreateProgramOptions = {
13791380
rootNames: rootFileNames,
13801381
options: newSettings,

src/tsconfig-base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"pretty": true,
44
"lib": ["es2015.iterable", "es2015.generator", "es5"],
5-
"target": "es5",
5+
"target": "ES2015",
66
"moduleResolution": "node",
77
"rootDir": ".",
88

0 commit comments

Comments
 (0)