@nuxt/kit-nightly 4.6.0-29776167.796cdae2 → 4.6.0-29778602.bfddf2f0

package/dist/index.d.mts

@@ -144,14 +144,31 @@ interface LoadNuxtConfigOptions {
    */
   onConfigResolved?: (context: ResolvedNuxtConfigContext) => void | Promise<void>;
 }
-/** A single difference between two resolved Nuxt configurations. */
-interface NuxtConfigDiffEntry {
-  /** Dot-separated path of the changed value, such as `modules` or `runtimeConfig.public.foo`. */
-  key: string;
-  type: 'added' | 'changed' | 'removed';
-  newValue?: unknown;
-  oldValue?: unknown;
+interface NuxtConfigDiffLocation {
+  /**
+   * Property path of the changed value, with array indices as numbers: `['modules']`,
+   * `['runtimeConfig', 'public', 'foo']`, `['modules', 0]`. Prefer this over {@link label} when
+   * reading the value back out of a config object.
+   */
+  path: Array<string | number>;
+  /**
+   * {@link path} written as a property accessor, for display and for matching against a known
+   * key: `ssr`, `runtimeConfig.public.foo`, `modules[0]`, `nitro.routeRules["/index.html"].ssr`.
+   */
+  label: string;
 }
+/** A single difference between two resolved Nuxt configurations. */
+type NuxtConfigDiffEntry = (NuxtConfigDiffLocation & {
+  type: 'added';
+  newValue: unknown;
+}) | (NuxtConfigDiffLocation & {
+  type: 'removed';
+  oldValue: unknown;
+}) | (NuxtConfigDiffLocation & {
+  type: 'changed';
+  newValue: unknown;
+  oldValue: unknown;
+});
 /**
  * Compare two `rawConfig` snapshots (as provided to `onConfigResolved`) and return the
  * differences between them.

package/dist/index.mjs

@@ -28,9 +28,9 @@ import * as nodeUtil from "node:util";
 import { readFile, rm, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { klona } from "klona";
-import { diff } from "ohash/utils";
+import microdiff from "microdiff";
 import destr from "destr";
-import { hash } from "ohash";
+import { createHash } from "node:crypto";
 import { isAbsolute as isAbsolute$1, join as join$1, resolve as resolve$1 } from "node:path";
 //#region ../../node_modules/.pnpm/untyped@2.0.0/node_modules/untyped/dist/shared/untyped.Br_uXjZG.mjs
 function getType(val) {
@@ -1221,6 +1221,7 @@ async function getAddDependencyCommand(names, cwd, options = {}) {
 //#region src/internal/jiti.ts
 const LOADER_ERROR_CODES = /* @__PURE__ */ new Set([
 	"ERR_MODULE_NOT_FOUND",
+	"ERR_IMPORT_ATTRIBUTE_MISSING",
 	"ERR_UNKNOWN_FILE_EXTENSION",
 	"ERR_UNSUPPORTED_DIR_IMPORT",
 	"ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING",
@@ -1231,15 +1232,14 @@ const LOADER_ERROR_CODES = /* @__PURE__ */ new Set([
 * Whether a failed `import()` failed because the runtime would not load the file, rather than
 * because the file threw once it was running.
 *
+* A resolution failure anywhere in the imported file's static graph counts, not just one for the
+* file itself.
+*
 * @param error the error the failed `import()` rejected with
-* @param target the URL that was imported, used to tell an unresolved import of `target` itself
-* apart from one the file made after it had started running
 */
-function isLoaderError(error, target) {
-	const { code, url } = error ?? {};
-	if (typeof code !== "string" || !LOADER_ERROR_CODES.has(code)) return false;
-	if (code === "ERR_MODULE_NOT_FOUND" && target) return url === target;
-	return true;
+function isLoaderError(error) {
+	const { code } = error ?? {};
+	return typeof code === "string" && LOADER_ERROR_CODES.has(code);
 }
 let cached;
 /**
@@ -1560,7 +1560,7 @@ async function loadNuxtModuleInstance(nuxtModule, nuxt = useNuxt()) {
 	try {
 		resolvedNuxtModule = await import(src).then((r) => interopDefault(r));
 	} catch (nativeError) {
-		if (!isLoaderError(nativeError, src)) throw kitDiagnostics.NUXT_B8018({
+		if (!isLoaderError(nativeError)) throw kitDiagnostics.NUXT_B8018({
 			module: nuxtModule,
 			error: String(nativeError),
 			cause: nativeError
@@ -2069,17 +2069,52 @@ function _isDirectory(path) {
 }
 //#endregion
 //#region src/loader/config.ts
+const IDENTIFIER_RE = /^[a-z_$][\w$]*$/i;
+function formatLabel(path) {
+	let label = "";
+	for (const segment of path) if (typeof segment === "number") label += `[${segment}]`;
+	else if (IDENTIFIER_RE.test(segment)) label += label ? `.${segment}` : segment;
+	else label += `[${JSON.stringify(segment)}]`;
+	return label;
+}
 /**
 * Compare two `rawConfig` snapshots (as provided to `onConfigResolved`) and return the
 * differences between them.
 */
 function diffNuxtConfig(oldConfig, newConfig) {
-	return diff(oldConfig, newConfig).map((entry) => ({
-		key: entry.key,
-		type: entry.type,
-		newValue: entry.newValue?.value,
-		oldValue: entry.oldValue?.value
-	}));
+	const entries = [];
+	for (const entry of microdiff(oldConfig, newConfig)) {
+		const location = {
+			path: entry.path,
+			label: formatLabel(entry.path)
+		};
+		switch (entry.type) {
+			case "CREATE":
+				entries.push({
+					...location,
+					type: "added",
+					newValue: entry.value
+				});
+				break;
+			case "REMOVE":
+				entries.push({
+					...location,
+					type: "removed",
+					oldValue: entry.oldValue
+				});
+				break;
+			case "CHANGE": if (!isSameFunction(entry.oldValue, entry.value)) entries.push({
+				...location,
+				type: "changed",
+				newValue: entry.value,
+				oldValue: entry.oldValue
+			});
+		}
+	}
+	return entries;
+}
+function isSameFunction(a, b) {
+	return typeof a === "function" && typeof b === "function" && a.toString() === b.toString();
 }
 const CONFIG_EXTENSIONS = [
 	".js",
@@ -2139,7 +2174,7 @@ async function loadNuxtConfig(opts) {
 		try {
 			return await import(url.href);
 		} catch (error) {
-			if (!isLoaderError(error, url.href)) throw error;
+			if (!isLoaderError(error)) throw error;
 			jitiPromise ??= loadJiti({ rootDir: rootCwd }).then((mod) => mod?.createJiti(join(rootCwd, "nuxt.config"), {
 				interopDefault: true,
 				moduleCache: false,
@@ -3201,6 +3236,9 @@ function addTypeTemplate(_template, context) {
 	});
 	return template;
 }
+function hashPath(path) {
+	return createHash("sha256").update(path).digest("base64url").slice(0, 10).replace(/-/g, "_");
+}
 /**
 * Normalize a nuxt template object
 */
@@ -3212,7 +3250,7 @@ function normalizeTemplate(template, buildDir) {
 		if (!existsSync(template.src)) throw kitDiagnostics.NUXT_B8009({ template: template.src });
 		if (!template.filename) {
 			const srcPath = parse(template.src);
-			template.filename = template.fileName || `${basename(srcPath.dir)}.${srcPath.name}.${hash(template.src).replace(/-/g, "_")}${srcPath.ext}`;
+			template.filename = template.fileName || `${basename(srcPath.dir)}.${srcPath.name}.${hashPath(template.src)}${srcPath.ext}`;
 		}
 	}
 	if (!template.src && !template.getContents) throw kitDiagnostics.NUXT_B8010({ template: template.filename || template.src || JSON.stringify(template) });
@@ -3467,7 +3505,8 @@ async function _generateTypes(nuxt) {
 		exclude: [...sharedExclude]
 	});
 	const aliases = nuxt.options.alias;
-	const basePath = tsConfig.compilerOptions.baseUrl ? resolve(nuxt.options.buildDir, tsConfig.compilerOptions.baseUrl) : nuxt.options.buildDir;
+	const baseUrl = isV5OrHigher ? void 0 : tsConfig.compilerOptions.baseUrl;
+	const basePath = baseUrl ? resolve(nuxt.options.buildDir, baseUrl) : nuxt.options.buildDir;
 	tsConfig.compilerOptions ||= {};
 	tsConfig.compilerOptions.paths ||= {};
 	tsConfig.include ||= [];
@@ -3535,6 +3574,7 @@ async function _generateTypes(nuxt) {
 	});
 	const nonRootLayerDirs = layerDirs.map((dirs) => dirs.root).filter((root) => !rootDirWithSlash.startsWith(root));
 	async function resolveConfig(tsConfig) {
+		if (isV5OrHigher) Reflect.deleteProperty(tsConfig.compilerOptions, "baseUrl");
 		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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.6.0-29776167.796cdae2",
+  "version": "4.6.0-29778602.bfddf2f0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -27,9 +27,9 @@
     "exsolve": "^1.1.1",
     "ignore": "^7.0.6",
     "klona": "^2.0.6",
+    "microdiff": "^1.6.0",
     "nostics": "^1.2.0",
     "nypm": "^0.6.9",
-    "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
     "rc9": "^3.0.1",
@@ -69,7 +69,7 @@
     }
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29776167.796cdae2",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29778602.bfddf2f0",
     "c12": "4.0.0-beta.5",
     "chokidar": "^5.0.0",
     "dotenv": "^17.4.2",