@nuxt/kit-nightly 4.3.0-29356103.2f7957ac → 4.3.0-29430576.f48ea4c8

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,15 +1,13 @@
-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';
-import * as unctx from 'unctx';
+import { UseContext } from 'unctx';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import { GlobOptions } from 'tinyglobby';
-import * as consola from 'consola';
-import { ConsolaOptions } from 'consola';
+import { ConsolaInstance, ConsolaOptions } from 'consola';
 
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
@@ -52,7 +50,7 @@ declare const normalizeModuleTranspilePath: (p: string) => string;
  */
 declare function hasNuxtModule(moduleName: string, nuxt?: Nuxt): boolean;
 /**
- * Checks if a Nuxt Module is compatible with a given semver version.
+ * Checks if a Nuxt module is compatible with a given semver version.
  */
 declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverVersion: string, nuxt?: Nuxt): Promise<boolean>;
 /**
@@ -111,7 +109,7 @@ interface LayerDirectories {
  * @param nuxt - The Nuxt instance to get layers from. Defaults to the current Nuxt context.
  * @returns Array of LayerDirectories objects, ordered by priority (user layer first)
  */
-declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
+declare function getLayerDirectories(nuxt?: Nuxt): LayerDirectories[];
 
 declare function setGlobalHead(head: NuxtAppConfig['head']): void;
 
@@ -119,7 +117,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.
@@ -132,6 +130,8 @@ declare function useRuntimeConfig(): Record<string, any>;
  */
 declare function updateRuntimeConfig(runtimeConfig: Record<string, unknown>): void | Promise<void>;
 
+type Arrayable<T> = T | T[];
+type Thenable<T> = T | Promise<T>;
 interface ExtendConfigOptions {
     /**
      * Install plugin on dev
@@ -178,40 +178,41 @@ interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | '
      */
     client?: boolean;
 }
+type ExtendWebpacklikeConfig = (fn: (config: Configuration) => void, options?: ExtendWebpackConfigOptions) => void;
 /**
  * Extend webpack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendWebpackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendWebpackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend rspack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendRspackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendRspackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend Vite config
  */
-declare function extendViteConfig(fn: ((config: UserConfig) => void), options?: ExtendViteConfigOptions): (() => void) | undefined;
+declare function extendViteConfig(fn: ((config: UserConfig) => Thenable<void>), options?: ExtendViteConfigOptions): (() => void) | undefined;
 /**
  * Append webpack plugin to the config.
  */
-declare function addWebpackPlugin(pluginOrGetter: WebpackPluginInstance | WebpackPluginInstance[] | (() => WebpackPluginInstance | WebpackPluginInstance[]), options?: ExtendWebpackConfigOptions): void;
+declare function addWebpackPlugin(pluginOrGetter: Arrayable<WebpackPluginInstance> | (() => Thenable<Arrayable<WebpackPluginInstance>>), options?: ExtendWebpackConfigOptions): void;
 /**
  * Append rspack plugin to the config.
  */
-declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPluginInstance[] | (() => RspackPluginInstance | RspackPluginInstance[]), options?: ExtendWebpackConfigOptions): void;
+declare function addRspackPlugin(pluginOrGetter: Arrayable<RspackPluginInstance> | (() => Thenable<Arrayable<RspackPluginInstance>>), options?: ExtendWebpackConfigOptions): void;
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Arrayable<Plugin> | (() => Thenable<Arrayable<Plugin>>), options?: ExtendConfigOptions): void;
 interface AddBuildPluginFactory {
-    vite?: () => Plugin | Plugin[];
-    webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];
-    rspack?: () => RspackPluginInstance | RspackPluginInstance[];
+    vite?: () => Thenable<Arrayable<Plugin>>;
+    webpack?: () => Thenable<Arrayable<WebpackPluginInstance>>;
+    rspack?: () => Thenable<Arrayable<RspackPluginInstance>>;
 }
 declare function addBuildPlugin(pluginFactory: AddBuildPluginFactory, options?: ExtendConfigOptions): void;
 
@@ -270,7 +271,7 @@ declare function addComponent(opts: AddComponentOptions): void;
  * Direct access to the Nuxt global context - see https://github.com/unjs/unctx.
  * @deprecated Use `getNuxtCtx` instead
  */
-declare const nuxtCtx: unctx.UseContext<Nuxt>;
+declare const nuxtCtx: UseContext<Nuxt>;
 /** Direct access to the Nuxt context with asyncLocalStorage - see https://github.com/unjs/unctx. */
 declare const getNuxtCtx: () => Nuxt | null;
 /**
@@ -298,11 +299,11 @@ declare function useNuxt(): Nuxt;
 declare function tryUseNuxt(): Nuxt | null;
 declare function runWithNuxtContext<T extends (...args: any[]) => any>(nuxt: Nuxt, fn: T): ReturnType<T>;
 
-declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
+declare function createIsIgnored(nuxt?: Nuxt | null | undefined): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: Nuxt | null | undefined): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(template: NuxtTemplate | string, name?: string): void;
@@ -509,11 +510,11 @@ declare function normalizeTemplate<T>(template: NuxtTemplate<T> | string, buildD
  */
 declare function updateTemplates(options?: {
     filter?: (template: ResolvedNuxtTemplate<any>) => boolean;
-}): Promise<any>;
+}): Promise<void>;
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
-declare const logger: consola.ConsolaInstance;
-declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola.ConsolaInstance;
+declare const logger: ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): ConsolaInstance;
 
 interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */

package/dist/index.d.ts

@@ -1,15 +1,13 @@
-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';
-import * as unctx from 'unctx';
+import { UseContext } from 'unctx';
 import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import { GlobOptions } from 'tinyglobby';
-import * as consola from 'consola';
-import { ConsolaOptions } from 'consola';
+import { ConsolaInstance, ConsolaOptions } from 'consola';
 
 /**
  * Define a Nuxt module, automatically merging defaults with user provided options, installing
@@ -52,7 +50,7 @@ declare const normalizeModuleTranspilePath: (p: string) => string;
  */
 declare function hasNuxtModule(moduleName: string, nuxt?: Nuxt): boolean;
 /**
- * Checks if a Nuxt Module is compatible with a given semver version.
+ * Checks if a Nuxt module is compatible with a given semver version.
  */
 declare function hasNuxtModuleCompatibility(module: string | NuxtModule, semverVersion: string, nuxt?: Nuxt): Promise<boolean>;
 /**
@@ -111,7 +109,7 @@ interface LayerDirectories {
  * @param nuxt - The Nuxt instance to get layers from. Defaults to the current Nuxt context.
  * @returns Array of LayerDirectories objects, ordered by priority (user layer first)
  */
-declare function getLayerDirectories(nuxt?: _nuxt_schema.Nuxt): LayerDirectories[];
+declare function getLayerDirectories(nuxt?: Nuxt): LayerDirectories[];
 
 declare function setGlobalHead(head: NuxtAppConfig['head']): void;
 
@@ -119,7 +117,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.
@@ -132,6 +130,8 @@ declare function useRuntimeConfig(): Record<string, any>;
  */
 declare function updateRuntimeConfig(runtimeConfig: Record<string, unknown>): void | Promise<void>;
 
+type Arrayable<T> = T | T[];
+type Thenable<T> = T | Promise<T>;
 interface ExtendConfigOptions {
     /**
      * Install plugin on dev
@@ -178,40 +178,41 @@ interface ExtendViteConfigOptions extends Omit<ExtendConfigOptions, 'server' | '
      */
     client?: boolean;
 }
+type ExtendWebpacklikeConfig = (fn: (config: Configuration) => void, options?: ExtendWebpackConfigOptions) => void;
 /**
  * Extend webpack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendWebpackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendWebpackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend rspack config
  *
  * The fallback function might be called multiple times
  * when applying to both client and server builds.
  */
-declare const extendRspackConfig: (fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions) => void;
+declare const extendRspackConfig: ExtendWebpacklikeConfig;
 /**
  * Extend Vite config
  */
-declare function extendViteConfig(fn: ((config: UserConfig) => void), options?: ExtendViteConfigOptions): (() => void) | undefined;
+declare function extendViteConfig(fn: ((config: UserConfig) => Thenable<void>), options?: ExtendViteConfigOptions): (() => void) | undefined;
 /**
  * Append webpack plugin to the config.
  */
-declare function addWebpackPlugin(pluginOrGetter: WebpackPluginInstance | WebpackPluginInstance[] | (() => WebpackPluginInstance | WebpackPluginInstance[]), options?: ExtendWebpackConfigOptions): void;
+declare function addWebpackPlugin(pluginOrGetter: Arrayable<WebpackPluginInstance> | (() => Thenable<Arrayable<WebpackPluginInstance>>), options?: ExtendWebpackConfigOptions): void;
 /**
  * Append rspack plugin to the config.
  */
-declare function addRspackPlugin(pluginOrGetter: RspackPluginInstance | RspackPluginInstance[] | (() => RspackPluginInstance | RspackPluginInstance[]), options?: ExtendWebpackConfigOptions): void;
+declare function addRspackPlugin(pluginOrGetter: Arrayable<RspackPluginInstance> | (() => Thenable<Arrayable<RspackPluginInstance>>), options?: ExtendWebpackConfigOptions): void;
 /**
  * Append Vite plugin to the config.
  */
-declare function addVitePlugin(pluginOrGetter: Plugin | Plugin[] | (() => Plugin | Plugin[]), options?: ExtendConfigOptions): void;
+declare function addVitePlugin(pluginOrGetter: Arrayable<Plugin> | (() => Thenable<Arrayable<Plugin>>), options?: ExtendConfigOptions): void;
 interface AddBuildPluginFactory {
-    vite?: () => Plugin | Plugin[];
-    webpack?: () => WebpackPluginInstance | WebpackPluginInstance[];
-    rspack?: () => RspackPluginInstance | RspackPluginInstance[];
+    vite?: () => Thenable<Arrayable<Plugin>>;
+    webpack?: () => Thenable<Arrayable<WebpackPluginInstance>>;
+    rspack?: () => Thenable<Arrayable<RspackPluginInstance>>;
 }
 declare function addBuildPlugin(pluginFactory: AddBuildPluginFactory, options?: ExtendConfigOptions): void;
 
@@ -270,7 +271,7 @@ declare function addComponent(opts: AddComponentOptions): void;
  * Direct access to the Nuxt global context - see https://github.com/unjs/unctx.
  * @deprecated Use `getNuxtCtx` instead
  */
-declare const nuxtCtx: unctx.UseContext<Nuxt>;
+declare const nuxtCtx: UseContext<Nuxt>;
 /** Direct access to the Nuxt context with asyncLocalStorage - see https://github.com/unjs/unctx. */
 declare const getNuxtCtx: () => Nuxt | null;
 /**
@@ -298,11 +299,11 @@ declare function useNuxt(): Nuxt;
 declare function tryUseNuxt(): Nuxt | null;
 declare function runWithNuxtContext<T extends (...args: any[]) => any>(nuxt: Nuxt, fn: T): ReturnType<T>;
 
-declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
+declare function createIsIgnored(nuxt?: Nuxt | null | undefined): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: Nuxt | null | undefined): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(template: NuxtTemplate | string, name?: string): void;
@@ -509,11 +510,11 @@ declare function normalizeTemplate<T>(template: NuxtTemplate<T> | string, buildD
  */
 declare function updateTemplates(options?: {
     filter?: (template: ResolvedNuxtTemplate<any>) => boolean;
-}): Promise<any>;
+}): Promise<void>;
 declare function writeTypes(nuxt: Nuxt): Promise<void>;
 
-declare const logger: consola.ConsolaInstance;
-declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): consola.ConsolaInstance;
+declare const logger: ConsolaInstance;
+declare function useLogger(tag?: string, options?: Partial<ConsolaOptions>): ConsolaInstance;
 
 interface ResolveModuleOptions {
     /** @deprecated use `url` with URLs pointing at a file - never a directory */

package/dist/index.mjs

@@ -10,17 +10,17 @@ 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 { isRelative, withTrailingSlash as withTrailingSlash$2, withoutTrailingSlash } 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';
@@ -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;
   }
@@ -860,7 +887,7 @@ async function loadNuxtConfig(opts) {
   const localLayers = (await glob("layers/*", {
     onlyDirectories: true,
     cwd: opts.cwd || process.cwd()
-  })).map((d) => d.endsWith("/") ? d.substring(0, d.length - 1) : d).sort((a, b) => b.localeCompare(a));
+  })).map((d) => withTrailingSlash$2(d)).sort((a, b) => b.localeCompare(a));
   opts.overrides = defu$1(opts.overrides, { _extends: localLayers });
   const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await withDefineNuxtConfig(
     () => loadConfig({
@@ -898,14 +925,17 @@ async function loadNuxtConfig(opts) {
   }
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
-  const localRelativePaths = new Set(localLayers);
+  const localRelativePaths = new Set(localLayers.map((layer) => withoutTrailingSlash(layer)));
   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;
@@ -1085,7 +1115,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) {
@@ -1096,7 +1126,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]
@@ -1128,7 +1158,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;
   });
@@ -1142,17 +1172,17 @@ const extendWebpackCompatibleConfig = (builder) => (fn, options = {}) => {
   if (options.build === false && nuxt.options.build) {
     return;
   }
-  nuxt.hook(`${builder}:config`, (configs) => {
+  nuxt.hook(`${builder}:config`, async (configs) => {
     if (options.server !== false) {
       const config = configs.find((i) => i.name === "server");
       if (config) {
-        fn(config);
+        await fn(config);
       }
     }
     if (options.client !== false) {
       const config = configs.find((i) => i.name === "client");
       if (config) {
-        fn(config);
+        await fn(config);
       }
     }
   });
@@ -1176,17 +1206,17 @@ function extendViteConfig(fn, options = {}) {
   return nuxt.hook("vite:extend", ({ config }) => fn(config));
 }
 function addWebpackPlugin(pluginOrGetter, options) {
-  extendWebpackConfig((config) => {
+  extendWebpackConfig(async (config) => {
     const method = options?.prepend ? "unshift" : "push";
-    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
+    const plugin = typeof pluginOrGetter === "function" ? await pluginOrGetter() : pluginOrGetter;
     config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
 function addRspackPlugin(pluginOrGetter, options) {
-  extendRspackConfig((config) => {
+  extendRspackConfig(async (config) => {
     const method = options?.prepend ? "unshift" : "push";
-    const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
+    const plugin = typeof pluginOrGetter === "function" ? await pluginOrGetter() : pluginOrGetter;
     config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
@@ -1200,9 +1230,9 @@ function addVitePlugin(pluginOrGetter, options = {}) {
     return;
   }
   let needsEnvInjection = false;
-  nuxt.hook("vite:extend", ({ config }) => {
+  nuxt.hook("vite:extend", async ({ config }) => {
     config.plugins ||= [];
-    const plugin = toArray(typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter);
+    const plugin = toArray(typeof pluginOrGetter === "function" ? await pluginOrGetter() : pluginOrGetter);
     if (options.server !== false && options.client !== false) {
       const method = options?.prepend ? "unshift" : "push";
       config.plugins[method](...plugin);
@@ -1224,11 +1254,11 @@ function addVitePlugin(pluginOrGetter, options = {}) {
       }
     });
   });
-  nuxt.hook("vite:extendConfig", (config, env) => {
+  nuxt.hook("vite:extendConfig", async (config, env) => {
     if (!needsEnvInjection) {
       return;
     }
-    const plugin = toArray(typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter);
+    const plugin = toArray(typeof pluginOrGetter === "function" ? await pluginOrGetter() : pluginOrGetter);
     const method = options?.prepend ? "unshift" : "push";
     if (env.isClient && options.server === false) {
       config.plugins[method](...plugin);
@@ -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-nightly",
-  "version": "4.3.0-29356103.2f7957ac",
+  "version": "4.3.0-29430576.f48ea4c8",
   "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,22 +45,23 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29356103.2f7957ac",
-    "@rspack/core": "1.5.8",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29430576.f48ea4c8",
+    "@rspack/core": "1.6.7",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",
-    "nitropack": "2.12.8",
+    "nitropack": "2.12.9",
     "unbuild": "3.6.1",
     "unimport": "5.5.0",
-    "vite": "7.1.12",
+    "vite": "7.2.7",
     "vitest": "3.2.4",
-    "webpack": "5.102.1"
+    "webpack": "5.103.0"
   },
   "engines": {
     "node": ">=18.12.0"
   },
   "_name": "@nuxt/kit",
   "scripts": {
+    "build:stub": "unbuild --stub",
     "test:attw": "attw --pack"
   }
 }