Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always watch package jsons for the sourceFile (#59311)

Browse Source
This commit is contained in:
Sheetal Nandi
2024-07-16 16:01:33 -07:00
committed by GitHub
parent bf39eccee6
commit f37482cd16
3 changed files with 398 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/resolutionCache.ts
+1 -2
View File
@@ -38,7 +38,6 @@ import {
isDiskPathRoot,
isEmittedFileOfProgram,
isExternalModuleNameRelative,
isExternalOrCommonJsModule,
isNodeModulesDirectory,
isRootedDiskPath,
isTraceEnabled,
@@ -779,7 +778,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
if (newProgram !== oldProgram) {
cleanupLibResolutionWatching(newProgram);
newProgram?.getSourceFiles().forEach(newFile => {
const expected = isExternalOrCommonJsModule(newFile) ? newFile.packageJsonLocations?.length ?? 0 : 0;
const expected = newFile.packageJsonLocations?.length ?? 0;
const existing = impliedFormatPackageJsons.get(newFile.resolvedPath) ?? emptyArray;
for (let i = existing.length; i < expected; i++) {
createFileWatcherOfAffectingLocation(newFile.packageJsonLocations![i], /*forResolution*/ false);
src/testRunner/unittests/tscWatch/moduleResolution.ts
+71
View File
@@ -1,3 +1,8 @@
import {
ModuleDetectionKind,
ModuleKind,
ModuleResolutionKind,
} from "../../_namespaces/ts.js";
import * as Utils from "../../_namespaces/Utils.js";
import { jsonToReadableText } from "../helpers.js";
import {
@@ -6,6 +11,7 @@ import {
getFsContentsForAlternateResultDts,
getFsContentsForAlternateResultPackageJson,
} from "../helpers/alternateResult.js";
import { compilerOptionsToConfigJson } from "../helpers/contents.js";
import { verifyTscWatch } from "../helpers/tscWatch.js";
import {
createWatchedSystem,
@@ -712,4 +718,69 @@ describe("unittests:: tsc-watch:: moduleResolution::", () => {
},
],
});
verifyTscWatch({
scenario: "moduleResolution",
subScenario: "type reference resolutions with impliedMode",
sys: () =>
createWatchedSystem({
"/user/username/projects/myproject/package.json": jsonToReadableText({
name: "myproject",
version: "1.0.0",
type: "module",
}),
"/user/username/projects/myproject/tsconfig.json": jsonToReadableText({
compilerOptions: compilerOptionsToConfigJson({
moduleResolution: ModuleResolutionKind.Node16,
module: ModuleKind.Node16,
moduleDetection: ModuleDetectionKind.Legacy,
types: [],
}),
}),
"/user/username/projects/myproject/index.ts": Utils.dedent`
/// <reference types="pkg"/>
interface LocalInterface extends RequireInterface {}
`,
"/user/username/projects/myproject/node_modules/@types/pkg/package.json": jsonToReadableText({
name: "pkg",
version: "0.0.1",
exports: {
import: "./import.js",
require: "./require.js",
},
}),
"/user/username/projects/myproject/node_modules/@types/pkg/import.d.ts": Utils.dedent`
export {};
declare global {
interface ImportInterface {}
}
`,
"/user/username/projects/myproject/node_modules/@types/pkg/require.d.ts": Utils.dedent`
export {};
declare global {
interface RequireInterface {}
}
`,
[libFile.path]: libFile.content,
["/a/lib/lib.es2022.full.d.ts"]: libFile.content,
}, { currentDirectory: "/user/username/projects/myproject" }),
commandLineArgs: ["-w", "--traceResolution", "--explainFiles"],
edits: [
{
caption: "Modify package json",
edit: sys =>
sys.prependFile(
"/user/username/projects/myproject/package.json",
jsonToReadableText({
name: "myproject",
version: "1.0.0",
}),
),
timeouts: sys => {
sys.runQueuedTimeoutCallbacks();
sys.runQueuedTimeoutCallbacks();
},
},
],
});
});