Skip to content

fix: close watcher if it's disabled #18521

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patak-cat merged 2 commits into from
Oct 30, 2024
Merged

fix: close watcher if it's disabled #18521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9bc791
fix: don't call `fs.watch` if `watch` is disabled
sheremet-va Oct 30, 2024
4fe8e9a
fix: close watcher immediately
sheremet-va Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions packages/vite/src/node/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,14 +469,17 @@ export async function _createServer(

const watcher = chokidar.watch(
// config file dependencies and env file might be outside of root
[
root,
...config.configFileDependencies,
...getEnvFilesForMode(config.mode, config.envDir),
// Watch the public directory explicitly because it might be outside
// of the root directory.
...(publicDir && publicFiles ? [publicDir] : []),
],
// eslint-disable-next-line eqeqeq -- null means disabled
serverConfig.watch === null
? []
: [
root,
...config.configFileDependencies,
...getEnvFilesForMode(config.mode, config.envDir),
// Watch the public directory explicitly because it might be outside
// of the root directory.
...(publicDir && publicFiles ? [publicDir] : []),
],
resolvedWatchOptions,
)
// If watch is turned off, patch `.add()` as a noop to prevent programmatically
Expand All @@ -486,6 +489,7 @@ export async function _createServer(
watcher.add = function () {
return this
}
await watcher.close()
}

const environments: Record<string, DevEnvironment> = {}
Expand Down