Skip to content

Commit 9891b69

Browse files
committed
Unpatch project tests
1 parent 8c07c5b commit 9891b69

File tree

631 files changed

+631
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

631 files changed

+631
-637
lines changed

src/harness/projectsRunner.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,7 @@ namespace project {
219219
.map(output => utils.removeTestPathPrefixes(vpath.isAbsolute(output) ? vpath.relative(cwd, output, ignoreCase) : output));
220220

221221
const content = JSON.stringify(resolutionInfo, undefined, " ");
222-
223-
// TODO(rbuckton): This patches the baseline to replace lib.es5.d.ts with lib.d.ts.
224-
// This is only to make the PR for this change easier to read. A follow-up PR will
225-
// revert this change and accept the new baselines.
226-
// See https://github.com/Microsoft/TypeScript/pull/20763#issuecomment-352553264
227-
const patchedContent = content.replace(/lib\.es5\.d\.ts/g, "lib.d.ts");
228-
Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => patchedContent);
222+
Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => content);
229223
}
230224

231225
public verifyDiagnostics() {

tests/baselines/reference/project/baseline/amd/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.ts",
1212
"emit.ts"
1313
],

tests/baselines/reference/project/baseline/node/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.ts",
1212
"emit.ts"
1313
],

tests/baselines/reference/project/baseline2/amd/baseline2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.ts",
1212
"dont_emit.ts"
1313
],

tests/baselines/reference/project/baseline2/node/baseline2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.ts",
1212
"dont_emit.ts"
1313
],

tests/baselines/reference/project/baseline3/amd/baseline3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"nestedModule.ts"
1212
],
1313
"emittedFiles": [

tests/baselines/reference/project/baseline3/node/baseline3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"baselineCheck": true,
88
"runTest": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"nestedModule.ts"
1212
],
1313
"emittedFiles": [

tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"decl.ts"
66
],
77
"resolvedInputFiles": [
8-
"lib.d.ts",
8+
"lib.es5.d.ts",
99
"decl.ts"
1010
],
1111
"emittedFiles": [

tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"decl.ts"
66
],
77
"resolvedInputFiles": [
8-
"lib.d.ts",
8+
"lib.es5.d.ts",
99
"decl.ts"
1010
],
1111
"emittedFiles": [

tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"consume.ts"
66
],
77
"resolvedInputFiles": [
8-
"lib.d.ts",
8+
"lib.es5.d.ts",
99
"decl.ts",
1010
"consume.ts"
1111
],

tests/baselines/reference/project/circularReferencing/node/circularReferencing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"consume.ts"
66
],
77
"resolvedInputFiles": [
8-
"lib.d.ts",
8+
"lib.es5.d.ts",
99
"decl.ts",
1010
"consume.ts"
1111
],

tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"runTest": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"b.ts",
1111
"c.ts",
1212
"a.ts"

tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"runTest": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"b.ts",
1111
"c.ts",
1212
"a.ts"

tests/baselines/reference/project/declarationDir/amd/declarationDir.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"declarationDir": "declarations",
1111
"baselineCheck": true,
1212
"resolvedInputFiles": [
13-
"lib.d.ts",
13+
"lib.es5.d.ts",
1414
"subfolder/b.ts",
1515
"a.ts",
1616
"subfolder/c.ts"

tests/baselines/reference/project/declarationDir/node/declarationDir.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"declarationDir": "declarations",
1111
"baselineCheck": true,
1212
"resolvedInputFiles": [
13-
"lib.d.ts",
13+
"lib.es5.d.ts",
1414
"subfolder/b.ts",
1515
"a.ts",
1616
"subfolder/c.ts"

tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"declarationDir": "declarations",
1212
"baselineCheck": true,
1313
"resolvedInputFiles": [
14-
"lib.d.ts",
14+
"lib.es5.d.ts",
1515
"subfolder/b.ts",
1616
"a.ts",
1717
"subfolder/c.ts"

tests/baselines/reference/project/declarationDir2/node/declarationDir2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"declarationDir": "declarations",
1212
"baselineCheck": true,
1313
"resolvedInputFiles": [
14-
"lib.d.ts",
14+
"lib.es5.d.ts",
1515
"subfolder/b.ts",
1616
"a.ts",
1717
"subfolder/c.ts"

tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"declarationDir": "declarations",
1212
"baselineCheck": true,
1313
"resolvedInputFiles": [
14-
"lib.d.ts",
14+
"lib.es5.d.ts",
1515
"subfolder/b.ts",
1616
"a.ts",
1717
"subfolder/c.ts"

tests/baselines/reference/project/declarationDir3/node/declarationDir3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"declarationDir": "declarations",
1212
"baselineCheck": true,
1313
"resolvedInputFiles": [
14-
"lib.d.ts",
14+
"lib.es5.d.ts",
1515
"subfolder/b.ts",
1616
"a.ts",
1717
"subfolder/c.ts"

tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"useModule.d.ts"
1313
],
1414
"resolvedInputFiles": [
15-
"lib.d.ts",
15+
"lib.es5.d.ts",
1616
"decl.d.ts",
1717
"useModule.ts"
1818
]

tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"useModule.d.ts"
1313
],
1414
"resolvedInputFiles": [
15-
"lib.d.ts",
15+
"lib.es5.d.ts",
1616
"decl.d.ts",
1717
"useModule.ts"
1818
]

tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"glo_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"glo_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"private_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"private_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"fncOnly_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"fncOnly_m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"baselineCheck": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"m4.ts",
1111
"m5.ts",
1212
"useModule.ts"

tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"baselineCheck": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"m4.ts",
1111
"m5.ts",
1212
"useModule.ts"

tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"m5.ts",
1313
"useModule.ts"

tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"m5.ts",
1313
"useModule.ts"

tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": true,
88
"baselineCheck": true,
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"m4.ts",
1212
"useModule.ts"
1313
],

tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"baselineCheck": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"ref.d.ts",
1111
"consumer.ts"
1212
],

tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"baselineCheck": true,
88
"resolvedInputFiles": [
9-
"lib.d.ts",
9+
"lib.es5.d.ts",
1010
"ref.d.ts",
1111
"consumer.ts"
1212
],

tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"in2.d.ts"
88
],
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.d.ts",
1212
"in1.d.ts",
1313
"in2.d.ts"

tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"in2.d.ts"
88
],
99
"resolvedInputFiles": [
10-
"lib.d.ts",
10+
"lib.es5.d.ts",
1111
"decl.d.ts",
1212
"in1.d.ts",
1313
"in2.d.ts"

tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"baselineCheck": true,
55
"declaration": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
88
"a.ts"
99
],
1010
"emittedFiles": [

tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"baselineCheck": true,
55
"declaration": true,
66
"resolvedInputFiles": [
7-
"lib.d.ts",
7+
"lib.es5.d.ts",
88
"a.ts"
99
],
1010
"emittedFiles": [

0 commit comments

Comments
 (0)