Unpatch project tests

Author: rbuckton

src/harness/projectsRunner.ts

@@ -219,13 +219,7 @@ namespace project {
                 .map(output => utils.removeTestPathPrefixes(vpath.isAbsolute(output) ? vpath.relative(cwd, output, ignoreCase) : output));
 
             const content = JSON.stringify(resolutionInfo, undefined, "    ");
-
-            // TODO(rbuckton): This patches the baseline to replace lib.es5.d.ts with lib.d.ts.
-            // This is only to make the PR for this change easier to read. A follow-up PR will
-            // revert this change and accept the new baselines.
-            // See https://github.com/Microsoft/TypeScript/pull/20763#issuecomment-352553264
-            const patchedContent = content.replace(/lib\.es5\.d\.ts/g, "lib.d.ts");
-            Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => patchedContent);
+            Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => content);
         }
 
         public verifyDiagnostics() {

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "emit.ts"
     ],

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "emit.ts"
     ],

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "dont_emit.ts"
     ],

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "dont_emit.ts"
     ],

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "nestedModule.ts"
     ],
     "emittedFiles": [

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

@@ -7,7 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "nestedModule.ts"
     ],
     "emittedFiles": [

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

@@ -5,7 +5,7 @@
         "decl.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts"
     ],
     "emittedFiles": [

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

@@ -5,7 +5,7 @@
         "decl.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts"
     ],
     "emittedFiles": [

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

@@ -5,7 +5,7 @@
         "consume.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "consume.ts"
     ],

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

@@ -5,7 +5,7 @@
         "consume.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.ts",
         "consume.ts"
     ],

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

@@ -6,7 +6,7 @@
     ],
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "b.ts",
         "c.ts",
         "a.ts"

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

@@ -6,7 +6,7 @@
     ],
     "runTest": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "b.ts",
         "c.ts",
         "a.ts"

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

@@ -10,7 +10,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -10,7 +10,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -11,7 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -11,7 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -11,7 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -11,7 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",
         "subfolder/c.ts"

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -12,7 +12,7 @@
         "useModule.d.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.d.ts",
         "useModule.ts"
     ]

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

@@ -12,7 +12,7 @@
         "useModule.d.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.d.ts",
         "useModule.ts"
     ]

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "glo_m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "glo_m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "private_m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "private_m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "fncOnly_m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "fncOnly_m4.ts",
         "useModule.ts"
     ],

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

@@ -6,7 +6,7 @@
     ],
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "m5.ts",
         "useModule.ts"

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

@@ -6,7 +6,7 @@
     ],
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "m5.ts",
         "useModule.ts"

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "m5.ts",
         "useModule.ts"

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "m5.ts",
         "useModule.ts"

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -7,7 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"
     ],

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

@@ -6,7 +6,7 @@
     ],
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "ref.d.ts",
         "consumer.ts"
     ],

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

@@ -6,7 +6,7 @@
     ],
     "baselineCheck": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "ref.d.ts",
         "consumer.ts"
     ],

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

@@ -7,7 +7,7 @@
         "in2.d.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.d.ts",
         "in1.d.ts",
         "in2.d.ts"

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

@@ -7,7 +7,7 @@
         "in2.d.ts"
     ],
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "decl.d.ts",
         "in1.d.ts",
         "in2.d.ts"

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

@@ -4,7 +4,7 @@
     "baselineCheck": true,
     "declaration": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "a.ts"
     ],
     "emittedFiles": [

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

@@ -4,7 +4,7 @@
     "baselineCheck": true,
     "declaration": true,
     "resolvedInputFiles": [
-        "lib.d.ts",
+        "lib.es5.d.ts",
         "a.ts"
     ],
     "emittedFiles": [