@nuxt/kit 4.0.0-alpha.1 → 4.0.0-alpha.3

package/dist/index.d.mts

@@ -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
  */
@@ -406,6 +406,7 @@ declare function addServerTemplate(template: NuxtServerTemplate): NuxtServerTemp
 declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>, context?: {
     nitro?: boolean;
     nuxt?: boolean;
+    node?: boolean;
 }): ResolvedNuxtTemplate<T>;
 /**
  * Normalize a nuxt template object

package/dist/index.d.ts

@@ -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
  */
@@ -406,6 +406,7 @@ declare function addServerTemplate(template: NuxtServerTemplate): NuxtServerTemp
 declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>, context?: {
     nitro?: boolean;
     nuxt?: boolean;
+    node?: boolean;
 }): ResolvedNuxtTemplate<T>;
 /**
  * Normalize a nuxt template object

package/dist/index.mjs

@@ -702,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);
@@ -794,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 = {}) {
@@ -1060,6 +1061,11 @@ function addTypeTemplate(_template, context) {
       references.push({ path: template.dst });
     });
   }
+  if (context?.node) {
+    nuxt.hook("prepare:types", ({ nodeReferences }) => {
+      nodeReferences.push({ path: template.dst });
+    });
+  }
   if (context?.nitro) {
     nuxt.hook("nitro:prepare:types", ({ references }) => {
       references.push({ path: template.dst });
@@ -1100,36 +1106,75 @@ function normalizeTemplate(template, buildDir) {
 async function updateTemplates(options) {
   return await tryUseNuxt()?.hooks.callHook("builder:generateApp", options);
 }
+function resolveLayerPaths(buildDir, rootDir, srcDir) {
+  const relativeRootDir = relativeWithDot(buildDir, rootDir);
+  return {
+    nuxt: [
+      join(relativeWithDot(buildDir, srcDir), "**/*"),
+      join(relativeRootDir, "modules/*/runtime/**/*"),
+      join(relativeRootDir, "layers/*/modules/*/runtime/**/*")
+    ],
+    nitro: [
+      join(relativeRootDir, "modules/*/runtime/server/**/*"),
+      join(relativeRootDir, "layers/*/modules/*/runtime/server/**/*")
+    ],
+    node: [
+      join(relativeRootDir, "modules/**/*"),
+      join(relativeRootDir, "nuxt.config.*"),
+      join(relativeRootDir, ".config/nuxt.*"),
+      join(relativeRootDir, "layers/*/nuxt.config.*"),
+      join(relativeRootDir, "layers/*/.config/nuxt.*"),
+      join(relativeRootDir, "layers/*/modules/**/*")
+    ]
+  };
+}
 const EXTENSION_RE = /\b(?:\.d\.[cm]?ts|\.\w+)$/g;
 const excludedAlias = [/^@vue\/.*$/, /^#internal\/nuxt/];
 async function _generateTypes(nuxt) {
-  const rootDirWithSlash = withTrailingSlash(nuxt.options.rootDir);
-  const relativeRootDir = relativeWithDot(nuxt.options.buildDir, nuxt.options.rootDir);
-  const include = /* @__PURE__ */ new Set([
-    join(relativeRootDir, "**/*"),
-    join(relativeRootDir, ".config/nuxt.*"),
-    "./nuxt.d.ts"
-  ]);
-  if (nuxt.options.srcDir !== nuxt.options.rootDir) {
-    include.add(join(relative(nuxt.options.buildDir, nuxt.options.srcDir), "**/*"));
-  }
-  if (nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.rootDir) {
+  const include = /* @__PURE__ */ new Set(["./nuxt.d.ts"]);
+  const nodeInclude = /* @__PURE__ */ new Set(["./nuxt.node.d.ts"]);
+  const legacyInclude = /* @__PURE__ */ new Set(["./nuxt.d.ts"]);
+  const exclude = /* @__PURE__ */ new Set();
+  const nodeExclude = /* @__PURE__ */ new Set();
+  const legacyExclude = /* @__PURE__ */ new Set();
+  if (nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.srcDir) {
     include.add(join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), "**/*"));
+    legacyInclude.add(join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), "**/*"));
   }
-  for (const layer of nuxt.options._layers) {
-    const srcOrCwd = layer.config.srcDir ?? layer.cwd;
-    if (!srcOrCwd.startsWith(rootDirWithSlash) || srcOrCwd.includes("node_modules")) {
-      include.add(join(relative(nuxt.options.buildDir, srcOrCwd), "**/*"));
-    }
-  }
-  const exclude = /* @__PURE__ */ new Set([
-    // nitro generate output: https://github.com/nuxt/nuxt/blob/main/packages/nuxt/src/core/nitro.ts#L186
-    relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, "dist")),
-    // nitro generate .data in development when kv storage is used
-    relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, ".data"))
-  ]);
   for (const dir of nuxt.options.modulesDir) {
     exclude.add(relativeWithDot(nuxt.options.buildDir, dir));
+    nodeExclude.add(relativeWithDot(nuxt.options.buildDir, dir));
+    legacyExclude.add(relativeWithDot(nuxt.options.buildDir, dir));
+  }
+  for (const dir of ["dist", ".data"]) {
+    exclude.add(relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, dir)));
+    nodeExclude.add(relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, dir)));
+    legacyExclude.add(relativeWithDot(nuxt.options.buildDir, resolve(nuxt.options.rootDir, dir)));
+  }
+  const rootDirWithSlash = withTrailingSlash(nuxt.options.rootDir);
+  for (const layer of nuxt.options._layers) {
+    const srcOrCwd = withTrailingSlash(layer.config.srcDir ?? layer.cwd);
+    if (!srcOrCwd.startsWith(rootDirWithSlash) || srcOrCwd === rootDirWithSlash || srcOrCwd.includes("node_modules")) {
+      const rootGlob = join(relativeWithDot(nuxt.options.buildDir, layer.cwd), "**/*");
+      const paths = resolveLayerPaths(nuxt.options.buildDir, layer.cwd, layer.config.srcDir);
+      for (const path of paths.nuxt) {
+        include.add(path);
+        legacyInclude.add(path);
+        if (path !== rootGlob) {
+          nodeExclude.add(path);
+        }
+      }
+      for (const path of paths.nitro) {
+        exclude.add(path);
+        nodeExclude.add(path);
+        legacyExclude.add(path);
+      }
+      for (const path of paths.node) {
+        nodeInclude.add(path);
+        legacyInclude.add(path);
+        exclude.add(path);
+      }
+    }
   }
   const moduleEntryPaths = [];
   for (const m of nuxt.options._installedModules) {
@@ -1141,9 +1186,15 @@ async function _generateTypes(nuxt) {
   for (const path of modulePaths) {
     const relative2 = relativeWithDot(nuxt.options.buildDir, path);
     include.add(join(relative2, "runtime"));
-    exclude.add(join(relative2, "runtime/server"));
     include.add(join(relative2, "dist/runtime"));
+    legacyInclude.add(join(relative2, "runtime"));
+    legacyInclude.add(join(relative2, "dist/runtime"));
+    nodeExclude.add(join(relative2, "runtime"));
+    nodeExclude.add(join(relative2, "dist/runtime"));
+    exclude.add(join(relative2, "runtime/server"));
     exclude.add(join(relative2, "dist/runtime/server"));
+    legacyExclude.add(join(relative2, "runtime/server"));
+    legacyExclude.add(join(relative2, "dist/runtime/server"));
   }
   const nestedModulesDirs = [];
   for (const dir of [...nuxt.options.modulesDir].sort()) {
@@ -1158,6 +1209,41 @@ async function _generateTypes(nuxt) {
   }
   hasTypescriptVersionWithModulePreserve ??= true;
   const useDecorators = Boolean(nuxt.options.experimental?.decorators);
+  const nodeReferences = [];
+  const nodeTsConfig = defu(nuxt.options.typescript?.nodeTsConfig, {
+    compilerOptions: {
+      /* Base options: */
+      esModuleInterop: true,
+      skipLibCheck: true,
+      target: "ESNext",
+      allowJs: true,
+      resolveJsonModule: true,
+      moduleDetection: "force",
+      isolatedModules: true,
+      verbatimModuleSyntax: true,
+      /* Strictness */
+      strict: nuxt.options.typescript?.strict ?? true,
+      noUncheckedIndexedAccess: true,
+      forceConsistentCasingInFileNames: true,
+      noImplicitOverride: true,
+      /* If NOT transpiling with TypeScript: */
+      module: hasTypescriptVersionWithModulePreserve ? "preserve" : "ESNext",
+      noEmit: true,
+      /* remove auto-scanning for types */
+      types: [],
+      /* add paths object for filling-in later */
+      paths: {},
+      /* Possibly consider removing the following in future */
+      moduleResolution: hasTypescriptVersionWithModulePreserve ? void 0 : "Bundler",
+      useDefineForClassFields: true,
+      /* implied by target: es2022+ */
+      noImplicitThis: true,
+      /* enabled with `strict` */
+      allowSyntheticDefaultImports: true
+    },
+    include: [...nodeInclude],
+    exclude: [...nodeExclude]
+  });
   const tsConfig = defu(nuxt.options.typescript?.tsConfig, {
     compilerOptions: {
       /* Base options: */
@@ -1238,15 +1324,9 @@ async function _generateTypes(nuxt) {
     if (stats?.isDirectory()) {
       tsConfig.compilerOptions.paths[alias] = [relativePath];
       tsConfig.compilerOptions.paths[`${alias}/*`] = [`${relativePath}/*`];
-      if (!absolutePath.startsWith(rootDirWithSlash)) {
-        tsConfig.include.push(relativePath);
-      }
     } else {
       const path = stats?.isFile() ? relativePath.replace(EXTENSION_RE, "") : aliases[alias];
       tsConfig.compilerOptions.paths[alias] = [path];
-      if (!absolutePath.startsWith(rootDirWithSlash)) {
-        tsConfig.include.push(path);
-      }
     }
   }
   const references = [];
@@ -1264,7 +1344,7 @@ async function _generateTypes(nuxt) {
     references.push({ types: id });
   }));
   const declarations = [];
-  await nuxt.callHook("prepare:types", { references, declarations, tsConfig });
+  await nuxt.callHook("prepare:types", { references, declarations, tsConfig, nodeTsConfig, nodeReferences });
   for (const alias in tsConfig.compilerOptions.paths) {
     const paths = tsConfig.compilerOptions.paths[alias];
     tsConfig.compilerOptions.paths[alias] = await Promise.all(paths.map(async (path) => {
@@ -1293,18 +1373,44 @@ async function _generateTypes(nuxt) {
     "export {}",
     ""
   ].join("\n");
+  const nodeDeclaration = [
+    ...nodeReferences.map((ref) => {
+      if ("path" in ref && isAbsolute(ref.path)) {
+        ref.path = relative(nuxt.options.buildDir, ref.path);
+      }
+      return `/// <reference ${renderAttrs(ref)} />`;
+    }),
+    "",
+    "export {}",
+    ""
+  ].join("\n");
+  const legacyTsConfig = defu({}, tsConfig, {
+    include: [...legacyInclude],
+    exclude: [...legacyExclude]
+  });
   return {
     declaration,
-    tsConfig
+    nodeTsConfig,
+    nodeDeclaration,
+    tsConfig,
+    legacyTsConfig
   };
 }
 async function writeTypes(nuxt) {
-  const { tsConfig, declaration } = await _generateTypes(nuxt);
-  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 { tsConfig, nodeTsConfig, nodeDeclaration, declaration, legacyTsConfig } = await _generateTypes(nuxt);
+  const appTsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.app.json");
+  const legacyTsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.json");
+  const nodeTsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.node.json");
   const declarationPath = resolve(nuxt.options.buildDir, "nuxt.d.ts");
-  await promises.writeFile(declarationPath, declaration);
+  const nodeDeclarationPath = resolve(nuxt.options.buildDir, "nuxt.node.d.ts");
+  await promises.mkdir(nuxt.options.buildDir, { recursive: true });
+  await Promise.all([
+    promises.writeFile(appTsConfigPath, JSON.stringify(tsConfig, null, 2)),
+    promises.writeFile(legacyTsConfigPath, JSON.stringify(legacyTsConfig, null, 2)),
+    promises.writeFile(nodeTsConfigPath, JSON.stringify(nodeTsConfig, null, 2)),
+    promises.writeFile(declarationPath, declaration),
+    promises.writeFile(nodeDeclarationPath, nodeDeclaration)
+  ]);
 }
 function sortTsPaths(paths) {
   for (const pathKey in paths) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -28,7 +28,7 @@
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "errx": "^0.1.0",
-    "exsolve": "^1.0.5",
+    "exsolve": "^1.0.7",
     "ignore": "^7.0.5",
     "jiti": "^2.4.2",
     "klona": "^2.0.6",
@@ -46,15 +46,15 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.3.13",
+    "@rspack/core": "1.3.15",
     "@types/semver": "7.7.0",
     "hookable": "5.5.3",
-    "nitropack": "2.11.12",
+    "nitropack": "2.11.13",
     "unbuild": "3.5.0",
-    "vite": "6.3.5",
-    "vitest": "3.2.0",
-    "webpack": "5.99.8",
-    "@nuxt/schema": "4.0.0-alpha.1"
+    "vite": "7.0.0",
+    "vitest": "3.2.4",
+    "webpack": "5.99.9",
+    "@nuxt/schema": "4.0.0-alpha.3"
   },
   "engines": {
     "node": ">=18.12.0"