Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃 Pick PR #45642 (Close package json watches in watch...) into release-4.4 #45644

Merged
merged 1 commit into from Aug 30, 2021
Merged

馃 Pick PR #45642 (Close package json watches in watch...) into release-4.4 #45644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/compiler/watchPublic.ts
View file
Open in desktop
Expand Up @@ -404,6 +404,10 @@ namespace ts {
});
parsedConfigs = undefined;
}
if (packageJsonMap) {
clearMap(packageJsonMap, closeFileWatcher);
packageJsonMap = undefined!;
}
}

function getCurrentBuilderProgram() {
Expand Down
5 changes: 2 additions & 3 deletions tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
View file
Open in desktop
Expand Up @@ -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:
Expand All @@ -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::

Expand Down
5 changes: 2 additions & 3 deletions tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
View file
Open in desktop
Expand Up @@ -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::

Expand Down
10 changes: 4 additions & 6 deletions ...s/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
View file
Open in desktop
Expand Up @@ -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::

Expand Down
4 changes: 0 additions & 4 deletions tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
View file
Open in desktop
Expand Up @@ -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:
Expand Down