@nuxt/kit-nightly 4.4.7-29652037.eb785fd0 → 4.4.7-29673425.78b1e698

package/dist/index.mjs

@@ -1297,7 +1297,20 @@ function resolveLayerPaths(dirs, projectBuildDir) {
 		globalDeclarations: [join(relativeRootDir, `*.d.ts`), join(relativeRootDir, `layers/*/*.d.ts`)]
 	};
 }
-const EXTENSION_RE = /\b(?:\.d\.[cm]?ts|\.\w+)$/g;
+const STRIPPABLE_EXT_RE = /\b\.(?:d\.ts|tsx?|jsx?)$/;
+const RUNTIME_EXT_RE = /\.([cm])(?:ts|js)$/;
+async function getPathSubstitution(absolutePath, buildDir) {
+	const stripped = absolutePath.replace(STRIPPABLE_EXT_RE, "");
+	if (stripped !== absolutePath) return relativeWithDot(buildDir, stripped);
+	const runtimeMatch = absolutePath.match(RUNTIME_EXT_RE);
+	if (runtimeMatch) {
+		const base = absolutePath.slice(0, -runtimeMatch[0].length);
+		if (await promises.stat(`${base}.d.ts`).then((s) => s.isFile(), () => false)) return relativeWithDot(buildDir, base);
+		const declaration = `${base}.d.${runtimeMatch[1]}ts`;
+		if (await promises.stat(declaration).then((s) => s.isFile(), () => false)) return relativeWithDot(buildDir, declaration);
+	}
+	return relativeWithDot(buildDir, absolutePath);
+}
 const excludedAlias = [/^@vue\/.*$/, /^#internal\/nuxt/];
 async function _generateTypes(nuxt) {
 	const include = new Set(["./nuxt.d.ts"]);
@@ -1379,7 +1392,7 @@ async function _generateTypes(nuxt) {
 		legacyExclude.add(join(relative, "dist/runtime/server"));
 	}
 	const nestedModulesDirs = [];
-	for (const dir of [...nuxt.options.modulesDir].sort()) {
+	for (const dir of nuxt.options.modulesDir.toSorted()) {
 		const withSlash = withTrailingSlash$1(dir);
 		if (nestedModulesDirs.every((d) => !d.startsWith(withSlash))) nestedModulesDirs.push(withSlash);
 	}
@@ -1387,6 +1400,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 ??= true;
 	const useDecorators = Boolean(nuxt.options.experimental?.decorators);
+	const userExclude = nuxt.options.typescript?.tsConfig?.exclude ?? [];
 	const tsConfig = defu(nuxt.options.typescript?.tsConfig, {
 		compilerOptions: {
 			esModuleInterop: true,
@@ -1510,7 +1524,7 @@ async function _generateTypes(nuxt) {
 			tsConfig.compilerOptions.paths[alias] = [relativePath];
 			tsConfig.compilerOptions.paths[`${alias}/*`] = [`${relativePath}/*`];
 		} else {
-			const path = stats?.isFile() ? relativePath.replace(EXTENSION_RE, "") : aliases[alias];
+			const path = stats?.isFile() ? await getPathSubstitution(absolutePath, nuxt.options.buildDir) : aliases[alias];
 			tsConfig.compilerOptions.paths[alias] = [path];
 		}
 	}
@@ -1543,15 +1557,14 @@ async function _generateTypes(nuxt) {
 	const legacyTsConfig = defu({}, {
 		...tsConfig,
 		include: [...tsConfig.include, ...legacyInclude],
-		exclude: [...tsConfig.exclude, ...legacyExclude]
+		exclude: [...userExclude, ...legacyExclude]
 	});
 	async function resolveConfig(tsConfig) {
 		for (const alias in tsConfig.compilerOptions.paths) {
 			const paths = tsConfig.compilerOptions.paths[alias];
 			tsConfig.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);
-				return relativeWithDot(nuxt.options.buildDir, stats?.isFile() ? path.replace(EXTENSION_RE, "") : path);
+				return (await promises.stat(path).catch(() => null))?.isFile() ? getPathSubstitution(path, nuxt.options.buildDir) : relativeWithDot(nuxt.options.buildDir, path);
 			})))];
 		}
 		sortTsPaths(tsConfig.compilerOptions.paths);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.4.7-29652037.eb785fd0",
+  "version": "4.4.7-29673425.78b1e698",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -34,24 +34,24 @@
     "pkg-types": "^2.3.1",
     "rc9": "^3.0.1",
     "scule": "^1.3.0",
-    "semver": "^7.8.0",
-    "tinyglobby": "^0.2.16",
+    "semver": "^7.8.1",
+    "tinyglobby": "^0.2.17",
     "ufo": "^1.6.4",
     "unctx": "^2.5.0",
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.4.7-29652037.eb785fd0",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.4.7-29673425.78b1e698",
     "@rspack/core": "1.7.11",
     "@types/semver": "7.7.1",
     "hookable": "6.1.1",
     "nitro": "3.0.260311-beta",
     "nitropack": "2.13.4",
-    "obuild": "0.4.35",
+    "obuild": "0.4.36",
     "unimport": "6.3.0",
     "vite": "7.3.3",
-    "vitest": "4.1.6",
-    "webpack": "5.106.2"
+    "vitest": "4.1.7",
+    "webpack": "5.107.2"
   },
   "engines": {
     "node": ">=18.12.0"