vite-plus 0.2.1 → 0.2.2

package/dist/migration/compat/worker.d.ts

@@ -0,0 +1 @@
+export { };

package/dist/migration/compat/worker.js

@@ -0,0 +1,35 @@
+import { n as addMigrationWarning, r as createMigrationReport } from "../../report-BS7ULx7A.js";
+import { t as ROLLDOWN_COMPAT_RESULT_PREFIX } from "../../protocol-D99W10Qi.js";
+import { writeSync } from "node:fs";
+//#region src/migration/compat/manual-chunks.ts
+/**
+* Check for Rolldown-incompatible manualChunks config patterns.
+*/
+function checkManualChunksCompat(output, report) {
+	const outputs = Array.isArray(output) ? output : output ? [output] : [];
+	for (const out of outputs) if (out.manualChunks != null && typeof out.manualChunks !== "function") {
+		addMigrationWarning(report, "Object-form `build.rollupOptions.output.manualChunks` is not supported by Rolldown. Convert it to function form or use `build.rolldownOptions.output.codeSplitting`. See: https://rolldown.rs/options/output#manualchunks and https://rolldown.rs/in-depth/manual-code-splitting");
+		break;
+	}
+}
+//#endregion
+//#region src/migration/compat/worker.ts
+async function main() {
+	const rootDir = process.argv[2];
+	if (!rootDir) return;
+	try {
+		const { resolveConfig } = await import("../../index.js");
+		const { withConfigMetadataResolution } = await import("../../define-config.js");
+		const config = await withConfigMetadataResolution(() => resolveConfig({
+			root: rootDir,
+			logLevel: "silent",
+			configLoader: "runner"
+		}, "build"));
+		const report = createMigrationReport();
+		checkManualChunksCompat(config.build?.rollupOptions?.output, report);
+		writeSync(process.stdout.fd, `${ROLLDOWN_COMPAT_RESULT_PREFIX}${JSON.stringify({ warnings: report.warnings })}\n`);
+	} catch {}
+}
+main().then(() => process.exit(0), () => process.exit(0));
+//#endregion
+export {};

package/dist/{oxlint-plugin-config-q8a5PFch.js → oxlint-plugin-config-C2Rqc_WQ.js}

@@ -1,4 +1,4 @@
-import { o as VITE_PLUS_NAME } from "./constants-CrfJQIUX.js";
+import { s as VITE_PLUS_NAME } from "./constants-NeTOxrzV.js";
 //#region src/oxlint-plugin-config.ts
 const VITE_PLUS_OXLINT_PLUGIN_NAME = VITE_PLUS_NAME;
 const VITE_PLUS_OXLINT_PLUGIN_SPECIFIER = `${VITE_PLUS_NAME}/oxlint-plugin`;

package/dist/oxlint-plugin.js

@@ -1,9 +1,34 @@
-import { n as VITE_PLUS_OXLINT_PLUGIN_NAME, t as PREFER_VITE_PLUS_IMPORTS_RULE_NAME } from "./oxlint-plugin-config-q8a5PFch.js";
+import { n as VITE_PLUS_OXLINT_PLUGIN_NAME, t as PREFER_VITE_PLUS_IMPORTS_RULE_NAME } from "./oxlint-plugin-config-C2Rqc_WQ.js";
+import path from "node:path";
+import fs from "node:fs";
 import { definePlugin, defineRule } from "@oxlint/plugins";
+//#region src/vite-config-entry-basenames.json
+var vite_config_entry_basenames_default = [
+	"vite.config.ts",
+	"vite.config.mts",
+	"vite.config.cts",
+	"vite.config.js",
+	"vite.config.mjs",
+	"vite.config.cjs",
+	"vitest.config.ts",
+	"vitest.config.mts",
+	"vitest.config.cts",
+	"vitest.config.js",
+	"vitest.config.mjs",
+	"vitest.config.cjs"
+];
+//#endregion
 //#region src/oxlint-plugin.ts
 function isVitestFamilyDeclareModuleSpecifier(specifier) {
 	return specifier === "vitest" || specifier.startsWith("vitest/") || specifier === "@vitest/browser" || specifier.startsWith("@vitest/browser/") || specifier.startsWith("@vitest/browser-");
 }
+const VITE_CONFIG_FILE_BASENAMES = new Set(vite_config_entry_basenames_default);
+function isViteSpecifier(specifier) {
+	return specifier === "vite" || specifier.startsWith("vite/");
+}
+function isViteConfigFile(filename) {
+	return VITE_CONFIG_FILE_BASENAMES.has(path.basename(filename));
+}
 function rewriteVitePlusImportSpecifier(specifier) {
 	if (specifier === "vite") return "vite-plus";
 	if (specifier.startsWith("vite/")) return `vite-plus/${specifier.slice(5)}`;
@@ -35,8 +60,46 @@ function quoteSpecifier(literal, replacement) {
 	const quote = literal.raw?.startsWith("'") ? "'" : "\"";
 	return `${quote}${replacement}${quote}`;
 }
-function maybeReportLiteral(context, literal) {
+const nuxtTestUtilsPackageCache = /* @__PURE__ */ new Map();
+function isUpstreamVitestSpecifier(specifier) {
+	return specifier === "vitest" || specifier.startsWith("vitest/");
+}
+function nearestPackageUsesNuxtTestUtils(filename) {
+	if (!path.isAbsolute(filename)) return false;
+	let directory = path.dirname(filename);
+	while (true) {
+		const packageJsonPath = path.join(directory, "package.json");
+		if (fs.existsSync(packageJsonPath)) {
+			let mtimeMs;
+			try {
+				mtimeMs = fs.statSync(packageJsonPath).mtimeMs;
+			} catch {}
+			const cached = mtimeMs === void 0 ? void 0 : nuxtTestUtilsPackageCache.get(packageJsonPath);
+			if (cached !== void 0 && cached.mtimeMs === mtimeMs) return cached.usesNuxtTestUtils;
+			let usesNuxtTestUtils = false;
+			try {
+				const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+				usesNuxtTestUtils = [
+					pkg.dependencies,
+					pkg.devDependencies,
+					pkg.optionalDependencies
+				].some((dependencies) => dependencies?.["@nuxt/test-utils"] !== void 0);
+			} catch {}
+			if (mtimeMs !== void 0) nuxtTestUtilsPackageCache.set(packageJsonPath, {
+				mtimeMs,
+				usesNuxtTestUtils
+			});
+			return usesNuxtTestUtils;
+		}
+		const parent = path.dirname(directory);
+		if (parent === directory) return false;
+		directory = parent;
+	}
+}
+function maybeReportLiteral(context, literal, preserveUpstreamVitest = false, fileIsViteConfig = false) {
 	if (!literal || literal.type !== "Literal" || typeof literal.value !== "string") return;
+	if (preserveUpstreamVitest && isUpstreamVitestSpecifier(literal.value)) return;
+	if (!fileIsViteConfig && isViteSpecifier(literal.value)) return;
 	const replacement = rewriteVitePlusImportSpecifier(literal.value);
 	if (!replacement) return;
 	context.report({
@@ -63,30 +126,36 @@ const preferVitePlusImportsRule = defineRule({
 		messages: { preferVitePlusImports: "Use '{{to}}' instead of '{{from}}' in Vite+ projects." }
 	},
 	createOnce(context) {
+		let preserveUpstreamVitest = false;
+		let fileIsViteConfig = false;
 		return {
+			Program() {
+				preserveUpstreamVitest = nearestPackageUsesNuxtTestUtils(context.filename);
+				fileIsViteConfig = isViteConfigFile(context.filename);
+			},
 			ImportDeclaration(node) {
-				maybeReportLiteral(context, node.source);
+				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			ExportAllDeclaration(node) {
-				maybeReportLiteral(context, node.source);
+				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			ExportNamedDeclaration(node) {
-				maybeReportLiteral(context, node.source);
+				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			ImportExpression(node) {
-				maybeReportLiteral(context, node.source);
+				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			TSImportType(node) {
-				maybeReportLiteral(context, node.source);
+				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			TSExternalModuleReference(node) {
-				maybeReportLiteral(context, node.expression);
+				maybeReportLiteral(context, node.expression, preserveUpstreamVitest, fileIsViteConfig);
 			},
 			TSModuleDeclaration(node) {
 				if (node.global) return;
 				const id = node.id;
 				if (id?.type === "Literal" && typeof id.value === "string" && isVitestFamilyDeclareModuleSpecifier(id.value)) return;
-				maybeReportLiteral(context, id);
+				maybeReportLiteral(context, id, preserveUpstreamVitest, fileIsViteConfig);
 			}
 		};
 	}

package/dist/pack-bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as resolveViteConfig } from "./resolve-vite-config-CmdsfQzS.js";
+import { a as resolveViteConfig } from "./resolve-vite-config-r91rIaPs.js";
 import module from "node:module";
 import { buildWithConfigs, enableDebug, globalLogger, resolveUserConfig } from "@voidzero-dev/vite-plus-core/pack";
 //#region ../../node_modules/.pnpm/cac@7.0.0/node_modules/cac/dist/index.js

package/dist/{package-BHirM1_v.js → package-CU2g7URl.js}

@@ -1,5 +1,5 @@
-import "./constants-CrfJQIUX.js";
-import { r as readJsonFile } from "./json-Dn87fvjk.js";
+import "./constants-NeTOxrzV.js";
+import { i as readJsonFile } from "./json-DiRs8ceZ.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "node:fs";
@@ -138,9 +138,58 @@ function getScopeFromPackageName(packageName) {
 	if (packageName.startsWith("@")) return packageName.split("/")[0];
 	return "";
 }
+function findOwningPackageJson(resolvedPath, packageName) {
+	let currentDir;
+	try {
+		currentDir = fs.statSync(resolvedPath).isDirectory() ? resolvedPath : path.dirname(resolvedPath);
+	} catch {
+		return;
+	}
+	while (currentDir !== path.dirname(currentDir)) {
+		const candidate = path.join(currentDir, "package.json");
+		if (fs.existsSync(candidate)) try {
+			if (JSON.parse(fs.readFileSync(candidate, "utf8")).name === packageName) return candidate;
+		} catch {}
+		currentDir = path.dirname(currentDir);
+	}
+}
+function resolvePackageJsonWithNode(require, packageName) {
+	try {
+		return require.resolve(`${packageName}/package.json`);
+	} catch {}
+	try {
+		return findOwningPackageJson(require.resolve(packageName), packageName);
+	} catch {
+		return;
+	}
+}
+function findPnpApiPath(projectPath) {
+	let currentDir = path.resolve(projectPath);
+	while (currentDir !== path.dirname(currentDir)) {
+		const candidate = path.join(currentDir, ".pnp.cjs");
+		if (fs.existsSync(candidate)) return candidate;
+		currentDir = path.dirname(currentDir);
+	}
+}
 function detectPackageMetadata(projectPath, packageName) {
+	const require = createRequire(path.join(projectPath, "noop.js"));
+	let pkgFilePath = resolvePackageJsonWithNode(require, packageName);
+	if (!pkgFilePath) {
+		const pnpApiPath = findPnpApiPath(projectPath);
+		if (!pnpApiPath) return;
+		try {
+			const pnpApi = createRequire(pnpApiPath)(pnpApiPath);
+			const issuer = path.join(projectPath, "noop.js");
+			if (pnpApi.findPackageLocator && !pnpApi.findPackageLocator(issuer)) return;
+			pnpApi.setup?.();
+			pkgFilePath = findOwningPackageJson(pnpApi.resolveToUnqualified(packageName, issuer), packageName);
+			if (!pkgFilePath) pkgFilePath = resolvePackageJsonWithNode(require, packageName);
+		} catch {
+			return;
+		}
+	}
+	if (!pkgFilePath) return;
 	try {
-		const pkgFilePath = createRequire(path.join(projectPath, "noop.js")).resolve(`${packageName}/package.json`);
 		const pkg = JSON.parse(fs.readFileSync(pkgFilePath, "utf8"));
 		return {
 			name: pkg.name,

package/dist/protocol-D99W10Qi.js

@@ -0,0 +1,4 @@
+//#region src/migration/compat/protocol.ts
+const ROLLDOWN_COMPAT_RESULT_PREFIX = "VITE_PLUS_ROLLDOWN_COMPAT_RESULT=";
+//#endregion
+export { ROLLDOWN_COMPAT_RESULT_PREFIX as t };

package/dist/{report-BHSkWqRR.js → report-BS7ULx7A.js}

@@ -9,6 +9,7 @@ function createMigrationReport() {
 		tsdownImportCount: 0,
 		wrappedPluginConfigCount: 0,
 		rewrittenImportFileCount: 0,
+		preservedUpstreamVitestImportFileCount: 0,
 		rewrittenImportErrors: [],
 		eslintMigrated: false,
 		prettierMigrated: false,
@@ -16,6 +17,7 @@ function createMigrationReport() {
 		gitHooksConfigured: false,
 		frameworkShimAdded: false,
 		packageManagerBootstrapConfigured: false,
+		dependencyUpgrades: [],
 		warnings: [],
 		manualSteps: []
 	};

package/dist/{resolve-vite-config-CmdsfQzS.js → resolve-vite-config-r91rIaPs.js}

@@ -1,3 +1,4 @@
+import { u as withConfigMetadataResolution } from "./define-config-CSgy0zML.js";
 import path from "node:path";
 import fs from "node:fs";
 //#region src/resolve-vite-config.ts
@@ -61,17 +62,19 @@ function findWorkspaceRoot(startDir) {
 */
 async function resolveViteConfig(cwd, options) {
 	const { resolveConfig } = await import("./index.js");
-	if (options?.traverseUp && !hasViteConfig(cwd)) {
-		const workspaceRoot = findWorkspaceRoot(cwd);
-		if (workspaceRoot) {
-			const configFile = findViteConfigUp(path.dirname(cwd), workspaceRoot);
-			if (configFile) return resolveConfig({
-				root: cwd,
-				configFile
-			}, "build");
+	return withConfigMetadataResolution(async () => {
+		if (options?.traverseUp && !hasViteConfig(cwd)) {
+			const workspaceRoot = findWorkspaceRoot(cwd);
+			if (workspaceRoot) {
+				const configFile = findViteConfigUp(path.dirname(cwd), workspaceRoot);
+				if (configFile) return resolveConfig({
+					root: cwd,
+					configFile
+				}, "build");
+			}
 		}
-	}
-	return resolveConfig({ root: cwd }, "build");
+		return resolveConfig({ root: cwd }, "build");
+	});
 }
 async function resolveUniversalViteConfig(err, viteConfigCwd) {
 	if (err) throw err;
@@ -81,6 +84,7 @@ async function resolveUniversalViteConfig(err, viteConfigCwd) {
 			configFile: config.configFile,
 			lint: config.lint,
 			fmt: config.fmt,
+			check: config.check,
 			run: config.run,
 			staged: config.staged
 		});

package/dist/{rolldown-runtime-DnnnRqeS.js → rolldown-runtime-C7HZzL1F.js}

@@ -21,6 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 export { __require as n, __toESM as r, __commonJSMin as t };

package/dist/staged/bin.js

@@ -1,6 +1,6 @@
-import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-DnnnRqeS.js";
+import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-C7HZzL1F.js";
 import { a as printHeader, n as errorMsg, r as log } from "../terminal-uTv0ZaMr.js";
-import { a as resolveViteConfig } from "../resolve-vite-config-CmdsfQzS.js";
+import { a as resolveViteConfig } from "../resolve-vite-config-r91rIaPs.js";
 import { t as lib_default } from "../lib-L3DWSRQp.js";
 import { t as renderCliDoc } from "../help-YP84FSEz.js";
 import { createRequire } from "node:module";
@@ -8,7 +8,7 @@ import path, { basename, delimiter, dirname, normalize, resolve } from "node:pat
 import { closeSync, constants, openSync, readSync, statSync } from "node:fs";
 import { formatWithOptions, inspect, promisify } from "node:util";
 import { cwd } from "node:process";
-import u from "node:readline";
+import l__default from "node:readline";
 import nodeTty from "node:tty";
 import { pathToFileURL } from "node:url";
 import { EOL } from "node:os";
@@ -363,7 +363,7 @@ var I = class {
 		if (this._streamErr) t.push(this._streamErr);
 		if (this._streamOut) t.push(this._streamOut);
 		const n = b(t);
-		const r = u.createInterface({ input: n });
+		const r = l__default.createInterface({ input: n });
 		for await (const e of r) yield e.toString();
 		await this._processClosed;
 		e.removeAllListeners();
@@ -1544,9 +1544,9 @@ var DefaultRenderer = class DefaultRenderer {
 		this.logger.options.color = this.options.color;
 	}
 	async render() {
-		const { createLogUpdate } = await import("../log-update-lyIiuflf.js");
-		const { default: truncate } = await import("../cli-truncate-CWsmbK3p.js");
-		const { default: wrap } = await import("../wrap-ansi-CeQuiQ31.js");
+		const { createLogUpdate } = await import("../log-update-DHZRyJ2m.js");
+		const { default: truncate } = await import("../cli-truncate-BVOlIIPy.js");
+		const { default: wrap } = await import("../wrap-ansi-DUi52C6W.js");
 		this.updater = createLogUpdate(this.logger.process.stdout);
 		this.truncate = truncate;
 		this.wrap = wrap;
@@ -3807,7 +3807,8 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 		const extglobClose = (token) => {
 			const literal = input.slice(token.startIndex, state.index + 1);
-			const analysis = analyzeRepeatedExtglob(input.slice(token.startIndex + 2, state.index), opts);
+			const body = input.slice(token.startIndex + 2, state.index);
+			const analysis = analyzeRepeatedExtglob(body, opts);
 			if ((token.type === "plus" || token.type === "star") && analysis.risky) {
 				const safeOutput = analysis.safeOutput ? (token.output ? "" : ONE_CHAR) + (opts.capture ? `(${analysis.safeOutput})` : analysis.safeOutput) : void 0;
 				const open = tokens[token.tokensIndex];
@@ -3933,7 +3934,8 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						if (inner.includes(":")) {
 							const idx = prev.value.lastIndexOf("[");
 							const pre = prev.value.slice(0, idx);
-							const posix = POSIX_REGEX_SOURCE[prev.value.slice(idx + 2)];
+							const rest = prev.value.slice(idx + 2);
+							const posix = POSIX_REGEX_SOURCE[rest];
 							if (posix) {
 								prev.value = pre + posix;
 								state.backtrack = true;
@@ -5614,11 +5616,12 @@ var GitWorkflow = class {
 	async runTasks(ctx, task, { listrTasks, concurrent }) {
 		if (ctx.shouldFailOnChanges) {
 			debugLog$8("Calculating SHA-256 hash of unstaged changes because \"--fail-on-changes\" was used...");
-			ctx.unstagedDiffSha256 = calculateSha256(await this.execGit([
+			const diff = await this.execGit([
 				"diff",
 				"--patch",
 				"--unified=0"
-			]));
+			]);
+			ctx.unstagedDiffSha256 = calculateSha256(diff);
 			debugLog$8("SHA-256 hash of unstaged changes is %s", ctx.unstagedDiffSha256);
 		}
 		return task.newListr(listrTasks, { concurrent });
@@ -5630,11 +5633,12 @@ var GitWorkflow = class {
 	async applyModifications(ctx) {
 		if (ctx.shouldFailOnChanges) {
 			debugLog$8("Calculating SHA-256 hash of changes after tasks because \"--fail-on-changes\" was used...");
-			const diffSha256 = calculateSha256(await this.execGit([
+			const diff = await this.execGit([
 				"diff",
 				"--patch",
 				"--unified=0"
-			]));
+			]);
+			const diffSha256 = calculateSha256(diff);
 			debugLog$8("SHA-256 hash of changes after tasks is %s", diffSha256);
 			if (ctx.unstagedDiffSha256 !== diffSha256) {
 				ctx.errors.add(FailOnChangesError);
@@ -5912,7 +5916,7 @@ const jsonParse = async (filename) => {
 const yamlParse = async (filename) => {
 	const isPackageFile = PACKAGE_YAML_FILES.includes(path.basename(filename));
 	try {
-		const [YAML, content] = await Promise.all([import("../dist-DRJUd9bL.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1)), readFile(filename)]);
+		const [YAML, content] = await Promise.all([import("../dist-CtM2JRbM.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1)), readFile(filename)]);
 		const yaml = YAML.parse(content);
 		return isPackageFile ? yaml[CONFIG_NAME] : yaml;
 	} catch (error) {
@@ -5945,7 +5949,8 @@ const loaders = {
 };
 const loadConfigByExt = async (filename) => {
 	const filepath = path.resolve(filename);
-	const loader = loaders[path.extname(filepath) || NO_EXT];
+	const ext = path.extname(filepath) || NO_EXT;
+	const loader = loaders[ext];
 	return {
 		config: await loader(filepath),
 		filepath
@@ -6486,9 +6491,7 @@ const validateOptions = async (options = {}, logger) => {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/lint-staged@16.4.0/node_modules/lint-staged/lib/version.js
-const getVersion = async () => {
-	return JSON.parse(await fsPromises.readFile(new URL("../package.json", import.meta.url))).version;
-};
+const getVersion = async () => "16.4.0";
 //#endregion
 //#region ../../node_modules/.pnpm/lint-staged@16.4.0/node_modules/lint-staged/lib/index.js
 const debugLog = createDebug("lint-staged");
@@ -6541,7 +6544,8 @@ const lintStaged = async ({ allowEmpty = false, color = SUPPORTS_COLOR, concurre
 		enableDebug(logger);
 		debugLog("Running `lint-staged@%s` on Node.js %s (%s)", await getVersion(), process.version, process.platform);
 	}
-	debugLog("%s", await execGit(["version", "--build-options"], { cwd }));
+	const gitVersion = await execGit(["version", "--build-options"], { cwd });
+	debugLog("%s", gitVersion);
 	const options = {
 		allowEmpty,
 		color,