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

Already on GitHub? Sign in to your account

Jump to bottom

fix: cacheDir should be ignored from watch #10242

Merged
merged 4 commits into from Dec 3, 2022
Merged

fix: cacheDir should be ignored from watch #10242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23d2e85
fix: cacheDir should be watch-ignored
shigma Sep 25, 2022
2d2dd7c
fix: apply review comments
shigma Dec 3, 2022
dc2ddb9
fix: don't escapePath glob part
sapphi-red Dec 3, 2022
7885dab
fix: normalize config.cacheDir
sapphi-red Dec 3, 2022
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
1 change: 1 addition & 0 deletions packages/vite/src/node/build.ts
View file
Open in desktop
Expand Up @@ -574,6 +574,7 @@ async function doBuild(
}

const resolvedChokidarOptions = resolveChokidarOptions(
config,
config.build.watch.chokidar
)

Expand Down
12 changes: 7 additions & 5 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Expand Up @@ -530,11 +530,13 @@ export async function resolveConfig(

// resolve cache directory
const pkgPath = lookupFile(resolvedRoot, [`package.json`], { pathOnly: true })
const cacheDir = config.cacheDir
? path.resolve(resolvedRoot, config.cacheDir)
: pkgPath
? path.join(path.dirname(pkgPath), `node_modules/.vite`)
: path.join(resolvedRoot, `.vite`)
const cacheDir = normalizePath(
config.cacheDir
? path.resolve(resolvedRoot, config.cacheDir)
: pkgPath
? path.join(path.dirname(pkgPath), `node_modules/.vite`)
: path.join(resolvedRoot, `.vite`)
)

const assetsFilter = config.assetsInclude
? createFilter(config.assetsInclude)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/server/index.ts
View file
Open in desktop
Expand Up @@ -304,7 +304,7 @@ export async function createServer(
const httpsOptions = await resolveHttpsConfig(config.server.https)
const { middlewareMode } = serverConfig

const resolvedWatchOptions = resolveChokidarOptions({
const resolvedWatchOptions = resolveChokidarOptions(config, {
disableGlobbing: true,
...serverConfig.watch
})
Expand Down
4 changes: 4 additions & 0 deletions packages/vite/src/node/watch.ts
View file
Open in desktop
@@ -1,6 +1,9 @@
import { escapePath } from 'fast-glob'
import type { WatchOptions } from 'dep-types/chokidar'
import type { ResolvedConfig } from '.'

export function resolveChokidarOptions(
config: ResolvedConfig,
options: WatchOptions | undefined
): WatchOptions {
const { ignored = [], ...otherOptions } = options ?? {}
Expand All @@ -10,6 +13,7 @@ export function resolveChokidarOptions(
'**/.git/**',
'**/node_modules/**',
'**/test-results/**', // Playwright
escapePath(config.cacheDir) + '/**',
...(Array.isArray(ignored) ? ignored : [ignored])
],
ignoreInitial: true,
Expand Down