chore: tweak prerelease flow

.changeset/pre.json

@@ -0,0 +1,47 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "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"
+  },
+  "changesets": ["social-mails-sort", "three-carrots-return"]
+}

.changeset/social-mails-sort.md

@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': major
+'@tanstack/solid-router-devtools': major
+'@tanstack/solid-start-client': major
+'@tanstack/solid-start-server': major
+'@tanstack/solid-router': major
+'@tanstack/solid-start': major
+---
+
+solid v2 pre-release for solid-router and start

.changeset/three-carrots-return.md

@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+bump to alpha.1

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF_NAME}"
           if [[ "$BRANCH" == *-pre ]]; then
-            echo "tag=next" >> "$GITHUB_OUTPUT"
+            echo "prerelease=true" >> "$GITHUB_OUTPUT"
           elif [[ "$BRANCH" == *-maint ]]; then
             echo "tag=maint" >> "$GITHUB_OUTPUT"
           fi
@@ -67,7 +67,7 @@ jobs:
         run: pnpm run changeset:publish ${{ steps.dist-tag.outputs.tag && format('--tag {0}', steps.dist-tag.outputs.tag) }}
       - name: Create GitHub Release
         if: steps.commit.outputs.committed == 'true'
-        run: node scripts/create-github-release.mjs ${{ steps.dist-tag.outputs.tag == 'next' && '--prerelease' }}
+        run: node scripts/create-github-release.mjs ${{ steps.dist-tag.outputs.prerelease == 'true' && '--prerelease' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

benchmarks/bundle-size/package.json

@@ -13,7 +13,8 @@
     "@tanstack/solid-start": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "solid-js": "^1.9.10",
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2",
     "vue": "^3.5.16"
   },
   "devDependencies": {
@@ -25,6 +26,6 @@
     "@vitejs/plugin-vue-jsx": "^4.1.2",
     "typescript": "^5.7.2",
     "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10"
+    "vite-plugin-solid": "3.0.0-next.2"
   }
 }

benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx

@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 import { routeTree } from './routeTree.gen'
 

benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx

@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 import { routeTree } from './routeTree.gen'
 

benchmarks/client-nav/package.json

@@ -25,7 +25,8 @@
     "@tanstack/vue-router": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "solid-js": "^1.9.10",
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2",
     "vue": "^3.5.16"
   },
   "devDependencies": {
@@ -38,7 +39,7 @@
     "@types/jsdom": "28.0.0",
     "typescript": "^5.7.2",
     "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10",
+    "vite-plugin-solid": "3.0.0-next.2",
     "vitest": "^4.0.17"
   },
   "nx": {

benchmarks/client-nav/solid/app.tsx

@@ -1,5 +1,5 @@
 import { For, createEffect } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import {
   Link,
   Outlet,
@@ -30,9 +30,10 @@ function Params() {
     select: (params) => runPerfSelectorComputation(Number(params.id ?? 0)),
   })
 
-  createEffect(() => {
-    void params()
-  })
+  createEffect(
+    () => params(),
+    () => {},
+  )
 
   return null
 }
@@ -43,9 +44,10 @@ function Search() {
     select: (search) => runPerfSelectorComputation(Number(search.id ?? 0)),
   })
 
-  createEffect(() => {
-    void search()
-  })
+  createEffect(
+    () => search(),
+    () => {},
+  )
 
   return null
 }

benchmarks/ssr/package.json

@@ -24,7 +24,8 @@
     "@tanstack/vue-start": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "solid-js": "^1.9.10",
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2",
     "vue": "^3.5.16"
   },
   "devDependencies": {
@@ -33,7 +34,7 @@
     "@vitejs/plugin-vue-jsx": "^4.1.2",
     "typescript": "^5.7.2",
     "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10",
+    "vite-plugin-solid": "3.0.0-next.2",
     "vitest": "^4.0.17"
   },
   "nx": {

benchmarks/ssr/solid/src/workload.tsx

@@ -29,9 +29,10 @@ function ParamsProbe(props: { salt: number }) {
       ),
   })
 
-  createEffect(() => {
-    void params()
-  })
+  createEffect(
+    () => params(),
+    () => {},
+  )
 
   return null
 }
@@ -43,9 +44,10 @@ function SearchProbe(props: { salt: number }) {
       runSelectorWork(String(nextSearch.q ?? ''), props.salt),
   })
 
-  createEffect(() => {
-    void search()
-  })
+  createEffect(
+    () => search(),
+    () => {},
+  )
 
   return null
 }
@@ -73,9 +75,9 @@ function LinkProbe(props: { salt: number }) {
 export function RouteWorkload() {
   return (
     <>
-      <For each={probes}>{(probe) => <ParamsProbe salt={probe + 1} />}</For>
-      <For each={probes}>{(probe) => <SearchProbe salt={probe + 11} />}</For>
-      <For each={probes}>{(probe) => <LinkProbe salt={probe + 21} />}</For>
+      <For each={probes}>{(probe) => <ParamsProbe salt={probe() + 1} />}</For>
+      <For each={probes}>{(probe) => <SearchProbe salt={probe() + 11} />}</For>
+      <For each={probes}>{(probe) => <LinkProbe salt={probe() + 21} />}</For>
     </>
   )
 }

docs/router/guide/ssr.md

@@ -234,7 +234,7 @@ hydrateRoot(document, <RouterClient router={router} />)
 # Solid
 
 ```tsx title="src/entry-client.tsx"
-import { hydrate } from 'solid-js/web'
+import { hydrate } from '@solidjs/web'
 import { RouterClient } from '@tanstack/solid-router/ssr/client'
 import { createRouter } from './router'
 

docs/router/installation/manual.md

@@ -204,7 +204,7 @@ function About() {
 
 ```tsx title="src/main.tsx"
 /* @refresh reload */
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 
 // Import the generated route tree
@@ -319,7 +319,7 @@ if (!rootElement.innerHTML) {
 
 ```tsx
 /* @refresh reload */
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import {
   Outlet,
   RouterProvider,

docs/start/framework/solid/build-from-scratch.md

@@ -163,7 +163,7 @@ import {
   HeadContent,
   Scripts,
 } from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
 
 export const Route = createRootRoute({
   head: () => ({

docs/start/framework/solid/guide/client-entry-point.md

@@ -12,7 +12,7 @@ Getting our html to the client is only half the battle. Once there, we need to h
 
 ```tsx
 // src/client.tsx
-import { hydrate } from 'solid-js/web'
+import { hydrate } from '@solidjs/web'
 import { StartClient, hydrateStart } from '@tanstack/solid-start/client'
 
 hydrateStart().then((router) => {
@@ -29,7 +29,7 @@ You can wrap your client entry point with error boundaries to handle client-side
 ```tsx
 // src/client.tsx
 import { StartClient } from '@tanstack/solid-start/client'
-import { hydrate } from 'solid-js/web'
+import { hydrate } from '@solidjs/web'
 import { ErrorBoundary } from './components/ErrorBoundary'
 
 hydrate(
@@ -49,7 +49,7 @@ You may want different behavior in development vs production:
 ```tsx
 // src/client.tsx
 import { StartClient } from '@tanstack/solid-start/client'
-import { hydrate } from 'solid-js/web'
+import { hydrate } from '@solidjs/web'
 
 const App = (
   <>

docs/start/framework/solid/guide/hydration-errors.md

@@ -93,7 +93,7 @@ function SetTimeZoneCookie() {
 
 ```tsx
 import { ClientOnly } from '@tanstack/solid-router'
-import { NoHydration } from 'solid-js/web'
+import { NoHydration } from '@solidjs/web'
 
 <ClientOnly fallback={<span>—</span>}>
   <RelativeTime ts={someTs} />

e2e/solid-router/basepath-file-based/package.json

@@ -14,12 +14,13 @@
     "@tanstack/solid-router": "workspace:^",
     "@tanstack/solid-router-devtools": "workspace:^",
     "@tanstack/router-plugin": "workspace:^",
-    "solid-js": "^1.9.10"
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.10",
+    "vite-plugin-solid": "3.0.0-next.2",
     "vite": "^7.3.1"
   }
 }

e2e/solid-router/basepath-file-based/src/main.tsx

@@ -1,5 +1,5 @@
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { routeTree } from './routeTree.gen'
 
 // Set up a Router instance

e2e/solid-router/basic-esbuild-file-based/package.json

@@ -3,9 +3,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --serve=5601 --bundle --outfile=dist/main.js --watch --servedir=.",
-    "build": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --bundle --outfile=dist/main.js && tsc --noEmit",
-    "serve": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --bundle --outfile=dist/main.js --servedir=.",
+    "dev": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --conditions=solid --serve=5601 --bundle --outfile=dist/main.js --watch --servedir=.",
+    "build": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --conditions=solid --bundle --outfile=dist/main.js && tsc --noEmit",
+    "serve": "esbuild src/main.tsx --jsx=preserve --jsx-import-source=solid-js --conditions=solid --bundle --outfile=dist/main.js --servedir=.",
     "start": "dev",
     "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
   },
@@ -15,7 +15,8 @@
     "@tanstack/solid-router-devtools": "workspace:^",
     "@tanstack/zod-adapter": "workspace:^",
     "redaxios": "^0.5.1",
-    "solid-js": "^1.9.10",
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2",
     "zod": "^3.24.2"
   },
   "devDependencies": {

e2e/solid-router/basic-esbuild-file-based/src/main.tsx

@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 import { routeTree } from './routeTree.gen'
 

e2e/solid-router/basic-file-based-code-splitting/package.json

@@ -17,14 +17,15 @@
     "@tanstack/router-plugin": "workspace:^",
     "@tanstack/solid-router": "workspace:^",
     "@tanstack/solid-router-devtools": "workspace:^",
-    "solid-js": "^1.9.10",
+    "solid-js": "2.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.2",
     "tailwindcss": "^4.1.18",
     "zod": "^3.24.2"
   },
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
     "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10"
+    "vite-plugin-solid": "3.0.0-next.2"
   }
 }

e2e/solid-router/basic-file-based-code-splitting/src/main.tsx

@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 import { RouterProvider, createRouter } from '@tanstack/solid-router'
 import { routeTree } from './routeTree.gen'
 import './styles.css'

e2e/solid-router/basic-file-based-code-splitting/src/routeTree.gen.ts

@@ -171,7 +171,7 @@ declare module '@tanstack/solid-router' {
     '/_layout': {
       id: '/_layout'
       path: ''
-      fullPath: ''
+      fullPath: '/'
       preLoaderRoute: typeof LayoutRouteImport
       parentRoute: typeof rootRouteImport
     }
@@ -199,7 +199,7 @@ declare module '@tanstack/solid-router' {
     '/_layout/_layout-2': {
       id: '/_layout/_layout-2'
       path: ''
-      fullPath: ''
+      fullPath: '/'
       preLoaderRoute: typeof LayoutLayout2RouteImport
       parentRoute: typeof LayoutRoute
     }