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

Show file tree
Hide file tree
Changes from all commits
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
8000 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
11 changes: 8 additions & 3 deletions packages/nuxt/src/core/nuxt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { join, normalize, resolve } from 'pathe'
import { join, normalize, relative, resolve } from 'pathe'
import { createDebugger, createHooks } from 'hookable'
import type { LoadNuxtOptions } from '@nuxt/kit'
import { addBuildPlugin, addComponent, addPlugin, addVitePlugin, addWebpackPlugin, installModule, loadNuxtConfig, logger, nuxtCtx, resolveAlias, resolveFiles, resolvePath, tryResolveModule, useNitro } from '@nuxt/kit'
Expand Down Expand Up @@ -349,12 +349,17 @@ async function initNuxt (nuxt: Nuxt) {
}

// User provided patterns
const layerRelativePaths = nuxt.options._layers.map(l => relative(l.config.srcDir || l.cwd, path))
for (const pattern of nuxt.options.watch) {
if (typeof pattern === 'string') {
if (pattern === path) { return nuxt.callHook('restart') }
// Test (normalised) strings against absolute path and relative path to any layer `srcDir`
if (pattern === path || layerRelativePaths.includes(pattern)) { return nuxt.callHook('restart') }
continue
}
if (pattern.test(path)) { return nuxt.callHook('restart') }
// Test regular expressions against path to _any_ layer `srcDir`
if (layerRelativePaths.some(p => pattern.test(p))) {
return nuxt.callHook('restart')
}
}

// Core Nuxt files: app.vue, error.vue and app.config.ts
Expand Down
5 changes: 3 additions & 2 deletions packages/schema/src/config/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,9 @@ export default defineUntypedSchema({
/**
* The watch property lets you define patterns that will restart the Nuxt dev server when changed.
*
* It is an array of strings or regular expressions, which will be matched against the file path
* relative to the project `srcDir`.
* It is an array of strings or regular expressions. Strings should be either absolute paths or
* relative to the `srcDir` (and the `srcDir` of any layers). Regular expressions will be matched
* against the path relative to the project `srcDir` (and the `srcDir` of any layers).
*
* @type {Array<string | RegExp>}
*/
Expand Down
0