fix(nuxt): pass (and handle) relative paths in builder:watch

packages/nuxt/src/components/module.ts

@@ -149,11 +149,13 @@ export default defineNuxtModule<ComponentsOptions>({
 
     // Restart dev server when component directories are added/removed
     nuxt.hook('builder:watch', (event, path) => {
-      const isDirChange = ['addDir', 'unlinkDir'].includes(event)
-      const fullPath = resolve(nuxt.options.srcDir, path)
+      if (!['addDir', 'unlinkDir'].includes(event)) {
+        return
+      }
 
-      if (isDirChange && componentDirs.some(dir => dir.path === fullPath)) {
-        console.info(`Directory \`${path}/\` ${event === 'addDir' ? 'created' : 'removed'}`)
+      if (componentDirs.some(dir => dir.path === path)) {
+        const relativePath = relative(nuxt.options.srcDir!, path)
+        console.info(`Directory \`${relativePath}/\` ${event === 'addDir' ? 'created' : 'removed'}`)
         return nuxt.callHook('restart')
       }
     })
@@ -187,8 +189,7 @@ export default defineNuxtModule<ComponentsOptions>({
       if (!['add', 'unlink'].includes(event)) {
         return
       }
-      const fPath = resolve(nuxt.options.srcDir, path)
-      if (componentDirs.find(dir => fPath.startsWith(dir.path))) {
+      if (componentDirs.some(dir => path.startsWith(dir.path + '/'))) {
         await updateTemplates({
           filter: template => [
             'components.plugin.mjs',

packages/nuxt/src/core/builder.ts

@@ -5,7 +5,7 @@ import chokidar from 'chokidar'
 import { isIgnored, tryResolveModule, useNuxt } from '@nuxt/kit'
 import { interopDefault } from 'mlly'
 import { debounce } from 'perfect-debounce'
-import { normalize, resolve } from 'pathe'
+import { normalize, relative, resolve } from 'pathe'
 import type { Nuxt } from 'nuxt/schema'
 
 import { generateApp as _generateApp, createApp } from './app'
@@ -20,11 +20,14 @@ export async function build (nuxt: Nuxt) {
   if (nuxt.options.dev) {
     watch(nuxt)
     nuxt.hook('builder:watch', async (event, path) => {
-      if (event !== 'change' && /^(app\.|error\.|plugins\/|middleware\/|layouts\/)/i.test(path)) {
-        if (path.startsWith('app')) {
+      if (event === 'change') { return }
+      const relativePaths = nuxt.options._layers.map(l => relative(l.config.srcDir || l.cwd, path))
+      const restartPath = relativePaths.find(relativePath => /^(app\.|error\.|plugins\/|middleware\/|layouts\/)/i.test(relativePath))
+      if (restartPath) {
+        if (restartPath.startsWith('app')) {
           app.mainComponent = undefined
         }
-        if (path.startsWith('error')) {
+        if (restartPath.startsWith('error')) {
           app.errorComponent = undefined
         }
         await generateApp()
@@ -72,7 +75,6 @@ function createWatcher () {
 
   const watcher = chokidar.watch(nuxt.options._layers.map(i => i.config.srcDir as string).filter(Boolean), {
     ...nuxt.options.watchers.chokidar,
-    cwd: nuxt.options.srcDir,
     ignoreInitial: true,
     ignored: [
       isIgnored,

packages/nuxt/src/core/nuxt.ts

@@ -1,4 +1,4 @@
-import { join, normalize, relative, resolve } from 'pathe'
+import { join, normalize, 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'
@@ -180,7 +180,7 @@ async function initNuxt (nuxt: Nuxt) {
       `${config.dir?.modules || 'modules'}/*/index{${nuxt.options.extensions.join(',')}}`
     ])
     for (const mod of layerModules) {
-      watchedPaths.add(relative(config.srcDir, mod))
+      watchedPaths.add(mod)
       if (specifiedModules.has(mod)) { continue }
       specifiedModules.add(mod)
       modulesToInstall.push(mod)

packages/nuxt/src/imports/module.ts

@@ -64,11 +64,11 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
 
     // Restart nuxt when composable directories are added/removed
     nuxt.hook('builder:watch', (event, path) => {
-      const isDirChange = ['addDir', 'unlinkDir'].includes(event)
-      const fullPath = resolve(nuxt.options.srcDir, path)
+      if (!['addDir', 'unlinkDir'].includes(event)) { return }
 
-      if (isDirChange && composablesDirs.includes(fullPath)) {
-        console.info(`Directory \`${path}/\` ${event === 'addDir' ? 'created' : 'removed'}`)
+      if (composablesDirs.includes(path)) {
+        const relativePath = relative(nuxt.options.srcDir, path)
+        console.info(`Directory \`${relativePath}/\` ${event === 'addDir' ? 'created' : 'removed'}`)
         return nuxt.callHook('restart')
       }
     })
@@ -120,8 +120,7 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
       'imports.mjs'
     ]
     nuxt.hook('builder:watch', async (_, path) => {
-      const _resolved = resolve(nuxt.options.srcDir, path)
-      if (composablesDirs.find(dir => _resolved.startsWith(dir))) {
+      if (composablesDirs.some(dir => dir === path || path.startsWith(dir + '/'))) {
         await updateTemplates({
           filter: template => templates.includes(template.filename)
         })

packages/nuxt/src/pages/module.ts

@@ -3,7 +3,6 @@ import { mkdir, readFile } from 'node:fs/promises'
 import { addComponent, addPlugin, addTemplate, addVitePlugin, addWebpackPlugin, defineNuxtModule, findPath, updateTemplates } from '@nuxt/kit'
 import { dirname, join, relative, resolve } from 'pathe'
 import { genImport, genObjectFromRawEntries, genString } from 'knitwork'
-import escapeRE from 'escape-string-regexp'
 import { joinURL } from 'ufo'
 import type { NuxtApp, NuxtPage } from 'nuxt/schema'
 import { createRoutesContext } from 'unplugin-vue-router'
@@ -55,9 +54,9 @@ export default defineNuxtModule({
       join(layer.config.srcDir, 'app/router.options.ts'),
       join(layer.config.srcDir, layer.config.dir?.pages || 'pages')
     ])
+
     nuxt.hooks.hook('builder:watch', async (event, path) => {
-      const fullPath = join(nuxt.options.srcDir, path)
-      if (restartPaths.some(path => path === fullPath || fullPath.startsWith(path + '/'))) {
+      if (restartPaths.some(p => p === path || path.startsWith(p + '/'))) {
         const newSetting = await isPagesEnabled()
         if (nuxt.options.pages !== newSetting) {
           console.info('Pages', newSetting ? 'enabled' : 'disabled')
@@ -174,15 +173,16 @@ export default defineNuxtModule({
     })
 
     // Regenerate templates when adding or removing pages
+    const updateTemplatePaths = nuxt.options._layers.flatMap(l => [
+      join(l.config.srcDir || l.cwd, l.config.dir?.pages || 'pages') + '/',
+      join(l.config.srcDir || l.cwd, l.config.dir?.layouts || 'layouts') + '/',
+      join(l.config.srcDir || l.cwd, l.config.dir?.middleware || 'middleware') + '/'
+    ])
+
     nuxt.hook('builder:watch', async (event, path) => {
-      const dirs = [
-        nuxt.options.dir.pages,
-        nuxt.options.dir.layouts,
-        nuxt.options.dir.middleware
-      ].filter(Boolean)
-
-      const pathPattern = new RegExp(`(^|\\/)(${dirs.map(escapeRE).join('|')})/`)
-      if (event !== 'change' && pathPattern.test(path)) {
+      if (event === 'change') { return }
+
+      if (updateTemplatePaths.some(dir => path.startsWith(dir))) {
         await updateTemplates({
           filter: template => template.filename === 'routes.mjs'
         })