@nuxt/kit 3.15.3 → 3.15.4

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 = {}) {
@@ -2544,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/*", {
@@ -2578,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) {
@@ -2605,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();
@@ -2613,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 || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.15.3",
+  "version": "3.15.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -42,8 +42,7 @@
     "ufo": "^1.5.4",
     "unctx": "^2.4.1",
     "unimport": "^4.0.0",
-    "untyped": "^1.5.2",
-    "@nuxt/schema": "3.15.3"
+    "untyped": "^1.5.2"
   },
   "devDependencies": {
     "@rspack/core": "1.2.2",
@@ -54,7 +53,8 @@
     "unbuild": "latest",
     "vite": "6.0.11",
     "vitest": "3.0.4",
-    "webpack": "5.96.1"
+    "webpack": "5.96.1",
+    "@nuxt/schema": "3.15.4"
   },
   "engines": {
     "node": ">=18.12.0"