Merge main into upgrade-solidjs-rc-0

.changeset/pre.json

@@ -1,49 +1,49 @@
 {
   "mode": "pre",
-  "tag": "beta",
+  "tag": "rc",
   "initialVersions": {
-    "@tanstack/arktype-adapter": "1.166.7",
-    "@tanstack/eslint-plugin-router": "1.161.4",
-    "@tanstack/history": "1.161.4",
-    "@tanstack/nitro-v2-vite-plugin": "1.154.7",
-    "@tanstack/react-router": "1.166.7",
-    "@tanstack/react-router-devtools": "1.166.7",
-    "@tanstack/react-router-ssr-query": "1.166.7",
-    "@tanstack/react-start": "1.166.8",
-    "@tanstack/react-start-client": "1.166.7",
-    "@tanstack/react-start-server": "1.166.7",
-    "@tanstack/router-cli": "1.166.7",
-    "@tanstack/router-core": "1.166.7",
-    "@tanstack/router-devtools": "1.166.7",
-    "@tanstack/router-devtools-core": "1.166.7",
-    "@tanstack/router-generator": "1.166.7",
-    "@tanstack/router-plugin": "1.166.7",
-    "@tanstack/router-ssr-query-core": "1.166.7",
-    "@tanstack/router-utils": "1.161.4",
-    "@tanstack/router-vite-plugin": "1.166.7",
-    "@tanstack/solid-router": "1.166.7",
-    "@tanstack/solid-router-devtools": "1.166.7",
-    "@tanstack/solid-router-ssr-query": "1.166.7",
-    "@tanstack/solid-start": "1.166.8",
-    "@tanstack/solid-start-client": "1.166.7",
-    "@tanstack/solid-start-server": "1.166.7",
-    "@tanstack/start-client-core": "1.166.7",
-    "@tanstack/start-fn-stubs": "1.161.4",
-    "@tanstack/start-plugin-core": "1.166.8",
-    "@tanstack/start-server-core": "1.166.7",
-    "@tanstack/start-static-server-functions": "1.166.8",
-    "@tanstack/start-storage-context": "1.166.7",
-    "@tanstack/valibot-adapter": "1.166.7",
-    "@tanstack/virtual-file-routes": "1.161.4",
-    "@tanstack/vue-router": "1.166.7",
-    "@tanstack/vue-router-devtools": "1.166.7",
-    "@tanstack/vue-router-ssr-query": "1.166.7",
-    "@tanstack/vue-start": "1.166.8",
-    "@tanstack/vue-start-client": "1.166.7",
-    "@tanstack/vue-start-server": "1.166.7",
-    "@tanstack/zod-adapter": "1.166.7",
+    "@tanstack/arktype-adapter": "1.167.0",
+    "@tanstack/eslint-plugin-router": "1.162.0",
     "@tanstack/eslint-plugin-start": "0.1.0",
-    "@tanstack/react-start-rsc": "0.1.17"
+    "@tanstack/history": "1.162.0",
+    "@tanstack/nitro-v2-vite-plugin": "1.155.0",
+    "@tanstack/react-router": "1.170.19",
+    "@tanstack/react-router-devtools": "1.167.1",
+    "@tanstack/react-router-ssr-query": "1.167.1",
+    "@tanstack/react-start": "1.168.36",
+    "@tanstack/react-start-client": "1.168.17",
+    "@tanstack/react-start-rsc": "0.1.35",
+    "@tanstack/react-start-server": "1.167.24",
+    "@tanstack/router-cli": "1.167.22",
+    "@tanstack/router-core": "1.171.16",
+    "@tanstack/router-devtools": "1.167.1",
+    "@tanstack/router-devtools-core": "1.168.1",
+    "@tanstack/router-generator": "1.167.22",
+    "@tanstack/router-plugin": "1.168.24",
+    "@tanstack/router-ssr-query-core": "1.169.1",
+    "@tanstack/router-utils": "1.162.2",
+    "@tanstack/router-vite-plugin": "1.167.24",
+    "@tanstack/solid-router": "2.0.0-beta.30",
+    "@tanstack/solid-router-devtools": "2.0.0-beta.25",
+    "@tanstack/solid-router-ssr-query": "2.0.0-beta.31",
+    "@tanstack/solid-start": "2.0.0-beta.31",
+    "@tanstack/solid-start-client": "2.0.0-beta.30",
+    "@tanstack/solid-start-server": "2.0.0-beta.30",
+    "@tanstack/start-client-core": "1.170.15",
+    "@tanstack/start-fn-stubs": "1.162.0",
+    "@tanstack/start-plugin-core": "1.171.27",
+    "@tanstack/start-server-core": "1.169.19",
+    "@tanstack/start-static-server-functions": "1.167.20",
+    "@tanstack/start-storage-context": "1.167.18",
+    "@tanstack/valibot-adapter": "1.167.0",
+    "@tanstack/virtual-file-routes": "1.162.0",
+    "@tanstack/vue-router": "1.170.18",
+    "@tanstack/vue-router-devtools": "1.167.1",
+    "@tanstack/vue-router-ssr-query": "1.167.1",
+    "@tanstack/vue-start": "1.168.34",
+    "@tanstack/vue-start-client": "1.167.20",
+    "@tanstack/vue-start-server": "1.167.24",
+    "@tanstack/zod-adapter": "1.167.0"
   },
   "changesets": [
     "brave-pans-create",
@@ -78,6 +78,7 @@
     "solid-js-beta-27",
     "solid-js-beta-29",
     "solid-js-beta-32",
+    "solid-js-rc-0",
     "solid-kings-help",
     "solid-match-suspend-ssr-only",
     "tall-horses-repair",

.changeset/solid-js-rc-0.md

@@ -0,0 +1,16 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-rc.0`, and migrate from `vite-plugin-solid` to its new name `@solidjs/vite-plugin` at `3.0.0-next.28`
+
+`vite-plugin-solid` was renamed to `@solidjs/vite-plugin`; its final release (`3.0.0-next.27`) is a re-export shim over the new package. `@solidjs/vite-plugin@3.0.0-next.28` requires `solid-js`/`@solidjs/web` `^2.0.0-rc.0`, so the rename and the `rc` bump land together.
+
+`@tanstack/router-plugin` is intentionally untouched: it detects the Solid JSX plugin by its Vite plugin _name_ (`solid`), which the renamed package still registers, and its `vite-plugin-solid` peer is optional — so it keeps working for both Solid 1 and Solid 2 consumers without a change.
+
+Also bumps `@tanstack/solid-query` and `@tanstack/solid-query-devtools` to `^6.0.0-rc.0` (whose peer requires `solid-js >=2.0.0-rc.0`), and converges `@tanstack/query-core` on `5.101.4` — `solid-query` depends on query-core `5.101.0`, which previously resolved to a stale `5.99.0` and produced two incompatible `QueryClient` types.

.github/workflows/bundle-size.yml

@@ -8,11 +8,13 @@ on:
     paths:
       - 'packages/**'
       - 'benchmarks/**'
+      - 'scripts/benchmarks/bundle-size/**'
   push:
     branches: [main]
     paths:
       - 'packages/**'
       - 'benchmarks/**'
+      - 'scripts/benchmarks/bundle-size/**'
   workflow_dispatch:
 
 concurrency:

.github/workflows/client-nav-benchmarks.yml

@@ -72,7 +72,7 @@ jobs:
           @benchmarks/${{ matrix.benchmark }}:build:${{ matrix.framework }}
 
       - name: Run ${{ matrix.benchmark }}:${{ matrix.framework }} CodSpeed benchmark
-        uses: CodSpeedHQ/action@9d332c4d90b43981c3e55ae8e38e68709996240f # v4.17.0
+        uses: CodSpeedHQ/action@4296e51e7041e24dadb86d1d6e8b9320d223dbe8 # v5.0.3
         with:
           mode: ${{ matrix.mode }}
           run: >-

benchmarks/bundle-size/package.json

@@ -36,7 +36,7 @@
     }
   },
   "dependencies": {
-    "@solidjs/web": "2.0.0-beta.32",
+    "@solidjs/web": "^2.0.0-rc.0",
     "@tanstack/react-router": "workspace:^",
     "@tanstack/react-start": "workspace:^",
     "@tanstack/solid-router": "workspace:^",
@@ -45,12 +45,13 @@
     "@tanstack/vue-start": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "solid-js": "2.0.0-beta.32",
+    "solid-js": "^2.0.0-rc.0",
     "vue": "^3.5.16"
   },
   "devDependencies": {
     "@rsbuild/core": "^2.1.0",
     "@rsbuild/plugin-react": "^2.0.0",
+    "@solidjs/vite-plugin": "^3.0.0-next.28",
     "@tanstack/router-plugin": "workspace:^",
     "@types/react": "^19.0.8",
     "@types/react-dom": "^19.0.3",
@@ -59,7 +60,6 @@
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "@typescript/native": "npm:typescript@^7.0.2",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
-    "vite": "^8.0.14",
-    "vite-plugin-solid": "^3.0.0-next.23"
+    "vite": "^8.0.14"
   }
 }

benchmarks/bundle-size/scenarios/solid-router-full/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import { tanstackRouter } from '@tanstack/router-plugin/vite'
 
 export default defineConfig({

benchmarks/bundle-size/scenarios/solid-router-minimal/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import { tanstackRouter } from '@tanstack/router-plugin/vite'
 
 export default defineConfig({

benchmarks/bundle-size/scenarios/solid-start-deferred-hydration/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
 
 export default defineConfig({

benchmarks/bundle-size/scenarios/solid-start-full/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
 
 export default defineConfig({

benchmarks/bundle-size/scenarios/solid-start-minimal/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
 
 export default defineConfig({

benchmarks/client-nav/package.json

@@ -19,29 +19,31 @@
     "test:types:vue": "tsc -p ./vue/tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@solidjs/web": "2.0.0-beta.32",
+    "@solidjs/web": "^2.0.0-rc.0",
+    "@tanstack/history": "workspace:^",
     "@tanstack/react-router": "workspace:^",
     "@tanstack/router-core": "workspace:^",
     "@tanstack/solid-router": "workspace:^",
     "@tanstack/vue-router": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "solid-js": "2.0.0-beta.32",
+    "solid-js": "^2.0.0-rc.0",
     "vue": "^3.5.16"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^5.5.0",
     "@platformatic/flame": "^1.6.0",
+    "@solidjs/vite-plugin": "^3.0.0-next.28",
     "@tanstack/router-plugin": "workspace:^",
     "@testing-library/react": "^16.2.0",
     "@types/jsdom": "28.0.0",
     "@vitejs/plugin-react": "^6.0.1",
     "@vitejs/plugin-vue": "^6.0.5",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "@typescript/native": "npm:typescript@^7.0.2",
+    "jsdom": "^29.1.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "vite": "^8.0.14",
-    "vite-plugin-solid": "^3.0.0-next.23",
     "vitest": "^4.1.4"
   },
   "nx": {

benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts

@@ -1,29 +1,27 @@
-import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { afterEach, beforeEach, bench, describe } from 'vitest'
 import { benchOptions, ticksPerIteration } from '../shared'
 import { setup } from './setup'
 
 describe('client-async-pipeline', () => {
   const test = setup()
 
   /**
-   * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
-   * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
-   *
-   * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
-   * but it does support `beforeAll` and `afterAll`.
-   *
-   * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+   * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup`
+   * and `teardown` options below. CodSpeed bypasses those options but supports
+   * `beforeEach` and `afterEach`. Only one lifecycle path runs in either
+   * environment, and every measured invocation receives fresh application state.
    */
 
-  beforeAll(test.before)
-  afterAll(test.after)
+  beforeEach(test.before)
+  afterEach(test.after)
 
   bench(
     'client-async-pipeline navigation loop (react)',
     async () => {
       for (let i = 0; i < ticksPerIteration; i++) {
         await test.tick()
       }
+      await test.finishBatch()
     },
     {
       ...benchOptions,

benchmarks/client-nav/scenarios/async-pipeline/react/src/main.tsx

@@ -1,10 +1,12 @@
+import type { RouterHistory } from '@tanstack/history'
 import { RouterProvider, createRouter } from '@tanstack/react-router'
 import { createRoot } from 'react-dom/client'
 import { routeTree } from './routeTree.gen'
 
-export function createTestRouter() {
+export function createTestRouter(history: RouterHistory) {
   return createRouter({
     routeTree,
+    history,
     scrollRestoration: true,
     // Key the scroll-restoration cache by pathname instead of the default
     // random per-entry location key: with push navigations the default mints
@@ -22,8 +24,8 @@ declare module '@tanstack/react-router' {
   }
 }
 
-export function mountTestApp(container: HTMLElement) {
-  const router = createTestRouter()
+export function mountTestApp(container: HTMLElement, history: RouterHistory) {
+  const router = createTestRouter(history)
 
   const reactRoot = createRoot(container)
   reactRoot.render(<RouterProvider router={router} />)

benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts

@@ -1,29 +1,27 @@
-import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { afterEach, beforeEach, bench, describe } from 'vitest'
 import { benchOptions, ticksPerIteration } from '../shared'
 import { setup } from './setup'
 
 describe('client-async-pipeline', () => {
   const test = setup()
 
   /**
-   * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
-   * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
-   *
-   * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
-   * but it does support `beforeAll` and `afterAll`.
-   *
-   * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+   * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup`
+   * and `teardown` options below. CodSpeed bypasses those options but supports
+   * `beforeEach` and `afterEach`. Only one lifecycle path runs in either
+   * environment, and every measured invocation receives fresh application state.
    */
 
-  beforeAll(test.before)
-  afterAll(test.after)
+  beforeEach(test.before)
+  afterEach(test.after)
 
   bench(
     'client-async-pipeline navigation loop (solid)',
     async () => {
       for (let i = 0; i < ticksPerIteration; i++) {
         await test.tick()
       }
+      await test.finishBatch()
     },
     {
       ...benchOptions,

benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx

@@ -1,10 +1,12 @@
+import type { RouterHistory } from '@tanstack/history'
 import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 import { routeTree } from './routeTree.gen'
 
-export function createTestRouter() {
+export function createTestRouter(history: RouterHistory) {
   return createRouter({
     routeTree,
+    history,
     scrollRestoration: true,
     // Key the scroll-restoration cache by pathname instead of the default
     // random per-entry location key: with push navigations the default mints
@@ -22,8 +24,8 @@ declare module '@tanstack/solid-router' {
   }
 }
 
-export function mountTestApp(container: HTMLElement) {
-  const router = createTestRouter()
+export function mountTestApp(container: HTMLElement, history: RouterHistory) {
+  const router = createTestRouter(history)
 
   const unmount = render(() => <RouterProvider router={router} />, container)
 

benchmarks/client-nav/scenarios/async-pipeline/solid/vite.config.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
 import codspeedPlugin from '@codspeed/vitest-plugin'
 import { tanstackRouter } from '@tanstack/router-plugin/vite'