nuxt-nightly 4.1.0-29279319.00ede5ce → 4.1.0-29279382.7234ae61

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { dirname, resolve, normalize, basename, extname, relative, isAbsolute, join } from 'pathe';
 import { createHooks, createDebugger } from 'hookable';
 import ignore from 'ignore';
-import { useLogger, tryUseNuxt, useNuxt, directoryToURL, resolveFiles, resolvePath, defineNuxtModule, findPath, addPlugin, addTemplate, addTypeTemplate, addComponent, useNitro, addBuildPlugin, isIgnored, resolveAlias as resolveAlias$1, addPluginTemplate, addImportsSources, addVitePlugin, createIsIgnored, updateTemplates, tryResolveModule, normalizeModuleTranspilePath, resolveNuxtModule, resolveIgnorePatterns, logger as logger$1, createResolver, importModule, tryImportModule, runWithNuxtContext, nuxtCtx, loadNuxtConfig, addWebpackPlugin, addServerPlugin, installModules, addServerTemplate, addServerHandler, addRouteMiddleware, resolveModuleWithOptions, normalizeTemplate, normalizePlugin } from '@nuxt/kit';
+import { useLogger, tryUseNuxt, useNuxt, directoryToURL, getLayerDirectories, resolveFiles, resolvePath, defineNuxtModule, findPath, addPlugin, addTemplate, addTypeTemplate, addComponent, useNitro, addBuildPlugin, isIgnored, resolveAlias as resolveAlias$1, addPluginTemplate, addImportsSources, addVitePlugin, createIsIgnored, updateTemplates, tryResolveModule, normalizeModuleTranspilePath, resolveNuxtModule, resolveIgnorePatterns, logger as logger$1, createResolver, importModule, tryImportModule, runWithNuxtContext, nuxtCtx, loadNuxtConfig, addWebpackPlugin, addServerPlugin, installModules, addServerTemplate, addServerHandler, addRouteMiddleware, resolveModuleWithOptions, normalizeTemplate, normalizePlugin } from '@nuxt/kit';
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
 import { hash, isEqual, serialize } from 'ohash';
 import consola, { consola as consola$1 } from 'consola';
@@ -13,7 +13,7 @@ import onChange from 'on-change';
 import { colors } from 'consola/utils';
 import { resolveCompatibilityDatesFromEnv, formatDate } from 'compatx';
 import escapeRE from 'escape-string-regexp';
-import { withTrailingSlash, parseURL, parseQuery, joinURL, withLeadingSlash, encodePath, withoutLeadingSlash } from 'ufo';
+import { withTrailingSlash as withTrailingSlash$1, parseURL, parseQuery, joinURL, withLeadingSlash, encodePath, withoutLeadingSlash } from 'ufo';
 import { ImpoundPlugin } from 'impound';
 import defu$1, { defu } from 'defu';
 import { satisfies, coerce } from 'semver';
@@ -150,7 +150,7 @@ async function resolveTypePath(path, subpath, searchPaths = tryUseNuxt()?.option
 }
 
 function getNameFromPath(path, relativeTo) {
-  const relativePath = relativeTo ? normalize(path).replace(withTrailingSlash(normalize(relativeTo)), "") : basename(path);
+  const relativePath = relativeTo ? normalize(path).replace(withTrailingSlash$1(normalize(relativeTo)), "") : basename(path);
   const prefixParts = splitByCase(dirname(relativePath));
   const fileName = basename(relativePath, extname(relativePath));
   const segments = resolveComponentNameSegments(fileName.toLowerCase() === "index" ? "" : fileName, prefixParts).filter(Boolean);
@@ -256,9 +256,7 @@ const SegmentParserState = {
 };
 const enUSComparator = new Intl.Collator("en-US");
 async function resolvePagesRoutes(pattern, nuxt = useNuxt()) {
-  const pagesDirs = nuxt.options._layers.map(
-    (layer) => resolve(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : layer.config.dir)?.pages || "pages")
-  );
+  const pagesDirs = getLayerDirectories(nuxt).map((d) => d.appPages);
   const scannedFiles = [];
   for (const dir of pagesDirs) {
     const files = await resolveFiles(dir, pattern);
@@ -1204,9 +1202,7 @@ const pagesModule = defineNuxtModule({
     };
     const useExperimentalTypedPages = nuxt.options.experimental.typedPages;
     const builtInRouterOptions = await findPath(resolve(runtimeDir, "router.options")) || resolve(runtimeDir, "router.options");
-    const pagesDirs = nuxt.options._layers.map(
-      (layer) => resolve(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.pages || "pages")
-    );
+    const pagesDirs = getLayerDirectories(nuxt).map((dirs) => dirs.appPages);
     nuxt.options.alias["#vue-router"] = "vue-router";
     const routerPath = await resolveTypePath("vue-router", "", nuxt.options.modulesDir) || "vue-router";
     nuxt.hook("prepare:types", ({ tsConfig }) => {
@@ -1381,14 +1377,11 @@ const pagesModule = defineNuxtModule({
         routerImports.from = "vue-router";
       }
     });
-    const updateTemplatePaths = nuxt.options._layers.flatMap((l) => {
-      const dir = l.config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : l.config.dir;
-      return [
-        resolve(l.config.srcDir || l.cwd, dir?.pages || "pages") + "/",
-        resolve(l.config.srcDir || l.cwd, dir?.layouts || "layouts") + "/",
-        resolve(l.config.srcDir || l.cwd, dir?.middleware || "middleware") + "/"
-      ];
-    });
+    const updateTemplatePaths = getLayerDirectories(nuxt).flatMap((dirs) => [
+      dirs.appPages,
+      dirs.appLayouts,
+      dirs.appMiddleware
+    ]);
     function isPage(file, pages = nuxt.apps.default?.pages) {
       if (!pages) {
         return false;
@@ -2283,7 +2276,7 @@ async function scanComponents(dirs, srcDir) {
     }
     for (const _file of files) {
       const filePath = join(dir.path, _file);
-      if (scannedPaths.find((d) => filePath.startsWith(withTrailingSlash(d))) || isIgnored(filePath)) {
+      if (scannedPaths.find((d) => filePath.startsWith(withTrailingSlash$1(d))) || isIgnored(filePath)) {
         continue;
       }
       if (filePaths.has(filePath)) {
@@ -3662,7 +3655,7 @@ const importsModule = defineNuxtModule({
     });
     nuxt.options.alias["#imports"] = join(nuxt.options.buildDir, "imports");
     addBuildPlugin(TransformPlugin({ ctx, options, sourcemap: !!nuxt.options.sourcemap.server || !!nuxt.options.sourcemap.client }));
-    const priorities = nuxt.options._layers.map((layer, i) => [layer.config.srcDir, -i]).sort(([a], [b]) => b.length - a.length);
+    const priorities = getLayerDirectories(nuxt).map((dirs, i) => [dirs.app, -i]).sort(([a], [b]) => b.length - a.length);
     const IMPORTS_TEMPLATE_RE = /\/imports\.(?:d\.ts|mjs)$/;
     function isImportsTemplate(template) {
       return IMPORTS_TEMPLATE_RE.test(template.filename);
@@ -3765,7 +3758,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.0-29279319.00ede5ce";
+const version = "4.1.0-29279382.7234ae61";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -4006,12 +3999,13 @@ const logLevelMapReverse = {
 const NODE_MODULES_RE = /(?<=\/)node_modules\/(.+)$/;
 const PNPM_NODE_MODULES_RE = /\.pnpm\/.+\/node_modules\/(.+)$/;
 async function initNitro(nuxt) {
-  const excludePaths = nuxt.options._layers.flatMap((l) => [
-    l.cwd.match(NODE_MODULES_RE)?.[1],
-    l.cwd.match(PNPM_NODE_MODULES_RE)?.[1]
-  ]).filter((dir) => Boolean(dir)).map((dir) => escapeRE(dir));
+  const layerDirs = getLayerDirectories(nuxt);
+  const excludePaths = layerDirs.flatMap((dirs) => [
+    dirs.root.match(NODE_MODULES_RE)?.[1]?.replace(/\/$/, ""),
+    dirs.root.match(PNPM_NODE_MODULES_RE)?.[1]?.replace(/\/$/, "")
+  ].filter((dir) => Boolean(dir)).map((dir) => escapeRE(dir)));
   const excludePattern = excludePaths.length ? [new RegExp(`node_modules\\/(?!${excludePaths.join("|")})`)] : [/node_modules/];
-  const rootDirWithSlash = withTrailingSlash(nuxt.options.rootDir);
+  const rootDirWithSlash = withTrailingSlash$1(nuxt.options.rootDir);
   const moduleEntryPaths = [];
   for (const m of nuxt.options._installedModules) {
     const path = m.meta?.rawPath || m.entryPath;
@@ -4078,7 +4072,7 @@ async function initNitro(nuxt) {
       projectRoot: nuxt.options.rootDir,
       filename: join(nuxt.options.analyzeDir, "{name}.html")
     } : false,
-    scanDirs: nuxt.options._layers.map((layer) => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, "server"))).filter(Boolean),
+    scanDirs: layerDirs.map((dirs) => dirs.server),
     renderer: resolve(distDir, "core/runtime/nitro/handlers/renderer"),
     nodeModulesDirs: nuxt.options.modulesDir,
     handlers: nuxt.options.serverHandlers,
@@ -4095,9 +4089,7 @@ async function initNitro(nuxt) {
       "/__nuxt_error": { cache: false }
     },
     appConfig: nuxt.options.appConfig,
-    appConfigFiles: nuxt.options._layers.map(
-      (layer) => resolve(layer.config.srcDir, "app.config")
-    ),
+    appConfigFiles: layerDirs.map((dirs) => join(dirs.app, "app.config")),
     typescript: {
       strict: true,
       generateTsConfig: true,
@@ -4116,12 +4108,7 @@ async function initNitro(nuxt) {
               join(moduleDir, "dist/runtime/server")
             ];
           }),
-          ...nuxt.options._layers.map(
-            (layer) => relativeWithDot(
-              nuxt.options.buildDir,
-              resolve(layer.config.rootDir, layer.config.dir?.shared ?? "shared", "**/*.d.ts")
-            )
-          )
+          ...getLayerDirectories(nuxt).map((dirs) => relativeWithDot(nuxt.options.buildDir, join(dirs.shared, "**/*.d.ts")))
         ],
         exclude: [
           ...nuxt.options.modulesDir.map((m) => relativeWithDot(nuxt.options.buildDir, m)),
@@ -4136,7 +4123,7 @@ async function initNitro(nuxt) {
         maxAge: 31536e3,
         baseURL: nuxt.options.app.buildAssetsDir
       },
-      ...nuxt.options._layers.map((layer) => resolve(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : layer.config.dir)?.public || "public")).filter((dir) => existsSync(dir)).map((dir) => ({ dir }))
+      ...getLayerDirectories(nuxt).filter((dirs) => existsSync(dirs.public)).map((dirs) => ({ dir: dirs.public }))
     ],
     prerender: {
       ignoreUnprefixedPublicAssets: true,
@@ -4158,7 +4145,7 @@ async function initNitro(nuxt) {
         "nuxt-nightly/dist",
         distDir,
         // Ensure app config files have auto-imports injected even if they are pure .js files
-        ...nuxt.options._layers.map((layer) => resolve(layer.config.srcDir, "app.config"))
+        ...getLayerDirectories(nuxt).map((dirs) => join(dirs.app, "app.config"))
       ],
       traceInclude: [
         // force include files used in generated code from the runtime-compiler
@@ -4353,8 +4340,8 @@ async function initNitro(nuxt) {
   }
   nitroConfig.rollupConfig.plugins = await nitroConfig.rollupConfig.plugins || [];
   nitroConfig.rollupConfig.plugins = toArray(nitroConfig.rollupConfig.plugins);
-  const sharedDir = withTrailingSlash(resolve(nuxt.options.rootDir, nuxt.options.dir.shared));
-  const relativeSharedDir = withTrailingSlash(relative(nuxt.options.rootDir, resolve(nuxt.options.rootDir, nuxt.options.dir.shared)));
+  const sharedDir = withTrailingSlash$1(resolve(nuxt.options.rootDir, nuxt.options.dir.shared));
+  const relativeSharedDir = withTrailingSlash$1(relative(nuxt.options.rootDir, resolve(nuxt.options.rootDir, nuxt.options.dir.shared)));
   const sharedPatterns = [/^#shared\//, new RegExp("^" + escapeRE(sharedDir)), new RegExp("^" + escapeRE(relativeSharedDir))];
   nitroConfig.rollupConfig.plugins.push(
     ImpoundPlugin.rollup({
@@ -4663,6 +4650,7 @@ const schemaModule = defineNuxtModule({
       schema = await resolveSchema$1();
     });
     nuxt.hooks.hook("build:done", () => writeSchema(schema));
+    const layerDirs = getLayerDirectories(nuxt);
     if (nuxt.options.dev) {
       const onChange = debounce(async () => {
         schema = await resolveSchema$1();
@@ -4673,8 +4661,8 @@ const schemaModule = defineNuxtModule({
           const { subscribe } = await importModule("@parcel/watcher", {
             url: [nuxt.options.rootDir, ...nuxt.options.modulesDir].map((dir) => directoryToURL(dir))
           });
-          for (const layer of nuxt.options._layers) {
-            const subscription = await subscribe(layer.config.rootDir, onChange, {
+          for (const dirs of layerDirs) {
+            const subscription = await subscribe(dirs.root, onChange, {
               ignore: ["!nuxt.schema.*"]
             });
             nuxt.hook("close", () => subscription.unsubscribe());
@@ -4685,9 +4673,9 @@ const schemaModule = defineNuxtModule({
         }
       }
       const isIgnored = createIsIgnored(nuxt);
-      const dirsToWatch = nuxt.options._layers.map((layer) => resolver.resolve(layer.config.rootDir));
+      const rootDirs = layerDirs.map((layer) => layer.root);
       const SCHEMA_RE = /(?:^|\/)nuxt.schema.\w+$/;
-      const watcher = watch$1(dirsToWatch, {
+      const watcher = watch$1(rootDirs, {
         ...nuxt.options.watchers.chokidar,
         depth: 1,
         ignored: [
@@ -4703,8 +4691,8 @@ const schemaModule = defineNuxtModule({
     async function resolveSchema$1() {
       globalThis.defineNuxtSchema = (val) => val;
       const schemaDefs = [nuxt.options.$schema];
-      for (const layer of nuxt.options._layers) {
-        const filePath = await resolver.resolvePath(resolve(layer.config.rootDir, "nuxt.schema"));
+      for (const dirs of layerDirs) {
+        const filePath = await resolver.resolvePath(join(dirs.root, "nuxt.schema"));
         if (filePath && existsSync(filePath)) {
           let loadedConfig;
           try {
@@ -5428,6 +5416,7 @@ const nightlies = {
 };
 let warnedAboutCompatDate = false;
 async function initNuxt(nuxt) {
+  const layerDirs = getLayerDirectories(nuxt);
   for (const config of nuxt.options._layers.map((layer) => layer.config).reverse()) {
     if (config.hooks) {
       nuxt.hooks.addHooks(config.hooks);
@@ -5503,8 +5492,8 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
     opts.tsConfig.compilerOptions = defu$1(opts.tsConfig.compilerOptions, { paths: { ...paths } });
     opts.nodeTsConfig.compilerOptions = defu$1(opts.nodeTsConfig.compilerOptions, { paths: { ...paths } });
     opts.sharedTsConfig.compilerOptions = defu$1(opts.sharedTsConfig.compilerOptions, { paths: { ...paths } });
-    for (const layer of nuxt.options._layers) {
-      const declaration = join(layer.cwd, "index.d.ts");
+    for (const dirs of layerDirs) {
+      const declaration = join(dirs.root, "index.d.ts");
       if (existsSync(declaration)) {
         opts.references.push({ path: declaration });
         opts.nodeReferences.push({ path: declaration });
@@ -5621,10 +5610,18 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
   }
   nuxt.options.build.transpile.push("nuxt/app");
   nuxt.options.build.transpile.push(
-    ...nuxt.options._layers.filter((i) => i.cwd.includes("node_modules")).map((i) => i.cwd)
+    ...layerDirs.filter((i) => i.root.includes("node_modules")).map((i) => i.root.replace(/\/$/, ""))
   );
-  const locallyScannedLayersDirs = nuxt.options._layers.map((l) => resolve(l.cwd, "layers").replace(/\/?$/, "/"));
-  nuxt.options.modulesDir.push(...nuxt.options._layers.filter((l) => l.cwd !== nuxt.options.rootDir && locallyScannedLayersDirs.every((dir) => !l.cwd.startsWith(dir))).map((l) => resolve(l.cwd, "node_modules")));
+  const locallyScannedLayersDirs = layerDirs.map((l) => join(l.root, "layers/"));
+  const rootWithTrailingSlash = withTrailingSlash(nuxt.options.rootDir);
+  for (const dirs of layerDirs) {
+    if (dirs.root === rootWithTrailingSlash) {
+      continue;
+    }
+    if (locallyScannedLayersDirs.every((dir) => !dirs.root.startsWith(dir))) {
+      nuxt.options.modulesDir.push(join(dirs.root, "node_modules"));
+    }
+  }
   await nuxt.callHook("modules:before");
   const { paths: watchedModulePaths, resolvedModulePaths, modules } = await resolveModules(nuxt);
   nuxt.options.watch.push(...watchedModulePaths);
@@ -5816,7 +5813,7 @@ export default defineNuxtPlugin({
     if (watchedModulePaths.has(path)) {
       return nuxt.callHook("restart", { hard: true });
     }
-    const layerRelativePaths = new Set(nuxt.options._layers.map((l) => relative(l.config.srcDir || l.cwd, path)));
+    const layerRelativePaths = new Set(getLayerDirectories(nuxt).map((l) => relative(l.app, path)));
     for (const pattern of nuxt.options.watch) {
       if (typeof pattern === "string") {
         if (pattern === path || layerRelativePaths.has(pattern)) {
@@ -5995,10 +5992,10 @@ async function resolveModules(nuxt) {
         }
       }
     }
-    const modulesDir = (config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : config.dir)?.modules || "modules";
-    const layerModules = await resolveFiles(config.srcDir, [
-      `${modulesDir}/*{${nuxt.options.extensions.join(",")}}`,
-      `${modulesDir}/*/index{${nuxt.options.extensions.join(",")}}`
+    const modulesDir = resolve(config.srcDir, (config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : config.dir)?.modules || "modules");
+    const layerModules = await resolveFiles(modulesDir, [
+      `*{${nuxt.options.extensions.join(",")}}`,
+      `*/index{${nuxt.options.extensions.join(",")}}`
     ]);
     for (const module of layerModules) {
       paths.add(module);
@@ -6049,6 +6046,9 @@ async function resolveTypescriptPaths(nuxt) {
   })).then((r) => r.flat()));
   return paths;
 }
+function withTrailingSlash(dir) {
+  return dir.replace(/[^/]$/, "$&/");
+}
 
 const vueShim = {
   filename: "types/vue-shim.d.ts",
@@ -6741,26 +6741,18 @@ async function compileTemplate(template, ctx) {
   throw new Error("[nuxt] Invalid template. Templates must have either `src` or `getContents`: " + JSON.stringify(template));
 }
 async function resolveApp(nuxt, app) {
-  app.mainComponent ||= await findPath(
-    nuxt.options._layers.flatMap((layer) => [
-      join(layer.config.srcDir, "App"),
-      join(layer.config.srcDir, "app")
-    ])
-  );
+  const layerDirs = getLayerDirectories(nuxt);
+  const reversedLayerDirs = [...layerDirs].reverse();
+  app.mainComponent ||= await findPath(layerDirs.flatMap((d) => [join(d.app, "App"), join(d.app, "app")]));
   app.mainComponent ||= resolve(nuxt.options.appDir, "components/welcome.vue");
   app.rootComponent ||= await findPath(["~/app.root", resolve(nuxt.options.appDir, "components/nuxt-root.vue")]);
-  app.errorComponent ||= await findPath(
-    nuxt.options._layers.map((layer) => join(layer.config.srcDir, "error"))
-  ) ?? resolve(nuxt.options.appDir, "components/nuxt-error-page.vue");
+  app.errorComponent ||= await findPath(layerDirs.map((d) => join(d.app, "error"))) ?? resolve(nuxt.options.appDir, "components/nuxt-error-page.vue");
   const extensionGlob = nuxt.options.extensions.join(",");
-  const layerConfigs = nuxt.options._layers.map((layer) => layer.config);
-  const reversedConfigs = layerConfigs.slice().reverse();
   const layouts = {};
-  for (const config of layerConfigs) {
-    const layoutDir = (config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : config.dir)?.layouts || "layouts";
-    const layoutFiles = await resolveFiles(config.srcDir, `${layoutDir}/**/*{${extensionGlob}}`);
+  for (const dirs of layerDirs) {
+    const layoutFiles = await resolveFiles(dirs.appLayouts, `**/*{${extensionGlob}}`);
     for (const file of layoutFiles) {
-      const name = getNameFromPath(file, resolve(config.srcDir, layoutDir));
+      const name = getNameFromPath(file, dirs.appLayouts);
       if (!name) {
         logger.warn(`No layout name could be resolved for \`${resolveToAlias(file, nuxt)}\`. Bear in mind that \`index\` is ignored for the purpose of creating a layout name.`);
         continue;
@@ -6769,11 +6761,10 @@ async function resolveApp(nuxt, app) {
     }
   }
   let middleware = [];
-  for (const config of reversedConfigs) {
-    const middlewareDir = (config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : config.dir)?.middleware || "middleware";
-    const middlewareFiles = await resolveFiles(config.srcDir, [
-      `${middlewareDir}/*{${extensionGlob}}`,
-      `${middlewareDir}/*/index{${extensionGlob}}`
+  for (const dirs of reversedLayerDirs) {
+    const middlewareFiles = await resolveFiles(dirs.appMiddleware, [
+      `*{${extensionGlob}}`,
+      `*/index{${extensionGlob}}`
     ]);
     for (const file of middlewareFiles) {
       const name = getNameFromPath(file);
@@ -6784,15 +6775,17 @@ async function resolveApp(nuxt, app) {
       middleware.push({ name, path: file, global: hasSuffix(file, ".global") });
     }
   }
+  const reversedLayers = nuxt.options._layers.slice().reverse();
   let plugins = [];
-  for (const config of reversedConfigs) {
-    const pluginDir = (config.rootDir === nuxt.options.rootDir ? nuxt.options.dir : config.dir)?.plugins || "plugins";
+  for (let i = 0; i < reversedLayerDirs.length; i++) {
+    const config = reversedLayers[i].config;
+    const dirs = reversedLayerDirs[i];
     plugins.push(...[
       ...config.plugins || [],
-      ...config.srcDir ? await resolveFiles(config.srcDir, [
-        `${pluginDir}/*{${extensionGlob}}`,
-        `${pluginDir}/*/index{${extensionGlob}}`
-      ]) : []
+      ...await resolveFiles(dirs.appPlugins, [
+        `*{${extensionGlob}}`,
+        `*/index{${extensionGlob}}`
+      ])
     ].map((plugin) => normalizePlugin(plugin)));
   }
   for (const p of [...nuxt.options.plugins].reverse()) {
@@ -6804,8 +6797,8 @@ async function resolveApp(nuxt, app) {
   middleware = uniqueBy(await resolvePaths(nuxt, [...middleware].reverse(), "path"), "name").reverse();
   plugins = uniqueBy(await resolvePaths(nuxt, plugins, "src"), "src");
   const configs = [];
-  for (const config of layerConfigs) {
-    const appConfigPath = await findPath(resolve(config.srcDir, "app.config"));
+  for (const dirs of layerDirs) {
+    const appConfigPath = await findPath(join(dirs.app, "app.config"));
     if (appConfigPath) {
       configs.push(appConfigPath);
     }
@@ -7170,8 +7163,8 @@ async function build(nuxt) {
     nuxt.hook("builder:watch", async (event, relativePath) => {
       if (event === "add" || event === "unlink") {
         const path = resolve(nuxt.options.srcDir, relativePath);
-        for (const layer of nuxt.options._layers) {
-          const relativePath2 = relative(layer.config.srcDir || layer.cwd, path);
+        for (const dirs of getLayerDirectories(nuxt)) {
+          const relativePath2 = relative(dirs.app, path);
           if (/^app\./i.test(relativePath2)) {
             app.mainComponent = void 0;
             break;
@@ -7236,7 +7229,7 @@ async function watch(nuxt) {
 function createWatcher() {
   const nuxt = useNuxt();
   const isIgnored2 = createIsIgnored(nuxt);
-  const watcher = watch$1(nuxt.options._layers.map((i) => i.config.srcDir).filter(Boolean), {
+  const watcher = watch$1(getLayerDirectories(nuxt).map((dirs) => dirs.app), {
     ...nuxt.options.watchers.chokidar,
     ignoreInitial: true,
     ignored: [isIgnored2, /[\\/]node_modules[\\/]/]
@@ -7368,12 +7361,11 @@ async function loadBuilder(nuxt, builder) {
 }
 function resolvePathsToWatch(nuxt, opts = {}) {
   const pathsToWatch = /* @__PURE__ */ new Set();
-  for (const layer of nuxt.options._layers) {
-    const dir = layer.config.srcDir || layer.cwd;
-    if (!dir || isIgnored(dir)) {
+  for (const dirs of getLayerDirectories(nuxt)) {
+    if (!dirs.app || isIgnored(dirs.app)) {
       continue;
     }
-    pathsToWatch.add(dir.replace(/[^/]$/, "$&/"));
+    pathsToWatch.add(dirs.app);
   }
   for (const pattern of nuxt.options.watch) {
     if (typeof pattern !== "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.0-29279319.00ede5ce",
+  "version": "4.1.0-29279382.7234ae61",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,10 +67,10 @@
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devalue": "^2.0.2",
     "@nuxt/devtools": "^2.6.3",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.0-29279319.00ede5ce",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.0-29279319.00ede5ce",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.0-29279382.7234ae61",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.0-29279382.7234ae61",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.0-29279319.00ede5ce",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.0-29279382.7234ae61",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.20",
     "c12": "^3.2.0",