@nuxt/kit 4.0.0-0 → 4.0.0-alpha.2

package/dist/index.d.mts

@@ -6,7 +6,7 @@ import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
 import * as unctx from 'unctx';
-import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitro/types';
+import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
 
@@ -372,7 +372,7 @@ declare function useNitro(): Nitro;
 /**
  * Add server imports to be auto-imported by Nitro
  */
-declare function addServerImports(imports: Import[]): void;
+declare function addServerImports(imports: Import | Import[]): void;
 /**
  * Add directories to be scanned for auto-imports by Nitro
  */

package/dist/index.d.ts

@@ -6,7 +6,7 @@ import { WebpackPluginInstance, Configuration } from 'webpack';
 import { RspackPluginInstance } from '@rspack/core';
 import { Plugin, UserConfig } from 'vite';
 import * as unctx from 'unctx';
-import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitro/types';
+import { NitroRouteConfig, NitroEventHandler, NitroDevEventHandler, Nitro } from 'nitropack/types';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
 
@@ -372,7 +372,7 @@ declare function useNitro(): Nitro;
 /**
  * Add server imports to be auto-imported by Nitro
  */
-declare function addServerImports(imports: Import[]): void;
+declare function addServerImports(imports: Import | Import[]): void;
 /**
  * Add directories to be scanned for auto-imports by Nitro
  */

package/dist/index.mjs

@@ -457,8 +457,8 @@ async function _resolvePathGranularly(path, opts = {}) {
   };
 }
 async function existsSensitive(path) {
-  const dirFiles = await promises.readdir(dirname(path)).catch(() => null);
-  return dirFiles && dirFiles.includes(basename(path));
+  const dirFiles = new Set(await promises.readdir(dirname(path)).catch(() => []));
+  return dirFiles.has(basename(path));
 }
 function existsInVFS(path, nuxt = tryUseNuxt()) {
   if (!nuxt) {
@@ -635,8 +635,8 @@ async function loadNuxtConfig(opts) {
     extend: { extendKey: ["theme", "_extends", "extends"] },
     dotenv: true,
     globalRc: true,
+    // @ts-expect-error TODO: fix type in c12, it should accept createDefu directly
     merger,
-    // TODO: fix type in c12, it should accept createDefu directly
     ...opts
   });
   delete globalSelf.defineNuxtConfig;
@@ -663,6 +663,7 @@ async function loadNuxtConfig(opts) {
   }
   const _layers = [];
   const processedLayers = /* @__PURE__ */ new Set();
+  const localRelativePaths = new Set(localLayers);
   for (const layer of layers) {
     layer.config ||= {};
     layer.config.rootDir ??= layer.cwd;
@@ -674,7 +675,7 @@ async function loadNuxtConfig(opts) {
     if (!layer.configFile || layer.configFile.endsWith(".nuxtrc")) {
       continue;
     }
-    if (layer.cwd && cwd && localLayers.includes(relative(cwd, layer.cwd))) {
+    if (layer.cwd && cwd && localRelativePaths.has(relative(cwd, layer.cwd))) {
       layer.meta ||= {};
       layer.meta.name ||= basename(layer.cwd);
     }
@@ -701,7 +702,7 @@ async function loadNuxtSchema(cwd) {
   const urls = [url];
   const nuxtPath = resolveModuleURL("nuxt", { try: true, from: url }) ?? resolveModuleURL("nuxt-nightly", { try: true, from: url });
   if (nuxtPath) {
-    urls.unshift(pathToFileURL(nuxtPath));
+    urls.unshift(nuxtPath);
   }
   const schemaPath = resolveModuleURL("@nuxt/schema", { try: true, from: urls }) ?? "@nuxt/schema";
   return await import(schemaPath).then((r) => r.NuxtConfigSchema);
@@ -793,10 +794,11 @@ function useNitro() {
 }
 function addServerImports(imports) {
   const nuxt = useNuxt();
+  const _imports = toArray(imports);
   nuxt.hook("nitro:config", (config) => {
     config.imports ||= {};
     config.imports.imports ||= [];
-    config.imports.imports.push(...imports);
+    config.imports.imports.push(..._imports);
   });
 }
 function addServerImportsDir(dirs, opts = {}) {
@@ -1144,7 +1146,6 @@ async function _generateTypes(nuxt) {
     include.add(join(relative2, "dist/runtime"));
     exclude.add(join(relative2, "dist/runtime/server"));
   }
-  const isV4 = nuxt.options.future?.compatibilityVersion === 4;
   const nestedModulesDirs = [];
   for (const dir of [...nuxt.options.modulesDir].sort()) {
     const withSlash = withTrailingSlash(dir);
@@ -1156,7 +1157,7 @@ async function _generateTypes(nuxt) {
   for (const parent of nestedModulesDirs) {
     hasTypescriptVersionWithModulePreserve ??= await readPackageJSON("typescript", { parent }).then((r) => r?.version && gte(r.version, "5.4.0")).catch(() => void 0);
   }
-  hasTypescriptVersionWithModulePreserve ??= isV4;
+  hasTypescriptVersionWithModulePreserve ??= true;
   const useDecorators = Boolean(nuxt.options.experimental?.decorators);
   const tsConfig = defu(nuxt.options.typescript?.tsConfig, {
     compilerOptions: {
@@ -1171,7 +1172,7 @@ async function _generateTypes(nuxt) {
       verbatimModuleSyntax: true,
       /* Strictness */
       strict: nuxt.options.typescript?.strict ?? true,
-      noUncheckedIndexedAccess: isV4,
+      noUncheckedIndexedAccess: true,
       forceConsistentCasingInFileNames: true,
       noImplicitOverride: true,
       /* Decorator support */
@@ -1300,15 +1301,11 @@ async function _generateTypes(nuxt) {
 }
 async function writeTypes(nuxt) {
   const { tsConfig, declaration } = await _generateTypes(nuxt);
-  async function writeFile() {
-    const GeneratedBy = "// Generated by nuxi";
-    const tsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.json");
-    await promises.mkdir(nuxt.options.buildDir, { recursive: true });
-    await promises.writeFile(tsConfigPath, GeneratedBy + "\n" + JSON.stringify(tsConfig, null, 2));
-    const declarationPath = resolve(nuxt.options.buildDir, "nuxt.d.ts");
-    await promises.writeFile(declarationPath, GeneratedBy + "\n" + declaration);
-  }
-  await writeFile();
+  const tsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.json");
+  await promises.mkdir(nuxt.options.buildDir, { recursive: true });
+  await promises.writeFile(tsConfigPath, JSON.stringify(tsConfig, null, 2));
+  const declarationPath = resolve(nuxt.options.buildDir, "nuxt.d.ts");
+  await promises.writeFile(declarationPath, declaration);
 }
 function sortTsPaths(paths) {
   for (const pathKey in paths) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "4.0.0-0",
+  "version": "4.0.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -23,13 +23,13 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^3.0.3",
+    "c12": "^3.0.4",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "errx": "^0.1.0",
     "exsolve": "^1.0.5",
-    "ignore": "^7.0.4",
+    "ignore": "^7.0.5",
     "jiti": "^2.4.2",
     "klona": "^2.0.6",
     "mlly": "^1.7.4",
@@ -39,22 +39,22 @@
     "scule": "^1.3.0",
     "semver": "^7.7.2",
     "std-env": "^3.9.0",
-    "tinyglobby": "^0.2.13",
+    "tinyglobby": "^0.2.14",
     "ufo": "^1.6.1",
     "unctx": "^2.4.1",
     "unimport": "^5.0.1",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.3.9",
+    "@rspack/core": "1.3.15",
     "@types/semver": "7.7.0",
     "hookable": "5.5.3",
-    "nitro": "npm:nitro-nightly@3.0.0-20250506-085946.5cc05779",
+    "nitropack": "2.11.12",
     "unbuild": "3.5.0",
     "vite": "6.3.5",
-    "vitest": "3.1.3",
-    "webpack": "5.99.8",
-    "@nuxt/schema": "4.0.0-0"
+    "vitest": "3.2.3",
+    "webpack": "5.99.9",
+    "@nuxt/schema": "4.0.0-alpha.2"
   },
   "engines": {
     "node": ">=18.12.0"