@nuxt/kit 3.12.1 → 3.12.2

package/dist/index.d.mts

@@ -42,7 +42,8 @@ declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverV
  */
 declare function getNuxtModuleVersion(module: string | NuxtModule, nuxt?: Nuxt | any): Promise<string | false>;
 
-interface LoadNuxtConfigOptions extends LoadConfigOptions<NuxtConfig> {
+interface LoadNuxtConfigOptions extends Omit<LoadConfigOptions<NuxtConfig>, 'overrides'> {
+    overrides?: Exclude<LoadConfigOptions<NuxtConfig>['overrides'], Promise<any> | Function>;
 }
 declare function loadNuxtConfig(opts: LoadNuxtConfigOptions): Promise<NuxtOptions>;
 
@@ -243,8 +244,11 @@ declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
  * Note: By default plugin is prepended to the plugins array. You can use second argument to append (push) instead.
  * @example
  * ```js
+ * import { createResolver } from '@nuxt/kit'
+ * const resolver = createResolver(import.meta.url)
+ *
  * addPlugin({
- *   src: path.resolve(__dirname, 'templates/foo.js'),
+ *   src: resolver.resolve('templates/foo.js'),
  *   filename: 'foo.server.js' // [optional] only include in server bundle
  * })
  * ```

package/dist/index.d.ts

@@ -42,7 +42,8 @@ declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverV
  */
 declare function getNuxtModuleVersion(module: string | NuxtModule, nuxt?: Nuxt | any): Promise<string | false>;
 
-interface LoadNuxtConfigOptions extends LoadConfigOptions<NuxtConfig> {
+interface LoadNuxtConfigOptions extends Omit<LoadConfigOptions<NuxtConfig>, 'overrides'> {
+    overrides?: Exclude<LoadConfigOptions<NuxtConfig>['overrides'], Promise<any> | Function>;
 }
 declare function loadNuxtConfig(opts: LoadNuxtConfigOptions): Promise<NuxtOptions>;
 
@@ -243,8 +244,11 @@ declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
  * Note: By default plugin is prepended to the plugins array. You can use second argument to append (push) instead.
  * @example
  * ```js
+ * import { createResolver } from '@nuxt/kit'
+ * const resolver = createResolver(import.meta.url)
+ *
  * addPlugin({
- *   src: path.resolve(__dirname, 'templates/foo.js'),
+ *   src: resolver.resolve('templates/foo.js'),
  *   filename: 'foo.server.js' // [optional] only include in server bundle
  * })
  * ```

package/dist/index.mjs

@@ -2070,10 +2070,11 @@ async function compileTemplate(template$1, ctx) {
 const serialize = (data) => JSON.stringify(data, null, 2).replace(/"\{(.+)\}"(?=,?$)/gm, (r) => JSON.parse(r).replace(/^\{(.*)\}$/, "$1"));
 const importSources = (sources, { lazy = false } = {}) => {
   return toArray(sources).map((src) => {
+    const safeVariableName = genSafeVariableName(src);
     if (lazy) {
-      return `const ${genSafeVariableName(src)} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`;
+      return `const ${safeVariableName} = ${genDynamicImport(src, { comment: `webpackChunkName: ${JSON.stringify(src)}` })}`;
     }
-    return genImport(src, genSafeVariableName(src));
+    return genImport(src, safeVariableName);
   }).join("\n");
 };
 const importName = genSafeVariableName;
@@ -2212,7 +2213,7 @@ function getRequireCacheItem(id) {
   } catch (e) {
   }
 }
-function getModulePaths(paths) {
+function getNodeModulesPaths(paths) {
   return [].concat(
     global.__NUXT_PREPATHS__,
     paths || [],
@@ -2222,7 +2223,7 @@ function getModulePaths(paths) {
 }
 function resolveModule(id, opts = {}) {
   return normalize(_require.resolve(id, {
-    paths: getModulePaths(opts.paths)
+    paths: getNodeModulesPaths(opts.paths)
   }));
 }
 function requireModule(id, opts = {}) {
@@ -2445,8 +2446,14 @@ function existsInVFS(path, nuxt = tryUseNuxt()) {
   return templates.some((template) => template.dst === path);
 }
 async function resolveFiles(path, pattern, opts = {}) {
-  const files = await globby(pattern, { cwd: path, followSymbolicLinks: opts.followSymbolicLinks ?? true });
-  return files.map((p) => resolve(path, p)).filter((p) => !isIgnored(p)).sort();
+  const files = [];
+  for (const file of await globby(pattern, { cwd: path, followSymbolicLinks: opts.followSymbolicLinks ?? true })) {
+    const p = resolve(path, file);
+    if (!isIgnored(p)) {
+      files.push(p);
+    }
+  }
+  return files.sort();
 }
 
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
@@ -2551,9 +2558,10 @@ async function getNuxtModuleVersion(module, nuxt = useNuxt()) {
   if (!moduleMeta.name) {
     return false;
   }
-  const version = nuxt.options._installedModules.filter((m) => m.meta.name === moduleMeta.name).map((m) => m.meta.version)?.[0];
-  if (version) {
-    return version;
+  for (const m of nuxt.options._installedModules) {
+    if (m.meta.name === moduleMeta.name && m.meta.version) {
+      return m.meta.version;
+    }
   }
   if (hasNuxtModule(moduleMeta.name)) {
     const { buildTimeModuleMeta } = await loadNuxtModuleInstance(moduleMeta.name, nuxt);
@@ -2563,7 +2571,12 @@ async function getNuxtModuleVersion(module, nuxt = useNuxt()) {
 }
 
 const layerSchemaKeys = ["future", "srcDir", "rootDir", "dir"];
-const layerSchema = Object.fromEntries(Object.entries(NuxtConfigSchema).filter(([key]) => layerSchemaKeys.includes(key)));
+const layerSchema = /* @__PURE__ */ Object.create(null);
+for (const key of layerSchemaKeys) {
+  if (key in NuxtConfigSchema) {
+    layerSchema[key] = NuxtConfigSchema[key];
+  }
+}
 async function loadNuxtConfig(opts) {
   opts.overrides = defu$1(opts.overrides, {
     _extends: await globby("layers/*", {
@@ -2588,9 +2601,14 @@ async function loadNuxtConfig(opts) {
   nuxtConfig._nuxtConfigFile = configFile;
   nuxtConfig._nuxtConfigFiles = [configFile];
   const _layers = [];
+  const processedLayers = /* @__PURE__ */ new Set();
   for (const layer of layers) {
     layer.config = layer.config || {};
     layer.config.rootDir = layer.config.rootDir ?? layer.cwd;
+    if (processedLayers.has(layer.config.rootDir)) {
+      continue;
+    }
+    processedLayers.add(layer.config.rootDir);
     layer.config = await applyDefaults(layerSchema, layer.config);
     if (!layer.configFile || layer.configFile.endsWith(".nuxtrc")) {
       continue;
@@ -2980,12 +2998,44 @@ async function updateTemplates(options) {
   return await tryUseNuxt()?.hooks.callHook("builder:generateApp", options);
 }
 async function _generateTypes(nuxt) {
-  const nodeModulePaths = getModulePaths(nuxt.options.modulesDir);
   const rootDirWithSlash = withTrailingSlash(nuxt.options.rootDir);
-  const modulePaths = await resolveNuxtModule(
-    rootDirWithSlash,
-    nuxt.options._installedModules.filter((m) => m.entryPath).map((m) => getDirectory(m.entryPath))
-  );
+  const relativeRootDir = relativeWithDot(nuxt.options.buildDir, nuxt.options.rootDir);
+  const include = /* @__PURE__ */ new Set([
+    "./nuxt.d.ts",
+    join(relativeRootDir, ".config/nuxt.*"),
+    join(relativeRootDir, "**/*")
+  ]);
+  if (nuxt.options.srcDir !== nuxt.options.rootDir) {
+    include.add(join(relative(nuxt.options.buildDir, nuxt.options.srcDir), "**/*"));
+  }
+  if (nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.rootDir) {
+    include.add(join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), "**/*"));
+  }
+  for (const layer of nuxt.options._layers) {
+    const srcOrCwd = layer.config.srcDir ?? layer.cwd;
+    if (!srcOrCwd.startsWith(rootDirWithSlash) || srcOrCwd.includes("node_modules")) {
+      include.add(join(relative(nuxt.options.buildDir, srcOrCwd), "**/*"));
+    }
+  }
+  const exclude = /* @__PURE__ */ new Set([
+    // nitro generate output: https://github.com/nuxt/nuxt/blob/main/packages/nuxt/src/core/nitro.ts#L186
+    relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, "dist"))
+  ]);
+  for (const dir of nuxt.options.modulesDir) {
+    exclude.add(relativeWithDot(nuxt.options.buildDir, dir));
+  }
+  const moduleEntryPaths = [];
+  for (const m of nuxt.options._installedModules) {
+    if (m.entryPath) {
+      moduleEntryPaths.push(getDirectory(m.entryPath));
+    }
+  }
+  const modulePaths = await resolveNuxtModule(rootDirWithSlash, moduleEntryPaths);
+  for (const path of modulePaths) {
+    const relative2 = relativeWithDot(nuxt.options.buildDir, path);
+    include.add(join(relative2, "runtime"));
+    exclude.add(join(relative2, "runtime/server"));
+  }
   const isV4 = nuxt.options.future?.compatibilityVersion === 4;
   const hasTypescriptVersionWithModulePreserve = await readPackageJSON("typescript", { url: nuxt.options.modulesDir }).then((r) => r?.version && gte(r.version, "5.4.0")).catch(() => isV4);
   const tsConfig = defu(nuxt.options.typescript?.tsConfig, {
@@ -3029,21 +3079,8 @@ async function _generateTypes(nuxt) {
       /* enabled with `strict` */
       allowSyntheticDefaultImports: true
     },
-    include: [
-      "./nuxt.d.ts",
-      join(relativeWithDot(nuxt.options.buildDir, nuxt.options.rootDir), ".config/nuxt.*"),
-      join(relativeWithDot(nuxt.options.buildDir, nuxt.options.rootDir), "**/*"),
-      ...nuxt.options.srcDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.srcDir), "**/*")] : [],
-      ...nuxt.options._layers.map((layer) => layer.config.srcDir ?? layer.cwd).filter((srcOrCwd) => !srcOrCwd.startsWith(rootDirWithSlash) || srcOrCwd.includes("node_modules")).map((srcOrCwd) => join(relative(nuxt.options.buildDir, srcOrCwd), "**/*")),
-      ...nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), "**/*")] : [],
-      ...modulePaths.map((m) => join(relativeWithDot(nuxt.options.buildDir, m), "runtime"))
-    ],
-    exclude: [
-      ...nuxt.options.modulesDir.map((m) => relativeWithDot(nuxt.options.buildDir, m)),
-      ...modulePaths.map((m) => join(relativeWithDot(nuxt.options.buildDir, m), "runtime/server")),
-      // nitro generate output: https://github.com/nuxt/nuxt/blob/main/packages/nuxt/src/core/nitro.ts#L186
-      relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, "dist"))
-    ]
+    include: [...include],
+    exclude: [...exclude]
   });
   const aliases = {
     ...nuxt.options.alias,
@@ -3084,10 +3121,14 @@ async function _generateTypes(nuxt) {
       }
     }
   }
-  const references = await Promise.all([
-    ...nuxt.options.modules,
-    ...nuxt.options._modules
-  ].filter((f) => typeof f === "string").map(async (id) => ({ types: (await readPackageJSON(id, { url: nodeModulePaths }).catch(() => null))?.name || id })));
+  const references = [];
+  await Promise.all([...nuxt.options.modules, ...nuxt.options._modules].map(async (id) => {
+    if (typeof id !== "string") {
+      return;
+    }
+    const pkg = await readPackageJSON(id, { url: getNodeModulesPaths(nuxt.options.modulesDir) }).catch(() => null);
+    references.push({ types: pkg?.name || id });
+  }));
   const declarations = [];
   await nuxt.callHook("prepare:types", { references, declarations, tsConfig });
   for (const alias in tsConfig.compilerOptions.paths) {
@@ -3136,7 +3177,11 @@ async function writeTypes(nuxt) {
   await writeFile();
 }
 function renderAttrs(obj) {
-  return Object.entries(obj).map((e) => renderAttr(e[0], e[1])).join(" ");
+  const attrs = [];
+  for (const key in obj) {
+    attrs.push(renderAttr(key, obj[key]));
+  }
+  return attrs.join(" ");
 }
 function renderAttr(key, value) {
   return value ? `${key}="${value}"` : "";
@@ -3200,13 +3245,14 @@ function addRouteMiddleware(input, options = {}) {
     for (const middleware of middlewares) {
       const find = app.middleware.findIndex((item) => item.name === middleware.name);
       if (find >= 0) {
-        if (app.middleware[find].path === middleware.path) {
+        const foundPath = app.middleware[find].path;
+        if (foundPath === middleware.path) {
           continue;
         }
         if (options.override === true) {
           app.middleware[find] = { ...middleware };
         } else {
-          logger.warn(`'${middleware.name}' middleware already exists at '${app.middleware[find].path}'. You can set \`override: true\` to replace it.`);
+          logger.warn(`'${middleware.name}' middleware already exists at '${foundPath}'. You can set \`override: true\` to replace it.`);
         }
       } else {
         app.middleware.push({ ...middleware });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.12.1",
+  "version": "3.12.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,7 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^1.10.0",
+    "c12": "^1.11.1",
     "consola": "^3.2.3",
     "defu": "^6.1.4",
     "destr": "^2.0.3",
@@ -42,7 +42,7 @@
     "unctx": "^2.3.1",
     "unimport": "^3.7.2",
     "untyped": "^1.4.2",
-    "@nuxt/schema": "3.12.1"
+    "@nuxt/schema": "3.12.2"
   },
   "devDependencies": {
     "@types/hash-sum": "1.0.2",
@@ -51,9 +51,9 @@
     "lodash-es": "4.17.21",
     "nitropack": "2.9.6",
     "unbuild": "latest",
-    "vite": "5.2.13",
+    "vite": "5.3.1",
     "vitest": "1.6.0",
-    "webpack": "5.91.0"
+    "webpack": "5.92.0"
   },
   "engines": {
     "node": "^14.18.0 || >=16.10.0"