vite-plus 0.1.21-alpha.0 → 0.1.21-alpha.2

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

@@ -1,6 +1,6 @@
 import { r as __toESM, t as __commonJSMin } from "./chunk-q7NCDQ7-.js";
 import { c as VITE_PLUS_VERSION, i as BASEURL_TSCONFIG_WARNING, l as isForceOverrideMode, o as VITE_PLUS_NAME, s as VITE_PLUS_OVERRIDE_PACKAGES } from "./main-A6UrSTYb.js";
-import { a as require_cross_spawn, i as runCommandSilently, n as hasBaseUrlInTsconfig, r as removeDeprecatedTsconfigFalseOption, t as findTsconfigFiles } from "./tsconfig-DQTf06oN.js";
+import { a as runCommandSilently, n as hasBaseUrlInTsconfig, o as require_cross_spawn, r as removeDeprecatedTsconfigFalseOption, t as findTsconfigFiles } from "./tsconfig-BQeK6Jxp.js";
 import { t as accent } from "./terminal-CxTMfsxZ.js";
 import { t as require_dist } from "./dist-DjG9AYbK.js";
 import { c as editJsonFile, l as isJsonFile, n as detectPackageMetadata, u as readJsonFile } from "./package-CrKanQYM.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/bin.js

@@ -1,5 +1,5 @@
 import { a as DEFAULT_ENVS, i as BASEURL_TSCONFIG_WARNING, o as VITE_PLUS_NAME, u as resolve$1 } from "./main-A6UrSTYb.js";
-import { i as runCommandSilently, n as hasBaseUrlInTsconfig } from "./tsconfig-DQTf06oN.js";
+import { a as runCommandSilently, n as hasBaseUrlInTsconfig } from "./tsconfig-BQeK6Jxp.js";
 import { n as errorMsg, r as log, s as warnMsg, t as accent } from "./terminal-CxTMfsxZ.js";
 import { r as resolveUniversalViteConfig } from "./resolve-vite-config-C1KX9CZU.js";
 import path, { dirname, join } from "node:path";

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-C8Me6C5u.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

@@ -1,11 +1,11 @@
 import { r as __toESM, t as __commonJSMin } from "../chunk-q7NCDQ7-.js";
-import { a as require_cross_spawn } from "../tsconfig-DQTf06oN.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-C8Me6C5u.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-BSMGz0AZ.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";
@@ -49,48 +49,6 @@ async function runCommandAndDetectProjectDir(options, parentDir) {
 		projectDir
 	};
 }
-async function runCommandSilently(options) {
-	const child = (0, import_cross_spawn.default)(options.command, options.args, {
-		stdio: "pipe",
-		cwd: options.cwd,
-		env: options.envs
-	});
-	return await new Promise((resolve, reject) => {
-		const stdout = [];
-		const stderr = [];
-		child.stdout?.on("data", (data) => {
-			stdout.push(data);
-		});
-		child.stderr?.on("data", (data) => {
-			stderr.push(data);
-		});
-		child.on("close", (code) => {
-			resolve({
-				exitCode: code ?? 0,
-				stdout: Buffer.concat(stdout),
-				stderr: Buffer.concat(stderr)
-			});
-		});
-		child.on("error", (err) => {
-			reject(err);
-		});
-	});
-}
-async function runCommand$1(options) {
-	const child = (0, import_cross_spawn.default)(options.command, options.args, {
-		stdio: "inherit",
-		cwd: options.cwd,
-		env: options.envs
-	});
-	return await new Promise((resolve, reject) => {
-		child.on("close", (code) => {
-			resolve({ exitCode: code ?? 0 });
-		});
-		child.on("error", (err) => {
-			reject(err);
-		});
-	});
-}
 function getPackageRunner(workspaceInfo) {
 	switch (workspaceInfo.packageManager) {
 		case "pnpm": return {

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-C8Me6C5u.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-BSMGz0AZ.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";