vp migrate last!

.github/actions/setup/action.yml

@@ -39,7 +39,7 @@
         echo "version=$version" >> "$GITHUB_OUTPUT"
 
     - name: Setup Vite+
-      uses: voidzero-dev/setup-vp@2dec1e33f4ab2c6d5bce1b0c4607961bb1a3f7a1 # v1
+      uses: voidzero-dev/setup-vp@13e7afb99c66525824db54e107d667216e795d37 # v1
       with:
         node-version: ${{ inputs.node-version }}
         cache: ${{ inputs.cache }}

.github/workflows/perf.yml

@@ -198,7 +198,7 @@
           done
 
       - name: Setup Vite+
-        uses: voidzero-dev/setup-vp@2dec1e33f4ab2c6d5bce1b0c4607961bb1a3f7a1 # v1
+        uses: voidzero-dev/setup-vp@13e7afb99c66525824db54e107d667216e795d37 # v1
         with:
           node-version: "24"
           cache: true

.npmrc

@@ -0,0 +1,2 @@
+# vite-plus preview build registry bridge (auto-added by vp)
+registry=https://registry-bridge.viteplus.dev/

apps/web/vite.config.ts

@@ -1,5 +1,5 @@
 import vinext from "vinext";
-import { defineConfig } from "vite";
+import { defineConfig } from "vite-plus";
 import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
 import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
 import { imagesOptimizer } from "@vinext/cloudflare/images/images-optimizer";

packages/cloudflare/package.json

@@ -50,6 +50,7 @@
   "devDependencies": {
     "@types/node": "catalog:",
     "vinext": "workspace:*",
+    "vite": "catalog:",
     "vite-plus": "catalog:"
   },
   "peerDependencies": {

pnpm-workspace.yaml

@@ -87,9 +87,9 @@ catalog:
   typescript: ^5.7.0
   use-count-up: 3.0.1
   validator: ^13.15.26
-  vite: npm:@voidzero-dev/vite-plus-core@0.2.1
+  vite: npm:@voidzero-dev/vite-plus-core@0.0.0-commit.3ee9ab747ff7ab00c71b1b5ab9b3a4794f4aa9ef
   vite-plugin-commonjs: ^0.10.4
-  vite-plus: 0.2.1
+  vite-plus: 0.0.0-commit.3ee9ab747ff7ab00c71b1b5ab9b3a4794f4aa9ef
   vite-tsconfig-paths: ^6.1.1
   vitest: 4.1.9
   web-vitals: ^4.2.4
@@ -105,8 +105,10 @@ overrides:
 peerDependencyRules:
   allowAny:
     - vite
+    - vitest
   allowedVersions:
     vite: "*"
+    vitest: "*"
   ignoreMissing:
     - next
     - webpack
@@ -137,3 +139,14 @@ allowBuilds:
   # @sentry/nextjs pulls in @sentry/cli for source-map upload tooling. The
   # tests only exercise the runtime SDK, so the CLI postinstall is unnecessary.
   "@sentry/cli": false
+minimumReleaseAgeExclude:
+  - vite-plus
+  - "@voidzero-dev/*"
+  - oxlint
+  - "@oxlint/*"
+  - oxlint-tsgolint
+  - "@oxlint-tsgolint/*"
+  - oxfmt
+  - "@oxfmt/*"
+  - vitest
+  - "@vitest/*"

scripts/performance-trace.test.ts

@@ -5,7 +5,7 @@ import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { promisify } from "node:util";
 import { gzip } from "node:zlib";
-import { afterEach, describe, expect, test } from "vitest";
+import { afterEach, describe, expect, test } from "vite-plus/test";
 import {
   profileToFlameGraph,
   readGzipProfile,

tests/_msw/setup.ts

@@ -1,4 +1,4 @@
-import { afterAll, afterEach, beforeAll } from "vitest";
+import { afterAll, afterEach, beforeAll } from "vite-plus/test";
 import { server } from "./server.js";
 
 /**

tests/app-browser-stream.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 import {
   chunksToReadableStream,
   createProgressiveRscStream,

tests/app-client-reference-preloader.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { createClientReferencePreloader } from "../packages/vinext/src/server/app-client-reference-preloader.js";
 
 function createDeferred(): { promise: Promise<void>; resolve: () => void } {

tests/app-prerender-static-params.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vite-plus/test";
 import { createAppPrerenderStaticParamsResolver } from "../packages/vinext/src/server/app-prerender-static-params.js";
 
 describe("createAppPrerenderStaticParamsResolver", () => {

tests/app-route-module-loader.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vite-plus/test";
 import {
   ensureAppRouteModulesLoaded,
   loadAppInterceptLayouts,

tests/app-router-client-preloading.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 
 describe("Client reference preloading (Issue #256)", () => {
   it("preloading correctly warms the memoize cache", async () => {

tests/app-router-deployment-id.test.ts

@@ -2,7 +2,7 @@ import fsp from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import type { ViteDevServer } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, startFixtureServer } from "./helpers.js";
 
 describe("App Router deployment ID", () => {

tests/app-router-dev-server.test.ts

@@ -1,7 +1,7 @@
 import http from "node:http";
 import fsp from "node:fs/promises";
 import { type ViteDevServer } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, fetchHtml, startFixtureServer } from "./helpers.js";
 
 function decodeHtmlText(text: string): string {

tests/app-router-external-rewrite.test.ts

@@ -1,6 +1,6 @@
 import zlib from "node:zlib";
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, startFixtureServer } from "./helpers.js";
 
 describe("App Router external rewrite proxy credential forwarding", () => {

tests/app-router-font-google-prod.test.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createBuilder } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 
 describe("App Router Production server self-hosted next/font/google headers", () => {

tests/app-router-global-not-found-css-order.test.ts

@@ -39,7 +39,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { createBuilder, preview } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 
 const FIXTURE_DIR = path.resolve(import.meta.dirname, "./fixtures/global-not-found-css-order");

tests/app-router-isr-codegen.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { generateRscEntry } from "../packages/vinext/src/entries/app-rsc-entry.js";
 import type { AppRoute } from "../packages/vinext/src/routing/app-router.js";
 

tests/app-router-malformed-url.test.ts

@@ -1,5 +1,5 @@
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, startFixtureServer } from "./helpers.js";
 
 describe("App Router dev server malformed URL handling", () => {

tests/app-router-metadata-routes.test.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, startFixtureServer } from "./helpers.js";
 
 describe("metadata routes integration (App Router)", () => {

tests/app-router-middleware-next-request.test.ts

@@ -1,5 +1,5 @@
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, fetchHtml, startFixtureServer } from "./helpers.js";
 
 describe("App Router middleware with NextRequest", () => {

tests/app-router-next-config-codegen.test.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { createServer } from "vite";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { generateRscEntry } from "../packages/vinext/src/entries/app-rsc-entry.js";
 import { generateSsrEntry } from "../packages/vinext/src/entries/app-ssr-entry.js";
 import vinext from "../packages/vinext/src/index.js";

tests/app-router-next-config-dev.test.ts

@@ -1,5 +1,5 @@
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, fetchHtml, startFixtureServer } from "./helpers.js";
 
 describe("App Router next.config.js features (dev server integration)", () => {

tests/app-router-origin-check.test.ts

@@ -1,5 +1,5 @@
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, startFixtureServer } from "./helpers.js";
 
 describe("App Router dev server origin check", () => {

tests/app-router-production-build.test.ts

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { createBuilder } from "vite";
-import { afterAll, describe, expect, it, vi } from "vitest";
+import { afterAll, describe, expect, it, vi } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 import { APP_FIXTURE_DIR } from "./helpers.js";
 

tests/app-router-production-server.test.ts

@@ -3,7 +3,7 @@ import http from "node:http";
 import os from "node:os";
 import path from "node:path";
 import { createBuilder } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 import {
   getPagesClientAssets,

tests/app-router-proxy-conventions.test.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { afterEach, describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it } from "vite-plus/test";
 import type { ViteDevServer } from "vite";
 import { createIsolatedFixture, startFixtureServer } from "./helpers.js";
 

tests/app-router-rsc-flight-hint.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { generateRscEntry } from "../packages/vinext/src/entries/app-rsc-entry.js";
 import type { AppRoute } from "../packages/vinext/src/routing/app-router.js";
 

tests/app-router-rsc-plugin.test.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { type ViteDevServer } from "vite";
-import { beforeAll, afterAll, describe, expect, it } from "vitest";
+import { beforeAll, afterAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 import { APP_FIXTURE_DIR, fetchHtml, RSC_ENTRIES } from "./helpers.js";
 

tests/app-router-static-export.test.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import { APP_FIXTURE_DIR, buildAppFixture } from "./helpers.js";
 
 describe("App Router Static export", () => {

tests/app-router-worker-entry.test.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vite-plus/test";
 
 describe("App Router Production server worker entry compatibility", () => {
   it("accepts Worker-style default exports from dist/server/index.js", async () => {

tests/app-rsc-stream-hints.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { normalizeReactFlightPreloadHints } from "../packages/vinext/src/server/rsc-stream-hints.js";
 
 function streamFromChunks(chunks: string[]): ReadableStream<Uint8Array> {

tests/app-segment-config.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   isEdgeRuntime,
   resolveAppPageFetchCacheMode,

tests/app-static-generation.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   createStaticGenerationHeadersContext,
   getAppPageStaticGenerationErrorMessage,

tests/app-trailing-slash-isr.test.ts

@@ -4,7 +4,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createBuilder, preview } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 
 const FIXTURE_DIR = path.resolve(import.meta.dirname, "./fixtures/app-trailing-slash-isr");

tests/benchmark-chart-points.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { visibleMarkerMask } from "../apps/web/app/benchmarks/components/chart-points";
 
 describe("benchmark chart point markers", () => {

tests/benchmark-url-state.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   benchmarkSelectionUrl,
   resolveSelectedBenchmark,

tests/e2e/app-front-redirect-issue/fixture/vite.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from "vite";
+import { defineConfig } from "vite-plus";
 import vinext from "../../../../packages/vinext/src/index.js";
 
 export default defineConfig({

tests/e2e/cloudflare-workers/fixture/vite.config.mjs

@@ -1,5 +1,5 @@
 import { cloudflare } from "@cloudflare/vite-plugin";
-import { defineConfig } from "vite";
+import { defineConfig } from "vite-plus";
 import vinext from "vinext";
 
 export default defineConfig({

tests/favicon-short-circuit.test.ts

@@ -11,7 +11,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { createBuilder, createServer } from "vite";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import vinext from "../packages/vinext/src/index.js";
 import { APP_FIXTURE_DIR } from "./helpers.js";
 

tests/fixtures/app-prefetch-inlining/vite.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from "vite";
+import { defineConfig } from "vite-plus";
 import vinext from "vinext";
 
 export default defineConfig({

tests/fixtures/global-not-found-not-present/vite.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from "vite";
+import { defineConfig } from "vite-plus";
 import vinext from "vinext";
 
 export default defineConfig({

tests/http-error-responses.test.ts

@@ -10,7 +10,7 @@
  *   - packages/next/src/pages/_error.tsx L7  (`404: 'This page could not be found'`)
  */
 
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   notFoundResponse,
   badRequestResponse,

tests/http2-pseudo-headers.test.ts

@@ -1,5 +1,5 @@
 import type { IncomingMessage } from "node:http";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { nodeToWebRequest } from "../packages/vinext/src/server/prod-server.js";
 
 /**

tests/hybrid-client-route-owner.test.ts

@@ -17,7 +17,7 @@
  * end with `+`, and optional catch-alls end with `*`. See
  * `routing/route-trie.ts`.
  */
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it } from "vite-plus/test";
 import type {
   VinextLinkPrefetchRoute,
   VinextPagesLinkPrefetchRoute,

tests/hybrid-route-priority.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import { compareHybridRoutePatterns } from "../packages/vinext/src/routing/utils.js";
 import {
   pagesRouteHasPriorityOverAppRoute,

tests/import-meta-url.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vite-plus/test";
 import fsp from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";

tests/middleware-export-validation.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   hasValidMiddlewareModuleExport,
   validateMiddlewareModuleExports,

tests/pages-default-404.test.ts

@@ -8,7 +8,7 @@
  * deploy-suite parity against `test/e2e/getserversideprops/test/index.test.ts`
  * and `test/e2e/basepath/error-pages.test.ts`.
  */
-import { describe, expect, it } from "vitest";
+import { describe, expect, it } from "vite-plus/test";
 import {
   buildDefaultPagesNotFoundResponse,
   DEFAULT_PAGES_NOT_FOUND_HTML,