Cherry-pick PR #45642 into release-4.4 (#45644)

TypeScript Bot · weswigham · web-flow · commit 9eb689e066cf · 2021-08-30T14:05:16.000-07:00
Component commits: 58e56ed Close package json watches in watch mode on close Co-authored-by: Wesley Wigham <t-weswig@microsoft.com>
diff --git a/src/compiler/watchPublic.ts b/src/compiler/watchPublic.ts
@@ -404,6 +404,10 @@ namespace ts {
                 });
                 parsedConfigs = undefined;
             }
+            if (packageJsonMap) {
+                clearMap(packageJsonMap, closeFileWatcher);
+                packageJsonMap = undefined!;
+            }
         }
 
         function getCurrentBuilderProgram() {
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -203,9 +203,6 @@ Shape signatures in builder refreshed for::
 /users/username/projects/project/src/index.ts (computed .d.ts)
 
 WatchedFiles::
-/users/username/projects/project/node_modules/classnames/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/classnames/package.json","pollingInterval":250}
-  {"fileName":"/users/username/projects/project/node_modules/classnames/package.json","pollingInterval":250}
 /users/username/projects/project/tsconfig.json:
   {"fileName":"/users/username/projects/project/tsconfig.json","pollingInterval":250}
 /users/username/projects/project/src/index.ts:
@@ -216,6 +213,8 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/src/types/classnames.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/classnames/package.json:
+  {"fileName":"/users/username/projects/project/node_modules/classnames/package.json","pollingInterval":250}
 
 FsWatches::
 
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
@@ -122,15 +122,14 @@ Shape signatures in builder refreshed for::
 /users/username/projects/project/index.tsx (used version)
 
 WatchedFiles::
-/users/username/projects/project/node_modules/tslib/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/tslib/package.json","pollingInterval":250}
-  {"fileName":"/users/username/projects/project/node_modules/tslib/package.json","pollingInterval":250}
 /users/username/projects/project/tsconfig.json:
   {"fileName":"/users/username/projects/project/tsconfig.json","pollingInterval":250}
 /users/username/projects/project/index.tsx:
   {"fileName":"/users/username/projects/project/index.tsx","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/tslib/package.json:
+  {"fileName":"/users/username/projects/project/node_modules/tslib/package.json","pollingInterval":250}
 
 FsWatches::
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
@@ -190,18 +190,16 @@ Shape signatures in builder refreshed for::
 /users/username/projects/project/index.tsx (computed .d.ts)
 
 WatchedFiles::
-/users/username/projects/project/node_modules/react/jsx-runtime/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
-  {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
-/users/username/projects/project/node_modules/react/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
-  {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
 /users/username/projects/project/tsconfig.json:
   {"fileName":"/users/username/projects/project/tsconfig.json","pollingInterval":250}
 /users/username/projects/project/index.tsx:
   {"fileName":"/users/username/projects/project/index.tsx","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/react/jsx-runtime/package.json:
+  {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/react/package.json:
+  {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
 
 FsWatches::
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
@@ -225,10 +225,6 @@ Shape signatures in builder refreshed for::
 /users/username/projects/project/index.tsx (computed .d.ts)
 
 WatchedFiles::
-/users/username/projects/project/node_modules/react/jsx-runtime/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
-/users/username/projects/project/node_modules/react/package.json:
-  {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
 /users/username/projects/project/tsconfig.json:
   {"fileName":"/users/username/projects/project/tsconfig.json","pollingInterval":250}
 /users/username/projects/project/index.tsx:

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,10 @@ namespace ts {`
`404`	`404`	`});`
`405`	`405`	`parsedConfigs = undefined;`
`406`	`406`	`}`
	`407`	`+ if (packageJsonMap) {`
	`408`	`+ clearMap(packageJsonMap, closeFileWatcher);`
	`409`	`+ packageJsonMap = undefined!;`
	`410`	`+ }`
`407`	`411`	`}`
`408`	`412`
`409`	`413`	`function getCurrentBuilderProgram() {`