Skip to content

Commit 6260577

Browse files
sheetalkamatsheetalkamat
committed
Dont store isExternalLibraryImport in the buildInfo
1 parent e39ce80 commit 6260577

Some content is hidden

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

41 files changed

+2724
-4977
lines changed

‎src/compiler/builder.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import {
8282
PackageJsonInfoContents,
8383
PackageJsonScope,
8484
Path,
85+
pathContainsNodeModules,
8586
PerDirectoryAndNonRelativeNameCache,
8687
PerNonRelativeNameCache,
8788
Program,
@@ -954,10 +955,10 @@ export type ProgramMultiFileEmitBuildInfoFileInfo = string | ProgramMultiFileEmi
954955
/** @internal */
955956
export interface ProgramBuildInfoResolutionBase {
956957
readonly resolvedFileName: ProgramBuildInfoAbsoluteFileId;
957-
readonly isExternalLibraryImport: true | undefined;
958958
readonly originalPath: ProgramBuildInfoAbsoluteFileId | undefined;
959959
readonly primary: true | undefined;
960960
extension: undefined;
961+
isExternalLibraryImport: undefined;
961962
}
962963
/** @internal */
963964
export type ProgramBuildInfoResolvedModuleFull = Omit<ResolvedModuleFull, "resolvedFileName" | "isExternalLibraryImport" | "originalPath" | "extension"> & ProgramBuildInfoResolutionBase;
@@ -1460,7 +1461,7 @@ function getBuildInfo(state: BuilderProgramState, host: BuilderProgramHost, bund
14601461
return resolved ? {
14611462
...resolved,
14621463
resolvedFileName: toAbsoluteFileId(resolved.resolvedFileName!),
1463-
isExternalLibraryImport: resolved.isExternalLibraryImport ? true : undefined,
1464+
isExternalLibraryImport: undefined,
14641465
originalPath: resolved.originalPath ? toAbsoluteFileId(resolved.originalPath) : undefined,
14651466
primary: (resolved as ResolvedTypeReferenceDirective).primary || undefined,
14661467
extension: undefined,
@@ -2446,10 +2447,12 @@ export function createOldBuildInfoProgram(
24462447
extension: Extension,
24472448
): (ResolvedModuleFull & ResolvedTypeReferenceDirective) | undefined {
24482449
if (!resolved) return undefined;
2450+
const originalPath = resolved.originalPath ? resuableCacheResolutions!.getProgramBuildInfoFilePathDecoder().toFileAbsolutePath(resolved.originalPath) : undefined;
24492451
return {
24502452
...resolved,
24512453
resolvedFileName,
2452-
originalPath: resolved.originalPath ? resuableCacheResolutions!.getProgramBuildInfoFilePathDecoder().toFileAbsolutePath(resolved.originalPath) : undefined,
2454+
originalPath,
2455+
isExternalLibraryImport: pathContainsNodeModules(originalPath || resolvedFileName),
24532456
extension,
24542457
};
24552458
}

‎tests/baselines/reference/tsbuild/cacheResolutions/bundle-emit.js

Lines changed: 48 additions & 78 deletions
Large diffs are not rendered by default.

‎tests/baselines/reference/tsbuild/cacheResolutions/multi-file-discrepancies.js

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ CleanBuild:
101101
"original": {
102102
"resolvedModule": {
103103
"resolvedFileName": 2,
104-
"isExternalLibraryImport": true,
105104
"packageId": {
106105
"name": "pkg0",
107106
"subModuleName": "import.d.ts",
@@ -115,7 +114,6 @@ CleanBuild:
115114
"resolutionId": 1,
116115
"resolvedModule": {
117116
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
118-
"isExternalLibraryImport": true,
119117
"packageId": {
120118
"name": "pkg0",
121119
"subModuleName": "import.d.ts",
@@ -134,8 +132,7 @@ CleanBuild:
134132
"name": "pkg2",
135133
"subModuleName": "import.d.ts",
136134
"version": "0.0.1"
137-
},
138-
"isExternalLibraryImport": true
135+
}
139136
},
140137
"affectingLocations": [
141138
12
@@ -148,8 +145,7 @@ CleanBuild:
148145
"name": "pkg2",
149146
"subModuleName": "import.d.ts",
150147
"version": "0.0.1"
151-
},
152-
"isExternalLibraryImport": true
148+
}
153149
},
154150
"affectingLocations": [
155151
"./node_modules/pkg2/package.json"
@@ -163,8 +159,7 @@ CleanBuild:
163159
"name": "pkg3",
164160
"subModuleName": "require.d.ts",
165161
"version": "0.0.1"
166-
},
167-
"isExternalLibraryImport": true
162+
}
168163
},
169164
"affectingLocations": [
170165
13
@@ -177,8 +172,7 @@ CleanBuild:
177172
"name": "pkg3",
178173
"subModuleName": "require.d.ts",
179174
"version": "0.0.1"
180-
},
181-
"isExternalLibraryImport": true
175+
}
182176
},
183177
"affectingLocations": [
184178
"./node_modules/pkg3/package.json"
@@ -188,15 +182,13 @@ CleanBuild:
188182
"original": {
189183
"resolvedTypeReferenceDirective": {
190184
"primary": true,
191-
"resolvedFileName": 9,
192-
"isExternalLibraryImport": true
185+
"resolvedFileName": 9
193186
}
194187
},
195188
"resolutionId": 4,
196189
"resolvedTypeReferenceDirective": {
197190
"primary": true,
198-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
199-
"isExternalLibraryImport": true
191+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
200192
}
201193
}
202194
],
@@ -233,7 +225,6 @@ CleanBuild:
233225
"resolutionId": 1,
234226
"resolvedModule": {
235227
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
236-
"isExternalLibraryImport": true,
237228
"packageId": {
238229
"name": "pkg0",
239230
"subModuleName": "import.d.ts",
@@ -262,8 +253,7 @@ CleanBuild:
262253
"name": "pkg2",
263254
"subModuleName": "import.d.ts",
264255
"version": "0.0.1"
265-
},
266-
"isExternalLibraryImport": true
256+
}
267257
},
268258
"affectingLocations": [
269259
"./node_modules/pkg2/package.json"
@@ -287,8 +277,7 @@ CleanBuild:
287277
"name": "pkg3",
288278
"subModuleName": "require.d.ts",
289279
"version": "0.0.1"
290-
},
291-
"isExternalLibraryImport": true
280+
}
292281
},
293282
"affectingLocations": [
294283
"./node_modules/pkg3/package.json"
@@ -307,8 +296,7 @@ CleanBuild:
307296
"resolutionId": 4,
308297
"resolvedTypeReferenceDirective": {
309298
"primary": true,
310-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
311-
"isExternalLibraryImport": true
299+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
312300
}
313301
}
314302
}
@@ -324,7 +312,6 @@ CleanBuild:
324312
"resolutionId": 1,
325313
"resolvedModule": {
326314
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
327-
"isExternalLibraryImport": true,
328315
"packageId": {
329316
"name": "pkg0",
330317
"subModuleName": "import.d.ts",
@@ -355,8 +342,7 @@ CleanBuild:
355342
"name": "pkg2",
356343
"subModuleName": "import.d.ts",
357344
"version": "0.0.1"
358-
},
359-
"isExternalLibraryImport": true
345+
}
360346
},
361347
"affectingLocations": [
362348
"./node_modules/pkg2/package.json"
@@ -375,8 +361,7 @@ CleanBuild:
375361
"name": "pkg3",
376362
"subModuleName": "require.d.ts",
377363
"version": "0.0.1"
378-
},
379-
"isExternalLibraryImport": true
364+
}
380365
},
381366
"affectingLocations": [
382367
"./node_modules/pkg3/package.json"
@@ -391,8 +376,7 @@ CleanBuild:
391376
"resolutionId": 4,
392377
"resolvedTypeReferenceDirective": {
393378
"primary": true,
394-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
395-
"isExternalLibraryImport": true
379+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
396380
}
397381
}
398382
}
@@ -503,7 +487,6 @@ IncrementalBuild:
503487
"original": {
504488
"resolvedModule": {
505489
"resolvedFileName": 2,
506-
"isExternalLibraryImport": true,
507490
"packageId": {
508491
"name": "pkg0",
509492
"subModuleName": "import.d.ts",
@@ -517,7 +500,6 @@ IncrementalBuild:
517500
"resolutionId": 1,
518501
"resolvedModule": {
519502
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
520-
"isExternalLibraryImport": true,
521503
"packageId": {
522504
"name": "pkg0",
523505
"subModuleName": "import.d.ts",
@@ -536,8 +518,7 @@ IncrementalBuild:
536518
"name": "pkg2",
537519
"subModuleName": "import.d.ts",
538520
"version": "0.0.1"
539-
},
540-
"isExternalLibraryImport": true
521+
}
541522
},
542523
"affectingLocations": [
543524
12
@@ -550,8 +531,7 @@ IncrementalBuild:
550531
"name": "pkg2",
551532
"subModuleName": "import.d.ts",
552533
"version": "0.0.1"
553-
},
554-
"isExternalLibraryImport": true
534+
}
555535
},
556536
"affectingLocations": [
557537
"./node_modules/pkg2/package.json"
@@ -565,8 +545,7 @@ IncrementalBuild:
565545
"name": "pkg3",
566546
"subModuleName": "require.d.ts",
567547
"version": "0.0.1"
568-
},
569-
"isExternalLibraryImport": true
548+
}
570549
},
571550
"affectingLocations": [
572551
13
@@ -579,8 +558,7 @@ IncrementalBuild:
579558
"name": "pkg3",
580559
"subModuleName": "require.d.ts",
581560
"version": "0.0.1"
582-
},
583-
"isExternalLibraryImport": true
561+
}
584562
},
585563
"affectingLocations": [
586564
"./node_modules/pkg3/package.json"
@@ -590,15 +568,13 @@ IncrementalBuild:
590568
"original": {
591569
"resolvedTypeReferenceDirective": {
592570
"primary": true,
593-
"resolvedFileName": 9,
594-
"isExternalLibraryImport": true
571+
"resolvedFileName": 9
595572
}
596573
},
597574
"resolutionId": 4,
598575
"resolvedTypeReferenceDirective": {
599576
"primary": true,
600-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
601-
"isExternalLibraryImport": true
577+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
602578
}
603579
}
604580
],
@@ -635,7 +611,6 @@ IncrementalBuild:
635611
"resolutionId": 1,
636612
"resolvedModule": {
637613
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
638-
"isExternalLibraryImport": true,
639614
"packageId": {
640615
"name": "pkg0",
641616
"subModuleName": "import.d.ts",
@@ -664,8 +639,7 @@ IncrementalBuild:
664639
"name": "pkg2",
665640
"subModuleName": "import.d.ts",
666641
"version": "0.0.1"
667-
},
668-
"isExternalLibraryImport": true
642+
}
669643
},
670644
"affectingLocations": [
671645
"./node_modules/pkg2/package.json"
@@ -689,8 +663,7 @@ IncrementalBuild:
689663
"name": "pkg3",
690664
"subModuleName": "require.d.ts",
691665
"version": "0.0.1"
692-
},
693-
"isExternalLibraryImport": true
666+
}
694667
},
695668
"affectingLocations": [
696669
"./node_modules/pkg3/package.json"
@@ -709,8 +682,7 @@ IncrementalBuild:
709682
"resolutionId": 4,
710683
"resolvedTypeReferenceDirective": {
711684
"primary": true,
712-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
713-
"isExternalLibraryImport": true
685+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
714686
}
715687
}
716688
}
@@ -726,7 +698,6 @@ IncrementalBuild:
726698
"resolutionId": 1,
727699
"resolvedModule": {
728700
"resolvedFileName": "./node_modules/pkg0/import.d.ts",
729-
"isExternalLibraryImport": true,
730701
"packageId": {
731702
"name": "pkg0",
732703
"subModuleName": "import.d.ts",
@@ -757,8 +728,7 @@ IncrementalBuild:
757728
"name": "pkg2",
758729
"subModuleName": "import.d.ts",
759730
"version": "0.0.1"
760-
},
761-
"isExternalLibraryImport": true
731+
}
762732
},
763733
"affectingLocations": [
764734
"./node_modules/pkg2/package.json"
@@ -777,8 +747,7 @@ IncrementalBuild:
777747
"name": "pkg3",
778748
"subModuleName": "require.d.ts",
779749
"version": "0.0.1"
780-
},
781-
"isExternalLibraryImport": true
750+
}
782751
},
783752
"affectingLocations": [
784753
"./node_modules/pkg3/package.json"
@@ -793,8 +762,7 @@ IncrementalBuild:
793762
"resolutionId": 4,
794763
"resolvedTypeReferenceDirective": {
795764
"primary": true,
796-
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts",
797-
"isExternalLibraryImport": true
765+
"resolvedFileName": "./node_modules/@types/pkg4/index.d.ts"
798766
}
799767
}
800768
}

0 commit comments

Comments
 (0)