refactor: replace @voidzero-dev/vite-plus-test with upstream vitest@4.1.5

Delete the bundled `@voidzero-dev/vite-plus-test` wrapper and consume
upstream `vitest@4.1.5` (plus `@vitest/browser*`) directly. The vite
redirection that the wrapper used to provide is now handled cleanly
by package-manager overrides (`vite` -> `@voidzero-dev/vite-plus-core`),
so the bundle was dead weight that lagged upstream vitest releases.

Public API contract preserved:
- `vite-plus/test*` IS the public test API. Existing vite-plus user
  code (e.g. `import { vi } from 'vite-plus/test'`) is NEVER rewritten —
  the imports stay exactly as authored.
- New vite-plus users do NOT install `vitest` or `@vitest/*` directly.
  They install `vite-plus`; vitest and the browser providers come in
  transitively as direct deps of the CLI package.
- `vp migrate` on an upstream-vitest project still rewrites bare
  `vitest`, `vitest/*`, `@vitest/browser*`, declare-module specifiers
  and `/// <reference types>` directives to the `vite-plus/test*`
  surface (one-time forward migration).

Implementation:
- packages/cli/build.ts `syncTestPackageExports` auto-generates
  `./test/*` shims from `vitest`'s own exports map, plus
  `./test/<provider>` and `./test/browser/providers/<short>` shims
  projected from each `@vitest/browser-*` package's exports.
- packages/cli/package.json adds `@vitest/browser`,
  `@vitest/browser-playwright`, `@vitest/browser-preview`,
  `@vitest/browser-webdriverio` as direct catalog deps pinned to
  4.1.5 alongside `vitest`.
- crates/vite_global_cli/src/commands/version.rs version ToolSpec
  points at the `vitest` package directly.
- packages/cli/src/resolve-test.ts resolves `vitest/package.json`
  and reads `bin.vitest` so `vp test` invokes upstream vitest.
- packages/cli/src/utils/constants.ts drops `vitest` from
  `VITE_PLUS_OVERRIDE_PACKAGES`; only `vite` remains a managed key.
- packages/cli/src/migration/migrator.ts adds an `isVitestAdjacent`
  flag that flips `needVitePlus = true` for projects with packages
  like `vitest-browser-svelte` even when no vite/oxlint/tsdown dep
  is being migrated; adds a `pruneLegacyWrapperAliases` /
  `pruneYamlMapLegacyWrapperAliases` sweep that rewrites stale
  `vitest: npm:@voidzero-dev/vite-plus-test@*` aliases to `^4.1.5`
  in package.json overrides/resolutions/pnpm.overrides, in
  pnpm-workspace.yaml catalog/catalogs/overrides, and in bun
  workspaces.catalog / workspaces.catalogs.
- packages/cli/src/migration/bin.ts adds a `handleInstallResult`
  helper so failed reinstalls warn the user, append to
  `report.warnings`, and flip `process.exitCode` instead of being
  silently reported as success.

Verification:
- cargo test -p vite_migration --lib: 167 tests pass
- pnpm exec vitest run (packages/cli): 355 tests pass
- pnpm bootstrap-cli + snap-test-global + snap-test-local: all
  fixtures regenerated; expected diffs only (forward import
  rewrites, `@vitest/browser*` removed from user devDeps,
  `playwright`/`webdriverio` preserved as peers, stale
  `vite-plus-test` catalog aliases normalized to `^4.1.5`).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: Brooooooklyn

.github/scripts/upgrade-deps.ts

@@ -155,8 +155,13 @@ async function updatePnpmWorkspace(versions: PnpmWorkspaceVersions): Promise<voi
   const entries: PnpmWorkspaceEntry[] = [
     {
       name: 'vitest',
-      pattern: /vitest-dev: npm:vitest@\^([\d.]+(?:-[\w.]+)?)/,
-      replacement: `vitest-dev: npm:vitest@^${versions.vitest}`,
+      // The `@voidzero-dev/vite-plus-test` wrapper (which used to be aliased
+      // here via `vitest-dev: npm:vitest@^…`) has been removed. Vitest is now
+      // a plain catalog entry pinned to an exact version (`vitest: x.y.z`),
+      // so match that shape directly. The leading newline anchor disambiguates
+      // from neighbouring keys like `vitepress-*` and `@vitest/browser`.
+      pattern: /\n {2}vitest: ([\d.]+(?:-[\w.]+)?)\n/,
+      replacement: `\n  vitest: ${versions.vitest}\n`,
       newVersion: versions.vitest,
     },
     {
@@ -246,36 +251,6 @@ async function updatePnpmWorkspace(versions: PnpmWorkspaceVersions): Promise<voi
   console.log('Updated pnpm-workspace.yaml');
 }
 
-// ============ Update packages/test/package.json ============
-async function updateTestPackage(vitestVersion: string): Promise<void> {
-  const filePath = path.join(ROOT, 'packages/test/package.json');
-  const pkg: PackageJson = readJsonFile(filePath);
-  const devDependencies = pkg.devDependencies;
-  if (!devDependencies) {
-    throw new Error('packages/test/package.json is missing devDependencies');
-  }
-
-  // Update all @vitest/* devDependencies
-  for (const dep of Object.keys(devDependencies)) {
-    if (dep.startsWith('@vitest/')) {
-      devDependencies[dep] = vitestVersion;
-    }
-  }
-
-  // Update vitest-dev devDependency
-  if (devDependencies['vitest-dev']) {
-    devDependencies['vitest-dev'] = `^${vitestVersion}`;
-  }
-
-  // Update @vitest/ui peerDependency if present
-  if (pkg.peerDependencies?.['@vitest/ui']) {
-    pkg.peerDependencies['@vitest/ui'] = vitestVersion;
-  }
-
-  fs.writeFileSync(filePath, JSON.stringify(pkg, null, 2) + '\n');
-  console.log('Updated packages/test/package.json');
-}
-
 // ============ Update packages/core/package.json ============
 async function updateCorePackage(devtoolsVersion: string): Promise<void> {
   const filePath = path.join(ROOT, 'packages/core/package.json');
@@ -430,7 +405,6 @@ await updatePnpmWorkspace({
   oxcParser: oxcParserVersion,
   oxcTransform: oxcTransformVersion,
 });
-await updateTestPackage(vitestVersion);
 await updateCorePackage(devtoolsVersion);
 
 writeMetaFiles();

.github/workflows/e2e-test.yml

@@ -109,7 +109,6 @@ jobs:
         run: |
           mkdir -p tmp/tgz
           cd packages/core && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
-          cd packages/test && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           cd packages/cli && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           # Copy vp binary for e2e-test job (findVpBinary expects it in target/)
           cp target/${{ matrix.target }}/release/vp tmp/tgz/vp 2>/dev/null || cp target/${{ matrix.target }}/release/vp.exe tmp/tgz/vp.exe 2>/dev/null || true

.github/workflows/prepare_release.yml

@@ -54,7 +54,6 @@ jobs:
           }
           update_json packages/cli/package.json
           update_json packages/core/package.json
-          update_json packages/test/package.json
           update_toml packages/cli/binding/Cargo.toml
           update_toml crates/vite_global_cli/Cargo.toml
 

.github/workflows/publish-to-pkg.pr.new.yml

@@ -136,5 +136,4 @@ jobs:
             './packages/cli/cli-npm/*' \
             './packages/cli' \
             './packages/core' \
-            './packages/prompts' \
-            './packages/test'
+            './packages/prompts'

.github/workflows/release.yml

@@ -157,7 +157,6 @@ jobs:
       - name: Publish
         run: |
           pnpm publish --filter=./packages/core --tag latest --access public --no-git-checks
-          pnpm publish --filter=./packages/test --tag latest --access public --no-git-checks
           pnpm publish --filter=./packages/cli --tag latest --access public --no-git-checks
 
       - name: Create release body
@@ -173,7 +172,6 @@ jobs:
           ### Published Packages
 
           - \`@voidzero-dev/vite-plus-core@${VERSION}\`
-          - \`@voidzero-dev/vite-plus-test@${VERSION}\`
           - \`vite-plus@${VERSION}\`
 
           ### Installation
@@ -222,7 +220,6 @@ jobs:
 
             **Published Packages:**
             • @voidzero-dev/vite-plus-core@${{ env.VERSION }}
-            • @voidzero-dev/vite-plus-test@${{ env.VERSION }}
             • vite-plus@${{ env.VERSION }}
 
             **Install:**

.github/workflows/test-vp-create.yml

@@ -94,7 +94,6 @@ jobs:
         run: |
           mkdir -p tmp/tgz
           cd packages/core && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
-          cd packages/test && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           cd packages/cli && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           # Copy vp binary for test jobs
           cp target/x86_64-unknown-linux-gnu/release/vp tmp/tgz/vp
@@ -152,7 +151,7 @@ jobs:
           - yarn
           - bun
     env:
-      VP_OVERRIDE_PACKAGES: '{"vite":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-core-0.0.0.tgz","vitest":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-test-0.0.0.tgz","@voidzero-dev/vite-plus-core":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-core-0.0.0.tgz","@voidzero-dev/vite-plus-test":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-test-0.0.0.tgz"}'
+      VP_OVERRIDE_PACKAGES: '{"vite":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-core-0.0.0.tgz","@voidzero-dev/vite-plus-core":"file:${{ github.workspace }}/tmp/tgz/voidzero-dev-vite-plus-core-0.0.0.tgz"}'
       VP_VERSION: 'file:${{ github.workspace }}/tmp/tgz/vite-plus-0.0.0.tgz'
       # Force full dependency rewriting so the library template's existing
       # vite-plus dep gets overridden with the local tgz

README.md

@@ -189,12 +189,11 @@ If you are manually migrating a project to Vite+, install these dev dependencies
 npm install -D vite-plus @voidzero-dev/vite-plus-core@latest
 ```
 
-You need to add overrides to your package manager for `vite` and `vitest` so that other packages depending on Vite and Vitest will use the Vite+ versions:
+You need to add overrides to your package manager for `vite` so that other packages depending on Vite (including Vitest) will use the Vite+ version:
 
 ```json
 "overrides": {
-  "vite": "npm:@voidzero-dev/vite-plus-core@latest",
-  "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
+  "vite": "npm:@voidzero-dev/vite-plus-core@latest"
 }
 ```
 
@@ -203,15 +202,13 @@ If you are using `pnpm`, add this to your `pnpm-workspace.yaml`:
 ```yaml
 overrides:
   vite: npm:@voidzero-dev/vite-plus-core@latest
-  vitest: npm:@voidzero-dev/vite-plus-test@latest
 ```
 
 Or, if you are using Yarn:
 
 ```json
 "resolutions": {
-  "vite": "npm:@voidzero-dev/vite-plus-core@latest",
-  "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
+  "vite": "npm:@voidzero-dev/vite-plus-core@latest"
 }
 ```
 

crates/vite_global_cli/src/commands/version.rs

@@ -47,11 +47,7 @@ const TOOL_SPECS: [ToolSpec; 7] = [
         package_name: "@voidzero-dev/vite-plus-core",
         bundled_version_key: Some("rolldown"),
     },
-    ToolSpec {
-        display_name: "vitest",
-        package_name: "@voidzero-dev/vite-plus-test",
-        bundled_version_key: Some("vitest"),
-    },
+    ToolSpec { display_name: "vitest", package_name: "vitest", bundled_version_key: None },
     ToolSpec { display_name: "oxfmt", package_name: "oxfmt", bundled_version_key: None },
     ToolSpec { display_name: "oxlint", package_name: "oxlint", bundled_version_key: None },
     ToolSpec {

crates/vite_migration/src/file_walker.rs

@@ -3,9 +3,12 @@ use std::path::{Path, PathBuf};
 use ignore::WalkBuilder;
 use vite_error::Error;
 
-// TODO: only support esm files for now
-/// File extensions to process for import rewriting
-const TS_JS_EXTENSIONS: &[&str] = &["ts", "tsx", "mts", "js", "jsx", "mjs"];
+/// File extensions to process for import rewriting.
+///
+/// Includes CommonJS (`.cjs`/`.cts`) variants in addition to ESM, because
+/// the legacy reverse-migration rules also cover `require('vite-plus/test/browser-*')`
+/// calls that are most commonly found in `.cjs` / `vitest.config.cjs` files.
+const TS_JS_EXTENSIONS: &[&str] = &["ts", "tsx", "mts", "cts", "js", "jsx", "mjs", "cjs"];
 
 /// Result of walking TypeScript/JavaScript files
 #[derive(Debug)]
@@ -164,7 +167,7 @@ mod tests {
 
         let result = find_ts_files(temp.path()).unwrap();
 
-        assert_eq!(result.files.len(), 6);
+        assert_eq!(result.files.len(), 8);
     }
 
     #[test]

docs/guide/migrate.md

@@ -75,8 +75,8 @@ Migrate this project to Vite+. Vite+ replaces the current split tooling around r
 After the migration:
 
 - Confirm `vite` imports were rewritten to `vite-plus` where needed
-- Confirm `vitest` imports were rewritten to `vite-plus/test` where needed
-- Remove old `vite` and `vitest` dependencies only after those rewrites are confirmed
+- Confirm `vitest/config` imports were rewritten to `vite-plus` (other `vitest` and `@vitest/browser*` imports are intentionally left as-is)
+- Remove the old `vite` dependency only after those rewrites are confirmed; keep `vitest` and any `@vitest/browser*` providers
 - Move remaining tool-specific config into the appropriate blocks in `vite.config.ts`
 
 Command mapping to keep in mind:
@@ -96,20 +96,28 @@ Summarize the migration at the end and report any manual follow-up still require
 
 ### Vitest
 
-Vitest is automatically migrated through `vp migrate`. If you are migrating manually, you have to update all the imports to `vite-plus/test` instead:
+`vp migrate` is the recommended path. It only rewrites `vitest/config` imports to `vite-plus`; all other Vitest imports are left untouched and resolve through the upstream `vitest` package as usual (`vite` is aliased to `@voidzero-dev/vite-plus-core` via overrides, so Vitest picks up the Vite+ core transparently).
+
+If you are migrating manually, update only the config entry point:
 
 ```ts
 // before
-import { describe, expect, it, vi } from 'vitest';
-
-const { page } = await import('@vitest/browser/context');
+import { defineConfig } from 'vitest/config';
 
 // after
-import { describe, expect, it, vi } from 'vite-plus/test';
+import { defineConfig } from 'vite-plus';
+```
 
-const { page } = await import('vite-plus/test/browser/context');
+Runtime imports stay as-is:
+
+```ts
+import { describe, expect, it, vi } from 'vitest';
+
+const { page } = await import('@vitest/browser/context');
 ```
 
+Do not rewrite bare `vitest`, `vitest/*` subpaths, or `@vitest/browser*` — Vitest's mock hoister requires the literal string `'vitest'`, and the browser/provider subpaths are not re-exported by `vite-plus`.
+
 ### tsdown
 
 If your project uses a `tsdown.config.ts`, move its options into the `pack` block in `vite.config.ts`: