Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-12 11:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): allow restarting nuxt on paths outside srcDir (#30771)

Browse Source
This commit is contained in:
Daniel Roe 2025-01-28 22:36:36 +01:00 committed by GitHub
parent 6fafc85ea0
commit 5c8744a30d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/nuxt/src/core/builder.ts
View File

@ -108,6 +108,18 @@ function createWatcher () {
ignored: [isIgnored, /[\\/]node_modules[\\/]/], ignored: [isIgnored, /[\\/]node_modules[\\/]/],
}) })
const restartPaths = new Set<string>()
const srcDir = nuxt.options.srcDir.replace(/\/?$/, '/')
for (const pattern of nuxt.options.watch) {
if (typeof pattern !== 'string') { continue }
const path = resolve(nuxt.options.srcDir, pattern)
if (!path.startsWith(srcDir)) {
restartPaths.add(path)
}
}
watcher.add([...restartPaths])
watcher.on('all', (event, path) => { watcher.on('all', (event, path) => {
if (event === 'all' || event === 'ready' || event === 'error' || event === 'raw') { if (event === 'all' || event === 'ready' || event === 'error' || event === 'raw') {
return return

8
packages/nuxt/src/core/nuxt.ts
View File

@ -413,7 +413,7 @@ async function initNuxt (nuxt: Nuxt) {
await nuxt.callHook('modules:before') await nuxt.callHook('modules:before')
const modulesToInstall = new Map<string | NuxtModule, Record<string, any>>() const modulesToInstall = new Map<string | NuxtModule, Record<string, any>>()
const watchedPaths = new Set<string>() const modulePaths = new Set<string>()
const specifiedModules = new Set<string>() const specifiedModules = new Set<string>()
for (const _mod of nuxt.options.modules) { for (const _mod of nuxt.options.modules) {
@ -431,13 +431,15 @@ async function initNuxt (nuxt: Nuxt) {
`${modulesDir}/*/index{${nuxt.options.extensions.join(',')}}`, `${modulesDir}/*/index{${nuxt.options.extensions.join(',')}}`,
]) ])
for (const mod of layerModules) { for (const mod of layerModules) {
watchedPaths.add(mod) modulePaths.add(mod)
if (specifiedModules.has(mod)) { continue } if (specifiedModules.has(mod)) { continue }
specifiedModules.add(mod) specifiedModules.add(mod)
modulesToInstall.set(mod, {}) modulesToInstall.set(mod, {})
} }
} }
nuxt.options.watch.push(...modulePaths)
// Register user and then ad-hoc modules // Register user and then ad-hoc modules
for (const key of ['modules', '_modules'] as const) { for (const key of ['modules', '_modules'] as const) {
for (const item of nuxt.options[key as 'modules']) { for (const item of nuxt.options[key as 'modules']) {
@ -660,7 +662,7 @@ export default defineNuxtPlugin({
nuxt.hooks.hook('builder:watch', (event, relativePath) => { nuxt.hooks.hook('builder:watch', (event, relativePath) => {
const path = resolve(nuxt.options.srcDir, relativePath) const path = resolve(nuxt.options.srcDir, relativePath)
// Local module patterns // Local module patterns
if (watchedPaths.has(path)) { if (modulePaths.has(path)) {
return nuxt.callHook('restart', { hard: true }) return nuxt.callHook('restart', { hard: true })
} }