vite-plus 0.3.3 → 1.0.0-rc.0

package/dist/{editor-4sjlHmUh.js → editor-DMBczTdj.js}

@@ -1,16 +1,18 @@
 import { r as __toESM } from "./rolldown-runtime-CMFfr-1z.js";
-import { a as SETUP_VP_VERSION, c as VITEST_VERSION, d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, l as VITE_CONFIG_FILES, m as isForceOverrideMode, n as BASEURL_TSCONFIG_WARNING, o as TSDOWN_MIGRATION_SKILL_URL, s as VITEST_AGE_GATE_EXEMPT_PACKAGES, u as VITE_PLUS_NAME } from "./constants-C2dTOTe-.js";
-import { i as ensureVitePlusImportRuleDefaults, r as createDefaultVitePlusLintConfig } from "./oxlint-plugin-config-BVqEe9KY.js";
-import { a as writeJsonFile, c as parse, i as readJsonFile, n as editJsonFile, o as applyEdits, r as isJsonFile, s as modify, t as detectFormattingOptions } from "./json-cULBl7Pi.js";
-import { n as detectPackageMetadata, r as getScopeFromPackageName } from "./package-CHH8jWan.js";
-import { C as multiselect, S as log, T as select, _ as getSpinner, b as confirm, d as readYamlFile, f as scalarString, g as getSilentSpinner, k as isCancel, t as cancelAndExit, u as editYamlFile, y as PackageManager } from "./prompts-k14KgthC.js";
+import { t as documentationUrl$1 } from "./documentation-DqcZSthV.js";
+import { a as SETUP_VP_VERSION, c as VITEST_VERSION, d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, l as VITE_CONFIG_FILES, m as isForceOverrideMode, n as BASEURL_TSCONFIG_WARNING, o as TSDOWN_MIGRATION_SKILL_URL, s as VITEST_AGE_GATE_EXEMPT_PACKAGES, u as VITE_PLUS_NAME } from "./constants-CiKwrA0v.js";
+import { i as ensureVitePlusImportRuleDefaults, r as createDefaultVitePlusLintConfig } from "./oxlint-plugin-config-BgsDA6ua.js";
+import { a as writeJsonFile, c as modify, i as readJsonFile, l as parse, n as editJsonFile, o as applyEdits, r as isJsonFile, t as detectFormattingOptions } from "./json-JP24qHUF.js";
+import { n as detectPackageMetadata, o as fetchNpmResource, r as getScopeFromPackageName, s as getNpmRegistry } from "./package-B85H2Nw0.js";
+import { n as isAlignableVitestEcosystemPackage } from "./vitest-ecosystem-BU0AqZq-.js";
+import { C as multiselect, S as log, T as select, _ as getSpinner, b as confirm, d as readYamlFile, f as scalarString, g as getSilentSpinner, k as isCancel, t as cancelAndExit, u as editYamlFile, y as PackageManager } from "./prompts-CQobX7uP.js";
 import { t as require_semver } from "./semver-CaDAb8vV.js";
-import { l as displayRelative, u as rulesDir } from "./agent-Cu6-tXIP.js";
+import { l as displayRelative, u as rulesDir } from "./agent-Dinpyd-k.js";
 import { n as addMigrationWarning, t as addManualStep } from "./report-CK5TnTsr.js";
 import { n as runCommandSilently, r as require_cross_spawn } from "./command-CguLh2KL.js";
 import { t as require_dist } from "./dist-BDYZP12R.js";
-import { a as hasBaseUrlInTsconfig, c as hasVitestTypesInTsconfig, l as removeDeprecatedTsconfigFalseOption, n as findTsconfigFiles, s as hasTypesToRewriteInTsconfig, u as rewriteTypesInTsconfig } from "./tsconfig-C3h9CVTA.js";
-import { n as extractOverrideTargetName, t as isAlignableVitestEcosystemPackage } from "./vitest-ecosystem-BiRqcaRI.js";
+import { a as hasBaseUrlInTsconfig, c as hasVitestTypesInTsconfig, l as removeDeprecatedTsconfigFalseOption, n as findTsconfigFiles, s as hasTypesToRewriteInTsconfig, u as rewriteTypesInTsconfig } from "./tsconfig-Buo0RSzz.js";
+import { t as extractOverrideTargetName } from "./package-overrides-Dpn4scvN.js";
 import { i as findUnsafeHookInstallPath, t as SUPPORTED_GIT_HOOK_NAMES } from "./hooks-C-4gykWR.js";
 import path, { posix, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -56,28 +58,18 @@ const REMOVE_PACKAGES = [
 ];
 const WEBDRIVERIO_PROVIDER = "@vitest/browser-webdriverio";
 const PLAYWRIGHT_PROVIDER = "@vitest/browser-playwright";
-const OPT_IN_BROWSER_PROVIDERS = [WEBDRIVERIO_PROVIDER, PLAYWRIGHT_PROVIDER];
+const OPT_IN_BROWSER_PROVIDERS = [PLAYWRIGHT_PROVIDER];
 const PROVIDER_OVERRIDE_DROP_NAMES = [...REMOVE_PACKAGES, ...OPT_IN_BROWSER_PROVIDERS];
-const BROWSER_PROVIDER_PEER_DEPS = {
-	"@vitest/browser-playwright": "playwright",
-	"@vitest/browser-webdriverio": "webdriverio"
-};
+const BROWSER_PROVIDER_PEER_DEPS = { "@vitest/browser-playwright": "playwright" };
 const RUNTIME_PEER_INCLUDED_BY = { playwright: ["@playwright/test"] };
-const PROVIDER_PEER_VERSION_SIBLINGS = { webdriverio: ["@wdio/cli", "@wdio/globals"] };
 function findDeclaredSpec(pkg, name) {
 	return pkg.dependencies?.[name] ?? pkg.devDependencies?.[name] ?? pkg.peerDependencies?.[name] ?? pkg.optionalDependencies?.[name];
 }
 function hasProviderPeerDependency(pkg, runtimePeer) {
 	return findDeclaredSpec(pkg, runtimePeer) !== void 0 || (RUNTIME_PEER_INCLUDED_BY[runtimePeer] ?? []).some((packageName) => findDeclaredSpec(pkg, packageName) !== void 0);
 }
-function resolveProviderPeerSpec(pkg, peer, supportCatalog, catalogDependencyResolver) {
-	if (supportCatalog && catalogDependencyResolver?.("catalog:", peer) !== void 0) return "catalog:";
-	for (const sibling of PROVIDER_PEER_VERSION_SIBLINGS[peer] ?? []) {
-		const spec = findDeclaredSpec(pkg, sibling);
-		const resolved = spec?.startsWith("catalog:") ? catalogDependencyResolver?.(spec, sibling) : spec;
-		if (resolved && !resolved.includes(":")) return resolved;
-	}
-	return "*";
+function resolveProviderPeerSpec(peer, supportCatalog, catalogDependencyResolver) {
+	return supportCatalog && catalogDependencyResolver?.("catalog:", peer) !== void 0 ? "catalog:" : "*";
 }
 const VITEST_BROWSER_DEP_NAMES = [
 	"@vitest/browser",
@@ -363,6 +355,29 @@ function extractSkippedRules(output) {
 	return block.join("\n");
 }
 /**
+* Resolve the `@oxlint/migrate` version to install. `@oxlint/migrate`
+* trails `oxlint` releases (published minutes to days later), so the exact
+* bundled-oxlint pin can name a version the registry does not have yet.
+* Pick the greatest published version that is not newer than the bundled
+* Oxlint. Fall back to the exact pin when the registry cannot be reached
+* and let the dlx step surface the failure.
+*/
+async function resolveOxlintMigrateVersion(oxlintVersion) {
+	try {
+		const response = await fetchNpmResource(`${getNpmRegistry("@oxlint")}/@oxlint/migrate`, {
+			headers: { accept: "application/vnd.npm.install-v1+json" },
+			timeoutMs: 5e3
+		});
+		if (!response.ok) return oxlintVersion;
+		const packument = await response.json();
+		if (packument.versions && Object.hasOwn(packument.versions, oxlintVersion)) return oxlintVersion;
+		const candidates = Object.keys(packument.versions ?? {}).filter((version) => import_semver.default.valid(version) && import_semver.default.lte(version, oxlintVersion));
+		return candidates.length > 0 ? candidates.toSorted(import_semver.default.rcompare)[0] : oxlintVersion;
+	} catch {
+		return oxlintVersion;
+	}
+}
+/**
 * Run a `vp dlx @oxlint/migrate` step with graceful error handling.
 * Returns true on success, false on failure (spawn error or non-zero exit).
 */
@@ -400,7 +415,7 @@ async function migrateEslintToOxlint(projectPath, interactive, eslintConfigFile,
 	const spinner = options?.silent ? getSilentSpinner() : getSpinner(interactive);
 	if (eslintConfigFile) {
 		const { versions } = await import("./versions.js");
-		const migratePackage = `@oxlint/migrate@${versions.oxlint}`;
+		const migratePackage = `@oxlint/migrate@${await resolveOxlintMigrateVersion(versions.oxlint)}`;
 		const migrateArgs = [
 			"--merge",
 			...!hasBaseUrlInTsconfig(projectPath) ? ["--type-aware"] : [],
@@ -1572,9 +1587,12 @@ function dropRemovePackageOverrideKeys(overrides, ancestorChain = []) {
 	}
 	return removed;
 }
-function managedOverridePackages(usesVitest) {
-	if (usesVitest) return VITE_PLUS_OVERRIDE_PACKAGES;
-	return Object.fromEntries(Object.entries(VITE_PLUS_OVERRIDE_PACKAGES).filter(([key]) => key !== "vitest"));
+function managedOverridePackages(usesVitest, usesWebdriverioProvider = false) {
+	const managed = usesVitest ? VITE_PLUS_OVERRIDE_PACKAGES : Object.fromEntries(Object.entries(VITE_PLUS_OVERRIDE_PACKAGES).filter(([key]) => key !== "vitest"));
+	return usesWebdriverioProvider && VITEST_IS_MANAGED_OVERRIDE ? {
+		...managed,
+		"@vitest/browser": VITEST_VERSION
+	} : managed;
 }
 function projectListsVitestEcosystemDep(pkg) {
 	return [
@@ -1724,7 +1742,7 @@ function vitestEcosystemCatalogReferencesPending(pkg, catalogDependencyResolver)
 		pkg.optionalDependencies
 	]) {
 		if (!dependencies) continue;
-		for (const [name, spec] of Object.entries(dependencies)) if (isAlignableVitestEcosystemPackage(name) && spec.startsWith("catalog:") && catalogDependencyResolver(spec, name) !== "4.1.11") return true;
+		for (const [name, spec] of Object.entries(dependencies)) if (isAlignableVitestEcosystemPackage(name) && spec.startsWith("catalog:") && catalogDependencyResolver(spec, name) !== "5.0.1") return true;
 	}
 	return false;
 }
@@ -1743,6 +1761,37 @@ function collectVitestEcosystemInstallDependencyNames(rootDir, packages) {
 	return names;
 }
 //#endregion
+//#region src/utils/git.ts
+var import_cross_spawn = /* @__PURE__ */ __toESM(require_cross_spawn(), 1);
+/**
+* Walk up from `startPath` looking for `.git` (directory or file — submodules
+* use a `.git` file).  Returns the directory that contains `.git`, or `null`.
+*/
+function findGitRoot(startPath) {
+	let dir = startPath;
+	while (true) {
+		if (fs.existsSync(path.join(dir, ".git"))) return dir;
+		const parent = path.dirname(dir);
+		if (parent === dir) return null;
+		dir = parent;
+	}
+}
+async function initGitRepository(cwd) {
+	const result = await runCommandSilently({
+		command: "git",
+		args: ["init"],
+		cwd,
+		envs: process.env
+	});
+	if (result.exitCode !== 0) {
+		log.warn("Failed to initialize git repository");
+		const stderr = result.stderr.toString().trim();
+		if (stderr) log.info(stderr);
+		return false;
+	}
+	return true;
+}
+//#endregion
 //#region ../../node_modules/.pnpm/balanced-match@4.0.4/node_modules/balanced-match/dist/esm/index.js
 const balanced = (a, b, str) => {
 	const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
@@ -3848,7 +3897,7 @@ var L = class c {
 	}
 };
 //#endregion
-//#region ../../node_modules/.pnpm/minipass@7.1.2/node_modules/minipass/dist/esm/index.js
+//#region ../../node_modules/.pnpm/minipass@7.1.3/node_modules/minipass/dist/esm/index.js
 const proc = typeof process === "object" && process ? process : {
 	stdout: null,
 	stderr: null
@@ -3943,7 +3992,7 @@ var PipeProxyErrors = class extends Pipe {
 	}
 	constructor(src, dest, opts) {
 		super(src, dest, opts);
-		this.proxyErrors = (er) => dest.emit("error", er);
+		this.proxyErrors = (er) => this.dest.emit("error", er);
 		src.on("error", this.proxyErrors);
 	}
 };
@@ -4582,7 +4631,8 @@ while (this[FLUSHCHUNK](this[BUFFERSHIFT]()) && this[BUFFER].length);
 			return: stop,
 			[Symbol.asyncIterator]() {
 				return this;
-			}
+			},
+			[Symbol.asyncDispose]: async () => {}
 		};
 	}
 	/**
@@ -4622,7 +4672,8 @@ while (this[FLUSHCHUNK](this[BUFFERSHIFT]()) && this[BUFFER].length);
 			return: stop,
 			[Symbol.iterator]() {
 				return this;
-			}
+			},
+			[Symbol.dispose]: () => {}
 		};
 	}
 	/**
@@ -4665,7 +4716,7 @@ while (this[FLUSHCHUNK](this[BUFFERSHIFT]()) && this[BUFFER].length);
 	}
 };
 //#endregion
-//#region ../../node_modules/.pnpm/path-scurry@2.0.1/node_modules/path-scurry/dist/esm/index.js
+//#region ../../node_modules/.pnpm/path-scurry@2.0.2/node_modules/path-scurry/dist/esm/index.js
 const realpathSync$2 = realpathSync$1.native;
 const defaultFS = {
 	lstatSync: lstatSync$1,
@@ -7402,10 +7453,10 @@ function migratePnpmSettingsToWorkspaceYaml(projectPath, settings) {
 * Rewrite pnpm-workspace.yaml to add vite-plus dependencies
 * @param projectPath - The path to the project
 */
-function rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, writeWorkspaceSettings = true, catalogAdditions = /* @__PURE__ */ new Set()) {
+function rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, writeWorkspaceSettings = true, catalogAdditions = /* @__PURE__ */ new Set(), usesWebdriverioProvider = false) {
 	const pnpmWorkspaceYamlPath = path.join(projectPath, "pnpm-workspace.yaml");
 	if (!fs.existsSync(pnpmWorkspaceYamlPath)) fs.writeFileSync(pnpmWorkspaceYamlPath, "");
-	const managed = managedOverridePackages(usesVitest);
+	const managed = managedOverridePackages(usesVitest, usesWebdriverioProvider);
 	editYamlFile(pnpmWorkspaceYamlPath, (doc) => {
 		const preferredCatalogSpec = rewriteCatalog(doc, usesVitest, vitestEcosystemPackages, catalogAdditions);
 		if (!writeWorkspaceSettings) return;
@@ -7420,7 +7471,9 @@ function rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrow
 		if (!usesVitest) removeYamlMapVitestEntry(doc.getIn(["overrides"]), "pnpm-ranged");
 		for (const key of Object.keys(managed)) {
 			const overrideKey = pnpmOverrideKey(key);
-			const version = getCatalogDependencySpec(getYamlMapScalarStringValue(overrides, overrideKey) ?? getYamlMapScalarStringValue(overrides, key), managed[key], true, { preferredCatalogSpec });
+			const currentVersion = getYamlMapScalarStringValue(overrides, overrideKey) ?? getYamlMapScalarStringValue(overrides, key);
+			// @vitest/browser is an override-only entry: migration removes its direct
+			const version = key === "@vitest/browser" ? managed[key] : getCatalogDependencySpec(currentVersion, managed[key], true, { preferredCatalogSpec });
 			if (overrides instanceof import_dist.YAMLMap) overrides.delete(key);
 			doc.setIn(["overrides", scalarString(overrideKey)], scalarString(version));
 		}
@@ -7439,14 +7492,14 @@ function rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrow
 		}
 		if (!usesVitest && VITEST_IS_MANAGED_OVERRIDE) allowAny.items = allowAny.items.filter((n) => n.value !== "vitest");
 		const existing = new Set(allowAny.items.map((n) => n.value));
-		for (const key of Object.keys(managed)) if (!existing.has(key)) allowAny.add(scalarString(key));
+		for (const key of Object.keys(managedOverridePackages(usesVitest))) if (!existing.has(key)) allowAny.add(scalarString(key));
 		doc.setIn(["peerDependencyRules", "allowAny"], allowAny);
 		const allowedVersionsNode = doc.getIn(["peerDependencyRules", "allowedVersions"]);
 		let allowedVersions;
 		if (allowedVersionsNode instanceof import_dist.YAMLMap) allowedVersions = allowedVersionsNode;
 		else allowedVersions = new import_dist.YAMLMap();
 		if (!usesVitest) removeYamlMapVitestEntry(allowedVersions);
-		for (const key of Object.keys(managed)) allowedVersions.set(scalarString(key), scalarString("*"));
+		for (const key of Object.keys(managedOverridePackages(usesVitest))) allowedVersions.set(scalarString(key), scalarString("*"));
 		doc.setIn(["peerDependencyRules", "allowedVersions"], allowedVersions);
 		if (doc.has("minimumReleaseAge")) {
 			let minimumReleaseAgeExclude = doc.getIn(["minimumReleaseAgeExclude"]);
@@ -7520,38 +7573,10 @@ function getCatalogDependencySpec(currentValue, version, supportCatalog, options
 	return currentValue?.startsWith("catalog:") ? currentValue : options?.preferredCatalogSpec ?? "catalog:";
 }
 /**
-* #1932: under pnpm, an importer that depends on `vite-plus` (which bundles
-* `vitest`) needs a DIRECT `vite` devDep pointing at @voidzero-dev/vite-plus-core
-* so vitest's required `vite` peer binds to it. Without a direct edge, pnpm's
-* `autoInstallPeers` fabricates a separate upstream `vite` to satisfy the
-* peer, splitting vite-plus / vite / vitest into duplicate instances (the extra
-* vite also lacks vite's `@voidzero-dev/vite-task-client` integration, breaking
-* the `vp test` cache). Under a catalog the edge is a `catalog:` reference and
-* the catalog entry carries the alias; the `vite@*` workspace override covers
-* transitive and peer declarations instead of this one (see `pnpmOverrideKey`).
-* npm/yarn/bun redirect transitive/peer vite via root overrides/resolutions (and
-* drop the aliased vite), so this is pnpm-only, mirroring the bun root-package
-* branch in `rewriteRootWorkspacePackageJson`.
-*
-* A package that already declares `vite` in ANY dependency field, including
-* `peerDependencies` (e.g. a vite plugin pinning `vite ^6`), is left untouched
-* so its existing version contract is preserved. Call this AFTER `vite-plus`
-* has been ensured in the package, so the dependency check sees it.
-*/
-function ensureDirectViteForPnpm(pkg, packageManager, supportCatalog, catalogDependencyResolver) {
-	const viteOverride = VITE_PLUS_OVERRIDE_PACKAGES.vite;
-	if (packageManager !== PackageManager.pnpm || !viteOverride) return false;
-	const dependsOnVitePlus = pkg.dependencies?.["vite-plus"] !== void 0 || pkg.devDependencies?.["vite-plus"] !== void 0;
-	const viteAlreadyDirect = pkg.dependencies?.vite !== void 0 || pkg.devDependencies?.vite !== void 0 || pkg.optionalDependencies?.vite !== void 0 || pkg.peerDependencies?.vite !== void 0;
-	if (!dependsOnVitePlus || viteAlreadyDirect) return false;
-	setDirectViteEdge(pkg, supportCatalog, catalogDependencyResolver);
-	return true;
-}
-/**
 * Insert (or overwrite) a DIRECT `vite` devDependency edge in SORTED position.
 *
 * Several migration paths need a direct `vite` devDep for different reasons
-* (pnpm peer binding #1932; bun peer pre-resolution oven-sh/bun#8406; npm
+* (bun peer pre-resolution oven-sh/bun#8406; npm
 * `@vitest/mocker` hoisting for opt-in providers), but they all want the SAME
 * spec and the SAME placement, so both are centralized here. Each caller keeps
 * its OWN gate for WHEN a direct edge is needed; this owns only the spec +
@@ -7759,10 +7784,10 @@ function rewriteCatalogsObject(catalogs, usesVitest, vitestEcosystemPackages) {
 * unlike pnpm which uses pnpm-workspace.yaml.
 * @see https://bun.sh/docs/pm/catalogs
 */
-function rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages) {
+function rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages, usesWebdriverioProvider = false) {
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
-	const managed = managedOverridePackages(usesVitest);
+	const managed = managedOverridePackages(usesVitest, usesWebdriverioProvider);
 	editJsonFile(packageJsonPath, (pkg) => {
 		const workspacesObj = pkg.workspaces && !Array.isArray(pkg.workspaces) ? pkg.workspaces : void 0;
 		const useWorkspacesCatalog = workspacesObj?.catalog != null || pkg.catalog == null && workspacesObj?.catalogs != null;
@@ -7796,7 +7821,7 @@ function rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages) {
 		for (const [key, value] of Object.entries(managed)) {
 			const current = overrides[key];
 			if (current !== void 0 && typeof current !== "string") continue;
-			overrides[key] = getCatalogDependencySpec(current, value, true);
+			overrides[key] = key === "@vitest/browser" ? value : getCatalogDependencySpec(current, value, true);
 		}
 		pkg.overrides = overrides;
 		return pkg;
@@ -7809,7 +7834,7 @@ function rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages) {
 function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStagedMigration, catalogDependencyResolver, packages, pnpmMajorVersion, pnpmVersion, shouldAllowBrowserBuilds = false, workspaceUsesVitest = true, supportCatalog = true) {
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
-	const managed = managedOverridePackages(workspaceUsesVitest);
+	const managed = managedOverridePackages(workspaceUsesVitest, workspaceUsesWebdriverioProvider(projectPath, packages));
 	let movedPnpmSettings;
 	editJsonFile(packageJsonPath, (pkg) => {
 		pruneLegacyWrapperAliases(pkg.resolutions);
@@ -7829,9 +7854,14 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 			...pkg.overrides,
 			...managed
 		};
-		else if (packageManager === PackageManager.bun) setDirectViteEdge(pkg, true, catalogDependencyResolver);
-		else if (packageManager === PackageManager.pnpm) {
-			const overrideKeys = Object.keys(managed);
+		else if (packageManager === PackageManager.bun) {
+			if (managed["@vitest/browser"]) pkg.overrides = {
+				...pkg.overrides,
+				"@vitest/browser": managed["@vitest/browser"]
+			};
+			setDirectViteEdge(pkg, true, catalogDependencyResolver);
+		} else if (packageManager === PackageManager.pnpm) {
+			const overrideKeys = Object.keys(managedOverridePackages(workspaceUsesVitest));
 			if (!pnpmSupportsWorkspaceSettings(pnpmVersion ?? "")) {
 				dropRemovePackageOverrideKeys(pkg.pnpm?.overrides);
 				if (!workspaceUsesVitest) removeManagedVitestEntry(pkg.pnpm?.overrides, "pnpm-ranged");
@@ -7862,7 +7892,6 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 			...pkg.devDependencies,
 			[VITE_PLUS_NAME]: packageManager === PackageManager.npm || !supportCatalog || VITE_PLUS_VERSION.startsWith("file:") ? VITE_PLUS_VERSION : catalogDependencyResolver?.preferredCatalogSpec ?? "catalog:"
 		};
-		ensureDirectViteForPnpm(pkg, packageManager, supportCatalog, catalogDependencyResolver);
 		return pkg;
 	});
 	migratePnpmSettingsToWorkspaceYaml(projectPath, movedPnpmSettings);
@@ -7918,6 +7947,12 @@ function readBunCatalogDependencyResolver(pkg) {
 //#endregion
 //#region src/migration/migrator/yarn.ts
 const WEBDRIVERIO_ALLOW_SIGNAL_DEPS = ["webdriverio", WEBDRIVERIO_PROVIDER];
+function workspaceUsesWebdriverioProvider(rootDir, packages) {
+	return [rootDir, ...(packages ?? []).map((pkg) => path.join(rootDir, pkg.path))].some((dir) => {
+		const pkg = readPackageJsonIfExists(path.join(dir, "package.json"));
+		return Boolean(pkg && findDeclaredSpec(pkg, "@vitest/browser-webdriverio") || usesWebdriverioProvider(dir));
+	});
+}
 function hasOwnWebdriverioDependency(pkg) {
 	for (const name of WEBDRIVERIO_ALLOW_SIGNAL_DEPS) if (pkg.dependencies?.[name] ?? pkg.devDependencies?.[name] ?? pkg.optionalDependencies?.[name] ?? pkg.peerDependencies?.[name]) return true;
 	return false;
@@ -8089,10 +8124,7 @@ const PLAYWRIGHT_PROVIDER_SPECIFIER_HINTS = [
 	"vite-plus/test/browser/providers/playwright",
 	"vite-plus/test/plugins/browser-playwright"
 ];
-const BROWSER_PROVIDER_SPECIFIER_HINTS = {
-	[WEBDRIVERIO_PROVIDER]: WEBDRIVERIO_PROVIDER_SPECIFIER_HINTS,
-	[PLAYWRIGHT_PROVIDER]: PLAYWRIGHT_PROVIDER_SPECIFIER_HINTS
-};
+const BROWSER_PROVIDER_SPECIFIER_HINTS = { [PLAYWRIGHT_PROVIDER]: PLAYWRIGHT_PROVIDER_SPECIFIER_HINTS };
 const VITEST_SCAN_EXTENSIONS = /* @__PURE__ */ new Set([
 	".ts",
 	".mts",
@@ -8114,7 +8146,8 @@ const VITEST_SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
 	".nuxt",
 	".svelte-kit",
 	".vite",
-	".cache"
+	".cache",
+	".yarn"
 ]);
 const OXLINT_RETENTION_SKIP_DIRS = /* @__PURE__ */ new Set([
 	"node_modules",
@@ -8161,10 +8194,11 @@ function sourceTreeMatches(projectPath, matchesContent, options = {}) {
 			if (entry.isDirectory()) {
 				if (skipDirs.has(entry.name)) continue;
 				if (scanDir(entryPath, false)) return true;
-			} else if (entry.isFile() && (VITEST_SCAN_EXTENSIONS.has(path.extname(entry.name)) || options.includePackageReferences && entry.name === "package.json")) try {
+			} else if (entry.isFile() && ![".pnp.cjs", ".pnp.loader.mjs"].includes(entry.name) && (VITEST_SCAN_EXTENSIONS.has(path.extname(entry.name)) || options.includeExtensionless && path.extname(entry.name) === "" || options.includePackageReferences && entry.name === "package.json")) try {
 				let content = fs.readFileSync(entryPath, "utf8");
 				if (entry.name === "package.json") {
 					const pkg = JSON.parse(content);
+					if (options.matchesPackage?.(dir, pkg)) return true;
 					content = JSON.stringify({
 						imports: pkg.imports,
 						scripts: pkg.scripts
@@ -8224,37 +8258,81 @@ function collectProviderSourceModes(projectPath) {
 	return modes;
 }
 /**
-* Check final source, build output, package import aliases, and package scripts.
+* Check final source, build output, aliases, scripts, and dependency peers.
 * A substring scan conservatively retains references the rewriter leaves alone,
 * including require calls, type references, and strings.
 */
-function sourceTreeReferencesOxlintPluginsPackage(projectPath) {
+function sourceTreeReferencesOxlintPluginsPackage(projectPath, originalDependencies = collectOxlintDependencyNames(projectPath)) {
 	return sourceTreeMatches(projectPath, (content) => content.includes(OXLINT_PLUGINS_PACKAGE), {
 		crossPackageBoundaries: true,
 		includePackageReferences: true,
+		includeExtensionless: true,
+		matchesPackage: (dir, pkg) => projectListsRequiredOxlintPluginsPeer(dir, pkg, {
+			retainUnknownPeers: originalDependencies.has(dir),
+			originalDependencyNames: originalDependencies.get(dir)
+		}),
 		skipDirs: OXLINT_RETENTION_SKIP_DIRS
 	});
 }
+function projectListsRequiredOxlintPluginsPeer(projectPath, pkg, { retainUnknownPeers = true, originalDependencyNames } = {}) {
+	const dependencyNames = collectInstallDependencyNames(pkg);
+	dependencyNames.delete(OXLINT_PLUGINS_PACKAGE);
+	dependencyNames.delete(VITE_PLUS_NAME);
+	dependencyNames.delete("vite");
+	for (const name of dependencyNames) {
+		if (originalDependencyNames && !originalDependencyNames.has(name)) continue;
+		const metadata = detectPackageMetadata(projectPath, name);
+		if (!metadata) {
+			if (retainUnknownPeers) return true;
+			continue;
+		}
+		try {
+			const installedPkg = readJsonFile(path.join(metadata.path, "package.json"));
+			if (typeof installedPkg.peerDependencies?.["@oxlint/plugins"] === "string" && installedPkg.peerDependenciesMeta?.["@oxlint/plugins"]?.optional !== true) return true;
+		} catch {
+			if (retainUnknownPeers) return true;
+		}
+	}
+	return false;
+}
+function collectInstallDependencyNames(pkg) {
+	return /* @__PURE__ */ new Set([
+		...Object.keys(pkg?.dependencies ?? {}),
+		...Object.keys(pkg?.devDependencies ?? {}),
+		...Object.keys(pkg?.optionalDependencies ?? {})
+	]);
+}
+function collectOxlintDependencyNames(rootDir, packages) {
+	const names = /* @__PURE__ */ new Map();
+	for (const dir of [rootDir, ...(packages ?? []).map((pkg) => path.join(rootDir, pkg.path))]) {
+		const pkg = readPackageJsonIfExists(path.join(dir, "package.json"));
+		names.set(dir, collectInstallDependencyNames(pkg));
+	}
+	return names;
+}
 /**
 * Drop `@oxlint/plugins` from devDependencies once nothing names it any more.
 *
 * Runs AFTER the import rewrite, so the scan sees final source. Skips a package
 * that owns the API as a runtime or peer dependency, and skips any package
-* whose source or build output still names it.
+* whose source, build output, or installed dependencies still require it.
 */
-function dropDeadOxlintPluginsDependency(rootDir, packages) {
+function dropDeadOxlintPluginsDependency(rootDir, packages, originalDependencies = collectOxlintDependencyNames(rootDir, packages)) {
+	let changed = false;
 	const dirs = [rootDir, ...(packages ?? []).map((pkg) => path.join(rootDir, pkg.path))];
 	for (const dir of dirs) {
 		const packageJsonPath = path.join(dir, "package.json");
 		const pkg = readPackageJsonIfExists(packageJsonPath);
 		if (pkg?.devDependencies?.["@oxlint/plugins"] === void 0) continue;
-		if (packageOwnsOxlintApi(pkg) || sourceTreeReferencesOxlintPluginsPackage(dir)) continue;
+		if (packageOwnsOxlintApi(pkg) || sourceTreeReferencesOxlintPluginsPackage(dir, originalDependencies)) continue;
 		editJsonFile(packageJsonPath, (json) => {
 			if (json.devDependencies?.["@oxlint/plugins"] === void 0) return;
 			delete json.devDependencies[OXLINT_PLUGINS_PACKAGE];
+			changed = true;
 			return json;
 		});
 	}
+	return changed;
 }
 //#endregion
 //#region src/migration/migrator/vite-plus-bootstrap.ts
@@ -8267,6 +8345,7 @@ function isSemanticVitePlusOverrideSpec(dependencyName, spec) {
 	if (!spec) return false;
 	if (isLegacyWrapperSpec(spec)) return false;
 	if (spec === VITE_PLUS_OVERRIDE_PACKAGES[dependencyName]) return true;
+	if (dependencyName === "@vitest/browser" && spec === "5.0.1") return true;
 	return false;
 }
 function overrideSpecSatisfiesVitePlus(dependencyName, spec, catalogDependencyResolver) {
@@ -8275,8 +8354,8 @@ function overrideSpecSatisfiesVitePlus(dependencyName, spec, catalogDependencyRe
 	if (!spec.startsWith("catalog:")) return false;
 	return isSemanticVitePlusOverrideSpec(dependencyName, catalogDependencyResolver?.(spec, dependencyName));
 }
-function overridesSatisfyVitePlus(overrides, usesVitest, catalogDependencyResolver, keyStyle = "bare") {
-	const managed = managedOverridePackages(usesVitest);
+function overridesSatisfyVitePlus(overrides, usesVitest, catalogDependencyResolver, keyStyle = "bare", usesWebdriverioProvider = false) {
+	const managed = managedOverridePackages(usesVitest, usesWebdriverioProvider);
 	if (!usesVitest && VITEST_IS_MANAGED_OVERRIDE && (typeof overrides?.vitest === "string" || keyStyle === "pnpm-ranged" && typeof overrides?.[pnpmOverrideKey("vitest")] === "string")) return false;
 	if (keyStyle === "pnpm-ranged" && Object.keys(managed).some((dependencyName) => typeof overrides?.[dependencyName] === "string")) return false;
 	return Object.keys(managed).every((dependencyName) => overrideSpecSatisfiesVitePlus(dependencyName, overrides?.[managedOverrideKey(dependencyName, keyStyle)], catalogDependencyResolver));
@@ -8398,7 +8477,7 @@ function reconcileVitePlusBootstrapPackage(projectPath, pkg, vitePlusVersion, pa
 		const frameworkPeer = BROWSER_PROVIDER_PEER_DEPS[provider];
 		if (!hasProviderPeerDependency(pkg, frameworkPeer)) {
 			pkg.devDependencies ??= {};
-			pkg.devDependencies[frameworkPeer] = resolveProviderPeerSpec(pkg, frameworkPeer, supportCatalog, catalogDependencyResolver);
+			pkg.devDependencies[frameworkPeer] = resolveProviderPeerSpec(frameworkPeer, supportCatalog, catalogDependencyResolver);
 		}
 	}
 	for (const bundledPackage of REMOVE_PACKAGES) for (const dependencies of installGroups) if (dependencies?.[bundledPackage] !== void 0) delete dependencies[bundledPackage];
@@ -8419,7 +8498,6 @@ function reconcileVitePlusBootstrapPackage(projectPath, pkg, vitePlusVersion, pa
 			pkg.devDependencies.vitest = getCatalogDependencySpec(void 0, VITEST_VERSION, supportCatalog, { preferredCatalogSpec: catalogDependencyResolver?.preferredCatalogSpec });
 		}
 	} else for (const dependencies of installGroups) removeManagedVitestEntry(dependencies);
-	ensureDirectViteForPnpm(pkg, packageManager, supportCatalog, catalogDependencyResolver);
 	return before !== JSON.stringify(pkg);
 }
 function bootstrapProjectPaths(rootDir, packages) {
@@ -8493,17 +8571,18 @@ function detectVitePlusBootstrapPending(projectPath, packageManager, packages, p
 		if (reconcileVitePlusBootstrapPackage(packagePath, JSON.parse(JSON.stringify(childPkg)), canonicalVitePlusSpec, packageManager, supportCatalog, index === 0, catalogDependencyResolver, providerCatalogAdditions)) return true;
 	}
 	const usesVitest = workspaceUsesVitestDirectly(projectPath, packages, true);
-	if (packageManager === PackageManager.yarn) return !overridesSatisfyVitePlus(pkg.resolutions, usesVitest) || !yarnrcSatisfiesVitePlus(projectPath, usesVitest, supportCatalog) || yarnWorkspaceHoistingOptOutPending(projectPath, packageManager, packages);
-	if (packageManager === PackageManager.npm) return vitePlusDependencyNeedsConcreteVersion(pkg) || !overridesSatisfyVitePlus(pkg.overrides, usesVitest) || npmVitePlusManagedDependenciesPending(pkg, usesVitest);
-	if (packageManager === PackageManager.bun) return !overridesSatisfyVitePlus(pkg.overrides, usesVitest, supportCatalog ? readBunCatalogDependencyResolver(pkg) : void 0);
+	const usesWebdriverio = workspaceUsesWebdriverioProvider(projectPath, packages);
+	if (packageManager === PackageManager.yarn) return !overridesSatisfyVitePlus(pkg.resolutions, usesVitest, void 0, "bare", usesWebdriverio) || !yarnrcSatisfiesVitePlus(projectPath, usesVitest, supportCatalog) || yarnWorkspaceHoistingOptOutPending(projectPath, packageManager, packages);
+	if (packageManager === PackageManager.npm) return vitePlusDependencyNeedsConcreteVersion(pkg) || !overridesSatisfyVitePlus(pkg.overrides, usesVitest, void 0, "bare", usesWebdriverio) || npmVitePlusManagedDependenciesPending(pkg, usesVitest);
+	if (packageManager === PackageManager.bun) return !overridesSatisfyVitePlus(pkg.overrides, usesVitest, supportCatalog ? readBunCatalogDependencyResolver(pkg) : void 0, "bare", usesWebdriverio);
 	if (packageManager === PackageManager.pnpm) {
 		if (!pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath)) return true;
 		if (!usePnpmWorkspaceYaml) {
-			if (supportCatalog) return catalogVitePlusDependencyPending(pkg, catalogDependencyResolver) || !overridesSatisfyVitePlus(pkg.pnpm?.overrides, usesVitest, catalogDependencyResolver, "pnpm-ranged") || !pnpmPeerDependencyRulesSatisfyVitePlus(pkg.pnpm?.peerDependencyRules, usesVitest);
-			return vitePlusDependencyNeedsConcreteVersion(pkg) || !overridesSatisfyVitePlus(pkg.pnpm?.overrides, usesVitest, void 0, "pnpm-ranged") || !pnpmPeerDependencyRulesSatisfyVitePlus(pkg.pnpm?.peerDependencyRules, usesVitest);
+			if (supportCatalog) return catalogVitePlusDependencyPending(pkg, catalogDependencyResolver) || !overridesSatisfyVitePlus(pkg.pnpm?.overrides, usesVitest, catalogDependencyResolver, "pnpm-ranged", usesWebdriverio) || !pnpmPeerDependencyRulesSatisfyVitePlus(pkg.pnpm?.peerDependencyRules, usesVitest);
+			return vitePlusDependencyNeedsConcreteVersion(pkg) || !overridesSatisfyVitePlus(pkg.pnpm?.overrides, usesVitest, void 0, "pnpm-ranged", usesWebdriverio) || !pnpmPeerDependencyRulesSatisfyVitePlus(pkg.pnpm?.peerDependencyRules, usesVitest);
 		}
 		const resolver = readPnpmWorkspaceCatalogDependencyResolver(projectPath);
-		return workspaceCatalogVitePlusDependencyPending(projectPath, packages, resolver) || !overridesSatisfyVitePlus(readPnpmWorkspaceOverrides(projectPath), usesVitest, resolver, "pnpm-ranged") || !pnpmPeerDependencyRulesSatisfyVitePlus(readPnpmWorkspacePeerDependencyRules(projectPath), usesVitest) || pnpmWorkspaceMinimumReleaseAgeExemptionsPending(projectPath);
+		return workspaceCatalogVitePlusDependencyPending(projectPath, packages, resolver) || !overridesSatisfyVitePlus(readPnpmWorkspaceOverrides(projectPath), usesVitest, resolver, "pnpm-ranged", usesWebdriverio) || !pnpmPeerDependencyRulesSatisfyVitePlus(readPnpmWorkspacePeerDependencyRules(projectPath), usesVitest) || pnpmWorkspaceMinimumReleaseAgeExemptionsPending(projectPath);
 	}
 	return false;
 }
@@ -8542,11 +8621,11 @@ function ensureVitePlusDependencySpecs(pkg, version, ensurePresent = true) {
 function readTextFileIfExists(filePath) {
 	return fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf-8") : void 0;
 }
-function ensureOverrideEntries(overrides, usesVitest, catalogDependencyResolver, keyStyle = "bare") {
+function ensureOverrideEntries(overrides, usesVitest, catalogDependencyResolver, keyStyle = "bare", usesWebdriverioProvider = false) {
 	const next = { ...overrides };
 	let changed = false;
 	if (!usesVitest && removeManagedVitestEntry(next, keyStyle)) changed = true;
-	for (const [dependencyName, overrideSpec] of Object.entries(managedOverridePackages(usesVitest))) {
+	for (const [dependencyName, overrideSpec] of Object.entries(managedOverridePackages(usesVitest, usesWebdriverioProvider))) {
 		const overrideKey = managedOverrideKey(dependencyName, keyStyle);
 		if (overrideKey !== dependencyName && next[dependencyName] !== void 0) {
 			next[overrideKey] ??= next[dependencyName];
@@ -8597,6 +8676,7 @@ function ensureVitePlusBootstrap(workspaceInfo, report) {
 	};
 	if (!fs.existsSync(packageJsonPath)) return result;
 	const usesVitest = workspaceUsesVitestDirectly(projectPath, workspaceInfo.packages, true);
+	const usesWebdriverio = workspaceUsesWebdriverioProvider(projectPath, workspaceInfo.packages);
 	const pnpmMajorVersion = pnpmMajor(workspaceInfo.downloadPackageManager.version);
 	const shouldAllowBrowserBuilds = workspaceUsesWebdriverio(projectPath, workspaceInfo.packages);
 	const usePnpmWorkspaceYaml = workspaceInfo.packageManager === PackageManager.pnpm && pnpmSupportsWorkspaceSettings(workspaceInfo.downloadPackageManager.version);
@@ -8612,31 +8692,31 @@ function ensureVitePlusBootstrap(workspaceInfo, report) {
 	let pnpmWorkspaceCatalogBefore;
 	if (workspaceInfo.packageManager === PackageManager.pnpm && !usePnpmWorkspaceYaml) {
 		pnpmWorkspaceCatalogBefore = readTextFileIfExists(pnpmWorkspaceYamlPath);
-		if (supportCatalog) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, false, providerCatalogAdditions);
+		if (supportCatalog) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, false, providerCatalogAdditions, usesWebdriverio);
 	}
 	editJsonFile(packageJsonPath, (pkg) => {
 		let packageJsonChanged = reconcileVitePlusBootstrapPackage(projectPath, pkg, canonicalVitePlusSpec, workspaceInfo.packageManager, supportCatalog, true, catalogDependencyResolver, providerCatalogAdditions);
 		if (workspaceInfo.packageManager === PackageManager.yarn) {
-			const ensured = ensureOverrideEntries(pkg.resolutions, usesVitest);
+			const ensured = ensureOverrideEntries(pkg.resolutions, usesVitest, void 0, "bare", usesWebdriverio);
 			if (ensured.changed) {
 				pkg.resolutions = ensured.overrides;
 				packageJsonChanged = true;
 			}
 		} else if (workspaceInfo.packageManager === PackageManager.npm) {
-			const ensured = ensureOverrideEntries(pkg.overrides, usesVitest);
+			const ensured = ensureOverrideEntries(pkg.overrides, usesVitest, void 0, "bare", usesWebdriverio);
 			if (ensured.changed) {
 				pkg.overrides = ensured.overrides;
 				packageJsonChanged = true;
 			}
 		} else if (workspaceInfo.packageManager === PackageManager.bun) {
-			const ensured = ensureOverrideEntries(pkg.overrides, usesVitest, supportCatalog ? readBunCatalogDependencyResolver(pkg) : void 0);
+			const ensured = ensureOverrideEntries(pkg.overrides, usesVitest, supportCatalog ? readBunCatalogDependencyResolver(pkg) : void 0, "bare", usesWebdriverio);
 			if (ensured.changed) {
 				pkg.overrides = ensured.overrides;
 				packageJsonChanged = true;
 			}
 		} else if (workspaceInfo.packageManager === PackageManager.pnpm && !usePnpmWorkspaceYaml) {
 			pkg.pnpm ??= {};
-			const ensured = ensureOverrideEntries(pkg.pnpm.overrides, usesVitest, supportCatalog ? readPnpmWorkspaceCatalogDependencyResolver(projectPath) : void 0, "pnpm-ranged");
+			const ensured = ensureOverrideEntries(pkg.pnpm.overrides, usesVitest, supportCatalog ? readPnpmWorkspaceCatalogDependencyResolver(projectPath) : void 0, "pnpm-ranged", usesWebdriverio);
 			if (ensured.changed) {
 				pkg.pnpm.overrides = ensured.overrides;
 				packageJsonChanged = true;
@@ -8675,7 +8755,7 @@ function ensureVitePlusBootstrap(workspaceInfo, report) {
 			const before = readTextFileIfExists(pnpmWorkspaceYamlPath);
 			migratePnpmSettingsToWorkspaceYaml(projectPath, movedPnpmSettings);
 			const catalogDependencyResolver = readPnpmWorkspaceCatalogDependencyResolver(projectPath);
-			if (movedPnpmSettings !== void 0 || result.packageJson || ecosystemCatalogReferencesPending || !pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath) || pnpmWorkspaceMinimumReleaseAgeExemptionsPending(projectPath) || workspaceCatalogVitePlusDependencyPending(projectPath, workspaceInfo.packages, catalogDependencyResolver) || !overridesSatisfyVitePlus(readPnpmWorkspaceOverrides(projectPath), usesVitest, catalogDependencyResolver, "pnpm-ranged") || !pnpmPeerDependencyRulesSatisfyVitePlus(readPnpmWorkspacePeerDependencyRules(projectPath), usesVitest)) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, true, providerCatalogAdditions);
+			if (movedPnpmSettings !== void 0 || result.packageJson || ecosystemCatalogReferencesPending || !pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath) || pnpmWorkspaceMinimumReleaseAgeExemptionsPending(projectPath) || workspaceCatalogVitePlusDependencyPending(projectPath, workspaceInfo.packages, catalogDependencyResolver) || !overridesSatisfyVitePlus(readPnpmWorkspaceOverrides(projectPath), usesVitest, catalogDependencyResolver, "pnpm-ranged", usesWebdriverio) || !pnpmPeerDependencyRulesSatisfyVitePlus(readPnpmWorkspacePeerDependencyRules(projectPath), usesVitest)) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserBuilds, usesVitest, vitestEcosystemPackages, true, providerCatalogAdditions, usesWebdriverio);
 			if (fs.existsSync(pnpmWorkspaceYamlPath)) ensurePnpmWorkspacePackages(projectPath, workspaceInfo.workspacePatterns);
 			result.packageManagerConfig = before !== readTextFileIfExists(pnpmWorkspaceYamlPath);
 		} else {
@@ -8691,7 +8771,7 @@ function ensureVitePlusBootstrap(workspaceInfo, report) {
 		result.packageManagerConfig = before !== fs.readFileSync(yarnrcYmlPath, "utf-8");
 	} else if (isBunWorkspace) {
 		const before = fs.readFileSync(packageJsonPath, "utf-8");
-		rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages);
+		rewriteBunCatalog(projectPath, usesVitest, vitestEcosystemPackages, usesWebdriverio);
 		const after = fs.readFileSync(packageJsonPath, "utf-8");
 		result.packageJson = result.packageJson || before !== after;
 	}
@@ -8890,7 +8970,7 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 		const peer = BROWSER_PROVIDER_PEER_DEPS[provider];
 		if (!hasProviderPeerDependency(pkg, peer)) {
 			pkg.devDependencies ??= {};
-			pkg.devDependencies[peer] = resolveProviderPeerSpec(pkg, peer, supportCatalog, catalogDependencyResolver);
+			pkg.devDependencies[peer] = resolveProviderPeerSpec(peer, supportCatalog, catalogDependencyResolver);
 		}
 		needVitePlus = true;
 	}
@@ -8922,7 +9002,6 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 		...pkg.devDependencies,
 		[VITE_PLUS_NAME]: canonicalVitePlusSpec
 	};
-	ensureDirectViteForPnpm(pkg, packageManager, supportCatalog, catalogDependencyResolver);
 	if (needDirectVitest) {
 		if (!{
 			...pkg.dependencies,
@@ -8990,7 +9069,7 @@ function rewriteLintStagedConfigFile(projectPath, report) {
 		warnMigration(`${displayRelative(configPath)} — please migrate to "staged" in vite.config.ts manually`, report);
 		hasUnsupported = true;
 	}
-	if (hasUnsupported) infoMigration("Only \"staged\" in vite.config.ts is supported. See https://viteplus.dev/guide/migrate#lint-staged", report);
+	if (hasUnsupported) infoMigration(`Only "staged" in vite.config.ts is supported. See ${documentationUrl$1("/guide/migrate#lint-staged")}`, report);
 }
 /**
 * Ensure vite.config.ts exists, create it if not
@@ -9028,7 +9107,7 @@ function mergeTsdownConfigFile(projectPath, silent = false, report) {
 	const tsdownRelativePath = `./${configs.tsdownConfig}`;
 	if (hasConfigKey(fullViteConfigPath, "pack")) {
 		const viteConfigContent = fs.readFileSync(fullViteConfigPath, "utf8");
-		if (![tsdownRelativePath, tsdownRelativePath.replace(/\.mts$/, ".mjs").replace(/\.cts$/, ".cjs").replace(/\.ts$/, ".js")].some((importPath) => viteConfigContent.includes(`from '${importPath}'`) || viteConfigContent.includes(`from "${importPath}"`))) infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see https://viteplus.dev/guide/migrate#tsdown`, report);
+		if (![tsdownRelativePath, tsdownRelativePath.replace(/\.mts$/, ".mjs").replace(/\.cts$/, ".cjs").replace(/\.ts$/, ".js")].some((importPath) => viteConfigContent.includes(`from '${importPath}'`) || viteConfigContent.includes(`from "${importPath}"`))) infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see ${documentationUrl$1("/guide/migrate#tsdown")}`, report);
 		return false;
 	}
 	const result = mergeTsdownConfig(fullViteConfigPath, tsdownRelativePath);
@@ -9037,7 +9116,7 @@ function mergeTsdownConfigFile(projectPath, silent = false, report) {
 		if (report) report.tsdownImportCount++;
 		if (!silent) log.success(`✔ Added import for ${displayRelative(fullTsdownConfigPath)} in ${displayRelative(fullViteConfigPath)}`);
 	}
-	infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see https://viteplus.dev/guide/migrate#tsdown`, report);
+	infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see ${documentationUrl$1("/guide/migrate#tsdown")}`, report);
 	return createdViteConfig || result.updated;
 }
 /**
@@ -9121,7 +9200,7 @@ function mergeAndRemoveJsonConfig(projectPath, viteConfigPath, jsonConfigPath, c
 		if (!silent) log.success(`✔ Merged ${displayRelative(fullJsonConfigPath)} into ${displayRelative(fullViteConfigPath)}`);
 	} else {
 		warnMigration(`Failed to merge ${displayRelative(fullJsonConfigPath)} into ${displayRelative(fullViteConfigPath)}`, report);
-		infoMigration("Please complete the merge manually and follow the instructions in the documentation: https://viteplus.dev/config/", report);
+		infoMigration(`Please complete the merge manually and follow the instructions in the documentation: ${documentationUrl$1("/config/")}`, report);
 	}
 }
 /**
@@ -9146,7 +9225,7 @@ function mergeStagedConfigToViteConfig(projectPath, stagedConfig, silent = false
 		return true;
 	} else {
 		warnMigration(`Failed to merge staged config into ${displayRelative(fullViteConfigPath)}`, report);
-		infoMigration(`Please add staged config to ${displayRelative(fullViteConfigPath)} manually, see https://viteplus.dev/guide/migrate#lint-staged`, report);
+		infoMigration(`Please add staged config to ${displayRelative(fullViteConfigPath)} manually, see ${documentationUrl$1("/guide/migrate#lint-staged")}`, report);
 		return false;
 	}
 }
@@ -9207,37 +9286,6 @@ function rewriteAllImports(projectPath, silent = false, report, preserveNuxtVite
 	return modified > 0;
 }
 //#endregion
-//#region src/utils/git.ts
-var import_cross_spawn = /* @__PURE__ */ __toESM(require_cross_spawn(), 1);
-/**
-* Walk up from `startPath` looking for `.git` (directory or file — submodules
-* use a `.git` file).  Returns the directory that contains `.git`, or `null`.
-*/
-function findGitRoot(startPath) {
-	let dir = startPath;
-	while (true) {
-		if (fs.existsSync(path.join(dir, ".git"))) return dir;
-		const parent = path.dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
-}
-async function initGitRepository(cwd) {
-	const result = await runCommandSilently({
-		command: "git",
-		args: ["init"],
-		cwd,
-		envs: process.env
-	});
-	if (result.exitCode !== 0) {
-		log.warn("Failed to initialize git repository");
-		const stderr = result.stderr.toString().trim();
-		if (stderr) log.info(stderr);
-		return false;
-	}
-	return true;
-}
-//#endregion
 //#region src/migration/migrator/git-hooks.ts
 const OTHER_HOOK_TOOLS = [
 	"simple-git-hooks",
@@ -9334,7 +9382,7 @@ function preflightGitHooksSetup(projectPath, _packageManager, packages = []) {
 	const configuredHooksPath = gitRoot ? getConfiguredHooksPath(projectPath) : "";
 	const normalizedHooksPath = normalizeGitHooksPath(configuredHooksPath);
 	if (hasHuskySetup(projectPath, pkgContent) || normalizedHooksPath === ".husky" || normalizedHooksPath.startsWith(".husky/")) return "Detected Husky — leaving its hooks, configuration, and dependencies unchanged. Migrate Husky manually before enabling Vite+ hooks.";
-	for (const tool of OTHER_HOOK_TOOLS) if (deps?.[tool] || prodDeps?.[tool] || pkgContent[tool]) return `Detected ${tool} — skipping git hooks setup. Please configure git hooks manually, see https://viteplus.dev/guide/migrate#git-hook-tools`;
+	for (const tool of OTHER_HOOK_TOOLS) if (deps?.[tool] || prodDeps?.[tool] || pkgContent[tool]) return `Detected ${tool} — skipping git hooks setup. Please configure git hooks manually, see ${documentationUrl$1("/guide/migrate#git-hook-tools")}`;
 	const workspacePackageReason = findWorkspacePackageHookPolicy(projectPath, packages);
 	if (workspacePackageReason) return workspacePackageReason;
 	const disabledHooksEnvironment = [
@@ -9687,6 +9735,7 @@ function detectPendingCoreMigration(workspaceInfo) {
 function finalizeCoreMigrationForExistingVitePlus(workspaceInfo, silent = false, report, pending = detectPendingCoreMigration(workspaceInfo)) {
 	const projectPaths = getCoreMigrationProjectPaths(workspaceInfo);
 	const result = {
+		dependencies: false,
 		scripts: false,
 		tsconfigTypes: false,
 		imports: false,
@@ -9695,6 +9744,7 @@ function finalizeCoreMigrationForExistingVitePlus(workspaceInfo, silent = false,
 	if (pending.scripts) for (const projectPath of projectPaths) result.scripts = rewriteCorePackageScripts(projectPath) || result.scripts;
 	if (pending.tsconfigTypes) for (const projectPath of projectPaths) result.tsconfigTypes = rewriteTsconfigTypes(projectPath, silent, report) || result.tsconfigTypes;
 	result.imports = rewriteAllImports(workspaceInfo.rootDir, silent, report, true);
+	result.dependencies = dropDeadOxlintPluginsDependency(workspaceInfo.rootDir, workspaceInfo.packages);
 	for (const projectPath of projectPaths) result.tsdownConfig = mergeTsdownConfigFile(projectPath, silent, report) || result.tsdownConfig;
 	return result;
 }
@@ -9707,7 +9757,9 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	const catalogDependencyResolver = createCatalogDependencyResolver(projectPath, packageManager);
 	const vitestEcosystemPackages = collectVitestEcosystemInstallDependencyNames(projectPath);
 	const oxlintOwnerDirs = collectOxlintOwnerDirs(projectPath, workspaceInfo.packages);
+	const originalOxlintDependencies = collectOxlintDependencyNames(projectPath, workspaceInfo.packages);
 	const providerSourceModes = collectProviderSourceModes(projectPath);
+	const usesWebdriverio = workspaceUsesWebdriverioProvider(projectPath);
 	const browserMode = usesVitestBrowserMode(projectPath);
 	const retainedVitestModule = sourceTreeReferencesRetainedVitestModule(projectPath);
 	const providerCatalogAdditions = collectInjectedProviderNames(projectPath, void 0, /* @__PURE__ */ new Map([[projectPath, providerSourceModes]]));
@@ -9726,7 +9778,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 			browserMode,
 			retainedModule: retainedVitestModule
 		});
-		const managed = managedOverridePackages(usesVitest);
+		const managed = managedOverridePackages(usesVitest, usesWebdriverio);
 		pruneLegacyWrapperAliases(pkg.resolutions);
 		pruneLegacyWrapperAliases(pkg.overrides);
 		pruneLegacyWrapperAliases(pkg.pnpm?.overrides);
@@ -9748,7 +9800,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 			if (packageManager === PackageManager.bun) setDirectViteEdge(pkg, supportCatalog, catalogDependencyResolver);
 		} else if (packageManager === PackageManager.pnpm) {
 			if (usePnpmWorkspaceYaml) shouldAddPnpmWorkspaceVitePlusOverride = isForceOverrideMode();
-			const overrideKeys = Object.keys(managed);
+			const overrideKeys = Object.keys(managedOverridePackages(usesVitest));
 			if (!usePnpmWorkspaceYaml) {
 				dropRemovePackageOverrideKeys(pkg.pnpm?.overrides);
 				if (!usesVitest) {
@@ -9785,11 +9837,10 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 				[VITE_PLUS_NAME]: version
 			};
 		}
-		ensureDirectViteForPnpm(pkg, packageManager, supportCatalog, catalogDependencyResolver);
 		return pkg;
 	});
 	migratePnpmSettingsToWorkspaceYaml(projectPath, movedPnpmSettings);
-	if (packageManager === PackageManager.pnpm && (usePnpmWorkspaceYaml || supportCatalog)) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserProviderBuilds, usesVitest, vitestEcosystemPackages, usePnpmWorkspaceYaml, providerCatalogAdditions);
+	if (packageManager === PackageManager.pnpm && (usePnpmWorkspaceYaml || supportCatalog)) rewritePnpmWorkspaceYaml(projectPath, pnpmMajorVersion, shouldAllowBrowserProviderBuilds, usesVitest, vitestEcosystemPackages, usePnpmWorkspaceYaml, providerCatalogAdditions, usesWebdriverio);
 	if (shouldAddPnpmWorkspaceVitePlusOverride) migratePnpmOverridesToWorkspaceYaml(projectPath, { [VITE_PLUS_NAME]: VITE_PLUS_VERSION });
 	if (packageManager === PackageManager.pnpm) ensurePnpmWorkspaceExoticSubdepsSetting(projectPath);
 	if (packageManager === PackageManager.yarn) rewriteYarnrcYml(projectPath, usesVitest, vitestEcosystemPackages, providerCatalogAdditions, supportCatalog);
@@ -9804,7 +9855,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	injectFmtDefaults(projectPath, silent, report);
 	mergeTsdownConfigFile(projectPath, silent, report);
 	rewriteAllImports(projectPath, silent, report, true, oxlintOwnerDirs);
-	dropDeadOxlintPluginsDependency(projectPath, workspaceInfo.packages);
+	dropDeadOxlintPluginsDependency(projectPath, workspaceInfo.packages, originalOxlintDependencies);
 	wrapLazyPluginsInViteConfig(projectPath, silent, report);
 	setPackageManager(projectPath, workspaceInfo.downloadPackageManager);
 }
@@ -9815,18 +9866,20 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, report) {
 	const catalogDependencyResolver = createCatalogDependencyResolver(workspaceInfo.rootDir, workspaceInfo.packageManager);
 	const oxlintOwnerDirs = collectOxlintOwnerDirs(workspaceInfo.rootDir, workspaceInfo.packages);
+	const originalOxlintDependencies = collectOxlintDependencyNames(workspaceInfo.rootDir, workspaceInfo.packages);
 	const pnpmMajorVersion = pnpmMajor(workspaceInfo.downloadPackageManager.version);
 	const usePnpmWorkspaceSettings = pnpmSupportsWorkspaceSettings(workspaceInfo.downloadPackageManager.version);
 	const workspaceShouldAllowBrowserBuilds = workspaceUsesWebdriverio(workspaceInfo.rootDir, workspaceInfo.packages);
+	const usesWebdriverio = workspaceUsesWebdriverioProvider(workspaceInfo.rootDir, workspaceInfo.packages);
 	const workspaceUsesVitest = workspaceUsesVitestDirectly(workspaceInfo.rootDir, workspaceInfo.packages, true);
 	const vitestEcosystemPackages = collectVitestEcosystemInstallDependencyNames(workspaceInfo.rootDir, workspaceInfo.packages);
 	const providerCatalogAdditions = collectInjectedProviderNames(workspaceInfo.rootDir, workspaceInfo.packages);
 	const supportCatalog = supportsCatalog(workspaceInfo.packageManager, workspaceInfo.downloadPackageManager.version, true);
 	if (workspaceInfo.packageManager === PackageManager.yarn) rewriteYarnrcYml(workspaceInfo.rootDir, workspaceUsesVitest, vitestEcosystemPackages, providerCatalogAdditions, supportCatalog);
-	else if (workspaceInfo.packageManager === PackageManager.bun) rewriteBunCatalog(workspaceInfo.rootDir, workspaceUsesVitest, vitestEcosystemPackages);
+	else if (workspaceInfo.packageManager === PackageManager.bun) rewriteBunCatalog(workspaceInfo.rootDir, workspaceUsesVitest, vitestEcosystemPackages, usesWebdriverio);
 	rewriteRootWorkspacePackageJson(workspaceInfo.rootDir, workspaceInfo.packageManager, skipStagedMigration, catalogDependencyResolver, workspaceInfo.packages, pnpmMajorVersion, workspaceInfo.downloadPackageManager.version, workspaceShouldAllowBrowserBuilds, workspaceUsesVitest, supportCatalog);
 	if (workspaceInfo.packageManager === PackageManager.pnpm) {
-		rewritePnpmWorkspaceYaml(workspaceInfo.rootDir, pnpmMajorVersion, workspaceShouldAllowBrowserBuilds, workspaceUsesVitest, vitestEcosystemPackages, usePnpmWorkspaceSettings, providerCatalogAdditions);
+		rewritePnpmWorkspaceYaml(workspaceInfo.rootDir, pnpmMajorVersion, workspaceShouldAllowBrowserBuilds, workspaceUsesVitest, vitestEcosystemPackages, usePnpmWorkspaceSettings, providerCatalogAdditions, usesWebdriverio);
 		if (usePnpmWorkspaceSettings && isForceOverrideMode()) migratePnpmOverridesToWorkspaceYaml(workspaceInfo.rootDir, { [VITE_PLUS_NAME]: VITE_PLUS_VERSION });
 	}
 	const workspaceContext = {
@@ -9842,7 +9895,7 @@ function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, rep
 	injectFmtDefaults(workspaceInfo.rootDir, silent, report);
 	mergeTsdownConfigFile(workspaceInfo.rootDir, silent, report);
 	rewriteAllImports(workspaceInfo.rootDir, silent, report, true, oxlintOwnerDirs);
-	dropDeadOxlintPluginsDependency(workspaceInfo.rootDir, workspaceInfo.packages);
+	dropDeadOxlintPluginsDependency(workspaceInfo.rootDir, workspaceInfo.packages, originalOxlintDependencies);
 	wrapLazyPluginsInViteConfig(workspaceInfo.rootDir, silent, report);
 	for (const pkg of workspaceInfo.packages) wrapLazyPluginsInViteConfig(path.join(workspaceInfo.rootDir, pkg.path), silent, report);
 	setPackageManager(workspaceInfo.rootDir, workspaceInfo.downloadPackageManager);
@@ -10237,4 +10290,4 @@ function resolveEditorIds(editors) {
 	return uniqueEditorIds.length === 0 ? void 0 : uniqueEditorIds;
 }
 //#endregion
-export { warnIncompatibleEslintIntegration as $, detectYarnPnpMode as A, migrateTsupToTsdown as B, injectLintTypeCheckDefaults as C, detectVitePlusBootstrapPending as D, collectToolchainVersionChanges as E, addFrameworkShim as F, migratePrettierToOxfmt as G, warnMissingTsupConfig as H, detectFramework as I, confirmEslintMigration as J, promptPrettierMigration as K, hasFrameworkShim as L, isBingoTemplate as M, updatePackageJsonWithDeps as N, ensureVitePlusBootstrap as O, updateWorkspaceConfig as P, promptEslintMigration as Q, confirmTsupMigration as R, injectCreateDefaultTemplate as S, mergeViteConfigFiles as T, confirmPrettierMigration as U, promptTsupMigration as V, detectPrettierProject as W, detectIncompatibleEslintIntegration as X, detectEslintProject as Y, migrateEslintToOxlint as Z, installGitHooks as _, selectEditors as a, findGitRoot as b, rewriteMonorepoProject as c, finalizeCoreMigrationForExistingVitePlus as d, warnLegacyEslintConfig as et, detectNodeVersionManagerFile as f, detectLegacyGitHooksMigrationCandidate as g, setPackageManager as h, selectEditor as i, detectWorkspace$1 as j, configureYarnNodeModulesMode as k, rewriteStandaloneProject as l, migrateSetupVpVersion as m, detectExistingEditors as n, checkViteVersion as nt, writeEditorConfigs as o, migrateNodeVersionManagerFile as p, warnPackageLevelPrettier as q, isJsonLikeFile as r, checkVitestVersion as rt, rewriteMonorepo as s, detectEditorConflicts as t, warnPackageLevelEslint as tt, detectPendingCoreMigration as u, preflightGitHooksSetup as v, mergeTsdownConfigFile as w, initGitRepository as x, shouldSkipStagedMigrationForHooks as y, detectTsupProject as z };
+export { confirmEslintMigration as $, createCatalogDependencyResolver as A, addFrameworkShim as B, mergeViteConfigFiles as C, usesWebdriverioProvider as D, ensureVitePlusBootstrap as E, updateWorkspaceConfig as F, migrateTsupToTsdown as G, hasFrameworkShim as H, minimatch as I, confirmPrettierMigration as J, promptTsupMigration as K, findGitRoot as L, detectWorkspace$1 as M, isBingoTemplate as N, configureYarnNodeModulesMode as O, updatePackageJsonWithDeps as P, warnPackageLevelPrettier as Q, initGitRepository as R, mergeTsdownConfigFile as S, detectVitePlusBootstrapPending as T, confirmTsupMigration as U, detectFramework as V, detectTsupProject as W, migratePrettierToOxfmt as X, detectPrettierProject as Y, promptPrettierMigration as Z, installGitHooks as _, selectEditors as a, warnLegacyEslintConfig as at, injectCreateDefaultTemplate as b, rewriteMonorepoProject as c, checkViteVersion as ct, finalizeCoreMigrationForExistingVitePlus as d, detectEslintProject as et, detectNodeVersionManagerFile as f, detectLegacyGitHooksMigrationCandidate as g, setPackageManager as h, selectEditor as i, warnIncompatibleEslintIntegration as it, supportsCatalog as j, detectYarnPnpMode as k, rewriteStandaloneProject as l, checkVitestVersion as lt, migrateSetupVpVersion as m, detectExistingEditors as n, migrateEslintToOxlint as nt, writeEditorConfigs as o, warnPackageLevelEslint as ot, migrateNodeVersionManagerFile as p, warnMissingTsupConfig as q, isJsonLikeFile as r, promptEslintMigration as rt, rewriteMonorepo as s, WEBDRIVERIO_PROVIDER as st, detectEditorConflicts as t, detectIncompatibleEslintIntegration as tt, detectPendingCoreMigration as u, preflightGitHooksSetup as v, collectToolchainVersionChanges as w, injectLintTypeCheckDefaults as x, shouldSkipStagedMigrationForHooks as y, extractOverrideParentSegments as z };