From dc7d77f2c7f6406eeddc207d9ad87534e9d57fec Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Apr 2019 15:08:40 -0700 Subject: [PATCH 1/3] Make the tsbuild tests use simple libFile instead of bigger lib file set --- src/testRunner/unittests/tsbuild/helpers.ts | 17 ++---- src/testRunner/unittests/tsbuild/sample.ts | 6 +- .../unittests/tsbuild/transitiveReferences.ts | 10 ++-- .../incremental-declaration-changes/sample.js | 60 ------------------- .../when-declaration-option-changes.js | 20 ------- ...en-logic-config-changes-declaration-dir.js | 40 ------------- .../sample.js | 20 ------- .../tsbuild/sample1/initial-Build/sample.js | 60 ------------------- .../when-declaration-option-changes.js | 20 ------- ...en-logic-config-changes-declaration-dir.js | 60 ------------------- .../when-logic-specifies-tsBuildInfoFile.js | 60 ------------------- .../tsconfig_withFiles.json | 1 - .../tsconfig_withInclude.json | 1 - .../tsconfig_withIncludeAndFiles.json | 1 - .../tsconfig_withIncludeOfJson.json | 1 - 15 files changed, 14 insertions(+), 363 deletions(-) diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index 538ebd75cdb..6c6510cd7b5 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -62,31 +62,26 @@ namespace ts { } } + const libContent = `${TestFSWithWatch.libFile.content} +interface ReadonlyArray {} +declare const console: { log(msg: any): void; };`; + export function loadProjectFromDisk(root: string, time?: vfs.FileSystemOptions["time"]): vfs.FileSystem { const resolver = vfs.createResolver(Harness.IO); const fs = new vfs.FileSystem(/*ignoreCase*/ true, { files: { - ["/lib"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), "built/local"), resolver), ["/src"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), root), resolver) }, cwd: "/", meta: { defaultLibLocation: "/lib" }, time }); + fs.mkdirSync("/lib"); + fs.writeFileSync("/lib/lib.d.ts", libContent); fs.makeReadonly(); return fs; } - export function getLibs() { - return [ - "/lib/lib.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.webworker.importscripts.d.ts", - "/lib/lib.scripthost.d.ts" - ]; - } - function generateSourceMapBaselineFiles(fs: vfs.FileSystem, mapFileNames: ReadonlyArray) { for (const mapFile of mapFileNames) { if (!fs.existsSync(mapFile)) continue; diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index ab9210451aa..6e31ada9ee5 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -399,14 +399,14 @@ export class cNew {}`); const builder = createSolutionBuilder(host, ["/src/tests"], { listFiles: true }); builder.buildAllProjects(); assert.deepEqual(host.traces, [ - ...getLibs(), + "/lib/lib.d.ts", "/src/core/anotherModule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts", - ...getLibs(), + "/lib/lib.d.ts", ...getCoreOutputs(), "/src/logic/index.ts", - ...getLibs(), + "/lib/lib.d.ts", ...getCoreOutputs(), "/src/logic/index.d.ts", "/src/tests/index.ts" diff --git a/src/testRunner/unittests/tsbuild/transitiveReferences.ts b/src/testRunner/unittests/tsbuild/transitiveReferences.ts index 7944d1fda09..30e28de8cde 100644 --- a/src/testRunner/unittests/tsbuild/transitiveReferences.ts +++ b/src/testRunner/unittests/tsbuild/transitiveReferences.ts @@ -7,12 +7,12 @@ namespace ts { "/src/c.js" ]; const expectedFileTraces = [ - ...getLibs(), + "/lib/lib.d.ts", "/src/a.ts", - ...getLibs(), + "/lib/lib.d.ts", "/src/a.d.ts", "/src/b.ts", - ...getLibs(), + "/lib/lib.d.ts", "/src/a.d.ts", "/src/b.d.ts", "/src/refs/a.d.ts", @@ -63,9 +63,9 @@ export const b = new A();`); // Error in b build only a const allExpectedOutputs = ["/src/a.js", "/src/a.d.ts"]; const expectedFileTraces = [ - ...getLibs(), + "/lib/lib.d.ts", "/src/a.ts", - ...getLibs(), + "/lib/lib.d.ts", "/src/b.ts" ]; verifyBuild(fs => modifyFsBTsToNonRelativeImport(fs, "node"), diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index c1274f3f49f..02f3fe6e91a 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -175,22 +175,6 @@ export class someClass { } "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" @@ -215,10 +199,6 @@ export class someClass { } "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" @@ -235,22 +215,6 @@ export class someClass { } "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-2069755619", "signature": "-2069755619" @@ -285,10 +249,6 @@ export class someClass { } }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts" @@ -305,22 +265,6 @@ export class someClass { } "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-2069755619", "signature": "-2069755619" @@ -365,10 +309,6 @@ export class someClass { } }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts", diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index ad16296e10c..43e463e4d63 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -24,22 +24,6 @@ export declare function multiply(a: number, b: number): number; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" @@ -63,10 +47,6 @@ export declare function multiply(a: number, b: number): number; "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 3412d1c89a2..2189fcd394a 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -28,22 +28,6 @@ export declare const m: typeof mod; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -79,10 +63,6 @@ export declare const m: typeof mod; }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts" @@ -99,22 +79,6 @@ export declare const m: typeof mod; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -159,10 +123,6 @@ export declare const m: typeof mod; }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts", diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index 85fcc62cfc9..cee10f6866b 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -28,22 +28,6 @@ class someClass { } "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" @@ -68,10 +52,6 @@ class someClass { } "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index 21e8c9b820f..2d22389340f 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -188,22 +188,6 @@ exports.multiply = multiply; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" @@ -228,10 +212,6 @@ exports.multiply = multiply; "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" @@ -393,22 +373,6 @@ sourceFile:index.ts "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -443,10 +407,6 @@ sourceFile:index.ts }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts" @@ -479,22 +439,6 @@ exports.m = mod; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -539,10 +483,6 @@ exports.m = mod; }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 341b277de0d..4641a3fd0d8 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -30,22 +30,6 @@ exports.multiply = multiply; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" @@ -68,10 +52,6 @@ exports.multiply = multiply; "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index 21e8c9b820f..2d22389340f 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -188,22 +188,6 @@ exports.multiply = multiply; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" @@ -228,10 +212,6 @@ exports.multiply = multiply; "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" @@ -393,22 +373,6 @@ sourceFile:index.ts "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -443,10 +407,6 @@ sourceFile:index.ts }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts" @@ -479,22 +439,6 @@ exports.m = mod; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -539,10 +483,6 @@ exports.m = mod; }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index 990a019c479..cde5b25ae0e 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -188,22 +188,6 @@ exports.multiply = multiply; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" @@ -228,10 +212,6 @@ exports.multiply = multiply; "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/core/some_decl.d.ts" @@ -393,22 +373,6 @@ sourceFile:index.ts "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -444,10 +408,6 @@ sourceFile:index.ts }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts" @@ -496,22 +456,6 @@ exports.m = mod; "version": "/lib/lib.d.ts", "signature": "/lib/lib.d.ts" }, - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" - }, - "/lib/lib.dom.d.ts": { - "version": "/lib/lib.dom.d.ts", - "signature": "/lib/lib.dom.d.ts" - }, - "/lib/lib.webworker.importscripts.d.ts": { - "version": "/lib/lib.webworker.importscripts.d.ts", - "signature": "/lib/lib.webworker.importscripts.d.ts" - }, - "/lib/lib.scripthost.d.ts": { - "version": "/lib/lib.scripthost.d.ts", - "signature": "/lib/lib.scripthost.d.ts" - }, "/src/core/index.ts": { "version": "-13851440507", "signature": "-13851440507" @@ -556,10 +500,6 @@ exports.m = mod; }, "semanticDiagnosticsPerFile": [ "/lib/lib.d.ts", - "/lib/lib.dom.d.ts", - "/lib/lib.es5.d.ts", - "/lib/lib.scripthost.d.ts", - "/lib/lib.webworker.importscripts.d.ts", "/src/core/anothermodule.ts", "/src/core/index.ts", "/src/logic/index.ts", diff --git a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withFiles.json b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withFiles.json index 71097850dbf..e463caf4879 100644 --- a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withFiles.json +++ b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withFiles.json @@ -1,7 +1,6 @@ { "compilerOptions": { "composite": true, - "target": "esnext", "moduleResolution": "node", "module": "commonjs", "resolveJsonModule": true, diff --git a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withInclude.json b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withInclude.json index 5efdbe28ac4..dde5eec33c4 100644 --- a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withInclude.json +++ b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withInclude.json @@ -1,7 +1,6 @@ { "compilerOptions": { "composite": true, - "target": "esnext", "moduleResolution": "node", "module": "commonjs", "resolveJsonModule": true, diff --git a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeAndFiles.json b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeAndFiles.json index f50c629bac5..82da9b398a7 100644 --- a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeAndFiles.json +++ b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeAndFiles.json @@ -1,7 +1,6 @@ { "compilerOptions": { "composite": true, - "target": "esnext", "moduleResolution": "node", "module": "commonjs", "resolveJsonModule": true, diff --git a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeOfJson.json b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeOfJson.json index 72d960b6fba..47279604fa6 100644 --- a/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeOfJson.json +++ b/tests/projects/resolveJsonModuleAndComposite/tsconfig_withIncludeOfJson.json @@ -1,7 +1,6 @@ { "compilerOptions": { "composite": true, - "target": "esnext", "moduleResolution": "node", "module": "commonjs", "resolveJsonModule": true, From acbedade4249934c6061a716625920ec97dc10d9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Apr 2019 15:36:47 -0700 Subject: [PATCH 2/3] No need to fix hash of lib files since the content is now fixed --- src/harness/fakes.ts | 22 ------------------- .../incremental-declaration-changes/sample.js | 12 +++++----- .../when-declaration-option-changes.js | 4 ++-- ...en-logic-config-changes-declaration-dir.js | 8 +++---- .../sample.js | 4 ++-- .../tsbuild/sample1/initial-Build/sample.js | 12 +++++----- .../when-declaration-option-changes.js | 4 ++-- ...en-logic-config-changes-declaration-dir.js | 12 +++++----- .../when-logic-specifies-tsBuildInfoFile.js | 12 +++++----- 9 files changed, 34 insertions(+), 56 deletions(-) diff --git a/src/harness/fakes.ts b/src/harness/fakes.ts index dcc125698c8..489a41dd677 100644 --- a/src/harness/fakes.ts +++ b/src/harness/fakes.ts @@ -397,19 +397,6 @@ namespace fakes { const value = super.readFile(path); if (!value || !ts.isBuildInfoFile(path)) return value; const buildInfo = ts.getBuildInfo(value); - if (buildInfo.program) { - // Fix lib signatures - for (const path of ts.getOwnKeys(buildInfo.program.fileInfos)) { - if (ts.startsWith(path, "/lib/")) { - const currentValue = buildInfo.program.fileInfos[path]; - ts.Debug.assert(currentValue.signature === path); - ts.Debug.assert(currentValue.signature === currentValue.version); - const text = super.readFile(path)!; - const signature = ts.generateDjb2Hash(text); - buildInfo.program.fileInfos[path] = { version: signature, signature }; - } - } - } ts.Debug.assert(buildInfo.version === version); buildInfo.version = ts.version; return ts.getBuildInfoText(buildInfo); @@ -419,15 +406,6 @@ namespace fakes { if (!ts.isBuildInfoFile(fileName)) return super.writeFile(fileName, content, writeByteOrderMark); const buildInfo = ts.getBuildInfo(content); if (buildInfo.program) { - // Fix lib signatures - for (const path of ts.getOwnKeys(buildInfo.program.fileInfos)) { - if (ts.startsWith(path, "/lib/")) { - const currentValue = buildInfo.program.fileInfos[path]; - ts.Debug.assert(currentValue.signature === currentValue.version); - buildInfo.program.fileInfos[path] = { version: path, signature: path }; - } - } - // reference Map if (buildInfo.program.referencedMap) { const referencedMap: ts.MapLike = {}; diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index 02f3fe6e91a..a698d6c34cf 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -172,8 +172,8 @@ export class someClass { } "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", @@ -212,8 +212,8 @@ export class someClass { } "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-2069755619", @@ -262,8 +262,8 @@ export class someClass { } "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-2069755619", diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 43e463e4d63..69c7b20d506 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -21,8 +21,8 @@ export declare function multiply(a: number, b: number): number; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 2189fcd394a..53f222a4bf5 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -25,8 +25,8 @@ export declare const m: typeof mod; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", @@ -76,8 +76,8 @@ export declare const m: typeof mod; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index cee10f6866b..aae81ea9fdc 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -25,8 +25,8 @@ class someClass { } "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index 2d22389340f..ef63741766a 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -185,8 +185,8 @@ exports.multiply = multiply; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", @@ -370,8 +370,8 @@ sourceFile:index.ts "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", @@ -436,8 +436,8 @@ exports.m = mod; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 4641a3fd0d8..90f10c0a25c 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -27,8 +27,8 @@ exports.multiply = multiply; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index 2d22389340f..ef63741766a 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -185,8 +185,8 @@ exports.multiply = multiply; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", @@ -370,8 +370,8 @@ sourceFile:index.ts "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", @@ -436,8 +436,8 @@ exports.m = mod; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index cde5b25ae0e..b3b74cb388c 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -185,8 +185,8 @@ exports.multiply = multiply; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/anothermodule.ts": { "version": "-2676574883", @@ -370,8 +370,8 @@ sourceFile:index.ts "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", @@ -453,8 +453,8 @@ exports.m = mod; "program": { "fileInfos": { "/lib/lib.d.ts": { - "version": "/lib/lib.d.ts", - "signature": "/lib/lib.d.ts" + "version": "-15964756381", + "signature": "-15964756381" }, "/src/core/index.ts": { "version": "-13851440507", From 83941c46553ec0ce7102d5e4507dde412377335a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Apr 2019 16:19:34 -0700 Subject: [PATCH 3/3] Fix lateBoundSymbol test case to handle the simple lib file for the test --- ...s-merged-and-contains-late-bound-member.js | 64 +++---------------- ...s-merged-and-contains-late-bound-member.js | 64 +++---------------- .../projects/lateBoundSymbol/src/globals.d.ts | 4 ++ tests/projects/lateBoundSymbol/tsconfig.json | 3 - 4 files changed, 20 insertions(+), 115 deletions(-) create mode 100644 tests/projects/lateBoundSymbol/src/globals.d.ts diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index 89748694bbc..b0549b1a8fb 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -21,49 +21,13 @@ type A = HKT[typeof sym]; { "program": { "fileInfos": { - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" + "/lib/lib.d.ts": { + "version": "-15964756381", + "signature": "-15964756381" }, - "/lib/lib.es2015.d.ts": { - "version": "/lib/lib.es2015.d.ts", - "signature": "/lib/lib.es2015.d.ts" - }, - "/lib/lib.es2015.core.d.ts": { - "version": "/lib/lib.es2015.core.d.ts", - "signature": "/lib/lib.es2015.core.d.ts" - }, - "/lib/lib.es2015.collection.d.ts": { - "version": "/lib/lib.es2015.collection.d.ts", - "signature": "/lib/lib.es2015.collection.d.ts" - }, - "/lib/lib.es2015.generator.d.ts": { - "version": "/lib/lib.es2015.generator.d.ts", - "signature": "/lib/lib.es2015.generator.d.ts" - }, - "/lib/lib.es2015.iterable.d.ts": { - "version": "/lib/lib.es2015.iterable.d.ts", - "signature": "/lib/lib.es2015.iterable.d.ts" - }, - "/lib/lib.es2015.promise.d.ts": { - "version": "/lib/lib.es2015.promise.d.ts", - "signature": "/lib/lib.es2015.promise.d.ts" - }, - "/lib/lib.es2015.proxy.d.ts": { - "version": "/lib/lib.es2015.proxy.d.ts", - "signature": "/lib/lib.es2015.proxy.d.ts" - }, - "/lib/lib.es2015.reflect.d.ts": { - "version": "/lib/lib.es2015.reflect.d.ts", - "signature": "/lib/lib.es2015.reflect.d.ts" - }, - "/lib/lib.es2015.symbol.d.ts": { - "version": "/lib/lib.es2015.symbol.d.ts", - "signature": "/lib/lib.es2015.symbol.d.ts" - }, - "/lib/lib.es2015.symbol.wellknown.d.ts": { - "version": "/lib/lib.es2015.symbol.wellknown.d.ts", - "signature": "/lib/lib.es2015.symbol.wellknown.d.ts" + "/src/src/globals.d.ts": { + "version": "-1994196675", + "signature": "-1994196675" }, "/src/src/hkt.ts": { "version": "675797797", @@ -76,9 +40,6 @@ type A = HKT[typeof sym]; }, "options": { "rootDir": "/src/src", - "lib": [ - "lib.es2015.d.ts" - ], "incremental": true, "configFilePath": "/src/tsconfig.json" }, @@ -93,17 +54,8 @@ type A = HKT[typeof sym]; ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.es2015.collection.d.ts", - "/lib/lib.es2015.core.d.ts", - "/lib/lib.es2015.d.ts", - "/lib/lib.es2015.generator.d.ts", - "/lib/lib.es2015.iterable.d.ts", - "/lib/lib.es2015.promise.d.ts", - "/lib/lib.es2015.proxy.d.ts", - "/lib/lib.es2015.reflect.d.ts", - "/lib/lib.es2015.symbol.d.ts", - "/lib/lib.es2015.symbol.wellknown.d.ts", - "/lib/lib.es5.d.ts", + "/lib/lib.d.ts", + "/src/src/globals.d.ts", "/src/src/hkt.ts", "/src/src/main.ts" ] diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index e30b62fcca8..a48d6df88e4 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -14,49 +14,13 @@ var x = 10; { "program": { "fileInfos": { - "/lib/lib.es5.d.ts": { - "version": "/lib/lib.es5.d.ts", - "signature": "/lib/lib.es5.d.ts" + "/lib/lib.d.ts": { + "version": "-15964756381", + "signature": "-15964756381" }, - "/lib/lib.es2015.d.ts": { - "version": "/lib/lib.es2015.d.ts", - "signature": "/lib/lib.es2015.d.ts" - }, - "/lib/lib.es2015.core.d.ts": { - "version": "/lib/lib.es2015.core.d.ts", - "signature": "/lib/lib.es2015.core.d.ts" - }, - "/lib/lib.es2015.collection.d.ts": { - "version": "/lib/lib.es2015.collection.d.ts", - "signature": "/lib/lib.es2015.collection.d.ts" - }, - "/lib/lib.es2015.generator.d.ts": { - "version": "/lib/lib.es2015.generator.d.ts", - "signature": "/lib/lib.es2015.generator.d.ts" - }, - "/lib/lib.es2015.iterable.d.ts": { - "version": "/lib/lib.es2015.iterable.d.ts", - "signature": "/lib/lib.es2015.iterable.d.ts" - }, - "/lib/lib.es2015.promise.d.ts": { - "version": "/lib/lib.es2015.promise.d.ts", - "signature": "/lib/lib.es2015.promise.d.ts" - }, - "/lib/lib.es2015.proxy.d.ts": { - "version": "/lib/lib.es2015.proxy.d.ts", - "signature": "/lib/lib.es2015.proxy.d.ts" - }, - "/lib/lib.es2015.reflect.d.ts": { - "version": "/lib/lib.es2015.reflect.d.ts", - "signature": "/lib/lib.es2015.reflect.d.ts" - }, - "/lib/lib.es2015.symbol.d.ts": { - "version": "/lib/lib.es2015.symbol.d.ts", - "signature": "/lib/lib.es2015.symbol.d.ts" - }, - "/lib/lib.es2015.symbol.wellknown.d.ts": { - "version": "/lib/lib.es2015.symbol.wellknown.d.ts", - "signature": "/lib/lib.es2015.symbol.wellknown.d.ts" + "/src/src/globals.d.ts": { + "version": "-1994196675", + "signature": "-1994196675" }, "/src/src/hkt.ts": { "version": "675797797", @@ -69,9 +33,6 @@ var x = 10; }, "options": { "rootDir": "/src/src", - "lib": [ - "lib.es2015.d.ts" - ], "incremental": true, "configFilePath": "/src/tsconfig.json" }, @@ -86,17 +47,8 @@ var x = 10; ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.es2015.collection.d.ts", - "/lib/lib.es2015.core.d.ts", - "/lib/lib.es2015.d.ts", - "/lib/lib.es2015.generator.d.ts", - "/lib/lib.es2015.iterable.d.ts", - "/lib/lib.es2015.promise.d.ts", - "/lib/lib.es2015.proxy.d.ts", - "/lib/lib.es2015.reflect.d.ts", - "/lib/lib.es2015.symbol.d.ts", - "/lib/lib.es2015.symbol.wellknown.d.ts", - "/lib/lib.es5.d.ts", + "/lib/lib.d.ts", + "/src/src/globals.d.ts", "/src/src/hkt.ts", "/src/src/main.ts" ] diff --git a/tests/projects/lateBoundSymbol/src/globals.d.ts b/tests/projects/lateBoundSymbol/src/globals.d.ts new file mode 100644 index 00000000000..8100e5859af --- /dev/null +++ b/tests/projects/lateBoundSymbol/src/globals.d.ts @@ -0,0 +1,4 @@ +interface SymbolConstructor { + (description?: string | number): symbol; +} +declare var Symbol: SymbolConstructor; \ No newline at end of file diff --git a/tests/projects/lateBoundSymbol/tsconfig.json b/tests/projects/lateBoundSymbol/tsconfig.json index 78bf9e23f00..6146e91d1f3 100644 --- a/tests/projects/lateBoundSymbol/tsconfig.json +++ b/tests/projects/lateBoundSymbol/tsconfig.json @@ -1,9 +1,6 @@ { "compilerOptions": { "rootDir": "src", - "lib": [ - "es2015" - ], "incremental": true } } \ No newline at end of file