Skip to content

Commit dc7d77f

Browse files
sheetalkamatsheetalkamat
committed
Make the tsbuild tests use simple libFile instead of bigger lib file set
1 parent b9145f9 commit dc7d77f

15 files changed

+14
-363
lines changed

‎src/testRunner/unittests/tsbuild/helpers.ts

+6-11
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,26 @@ namespace ts {
6262
}
6363
}
6464

65+
const libContent = `${TestFSWithWatch.libFile.content}
66+
interface ReadonlyArray<T> {}
67+
declare const console: { log(msg: any): void; };`;
68+
6569
export function loadProjectFromDisk(root: string, time?: vfs.FileSystemOptions["time"]): vfs.FileSystem {
6670
const resolver = vfs.createResolver(Harness.IO);
6771
const fs = new vfs.FileSystem(/*ignoreCase*/ true, {
6872
files: {
69-
["/lib"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), "built/local"), resolver),
7073
["/src"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), root), resolver)
7174
},
7275
cwd: "/",
7376
meta: { defaultLibLocation: "/lib" },
7477
time
7578
});
79+
fs.mkdirSync("/lib");
80+
fs.writeFileSync("/lib/lib.d.ts", libContent);
7681
fs.makeReadonly();
7782
return fs;
7883
}
7984

80-
export function getLibs() {
81-
return [
82-
"/lib/lib.d.ts",
83-
"/lib/lib.es5.d.ts",
84-
"/lib/lib.dom.d.ts",
85-
"/lib/lib.webworker.importscripts.d.ts",
86-
"/lib/lib.scripthost.d.ts"
87-
];
88-
}
89-
9085
function generateSourceMapBaselineFiles(fs: vfs.FileSystem, mapFileNames: ReadonlyArray<string>) {
9186
for (const mapFile of mapFileNames) {
9287
if (!fs.existsSync(mapFile)) continue;

‎src/testRunner/unittests/tsbuild/sample.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,14 @@ export class cNew {}`);
399399
const builder = createSolutionBuilder(host, ["/src/tests"], { listFiles: true });
400400
builder.buildAllProjects();
401401
assert.deepEqual(host.traces, [
402-
...getLibs(),
402+
"/lib/lib.d.ts",
403403
"/src/core/anotherModule.ts",
404404
"/src/core/index.ts",
405405
"/src/core/some_decl.d.ts",
406-
...getLibs(),
406+
"/lib/lib.d.ts",
407407
...getCoreOutputs(),
408408
"/src/logic/index.ts",
409-
...getLibs(),
409+
"/lib/lib.d.ts",
410410
...getCoreOutputs(),
411411
"/src/logic/index.d.ts",
412412
"/src/tests/index.ts"

‎src/testRunner/unittests/tsbuild/transitiveReferences.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ namespace ts {
77
"/src/c.js"
88
];
99
const expectedFileTraces = [
10-
...getLibs(),
10+
"/lib/lib.d.ts",
1111
"/src/a.ts",
12-
...getLibs(),
12+
"/lib/lib.d.ts",
1313
"/src/a.d.ts",
1414
"/src/b.ts",
15-
...getLibs(),
15+
"/lib/lib.d.ts",
1616
"/src/a.d.ts",
1717
"/src/b.d.ts",
1818
"/src/refs/a.d.ts",
@@ -63,9 +63,9 @@ export const b = new A();`);
6363
// Error in b build only a
6464
const allExpectedOutputs = ["/src/a.js", "/src/a.d.ts"];
6565
const expectedFileTraces = [
66-
...getLibs(),
66+
"/lib/lib.d.ts",
6767
"/src/a.ts",
68-
...getLibs(),
68+
"/lib/lib.d.ts",
6969
"/src/b.ts"
7070
];
7171
verifyBuild(fs => modifyFsBTsToNonRelativeImport(fs, "node"),

‎tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js

-60
Original file line numberDiff line numberDiff line change
@@ -175,22 +175,6 @@ export class someClass { }
175175
"version": "/lib/lib.d.ts",
176176
"signature": "/lib/lib.d.ts"
177177
},
178-
"/lib/lib.es5.d.ts": {
179-
"version": "/lib/lib.es5.d.ts",
180-
"signature": "/lib/lib.es5.d.ts"
181-
},
182-
"/lib/lib.dom.d.ts": {
183-
"version": "/lib/lib.dom.d.ts",
184-
"signature": "/lib/lib.dom.d.ts"
185-
},
186-
"/lib/lib.webworker.importscripts.d.ts": {
187-
"version": "/lib/lib.webworker.importscripts.d.ts",
188-
"signature": "/lib/lib.webworker.importscripts.d.ts"
189-
},
190-
"/lib/lib.scripthost.d.ts": {
191-
"version": "/lib/lib.scripthost.d.ts",
192-
"signature": "/lib/lib.scripthost.d.ts"
193-
},
194178
"/src/core/anothermodule.ts": {
195179
"version": "-2676574883",
196180
"signature": "25219880154"
@@ -215,10 +199,6 @@ export class someClass { }
215199
"exportedModulesMap": {},
216200
"semanticDiagnosticsPerFile": [
217201
"/lib/lib.d.ts",
218-
"/lib/lib.dom.d.ts",
219-
"/lib/lib.es5.d.ts",
220-
"/lib/lib.scripthost.d.ts",
221-
"/lib/lib.webworker.importscripts.d.ts",
222202
"/src/core/anothermodule.ts",
223203
"/src/core/index.ts",
224204
"/src/core/some_decl.d.ts"
@@ -235,22 +215,6 @@ export class someClass { }
235215
"version": "/lib/lib.d.ts",
236216
"signature": "/lib/lib.d.ts"
237217
},
238-
"/lib/lib.es5.d.ts": {
239-
"version": "/lib/lib.es5.d.ts",
240-
"signature": "/lib/lib.es5.d.ts"
241-
},
242-
"/lib/lib.dom.d.ts": {
243-
"version": "/lib/lib.dom.d.ts",
244-
"signature": "/lib/lib.dom.d.ts"
245-
},
246-
"/lib/lib.webworker.importscripts.d.ts": {
247-
"version": "/lib/lib.webworker.importscripts.d.ts",
248-
"signature": "/lib/lib.webworker.importscripts.d.ts"
249-
},
250-
"/lib/lib.scripthost.d.ts": {
251-
"version": "/lib/lib.scripthost.d.ts",
252-
"signature": "/lib/lib.scripthost.d.ts"
253-
},
254218
"/src/core/index.ts": {
255219
"version": "-2069755619",
256220
"signature": "-2069755619"
@@ -285,10 +249,6 @@ export class someClass { }
285249
},
286250
"semanticDiagnosticsPerFile": [
287251
"/lib/lib.d.ts",
288-
"/lib/lib.dom.d.ts",
289-
"/lib/lib.es5.d.ts",
290-
"/lib/lib.scripthost.d.ts",
291-
"/lib/lib.webworker.importscripts.d.ts",
292252
"/src/core/anothermodule.ts",
293253
"/src/core/index.ts",
294254
"/src/logic/index.ts"
@@ -305,22 +265,6 @@ export class someClass { }
305265
"version": "/lib/lib.d.ts",
306266
"signature": "/lib/lib.d.ts"
307267
},
308-
"/lib/lib.es5.d.ts": {
309-
"version": "/lib/lib.es5.d.ts",
310-
"signature": "/lib/lib.es5.d.ts"
311-
},
312-
"/lib/lib.dom.d.ts": {
313-
"version": "/lib/lib.dom.d.ts",
314-
"signature": "/lib/lib.dom.d.ts"
315-
},
316-
"/lib/lib.webworker.importscripts.d.ts": {
317-
"version": "/lib/lib.webworker.importscripts.d.ts",
318-
"signature": "/lib/lib.webworker.importscripts.d.ts"
319-
},
320-
"/lib/lib.scripthost.d.ts": {
321-
"version": "/lib/lib.scripthost.d.ts",
322-
"signature": "/lib/lib.scripthost.d.ts"
323-
},
324268
"/src/core/index.ts": {
325269
"version": "-2069755619",
326270
"signature": "-2069755619"
@@ -365,10 +309,6 @@ export class someClass { }
365309
},
366310
"semanticDiagnosticsPerFile": [
367311
"/lib/lib.d.ts",
368-
"/lib/lib.dom.d.ts",
369-
"/lib/lib.es5.d.ts",
370-
"/lib/lib.scripthost.d.ts",
371-
"/lib/lib.webworker.importscripts.d.ts",
372312
"/src/core/anothermodule.ts",
373313
"/src/core/index.ts",
374314
"/src/logic/index.ts",

‎tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js

-20
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ export declare function multiply(a: number, b: number): number;
2424
"version": "/lib/lib.d.ts",
2525
"signature": "/lib/lib.d.ts"
2626
},
27-
"/lib/lib.es5.d.ts": {
28-
"version": "/lib/lib.es5.d.ts",
29-
"signature": "/lib/lib.es5.d.ts"
30-
},
31-
"/lib/lib.dom.d.ts": {
32-
"version": "/lib/lib.dom.d.ts",
33-
"signature": "/lib/lib.dom.d.ts"
34-
},
35-
"/lib/lib.webworker.importscripts.d.ts": {
36-
"version": "/lib/lib.webworker.importscripts.d.ts",
37-
"signature": "/lib/lib.webworker.importscripts.d.ts"
38-
},
39-
"/lib/lib.scripthost.d.ts": {
40-
"version": "/lib/lib.scripthost.d.ts",
41-
"signature": "/lib/lib.scripthost.d.ts"
42-
},
4327
"/src/core/anothermodule.ts": {
4428
"version": "-2676574883",
4529
"signature": "-8396256275"
@@ -63,10 +47,6 @@ export declare function multiply(a: number, b: number): number;
6347
"exportedModulesMap": {},
6448
"semanticDiagnosticsPerFile": [
6549
"/lib/lib.d.ts",
66-
"/lib/lib.dom.d.ts",
67-
"/lib/lib.es5.d.ts",
68-
"/lib/lib.scripthost.d.ts",
69-
"/lib/lib.webworker.importscripts.d.ts",
7050
"/src/core/anothermodule.ts",
7151
"/src/core/index.ts",
7252
"/src/core/some_decl.d.ts"

‎tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js

-40
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,6 @@ export declare const m: typeof mod;
2828
"version": "/lib/lib.d.ts",
2929
"signature": "/lib/lib.d.ts"
3030
},
31-
"/lib/lib.es5.d.ts": {
32-
"version": "/lib/lib.es5.d.ts",
33-
"signature": "/lib/lib.es5.d.ts"
34-
},
35-
"/lib/lib.dom.d.ts": {
36-
"version": "/lib/lib.dom.d.ts",
37-
"signature": "/lib/lib.dom.d.ts"
38-
},
39-
"/lib/lib.webworker.importscripts.d.ts": {
40-
"version": "/lib/lib.webworker.importscripts.d.ts",
41-
"signature": "/lib/lib.webworker.importscripts.d.ts"
42-
},
43-
"/lib/lib.scripthost.d.ts": {
44-
"version": "/lib/lib.scripthost.d.ts",
45-
"signature": "/lib/lib.scripthost.d.ts"
46-
},
4731
"/src/core/index.ts": {
4832
"version": "-13851440507",
4933
"signature": "-13851440507"
@@ -79,10 +63,6 @@ export declare const m: typeof mod;
7963
},
8064
"semanticDiagnosticsPerFile": [
8165
"/lib/lib.d.ts",
82-
"/lib/lib.dom.d.ts",
83-
"/lib/lib.es5.d.ts",
84-
"/lib/lib.scripthost.d.ts",
85-
"/lib/lib.webworker.importscripts.d.ts",
8666
"/src/core/anothermodule.ts",
8767
"/src/core/index.ts",
8868
"/src/logic/index.ts"
@@ -99,22 +79,6 @@ export declare const m: typeof mod;
9979
"version": "/lib/lib.d.ts",
10080
"signature": "/lib/lib.d.ts"
10181
},
102-
"/lib/lib.es5.d.ts": {
103-
"version": "/lib/lib.es5.d.ts",
104-
"signature": "/lib/lib.es5.d.ts"
105-
},
106-
"/lib/lib.dom.d.ts": {
107-
"version": "/lib/lib.dom.d.ts",
108-
"signature": "/lib/lib.dom.d.ts"
109-
},
110-
"/lib/lib.webworker.importscripts.d.ts": {
111-
"version": "/lib/lib.webworker.importscripts.d.ts",
112-
"signature": "/lib/lib.webworker.importscripts.d.ts"
113-
},
114-
"/lib/lib.scripthost.d.ts": {
115-
"version": "/lib/lib.scripthost.d.ts",
116-
"signature": "/lib/lib.scripthost.d.ts"
117-
},
11882
"/src/core/index.ts": {
11983
"version": "-13851440507",
12084
"signature": "-13851440507"
@@ -159,10 +123,6 @@ export declare const m: typeof mod;
159123
},
160124
"semanticDiagnosticsPerFile": [
161125
"/lib/lib.d.ts",
162-
"/lib/lib.dom.d.ts",
163-
"/lib/lib.es5.d.ts",
164-
"/lib/lib.scripthost.d.ts",
165-
"/lib/lib.webworker.importscripts.d.ts",
166126
"/src/core/anothermodule.ts",
167127
"/src/core/index.ts",
168128
"/src/logic/index.ts",

‎tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js

-20
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,6 @@ class someClass { }
2828
"version": "/lib/lib.d.ts",
2929
"signature": "/lib/lib.d.ts"
3030
},
31-
"/lib/lib.es5.d.ts": {
32-
"version": "/lib/lib.es5.d.ts",
33-
"signature": "/lib/lib.es5.d.ts"
34-
},
35-
"/lib/lib.dom.d.ts": {
36-
"version": "/lib/lib.dom.d.ts",
37-
"signature": "/lib/lib.dom.d.ts"
38-
},
39-
"/lib/lib.webworker.importscripts.d.ts": {
40-
"version": "/lib/lib.webworker.importscripts.d.ts",
41-
"signature": "/lib/lib.webworker.importscripts.d.ts"
42-
},
43-
"/lib/lib.scripthost.d.ts": {
44-
"version": "/lib/lib.scripthost.d.ts",
45-
"signature": "/lib/lib.scripthost.d.ts"
46-
},
4731
"/src/core/anothermodule.ts": {
4832
"version": "-2676574883",
4933
"signature": "25219880154"
@@ -68,10 +52,6 @@ class someClass { }
6852
"exportedModulesMap": {},
6953
"semanticDiagnosticsPerFile": [
7054
"/lib/lib.d.ts",
71-
"/lib/lib.dom.d.ts",
72-
"/lib/lib.es5.d.ts",
73-
"/lib/lib.scripthost.d.ts",
74-
"/lib/lib.webworker.importscripts.d.ts",
7555
"/src/core/anothermodule.ts",
7656
"/src/core/index.ts",
7757
"/src/core/some_decl.d.ts"

0 commit comments

Comments
 (0)