vite-plus 0.1.21-alpha.1 → 0.1.21-alpha.3

package/dist/{agent-YSH78B1d.js → agent-Ch4JIuSB.js}

@@ -845,21 +845,11 @@ const S_STEP_ACTIVE = S_POINTER_ACTIVE;
 const S_STEP_CANCEL = unicodeOr("■", "x");
 const S_STEP_ERROR = unicodeOr("▲", "x");
 const S_STEP_SUBMIT = unicodeOr("◇", "o");
-unicodeOr("┌", "T");
 const S_BAR = unicodeOr("│", "|");
 const S_BAR_END = unicodeOr("└", "—");
-unicodeOr("┐", "T");
-unicodeOr("┘", "—");
 const S_CHECKBOX_ACTIVE = unicodeOr("◻", "[•]");
 const S_CHECKBOX_SELECTED = unicodeOr("◼", "[+]");
 const S_CHECKBOX_INACTIVE = unicodeOr("◻", "[ ]");
-unicodeOr("▪", "•");
-unicodeOr("─", "-");
-unicodeOr("╮", "+");
-unicodeOr("├", "+");
-unicodeOr("╯", "+");
-unicodeOr("╰", "+");
-unicodeOr("╭", "+");
 const S_INFO = unicodeOr("●", "•");
 const S_SUCCESS = unicodeOr("◆", "*");
 const S_WARN = unicodeOr("▲", "!");
@@ -1611,7 +1601,6 @@ const spinner = ({ indicator = "dots", onCancel, output = process.stdout, cancel
 		}
 	};
 };
-unicodeOr("─", "-"), unicodeOr("━", "="), unicodeOr("█", "#");
 const computeLabel = (label, format) => {
 	if (!label.includes("\n")) return format(label);
 	return label.split("\n").map((line) => format(line)).join("\n");
@@ -3403,6 +3392,10 @@ const BROWSER_PROVIDER_PEER_DEPS = {
 	"@vitest/browser-playwright": "playwright",
 	"@vitest/browser-webdriverio": "webdriverio"
 };
+const PUBLIC_PEER_DEPENDENCY_FALLBACKS = {
+	vite: "*",
+	vitest: "*"
+};
 function warnMigration(message, report) {
 	addMigrationWarning(report, message);
 	if (!report) log.warn(message);
@@ -3811,8 +3804,11 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
 	const packageManager = workspaceInfo.packageManager;
+	const catalogDependencyResolver = createCatalogDependencyResolver(projectPath, packageManager);
 	let extractedStagedConfig = null;
 	let remainingPnpmOverrides;
+	let shouldRewritePnpmWorkspaceYaml = false;
+	let shouldAddPnpmWorkspaceVitePlusOverride = false;
 	let usePnpmWorkspaceYaml = false;
 	editJsonFile(packageJsonPath, (pkg) => {
 		if (packageManager === PackageManager.yarn) pkg.resolutions = {
@@ -3826,8 +3822,8 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 		else if (packageManager === PackageManager.pnpm) {
 			usePnpmWorkspaceYaml = !pkg.pnpm;
 			if (usePnpmWorkspaceYaml) {
-				rewritePnpmWorkspaceYaml(projectPath);
-				if (isForceOverrideMode()) migratePnpmOverridesToWorkspaceYaml(projectPath, { [VITE_PLUS_NAME]: VITE_PLUS_VERSION });
+				shouldRewritePnpmWorkspaceYaml = true;
+				shouldAddPnpmWorkspaceVitePlusOverride = isForceOverrideMode();
 			}
 			const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
 			if (!usePnpmWorkspaceYaml) pkg.pnpm = {
@@ -3853,7 +3849,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 			}
 			for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) if (pkg.resolutions?.[key]) delete pkg.resolutions[key];
 		}
-		extractedStagedConfig = rewritePackageJson(pkg, packageManager, usePnpmWorkspaceYaml, skipStagedMigration);
+		extractedStagedConfig = rewritePackageJson(pkg, packageManager, usePnpmWorkspaceYaml, skipStagedMigration, catalogDependencyResolver);
 		if (!pkg.devDependencies?.["vite-plus"] || isForceOverrideMode()) {
 			const version = usePnpmWorkspaceYaml && !VITE_PLUS_VERSION.startsWith("file:") ? "catalog:" : VITE_PLUS_VERSION;
 			pkg.devDependencies = {
@@ -3863,7 +3859,9 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 		}
 		return pkg;
 	});
+	if (shouldRewritePnpmWorkspaceYaml) rewritePnpmWorkspaceYaml(projectPath);
 	if (remainingPnpmOverrides) migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
+	if (shouldAddPnpmWorkspaceVitePlusOverride) migratePnpmOverridesToWorkspaceYaml(projectPath, { [VITE_PLUS_NAME]: VITE_PLUS_VERSION });
 	if (packageManager === PackageManager.yarn) rewriteYarnrcYml(projectPath);
 	if (extractedStagedConfig) {
 		if (mergeStagedConfigToViteConfig(projectPath, extractedStagedConfig, silent, report)) removeLintStagedFromPackageJson(packageJsonPath);
@@ -3882,11 +3880,12 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 * @param workspaceInfo - The workspace info
 */
 function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, report) {
+	const catalogDependencyResolver = createCatalogDependencyResolver(workspaceInfo.rootDir, workspaceInfo.packageManager);
 	if (workspaceInfo.packageManager === PackageManager.pnpm) rewritePnpmWorkspaceYaml(workspaceInfo.rootDir);
 	else if (workspaceInfo.packageManager === PackageManager.yarn) rewriteYarnrcYml(workspaceInfo.rootDir);
 	else if (workspaceInfo.packageManager === PackageManager.bun) rewriteBunCatalog(workspaceInfo.rootDir);
-	rewriteRootWorkspacePackageJson(workspaceInfo.rootDir, workspaceInfo.packageManager, skipStagedMigration);
-	for (const pkg of workspaceInfo.packages) rewriteMonorepoProject(path.join(workspaceInfo.rootDir, pkg.path), workspaceInfo.packageManager, skipStagedMigration, silent, report);
+	rewriteRootWorkspacePackageJson(workspaceInfo.rootDir, workspaceInfo.packageManager, skipStagedMigration, catalogDependencyResolver);
+	for (const pkg of workspaceInfo.packages) rewriteMonorepoProject(path.join(workspaceInfo.rootDir, pkg.path), workspaceInfo.packageManager, skipStagedMigration, silent, report, catalogDependencyResolver);
 	if (!skipStagedMigration) rewriteLintStagedConfigFile(workspaceInfo.rootDir, report);
 	cleanupDeprecatedTsconfigOptions(workspaceInfo.rootDir, silent, report);
 	mergeViteConfigFiles(workspaceInfo.rootDir, silent, report);
@@ -3900,7 +3899,7 @@ function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, rep
 * Rewrite monorepo project to add vite-plus dependencies
 * @param projectPath - The path to the project
 */
-function rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration, silent = false, report) {
+function rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration, silent = false, report, catalogDependencyResolver) {
 	cleanupDeprecatedTsconfigOptions(projectPath, silent, report);
 	mergeViteConfigFiles(projectPath, silent, report);
 	mergeTsdownConfigFile(projectPath, silent, report);
@@ -3908,7 +3907,7 @@ function rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration
 	if (!fs.existsSync(packageJsonPath)) return;
 	let extractedStagedConfig = null;
 	editJsonFile(packageJsonPath, (pkg) => {
-		extractedStagedConfig = rewritePackageJson(pkg, packageManager, true, skipStagedMigration);
+		extractedStagedConfig = rewritePackageJson(pkg, packageManager, true, skipStagedMigration, catalogDependencyResolver);
 		return pkg;
 	});
 	if (extractedStagedConfig) {
@@ -3924,15 +3923,15 @@ function rewritePnpmWorkspaceYaml(projectPath) {
 	if (!fs.existsSync(pnpmWorkspaceYamlPath)) fs.writeFileSync(pnpmWorkspaceYamlPath, "");
 	editYamlFile(pnpmWorkspaceYamlPath, (doc) => {
 		rewriteCatalog(doc);
+		const overrides = doc.getIn(["overrides"]);
 		for (const key of Object.keys(VITE_PLUS_OVERRIDE_PACKAGES)) {
-			let version = VITE_PLUS_OVERRIDE_PACKAGES[key];
-			if (!version.startsWith("file:")) version = "catalog:";
+			const version = getCatalogDependencySpec(getYamlMapScalarStringValue(overrides, key), VITE_PLUS_OVERRIDE_PACKAGES[key], true);
 			doc.setIn(["overrides", scalarString(key)], scalarString(version));
 		}
-		const overrides = doc.getIn(["overrides"]);
-		for (const item of overrides.items) if (item.key.value.includes(">")) {
+		const updatedOverrides = doc.getIn(["overrides"]);
+		for (const item of updatedOverrides.items) if (item.key.value.includes(">")) {
 			const splits = item.key.value.split(">");
-			if (splits[splits.length - 1].trim() === "vite") overrides.delete(item.key);
+			if (splits[splits.length - 1].trim() === "vite") updatedOverrides.delete(item.key);
 		}
 		let allowAny = doc.getIn(["peerDependencyRules", "allowAny"]);
 		if (!allowAny) allowAny = new import_dist.YAMLSeq();
@@ -3968,13 +3967,25 @@ function rewritePnpmWorkspaceYaml(projectPath) {
 * moved to pnpm-workspace.yaml.
 */
 function cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys) {
-	for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) if (pkg.pnpm?.overrides?.[key]) delete pkg.pnpm.overrides[key];
+	const catalogOverrides = {};
+	const overrides = pkg.pnpm?.overrides;
+	for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
+		const value = overrides?.[key];
+		if (value) {
+			if (overrideKeys.includes(key) && value.startsWith("catalog:")) catalogOverrides[key] = value;
+			delete overrides[key];
+		}
+	}
 	for (const key in pkg.pnpm?.overrides) if (key.includes(">")) {
 		const splits = key.split(">");
 		if (splits[splits.length - 1].trim() === "vite") delete pkg.pnpm.overrides[key];
 	}
 	let remaining;
-	if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) remaining = { ...pkg.pnpm.overrides };
+	if (Object.keys(catalogOverrides).length > 0) remaining = { ...catalogOverrides };
+	if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) remaining = {
+		...remaining,
+		...pkg.pnpm.overrides
+	};
 	delete pkg.pnpm?.overrides;
 	cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
 	if (pkg.pnpm?.peerDependencyRules && Object.keys(pkg.pnpm.peerDependencyRules).length === 0) delete pkg.pnpm.peerDependencyRules;
@@ -4021,6 +4032,58 @@ function rewriteYarnrcYml(projectPath) {
 * Rewrite catalog in pnpm-workspace.yaml or .yarnrc.yml
 * @param doc - The document to rewrite
 */
+function getCatalogDependencySpec(currentValue, version, supportCatalog, options) {
+	if (options?.dependencyField === "peerDependencies") {
+		if (currentValue?.startsWith("catalog:") && options.dependencyName) {
+			const resolved = options.catalogDependencyResolver?.(currentValue, options.dependencyName);
+			if (resolved && !isVitePlusOverrideSpec(resolved)) return resolved;
+			return PUBLIC_PEER_DEPENDENCY_FALLBACKS[options.dependencyName] ?? currentValue;
+		}
+		return currentValue ?? version;
+	}
+	if (options?.dependencyField === "optionalDependencies" && options?.packageManager === PackageManager.yarn) return version;
+	if (!supportCatalog || version.startsWith("file:")) return version;
+	return currentValue?.startsWith("catalog:") ? currentValue : "catalog:";
+}
+function isVitePlusOverrideSpec(value) {
+	return Object.values(VITE_PLUS_OVERRIDE_PACKAGES).includes(value) || value.startsWith("npm:@voidzero-dev/vite-plus-");
+}
+function createCatalogDependencyResolver(projectPath, packageManager) {
+	if (packageManager === PackageManager.pnpm) {
+		const pnpmWorkspaceYamlPath = path.join(projectPath, "pnpm-workspace.yaml");
+		if (!fs.existsSync(pnpmWorkspaceYamlPath)) return;
+		const doc = readYamlFile(pnpmWorkspaceYamlPath);
+		return createCatalogDependencyResolverFromCatalogs(doc?.catalog, doc?.catalogs);
+	}
+	if (packageManager === PackageManager.yarn) {
+		const yarnrcYmlPath = path.join(projectPath, ".yarnrc.yml");
+		if (!fs.existsSync(yarnrcYmlPath)) return;
+		const doc = readYamlFile(yarnrcYmlPath);
+		return createCatalogDependencyResolverFromCatalogs(doc?.catalog, doc?.catalogs);
+	}
+	if (packageManager === PackageManager.bun) {
+		const packageJsonPath = path.join(projectPath, "package.json");
+		if (!fs.existsSync(packageJsonPath)) return;
+		const pkg = readJsonFile(packageJsonPath);
+		const workspacesObj = pkg.workspaces && !Array.isArray(pkg.workspaces) ? pkg.workspaces : void 0;
+		return (catalogSpec, dependencyName) => {
+			const catalogName = catalogSpec.slice(8);
+			if (catalogName) return workspacesObj?.catalogs?.[catalogName]?.[dependencyName] ?? pkg.catalogs?.[catalogName]?.[dependencyName];
+			return workspacesObj?.catalog?.[dependencyName] ?? pkg.catalog?.[dependencyName];
+		};
+	}
+}
+function createCatalogDependencyResolverFromCatalogs(catalog, catalogs) {
+	return (catalogSpec, dependencyName) => {
+		const catalogName = catalogSpec.slice(8);
+		if (catalogName) return catalogs?.[catalogName]?.[dependencyName];
+		return catalog?.[dependencyName];
+	};
+}
+function getYamlMapScalarStringValue(map, key) {
+	if (!(map instanceof import_dist.YAMLMap)) return;
+	for (const item of map.items) if (item.key instanceof import_dist.Scalar && item.key.value === key && item.value instanceof import_dist.Scalar && typeof item.value.value === "string") return item.value.value;
+}
 function rewriteCatalog(doc) {
 	for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
 		if (value.startsWith("file:")) continue;
@@ -4031,6 +4094,45 @@ function rewriteCatalog(doc) {
 		const path = ["catalog", name];
 		if (doc.hasIn(path)) doc.deleteIn(path);
 	}
+	const catalogs = doc.getIn(["catalogs"]);
+	if (!(catalogs instanceof import_dist.YAMLMap)) return;
+	for (const item of catalogs.items) {
+		const catalogName = item.key instanceof import_dist.Scalar ? item.key.value : void 0;
+		if (typeof catalogName !== "string" || !(item.value instanceof import_dist.YAMLMap)) continue;
+		for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
+			const catalogPath = [
+				"catalogs",
+				catalogName,
+				key
+			];
+			if (!value.startsWith("file:") && doc.hasIn(catalogPath)) doc.setIn(catalogPath, scalarString(value));
+		}
+		const vitePlusPath = [
+			"catalogs",
+			catalogName,
+			VITE_PLUS_NAME
+		];
+		if (!VITE_PLUS_VERSION.startsWith("file:") && doc.hasIn(vitePlusPath)) doc.setIn(vitePlusPath, scalarString(VITE_PLUS_VERSION));
+		for (const name of REMOVE_PACKAGES) {
+			const catalogPath = [
+				"catalogs",
+				catalogName,
+				name
+			];
+			if (doc.hasIn(catalogPath)) doc.deleteIn(catalogPath);
+		}
+	}
+}
+function rewriteCatalogObject(catalog, addMissing) {
+	for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
+		if (value.startsWith("file:") || !addMissing && !(key in catalog)) continue;
+		catalog[key] = value;
+	}
+	if (!VITE_PLUS_VERSION.startsWith("file:") && (addMissing || "vite-plus" in catalog)) catalog[VITE_PLUS_NAME] = VITE_PLUS_VERSION;
+	for (const name of REMOVE_PACKAGES) delete catalog[name];
+}
+function rewriteCatalogsObject(catalogs) {
+	for (const catalog of Object.values(catalogs)) rewriteCatalogObject(catalog, false);
 }
 /**
 * Write catalog entries to root package.json for bun.
@@ -4043,14 +4145,20 @@ function rewriteBunCatalog(projectPath) {
 	if (!fs.existsSync(packageJsonPath)) return;
 	editJsonFile(packageJsonPath, (pkg) => {
 		const workspacesObj = pkg.workspaces && !Array.isArray(pkg.workspaces) ? pkg.workspaces : void 0;
-		const catalog = { ...workspacesObj?.catalog ?? pkg.catalog };
-		for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) if (!value.startsWith("file:")) catalog[key] = value;
-		if (!VITE_PLUS_VERSION.startsWith("file:")) catalog[VITE_PLUS_NAME] = VITE_PLUS_VERSION;
-		for (const name of REMOVE_PACKAGES) delete catalog[name];
-		if (workspacesObj?.catalog != null) workspacesObj.catalog = catalog;
-		else pkg.catalog = catalog;
+		const useWorkspacesCatalog = workspacesObj?.catalog != null || pkg.catalog == null && workspacesObj?.catalogs != null;
+		const catalog = { ...useWorkspacesCatalog ? workspacesObj?.catalog : pkg.catalog };
+		rewriteCatalogObject(catalog, true);
+		if (useWorkspacesCatalog) {
+			workspacesObj.catalog = catalog;
+			if (pkg.catalog) rewriteCatalogObject(pkg.catalog, false);
+		} else {
+			pkg.catalog = catalog;
+			if (workspacesObj?.catalog) rewriteCatalogObject(workspacesObj.catalog, false);
+		}
+		if (workspacesObj?.catalogs) rewriteCatalogsObject(workspacesObj.catalogs);
+		if (pkg.catalogs) rewriteCatalogsObject(pkg.catalogs);
 		const overrides = { ...pkg.overrides };
-		for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) overrides[key] = value.startsWith("file:") ? value : "catalog:";
+		for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) overrides[key] = getCatalogDependencySpec(overrides[key], value, true);
 		pkg.overrides = overrides;
 		return pkg;
 	});
@@ -4059,7 +4167,7 @@ function rewriteBunCatalog(projectPath) {
 * Rewrite root workspace package.json to add vite-plus dependencies
 * @param projectPath - The path to the project
 */
-function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStagedMigration) {
+function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStagedMigration, catalogDependencyResolver) {
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
 	let remainingPnpmOverrides;
@@ -4098,7 +4206,7 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 		return pkg;
 	});
 	if (remainingPnpmOverrides) migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
-	rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration);
+	rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration, void 0, void 0, catalogDependencyResolver);
 }
 const RULES_YAML_PATH = path.join(rulesDir, "vite-tools.yml");
 const PREPARE_RULES_YAML_PATH = path.join(rulesDir, "vite-prepare.yml");
@@ -4119,7 +4227,7 @@ function readPrepareRulesYaml() {
 	cachedPrepareRulesYaml ??= fs.readFileSync(PREPARE_RULES_YAML_PATH, "utf8");
 	return cachedPrepareRulesYaml;
 }
-function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration) {
+function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration, catalogDependencyResolver) {
 	if (pkg.scripts) {
 		const updated = rewriteScripts(JSON.stringify(pkg.scripts), getScriptRulesYaml(skipStagedMigration));
 		if (updated) pkg.scripts = JSON.parse(updated);
@@ -4130,32 +4238,44 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 		const updated = rewriteScripts(JSON.stringify(config), readRulesYaml());
 		extractedStagedConfig = updated ? JSON.parse(updated) : config;
 	}
-	const supportCatalog = isMonorepo && packageManager !== PackageManager.npm;
+	const supportCatalog = !!isMonorepo && packageManager !== PackageManager.npm;
 	let needVitePlus = false;
-	for (const [key, version] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
-		const value = supportCatalog && !version.startsWith("file:") ? "catalog:" : version;
-		if (pkg.devDependencies?.[key]) {
-			pkg.devDependencies[key] = value;
-			needVitePlus = true;
-		}
-		if (pkg.dependencies?.[key]) {
-			pkg.dependencies[key] = value;
-			needVitePlus = true;
+	const dependencyGroups = [
+		{
+			dependencyField: "devDependencies",
+			dependencies: pkg.devDependencies
+		},
+		{
+			dependencyField: "dependencies",
+			dependencies: pkg.dependencies
+		},
+		{
+			dependencyField: "peerDependencies",
+			dependencies: pkg.peerDependencies
+		},
+		{
+			dependencyField: "optionalDependencies",
+			dependencies: pkg.optionalDependencies
 		}
+	];
+	for (const [key, version] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) for (const { dependencyField, dependencies } of dependencyGroups) if (dependencies?.[key]) {
+		dependencies[key] = getCatalogDependencySpec(dependencies[key], version, supportCatalog, {
+			dependencyField,
+			dependencyName: key,
+			packageManager,
+			catalogDependencyResolver
+		});
+		needVitePlus = true;
 	}
 	for (const name of REMOVE_PACKAGES) {
-		const wasInDevDeps = !!pkg.devDependencies?.[name];
-		const wasInDeps = !!pkg.dependencies?.[name];
-		if (wasInDevDeps) {
-			delete pkg.devDependencies[name];
-			needVitePlus = true;
-		}
-		if (wasInDeps) {
-			delete pkg.dependencies[name];
-			needVitePlus = true;
+		let wasRemoved = false;
+		for (const { dependencies } of dependencyGroups) if (dependencies?.[name]) {
+			delete dependencies[name];
+			wasRemoved = true;
 		}
+		if (wasRemoved) needVitePlus = true;
 		const peerDep = BROWSER_PROVIDER_PEER_DEPS[name];
-		if ((wasInDevDeps || wasInDeps) && peerDep && !pkg.devDependencies?.[peerDep] && !pkg.dependencies?.[peerDep]) {
+		if (wasRemoved && peerDep && !pkg.devDependencies?.[peerDep] && !pkg.dependencies?.[peerDep] && !pkg.peerDependencies?.[peerDep] && !pkg.optionalDependencies?.[peerDep]) {
 			pkg.devDependencies ??= {};
 			pkg.devDependencies[peerDep] = "*";
 		}
@@ -4166,13 +4286,14 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 			...pkg.devDependencies,
 			[VITE_PLUS_NAME]: version
 		};
-		const allDeps = {
+		const installableDeps = {
 			...pkg.dependencies,
-			...pkg.devDependencies
+			...pkg.devDependencies,
+			...pkg.optionalDependencies
 		};
-		if (!allDeps.vitest && Object.keys(allDeps).some((name) => name.includes("vitest"))) {
+		if (!installableDeps.vitest && Object.keys(installableDeps).some((name) => name.includes("vitest"))) {
 			const ver = VITE_PLUS_OVERRIDE_PACKAGES.vitest;
-			pkg.devDependencies.vitest = supportCatalog && !ver.startsWith("file:") ? "catalog:" : ver;
+			pkg.devDependencies.vitest = getCatalogDependencySpec(void 0, ver, supportCatalog);
 		}
 	}
 	return extractedStagedConfig;

package/dist/config/bin.js

@@ -1,5 +1,5 @@
 import { a as printHeader, r as log } from "../terminal-CxTMfsxZ.js";
-import { L as defaultInteractive, _ as hasStagedConfigInViteConfig, h as ensurePreCommitHook, i as updateExistingAgentInstructions, z as promptGitHooks } from "../agent-YSH78B1d.js";
+import { L as defaultInteractive, _ as hasStagedConfigInViteConfig, h as ensurePreCommitHook, i as updateExistingAgentInstructions, z as promptGitHooks } from "../agent-Ch4JIuSB.js";
 import { t as lib_default } from "../lib-BamM40b7.js";
 import { t as renderCliDoc } from "../help-BtkjXtRM.js";
 import { join } from "node:path";

package/dist/create/bin.js

@@ -2,10 +2,10 @@ import { r as __toESM, t as __commonJSMin } from "../chunk-q7NCDQ7-.js";
 import { a as runCommandSilently, i as runCommand$1, o as require_cross_spawn } from "../tsconfig-BQeK6Jxp.js";
 import { a as printHeader, i as muted, o as success, r as log, t as accent } from "../terminal-CxTMfsxZ.js";
 import { i as resolveViteConfig, n as hasViteConfig, t as findWorkspaceRoot } from "../resolve-vite-config-C1KX9CZU.js";
-import { $ as multiselect, A as setPackageManager, B as runViteFmt, D as rewriteMonorepo, E as promptPrettierMigration, G as templatesDir, H as selectPackageManager, K as DependencyType, L as defaultInteractive, O as rewriteMonorepoProject, Q as log$1, R as downloadPackageManager$1, T as promptEslintMigration, V as runViteInstall, W as displayRelative, X as confirm, Y as cancel, Z as intro, a as writeAgentInstructions, at as q, d as detectEslintProject, f as detectFramework, g as hasFrameworkShim, it as require_picocolors, k as rewriteStandaloneProject, m as detectPrettierProject, n as detectExistingAgentTargetPaths, nt as spinner, o as addFrameworkShim, q as PackageManager, r as selectAgentTargetPaths, rt as text, tt as select, v as injectCreateDefaultTemplate, y as installGitHooks, z as promptGitHooks } from "../agent-YSH78B1d.js";
+import { $ as multiselect, A as setPackageManager, B as runViteFmt, D as rewriteMonorepo, E as promptPrettierMigration, G as templatesDir, H as selectPackageManager, K as DependencyType, L as defaultInteractive, O as rewriteMonorepoProject, Q as log$1, R as downloadPackageManager$1, T as promptEslintMigration, V as runViteInstall, W as displayRelative, X as confirm, Y as cancel, Z as intro, a as writeAgentInstructions, at as q, d as detectEslintProject, f as detectFramework, g as hasFrameworkShim, it as require_picocolors, k as rewriteStandaloneProject, m as detectPrettierProject, n as detectExistingAgentTargetPaths, nt as spinner, o as addFrameworkShim, q as PackageManager, r as selectAgentTargetPaths, rt as text, tt as select, v as injectCreateDefaultTemplate, y as installGitHooks, z as promptGitHooks } from "../agent-Ch4JIuSB.js";
 import { t as lib_default } from "../lib-BamM40b7.js";
 import { c as editJsonFile, o as fetchNpmResource, s as getNpmRegistry, t as checkNpmPackageExists, u as readJsonFile } from "../package-CrKanQYM.js";
-import { a as detectExistingEditors, c as writeEditorConfigs, n as updatePackageJsonWithDeps, r as updateWorkspaceConfig, s as selectEditors, t as detectWorkspace$1 } from "../workspace-9Zx76HPn.js";
+import { a as detectExistingEditors, c as writeEditorConfigs, n as updatePackageJsonWithDeps, r as updateWorkspaceConfig, s as selectEditors, t as detectWorkspace$1 } from "../workspace-DxqnDgi4.js";
 import { t as renderCliDoc } from "../help-BtkjXtRM.js";
 import path from "node:path";
 import { runCommand, vitePlusHeader } from "../../binding/index.js";

package/dist/migration/bin.js

@@ -1,11 +1,11 @@
 import { r as __toESM } from "../chunk-q7NCDQ7-.js";
 import { l as isForceOverrideMode } from "../main-A6UrSTYb.js";
 import { a as printHeader, i as muted, r as log, t as accent } from "../terminal-CxTMfsxZ.js";
-import { C as migratePrettierToOxfmt, D as rewriteMonorepo, E as promptPrettierMigration, H as selectPackageManager, I as cancelAndExit, J as require_semver, L as defaultInteractive, M as warnPackageLevelEslint, N as warnPackageLevelPrettier, Q as log$1, R as downloadPackageManager, S as migrateNodeVersionManagerFile, T as promptEslintMigration, U as upgradeYarn, V as runViteInstall, W as displayRelative, X as confirm, a as writeAgentInstructions, at as q, b as mergeViteConfigFiles, c as checkVitestVersion, d as detectEslintProject, et as outro, f as detectFramework, g as hasFrameworkShim, j as warnLegacyEslintConfig, k as rewriteStandaloneProject, l as confirmEslintMigration, m as detectPrettierProject, n as detectExistingAgentTargetPaths, nt as spinner, o as addFrameworkShim, p as detectNodeVersionManagerFile, q as PackageManager, r as selectAgentTargetPaths, s as checkViteVersion, t as detectAgentConflicts, tt as select, u as confirmPrettierMigration, w as preflightGitHooksSetup, x as migrateEslintToOxlint, y as installGitHooks, z as promptGitHooks } from "../agent-YSH78B1d.js";
+import { C as migratePrettierToOxfmt, D as rewriteMonorepo, E as promptPrettierMigration, H as selectPackageManager, I as cancelAndExit, J as require_semver, L as defaultInteractive, M as warnPackageLevelEslint, N as warnPackageLevelPrettier, Q as log$1, R as downloadPackageManager, S as migrateNodeVersionManagerFile, T as promptEslintMigration, U as upgradeYarn, V as runViteInstall, W as displayRelative, X as confirm, a as writeAgentInstructions, at as q, b as mergeViteConfigFiles, c as checkVitestVersion, d as detectEslintProject, et as outro, f as detectFramework, g as hasFrameworkShim, j as warnLegacyEslintConfig, k as rewriteStandaloneProject, l as confirmEslintMigration, m as detectPrettierProject, n as detectExistingAgentTargetPaths, nt as spinner, o as addFrameworkShim, p as detectNodeVersionManagerFile, q as PackageManager, r as selectAgentTargetPaths, s as checkViteVersion, t as detectAgentConflicts, tt as select, u as confirmPrettierMigration, w as preflightGitHooksSetup, x as migrateEslintToOxlint, y as installGitHooks, z as promptGitHooks } from "../agent-Ch4JIuSB.js";
 import { t as lib_default } from "../lib-BamM40b7.js";
 import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-CrKanQYM.js";
 import { r as createMigrationReport } from "../report-DbrfjWiP.js";
-import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-9Zx76HPn.js";
+import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-DxqnDgi4.js";
 import { t as renderCliDoc } from "../help-BtkjXtRM.js";
 import path from "node:path";
 import { styleText } from "node:util";

package/dist/staged/bin.js

@@ -4,7 +4,7 @@ import { i as resolveViteConfig } from "../resolve-vite-config-C1KX9CZU.js";
 import { t as lib_default } from "../lib-BamM40b7.js";
 import { t as renderCliDoc } from "../help-BtkjXtRM.js";
 import { createRequire } from "node:module";
-import path, { delimiter, dirname, normalize, resolve } from "node:path";
+import path, { delimiter, dirname, resolve } from "node:path";
 import { constants } from "node:fs";
 import { formatWithOptions, inspect, promisify } from "node:util";
 import { pathToFileURL } from "node:url";
@@ -95,7 +95,6 @@ const wrapAnsiColor = (code, supported = SUPPORTS_COLOR) => {
 	return (text) => text;
 };
 const red$1 = wrapAnsiColor("\x1B[0;31m");
-wrapAnsiColor("\x1B[0;32m");
 const yellow$1 = wrapAnsiColor("\x1B[0;33m");
 const blue$1 = wrapAnsiColor("\x1B[0;34m");
 const blackBright$1 = wrapAnsiColor("\x1B[0;90m");
@@ -119,53 +118,53 @@ const createDebug = (name) => {
 	};
 };
 //#endregion
-//#region ../../node_modules/.pnpm/tinyexec@1.1.1/node_modules/tinyexec/dist/main.mjs
-var d = (e, t) => () => (t || e((t = { exports: {} }).exports, t), t.exports);
-var f = /* @__PURE__ */ createRequire(import.meta.url);
-const p = /^path$/i;
-const m = {
+//#region ../../node_modules/.pnpm/tinyexec@1.1.2/node_modules/tinyexec/dist/main.mjs
+var u = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports);
+var d = /* @__PURE__ */ createRequire(import.meta.url);
+const f = /^path$/i;
+const p = {
 	key: "PATH",
 	value: ""
 };
-function h(e) {
+function m(e) {
 	for (const t in e) {
-		if (!Object.prototype.hasOwnProperty.call(e, t) || !p.test(t)) continue;
+		if (!Object.prototype.hasOwnProperty.call(e, t) || !f.test(t)) continue;
 		const n = e[t];
-		if (!n) return m;
+		if (!n) return p;
 		return {
 			key: t,
 			value: n
 		};
 	}
-	return m;
+	return p;
 }
-function g(e, t) {
+function h(e, t) {
 	const n = t.value.split(delimiter);
-	const a = [];
+	const r = [];
 	let s = e;
 	let c;
 	do {
-		a.push(resolve(s, "node_modules", ".bin"));
+		r.push(resolve(s, "node_modules", ".bin"));
 		c = s;
 		s = dirname(s);
 	} while (s !== c);
-	a.push(dirname(process.execPath));
-	const l = a.concat(n).join(delimiter);
+	r.push(dirname(process.execPath));
+	const l = r.concat(n).join(delimiter);
 	return {
 		key: t.key,
 		value: l
 	};
 }
-function _(e, t) {
+function g(e, t) {
 	const n = {
 		...process.env,
 		...t
 	};
-	const r = g(e, h(n));
+	const r = h(e, m(n));
 	n[r.key] = r.value;
 	return n;
 }
-const v = (e) => {
+const _ = (e) => {
 	let t = e.length;
 	const n = new PassThrough();
 	const r = () => {
@@ -174,10 +173,10 @@ const v = (e) => {
 	for (const t of e) pipeline(t, n, { end: false }).then(r).catch(r);
 	return n;
 };
-var y = /* @__PURE__ */ d(((e, t) => {
+var v = /* @__PURE__ */ u(((e, t) => {
 	t.exports = a;
 	a.sync = o;
-	var n = f("fs");
+	var n = d("fs");
 	function r(e, t) {
 		var n = t.pathExt !== void 0 ? t.pathExt : process.env.PATHEXT;
 		if (!n) return true;
@@ -202,10 +201,10 @@ var y = /* @__PURE__ */ d(((e, t) => {
 		return i(n.statSync(e), e, t);
 	}
 }));
-var b = /* @__PURE__ */ d(((e, t) => {
+var y = /* @__PURE__ */ u(((e, t) => {
 	t.exports = r;
 	r.sync = i;
-	var n = f("fs");
+	var n = d("fs");
 	function r(e, t, r) {
 		n.stat(e, function(e, n) {
 			r(e, e ? false : a(n, t));
@@ -230,11 +229,11 @@ var b = /* @__PURE__ */ d(((e, t) => {
 		return n & l || n & c && i === o || n & s && r === a || n & u && a === 0;
 	}
 }));
-var x = /* @__PURE__ */ d(((e, t) => {
-	f("fs");
+var b = /* @__PURE__ */ u(((e, t) => {
+	d("fs");
 	var n;
-	if (process.platform === "win32" || global.TESTING_WINDOWS) n = y();
-	else n = b();
+	if (process.platform === "win32" || global.TESTING_WINDOWS) n = v();
+	else n = y();
 	t.exports = r;
 	r.sync = i;
 	function r(e, t, i) {
@@ -270,11 +269,11 @@ var x = /* @__PURE__ */ d(((e, t) => {
 		}
 	}
 }));
-var S = /* @__PURE__ */ d(((e, t) => {
+var x = /* @__PURE__ */ u(((e, t) => {
 	const n = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-	const r = f("path");
+	const r = d("path");
 	const i = n ? ";" : ":";
-	const a = x();
+	const a = b();
 	const o = (e) => Object.assign(/* @__PURE__ */ new Error(`not found: ${e}`), { code: "ENOENT" });
 	const s = (e, t) => {
 		const r = t.colon || i;
@@ -340,7 +339,7 @@ var S = /* @__PURE__ */ d(((e, t) => {
 	t.exports = c;
 	c.sync = l;
 }));
-var C = /* @__PURE__ */ d(((e, t) => {
+var S = /* @__PURE__ */ u(((e, t) => {
 	const n = (e = {}) => {
 		const t = e.env || process.env;
 		if ((e.platform || process.platform) !== "win32") return "PATH";
@@ -349,10 +348,10 @@ var C = /* @__PURE__ */ d(((e, t) => {
 	t.exports = n;
 	t.exports.default = n;
 }));
-var w = /* @__PURE__ */ d(((e, t) => {
-	const n = f("path");
-	const r = S();
-	const i = C();
+var C = /* @__PURE__ */ u(((e, t) => {
+	const n = d("path");
+	const r = x();
+	const i = S();
 	function a(e, t) {
 		const a = e.options.env || process.env;
 		const o = process.cwd();
@@ -378,7 +377,7 @@ var w = /* @__PURE__ */ d(((e, t) => {
 	}
 	t.exports = o;
 }));
-var T = /* @__PURE__ */ d(((e, t) => {
+var w = /* @__PURE__ */ u(((e, t) => {
 	const n = /([()\][%!^"`<>&|;, *?])/g;
 	function r(e) {
 		e = e.replace(n, "^$1");
@@ -396,11 +395,11 @@ var T = /* @__PURE__ */ d(((e, t) => {
 	t.exports.command = r;
 	t.exports.argument = i;
 }));
-var E = /* @__PURE__ */ d(((e, t) => {
+var T = /* @__PURE__ */ u(((e, t) => {
 	t.exports = /^#!(.*)/;
 }));
-var D = /* @__PURE__ */ d(((e, t) => {
-	const n = E();
+var E = /* @__PURE__ */ u(((e, t) => {
+	const n = T();
 	t.exports = (e = "") => {
 		const t = e.match(n);
 		if (!t) return null;
@@ -410,9 +409,9 @@ var D = /* @__PURE__ */ d(((e, t) => {
 		return i ? `${a} ${i}` : a;
 	};
 }));
-var O = /* @__PURE__ */ d(((e, t) => {
-	const n = f("fs");
-	const r = D();
+var D = /* @__PURE__ */ u(((e, t) => {
+	const n = d("fs");
+	const r = E();
 	function i(e) {
 		const t = 150;
 		const i = Buffer.alloc(t);
@@ -426,11 +425,11 @@ var O = /* @__PURE__ */ d(((e, t) => {
 	}
 	t.exports = i;
 }));
-var k = /* @__PURE__ */ d(((e, t) => {
-	const n = f("path");
-	const r = w();
-	const i = T();
-	const a = O();
+var O = /* @__PURE__ */ u(((e, t) => {
+	const n = d("path");
+	const r = C();
+	const i = w();
+	const a = D();
 	const o = process.platform === "win32";
 	const s = /\.(?:com|exe)$/i;
 	const c = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
@@ -464,7 +463,7 @@ var k = /* @__PURE__ */ d(((e, t) => {
 		}
 		return e;
 	}
-	function d(e, t, n) {
+	function f(e, t, n) {
 		if (t && !Array.isArray(t)) {
 			n = t;
 			t = null;
@@ -483,9 +482,9 @@ var k = /* @__PURE__ */ d(((e, t) => {
 		};
 		return n.shell ? r : u(r);
 	}
-	t.exports = d;
+	t.exports = f;
 }));
-var A = /* @__PURE__ */ d(((e, t) => {
+var k = /* @__PURE__ */ u(((e, t) => {
 	const n = process.platform === "win32";
 	function r(e, t) {
 		return Object.assign(/* @__PURE__ */ new Error(`${t} ${e.command} ENOENT`), {
@@ -522,10 +521,10 @@ var A = /* @__PURE__ */ d(((e, t) => {
 		notFoundError: r
 	};
 }));
-var M = (/* @__PURE__ */ d(((e, t) => {
-	const n = f("child_process");
-	const r = k();
-	const i = A();
+var j = (/* @__PURE__ */ u(((e, t) => {
+	const n = d("child_process");
+	const r = O();
+	const i = k();
 	function a(e, t, a) {
 		const o = r(e, t, a);
 		const s = n.spawn(o.command, o.args, o.options);
@@ -544,7 +543,7 @@ var M = (/* @__PURE__ */ d(((e, t) => {
 	t.exports._parse = r;
 	t.exports._enoent = i;
 })))();
-var N = class extends Error {
+var M = class extends Error {
 	get exitCode() {
 		if (this.result.exitCode !== null) return this.result.exitCode;
 	}
@@ -554,18 +553,12 @@ var N = class extends Error {
 		this.output = t;
 	}
 };
-const F = {
+const P$1 = {
 	timeout: void 0,
 	persist: false
 };
-const L = { windowsHide: true };
-function R(e, t) {
-	return {
-		command: normalize(e),
-		args: t ?? []
-	};
-}
-function z(e) {
+const I = { windowsHide: true };
+function L(e) {
 	const t = new AbortController();
 	for (const n of e) {
 		if (n.aborted) {
@@ -579,14 +572,14 @@ function z(e) {
 	}
 	return t.signal;
 }
-async function B(e) {
+async function R(e) {
 	let t = "";
 	try {
 		for await (const n of e) t += n.toString();
 	} catch {}
 	return t;
 }
-var V = class {
+var z = class {
 	_process;
 	_aborted = false;
 	_options;
@@ -606,7 +599,7 @@ var V = class {
 	}
 	constructor(e, t, n) {
 		this._options = {
-			...F,
+			...P$1,
 			...n
 		};
 		this._command = e;
@@ -625,7 +618,7 @@ var V = class {
 		return this._process?.killed === true;
 	}
 	pipe(e, t, n) {
-		return W(e, t, {
+		return H(e, t, {
 			...n,
 			stdin: this
 		});
@@ -636,18 +629,18 @@ var V = class {
 		const t = [];
 		if (this._streamErr) t.push(this._streamErr);
 		if (this._streamOut) t.push(this._streamOut);
-		const n = v(t);
+		const n = _(t);
 		const r = P.createInterface({ input: n });
 		for await (const e of r) yield e.toString();
 		await this._processClosed;
 		e.removeAllListeners();
 		if (this._thrownError) throw this._thrownError;
-		if (this._options?.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new N(this);
+		if (this._options?.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new M(this);
 	}
 	async _waitForOutput() {
 		const e = this._process;
 		if (!e) throw new Error("No process was started");
-		const [t, n] = await Promise.all([this._streamOut ? B(this._streamOut) : "", this._streamErr ? B(this._streamErr) : ""]);
+		const [t, n] = await Promise.all([this._streamOut ? R(this._streamOut) : "", this._streamErr ? R(this._streamErr) : ""]);
 		await this._processClosed;
 		const { stdin: r } = this._options;
 		if (r && typeof r !== "string") await r;
@@ -658,7 +651,7 @@ var V = class {
 			stdout: t,
 			exitCode: this.exitCode
 		};
-		if (this._options.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new N(this, i);
+		if (this._options.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new M(this, i);
 		return i;
 	}
 	then(e, t) {
@@ -669,29 +662,28 @@ var V = class {
 	spawn() {
 		const e = cwd();
 		const n = this._options;
-		const r = {
-			...L,
+		const i = {
+			...I,
 			...n.nodeOptions
 		};
-		const i = [];
+		const a = [];
 		this._resetState();
-		if (n.timeout !== void 0) i.push(AbortSignal.timeout(n.timeout));
-		if (n.signal !== void 0) i.push(n.signal);
-		if (n.persist === true) r.detached = true;
-		if (i.length > 0) r.signal = z(i);
-		r.env = _(e, r.env);
-		const { command: a, args: o } = R(this._command, this._args);
-		const c = (0, M._parse)(a, o, r);
-		const l = spawn(c.command, c.args, c.options);
-		if (l.stderr) this._streamErr = l.stderr;
-		if (l.stdout) this._streamOut = l.stdout;
-		this._process = l;
-		l.once("error", this._onError);
-		l.once("close", this._onClose);
-		if (l.stdin) {
+		if (n.timeout !== void 0) a.push(AbortSignal.timeout(n.timeout));
+		if (n.signal !== void 0) a.push(n.signal);
+		if (n.persist === true) i.detached = true;
+		if (a.length > 0) i.signal = L(a);
+		i.env = g(e, i.env);
+		const o = (0, j._parse)(this._command, this._args, i);
+		const s = spawn(o.command, o.args, o.options);
+		if (s.stderr) this._streamErr = s.stderr;
+		if (s.stdout) this._streamOut = s.stdout;
+		this._process = s;
+		s.once("error", this._onError);
+		s.once("close", this._onClose);
+		if (s.stdin) {
 			const { stdin: e } = n;
-			if (typeof e === "string") l.stdin.end(e);
-			else e?.process?.stdout?.pipe(l.stdin);
+			if (typeof e === "string") s.stdin.end(e);
+			else e?.process?.stdout?.pipe(s.stdin);
 		}
 	}
 	_resetState() {
@@ -712,12 +704,12 @@ var V = class {
 		if (this._resolveClose) this._resolveClose();
 	};
 };
-const U = (e, t, n) => {
-	const r = new V(e, t, n);
+const V = (e, t, n) => {
+	const r = new z(e, t, n);
 	r.spawn();
 	return r;
 };
-const W = U;
+const H = V;
 //#endregion
 //#region ../../node_modules/.pnpm/lint-staged@16.4.0/node_modules/lint-staged/lib/execGit.js
 const debugLog$15 = createDebug("lint-staged:execGit");
@@ -732,7 +724,7 @@ const NO_SUBMODULE_RECURSE = ["-c", "submodule.recurse=false"];
 /** @type {(cmd: string[], options?: { cwd?: string }) => Promise<string>} */
 const execGit = async (cmd, options) => {
 	debugLog$15("Running git command:", cmd);
-	const result = W("git", [...NO_SUBMODULE_RECURSE, ...cmd], { nodeOptions: {
+	const result = H("git", [...NO_SUBMODULE_RECURSE, ...cmd], { nodeOptions: {
 		cwd: options?.cwd,
 		stdio: ["ignore"]
 	} });
@@ -5348,7 +5340,7 @@ const getSpawnedTask = ({ abortController, color, command, continueOnError = fal
 	debugLog$12("Tinyexec options:", tinyExecOptions);
 	/** @param {ReturnType<typeof getInitialState>} ctx context */
 	return async (ctx = getInitialState()) => {
-		const result = W(cmd, isFn ? args : args.concat(files), tinyExecOptions);
+		const result = H(cmd, isFn ? args : args.concat(files), tinyExecOptions);
 		const taskFailed = () => result.exitCode > 0 || result.process?.signalCode;
 		/** @type {keyof typeof Signal | undefined} */
 		let signal;

package/dist/versions.js

@@ -1,9 +1,9 @@
 export const versions = {
   "vite": "8.0.10",
-  "rolldown": "1.0.0-rc.17",
+  "rolldown": "1.0.0-rc.18",
   "tsdown": "0.21.10",
   "vitest": "4.1.5",
-  "oxlint": "1.61.0",
-  "oxfmt": "0.46.0",
-  "oxlint-tsgolint": "0.22.0"
+  "oxlint": "1.63.0",
+  "oxfmt": "0.48.0",
+  "oxlint-tsgolint": "0.22.1"
 };

package/dist/{workspace-9Zx76HPn.js → workspace-DxqnDgi4.js}

@@ -1,4 +1,4 @@
-import { $ as multiselect, F as readYamlFile, P as editYamlFile, Q as log, at as q, q as PackageManager, tt as select } from "./agent-YSH78B1d.js";
+import { $ as multiselect, F as readYamlFile, P as editYamlFile, Q as log, at as q, q as PackageManager, tt as select } from "./agent-Ch4JIuSB.js";
 import { t as require_dist } from "./dist-DjG9AYbK.js";
 import { c as editJsonFile, d as writeJsonFile, r as getScopeFromPackageName, u as readJsonFile } from "./package-CrKanQYM.js";
 import path, { posix, win32 } from "node:path";
@@ -3258,7 +3258,7 @@ const ENOCHILD = ENOENT | 576;
 const TYPEMASK = 1023;
 const entToType = (s) => s.isFile() ? IFREG : s.isDirectory() ? IFDIR : s.isSymbolicLink() ? IFLNK : s.isCharacterDevice() ? IFCHR : s.isBlockDevice() ? IFBLK : s.isSocket() ? IFSOCK : s.isFIFO() ? IFIFO : UNKNOWN;
 const normalizeCache = new L({ max: 2 ** 12 });
-const normalize$1 = (s) => {
+const normalize = (s) => {
 	const c = normalizeCache.get(s);
 	if (c) return c;
 	const n = s.normalize("NFKD");
@@ -3269,7 +3269,7 @@ const normalizeNocaseCache = new L({ max: 2 ** 12 });
 const normalizeNocase = (s) => {
 	const c = normalizeNocaseCache.get(s);
 	if (c) return c;
-	const n = normalize$1(s.toLowerCase());
+	const n = normalize(s.toLowerCase());
 	normalizeNocaseCache.set(s, n);
 	return n;
 };
@@ -3458,7 +3458,7 @@ var PathBase = class {
 	*/
 	constructor(name, type = UNKNOWN, root, roots, nocase, children, opts) {
 		this.name = name;
-		this.#matchName = nocase ? normalizeNocase(name) : normalize$1(name);
+		this.#matchName = nocase ? normalizeNocase(name) : normalize(name);
 		this.#type = type & TYPEMASK;
 		this.nocase = nocase;
 		this.roots = roots;
@@ -3534,7 +3534,7 @@ var PathBase = class {
 		if (pathPart === "" || pathPart === ".") return this;
 		if (pathPart === "..") return this.parent || this;
 		const children = this.children();
-		const name = this.nocase ? normalizeNocase(pathPart) : normalize$1(pathPart);
+		const name = this.nocase ? normalizeNocase(pathPart) : normalize(pathPart);
 		for (const p of children) if (p.#matchName === name) return p;
 		const s = this.parent ? this.sep : "";
 		const fullpath = this.#fullpath ? this.#fullpath + s + pathPart : void 0;
@@ -3749,7 +3749,7 @@ var PathBase = class {
 	* directly.
 	*/
 	isNamed(n) {
-		return !this.nocase ? this.#matchName === normalize$1(n) : this.#matchName === normalizeNocase(n);
+		return !this.nocase ? this.#matchName === normalize(n) : this.#matchName === normalizeNocase(n);
 	}
 	/**
 	* Return the Path object corresponding to the target of a symbolic link.
@@ -3861,7 +3861,7 @@ var PathBase = class {
 	#readdirMaybePromoteChild(e, c) {
 		for (let p = c.provisional; p < c.length; p++) {
 			const pchild = c[p];
-			if ((this.nocase ? normalizeNocase(e.name) : normalize$1(e.name)) !== pchild.#matchName) continue;
+			if ((this.nocase ? normalizeNocase(e.name) : normalize(e.name)) !== pchild.#matchName) continue;
 			return this.#readdirPromoteChild(e, pchild, p, c);
 		}
 	}

package/docs/_data/team.ts

@@ -0,0 +1,121 @@
+import type { DefaultTheme } from "vitepress";
+
+export const core: DefaultTheme.TeamMember[] = [
+  {
+    avatar: "https://github.com/fengmk2.png",
+    name: "MK",
+    links: [
+      { icon: "github", link: "https://github.com/fengmk2" },
+      { icon: "x", link: "https://x.com/fengmk2" },
+    ],
+  },
+  {
+    avatar: "https://github.com/branchseer.png",
+    name: "Wang Chi",
+    links: [
+      { icon: "github", link: "https://github.com/branchseer" },
+      { icon: "x", link: "https://x.com/branchseer" },
+    ],
+  },
+  {
+    avatar: "https://github.com/Brooooooklyn.png",
+    name: "Long Yinan",
+    links: [
+      { icon: "github", link: "https://github.com/Brooooooklyn" },
+      { icon: "x", link: "https://x.com/Brooooook_lyn" },
+    ],
+  },
+  {
+    avatar: "https://github.com/cpojer.png",
+    name: "Christoph Nakazawa",
+    links: [
+      { icon: "github", link: "https://github.com/cpojer" },
+      { icon: "x", link: "https://x.com/cpojer" },
+      { icon: "bluesky", link: "https://bsky.app/profile/christoph.nkzw.tech" },
+    ],
+  },
+  {
+    avatar: "https://github.com/TheAlexLichter.png",
+    name: "Alexander Lichter",
+    links: [
+      { icon: "github", link: "https://github.com/TheAlexLichter" },
+      { icon: "x", link: "https://x.com/TheAlexLichter" },
+      { icon: "bluesky", link: "https://bsky.app/profile/thealexlichter.com" },
+    ],
+  },
+  {
+    avatar: "https://github.com/camc314.png",
+    name: "Cameron Clark",
+    links: [
+      { icon: "github", link: "https://github.com/camc314" },
+      { icon: "x", link: "https://x.com/cameron_C2" },
+    ],
+  },
+  {
+    avatar: "https://github.com/leaysgur.png",
+    name: "Yuji Sugiura",
+    links: [
+      { icon: "github", link: "https://github.com/leaysgur" },
+      { icon: "x", link: "https://x.com/leaysgur" },
+    ],
+  },
+  {
+    avatar: "https://github.com/mdong1909.png",
+    name: "Michael Dong",
+    links: [
+      { icon: "github", link: "https://github.com/mdong1909" },
+      { icon: "x", link: "https://x.com/mdong1909" },
+      { icon: "linkedin", link: "https://www.linkedin.com/in/michael-d-612b5b50/" },
+    ],
+  },
+  {
+    avatar: "https://github.com/kazupon.png",
+    name: "kazupon",
+    links: [
+      { icon: "github", link: "https://github.com/kazupon" },
+      { icon: "x", link: "https://x.com/kazupon" },
+      { icon: "bluesky", link: "https://bsky.app/profile/kazupon.dev" },
+    ],
+  },
+  {
+    avatar: "https://github.com/ubugeeei.png",
+    name: "ubugeeei",
+    links: [
+      { icon: "github", link: "https://github.com/ubugeeei" },
+      { icon: "x", link: "https://x.com/ubugeeei" },
+    ],
+  },
+  {
+    avatar: "https://github.com/nekomoyi.png",
+    name: "nekomoyi",
+    links: [{ icon: "github", link: "https://github.com/nekomoyi" }],
+  },
+  {
+    avatar: "https://github.com/HaasStefan.png",
+    name: "Stefan Haas",
+    links: [
+      { icon: "github", link: "https://github.com/HaasStefan" },
+      { icon: "x", link: "https://x.com/StefanvHaas" },
+      { icon: "linkedin", link: "https://www.linkedin.com/in/stefan-haas-angular" },
+    ],
+  },
+  {
+    avatar: "https://github.com/naokihaba.png",
+    name: "naokihaba",
+    links: [
+      { icon: "github", link: "https://github.com/naokihaba" },
+      { icon: "x", link: "https://x.com/naokihaba" },
+      { icon: "bluesky", link: "https://bsky.app/profile/naokihaba.com" },
+    ],
+  },
+  {
+    avatar: "https://github.com/jong-kyung.png",
+    name: "JongKyung Lee",
+    links: [
+      { icon: "github", link: "https://github.com/jong-kyung" },
+      { icon: "linkedin", link: "https://www.linkedin.com/in/jong-kyung" },
+    ],
+  },
+];
+
+export const emeriti: DefaultTheme.TeamMember[] = [];

package/docs/package.json

@@ -23,5 +23,5 @@
     "tailwindcss": "^4.1.18",
     "vitepress": "2.0.0-alpha.15"
   },
-  "packageManager": "pnpm@10.33.0"
+  "packageManager": "pnpm@10.33.2"
 }

package/docs/pnpm-lock.yaml

@@ -859,6 +859,7 @@ packages:
 
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
   '@upsetjs/venn.js@2.0.0':
     resolution: {integrity: sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw==}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plus",
-  "version": "0.1.21-alpha.1",
+  "version": "0.1.21-alpha.3",
   "description": "The Unified Toolchain for the Web",
   "homepage": "https://viteplus.dev/guide",
   "bugs": {
@@ -318,12 +318,12 @@
     }
   },
   "dependencies": {
-    "@oxc-project/types": "=0.127.0",
-    "oxfmt": "=0.46.0",
-    "oxlint": "=1.61.0",
-    "oxlint-tsgolint": "=0.22.0",
-    "@voidzero-dev/vite-plus-core": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-test": "0.1.21-alpha.1"
+    "@oxc-project/types": "=0.129.0",
+    "oxfmt": "=0.48.0",
+    "oxlint": "=1.63.0",
+    "oxlint-tsgolint": "=0.22.1",
+    "@voidzero-dev/vite-plus-test": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-core": "0.1.21-alpha.3"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3.6.1",
@@ -349,7 +349,7 @@
     "validate-npm-package-name": "^7.0.2",
     "yaml": "^2.8.1",
     "@voidzero-dev/vite-plus-tools": "0.0.0",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.21-alpha.1",
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.21-alpha.3",
     "@voidzero-dev/vite-plus-prompts": "0.0.0"
   },
   "napi": {
@@ -370,14 +370,14 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "optionalDependencies": {
-    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-darwin-x64": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.21-alpha.1",
-    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.21-alpha.1"
+    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-darwin-x64": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.21-alpha.3",
+    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.21-alpha.3"
   },
   "scripts": {
     "build": "oxnode -C dev ./build.ts",

package/docs/_data/team.js

@@ -1,122 +0,0 @@
-/** @type {import('@voidzero-dev/vitepress-theme').TeamMember[]} */
-export const core = [
-  {
-    avatar: 'https://github.com/fengmk2.png',
-    name: 'MK',
-    links: [{ icon: 'github', link: 'https://github.com/fengmk2' },
-    { icon: 'x', link: 'https://x.com/fengmk2' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/branchseer.png',
-    name: 'Wang Chi',
-    links: [
-      { icon: 'github', link: 'https://github.com/branchseer' },
-      { icon: 'x', link: 'https://x.com/branchseer' }
-    ],
-  },
-  {
-    avatar: 'https://github.com/Brooooooklyn.png',
-    name: 'Long Yinan',
-    links: [
-      { icon: 'github', link: 'https://github.com/Brooooooklyn' },
-      { icon: 'x', link: 'https://x.com/Brooooook_lyn' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/cpojer.png',
-    name: 'Christoph Nakazawa',
-    links: [
-      { icon: 'github', link: 'https://github.com/cpojer' },
-      { icon: 'x', link: 'https://x.com/cpojer' },
-      { icon: 'bluesky', link: 'https://bsky.app/profile/christoph.nkzw.tech' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/TheAlexLichter.png',
-    name: 'Alexander Lichter',
-    links: [
-      { icon: 'github', link: 'https://github.com/TheAlexLichter' },
-      { icon: 'x', link: 'https://x.com/TheAlexLichter' },
-      { icon: 'bluesky', link: 'https://bsky.app/profile/thealexlichter.com' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/camc314.png',
-    name: 'Cameron Clark',
-    links: [
-      { icon: 'github', link: 'https://github.com/camc314' },
-      { icon: 'x', link: 'https://x.com/cameron_C2' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/leaysgur.png',
-    name: 'Yuji Sugiura',
-    links: [
-      { icon: 'github', link: 'https://github.com/leaysgur' },
-      { icon: 'x', link: 'https://x.com/leaysgur' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/mdong1909.png',
-    name: 'Michael Dong',
-    links: [
-      { icon: 'github', link: 'https://github.com/mdong1909' },
-      { icon: 'x', link: 'https://x.com/mdong1909' },
-      { icon: 'linkedin', link: 'https://www.linkedin.com/in/michael-d-612b5b50/' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/kazupon.png',
-    name: 'kazupon',
-    links: [
-      { icon: 'github', link: 'https://github.com/kazupon' },
-      { icon: 'x', link: 'https://x.com/kazu_pon' },
-      { icon: 'bluesky', link: 'https://bsky.app/profile/kazupon.dev' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/ubugeeei.png',
-    name: 'ubugeeei',
-    links: [
-      { icon: 'github', link: 'https://github.com/ubugeeei' },
-      { icon: 'x', link: 'https://x.com/ubugeeei' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/nekomoyi.png',
-    name: 'nekomoyi',
-    links: [
-      { icon: 'github', link: 'https://github.com/nekomoyi' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/HaasStefan.png',
-    name: 'Stefan Haas',
-    links: [
-      { icon: 'github', link: 'https://github.com/HaasStefan' },
-      { icon: 'x', link: 'https://x.com/StefanvHaas' },
-      { icon: 'linkedin', link: 'https://www.linkedin.com/in/stefan-haas-angular' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/naokihaba.png',
-    name: 'naokihaba',
-    links: [
-      { icon: 'github', link: 'https://github.com/naokihaba' },
-      { icon: 'x', link: 'https://x.com/naokihaba' },
-      { icon: 'bluesky', link: 'https://bsky.app/profile/naokihaba.com' },
-    ],
-  },
-  {
-    avatar: 'https://github.com/jong-kyung.png',
-    name: 'JongKyung Lee',
-    links: [
-      { icon: 'github', link: 'https://github.com/jong-kyung' },
-      { icon: 'linkedin', link: 'https://www.linkedin.com/in/jong-kyung' },
-    ],
-  },
-]
-
-/** @type {import('@voidzero-dev/vitepress-theme').TeamMember[]} */
-export const emeriti = []