@vizejs/nuxt 0.431.0 → 0.433.0

package/dist/{addons-CrR0MCzZ.d.mts → addons-C6yVrK58.d.mts}

@@ -187,13 +187,17 @@ interface VizeNuxtLintOptions extends NuxtLintFeatures {
   /**
    * File path for the generated oxlint config.
    *
-   * Relative paths are resolved from the Nuxt project root.
-   * @default ".nuxt/oxlint.config.json"
+   * Relative paths are resolved from the Nuxt project root. The config must
+   * live in the lint root or an ancestor so Oxlint can apply its ignores.
+   * Add the generated file to the project's .gitignore.
+   * @default ".oxlint.vize.json"
    */
   configFile?: string;
   /**
    * Create a root `oxlint.config.mts` loading the generated config when no
-   * supported oxlint config exists in the project or an ancestor.
+   * supported oxlint or Vite config exists in the project or an ancestor.
+   * Existing Vite configs are preserved without evaluating their lint block;
+   * compose the generated Nuxt plan in that toolchain explicitly.
    * @default true
    */
   autoInit?: boolean;

package/dist/{generation-CXADZreI.mjs → generation-QrhC3X7H.mjs}

@@ -11,9 +11,9 @@ import { createServer } from "node:http";
 //#region src/builder.ts
 function getDetectedNuxtMajor(nuxt) {
 	const nuxtLike = nuxt;
-	const version = nuxtLike?._version ?? nuxtLike?.version ?? nuxtLike?.options?._nuxtVersion;
+	const version = nuxtLike?._version ?? nuxtLike?.version ?? nuxtLike?.options?._nuxtVersion ?? nuxtLike?.constructor?.version;
 	if (!version) return null;
-	const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+	const major = Number.parseInt(version.replace(/^v/, "").split(".")[0] ?? "", 10);
 	return major === 2 || major === 3 || major === 4 ? major : null;
 }
 function isViteNuxtBuilder(builder) {
@@ -650,21 +650,25 @@ function mergeRules(target, source) {
 }
 /** Render the complete generated oxlint config, including its trailing newline. */
 function renderNuxtOxlintConfig(items, pluginSpecifier, globBase) {
-	const rebase = (glob) => globBase ? rebaseGlob(glob, globBase.rootDir, globBase.configDir) : glob;
+	if (globBase) {
+		const root = path.relative(globBase.configDir, globBase.rootDir);
+		if (root === ".." || root.startsWith(`..${path.sep}`) || path.isAbsolute(root)) throw new Error("Generated oxlint config must be in the lint root or an ancestor directory");
+	}
+	const rebase = (glob, ignore = false) => globBase ? rebaseGlob(glob, globBase, ignore) : glob;
 	const ignorePatterns = [];
 	const globals = {};
 	const rules = {};
 	const overrides = [];
 	for (const item of items) {
 		if (item.files) {
-			const override = { files: item.files.map(rebase) };
-			if (item.ignores) override.excludeFiles = item.ignores.map(rebase);
+			const override = { files: item.files.map((glob) => rebase(glob)) };
+			if (item.ignores) override.excludeFiles = item.ignores.map((glob) => rebase(glob));
 			if (item.globals) override.globals = { ...item.globals };
 			if (item.rules) override.rules = prefixVizeRules(item.rules);
 			overrides.push(override);
 			continue;
 		}
-		if (item.ignores) ignorePatterns.push(...item.ignores.map(rebase));
+		if (item.ignores) ignorePatterns.push(...item.ignores.map((glob) => rebase(glob, true)));
 		mergeGlobals(globals, item.globals);
 		mergeRules(rules, item.rules);
 	}
@@ -674,7 +678,10 @@ function renderNuxtOxlintConfig(items, pluginSpecifier, globBase) {
 			name: "vize",
 			specifier: pluginSpecifier
 		}],
-		settings: { vize: { preset: "incremental" } }
+		settings: { vize: {
+			preset: "incremental",
+			...globBase?.owner ? { generatedBy: globBase.owner } : {}
+		} }
 	};
 	if (ignorePatterns.length > 0) config.ignorePatterns = ignorePatterns;
 	if (Object.keys(globals).length > 0) config.globals = globals;
@@ -682,15 +689,17 @@ function renderNuxtOxlintConfig(items, pluginSpecifier, globBase) {
 	if (overrides.length > 0) config.overrides = overrides;
 	return `${JSON.stringify(config, null, 2)}\n`;
 }
-function rebaseGlob(glob, rootDir, configDir) {
+function rebaseGlob(glob, base, ignore) {
 	const negated = glob.startsWith("!");
 	const body = negated ? glob.slice(1) : glob;
-	if (path.isAbsolute(body)) return glob;
-	let relative = path.relative(configDir, path.resolve(rootDir, body));
-	relative = relative.split(path.sep).join("/");
-	if (relative.length === 0) relative = ".";
-	else if (!relative.startsWith(".")) relative = `./${relative}`;
-	return negated ? `!${relative}` : relative;
+	const target = path.resolve(base.rootDir, body);
+	let relative = path.relative(base.configDir, target);
+	if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+		if (ignore) throw new Error(`Oxlint cannot ignore a path outside its config directory: ${glob}`);
+		relative = target;
+	}
+	const pattern = relative.split(path.sep).join("/") || ".";
+	return negated ? `!${pattern}` : pattern;
 }
 //#endregion
 //#region src/lint/nuxt-state.ts
@@ -788,6 +797,30 @@ function isSeverity(value) {
 	return value === "off" || value === "warn" || value === "error";
 }
 //#endregion
+//#region src/lint/owned-config.ts
+/** Keep the module's reserved root file from replacing an authored config. */
+async function writeOwnedNuxtConfig(file, content, writeChanged) {
+	try {
+		const handle = await open(file, "wx");
+		try {
+			await handle.writeFile(content, "utf8");
+		} finally {
+			await handle.close();
+		}
+		return true;
+	} catch (error) {
+		if (error.code !== "EEXIST") throw error;
+	}
+	const metadata = await lstat(file);
+	if (!metadata.isFile() || metadata.isSymbolicLink()) throw new Error(`Generated oxlint config must be a regular file: ${file}`);
+	let owner;
+	try {
+		owner = JSON.parse(await readFile(file, "utf8"))?.settings?.vize?.generatedBy;
+	} catch {}
+	if (owner !== "@vizejs/nuxt") throw new Error(`Refusing to replace authored ${file}; choose a different lint.configFile`);
+	return writeChanged(file, content);
+}
+//#endregion
 //#region src/lint/inspector-view.ts
 /** Render the dependency-free UI served by the in-process lint-plan inspector. */
 function renderNuxtLintInspectorHtml(nonce) {
@@ -1170,7 +1203,7 @@ function isLintPlanPayload(value) {
 //#endregion
 //#region src/lint/generation.ts
 /** Nuxt module wiring for generated oxlint configuration. */
-const GENERATED_CONFIG_NAME = "oxlint.config.json";
+const GENERATED_CONFIG_NAME = ".oxlint.vize.json";
 /** Root config names supported by oxlint's config discovery. */
 const ROOT_OXLINT_CONFIG_NAMES = [
 	".oxlintrc.json",
@@ -1178,6 +1211,15 @@ const ROOT_OXLINT_CONFIG_NAMES = [
 	"oxlint.config.ts",
 	"oxlint.config.mts"
 ];
+const ROOT_LINT_CONFIG_NAMES = [
+	...ROOT_OXLINT_CONFIG_NAMES,
+	"vite.config.js",
+	"vite.config.mjs",
+	"vite.config.ts",
+	"vite.config.cjs",
+	"vite.config.mts",
+	"vite.config.cts"
+];
 function isNotFound(error) {
 	return error.code === "ENOENT";
 }
@@ -1227,10 +1269,10 @@ function relativeSpecifier(from, target) {
 function resolveVizePluginSpecifier(configDir) {
 	return relativeSpecifier(configDir, fileURLToPath(import.meta.resolve("oxlint-plugin-vize")));
 }
-async function findRootOxlintConfig(rootDir) {
+async function findRootLintConfig(rootDir) {
 	let directory = path.resolve(rootDir);
 	while (true) {
-		for (const name of ROOT_OXLINT_CONFIG_NAMES) {
+		for (const name of ROOT_LINT_CONFIG_NAMES) {
 			const candidate = path.join(directory, name);
 			try {
 				const metadata = await lstat(candidate);
@@ -1264,8 +1306,13 @@ function renderRootOxlintConfig(rootDir, generatedConfig) {
 		""
 	].join("\n");
 }
-async function initRootOxlintConfig(rootDir, generatedConfig) {
-	if (await findRootOxlintConfig(rootDir)) return;
+async function initRootOxlintConfig(rootDir, generatedConfig, previousDefault) {
+	const existing = await findRootLintConfig(rootDir);
+	if (existing) {
+		if (existing === path.join(rootDir, "oxlint.config.mts") && previousDefault && (await lstat(existing)).isFile() && await readFile(existing, "utf8") === renderRootOxlintConfig(rootDir, previousDefault)) await writeFileIfChanged(existing, renderRootOxlintConfig(rootDir, generatedConfig));
+		return;
+	}
+	if (path.dirname(generatedConfig) !== rootDir) throw new Error("Set lint.autoInit to false when lint.configFile is outside the Nuxt root");
 	const handle = await open(path.join(rootDir, "oxlint.config.mts"), "wx").catch((error) => {
 		if (error.code === "EEXIST") return void 0;
 		throw error;
@@ -1288,14 +1335,15 @@ async function setupNuxtLintConfigGeneration(lint, nuxt, dependencies = {}) {
 	const { autoInit = true, configFile: configuredFile, rootDir: configuredRoot, ...featureOptions } = typeof lint === "object" && lint !== null ? lint : {};
 	const nuxtRoot = path.resolve(nuxt.options.rootDir);
 	const planRoot = configuredRoot ? path.resolve(nuxtRoot, configuredRoot) : nuxtRoot;
-	const configFile = path.resolve(nuxtRoot, configuredFile ?? path.join(nuxt.options.buildDir, GENERATED_CONFIG_NAME));
+	const configFile = path.resolve(nuxtRoot, configuredFile ?? GENERATED_CONFIG_NAME);
+	const ownsReservedConfig = configFile === path.join(nuxtRoot, GENERATED_CONFIG_NAME);
 	const hasTypeScriptProbe = dependencies.hasTypeScript ?? hasTypeScript;
 	const resolvePluginSpecifier = dependencies.resolvePluginSpecifier ?? resolveVizePluginSpecifier;
 	const resolveAddons = dependencies.resolveAddons ?? ("callHook" in nuxt ? setupNuxtLintConfigAddons(nuxt) : void 0);
 	const resolveProjectRules = dependencies.resolveProjectLintRules ?? readProjectLintRules;
 	let currentPlan = [];
 	const regenerate = async () => {
-		const plan = buildNuxtLintPlan(resolveNuxtLintFeatures(featureOptions, () => hasTypeScriptProbe(planRoot)), collectNuxtLintDirs(toNuxtLintProjectState(nuxt.options, { rootDir: planRoot })));
+		const plan = buildNuxtLintPlan(resolveNuxtLintFeatures(featureOptions, () => hasTypeScriptProbe(planRoot)), collectNuxtLintDirs(toNuxtLintProjectState(nuxt.options, { rootDir: planRoot })), getDetectedNuxtMajor(nuxt) ?? 3);
 		const addons = await resolveAddons?.() ?? [];
 		const projectRules = await resolveProjectRules(planRoot);
 		const nextPlan = [
@@ -1306,10 +1354,12 @@ async function setupNuxtLintConfigGeneration(lint, nuxt, dependencies = {}) {
 			...plan,
 			...addons
 		];
-		const changed = await writeFileIfChanged(configFile, renderNuxtOxlintConfig(nextPlan, resolvePluginSpecifier(path.dirname(configFile)), {
+		const artifact = renderNuxtOxlintConfig(nextPlan, resolvePluginSpecifier(path.dirname(configFile)), {
 			rootDir: planRoot,
-			configDir: path.dirname(configFile)
-		}));
+			configDir: path.dirname(configFile),
+			owner: ownsReservedConfig ? "@vizejs/nuxt" : void 0
+		});
+		const changed = ownsReservedConfig ? await writeOwnedNuxtConfig(configFile, artifact, writeFileIfChanged) : await writeFileIfChanged(configFile, artifact);
 		currentPlan = nextPlan;
 		return changed;
 	};
@@ -1320,7 +1370,7 @@ async function setupNuxtLintConfigGeneration(lint, nuxt, dependencies = {}) {
 	await regenerate();
 	nuxt.hook("builder:generateApp", regenerate);
 	if (getDetectedNuxtMajor(nuxt) === 2) nuxt.hook("build:templates", regenerate);
-	if (autoInit) await initRootOxlintConfig(nuxtRoot, configFile);
+	if (autoInit) await initRootOxlintConfig(nuxtRoot, configFile, ownsReservedConfig ? path.resolve(nuxtRoot, nuxt.options.buildDir, "oxlint.config.json") : void 0);
 	return {
 		configFile,
 		root: planRoot,

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { C as VizeNuxtUiOptions, S as VizeNuxtComposablesOptions, _ as VizeNuxtLintCheckerOptions, b as VizeNuxtCompilerOptions, c as NuxtMuseaOptions, d as VizeNuxtDevOptions, f as VizeNuxtMajorVersion, h as VizeNuxtLintOptions, l as VizeNuxtBridgeOptions, m as VizeNuxtUnoCssOptions, n as NuxtLintConfigAddon, p as VizeNuxtOptions, u as VizeNuxtCompatibilityOptions, x as VizeNuxtVueVersion, y as VizeNuxtCompilerCompatibilityOptions } from "./addons-CrR0MCzZ.mjs";
+import { C as VizeNuxtUiOptions, S as VizeNuxtComposablesOptions, _ as VizeNuxtLintCheckerOptions, b as VizeNuxtCompilerOptions, c as NuxtMuseaOptions, d as VizeNuxtDevOptions, f as VizeNuxtMajorVersion, h as VizeNuxtLintOptions, l as VizeNuxtBridgeOptions, m as VizeNuxtUnoCssOptions, n as NuxtLintConfigAddon, p as VizeNuxtOptions, u as VizeNuxtCompatibilityOptions, x as VizeNuxtVueVersion, y as VizeNuxtCompilerCompatibilityOptions } from "./addons-C6yVrK58.mjs";
 import { MuseaOptions } from "@vizejs/vite-plugin-musea";
 
 //#region src/schema.d.ts

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as setupLintInspector, l as setupNuxtLintChecker, m as hasNuxtViteCompilerSupport, n as setupNuxtLintConfigGeneration, p as getDetectedNuxtMajor } from "./generation-CXADZreI.mjs";
+import { i as setupLintInspector, l as setupNuxtLintChecker, m as hasNuxtViteCompilerSupport, n as setupNuxtLintConfigGeneration, p as getDetectedNuxtMajor } from "./generation-QrhC3X7H.mjs";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path, { dirname, join, resolve } from "node:path";
@@ -580,6 +580,32 @@ function runOnceForScope(buildScope, run) {
 	return tracked;
 }
 //#endregion
+//#region src/client-manifest.ts
+function restoreNuxtClientManifestSourceIds(manifest) {
+	const identities = /* @__PURE__ */ new Map();
+	for (const [key, entry] of Object.entries(manifest)) {
+		const query = key.indexOf("?");
+		if (query < 0 || key.slice(query) !== "?vue&vize" || entry.src !== key) continue;
+		const source = key.slice(0, query);
+		if (!source.endsWith(".vue")) continue;
+		if (Object.hasOwn(manifest, source)) throw new Error(`@vizejs/nuxt: conflicting client manifest source ${source}`);
+		identities.set(key, source);
+	}
+	if (identities.size === 0) return;
+	for (const [key, entry] of Object.entries(manifest)) {
+		const source = identities.get(key);
+		if (source) {
+			delete manifest[key];
+			manifest[source] = entry;
+			entry.src = source;
+		}
+		for (const field of ["imports", "dynamicImports"]) {
+			const references = entry[field];
+			if (references?.some((reference) => identities.has(reference))) entry[field] = references.map((reference) => identities.get(reference) ?? reference);
+		}
+	}
+}
+//#endregion
 //#region src/host-vue-bridge.ts
 const VIZE_NUXT_HOST_VUE_EXCLUDE_PATCHED = "__vizeNuxtHostVueExcludePatched";
 /**
@@ -1106,6 +1132,22 @@ function createNuxtModuleResolver() {
 	return { resolve: (...segments) => resolve(moduleDir, ...segments) };
 }
 //#endregion
+//#region src/module-records.ts
+function isPlainRecord(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
+function mergePlainRecords(...values) {
+	const result = {};
+	for (const value of values) {
+		if (!value) continue;
+		for (const [key, nextValue] of Object.entries(value)) {
+			const currentValue = result[key];
+			result[key] = isPlainRecord(currentValue) && isPlainRecord(nextValue) ? mergePlainRecords(currentValue, nextValue) : nextValue;
+		}
+	}
+	return result;
+}
+//#endregion
 //#region src/libraries.ts
 function projectLoader(rootDir, specifier, option) {
 	return async () => {
@@ -1264,20 +1306,6 @@ async function addNuxtServerPlugin(plugin) {
 async function addNuxtVitePlugin(plugin) {
 	(await loadNuxtKit()).addVitePlugin(plugin);
 }
-function isPlainRecord(value) {
-	return value != null && typeof value === "object" && !Array.isArray(value);
-}
-function mergePlainRecords(...values) {
-	const result = {};
-	for (const value of values) {
-		if (!value) continue;
-		for (const [key, nextValue] of Object.entries(value)) {
-			const currentValue = result[key];
-			result[key] = isPlainRecord(currentValue) && isPlainRecord(nextValue) ? mergePlainRecords(currentValue, nextValue) : nextValue;
-		}
-	}
-	return result;
-}
 function resolveModuleOptions(inlineOptions, nuxt) {
 	return mergePlainRecords(moduleDefaults, nuxt?.options.vize, inlineOptions);
 }
@@ -1372,12 +1400,16 @@ async function setupVizeNuxtModule(options, nuxt) {
 		nuxt.options.vite.plugins = nuxt.options.vite.plugins || [];
 		nuxt.options.vite.plugins.push(vize({
 			...compilerOptions,
+			nuxtPageMeta: true,
 			ssrModuleIdRoot: nuxt.options.srcDir
 		}));
 	}
 	let isNuxtBuild = false;
 	let isViteBuild = false;
 	if (usesVizeCompiler) {
+		nuxt.hook("build:manifest", (manifest) => {
+			if (nuxt.options.dev === false) restoreNuxtClientManifestSourceIds(manifest);
+		});
 		nuxt.hook("build:before", () => {
 			if (nuxt.options.dev !== false) return;
 			isNuxtBuild = true;

package/dist/lint/index.d.mts

@@ -1,4 +1,4 @@
-import { _ as VizeNuxtLintCheckerOptions, a as ResolveNuxtLintConfigAddons, g as ResolvedVizeNuxtLintCheckerOptions, h as VizeNuxtLintOptions, i as NuxtLintImport, n as NuxtLintConfigAddon, o as VIZE_NUXT_LINT_CONFIG_ADDONS_HOOK, r as NuxtLintConfigAddonNuxt, s as setupNuxtLintConfigAddons, t as NuxtLintAwaitable, v as resolveNuxtLintCheckerOptions } from "../addons-CrR0MCzZ.mjs";
+import { _ as VizeNuxtLintCheckerOptions, a as ResolveNuxtLintConfigAddons, g as ResolvedVizeNuxtLintCheckerOptions, h as VizeNuxtLintOptions, i as NuxtLintImport, n as NuxtLintConfigAddon, o as VIZE_NUXT_LINT_CONFIG_ADDONS_HOOK, r as NuxtLintConfigAddonNuxt, s as setupNuxtLintConfigAddons, t as NuxtLintAwaitable, v as resolveNuxtLintCheckerOptions } from "../addons-C6yVrK58.mjs";
 import { NuxtLintConfigItem, NuxtLintDirNames, NuxtLintLayer, NuxtLintProjectState, NuxtLintSeverity } from "@vizejs/nuxt-lint-config";
 export * from "@vizejs/nuxt-lint-config";
 
@@ -213,12 +213,14 @@ declare function toNuxtLintProjectState(options: NuxtLintSourceOptions, override
 //#region src/lint/emitter.d.ts
 /**
  * Plan globs are relative to the Nuxt root. Oxlint resolves `overrides` and
- * `ignorePatterns` from the generated config's directory, so the emitter
- * rebases them when it knows both directories.
+ * `ignorePatterns` from the generated config's directory. That directory
+ * must contain the plan root: Oxlint cannot ignore files outside it.
  */
 interface NuxtOxlintGlobBase {
   rootDir: string;
   configDir: string;
+  /** Mark the module's reserved generated file; custom artifacts remain unmarked. */
+  owner?: "@vizejs/nuxt";
 }
 /** Render the complete generated oxlint config, including its trailing newline. */
 declare function renderNuxtOxlintConfig(items: readonly NuxtLintConfigItem[], pluginSpecifier: string, globBase?: NuxtOxlintGlobBase): string;

package/dist/lint/index.mjs

@@ -1,3 +1,3 @@
-import { a as toNuxtLintProjectState, c as setupNuxtLintConfigAddons, d as createNuxtLintCheckerVitePlugin, f as resolveNuxtLintCheckerOptions, l as setupNuxtLintChecker, n as setupNuxtLintConfigGeneration, o as renderNuxtOxlintConfig, r as writeFileIfChanged, s as VIZE_NUXT_LINT_CONFIG_ADDONS_HOOK, t as ROOT_OXLINT_CONFIG_NAMES, u as createNuxtLintCheckerWebpackPlugin } from "../generation-CXADZreI.mjs";
+import { a as toNuxtLintProjectState, c as setupNuxtLintConfigAddons, d as createNuxtLintCheckerVitePlugin, f as resolveNuxtLintCheckerOptions, l as setupNuxtLintChecker, n as setupNuxtLintConfigGeneration, o as renderNuxtOxlintConfig, r as writeFileIfChanged, s as VIZE_NUXT_LINT_CONFIG_ADDONS_HOOK, t as ROOT_OXLINT_CONFIG_NAMES, u as createNuxtLintCheckerWebpackPlugin } from "../generation-QrhC3X7H.mjs";
 export * from "@vizejs/nuxt-lint-config";
 export { ROOT_OXLINT_CONFIG_NAMES, VIZE_NUXT_LINT_CONFIG_ADDONS_HOOK, createNuxtLintCheckerVitePlugin, createNuxtLintCheckerWebpackPlugin, renderNuxtOxlintConfig, resolveNuxtLintCheckerOptions, setupNuxtLintChecker, setupNuxtLintConfigAddons, setupNuxtLintConfigGeneration, toNuxtLintProjectState, writeFileIfChanged };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/nuxt",
-  "version": "0.431.0",
+  "version": "0.433.0",
   "description": "Nuxt module for Vize - compiler, musea gallery, linter, and type checker",
   "keywords": [
     "compiler",
@@ -49,12 +49,12 @@
   },
   "dependencies": {
     "@nuxt/kit": "3.11.2",
-    "@vizejs/native": "0.431.0",
-    "@vizejs/nuxt-lint-config": "0.431.0",
-    "@vizejs/vite-plugin": "0.431.0",
-    "@vizejs/vite-plugin-musea": "0.431.0",
-    "oxlint-plugin-vize": "0.431.0",
-    "vize": "0.431.0"
+    "@vizejs/native": "0.433.0",
+    "@vizejs/nuxt-lint-config": "0.433.0",
+    "@vizejs/vite-plugin": "0.433.0",
+    "@vizejs/vite-plugin-musea": "0.433.0",
+    "oxlint-plugin-vize": "0.433.0",
+    "vize": "0.433.0"
   },
   "devDependencies": {
     "jiti-nuxt2": "npm:jiti@1.21.7",