@nuxt/kit 4.2.1 → 4.2.2

package/README.md

@@ -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)

package/dist/index.mjs

@@ -10,7 +10,7 @@ import { existsSync, readFileSync, promises, lstatSync } from 'node:fs';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { resolve, relative, join, dirname, normalize, isAbsolute, basename, parse } from 'pathe';
 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';
@@ -569,7 +569,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)))
@@ -604,8 +604,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 })
         ]);
@@ -640,25 +640,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);
@@ -669,8 +672,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, {}];
@@ -786,8 +808,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(/\/?$/, "/");
@@ -796,7 +823,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;
   }
@@ -900,12 +927,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;
@@ -1426,6 +1456,8 @@ function resolveLayerPaths(dirs, projectBuildDir) {
     nuxt: [
       join(relativeSrcDir, "**/*"),
       join(relativeModulesDir, `*/runtime/**/*`),
+      join(relativeRootDir, `test/nuxt/**/*`),
+      join(relativeRootDir, `tests/nuxt/**/*`),
       join(relativeRootDir, `layers/*/app/**/*`),
       join(relativeRootDir, `layers/*/modules/*/runtime/**/*`)
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,12 +23,12 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^3.3.1",
+    "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",
@@ -45,16 +45,16 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.6.1",
+    "@rspack/core": "1.6.7",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
     "nitropack": "2.12.9",
     "unbuild": "3.6.1",
     "unimport": "5.5.0",
-    "vite": "7.2.1",
+    "vite": "7.2.7",
     "vitest": "3.2.4",
-    "webpack": "5.102.1",
-    "@nuxt/schema": "4.2.1"
+    "webpack": "5.103.0",
+    "@nuxt/schema": "4.2.2"
   },
   "engines": {
     "node": ">=18.12.0"