@nuxt/kit-nightly 4.2.2-29421555.42ff3dfb → 4.2.2-29421604.b8b53eda

package/dist/index.mjs

@@ -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 })
         ]);
@@ -641,10 +641,10 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
   for (const { nuxtModule, meta, moduleToInstall, buildTimeModuleMeta, resolvedModulePath, inlineOptions } of resolvedModules) {
     const configKey = meta?.configKey;
     const optionsFns = [
-      ...optionsFunctions.get(moduleToInstall) || [],
-      ...meta?.name ? optionsFunctions.get(meta.name) || [] : [],
+      ...nuxt._moduleOptionsFunctions.get(moduleToInstall) || [],
+      ...meta?.name ? nuxt._moduleOptionsFunctions.get(meta.name) || [] : [],
       // TODO: consider dropping options functions keyed by config key
-      ...configKey ? optionsFunctions.get(configKey) || [] : []
+      ...configKey ? nuxt._moduleOptionsFunctions.get(configKey) || [] : []
     ];
     if (optionsFns.length > 0) {
       const overrides = [];
@@ -661,6 +661,7 @@ async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useN
     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);
@@ -671,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, {}];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.2.2-29421555.42ff3dfb",
+  "version": "4.2.2-29421604.b8b53eda",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -45,14 +45,14 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.2-29421555.42ff3dfb",
-    "@rspack/core": "1.6.5",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.2-29421604.b8b53eda",
+    "@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.4",
+    "vite": "7.2.7",
     "vitest": "3.2.4",
     "webpack": "5.103.0"
   },