@nuxt/kit 4.0.0-alpha.3 → 4.0.0-rc.0

package/dist/index.d.mts

@@ -407,6 +407,7 @@ declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>, context?: {
     nitro?: boolean;
     nuxt?: boolean;
     node?: boolean;
+    shared?: boolean;
 }): ResolvedNuxtTemplate<T>;
 /**
  * Normalize a nuxt template object

package/dist/index.d.ts

@@ -407,6 +407,7 @@ declare function addTypeTemplate<T>(_template: NuxtTypeTemplate<T>, context?: {
     nitro?: boolean;
     nuxt?: boolean;
     node?: boolean;
+    shared?: boolean;
 }): ResolvedNuxtTemplate<T>;
 /**
  * Normalize a nuxt template object

package/dist/index.mjs

@@ -1066,6 +1066,11 @@ function addTypeTemplate(_template, context) {
       nodeReferences.push({ path: template.dst });
     });
   }
+  if (context?.shared) {
+    nuxt.hook("prepare:types", ({ sharedReferences }) => {
+      sharedReferences.push({ path: template.dst });
+    });
+  }
   if (context?.nitro) {
     nuxt.hook("nitro:prepare:types", ({ references }) => {
       references.push({ path: template.dst });
@@ -1106,25 +1111,42 @@ function normalizeTemplate(template, buildDir) {
 async function updateTemplates(options) {
   return await tryUseNuxt()?.hooks.callHook("builder:generateApp", options);
 }
-function resolveLayerPaths(buildDir, rootDir, srcDir) {
+function resolveLayerPaths(dir, buildDir, rootDir, srcDir) {
   const relativeRootDir = relativeWithDot(buildDir, rootDir);
+  const relativeSrcDir = relativeWithDot(buildDir, srcDir);
+  const relativeModulesDir = relativeWithDot(buildDir, resolve(rootDir, dir.modules || "modules"));
+  const relativeSharedDir = relativeWithDot(buildDir, resolve(rootDir, dir.shared || "shared"));
   return {
     nuxt: [
-      join(relativeWithDot(buildDir, srcDir), "**/*"),
-      join(relativeRootDir, "modules/*/runtime/**/*"),
-      join(relativeRootDir, "layers/*/modules/*/runtime/**/*")
+      join(relativeSrcDir, "**/*"),
+      join(relativeModulesDir, `*/runtime/**/*`),
+      join(relativeRootDir, `layers/*/modules/*/runtime/**/*`)
     ],
     nitro: [
-      join(relativeRootDir, "modules/*/runtime/server/**/*"),
-      join(relativeRootDir, "layers/*/modules/*/runtime/server/**/*")
+      join(relativeModulesDir, `*/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/**/*")
+      join(relativeModulesDir, `*.*`),
+      join(relativeRootDir, `nuxt.config.*`),
+      join(relativeRootDir, `.config/nuxt.*`),
+      join(relativeRootDir, `layers/*/nuxt.config.*`),
+      join(relativeRootDir, `layers/*/.config/nuxt.*`),
+      join(relativeRootDir, `layers/*/modules/**/*`)
+    ],
+    shared: [
+      join(relativeSharedDir, `**/*`),
+      join(relativeModulesDir, `*/shared/**/*`),
+      join(relativeRootDir, `layers/*/shared/**/*`)
+    ],
+    sharedDeclarations: [
+      join(relativeSharedDir, `**/*.d.ts`),
+      join(relativeModulesDir, `*/shared/**/*.d.ts`),
+      join(relativeRootDir, `layers/*/shared/**/*.d.ts`)
+    ],
+    globalDeclarations: [
+      join(relativeRootDir, `*.d.ts`),
+      join(relativeRootDir, `layers/*/*.d.ts`)
     ]
   };
 }
@@ -1133,9 +1155,11 @@ const excludedAlias = [/^@vue\/.*$/, /^#internal\/nuxt/];
 async function _generateTypes(nuxt) {
   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 sharedInclude = /* @__PURE__ */ new Set(["./nuxt.shared.d.ts"]);
+  const legacyInclude = /* @__PURE__ */ new Set([...include, ...nodeInclude]);
   const exclude = /* @__PURE__ */ new Set();
   const nodeExclude = /* @__PURE__ */ new Set();
+  const sharedExclude = /* @__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), "**/*"));
@@ -1154,9 +1178,9 @@ async function _generateTypes(nuxt) {
   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")) {
+    if (!srcOrCwd.startsWith(rootDirWithSlash) || layer.cwd === nuxt.options.rootDir || srcOrCwd.includes("node_modules")) {
       const rootGlob = join(relativeWithDot(nuxt.options.buildDir, layer.cwd), "**/*");
-      const paths = resolveLayerPaths(nuxt.options.buildDir, layer.cwd, layer.config.srcDir);
+      const paths = resolveLayerPaths(defu(layer.config.dir, nuxt.options.dir), nuxt.options.buildDir, layer.cwd, layer.config.srcDir);
       for (const path of paths.nuxt) {
         include.add(path);
         legacyInclude.add(path);
@@ -1174,6 +1198,18 @@ async function _generateTypes(nuxt) {
         legacyInclude.add(path);
         exclude.add(path);
       }
+      for (const path of paths.shared) {
+        legacyInclude.add(path);
+        sharedInclude.add(path);
+      }
+      for (const path of paths.sharedDeclarations) {
+        include.add(path);
+      }
+      for (const path of paths.globalDeclarations) {
+        include.add(path);
+        legacyInclude.add(path);
+        sharedInclude.add(path);
+      }
     }
   }
   const moduleEntryPaths = [];
@@ -1185,14 +1221,18 @@ async function _generateTypes(nuxt) {
   const modulePaths = await resolveNuxtModule(rootDirWithSlash, moduleEntryPaths);
   for (const path of modulePaths) {
     const relative2 = relativeWithDot(nuxt.options.buildDir, path);
-    include.add(join(relative2, "runtime"));
-    include.add(join(relative2, "dist/runtime"));
+    if (!path.includes("node_modules")) {
+      include.add(join(relative2, "runtime"));
+      include.add(join(relative2, "dist/runtime"));
+      nodeInclude.add(join(relative2, "*.*"));
+    }
     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"));
+    exclude.add(join(relative2, "*.*"));
     legacyExclude.add(join(relative2, "runtime/server"));
     legacyExclude.add(join(relative2, "dist/runtime/server"));
   }
@@ -1209,41 +1249,6 @@ 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: */
@@ -1294,6 +1299,70 @@ async function _generateTypes(nuxt) {
     include: [...include],
     exclude: [...exclude]
   });
+  const nodeTsConfig = defu(nuxt.options.typescript?.nodeTsConfig, {
+    compilerOptions: {
+      /* Base options: */
+      esModuleInterop: tsConfig.compilerOptions?.esModuleInterop,
+      skipLibCheck: tsConfig.compilerOptions?.skipLibCheck,
+      target: tsConfig.compilerOptions?.target,
+      allowJs: tsConfig.compilerOptions?.allowJs,
+      resolveJsonModule: tsConfig.compilerOptions?.resolveJsonModule,
+      moduleDetection: tsConfig.compilerOptions?.moduleDetection,
+      isolatedModules: tsConfig.compilerOptions?.isolatedModules,
+      verbatimModuleSyntax: tsConfig.compilerOptions?.verbatimModuleSyntax,
+      /* Strictness */
+      strict: tsConfig.compilerOptions?.strict,
+      noUncheckedIndexedAccess: tsConfig.compilerOptions?.noUncheckedIndexedAccess,
+      forceConsistentCasingInFileNames: tsConfig.compilerOptions?.forceConsistentCasingInFileNames,
+      noImplicitOverride: tsConfig.compilerOptions?.noImplicitOverride,
+      /* If NOT transpiling with TypeScript: */
+      module: tsConfig.compilerOptions?.module,
+      noEmit: true,
+      /* remove auto-scanning for types */
+      types: [],
+      /* add paths object for filling-in later */
+      paths: {},
+      /* Possibly consider removing the following in future */
+      moduleResolution: tsConfig.compilerOptions?.moduleResolution,
+      useDefineForClassFields: tsConfig.compilerOptions?.useDefineForClassFields,
+      noImplicitThis: tsConfig.compilerOptions?.noImplicitThis,
+      allowSyntheticDefaultImports: tsConfig.compilerOptions?.allowSyntheticDefaultImports
+    },
+    include: [...nodeInclude],
+    exclude: [...nodeExclude]
+  });
+  const sharedTsConfig = defu(nuxt.options.typescript?.sharedTsConfig, {
+    compilerOptions: {
+      /* Base options: */
+      esModuleInterop: tsConfig.compilerOptions?.esModuleInterop,
+      skipLibCheck: tsConfig.compilerOptions?.skipLibCheck,
+      target: tsConfig.compilerOptions?.target,
+      allowJs: tsConfig.compilerOptions?.allowJs,
+      resolveJsonModule: tsConfig.compilerOptions?.resolveJsonModule,
+      moduleDetection: tsConfig.compilerOptions?.moduleDetection,
+      isolatedModules: tsConfig.compilerOptions?.isolatedModules,
+      verbatimModuleSyntax: tsConfig.compilerOptions?.verbatimModuleSyntax,
+      /* Strictness */
+      strict: tsConfig.compilerOptions?.strict,
+      noUncheckedIndexedAccess: tsConfig.compilerOptions?.noUncheckedIndexedAccess,
+      forceConsistentCasingInFileNames: tsConfig.compilerOptions?.forceConsistentCasingInFileNames,
+      noImplicitOverride: tsConfig.compilerOptions?.noImplicitOverride,
+      /* If NOT transpiling with TypeScript: */
+      module: tsConfig.compilerOptions?.module,
+      noEmit: true,
+      /* remove auto-scanning for types */
+      types: [],
+      /* add paths object for filling-in later */
+      paths: {},
+      /* Possibly consider removing the following in future */
+      moduleResolution: tsConfig.compilerOptions?.moduleResolution,
+      useDefineForClassFields: tsConfig.compilerOptions?.useDefineForClassFields,
+      noImplicitThis: tsConfig.compilerOptions?.noImplicitThis,
+      allowSyntheticDefaultImports: tsConfig.compilerOptions?.allowSyntheticDefaultImports
+    },
+    include: [...sharedInclude],
+    exclude: [...sharedExclude]
+  });
   const aliases = nuxt.options.alias;
   const basePath = tsConfig.compilerOptions.baseUrl ? resolve(nuxt.options.buildDir, tsConfig.compilerOptions.baseUrl) : nuxt.options.buildDir;
   tsConfig.compilerOptions ||= {};
@@ -1330,6 +1399,8 @@ async function _generateTypes(nuxt) {
     }
   }
   const references = [];
+  const nodeReferences = [];
+  const sharedReferences = [];
   await Promise.all([...nuxt.options.modules, ...nuxt.options._modules].map(async (id) => {
     if (typeof id !== "string") {
       return;
@@ -1337,30 +1408,43 @@ async function _generateTypes(nuxt) {
     for (const parent of nestedModulesDirs) {
       const pkg = await readPackageJSON(id, { parent }).catch(() => null);
       if (pkg) {
-        references.push({ types: pkg.name ?? id });
+        nodeReferences.push({ types: pkg.name ?? id });
         return;
       }
     }
-    references.push({ types: id });
+    nodeReferences.push({ types: id });
   }));
   const declarations = [];
-  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) => {
-      if (!isAbsolute(path)) {
-        return path;
-      }
-      const stats = await promises.stat(path).catch(
-        () => null
-        /* file does not exist */
-      );
-      return relativeWithDot(nuxt.options.buildDir, stats?.isFile() ? path.replace(EXTENSION_RE, "") : path);
-    }));
+  await nuxt.callHook("prepare:types", { references, declarations, tsConfig, nodeTsConfig, nodeReferences, sharedTsConfig, sharedReferences });
+  const legacyTsConfig = defu({}, {
+    ...tsConfig,
+    include: [...tsConfig.include, ...legacyInclude],
+    exclude: [...legacyExclude]
+  });
+  async function resolveConfig(tsConfig2) {
+    for (const alias in tsConfig2.compilerOptions.paths) {
+      const paths = tsConfig2.compilerOptions.paths[alias];
+      tsConfig2.compilerOptions.paths[alias] = [...new Set(await Promise.all(paths.map(async (path) => {
+        if (!isAbsolute(path)) {
+          return path;
+        }
+        const stats = await promises.stat(path).catch(
+          () => null
+          /* file does not exist */
+        );
+        return relativeWithDot(nuxt.options.buildDir, stats?.isFile() ? path.replace(EXTENSION_RE, "") : path);
+      })))];
+    }
+    sortTsPaths(tsConfig2.compilerOptions.paths);
+    tsConfig2.include = [...new Set(tsConfig2.include.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
+    tsConfig2.exclude = [...new Set(tsConfig2.exclude.map((p) => isAbsolute(p) ? relativeWithDot(nuxt.options.buildDir, p) : p))];
   }
-  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))];
+  await Promise.all([
+    resolveConfig(tsConfig),
+    resolveConfig(nodeTsConfig),
+    resolveConfig(sharedTsConfig),
+    resolveConfig(legacyTsConfig)
+  ]);
   const declaration = [
     ...references.map((ref) => {
       if ("path" in ref && isAbsolute(ref.path)) {
@@ -1384,12 +1468,21 @@ async function _generateTypes(nuxt) {
     "export {}",
     ""
   ].join("\n");
-  const legacyTsConfig = defu({}, tsConfig, {
-    include: [...legacyInclude],
-    exclude: [...legacyExclude]
-  });
+  const sharedDeclaration = [
+    ...sharedReferences.map((ref) => {
+      if ("path" in ref && isAbsolute(ref.path)) {
+        ref.path = relative(nuxt.options.buildDir, ref.path);
+      }
+      return `/// <reference ${renderAttrs(ref)} />`;
+    }),
+    "",
+    "export {}",
+    ""
+  ].join("\n");
   return {
     declaration,
+    sharedTsConfig,
+    sharedDeclaration,
     nodeTsConfig,
     nodeDeclaration,
     tsConfig,
@@ -1397,19 +1490,23 @@ async function _generateTypes(nuxt) {
   };
 }
 async function writeTypes(nuxt) {
-  const { tsConfig, nodeTsConfig, nodeDeclaration, declaration, legacyTsConfig } = await _generateTypes(nuxt);
+  const { tsConfig, nodeTsConfig, nodeDeclaration, declaration, legacyTsConfig, sharedDeclaration, sharedTsConfig } = 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 sharedTsConfigPath = resolve(nuxt.options.buildDir, "tsconfig.shared.json");
   const declarationPath = resolve(nuxt.options.buildDir, "nuxt.d.ts");
   const nodeDeclarationPath = resolve(nuxt.options.buildDir, "nuxt.node.d.ts");
+  const sharedDeclarationPath = resolve(nuxt.options.buildDir, "nuxt.shared.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(sharedTsConfigPath, JSON.stringify(sharedTsConfig, null, 2)),
     promises.writeFile(declarationPath, declaration),
-    promises.writeFile(nodeDeclarationPath, nodeDeclaration)
+    promises.writeFile(nodeDeclarationPath, nodeDeclaration),
+    promises.writeFile(sharedDeclarationPath, sharedDeclaration)
   ]);
 }
 function sortTsPaths(paths) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-rc.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -35,26 +35,26 @@
     "mlly": "^1.7.4",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
-    "pkg-types": "^2.1.0",
+    "pkg-types": "^2.2.0",
     "scule": "^1.3.0",
     "semver": "^7.7.2",
     "std-env": "^3.9.0",
     "tinyglobby": "^0.2.14",
     "ufo": "^1.6.1",
     "unctx": "^2.4.1",
-    "unimport": "^5.0.1",
+    "unimport": "^5.1.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "1.3.15",
+    "@rspack/core": "1.4.4",
     "@types/semver": "7.7.0",
     "hookable": "5.5.3",
     "nitropack": "2.11.13",
     "unbuild": "3.5.0",
-    "vite": "7.0.0",
+    "vite": "7.0.2",
     "vitest": "3.2.4",
     "webpack": "5.99.9",
-    "@nuxt/schema": "4.0.0-alpha.3"
+    "@nuxt/schema": "4.0.0-rc.0"
   },
   "engines": {
     "node": ">=18.12.0"