@nuxt/kit 3.21.0 → 3.21.1

package/README.md

@@ -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';

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';

package/dist/index.mjs

@@ -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);
         }
@@ -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.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -37,28 +37,28 @@
     "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.5",
     "@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",
     "vite": "7.3.1",
-    "vitest": "3.2.4",
-    "webpack": "5.104.1",
-    "@nuxt/schema": "3.21.0"
+    "vitest": "4.0.18",
+    "webpack": "5.105.0",
+    "@nuxt/schema": "3.21.1"
   },
   "engines": {
     "node": ">=18.12.0"