@nuxt/kit 3.15.1 → 3.15.3

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import * as _nuxt_schema from '@nuxt/schema';
 import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, ComponentsDir, Component, NuxtTemplate, NuxtHooks, NuxtMiddleware, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
@@ -188,7 +189,7 @@ declare function getNuxtVersion(nuxt?: Nuxt | any): string;
  */
 declare function addComponentsDir(dir: ComponentsDir, opts?: {
     prepend?: boolean;
-}): Promise<void>;
+}): void;
 type AddComponentOptions = {
     name: string;
     filePath: string;
@@ -198,7 +199,7 @@ type AddComponentOptions = {
  *
  * Requires Nuxt 2.13+
  */
-declare function addComponent(opts: AddComponentOptions): Promise<void>;
+declare function addComponent(opts: AddComponentOptions): void;
 
 /** Direct access to the Nuxt context - see https://github.com/unjs/unctx. */
 declare const nuxtCtx: unctx.UseContext<Nuxt>;
@@ -226,10 +227,11 @@ declare function useNuxt(): Nuxt;
  */
 declare function tryUseNuxt(): Nuxt | null;
 
+declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(this: any, template: NuxtTemplate | string, name?: string): void;
@@ -257,9 +259,6 @@ interface AddRouteMiddlewareOptions {
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 
-/**
- * Normalize a nuxt plugin object
- */
 declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
 /**
  * Registers a nuxt plugin and to the plugins array.
@@ -452,4 +451,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type ImportModuleOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type ImportModuleOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as _nuxt_schema from '@nuxt/schema';
 import { ModuleOptions, ModuleDefinition, NuxtModule, NuxtConfig, Nuxt, ModuleMeta, NuxtOptions, SchemaDefinition, ImportPresetWithDeprecation, NuxtCompatibility, NuxtCompatibilityIssues, ComponentsDir, Component, NuxtTemplate, NuxtHooks, NuxtMiddleware, NuxtPlugin, NuxtPluginTemplate, ResolvedNuxtTemplate, NuxtServerTemplate, NuxtTypeTemplate } from '@nuxt/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'unimport';
@@ -188,7 +189,7 @@ declare function getNuxtVersion(nuxt?: Nuxt | any): string;
  */
 declare function addComponentsDir(dir: ComponentsDir, opts?: {
     prepend?: boolean;
-}): Promise<void>;
+}): void;
 type AddComponentOptions = {
     name: string;
     filePath: string;
@@ -198,7 +199,7 @@ type AddComponentOptions = {
  *
  * Requires Nuxt 2.13+
  */
-declare function addComponent(opts: AddComponentOptions): Promise<void>;
+declare function addComponent(opts: AddComponentOptions): void;
 
 /** Direct access to the Nuxt context - see https://github.com/unjs/unctx. */
 declare const nuxtCtx: unctx.UseContext<Nuxt>;
@@ -226,10 +227,11 @@ declare function useNuxt(): Nuxt;
  */
 declare function tryUseNuxt(): Nuxt | null;
 
+declare function createIsIgnored(nuxt?: _nuxt_schema.Nuxt | null): (pathname: string, stats?: unknown) => boolean;
 /**
  * Return a filter function to filter an array of paths
  */
-declare function isIgnored(pathname: string): boolean;
+declare function isIgnored(pathname: string, _stats?: unknown, nuxt?: _nuxt_schema.Nuxt | null): boolean;
 declare function resolveIgnorePatterns(relativePath?: string): string[];
 
 declare function addLayout(this: any, template: NuxtTemplate | string, name?: string): void;
@@ -257,9 +259,6 @@ interface AddRouteMiddlewareOptions {
 }
 declare function addRouteMiddleware(input: NuxtMiddleware | NuxtMiddleware[], options?: AddRouteMiddlewareOptions): void;
 
-/**
- * Normalize a nuxt plugin object
- */
 declare function normalizePlugin(plugin: NuxtPlugin | string): NuxtPlugin;
 /**
  * Registers a nuxt plugin and to the plugins array.
@@ -452,4 +451,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type ImportModuleOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { type AddComponentOptions, type AddPluginOptions, type AddRouteMiddlewareOptions, type ExtendConfigOptions, type ExtendRouteRulesOptions, type ExtendViteConfigOptions, type ExtendWebpackConfigOptions, type ImportModuleOptions, type LoadNuxtConfigOptions, type LoadNuxtOptions, type ResolveModuleOptions, type ResolvePathOptions, type Resolver, addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };

package/dist/index.mjs

@@ -23,6 +23,8 @@ import { snakeCase, kebabCase, pascalCase } from 'scule';
 import { klona } from 'klona';
 import { hash } from 'ohash';
 import { gte } from 'semver';
+import { isAbsolute as isAbsolute$1 } from 'node:path';
+import { isWindows } from 'std-env';
 
 const logger = consola;
 function useLogger(tag, options = {}) {
@@ -50,11 +52,15 @@ const builderMap = {
   "@nuxt/vite-builder": "vite",
   "@nuxt/webpack-builder": "webpack"
 };
+function checkNuxtVersion(version, nuxt = useNuxt()) {
+  const nuxtVersion = getNuxtVersion(nuxt);
+  return satisfies(normalizeSemanticVersion(nuxtVersion), version, { includePrerelease: true });
+}
 async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
   const issues = [];
   if (constraints.nuxt) {
     const nuxtVersion = getNuxtVersion(nuxt);
-    if (!satisfies(normalizeSemanticVersion(nuxtVersion), constraints.nuxt, { includePrerelease: true })) {
+    if (!checkNuxtVersion(constraints.nuxt, nuxt)) {
       issues.push({
         name: "nuxt",
         message: `Nuxt version \`${constraints.nuxt}\` is required but currently using \`${nuxtVersion}\``
@@ -86,7 +92,7 @@ async function checkNuxtCompatibility(constraints, nuxt = useNuxt()) {
           message: `Not compatible with \`${nuxt.options.builder}\`.`
         });
       } else {
-        const builderVersion = await readPackageJSON(nuxt.options.builder, { url: nuxt.options.modulesDir }).then((r) => r.version).catch(() => void 0);
+        const builderVersion = await readPackageJSON(nuxt.options.builder, { url: nuxt.options.modulesDir }).then((r) => r.version).catch(() => undefined);
         if (builderVersion && !satisfies(normalizeSemanticVersion(builderVersion), constraint, { includePrerelease: true })) {
           issues.push({
             name: "builder",
@@ -140,7 +146,7 @@ var freeSelf = typeof self == 'object' && self && self.Object === Object && self
 var root = freeGlobal || freeSelf || Function('return this')();
 
 /** Built-in value references. */
-var Symbol = root.Symbol;
+var Symbol$1 = root.Symbol;
 
 /** Used for built-in method references. */
 var objectProto$b = Object.prototype;
@@ -156,7 +162,7 @@ var hasOwnProperty$9 = objectProto$b.hasOwnProperty;
 var nativeObjectToString$1 = objectProto$b.toString;
 
 /** Built-in value references. */
-var symToStringTag$1 = Symbol ? Symbol.toStringTag : undefined;
+var symToStringTag$1 = Symbol$1 ? Symbol$1.toStringTag : undefined;
 
 /**
  * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
@@ -211,7 +217,7 @@ var nullTag = '[object Null]',
     undefinedTag = '[object Undefined]';
 
 /** Built-in value references. */
-var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : undefined;
 
 /**
  * The base implementation of `getTag` without fallbacks for buggy environments.
@@ -327,11 +333,8 @@ function arrayMap(array, iteratee) {
  */
 var isArray = Array.isArray;
 
-/** Used as references for various `Number` constants. */
-var INFINITY = 1 / 0;
-
 /** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol ? Symbol.prototype : undefined,
+var symbolProto = Symbol$1 ? Symbol$1.prototype : undefined,
     symbolToString = symbolProto ? symbolProto.toString : undefined;
 
 /**
@@ -355,7 +358,7 @@ function baseToString(value) {
     return symbolToString ? symbolToString.call(value) : '';
   }
   var result = (value + '');
-  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+  return (result == '0' && (1 / value) == -Infinity) ? '-0' : result;
 }
 
 /**
@@ -2055,6 +2058,14 @@ function template(string, options, guard) {
 function toArray(value) {
   return Array.isArray(value) ? value : [value];
 }
+function filterInPlace(array, predicate) {
+  for (let i = array.length; i--; i >= 0) {
+    if (!predicate(array[i], i, array)) {
+      array.splice(i, 1);
+    }
+  }
+  return array;
+}
 const MODE_RE = /\.(server|client)(\.\w+)*$/;
 
 async function compileTemplate(template$1, ctx) {
@@ -2116,7 +2127,7 @@ function _defineNuxtModule(definition) {
     }
     const uniqueKey = module.meta.name || module.meta.configKey;
     if (uniqueKey) {
-      nuxt.options._requiredModules = nuxt.options._requiredModules || {};
+      nuxt.options._requiredModules ||= {};
       if (nuxt.options._requiredModules[uniqueKey]) {
         return false;
       }
@@ -2198,8 +2209,10 @@ function nuxt2Shims(nuxt) {
   });
 }
 
-function isIgnored(pathname) {
-  const nuxt = tryUseNuxt();
+function createIsIgnored(nuxt = tryUseNuxt()) {
+  return (pathname, stats) => isIgnored(pathname, stats, nuxt);
+}
+function isIgnored(pathname, _stats, nuxt = tryUseNuxt()) {
   if (!nuxt) {
     return false;
   }
@@ -2254,68 +2267,20 @@ function resolveGroupSyntax(group) {
 }
 
 async function resolvePath(path, opts = {}) {
-  const _path = path;
-  path = normalize(path);
-  if (isAbsolute(path)) {
-    if (opts?.virtual && existsInVFS(path)) {
-      return path;
-    }
-    if (existsSync(path) && !await isDirectory(path)) {
-      return path;
-    }
-  }
-  const nuxt = tryUseNuxt();
-  const cwd = opts.cwd || (nuxt ? nuxt.options.rootDir : process.cwd());
-  const extensions = opts.extensions || (nuxt ? nuxt.options.extensions : [".ts", ".mjs", ".cjs", ".json"]);
-  const modulesDir = nuxt ? nuxt.options.modulesDir : [];
-  path = resolveAlias(path);
-  if (!isAbsolute(path)) {
-    path = resolve(cwd, path);
-  }
-  if (opts?.virtual && existsInVFS(path, nuxt)) {
-    return path;
-  }
-  let _isDir = false;
-  if (existsSync(path)) {
-    _isDir = await isDirectory(path);
-    if (!_isDir) {
-      return path;
-    }
-  }
-  for (const ext of extensions) {
-    const pathWithExt = path + ext;
-    if (opts?.virtual && existsInVFS(pathWithExt, nuxt)) {
-      return pathWithExt;
-    }
-    if (existsSync(pathWithExt)) {
-      return pathWithExt;
-    }
-    const pathWithIndex = join(path, "index" + ext);
-    if (opts?.virtual && existsInVFS(pathWithIndex, nuxt)) {
-      return pathWithIndex;
-    }
-    if (_isDir && existsSync(pathWithIndex)) {
-      return pathWithIndex;
-    }
+  const res = await _resolvePathGranularly(path, opts);
+  if (res.type === "file") {
+    return res.path;
   }
-  const resolveModulePath = await resolvePath$1(_path, { url: [cwd, ...modulesDir] }).catch(() => null);
-  if (resolveModulePath) {
-    return resolveModulePath;
-  }
-  return opts.fallbackToOriginal ? _path : path;
+  return opts.fallbackToOriginal ? path : res.path;
 }
 async function findPath(paths, opts, pathType = "file") {
-  const nuxt = opts?.virtual ? tryUseNuxt() : void 0;
   for (const path of toArray(paths)) {
-    const rPath = await resolvePath(path, opts);
-    if (opts?.virtual && existsInVFS(rPath, nuxt)) {
-      return rPath;
-    }
-    if (await existsSensitive(rPath)) {
-      const _isDir = await isDirectory(rPath);
-      if (!pathType || pathType === "file" && !_isDir || pathType === "dir" && _isDir) {
-        return rPath;
-      }
+    const res = await _resolvePathGranularly(path, opts);
+    if (!res.type || pathType && res.type !== pathType) {
+      continue;
+    }
+    if (res.virtual || await existsSensitive(res.path)) {
+      return res.path;
     }
   }
   return null;
@@ -2352,15 +2317,82 @@ async function resolveNuxtModule(base, paths) {
   }
   return resolved;
 }
-async function existsSensitive(path) {
-  if (!existsSync(path)) {
-    return false;
+async function _resolvePathType(path, opts = {}, skipFs = false) {
+  if (opts?.virtual && existsInVFS(path)) {
+    return {
+      path,
+      type: "file",
+      virtual: true
+    };
+  }
+  if (skipFs) {
+    return;
+  }
+  const fd = await promises.open(path, "r").catch(() => null);
+  try {
+    const stats = await fd?.stat();
+    if (stats) {
+      return {
+        path,
+        type: stats.isFile() ? "file" : "dir",
+        virtual: false
+      };
+    }
+  } finally {
+    fd?.close();
   }
-  const dirFiles = await promises.readdir(dirname(path));
-  return dirFiles.includes(basename(path));
 }
-async function isDirectory(path) {
-  return (await promises.lstat(path)).isDirectory();
+async function _resolvePathGranularly(path, opts = {}) {
+  const _path = path;
+  path = normalize(path);
+  if (isAbsolute(path)) {
+    const res2 = await _resolvePathType(path, opts);
+    if (res2 && res2.type === "file") {
+      return res2;
+    }
+  }
+  const nuxt = tryUseNuxt();
+  const cwd = opts.cwd || (nuxt ? nuxt.options.rootDir : process.cwd());
+  const extensions = opts.extensions || (nuxt ? nuxt.options.extensions : [".ts", ".mjs", ".cjs", ".json"]);
+  const modulesDir = nuxt ? nuxt.options.modulesDir : [];
+  path = resolveAlias(path);
+  if (!isAbsolute(path)) {
+    path = resolve(cwd, path);
+  }
+  const res = await _resolvePathType(path, opts);
+  if (res && res.type === "file") {
+    return res;
+  }
+  for (const ext of extensions) {
+    const extPath = await _resolvePathType(path + ext, opts);
+    if (extPath && extPath.type === "file") {
+      return extPath;
+    }
+    const indexPath = await _resolvePathType(
+      join(path, "index" + ext),
+      opts,
+      res?.type !== "dir"
+      /* skip checking if parent is not a directory */
+    );
+    if (indexPath && indexPath.type === "file") {
+      return indexPath;
+    }
+  }
+  const resolvedModulePath = await resolvePath$1(_path, { url: [cwd, ...modulesDir] }).catch(() => null);
+  if (resolvedModulePath) {
+    return {
+      path: resolvedModulePath,
+      type: "file",
+      virtual: false
+    };
+  }
+  return {
+    path
+  };
+}
+async function existsSensitive(path) {
+  const dirFiles = await promises.readdir(dirname(path)).catch(() => null);
+  return dirFiles && dirFiles.includes(basename(path));
 }
 function existsInVFS(path, nuxt = tryUseNuxt()) {
   if (!nuxt) {
@@ -2386,11 +2418,11 @@ async function resolveFiles(path, pattern, opts = {}) {
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
 async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
   const { nuxtModule, buildTimeModuleMeta, resolvedModulePath } = await loadNuxtModuleInstance(moduleToInstall, nuxt);
-  const localLayerModuleDirs = /* @__PURE__ */ new Set();
+  const localLayerModuleDirs = [];
   for (const l of nuxt.options._layers) {
     const srcDir = l.config.srcDir || l.cwd;
     if (!NODE_MODULES_RE.test(srcDir)) {
-      localLayerModuleDirs.add(resolve(srcDir, l.config?.dir?.modules || "modules"));
+      localLayerModuleDirs.push(resolve(srcDir, l.config?.dir?.modules || "modules").replace(/\/?$/, "/"));
     }
   }
   const res = (isNuxt2() ? await nuxtModule.call(nuxt.moduleContainer, inlineOptions, nuxt) : await nuxtModule(inlineOptions, nuxt)) ?? {};
@@ -2402,13 +2434,13 @@ async function installModule(moduleToInstall, inlineOptions, nuxt = useNuxt()) {
     const parsed = parseNodeModulePath(modulePath);
     const moduleRoot = parsed.dir ? parsed.dir + parsed.name : modulePath;
     nuxt.options.build.transpile.push(normalizeModuleTranspilePath(moduleRoot));
-    const directory = parsed.dir ? moduleRoot : getDirectory(modulePath);
-    if (directory !== moduleToInstall && !localLayerModuleDirs.has(directory)) {
+    const directory = (parsed.dir ? moduleRoot : getDirectory(modulePath)).replace(/\/?$/, "/");
+    if (directory !== moduleToInstall && !localLayerModuleDirs.some((dir) => directory.startsWith(dir))) {
       nuxt.options.modulesDir.push(resolve(directory, "node_modules"));
     }
   }
-  nuxt.options._installedModules = nuxt.options._installedModules || [];
-  const entryPath = typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall) : void 0;
+  nuxt.options._installedModules ||= [];
+  const entryPath = typeof moduleToInstall === "string" ? resolveAlias(moduleToInstall) : undefined;
   if (typeof moduleToInstall === "string" && entryPath !== moduleToInstall) {
     buildTimeModuleMeta.rawPath = moduleToInstall;
   }
@@ -2442,27 +2474,22 @@ async function loadNuxtModuleInstance(nuxtModule, nuxt = useNuxt()) {
     paths.add(join(nuxtModule, "module"));
     paths.add(nuxtModule);
     for (const path of paths) {
-      for (const parentURL of nuxt.options.modulesDir) {
-        try {
-          const src = isAbsolute(path) ? pathToFileURL(await resolvePath(path, { cwd: parentURL, fallbackToOriginal: false, extensions: nuxt.options.extensions })).href : await resolve$1(path, { url: pathToFileURL(parentURL.replace(/\/node_modules\/?$/, "")), extensions: nuxt.options.extensions });
-          nuxtModule = await jiti.import(src, { default: true });
-          resolvedModulePath = fileURLToPath(new URL(src));
-          const moduleMetadataPath = new URL("module.json", src);
-          if (existsSync(moduleMetadataPath)) {
-            buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
-          }
-          break;
-        } catch (error) {
-          const code = error.code;
-          if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
-            continue;
-          }
-          logger.error(`Error while importing module \`${nuxtModule}\`: ${error}`);
-          throw error;
+      try {
+        const src = isAbsolute(path) ? pathToFileURL(await resolvePath(path, { fallbackToOriginal: false, extensions: nuxt.options.extensions })).href : await resolve$1(path, { url: nuxt.options.modulesDir.map((m) => pathToFileURL(m.replace(/\/node_modules\/?$/, ""))), extensions: nuxt.options.extensions });
+        nuxtModule = await jiti.import(src, { default: true });
+        resolvedModulePath = fileURLToPath(new URL(src));
+        const moduleMetadataPath = new URL("module.json", src);
+        if (existsSync(moduleMetadataPath)) {
+          buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
         }
-      }
-      if (typeof nuxtModule !== "string") {
         break;
+      } catch (error) {
+        const code = error.code;
+        if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
+          continue;
+        }
+        logger.error(`Error while importing module \`${nuxtModule}\`: ${error}`);
+        throw error;
       }
     }
   }
@@ -2554,7 +2581,7 @@ async function loadNuxtConfig(opts) {
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
   for (const layer of layers) {
-    layer.config = layer.config || {};
+    layer.config ||= {};
     layer.config.rootDir = layer.config.rootDir ?? layer.cwd;
     if (processedLayers.has(layer.config.rootDir)) {
       continue;
@@ -2626,7 +2653,7 @@ function tryRequireModule(id, opts) {
 
 async function loadNuxt(opts) {
   opts.cwd = opts.cwd || opts.rootDir;
-  opts.overrides = opts.overrides || opts.config || {};
+  opts.overrides ||= opts.config || {};
   opts.overrides.dev = !!opts.dev;
   const nearestNuxtPkg = await Promise.all(["nuxt-nightly", "nuxt3", "nuxt", "nuxt-edge"].map((pkg2) => resolvePackageJSON(pkg2, { url: opts.cwd }).catch(() => null))).then((r) => r.filter(Boolean).sort((a, b) => b.length - a.length)[0]);
   if (!nearestNuxtPkg) {
@@ -2696,7 +2723,7 @@ function addImportsSources(presets) {
 
 const HANDLER_METHOD_RE = /\.(get|head|patch|post|put|delete|connect|options|trace)(\.\w+)*$/;
 function normalizeHandlerMethod(handler) {
-  const [, method = void 0] = handler.handler.match(HANDLER_METHOD_RE) || [];
+  const [, method = undefined] = handler.handler.match(HANDLER_METHOD_RE) || [];
   return {
     method,
     ...handler,
@@ -2711,7 +2738,7 @@ function addDevServerHandler(handler) {
 }
 function addServerPlugin(plugin) {
   const nuxt = useNuxt();
-  nuxt.options.nitro.plugins = nuxt.options.nitro.plugins || [];
+  nuxt.options.nitro.plugins ||= [];
   nuxt.options.nitro.plugins.push(normalize(plugin));
 }
 function addPrerenderRoutes(routes) {
@@ -2736,8 +2763,8 @@ function useNitro() {
 function addServerImports(imports) {
   const nuxt = useNuxt();
   nuxt.hook("nitro:config", (config) => {
-    config.imports = config.imports || {};
-    config.imports.imports = config.imports.imports || [];
+    config.imports ||= {};
+    config.imports.imports ||= [];
     config.imports.imports.push(...imports);
   });
 }
@@ -2745,15 +2772,15 @@ function addServerImportsDir(dirs, opts = {}) {
   const nuxt = useNuxt();
   const _dirs = toArray(dirs);
   nuxt.hook("nitro:config", (config) => {
-    config.imports = config.imports || {};
-    config.imports.dirs = config.imports.dirs || [];
+    config.imports ||= {};
+    config.imports.dirs ||= [];
     config.imports.dirs[opts.prepend ? "unshift" : "push"](..._dirs);
   });
 }
 function addServerScanDir(dirs, opts = {}) {
   const nuxt = useNuxt();
   nuxt.hook("nitro:config", (config) => {
-    config.scanDirs = config.scanDirs || [];
+    config.scanDirs ||= [];
     for (const dir of toArray(dirs)) {
       config.scanDirs[opts.prepend ? "unshift" : "push"](dir);
     }
@@ -2793,7 +2820,7 @@ function applyEnv(obj, opts, parentKey = "") {
       if (_isObject(envValue)) {
         obj[key] = { ...obj[key], ...envValue };
         applyEnv(obj[key], opts, subKey);
-      } else if (envValue === void 0) {
+      } else if (envValue === undefined) {
         applyEnv(obj[key], opts, subKey);
       } else {
         obj[key] = envValue ?? obj[key];
@@ -2863,7 +2890,7 @@ function addWebpackPlugin(pluginOrGetter, options) {
   extendWebpackConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2871,7 +2898,7 @@ function addRspackPlugin(pluginOrGetter, options) {
   extendRspackConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2879,7 +2906,7 @@ function addVitePlugin(pluginOrGetter, options) {
   extendViteConfig((config) => {
     const method = options?.prepend ? "unshift" : "push";
     const plugin = typeof pluginOrGetter === "function" ? pluginOrGetter() : pluginOrGetter;
-    config.plugins = config.plugins || [];
+    config.plugins ||= [];
     config.plugins[method](...toArray(plugin));
   }, options);
 }
@@ -2895,19 +2922,23 @@ function addBuildPlugin(pluginFactory, options) {
   }
 }
 
-async function addComponentsDir(dir, opts = {}) {
+function addComponentsDir(dir, opts = {}) {
   const nuxt = useNuxt();
-  await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
-  nuxt.options.components = nuxt.options.components || [];
+  if (!checkNuxtVersion(">=2.13", nuxt)) {
+    throw new Error(`\`addComponentsDir\` requires Nuxt 2.13 or higher.`);
+  }
+  nuxt.options.components ||= [];
   dir.priority ||= 0;
   nuxt.hook("components:dirs", (dirs) => {
     dirs[opts.prepend ? "unshift" : "push"](dir);
   });
 }
-async function addComponent(opts) {
+function addComponent(opts) {
   const nuxt = useNuxt();
-  await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
-  nuxt.options.components = nuxt.options.components || [];
+  if (!checkNuxtVersion(">=2.13", nuxt)) {
+    throw new Error(`\`addComponent\` requires Nuxt 2.13 or higher.`);
+  }
+  nuxt.options.components ||= [];
   if (!opts.mode) {
     const [, mode = "all"] = opts.filePath.match(MODE_RE) || [];
     opts.mode = mode;
@@ -2949,7 +2980,7 @@ async function addComponent(opts) {
 function addTemplate(_template) {
   const nuxt = useNuxt();
   const template = normalizeTemplate(_template);
-  nuxt.options.build.templates = nuxt.options.build.templates.filter((p) => normalizeTemplate(p).dst !== template.dst);
+  filterInPlace(nuxt.options.build.templates, (p) => normalizeTemplate(p).dst !== template.dst);
   nuxt.options.build.templates.push(template);
   return template;
 }
@@ -3097,9 +3128,9 @@ async function _generateTypes(nuxt) {
   });
   const aliases = nuxt.options.alias;
   const basePath = tsConfig.compilerOptions.baseUrl ? resolve(nuxt.options.buildDir, tsConfig.compilerOptions.baseUrl) : nuxt.options.buildDir;
-  tsConfig.compilerOptions = tsConfig.compilerOptions || {};
-  tsConfig.compilerOptions.paths = tsConfig.compilerOptions.paths || {};
-  tsConfig.include = tsConfig.include || [];
+  tsConfig.compilerOptions ||= {};
+  tsConfig.compilerOptions.paths ||= {};
+  tsConfig.include ||= [];
   for (const alias in aliases) {
     if (excludedAlias.some((re) => re.test(alias))) {
       continue;
@@ -3154,6 +3185,7 @@ async function _generateTypes(nuxt) {
       return relativeWithDot(nuxt.options.buildDir, stats?.isFile() ? path.replace(EXTENSION_RE, "") : path);
     }));
   }
+  sortTsPaths(tsConfig.compilerOptions.paths);
   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 = [
@@ -3186,6 +3218,15 @@ async function writeTypes(nuxt) {
   nuxt.hook("builder:prepared", writeFile);
   await writeFile();
 }
+function sortTsPaths(paths) {
+  for (const pathKey in paths) {
+    if (pathKey.startsWith("#build")) {
+      const pathValue = paths[pathKey];
+      delete paths[pathKey];
+      paths[pathKey] = pathValue;
+    }
+  }
+}
 function renderAttrs(obj) {
   const attrs = [];
   for (const key in obj) {
@@ -3244,9 +3285,7 @@ function extendPages(cb) {
 function extendRouteRules(route, rule, options = {}) {
   const nuxt = useNuxt();
   for (const opts of [nuxt.options, nuxt.options.nitro]) {
-    if (!opts.routeRules) {
-      opts.routeRules = {};
-    }
+    opts.routeRules ||= {};
     opts.routeRules[route] = options.override ? defu(rule, opts.routeRules[route]) : defu(opts.routeRules[route], rule);
   }
 }
@@ -3275,16 +3314,26 @@ function addRouteMiddleware(input, options = {}) {
   });
 }
 
+const pluginSymbol = Symbol.for("nuxt plugin");
 function normalizePlugin(plugin) {
   if (typeof plugin === "string") {
     plugin = { src: plugin };
   } else {
     plugin = { ...plugin };
   }
+  if (pluginSymbol in plugin) {
+    return plugin;
+  }
   if (!plugin.src) {
     throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
   }
   plugin.src = normalize(resolveAlias(plugin.src));
+  if (!existsSync(plugin.src) && isAbsolute$1(plugin.src)) {
+    try {
+      plugin.src = resolvePathSync(isWindows ? pathToFileURL(plugin.src).href : plugin.src, { extensions: tryUseNuxt()?.options.extensions });
+    } catch {
+    }
+  }
   if (plugin.ssr) {
     plugin.mode = "server";
   }
@@ -3292,12 +3341,13 @@ function normalizePlugin(plugin) {
     const [, mode = "all"] = plugin.src.match(MODE_RE) || [];
     plugin.mode = mode;
   }
+  plugin[pluginSymbol] = true;
   return plugin;
 }
 function addPlugin(_plugin, opts = {}) {
   const nuxt = useNuxt();
   const plugin = normalizePlugin(_plugin);
-  nuxt.options.plugins = nuxt.options.plugins.filter((p) => normalizePlugin(p).src !== plugin.src);
+  filterInPlace(nuxt.options.plugins, (p) => normalizePlugin(p).src !== plugin.src);
   nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
   return plugin;
 }
@@ -3306,4 +3356,4 @@ function addPluginTemplate(plugin, opts = {}) {
   return addPlugin(normalizedPlugin, opts);
 }
 
-export { addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };
+export { addBuildPlugin, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addRspackPlugin, addServerHandler, addServerImports, addServerImportsDir, addServerPlugin, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, addVitePlugin, addWebpackPlugin, assertNuxtCompatibility, buildNuxt, checkNuxtCompatibility, compileTemplate, createIsIgnored, createResolver, defineNuxtModule, extendNuxtSchema, extendPages, extendRouteRules, extendRspackConfig, extendViteConfig, extendWebpackConfig, findPath, getDirectory, getNuxtModuleVersion, getNuxtVersion, hasNuxtCompatibility, hasNuxtModule, hasNuxtModuleCompatibility, importModule, installModule, isIgnored, isNuxt2, isNuxt3, isNuxtMajorVersion, loadNuxt, loadNuxtConfig, loadNuxtModuleInstance, logger, normalizeModuleTranspilePath, normalizePlugin, normalizeSemanticVersion, normalizeTemplate, nuxtCtx, requireModule, resolveAlias, resolveFiles, resolveIgnorePatterns, resolveModule, resolveNuxtModule, resolvePath, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseNuxt, updateRuntimeConfig, updateTemplates, useLogger, useNitro, useNuxt, useRuntimeConfig, writeTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.15.1",
+  "version": "3.15.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -24,39 +24,40 @@
   ],
   "dependencies": {
     "c12": "^2.0.1",
-    "consola": "^3.3.3",
+    "consola": "^3.4.0",
     "defu": "^6.1.4",
     "destr": "^2.0.3",
     "globby": "^14.0.2",
-    "ignore": "^7.0.0",
+    "ignore": "^7.0.3",
     "jiti": "^2.4.2",
     "klona": "^2.0.6",
     "knitwork": "^1.2.0",
-    "mlly": "^1.7.3",
+    "mlly": "^1.7.4",
     "ohash": "^1.1.4",
-    "pathe": "^2.0.0",
-    "pkg-types": "^1.3.0",
+    "pathe": "^2.0.2",
+    "pkg-types": "^1.3.1",
     "scule": "^1.3.0",
     "semver": "^7.6.3",
+    "std-env": "^3.8.0",
     "ufo": "^1.5.4",
     "unctx": "^2.4.1",
-    "unimport": "^3.14.5",
+    "unimport": "^4.0.0",
     "untyped": "^1.5.2",
-    "@nuxt/schema": "3.15.1"
+    "@nuxt/schema": "3.15.3"
   },
   "devDependencies": {
-    "@rspack/core": "1.1.8",
+    "@rspack/core": "1.2.2",
     "@types/lodash-es": "4.17.12",
     "@types/semver": "7.5.8",
     "lodash-es": "4.17.21",
     "nitropack": "2.10.4",
     "unbuild": "latest",
-    "vite": "6.0.7",
-    "vitest": "2.1.8",
+    "vite": "6.0.11",
+    "vitest": "3.0.4",
     "webpack": "5.96.1"
   },
   "engines": {
-    "node": ">=18.20.5"
+    "node": ">=18.12.0"
   },
   "scripts": {
     "test:attw": "attw --pack"