8000 fix(nuxt): test `watch` paths against all layer `srcDir`s by userquin · Pull Request #22307 · nuxt/nuxt · GitHub
[go: up one dir, main page]
Skip to content

fix(nuxt): test watch paths against all layer srcDirs #22307

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
merged 14 commits into from
Jul 30, 2023
Merged

fix(nuxt): test watch paths against all layer srcDirs #22307

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
56a4085
fix(nuxt): normalize watched paths to restart nuxt server
userquin Jul 24, 2023
a1480ba
chore: normalize paths that are provided in the schema to absolute paths
userquin Jul 24, 2023
130f5fe
chore: include traversing layers + update builder
userquin Jul 24, 2023
bb6ac71
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 24, 2023
45d5562
chore: check the path inside the layer
userquin Jul 24, 2023
9f2c20f
Merge remote-tracking branch 'origin/fix-watch-restart' into fix-watc…
userquin Jul 24, 2023
7a68bbf
chore: cleanup playground config
userquin Jul 24, 2023
a0738f2
chore: await watch entries in the schema
userquin Jul 25, 2023
5f2675e
Merge remote-tracking branch 'origin/main' into fix-watch-restart
danielroe Jul 30, 2023
7cb1632
docs: update schema description
danielroe Jul 30, 2023
80fbbe6
perf: resolve `srcDir` only once
danielroe Jul 30, 2023
ad53bad
fix: test regular expressions relative to all layer srcDirs
danielroe Jul 30, 2023
21f44b0
fix: don't resolve paths as absolute
danielroe Jul 30, 2023
dd84490
Merge remote-tracking branch 'origin/main' into fix-watch-restart
danielroe Jul 30, 2023
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
Prev Previous commit
Next Next commit
chore: check the path inside the layer
  • Loading branch information
@userquin
userquin committed Jul 24, 2023
commit 45d55628fbdad98a1d9aba08980c9e6a420b58c8
4 changes: 3 additions & 1 deletion packages/nuxt/src/core/nuxt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,14 @@ async function initNuxt (nuxt: Nuxt) {
for (const layer of nuxt.options._layers) {
if (!layer.config.watch) { continue }
const normalizedPath = relative(layer.config.srcDir, path)
// not inside layer srcDir
if (normalizedPath.startsWith('..') || isAbsolute(normalizedPath)) { continue }
for (const pattern of await Promise.all(layer.config.watch)) {
if (typeof pattern === 'string') {
if (pattern === path || pattern === normalizedPath) { return nuxt.callHook('restart') }
continue
}
// @ts-expect-error: pattern is filtered
// @ts-expect-error: 'pattern' is possibly 'undefined'.ts(18048) => pattern is filtered
if (pattern.test(path) || pattern.test(normalizedPath)) { return nuxt.callHook('restart') }
}
}
Expand Down
0