vite-plus 0.1.15-alpha.6 → 0.1.15

package/dist/define-config.cjs

@@ -1,36 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = defineConfig;
-const config_1 = require("@voidzero-dev/vite-plus-test/config");
-function defineConfig(config) {
+import { defineConfig as viteDefineConfig, } from '@voidzero-dev/vite-plus-test/config';
+export function defineConfig(config) {
     if (typeof config === 'object') {
         if (config instanceof Promise) {
             return config.then((config) => {
                 if (config.lazy) {
-                    return config.lazy().then(({ plugins }) => (0, config_1.defineConfig)({
+                    return config.lazy().then(({ plugins }) => viteDefineConfig({
                         ...config,
                         plugins: [...(config.plugins || []), ...(plugins || [])],
                     }));
                 }
-                return (0, config_1.defineConfig)(config);
+                return viteDefineConfig(config);
             });
         }
         else if (config.lazy) {
-            return config.lazy().then(({ plugins }) => (0, config_1.defineConfig)({
+            return config.lazy().then(({ plugins }) => viteDefineConfig({
                 ...config,
                 plugins: [...(config.plugins || []), ...(plugins || [])],
             }));
         }
     }
     else if (typeof config === 'function') {
-        return (0, config_1.defineConfig)((env) => {
+        return viteDefineConfig((env) => {
             const c = config(env);
             if (c instanceof Promise) {
                 return c.then((v) => {
                     if (v.lazy) {
                         return v
                             .lazy()
-                            .then(({ plugins }) => (0, config_1.defineConfig)({ ...v, plugins: [...(v.plugins || []), ...(plugins || [])] }));
+                            .then(({ plugins }) => viteDefineConfig({ ...v, plugins: [...(v.plugins || []), ...(plugins || [])] }));
                     }
                     return v;
                 });
@@ -43,5 +41,5 @@ function defineConfig(config) {
             return c;
         });
     }
-    return (0, config_1.defineConfig)(config);
+    return viteDefineConfig(config);
 }

package/dist/define-config.d.ts

@@ -1,5 +1,5 @@
 import { type ConfigEnv } from '@voidzero-dev/vite-plus-test/config';
-import type { UserConfig } from './index';
+import type { UserConfig } from './index.js';
 type ViteUserConfigFnObject = (env: ConfigEnv) => UserConfig;
 type ViteUserConfigFnPromise = (env: ConfigEnv) => Promise<UserConfig>;
 type ViteUserConfigFn = (env: ConfigEnv) => UserConfig | Promise<UserConfig>;

package/dist/fmt.d.ts

@@ -0,0 +1,2 @@
+export { format } from 'oxfmt';
+export type * from 'oxfmt';

package/dist/fmt.js

@@ -0,0 +1 @@
+export { format } from 'oxfmt';

package/dist/global/{agent-D-vEue3D.js → agent-Dq7R_VUV.js}

@@ -3232,6 +3232,10 @@ const REMOVE_PACKAGES = [
 	"@vitest/browser-playwright",
 	"@vitest/browser-webdriverio"
 ];
+const BROWSER_PROVIDER_PEER_DEPS = {
+	"@vitest/browser-playwright": "playwright",
+	"@vitest/browser-webdriverio": "webdriverio"
+};
 function warnMigration(message, report) {
 	addMigrationWarning(report, message);
 	if (!report) log.warn(message);
@@ -3331,7 +3335,8 @@ async function migrateEslintToOxlint(projectPath, interactive, eslintConfigFile,
 		isCancelled: false
 	} : getSpinner(interactive);
 	if (eslintConfigFile) {
-		const migratePackage = "@oxlint/migrate";
+		const { versions } = await import("../versions.js");
+		const migratePackage = `@oxlint/migrate@${versions.oxlint}`;
 		spinner.start("Migrating ESLint config to Oxlint...");
 		if (!await runOxlintMigrateStep(vpBin, projectPath, migratePackage, [
 			"--merge",
@@ -3582,6 +3587,8 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	if (!fs.existsSync(packageJsonPath)) return;
 	const packageManager = workspaceInfo.packageManager;
 	let extractedStagedConfig = null;
+	let remainingPnpmOverrides;
+	let usePnpmWorkspaceYaml = false;
 	editJsonFile(packageJsonPath, (pkg) => {
 		if (packageManager === PackageManager.yarn) pkg.resolutions = {
 			...pkg.resolutions,
@@ -3592,23 +3599,46 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 			...VITE_PLUS_OVERRIDE_PACKAGES
 		};
 		else if (packageManager === PackageManager.pnpm) {
-			pkg.pnpm = {
+			usePnpmWorkspaceYaml = !pkg.pnpm;
+			if (usePnpmWorkspaceYaml) {
+				rewritePnpmWorkspaceYaml(projectPath);
+				if (isForceOverrideMode()) migratePnpmOverridesToWorkspaceYaml(projectPath, { [VITE_PLUS_NAME]: VITE_PLUS_VERSION });
+			}
+			const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
+			if (!usePnpmWorkspaceYaml) pkg.pnpm = {
 				...pkg.pnpm,
 				overrides: {
 					...pkg.pnpm?.overrides,
 					...VITE_PLUS_OVERRIDE_PACKAGES,
 					...isForceOverrideMode() ? { [VITE_PLUS_NAME]: VITE_PLUS_VERSION } : {}
+				},
+				peerDependencyRules: {
+					...pkg.pnpm?.peerDependencyRules,
+					allowAny: [...new Set([...pkg.pnpm?.peerDependencyRules?.allowAny ?? [], ...overrideKeys])],
+					allowedVersions: {
+						...pkg.pnpm?.peerDependencyRules?.allowedVersions,
+						...Object.fromEntries(overrideKeys.map((key) => [key, "*"]))
+					}
 				}
 			};
-			for (const key of [...Object.keys(VITE_PLUS_OVERRIDE_PACKAGES), ...REMOVE_PACKAGES]) if (pkg.resolutions?.[key]) delete pkg.resolutions[key];
+			else remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
+			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];
+			}
+			for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) if (pkg.resolutions?.[key]) delete pkg.resolutions[key];
+		}
+		extractedStagedConfig = rewritePackageJson(pkg, packageManager, usePnpmWorkspaceYaml, skipStagedMigration);
+		if (!pkg.devDependencies?.["vite-plus"] || isForceOverrideMode()) {
+			const version = usePnpmWorkspaceYaml && !VITE_PLUS_VERSION.startsWith("file:") ? "catalog:" : VITE_PLUS_VERSION;
+			pkg.devDependencies = {
+				...pkg.devDependencies,
+				[VITE_PLUS_NAME]: version
+			};
 		}
-		extractedStagedConfig = rewritePackageJson(pkg, packageManager, false, skipStagedMigration);
-		if (!pkg.devDependencies?.["vite-plus"] || isForceOverrideMode()) pkg.devDependencies = {
-			...pkg.devDependencies,
-			[VITE_PLUS_NAME]: VITE_PLUS_VERSION
-		};
 		return pkg;
 	});
+	if (remainingPnpmOverrides) migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
 	if (extractedStagedConfig) {
 		if (mergeStagedConfigToViteConfig(projectPath, extractedStagedConfig, silent, report)) removeLintStagedFromPackageJson(packageJsonPath);
 	}
@@ -3707,6 +3737,49 @@ function rewritePnpmWorkspaceYaml(projectPath) {
 	});
 }
 /**
+* Clean up pnpm.overrides and peerDependencyRules from package.json when migrating
+* to pnpm-workspace.yaml. Returns any remaining non-Vite overrides that need to be
+* 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];
+	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 };
+	delete pkg.pnpm?.overrides;
+	cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
+	if (pkg.pnpm?.peerDependencyRules && Object.keys(pkg.pnpm.peerDependencyRules).length === 0) delete pkg.pnpm.peerDependencyRules;
+	if (pkg.pnpm && Object.keys(pkg.pnpm).length === 0) delete pkg.pnpm;
+	return remaining;
+}
+/**
+* Move remaining non-Vite pnpm.overrides from package.json to pnpm-workspace.yaml.
+* pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json,
+* so all overrides must live in pnpm-workspace.yaml.
+*/
+function migratePnpmOverridesToWorkspaceYaml(projectPath, overrides) {
+	editYamlFile(path.join(projectPath, "pnpm-workspace.yaml"), (doc) => {
+		for (const [key, value] of Object.entries(overrides)) doc.setIn(["overrides", scalarString(key)], scalarString(value));
+	});
+}
+/**
+* Remove only Vite-managed entries from peerDependencyRules, preserving custom ones.
+*/
+function cleanupPeerDependencyRules(peerDependencyRules, overrideKeys) {
+	if (!peerDependencyRules) return;
+	if (Array.isArray(peerDependencyRules.allowAny)) {
+		peerDependencyRules.allowAny = peerDependencyRules.allowAny.filter((key) => !overrideKeys.includes(key));
+		if (peerDependencyRules.allowAny.length === 0) delete peerDependencyRules.allowAny;
+	}
+	if (peerDependencyRules.allowedVersions) {
+		for (const key of overrideKeys) delete peerDependencyRules.allowedVersions[key];
+		if (Object.keys(peerDependencyRules.allowedVersions).length === 0) delete peerDependencyRules.allowedVersions;
+	}
+}
+/**
 * Rewrite .yarnrc.yml to add vite-plus dependencies
 * @param projectPath - The path to the project
 */
@@ -3760,6 +3833,7 @@ function rewriteBunCatalog(projectPath) {
 function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStagedMigration) {
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
+	let remainingPnpmOverrides;
 	editJsonFile(packageJsonPath, (pkg) => {
 		if (packageManager === PackageManager.yarn) pkg.resolutions = {
 			...pkg.resolutions,
@@ -3770,6 +3844,7 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 			...VITE_PLUS_OVERRIDE_PACKAGES
 		};
 		else if (packageManager === PackageManager.bun) {} else if (packageManager === PackageManager.pnpm) {
+			const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
 			if (isForceOverrideMode()) pkg.pnpm = {
 				...pkg.pnpm,
 				overrides: {
@@ -3778,9 +3853,9 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 					[VITE_PLUS_NAME]: VITE_PLUS_VERSION
 				}
 			};
-			else for (const key of [...Object.keys(VITE_PLUS_OVERRIDE_PACKAGES), ...REMOVE_PACKAGES]) {
-				if (pkg.pnpm?.overrides?.[key]) delete pkg.pnpm.overrides[key];
-				if (pkg.resolutions?.[key]) delete pkg.resolutions[key];
+			else {
+				for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) if (pkg.resolutions?.[key]) delete pkg.resolutions[key];
+				remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
 			}
 			for (const key in pkg.pnpm?.overrides) if (key.includes(">")) {
 				const splits = key.split(">");
@@ -3793,6 +3868,7 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
 		};
 		return pkg;
 	});
+	if (remainingPnpmOverrides) migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
 	rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration);
 }
 const RULES_YAML_PATH = path.join(rulesDir, "vite-tools.yml");
@@ -3839,14 +3915,21 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 		}
 	}
 	for (const name of REMOVE_PACKAGES) {
-		if (pkg.devDependencies?.[name]) {
+		const wasInDevDeps = !!pkg.devDependencies?.[name];
+		const wasInDeps = !!pkg.dependencies?.[name];
+		if (wasInDevDeps) {
 			delete pkg.devDependencies[name];
 			needVitePlus = true;
 		}
-		if (pkg.dependencies?.[name]) {
+		if (wasInDeps) {
 			delete pkg.dependencies[name];
 			needVitePlus = true;
 		}
+		const peerDep = BROWSER_PROVIDER_PEER_DEPS[name];
+		if ((wasInDevDeps || wasInDeps) && peerDep && !pkg.devDependencies?.[peerDep] && !pkg.dependencies?.[peerDep]) {
+			pkg.devDependencies ??= {};
+			pkg.devDependencies[peerDep] = "*";
+		}
 	}
 	if (needVitePlus) {
 		const version = supportCatalog && !VITE_PLUS_VERSION.startsWith("file:") ? "catalog:" : VITE_PLUS_VERSION;

package/dist/global/config.js

@@ -1,4 +1,4 @@
-import { D as promptGitHooks, T as defaultInteractive, d as ensurePreCommitHook, f as hasStagedConfigInViteConfig, i as updateExistingAgentInstructions } from "./agent-D-vEue3D.js";
+import { D as promptGitHooks, T as defaultInteractive, d as ensurePreCommitHook, f as hasStagedConfigInViteConfig, i as updateExistingAgentInstructions } from "./agent-Dq7R_VUV.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { i as log, t as renderCliDoc } from "./help-HviKaKAU.js";
 import { join } from "node:path";

package/dist/global/create.js

@@ -1,9 +1,9 @@
 import { r as __toESM, t as __commonJSMin } from "./chunk-BoAXSpZd.js";
-import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, G as text, K as Ct, L as cancel, M as displayRelative, N as templatesDir, O as runViteFmt, P as DependencyType, R as confirm, T as defaultInteractive, U as select, V as multiselect, W as spinner, a as writeAgentInstructions, b as rewriteMonorepoProject, k as runViteInstall, n as detectExistingAgentTargetPaths, p as installGitHooks, r as selectAgentTargetPaths, x as rewriteStandaloneProject, y as rewriteMonorepo, z as intro } from "./agent-D-vEue3D.js";
+import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, G as text, K as Ct, L as cancel, M as displayRelative, N as templatesDir, O as runViteFmt, P as DependencyType, R as confirm, T as defaultInteractive, U as select, V as multiselect, W as spinner, a as writeAgentInstructions, b as rewriteMonorepoProject, k as runViteInstall, n as detectExistingAgentTargetPaths, p as installGitHooks, r as selectAgentTargetPaths, x as rewriteStandaloneProject, y as rewriteMonorepo, z as intro } from "./agent-Dq7R_VUV.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { c as readJsonFile, o as editJsonFile, t as checkNpmPackageExists } from "./package-2ArHHFnA.js";
 import { a as muted, i as log$1, n as accent, o as success, t as renderCliDoc } from "./help-HviKaKAU.js";
-import { a as detectExistingEditor, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-CYveUJBn.js";
+import { a as detectExistingEditor, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-BCuLuHte.js";
 import path from "node:path";
 import { styleText } from "node:util";
 import color from "picocolors";

package/dist/global/migrate.js

@@ -1,10 +1,10 @@
 import { r as __toESM } from "./chunk-BoAXSpZd.js";
-import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, H as outro, I as require_semver, K as Ct, M as displayRelative, R as confirm, T as defaultInteractive, U as select, W as spinner, _ as migratePrettierToOxfmt, a as writeAgentInstructions, c as detectEslintProject, g as migrateNodeVersionManagerFile, h as migrateEslintToOxlint, j as upgradeYarn, k as runViteInstall, l as detectNodeVersionManagerFile, m as mergeViteConfigFiles, n as detectExistingAgentTargetPaths, o as checkViteVersion, p as installGitHooks, r as selectAgentTargetPaths, s as checkVitestVersion, t as detectAgentConflicts, u as detectPrettierProject, v as preflightGitHooksSetup, w as cancelAndExit, x as rewriteStandaloneProject, y as rewriteMonorepo } from "./agent-D-vEue3D.js";
+import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, H as outro, I as require_semver, K as Ct, M as displayRelative, R as confirm, T as defaultInteractive, U as select, W as spinner, _ as migratePrettierToOxfmt, a as writeAgentInstructions, c as detectEslintProject, g as migrateNodeVersionManagerFile, h as migrateEslintToOxlint, j as upgradeYarn, k as runViteInstall, l as detectNodeVersionManagerFile, m as mergeViteConfigFiles, n as detectExistingAgentTargetPaths, o as checkViteVersion, p as installGitHooks, r as selectAgentTargetPaths, s as checkVitestVersion, t as detectAgentConflicts, u as detectPrettierProject, v as preflightGitHooksSetup, w as cancelAndExit, x as rewriteStandaloneProject, y as rewriteMonorepo } from "./agent-Dq7R_VUV.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { _ as isForceOverrideMode, a as readNearestPackageJson, i as hasVitePlusDependency } from "./package-2ArHHFnA.js";
 import { a as muted, i as log$1, n as accent, t as renderCliDoc } from "./help-HviKaKAU.js";
 import { r as createMigrationReport } from "./report-DGaKL5VQ.js";
-import { i as detectEditorConflicts, o as selectEditor, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-CYveUJBn.js";
+import { i as detectEditorConflicts, o as selectEditor, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-BCuLuHte.js";
 import path from "node:path";
 import { styleText } from "node:util";
 import { vitePlusHeader } from "../../binding/index.js";

package/dist/global/{workspace-CYveUJBn.js → workspace-BCuLuHte.js}

@@ -1,4 +1,4 @@
-import { B as log, C as readYamlFile, F as PackageManager, K as Ct, S as editYamlFile, U as select } from "./agent-D-vEue3D.js";
+import { B as log, C as readYamlFile, F as PackageManager, K as Ct, S as editYamlFile, U as select } from "./agent-Dq7R_VUV.js";
 import { g as YAMLSeq, y as Scalar } from "./browser-09BZLUYM.js";
 import { c as readJsonFile, l as writeJsonFile, o as editJsonFile, r as getScopeFromPackageName } from "./package-2ArHHFnA.js";
 import path, { posix, win32 } from "node:path";

package/dist/index.cjs

@@ -1,3 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const vite = require('@voidzero-dev/vite-plus-core');
 const vitest = require('@voidzero-dev/vite-plus-test/config');
 const { defineConfig } = require('./define-config');

package/dist/index.d.ts

@@ -2,9 +2,9 @@ import { type Plugin as VitestPlugin } from '@voidzero-dev/vite-plus-test/config
 import type { OxfmtConfig } from 'oxfmt';
 import type { OxlintConfig } from 'oxlint';
 import { defineConfig } from './define-config.js';
-import type { PackUserConfig } from './pack';
-import type { RunConfig } from './run-config';
-import type { StagedConfig } from './staged-config';
+import type { PackUserConfig } from './pack.js';
+import type { RunConfig } from './run-config.js';
+import type { StagedConfig } from './staged-config.js';
 declare module '@voidzero-dev/vite-plus-core' {
     interface UserConfig {
         /**

package/dist/lint.d.ts

@@ -1 +1 @@
-export { type AllowWarnDeny, type DummyRule, type DummyRuleMap, type ExternalPluginEntry, type ExternalPluginsConfig, type OxlintConfig, type OxlintEnv, type OxlintGlobals, type OxlintOverride, type RuleCategories, defineConfig, } from 'oxlint';
+export type * from 'oxlint';

package/dist/lint.js

@@ -1 +1,3 @@
-export { defineConfig, } from 'oxlint';
+// For now, `defineConfig()` is the only non-type exports from `oxlint`,
+// but in Vite+, users should use `defineConfig()` from 'vite-plus`.
+export {};

package/dist/migration/migrator.js

@@ -50,6 +50,12 @@ const REMOVE_PACKAGES = [
     '@vitest/browser-playwright',
     '@vitest/browser-webdriverio',
 ];
+// When a browser provider package is removed, its runtime peer dependency
+// must be preserved in devDependencies so browser tests continue to work.
+const BROWSER_PROVIDER_PEER_DEPS = {
+    '@vitest/browser-playwright': 'playwright',
+    '@vitest/browser-webdriverio': 'webdriverio',
+};
 function warnMigration(message, report) {
     addMigrationWarning(report, message);
     if (!report) {
@@ -160,7 +166,10 @@ export async function migrateEslintToOxlint(projectPath, interactive, eslintConf
         : getSpinner(interactive);
     // Steps 1-2: Only run @oxlint/migrate if there's an eslint config at root
     if (eslintConfigFile) {
-        const migratePackage = '@oxlint/migrate';
+        // Pin @oxlint/migrate to the bundled oxlint version.
+        // @ts-expect-error — resolved at runtime from dist/global/ → dist/versions.js
+        const { versions } = await import('../versions.js');
+        const migratePackage = `@oxlint/migrate@${versions.oxlint}`;
         // Step 1: Generate .oxlintrc.json from ESLint config
         spinner.start('Migrating ESLint config to Oxlint...');
         const migrateOk = await runOxlintMigrateStep(vpBin, projectPath, migratePackage, ['--merge', '--type-aware', '--with-nursery', '--details'], spinner, 'ESLint migration failed', `You can run \`vp dlx ${migratePackage} --merge --type-aware --with-nursery --details\` manually later`);
@@ -508,6 +517,9 @@ export function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedM
     }
     const packageManager = workspaceInfo.packageManager;
     let extractedStagedConfig = null;
+    let remainingPnpmOverrides;
+    // Determined inside editJsonFile callback to avoid a redundant file read
+    let usePnpmWorkspaceYaml = false;
     editJsonFile(packageJsonPath, (pkg) => {
         if (packageManager === PackageManager.yarn) {
             pkg.resolutions = {
@@ -522,32 +534,78 @@ export function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedM
             };
         }
         else if (packageManager === PackageManager.pnpm) {
-            pkg.pnpm = {
-                ...pkg.pnpm,
-                overrides: {
-                    ...pkg.pnpm?.overrides,
-                    ...VITE_PLUS_OVERRIDE_PACKAGES,
-                    ...(isForceOverrideMode() ? { [VITE_PLUS_NAME]: VITE_PLUS_VERSION } : {}),
-                },
-            };
+            // If package.json already has a "pnpm" field, keep using it;
+            // otherwise use pnpm-workspace.yaml.
+            usePnpmWorkspaceYaml = !pkg.pnpm;
+            if (usePnpmWorkspaceYaml) {
+                rewritePnpmWorkspaceYaml(projectPath);
+                // In force-override mode, also override vite-plus itself so transitive
+                // deps resolve to the local tgz instead of the published version.
+                if (isForceOverrideMode()) {
+                    migratePnpmOverridesToWorkspaceYaml(projectPath, {
+                        [VITE_PLUS_NAME]: VITE_PLUS_VERSION,
+                    });
+                }
+            }
+            const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
+            if (!usePnpmWorkspaceYaml) {
+                // Project already has pnpm config in package.json -- keep using it.
+                pkg.pnpm = {
+                    ...pkg.pnpm,
+                    overrides: {
+                        ...pkg.pnpm?.overrides,
+                        ...VITE_PLUS_OVERRIDE_PACKAGES,
+                        ...(isForceOverrideMode() ? { [VITE_PLUS_NAME]: VITE_PLUS_VERSION } : {}),
+                    },
+                    peerDependencyRules: {
+                        ...pkg.pnpm?.peerDependencyRules,
+                        allowAny: [
+                            ...new Set([...(pkg.pnpm?.peerDependencyRules?.allowAny ?? []), ...overrideKeys]),
+                        ],
+                        allowedVersions: {
+                            ...pkg.pnpm?.peerDependencyRules?.allowedVersions,
+                            ...Object.fromEntries(overrideKeys.map((key) => [key, '*'])),
+                        },
+                    },
+                };
+            }
+            else {
+                remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
+            }
+            // remove dependency selectors targeting vite (e.g. "vite-plugin-svgr>vite")
+            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];
+                    }
+                }
+            }
             // remove packages from `resolutions` field if they exist
             // https://pnpm.io/9.x/package_json#resolutions
-            for (const key of [...Object.keys(VITE_PLUS_OVERRIDE_PACKAGES), ...REMOVE_PACKAGES]) {
+            for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
                 if (pkg.resolutions?.[key]) {
                     delete pkg.resolutions[key];
                 }
             }
         }
-        extractedStagedConfig = rewritePackageJson(pkg, packageManager, false, skipStagedMigration);
+        extractedStagedConfig = rewritePackageJson(pkg, packageManager, usePnpmWorkspaceYaml, skipStagedMigration);
         // ensure vite-plus is in devDependencies
         if (!pkg.devDependencies?.[VITE_PLUS_NAME] || isForceOverrideMode()) {
+            const version = usePnpmWorkspaceYaml && !VITE_PLUS_VERSION.startsWith('file:')
+                ? 'catalog:'
+                : VITE_PLUS_VERSION;
             pkg.devDependencies = {
                 ...pkg.devDependencies,
-                [VITE_PLUS_NAME]: VITE_PLUS_VERSION,
+                [VITE_PLUS_NAME]: version,
             };
         }
         return pkg;
     });
+    // Move remaining non-Vite pnpm.overrides to pnpm-workspace.yaml
+    if (remainingPnpmOverrides) {
+        migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
+    }
     // Merge extracted staged config into vite.config.ts, then remove lint-staged from package.json
     if (extractedStagedConfig) {
         if (mergeStagedConfigToViteConfig(projectPath, extractedStagedConfig, silent, report)) {
@@ -704,6 +762,81 @@ function rewritePnpmWorkspaceYaml(projectPath) {
         }
     });
 }
+/**
+ * Clean up pnpm.overrides and peerDependencyRules from package.json when migrating
+ * to pnpm-workspace.yaml. Returns any remaining non-Vite overrides that need to be
+ * moved to pnpm-workspace.yaml.
+ */
+function cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys) {
+    // Remove Vite-managed keys from pnpm.overrides
+    for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
+        if (pkg.pnpm?.overrides?.[key]) {
+            delete pkg.pnpm.overrides[key];
+        }
+    }
+    // Remove dependency selectors targeting vite
+    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];
+            }
+        }
+    }
+    // Collect remaining overrides to move to pnpm-workspace.yaml then delete all
+    // (pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json)
+    let remaining;
+    if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) {
+        remaining = { ...pkg.pnpm.overrides };
+    }
+    delete pkg.pnpm?.overrides;
+    // Only remove Vite-managed peerDependencyRules entries, preserve custom ones
+    cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
+    if (pkg.pnpm?.peerDependencyRules && Object.keys(pkg.pnpm.peerDependencyRules).length === 0) {
+        delete pkg.pnpm.peerDependencyRules;
+    }
+    if (pkg.pnpm && Object.keys(pkg.pnpm).length === 0) {
+        delete pkg.pnpm;
+    }
+    return remaining;
+}
+/**
+ * Move remaining non-Vite pnpm.overrides from package.json to pnpm-workspace.yaml.
+ * pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json,
+ * so all overrides must live in pnpm-workspace.yaml.
+ */
+function migratePnpmOverridesToWorkspaceYaml(projectPath, overrides) {
+    const pnpmWorkspaceYamlPath = path.join(projectPath, 'pnpm-workspace.yaml');
+    editYamlFile(pnpmWorkspaceYamlPath, (doc) => {
+        for (const [key, value] of Object.entries(overrides)) {
+            // Always overwrite: package.json value was the effective one before migration
+            // (pnpm ignores workspace overrides when pnpm.overrides exists in package.json)
+            doc.setIn(['overrides', scalarString(key)], scalarString(value));
+        }
+    });
+}
+/**
+ * Remove only Vite-managed entries from peerDependencyRules, preserving custom ones.
+ */
+function cleanupPeerDependencyRules(peerDependencyRules, overrideKeys) {
+    if (!peerDependencyRules) {
+        return;
+    }
+    if (Array.isArray(peerDependencyRules.allowAny)) {
+        peerDependencyRules.allowAny = peerDependencyRules.allowAny.filter((key) => !overrideKeys.includes(key));
+        if (peerDependencyRules.allowAny.length === 0) {
+            delete peerDependencyRules.allowAny;
+        }
+    }
+    if (peerDependencyRules.allowedVersions) {
+        for (const key of overrideKeys) {
+            delete peerDependencyRules.allowedVersions[key];
+        }
+        if (Object.keys(peerDependencyRules.allowedVersions).length === 0) {
+            delete peerDependencyRules.allowedVersions;
+        }
+    }
+}
 /**
  * Rewrite .yarnrc.yml to add vite-plus dependencies
  * @param projectPath - The path to the project
@@ -787,6 +920,7 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
     if (!fs.existsSync(packageJsonPath)) {
         return;
     }
+    let remainingPnpmOverrides;
     editJsonFile(packageJsonPath, (pkg) => {
         if (packageManager === PackageManager.yarn) {
             pkg.resolutions = {
@@ -806,6 +940,7 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
             // bun overrides are handled in rewriteBunCatalog() with catalog: references
         }
         else if (packageManager === PackageManager.pnpm) {
+            const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
             if (isForceOverrideMode()) {
                 // In force-override mode, keep overrides in package.json pnpm.overrides
                 // because pnpm ignores pnpm-workspace.yaml overrides when pnpm.overrides
@@ -820,20 +955,14 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
                 };
             }
             else {
-                // pnpm use overrides field at pnpm-workspace.yaml
-                // so we don't need to set overrides field at package.json
-                // remove packages from `resolutions` field and `pnpm.overrides` field if they exist
-                // https://pnpm.io/9.x/package_json#resolutions
-                for (const key of [...Object.keys(VITE_PLUS_OVERRIDE_PACKAGES), ...REMOVE_PACKAGES]) {
-                    if (pkg.pnpm?.overrides?.[key]) {
-                        delete pkg.pnpm.overrides[key];
-                    }
+                for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
                     if (pkg.resolutions?.[key]) {
                         delete pkg.resolutions[key];
                     }
                 }
+                remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
             }
-            // remove dependency selector from vite, e.g. "vite-plugin-svgr>vite": "npm:vite@7.0.12"
+            // remove dependency selectors targeting vite (e.g. "vite-plugin-svgr>vite")
             for (const key in pkg.pnpm?.overrides) {
                 if (key.includes('>')) {
                     const splits = key.split('>');
@@ -854,6 +983,10 @@ function rewriteRootWorkspacePackageJson(projectPath, packageManager, skipStaged
         }
         return pkg;
     });
+    // Move remaining non-Vite pnpm.overrides to pnpm-workspace.yaml
+    if (remainingPnpmOverrides) {
+        migratePnpmOverridesToWorkspaceYaml(projectPath, remainingPnpmOverrides);
+    }
     // rewrite package.json
     rewriteMonorepoProject(projectPath, packageManager, skipStagedMigration);
 }
@@ -913,14 +1046,25 @@ export function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMi
     }
     // remove packages that are replaced with vite-plus
     for (const name of REMOVE_PACKAGES) {
-        if (pkg.devDependencies?.[name]) {
+        const wasInDevDeps = !!pkg.devDependencies?.[name];
+        const wasInDeps = !!pkg.dependencies?.[name];
+        if (wasInDevDeps) {
             delete pkg.devDependencies[name];
             needVitePlus = true;
         }
-        if (pkg.dependencies?.[name]) {
+        if (wasInDeps) {
             delete pkg.dependencies[name];
             needVitePlus = true;
         }
+        // e.g., removing @vitest/browser-playwright should keep `playwright` in devDeps
+        const peerDep = BROWSER_PROVIDER_PEER_DEPS[name];
+        if ((wasInDevDeps || wasInDeps) &&
+            peerDep &&
+            !pkg.devDependencies?.[peerDep] &&
+            !pkg.dependencies?.[peerDep]) {
+            pkg.devDependencies ??= {};
+            pkg.devDependencies[peerDep] = '*';
+        }
     }
     if (needVitePlus) {
         // add vite-plus to devDependencies

package/dist/run-config.d.ts

@@ -14,7 +14,7 @@ export type GlobWithBase = {
      */
     base: InputBase;
 };
-export type InputBase = 'package' | 'workspace';
+export type InputBase = "package" | "workspace";
 export type Task = {
     /**
      * The command to run for the task.

package/dist/run-config.js

@@ -1 +1,2 @@
 // This file is auto-generated by `cargo test`. Do not edit manually.
+export {};

package/dist/staged-config.js

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

package/dist/utils/types.js

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

package/dist/versions.js

@@ -3,7 +3,7 @@ export const versions = {
   "rolldown": "1.0.0-rc.12",
   "tsdown": "0.21.7",
   "vitest": "4.1.2",
-  "oxlint": "1.57.0",
-  "oxfmt": "0.42.0",
+  "oxlint": "1.58.0",
+  "oxfmt": "0.43.0",
   "oxlint-tsgolint": "0.18.1"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plus",
-  "version": "0.1.15-alpha.6",
+  "version": "0.1.15",
   "description": "The Unified Toolchain for the Web",
   "homepage": "https://viteplus.dev/guide",
   "bugs": {
@@ -66,6 +66,10 @@
       "import": "./binding/index.cjs",
       "require": "./binding/index.cjs"
     },
+    "./fmt": {
+      "types": "./dist/fmt.d.ts",
+      "import": "./dist/fmt.js"
+    },
     "./lint": {
       "types": "./dist/lint.d.ts",
       "import": "./dist/lint.js"
@@ -318,12 +322,12 @@
     "cac": "^7.0.0",
     "cross-spawn": "^7.0.5",
     "jsonc-parser": "^3.3.1",
-    "oxfmt": "=0.42.0",
-    "oxlint": "=1.57.0",
+    "oxfmt": "=0.43.0",
+    "oxlint": "=1.58.0",
     "oxlint-tsgolint": "=0.18.1",
     "picocolors": "^1.1.1",
-    "@voidzero-dev/vite-plus-core": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-test": "0.1.15-alpha.6"
+    "@voidzero-dev/vite-plus-core": "0.1.15",
+    "@voidzero-dev/vite-plus-test": "0.1.15"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3.4.1",
@@ -345,8 +349,8 @@
     "validate-npm-package-name": "^7.0.2",
     "yaml": "^2.8.1",
     "@voidzero-dev/vite-plus-prompts": "0.0.0",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.15-alpha.6",
-    "rolldown": "1.0.0-rc.12"
+    "rolldown": "1.0.0-rc.12",
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.15"
   },
   "napi": {
     "binaryName": "vite-plus",
@@ -366,14 +370,14 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "optionalDependencies": {
-    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-darwin-x64": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.15-alpha.6",
-    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.15-alpha.6"
+    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.15",
+    "@voidzero-dev/vite-plus-darwin-x64": "0.1.15",
+    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.15",
+    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.15",
+    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.15",
+    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.15",
+    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.15",
+    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.15"
   },
   "scripts": {
     "build": "oxnode -C dev ./build.ts",

package/skills/vite-plus/docs/config/run.md

@@ -171,7 +171,7 @@ A set of common environment variables are automatically passed through to all ta
 
 ### `input`
 
-- **Type:** `Array<string | { auto: boolean }>`
+- **Type:** `Array<string | { auto: boolean } | { pattern: string, base: "workspace" | "package" }>`
 - **Default:** `[{ auto: true }]` (auto-inferred)
 
 Vite Task automatically detects which files are used by a command (see [Automatic File Tracking](/guide/cache#automatic-file-tracking)). The `input` option can be used to explicitly include or exclude certain files.
@@ -199,6 +199,24 @@ tasks: {
 }
 ```
 
+**Resolve patterns relative to the workspace root** using the object form:
+
+```ts
+tasks: {
+  build: {
+    command: 'vp build',
+    input: [
+      { auto: true },
+      { pattern: 'shared-config/**', base: 'workspace' },
+    ],
+  },
+}
+```
+
+The `base` field is required and controls how the glob pattern is resolved:
+- `"package"`: relative to the package directory
+- `"workspace"`: relative to the workspace root
+
 **Disable file tracking** entirely and cache only on command/env changes:
 
 ```ts
@@ -211,7 +229,7 @@ tasks: {
 ```
 
 ::: tip
-Glob patterns are resolved relative to the package directory, not the task's `cwd`.
+String glob patterns are resolved relative to the package directory by default. Use the object form with `base: "workspace"` to resolve relative to the workspace root.
 :::
 
 ### `cwd`

package/skills/vite-plus/docs/guide/run.md

@@ -287,6 +287,34 @@ Use `--last-details` to show the summary from the last run without running tasks
 vp run --last-details
 ```
 
+## Concurrency
+
+By default, up to 4 tasks run at the same time. Use `--concurrency-limit` to change this:
+
+```bash
+# Run up to 8 tasks at once
+vp run -r --concurrency-limit 8 build
+
+# Run tasks one at a time
+vp run -r --concurrency-limit 1 build
+```
+
+The limit can also be set via the `VP_RUN_CONCURRENCY_LIMIT` environment variable. The `--concurrency-limit` flag takes priority over the environment variable.
+
+### Parallel Mode
+
+Use `--parallel` to ignore task dependencies and run all tasks at once with unlimited concurrency:
+
+```bash
+vp run -r --parallel dev
+```
+
+This is useful when tasks are independent and you want maximum throughput. You can combine `--parallel` with `--concurrency-limit` to run tasks without dependency ordering but still cap the number of concurrent tasks:
+
+```bash
+vp run -r --parallel --concurrency-limit 4 dev
+```
+
 ## Additional Arguments
 
 Arguments after the task name are passed through to the task command:

package/templates/generator/bin/index.ts

@@ -2,6 +2,6 @@
 
 import { runTemplateCLI } from 'bingo';
 
-import template from '../src/template.ts';
+import template from '../src/template.js';
 
 process.exitCode = await runTemplateCLI(template);

package/templates/monorepo/vite.config.ts

@@ -1,3 +1,7 @@
-import { defineConfig } from 'vite';
+import { defineConfig } from 'vite-plus';
 
-export default defineConfig({});
+export default defineConfig({
+  run: {
+    cache: true,
+  },
+});