@nuxt/kit 3.20.0 → 3.20.2

package/README.md

@@ -1,11 +1,11 @@
-[![Nuxt banner](https://github.com/nuxt/nuxt/tree/main/.github/assets/banner.svg)](https://nuxt.com)
+[![Nuxt banner](https://github.com/nuxt/nuxt/blob/main/.github/assets/banner.svg)](https://nuxt.com)
 
 # 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://github.com/nuxt/nuxt/tree/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://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"><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>
@@ -14,13 +14,13 @@
 Nuxt is a free and open-source framework with an intuitive and extendable way to create type-safe, performant and production-grade full-stack web applications and websites with Vue.js.
 
 It provides a number of features that make it easy to build fast, SEO-friendly, and scalable web applications, including:
-- Server-side rendering, Static Site Generation, Hybrid Rendering and Edge-Side Rendering
+- Server-side rendering, static site generation, hybrid rendering and edge-side rendering
 - Automatic routing with code-splitting and pre-fetching
 - Data fetching and state management
-- SEO Optimization and Meta tags definition
+- Search engine optimization and defining meta tags
 - Auto imports of components, composables and utils
 - TypeScript with zero configuration
-- Go fullstack with our server/ directory
+- Go full-stack with our server/ directory
 - Extensible with [200+ modules](https://nuxt.com/modules)
 - Deployment to a variety of [hosting platforms](https://nuxt.com/deploy)
 - ...[and much more](https://nuxt.com) 🚀
@@ -31,7 +31,7 @@ It provides a number of features that make it easy to build fast, SEO-friendly,
 - 💻 [ Vue Development](#vue-development)
 - 📖 [Documentation](#documentation)
 - 🧩 [Modules](#modules)
-- ❤️  [Contribute](#contribute)
+- ❤️ [Contribute](#contribute)
 - 🏠 [Local Development](#local-development)
 - 🛟 [Professional Support](#professional-support)
 - 🔗 [Follow Us](#follow-us)
@@ -109,9 +109,9 @@ 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/tree/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/tree/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/tree/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/tree/main/.github/assets/bluesky.svg" alt="Bluesky"></a>
+  <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>
 </p>
 
 ## <a name="license">⚖️ License</a>
 
-[MIT](https://github.com/nuxt/nuxt/tree/main/LICENSE)
+[MIT](https://github.com/nuxt/nuxt/blob/main/LICENSE)

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, ImportPresetWithDeprecation, 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, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
-import { Import } from 'unimport';
+import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
@@ -124,7 +124,7 @@ declare function addImports(imports: Import | Import[]): void;
 declare function addImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
 }): void;
-declare function addImportsSources(presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]): void;
+declare function addImportsSources(presets: InlinePreset | InlinePreset[]): void;
 
 /**
  * Access 'resolved' Nuxt runtime configuration, with values updated from environment.

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, NuxtAppConfig, ImportPresetWithDeprecation, 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, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
-import { Import } from 'unimport';
+import { Import, InlinePreset } from 'unimport';
 import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
@@ -124,7 +124,7 @@ declare function addImports(imports: Import | Import[]): void;
 declare function addImportsDir(dirs: string | string[], opts?: {
     prepend?: boolean;
 }): void;
-declare function addImportsSources(presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]): void;
+declare function addImportsSources(presets: InlinePreset | InlinePreset[]): void;
 
 /**
  * Access 'resolved' Nuxt runtime configuration, with values updated from environment.

package/dist/index.mjs

@@ -11,17 +11,17 @@ import { readPackageJSON, resolvePackageJSON } from 'pkg-types';
 import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createJiti } from 'jiti';
-import { parseNodeModulePath, interopDefault, resolveModuleExportNames } from 'mlly';
+import { parseNodeModulePath, interopDefault, lookupNodeModuleSubpath, resolveModuleExportNames } from 'mlly';
 import { resolveModulePath, resolveModuleURL } from 'exsolve';
 import { isRelative, withTrailingSlash as withTrailingSlash$2 } from 'ufo';
 import { read, update } from 'rc9';
 import semver, { gte } from 'semver';
 import { captureStackTrace } from 'errx';
+import process from 'node:process';
 import { glob } from 'tinyglobby';
 import { resolveAlias as resolveAlias$1, reverseResolveAlias } from 'pathe/utils';
 import ignore from 'ignore';
 import { loadConfig } from 'c12';
-import process$1 from 'node:process';
 import destr from 'destr';
 import { snakeCase, pascalCase, kebabCase } from 'scule';
 import { klona } from 'klona';
@@ -2573,7 +2573,7 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
       localLayerModuleDirs.push(resolve(srcDir, l.config?.dir?.modules || "modules").replace(/\/?$/, "/"));
     }
   }
-  const optionsFunctions = /* @__PURE__ */ new Map();
+  nuxt._moduleOptionsFunctions ||= /* @__PURE__ */ new Map();
   const resolvedModules = [];
   const inlineConfigKeys = new Set(
     await Promise.all([...modulesToInstall].map(([mod]) => typeof mod !== "string" && Promise.resolve(mod.getMeta?.())?.then((r) => r?.configKey)))
@@ -2608,8 +2608,8 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
         }
       }
       if (value.overrides || value.defaults) {
-        const currentFns = optionsFunctions.get(resolvedModule.module) || [];
-        optionsFunctions.set(resolvedModule.module, [
+        const currentFns = nuxt._moduleOptionsFunctions.get(resolvedModule.module) || [];
+        nuxt._moduleOptionsFunctions.set(resolvedModule.module, [
           ...currentFns,
           () => ({ defaults: value.defaults, overrides: value.overrides })
         ]);
@@ -2644,25 +2644,28 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   }
   for (const { nuxtModule, meta, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions } of resolvedModules) {
     const configKey = meta?.configKey;
-    if (configKey) {
-      const optionsFns = [
-        ...optionsFunctions.get(moduleToInstall) || [],
-        ...optionsFunctions.get(configKey) || []
-      ];
-      if (optionsFns.length > 0) {
-        const overrides = [];
-        const defaults = [];
-        for (const fn of optionsFns) {
-          const options = fn();
-          overrides.push(options.overrides);
-          defaults.push(options.defaults);
-        }
+    const optionsFns = [
+      ...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) {
+      const overrides = [];
+      const defaults = [];
+      for (const fn of optionsFns) {
+        const options = fn();
+        overrides.push(options.overrides);
+        defaults.push(options.defaults);
+      }
+      if (configKey) {
         nuxt.options[configKey] = defu(...overrides, nuxt.options[configKey], ...defaults);
       }
     }
     await callLifecycleHooks(nuxtModule, meta, inlineOptions, nuxt);
     await callModule(nuxtModule, meta, inlineOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt);
   }
+  delete nuxt._moduleOptionsFunctions;
 }
 async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
   const { nuxtModule, buildTimeModuleMeta, resolvedModulePath } = await loadNuxtModuleInstance(moduleToInstall, nuxt);
@@ -2673,8 +2676,27 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
     }
   }
   const meta = await nuxtModule.getMeta?.();
-  await callLifecycleHooks(nuxtModule, meta, inlineOptions, nuxt);
-  await callModule(nuxtModule, meta, inlineOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt);
+  let mergedOptions = inlineOptions;
+  const configKey = meta?.configKey;
+  if (configKey && nuxt._moduleOptionsFunctions) {
+    const optionsFns = [
+      ...nuxt._moduleOptionsFunctions.get(moduleToInstall) || [],
+      ...nuxt._moduleOptionsFunctions.get(configKey) || []
+    ];
+    if (optionsFns.length > 0) {
+      const overrides = [];
+      const defaults = [];
+      for (const fn of optionsFns) {
+        const options = fn();
+        overrides.push(options.overrides);
+        defaults.push(options.defaults);
+      }
+      mergedOptions = defu(inlineOptions, ...overrides, nuxt.options[configKey], ...defaults);
+      nuxt.options[configKey] = mergedOptions;
+    }
+  }
+  await callLifecycleHooks(nuxtModule, meta, mergedOptions, nuxt);
+  await callModule(nuxtModule, meta, mergedOptions, resolvedModulePath, moduleToInstall, localLayerModuleDirs, buildTimeModuleMeta, nuxt);
 }
 function resolveModuleWithOptions(definition, nuxt) {
   const [module, options = {}] = Array.isArray(definition) ? definition : [definition, {}];
@@ -2790,8 +2812,13 @@ async function callModule(nuxtModule, meta = {}, inlineOptions, resolvedModulePa
     return;
   }
   const modulePath = resolvedModulePath || moduleToInstall;
+  let entryPath;
   if (typeof modulePath === "string") {
     const parsed = parseNodeModulePath(modulePath);
+    if (parsed.name) {
+      const subpath = await lookupNodeModuleSubpath(modulePath) || ".";
+      entryPath = join(parsed.name, subpath === "./" ? "." : subpath);
+    }
     const moduleRoot = parsed.dir ? parsed.dir + parsed.name : await resolvePackageJSON(modulePath, { try: true }).then((r) => r ? dirname(r) : modulePath);
     nuxt.options.build.transpile.push(normalizeModuleTranspilePath(moduleRoot));
     const directory = moduleRoot.replace(/\/?$/, "/");
@@ -2800,7 +2827,7 @@ async function callModule(nuxtModule, meta = {}, inlineOptions, resolvedModulePa
     }
   }
   nuxt.options._installedModules ||= [];
-  const entryPath = typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall, nuxt.options.alias) : void 0;
+  entryPath ||= typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall, nuxt.options.alias) : void 0;
   if (typeof moduleToInstall === "string" && entryPath !== moduleToInstall) {
     buildTimeModuleMeta.rawPath = moduleToInstall;
   }
@@ -2896,12 +2923,15 @@ async function loadNuxtConfig(opts) {
   const processedLayers = /* @__PURE__ */ new Set();
   const localRelativePaths = new Set(localLayers);
   for (const layer of layers) {
-    layer.config ||= {};
-    layer.config.rootDir ??= layer.cwd;
-    if (processedLayers.has(layer.config.rootDir)) {
+    const resolvedRootDir = layer.config?.rootDir ?? layer.cwd;
+    layer.config = {
+      ...layer.config || {},
+      rootDir: resolvedRootDir
+    };
+    if (processedLayers.has(resolvedRootDir)) {
       continue;
     }
-    processedLayers.add(layer.config.rootDir);
+    processedLayers.add(resolvedRootDir);
     layer.config = await applyDefaults(layerSchema, layer.config);
     if (!layer.configFile || layer.configFile.endsWith(".nuxtrc")) {
       continue;
@@ -3113,7 +3143,7 @@ function useRuntimeConfig() {
   return applyEnv(klona(nuxt.options.nitro.runtimeConfig), {
     prefix: "NITRO_",
     altPrefix: "NUXT_",
-    envExpansion: nuxt.options.nitro.experimental?.envExpansion ?? !!process$1.env.NITRO_ENV_EXPANSION
+    envExpansion: nuxt.options.nitro.experimental?.envExpansion ?? !!process.env.NITRO_ENV_EXPANSION
   });
 }
 function updateRuntimeConfig(runtimeConfig) {
@@ -3124,7 +3154,7 @@ function updateRuntimeConfig(runtimeConfig) {
   } catch {
   }
 }
-function getEnv(key, opts, env = process$1.env) {
+function getEnv(key, opts, env = process.env) {
   const envKey = snakeCase(key).toUpperCase();
   return destr(
     env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey]
@@ -3156,7 +3186,7 @@ function applyEnv(obj, opts, parentKey = "") {
   return obj;
 }
 const envExpandRx = /\{\{([^{}]*)\}\}/g;
-function _expandFromEnv(value, env = process$1.env) {
+function _expandFromEnv(value, env = process.env) {
   return value.replace(envExpandRx, (match, key) => {
     return env[key] || match;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.20.0",
+  "version": "3.20.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,16 +23,16 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^3.3.0",
+    "c12": "^3.3.2",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "errx": "^0.1.0",
-    "exsolve": "^1.0.7",
+    "exsolve": "^1.0.8",
     "ignore": "^7.0.5",
     "jiti": "^2.6.1",
     "klona": "^2.0.6",
-    "knitwork": "^1.2.0",
+    "knitwork": "^1.3.0",
     "mlly": "^1.8.0",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
@@ -46,18 +46,18 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.5.8",
+    "@rspack/core": "1.6.7",
     "@types/lodash-es": "4.17.12",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
     "lodash-es": "4.17.21",
-    "nitropack": "2.12.8",
+    "nitropack": "2.12.9",
     "unbuild": "3.6.1",
-    "unimport": "5.4.1",
-    "vite": "7.1.9",
+    "unimport": "5.5.0",
+    "vite": "7.2.7",
     "vitest": "3.2.4",
-    "webpack": "5.102.1",
-    "@nuxt/schema": "3.20.0"
+    "webpack": "5.103.0",
+    "@nuxt/schema": "3.20.2"
   },
   "engines": {
     "node": ">=18.12.0"