@nuxt/kit 3.21.0 → 3.21.2

package/README.md

@@ -1,15 +1,15 @@
-[![Nuxt banner](https://github.com/nuxt/nuxt/blob/main/.github/assets/banner.svg)](https://nuxt.com)
+<a href="https://nuxt.com"><img width="830" height="213" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/banner.svg" alt="Nuxt banner"></a>
 
 # Nuxt
 
 <p>
-  <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/v/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="Version"></a>
-  <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/dm/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="Downloads"></a>
+  <a href="https://npmx.dev/package/nuxt"><img src="https://npmx.dev/api/registry/badge/version/nuxt" alt="Version"></a>
+  <a href="https://npmx.dev/package/nuxt"><img src="https://npmx.dev/api/registry/badge/downloads/nuxt" alt="Downloads"></a>
   <a href="https://github.com/nuxt/nuxt/blob/main/LICENSE"><img src="https://img.shields.io/github/license/nuxt/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="License"></a>
   <a href="https://nuxt.com/modules"><img src="https://img.shields.io/badge/dynamic/json?url=https://nuxt.com/api/v1/modules&query=$.stats.modules&label=Modules&style=flat&colorA=18181B&colorB=28CF8D" alt="Modules"></a>
   <a href="https://nuxt.com"><img src="https://img.shields.io/badge/Nuxt%20Docs-18181B?logo=nuxt" alt="Website"></a>
   <a href="https://chat.nuxt.dev"><img src="https://img.shields.io/badge/Nuxt%20Discord-18181B?logo=discord" alt="Discord"></a>
-  <a href="https://securityscorecards.dev/"><img src="https://api.securityscorecards.dev/projects/github.com/nuxt/nuxt/badge" alt="Nuxt openssf scorecard score"></a>
+  <a href="https://securityscorecards.dev/viewer/?uri=github.com/nuxt/nuxt"><img src="https://api.securityscorecards.dev/projects/github.com/nuxt/nuxt/badge" alt="Nuxt openssf scorecard score"></a>
   <a href="https://deepwiki.com/nuxt/nuxt"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
 </p>
 
@@ -111,7 +111,7 @@ Follow the docs to [Set Up Your Local Development Environment](https://nuxt.com/
 ## <a name="follow-us">🔗 Follow Us</a>
 
 <p valign="center">
-  <a href="https://go.nuxt.com/discord"><img width="20px" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/x"><img width="20px" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/github"><img width="20px" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/github.svg" alt="GitHub"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/bluesky"><img width="20px" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/bluesky.svg" alt="Bluesky"></a>
+  <a href="https://go.nuxt.com/discord"><img width="20" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/x"><img width="20" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/github"><img width="20" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/github.svg" alt="GitHub"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/bluesky"><img width="20" src="https://github.com/nuxt/nuxt/blob/main/.github/assets/bluesky.svg" alt="Bluesky"></a>
 </p>
 
 ## <a name="license">⚖️ License</a>

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
+import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, NuxtServerTemplate, ResolvedNuxtTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
@@ -489,7 +489,7 @@ declare function addServerImportsDir(dirs: string | string[], opts?: {
 }): void;
 /**
  * Add directories to be scanned by Nitro. It will check for subdirectories,
- * which will be registered just like the `~/server` folder is.
+ * which will be registered just like the `~~/server` folder is.
  */
 declare function addServerScanDir(dirs: string | string[], opts?: {
     prepend?: boolean;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
+import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, NuxtCompatibility, NuxtCompatibilityIssues, Component, ComponentsDir, NuxtTemplate, NuxtMiddleware, NuxtHooks, NuxtPlugin, NuxtPluginTemplate, NuxtServerTemplate, ResolvedNuxtTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
@@ -489,7 +489,7 @@ declare function addServerImportsDir(dirs: string | string[], opts?: {
 }): void;
 /**
  * Add directories to be scanned by Nitro. It will check for subdirectories,
- * which will be registered just like the `~/server` folder is.
+ * which will be registered just like the `~~/server` folder is.
  */
 declare function addServerScanDir(dirs: string | string[], opts?: {
     prepend?: boolean;

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { applyDefaults } from 'untyped';
 import { dirname, resolve, relative, join, normalize, isAbsolute, basename, parse } from 'pathe';
 import { consola } from 'consola';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { getContext, createContext } from 'unctx';
+import { getContext } from 'unctx';
 import satisfies from 'semver/functions/satisfies.js';
 import { readPackageJSON, resolvePackageJSON } from 'pkg-types';
 import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork';
@@ -34,7 +34,7 @@ function useLogger(tag, options = {}) {
 }
 
 const nuxtCtx = getContext("nuxt");
-const asyncNuxtStorage = createContext({
+const asyncNuxtStorage = getContext("asyncNuxtStorage", {
   asyncContext: true,
   AsyncLocalStorage
 });
@@ -2576,8 +2576,23 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   }
   nuxt._moduleOptionsFunctions ||= /* @__PURE__ */ new Map();
   const resolvedModules = [];
+  const modulesByMetaName = /* @__PURE__ */ new Map();
   const inlineConfigKeys = new Set(
-    await Promise.all([...modulesToInstall].map(([mod]) => typeof mod !== "string" && Promise.resolve(mod.getMeta?.())?.then((r) => r?.configKey)))
+    await Promise.all([...modulesToInstall].map(async ([mod]) => {
+      if (typeof mod === "string") {
+        return;
+      }
+      const meta = await Promise.resolve(mod.getMeta?.());
+      if (meta?.name) {
+        modulesByMetaName.set(meta.name, mod);
+      }
+      if (meta?.configKey) {
+        if (meta.configKey !== meta.name) {
+          modulesByMetaName.set(meta.configKey, mod);
+        }
+        return meta.configKey;
+      }
+    }))
   );
   let error;
   const dependencyMap = /* @__PURE__ */ new Map();
@@ -2593,7 +2608,7 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
       if (!value.overrides && !value.defaults && !value.version && value.optional) {
         continue;
       }
-      const resolvedModule = resolveModuleWithOptions(name, nuxt);
+      const resolvedModule = modulesByMetaName.has(name) ? resolveModuleWithOptions(modulesByMetaName.get(name), nuxt) : resolveModuleWithOptions(name, nuxt);
       const moduleToAttribute = typeof key === "string" ? `\`${key}\`` : "a module in `nuxt.options`";
       if (!resolvedModule?.module) {
         const message = `Could not resolve \`${name}\` (specified as a dependency of ${moduleToAttribute}).`;
@@ -2603,7 +2618,7 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
       if (value.version) {
         const resolvePaths = [res.resolvedModulePath, ...nuxt.options.modulesDir].filter(Boolean);
         const pkg = await readPackageJSON(name, { from: resolvePaths }).catch(() => null);
-        if (pkg?.version && !semver.satisfies(pkg.version, value.version)) {
+        if (pkg?.version && !semver.satisfies(pkg.version, value.version, { includePrerelease: true })) {
           const message = `Module \`${name}\` version (\`${pkg.version}\`) does not satisfy \`${value.version}\` (requested by ${moduleToAttribute}).`;
           error = new TypeError(message);
         }
@@ -2643,15 +2658,15 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   if (error) {
     throw error;
   }
-  for (const { nuxtModule, meta = {}, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions: inlineOptions2 } of resolvedModules) {
+  for (const { nuxtModule, meta = {}, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions } of resolvedModules) {
     const configKey = meta.configKey;
-    const optionsFns = [
+    const optionsFns = /* @__PURE__ */ new Set([
       ...nuxt._moduleOptionsFunctions.get(moduleToInstall) || [],
       ...meta?.name ? nuxt._moduleOptionsFunctions.get(meta.name) || [] : [],
       // TODO: consider dropping options functions keyed by config key
       ...configKey ? nuxt._moduleOptionsFunctions.get(configKey) || [] : []
-    ];
-    if (optionsFns.length > 0) {
+    ]);
+    if (optionsFns.size > 0) {
       const overrides = [];
       const defaults = [];
       for (const fn of optionsFns) {
@@ -2665,10 +2680,10 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
     }
     const isDisabled = configKey && !ignoredConfigKeys.has(configKey) && nuxt.options[configKey] === false;
     if (!isDisabled) {
-      await callLifecycleHooks(nuxtModule, meta, inlineOptions2, nuxt);
+      await callLifecycleHooks(nuxtModule, meta, inlineOptions, nuxt);
     }
     const path = typeof moduleToInstall === "string" ? moduleToInstall : void 0;
-    await callModule(nuxt, nuxtModule, inlineOptions2, {
+    await callModule(nuxt, nuxtModule, inlineOptions, {
       meta: defu({ disabled: isDisabled }, meta, buildTimeModuleMeta),
       nameOrPath: path,
       modulePath: resolvedModulePath || path,
@@ -2677,7 +2692,7 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   }
   delete nuxt._moduleOptionsFunctions;
 }
-async function installModule(moduleToInstall, inlineOptions2, nuxt = useNuxt()) {
+async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
   const { nuxtModule, buildTimeModuleMeta, resolvedModulePath } = await loadNuxtModuleInstance(moduleToInstall, nuxt);
   const localLayerModuleDirs = [];
   for (const dirs of getLayerDirectories(nuxt)) {
@@ -2686,7 +2701,7 @@ async function installModule(moduleToInstall, inlineOptions2, nuxt = useNuxt())
     }
   }
   const meta = await nuxtModule.getMeta?.();
-  let mergedOptions = inlineOptions2;
+  let mergedOptions = inlineOptions;
   const configKey = meta?.configKey;
   if (configKey && nuxt._moduleOptionsFunctions) {
     const optionsFns = [
@@ -2701,7 +2716,7 @@ async function installModule(moduleToInstall, inlineOptions2, nuxt = useNuxt())
         overrides.push(options.overrides);
         defaults.push(options.defaults);
       }
-      mergedOptions = defu(inlineOptions2, ...overrides, nuxt.options[configKey], ...defaults);
+      mergedOptions = defu(inlineOptions, ...overrides, nuxt.options[configKey], ...defaults);
       nuxt.options[configKey] = mergedOptions;
     }
   }
@@ -2798,7 +2813,7 @@ const normalizeModuleTranspilePath = (p) => {
   return getDirectory(p).split("node_modules/").pop();
 };
 const MissingModuleMatcher = /Cannot find module\s+['"]?([^'")\s]+)['"]?/i;
-async function callLifecycleHooks(nuxtModule, meta = {}, inlineOptions2, nuxt = useNuxt()) {
+async function callLifecycleHooks(nuxtModule, meta = {}, inlineOptions, nuxt = useNuxt()) {
   if (!meta.name || !meta.version) {
     return;
   }
@@ -2811,7 +2826,7 @@ async function callLifecycleHooks(nuxtModule, meta = {}, inlineOptions2, nuxt =
     if (!previousVersion) {
       await nuxtModule.onInstall?.(nuxt);
     } else if (semver.gt(meta.version, previousVersion)) {
-      await nuxtModule.onUpgrade?.(nuxt, inlineOptions2, previousVersion);
+      await nuxtModule.onUpgrade?.(nuxt, inlineOptions, previousVersion);
     }
     if (previousVersion !== meta.version) {
       update(
@@ -2829,7 +2844,7 @@ async function callModule(nuxt, nuxtModule, moduleOptions = {}, options) {
   const modulePath = options.modulePath;
   const nameOrPath = options.nameOrPath;
   const localLayerModuleDirs = options.localLayerModuleDirs;
-  const fn = () => isNuxtMajorVersion(2, nuxt) ? nuxtModule.call(nuxt.moduleContainer, inlineOptions, nuxt) : nuxt.options.experimental?.debugModuleMutation && nuxt._asyncLocalStorageModule ? nuxt._asyncLocalStorageModule.run(nuxtModule, () => nuxtModule(moduleOptions, nuxt)) : nuxtModule(moduleOptions, nuxt);
+  const fn = () => isNuxtMajorVersion(2, nuxt) ? nuxtModule.call(nuxt.moduleContainer, moduleOptions, nuxt) : nuxt.options.experimental?.debugModuleMutation && nuxt._asyncLocalStorageModule ? nuxt._asyncLocalStorageModule.run(nuxtModule, () => nuxtModule(moduleOptions, nuxt)) : nuxtModule(moduleOptions, nuxt);
   const res = options.meta.disabled ? false : await fn();
   let entryPath;
   if (typeof modulePath === "string") {
@@ -2981,7 +2996,7 @@ async function loadNuxtConfig(opts) {
   }
   return await applyDefaults(NuxtConfigSchema, nuxtConfig);
 }
-async function loadNuxtSchema(cwd) {
+function loadNuxtSchema(cwd) {
   const url = directoryToURL(cwd);
   const urls = [url];
   const nuxtPath = resolveModuleURL("nuxt", { try: true, from: url }) ?? resolveModuleURL("nuxt-nightly", { try: true, from: url });
@@ -2989,7 +3004,7 @@ async function loadNuxtSchema(cwd) {
     urls.unshift(nuxtPath);
   }
   const schemaPath = resolveModuleURL("@nuxt/schema", { try: true, from: urls }) ?? "@nuxt/schema";
-  return await import(schemaPath).then((r) => r.NuxtConfigSchema);
+  return import(schemaPath).then((r) => r.NuxtConfigSchema);
 }
 async function withDefineNuxtConfig(fn) {
   const key = "defineNuxtConfig";
@@ -3486,7 +3501,7 @@ function normalizeTemplate(template, buildDir) {
   return template;
 }
 async function updateTemplates(options) {
-  return await tryUseNuxt()?.hooks.callHook("builder:generateApp", options);
+  await tryUseNuxt()?.hooks.callHook("builder:generateApp", options);
 }
 const EXTENSION_RE = /\b(?:\.d\.[cm]?ts|\.\w+)$/g;
 const excludedAlias = [/^@vue\/.*$/, /^#internal\/nuxt/];
@@ -3676,12 +3691,7 @@ async function _generateTypes(nuxt) {
   tsConfig.include = [...new Set(tsConfig.include.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
   tsConfig.exclude = [...new Set(tsConfig.exclude.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
   const declaration = [
-    ...references.map((ref) => {
-      if ("path" in ref && isAbsolute(ref.path)) {
-        ref.path = relative(nuxt.options.buildDir, ref.path);
-      }
-      return `/// <reference ${renderAttrs(ref)} />`;
-    }),
+    ...references.map((ref) => renderReference(ref, nuxt.options.buildDir)),
     ...declarations,
     "",
     "export {}",
@@ -3713,15 +3723,9 @@ function sortTsPaths(paths) {
     }
   }
 }
-function renderAttrs(obj) {
-  const attrs = [];
-  for (const key in obj) {
-    attrs.push(renderAttr(key, obj[key]));
-  }
-  return attrs.join(" ");
-}
-function renderAttr(key, value) {
-  return value ? `${key}="${value}"` : "";
+function renderReference(ref, baseDir) {
+  const stuff = "path" in ref ? `path="${isAbsolute(ref.path) ? relative(baseDir, ref.path) : ref.path}"` : `types="${ref.types}"`;
+  return `/// <reference ${stuff} />`;
 }
 const RELATIVE_WITH_DOT_RE = /^([^.])/;
 function relativeWithDot(from, to) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.21.0",
+  "version": "3.21.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -33,32 +33,32 @@
     "jiti": "^2.6.1",
     "klona": "^2.0.6",
     "knitwork": "^1.3.0",
-    "mlly": "^1.8.0",
+    "mlly": "^1.8.1",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
-    "rc9": "^2.1.2",
+    "rc9": "^3.0.0",
     "scule": "^1.3.0",
-    "semver": "^7.7.3",
+    "semver": "^7.7.4",
     "tinyglobby": "^0.2.15",
     "ufo": "^1.6.3",
     "unctx": "^2.5.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.7.2",
+    "@rspack/core": "1.7.8",
     "@types/lodash-es": "4.17.12",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
-    "lodash-es": "4.17.22",
-    "nitro": "3.0.1-alpha.1",
+    "lodash-es": "4.17.23",
+    "nitro": "3.0.1-alpha.2",
     "nitropack": "2.13.1",
     "unbuild": "3.6.1",
-    "unimport": "5.6.0",
+    "unimport": "6.0.1",
     "vite": "7.3.1",
-    "vitest": "3.2.4",
-    "webpack": "5.104.1",
-    "@nuxt/schema": "3.21.0"
+    "vitest": "4.0.18",
+    "webpack": "5.105.4",
+    "@nuxt/schema": "3.21.2"
   },
   "engines": {
     "node": ">=18.12.0"