@nuxt/kit 3.15.2 → 3.15.4

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;
@@ -449,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;
@@ -449,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

@@ -16,7 +16,7 @@ import { globby } from 'globby';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import ignore from 'ignore';
 import { loadConfig } from 'c12';
-import { NuxtConfigSchema } from '@nuxt/schema';
+import { isWindows } from 'std-env';
 import process$1 from 'node:process';
 import destr from 'destr';
 import { snakeCase, kebabCase, pascalCase } from 'scule';
@@ -24,7 +24,6 @@ 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 = {}) {
@@ -52,11 +51,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}\``
@@ -2205,8 +2208,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;
   }
@@ -2261,68 +2266,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);
+  const res = await _resolvePathGranularly(path, opts);
+  if (res.type === "file") {
+    return res.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 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() : undefined;
   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;
@@ -2359,15 +2316,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 dirFiles = await promises.readdir(dirname(path));
-  return dirFiles.includes(basename(path));
+  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();
+  }
+}
+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 isDirectory(path) {
-  return (await promises.lstat(path)).isDirectory();
+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) {
@@ -2393,11 +2417,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)) ?? {};
@@ -2409,8 +2433,8 @@ 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"));
     }
   }
@@ -2519,13 +2543,44 @@ async function getNuxtModuleVersion(module, nuxt = useNuxt()) {
   return false;
 }
 
-const layerSchemaKeys = ["future", "srcDir", "rootDir", "serverDir", "dir"];
-const layerSchema = /* @__PURE__ */ Object.create(null);
-for (const key of layerSchemaKeys) {
-  if (key in NuxtConfigSchema) {
-    layerSchema[key] = NuxtConfigSchema[key];
+async function tryResolveModule(id, url = import.meta.url) {
+  try {
+    return await resolvePath$1(id, { url });
+  } catch {
   }
 }
+function resolveModule(id, options) {
+  return resolvePathSync(id, { url: options?.paths ?? [import.meta.url] });
+}
+async function importModule(id, opts) {
+  const resolvedPath = await resolveModule(id, opts);
+  return import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
+}
+function tryImportModule(id, opts) {
+  try {
+    return importModule(id, opts).catch(() => void 0);
+  } catch {
+  }
+}
+const warnings = /* @__PURE__ */ new Set();
+function requireModule(id, opts) {
+  if (!warnings.has(id)) {
+    console.warn("[@nuxt/kit] `requireModule` is deprecated. Please use `importModule` instead.");
+    warnings.add(id);
+  }
+  const resolvedPath = resolveModule(id, opts);
+  const jiti = createJiti(import.meta.url, {
+    interopDefault: opts?.interopDefault !== false
+  });
+  return jiti(pathToFileURL(resolvedPath).href);
+}
+function tryRequireModule(id, opts) {
+  try {
+    return requireModule(id, opts);
+  } catch {
+  }
+}
+
 async function loadNuxtConfig(opts) {
   opts.overrides = defu$1(opts.overrides, {
     _extends: await globby("layers/*", {
@@ -2553,6 +2608,14 @@ async function loadNuxtConfig(opts) {
   if (!opts.overrides?._prepare && !nuxtConfig.dev && !nuxtConfig.buildDir && nuxtConfig.future?.compatibilityVersion === 4 && existsSync(defaultBuildDir)) {
     nuxtConfig.buildDir = join(nuxtConfig.rootDir, "node_modules/.cache/nuxt/.nuxt");
   }
+  const NuxtConfigSchema = await loadNuxtSchema(nuxtConfig.rootDir || cwd || process.cwd());
+  const layerSchemaKeys = ["future", "srcDir", "rootDir", "serverDir", "dir"];
+  const layerSchema = /* @__PURE__ */ Object.create(null);
+  for (const key of layerSchemaKeys) {
+    if (key in NuxtConfigSchema) {
+      layerSchema[key] = NuxtConfigSchema[key];
+    }
+  }
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
   for (const layer of layers) {
@@ -2580,6 +2643,15 @@ async function loadNuxtConfig(opts) {
   }
   return await applyDefaults(NuxtConfigSchema, nuxtConfig);
 }
+async function loadNuxtSchema(cwd) {
+  const paths = [cwd];
+  const nuxtPath = await tryResolveModule("nuxt", cwd) ?? await tryResolveModule("nuxt-nightly", cwd);
+  if (nuxtPath) {
+    paths.unshift(nuxtPath);
+  }
+  const schemaPath = await tryResolveModule("@nuxt/schema", paths) ?? "@nuxt/schema";
+  return await (isWindows ? import(pathToFileURL(schemaPath).href) : import(schemaPath)).then((r) => r.NuxtConfigSchema);
+}
 
 function extendNuxtSchema(def) {
   const nuxt = useNuxt();
@@ -2588,44 +2660,6 @@ function extendNuxtSchema(def) {
   });
 }
 
-async function tryResolveModule(id, url = import.meta.url) {
-  try {
-    return await resolvePath$1(id, { url });
-  } catch {
-  }
-}
-function resolveModule(id, options) {
-  return resolvePathSync(id, { url: options?.paths ?? [import.meta.url] });
-}
-async function importModule(id, opts) {
-  const resolvedPath = await resolveModule(id, opts);
-  return import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
-}
-function tryImportModule(id, opts) {
-  try {
-    return importModule(id, opts).catch(() => void 0);
-  } catch {
-  }
-}
-const warnings = /* @__PURE__ */ new Set();
-function requireModule(id, opts) {
-  if (!warnings.has(id)) {
-    console.warn("[@nuxt/kit] `requireModule` is deprecated. Please use `importModule` instead.");
-    warnings.add(id);
-  }
-  const resolvedPath = resolveModule(id, opts);
-  const jiti = createJiti(import.meta.url, {
-    interopDefault: opts?.interopDefault !== false
-  });
-  return jiti(pathToFileURL(resolvedPath).href);
-}
-function tryRequireModule(id, opts) {
-  try {
-    return requireModule(id, opts);
-  } catch {
-  }
-}
-
 async function loadNuxt(opts) {
   opts.cwd = opts.cwd || opts.rootDir;
   opts.overrides ||= opts.config || {};
@@ -2897,18 +2931,22 @@ function addBuildPlugin(pluginFactory, options) {
   }
 }
 
-async function addComponentsDir(dir, opts = {}) {
+function addComponentsDir(dir, opts = {}) {
   const nuxt = useNuxt();
-  await assertNuxtCompatibility({ nuxt: ">=2.13" }, nuxt);
+  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);
+  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) || [];
@@ -3327,4 +3365,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.2",
+  "version": "3.15.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -34,30 +34,30 @@
     "knitwork": "^1.2.0",
     "mlly": "^1.7.4",
     "ohash": "^1.1.4",
-    "pathe": "^2.0.1",
+    "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.6",
-    "untyped": "^1.5.2",
-    "@nuxt/schema": "3.15.2"
+    "unimport": "^4.0.0",
+    "untyped": "^1.5.2"
   },
   "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",
-    "webpack": "5.96.1"
+    "vite": "6.0.11",
+    "vitest": "3.0.4",
+    "webpack": "5.96.1",
+    "@nuxt/schema": "3.15.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=18.12.0"
   },
   "scripts": {
     "test:attw": "attw --pack"