@@ -848,6 +848,26 @@ function Component() {
}
```
+The `matchRoute` function returned by `useMatchRoute` changes identity when the relevant router state changes. If you only need to check the route at the time an event occurs, use the stable router instance returned by `useRouter` and call `router.matchRoute` directly. This reads the latest router state without subscribing the component to matching state that it does not use while rendering:
+
+```tsx
+function Component() {
+ const router = useRouter()
+
+ return (
+
{
+ if (router.matchRoute({ to: '/users' }, { fuzzy: true })) {
+ console.info('The users route is active')
+ }
+ }}
+ >
+ Check current route
+
+ )
+}
+```
+
---
Phew! That's a lot of navigating! That said, hopefully you're feeling pretty good about getting around your application now. Let's move on!
diff --git a/docs/router/guide/preloading.md b/docs/router/guide/preloading.md
index 6ae9563f2f8..7f48412ce68 100644
--- a/docs/router/guide/preloading.md
+++ b/docs/router/guide/preloading.md
@@ -64,7 +64,7 @@ This will turn on `intent` preloading by default for all `
` components in
## Preload Delay
-By default, preloading will start after **50ms** of the user hovering or touching a `
` component. You can change this delay by setting the `defaultPreloadDelay` option on your router:
+By default, intent focus/hover and viewport preloading start after **50ms**. Pending preloads are cancelled if focus or hover ends, or the link leaves the viewport. Touch intent preloads immediately. You can change this delay by setting the `defaultPreloadDelay` option on your router:
diff --git a/docs/router/installation/with-vite.md b/docs/router/installation/with-vite.md
index 64cf2cb2b74..4db7a084997 100644
--- a/docs/router/installation/with-vite.md
+++ b/docs/router/installation/with-vite.md
@@ -42,7 +42,7 @@ Or, you can clone our [Quickstart Vite example](https://github.com/TanStack/rout
```ts title="vite.config.ts"
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
// https://vitejs.dev/config/
diff --git a/docs/router/routing/virtual-file-routes.md b/docs/router/routing/virtual-file-routes.md
index 2de0ded5df2..e8e1eed2f0c 100644
--- a/docs/router/routing/virtual-file-routes.md
+++ b/docs/router/routing/virtual-file-routes.md
@@ -73,7 +73,7 @@ export default defineConfig({
```tsx title="vite.config.ts"
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({
@@ -132,7 +132,7 @@ export default defineConfig({
```tsx title="vite.config.ts"
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
const routes = rootRoute('root.tsx', [
diff --git a/docs/start/framework/solid/build-from-scratch.md b/docs/start/framework/solid/build-from-scratch.md
index c376497aeb6..912c90ebeb1 100644
--- a/docs/start/framework/solid/build-from-scratch.md
+++ b/docs/start/framework/solid/build-from-scratch.md
@@ -69,7 +69,7 @@ Install the build tool and Solid integration you want to use:
# Vite
```shell
-npm i -D vite vite-plugin-solid
+npm i -D vite @solidjs/vite-plugin
```
# Rsbuild
@@ -129,7 +129,7 @@ Then configure TanStack Start's build tool plugin:
```ts title="vite.config.ts"
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
server: {
diff --git a/docs/start/framework/solid/guide/environment-variables.md b/docs/start/framework/solid/guide/environment-variables.md
index 6a7f763d110..ff3c26fbe95 100644
--- a/docs/start/framework/solid/guide/environment-variables.md
+++ b/docs/start/framework/solid/guide/environment-variables.md
@@ -10,7 +10,7 @@ replace:
'{children}': '{props.children}',
'@tanstack/react-start/plugin/vite': '@tanstack/solid-start/plugin/vite',
'@tanstack/react-start/plugin/rsbuild': '@tanstack/solid-start/plugin/rsbuild',
- '@vitejs/plugin-react': 'vite-plugin-solid',
+ '@vitejs/plugin-react': '@solidjs/vite-plugin',
'viteReact()': 'viteSolid({ ssr: true })',
'viteReact': 'viteSolid',
"import { pluginReact } from '@rsbuild/plugin-react'": "import { pluginBabel } from '@rsbuild/plugin-babel'\nimport { pluginSolid } from '@rsbuild/plugin-solid'",
diff --git a/docs/start/framework/solid/guide/hosting.md b/docs/start/framework/solid/guide/hosting.md
index 23f1d35cf40..fea0c29a370 100644
--- a/docs/start/framework/solid/guide/hosting.md
+++ b/docs/start/framework/solid/guide/hosting.md
@@ -3,7 +3,7 @@ ref: docs/start/framework/react/guide/hosting.md
replace:
{
'@tanstack/react-start': '@tanstack/solid-start',
- '@vitejs/plugin-react': 'vite-plugin-solid',
+ '@vitejs/plugin-react': '@solidjs/vite-plugin',
'viteReact()': 'viteSolid({ ssr: true })',
'viteReact': 'viteSolid',
'examples/react/start-basic-cloudflare': 'examples/solid/start-basic-cloudflare',
diff --git a/docs/start/framework/solid/guide/static-prerendering.md b/docs/start/framework/solid/guide/static-prerendering.md
index d5308138969..5ebbc1e96a0 100644
--- a/docs/start/framework/solid/guide/static-prerendering.md
+++ b/docs/start/framework/solid/guide/static-prerendering.md
@@ -16,7 +16,7 @@ TanStack Start can prerender your application to static HTML files, which can th
```ts title="vite.config.ts"
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [
diff --git a/docs/start/framework/solid/guide/tailwind-integration.md b/docs/start/framework/solid/guide/tailwind-integration.md
index adb733a5097..272846ca610 100644
--- a/docs/start/framework/solid/guide/tailwind-integration.md
+++ b/docs/start/framework/solid/guide/tailwind-integration.md
@@ -4,7 +4,7 @@ replace:
{
'@tanstack/react-start': '@tanstack/solid-start',
'@tanstack/react-router': '@tanstack/solid-router',
- '@vitejs/plugin-react': 'vite-plugin-solid',
+ '@vitejs/plugin-react': '@solidjs/vite-plugin',
'viteReact()': 'viteSolid({ ssr: true })',
'viteReact': 'viteSolid',
"import { pluginReact } from '@rsbuild/plugin-react'": "import { pluginBabel } from '@rsbuild/plugin-babel'\nimport { pluginSolid } from '@rsbuild/plugin-solid'",
diff --git a/e2e/react-router/basic-react-query-file-based/package.json b/e2e/react-router/basic-react-query-file-based/package.json
index 65483817725..5f121de6a4f 100644
--- a/e2e/react-router/basic-react-query-file-based/package.json
+++ b/e2e/react-router/basic-react-query-file-based/package.json
@@ -12,7 +12,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
diff --git a/e2e/react-router/basic-react-query/package.json b/e2e/react-router/basic-react-query/package.json
index 81eb9eb67bf..3e0527183b0 100644
--- a/e2e/react-router/basic-react-query/package.json
+++ b/e2e/react-router/basic-react-query/package.json
@@ -12,7 +12,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
diff --git a/e2e/react-router/issue-4759/index.html b/e2e/react-router/issue-4759/index.html
new file mode 100644
index 00000000000..9609ea710b7
--- /dev/null
+++ b/e2e/react-router/issue-4759/index.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+
Issue 4759
+
+
+
+
+
+
+
+
diff --git a/e2e/react-router/issue-4759/package.json b/e2e/react-router/issue-4759/package.json
new file mode 100644
index 00000000000..91a7a5053e4
--- /dev/null
+++ b/e2e/react-router/issue-4759/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "tanstack-router-e2e-react-issue-4759",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "build": "vite build && tsc --noEmit",
+ "dev": "vite --port 3000",
+ "dev:e2e": "vite",
+ "preview": "vite preview",
+ "start": "vite",
+ "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
+ },
+ "dependencies": {
+ "@tanstack/react-router": "workspace:^",
+ "react": "^19.0.0",
+ "react-dom": "^19.0.0"
+ },
+ "devDependencies": {
+ "@playwright/test": "^1.61.0",
+ "@tanstack/router-e2e-utils": "workspace:^",
+ "@types/react": "^19.0.8",
+ "@types/react-dom": "^19.0.3",
+ "@vitejs/plugin-react": "^6.0.1",
+ "vite": "^8.0.14"
+ }
+}
diff --git a/e2e/react-router/issue-4759/playwright.config.ts b/e2e/react-router/issue-4759/playwright.config.ts
new file mode 100644
index 00000000000..b5e8249edc7
--- /dev/null
+++ b/e2e/react-router/issue-4759/playwright.config.ts
@@ -0,0 +1,25 @@
+import { defineConfig, devices } from '@playwright/test'
+import { getTestServerPort } from '@tanstack/router-e2e-utils'
+import packageJson from './package.json' with { type: 'json' }
+
+const PORT = await getTestServerPort(packageJson.name)
+const baseURL = `http://localhost:${PORT}`
+
+export default defineConfig({
+ testDir: './tests',
+ workers: 1,
+ reporter: [['line']],
+ use: { baseURL },
+ webServer: {
+ command: `VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`,
+ url: baseURL,
+ reuseExistingServer: !process.env.CI,
+ stdout: 'pipe',
+ },
+ projects: [
+ {
+ name: 'chromium',
+ use: { ...devices['Desktop Chrome'] },
+ },
+ ],
+})
diff --git a/e2e/react-router/issue-4759/src/main.tsx b/e2e/react-router/issue-4759/src/main.tsx
new file mode 100644
index 00000000000..bc4a99c37fb
--- /dev/null
+++ b/e2e/react-router/issue-4759/src/main.tsx
@@ -0,0 +1,50 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import {
+ RouterProvider,
+ createRootRoute,
+ createRoute,
+ createRouter,
+} from '@tanstack/react-router'
+
+const rootRoute = createRootRoute()
+const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ loader: () => new Promise((resolve) => setTimeout(resolve, 1_000)),
+ component: () =>
loaded
,
+})
+const routePendingRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/route-pending',
+ pendingMs: 0,
+ pendingMinMs: 0,
+ pendingComponent: () => (
+
+ route pending
+
+ ),
+ loader: () => new Promise((resolve) => setTimeout(resolve, 1_000)),
+ component: () =>
loaded
,
+})
+const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute, routePendingRoute]),
+})
+const usesRoutePending = window.location.pathname === '/route-pending'
+
+createRoot(document.getElementById('app')!).render(
+
+
+ (
+
+ default pending
+
+ )}
+ />
+
+ ,
+)
diff --git a/e2e/react-router/issue-4759/tests/issue-4759.spec.ts b/e2e/react-router/issue-4759/tests/issue-4759.spec.ts
new file mode 100644
index 00000000000..7556b1c47a4
--- /dev/null
+++ b/e2e/react-router/issue-4759/tests/issue-4759.spec.ts
@@ -0,0 +1,38 @@
+import { expect, test } from '@playwright/test'
+import type { Page } from '@playwright/test'
+
+async function expectNoBlankFrame(
+ page: Page,
+ pendingSource: 'default' | 'route',
+) {
+ await expect(
+ page.locator(
+ `[data-state="pending"][data-pending-source="${pendingSource}"]`,
+ ),
+ ).toBeVisible()
+
+ const paintStates = await page.evaluate(
+ () =>
+ (globalThis as typeof globalThis & { __paintStates: Array
})
+ .__paintStates,
+ )
+
+ expect(paintStates).toContain('pending')
+ expect(paintStates).not.toContain('shell')
+ expect(paintStates).not.toContain('empty')
+ await expect(page.locator('[data-state="loaded"]')).toBeVisible()
+}
+
+test('#4759: the initial default pending component has no blank frame before it', async ({
+ page,
+}) => {
+ await page.goto('/')
+ await expectNoBlankFrame(page, 'default')
+})
+
+test('an initial route pending component has no blank frame before it', async ({
+ page,
+}) => {
+ await page.goto('/route-pending')
+ await expectNoBlankFrame(page, 'route')
+})
diff --git a/e2e/react-router/issue-4759/tsconfig.json b/e2e/react-router/issue-4759/tsconfig.json
new file mode 100644
index 00000000000..e4ba4788a35
--- /dev/null
+++ b/e2e/react-router/issue-4759/tsconfig.json
@@ -0,0 +1,13 @@
+{
+ "compilerOptions": {
+ "strict": true,
+ "jsx": "react-jsx",
+ "target": "ESNext",
+ "moduleResolution": "Bundler",
+ "module": "ESNext",
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "types": ["vite/client"]
+ },
+ "exclude": ["node_modules", "dist"]
+}
diff --git a/e2e/react-router/issue-4759/vite.config.ts b/e2e/react-router/issue-4759/vite.config.ts
new file mode 100644
index 00000000000..9ffcc675746
--- /dev/null
+++ b/e2e/react-router/issue-4759/vite.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+export default defineConfig({
+ plugins: [react()],
+})
diff --git a/e2e/react-router/issue-7457/package.json b/e2e/react-router/issue-7457/package.json
index 3220a4dbb40..bf78bbf428b 100644
--- a/e2e/react-router/issue-7457/package.json
+++ b/e2e/react-router/issue-7457/package.json
@@ -11,7 +11,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.99.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
"react": "^19.0.0",
diff --git a/e2e/react-router/react-compiler/index.html b/e2e/react-router/react-compiler/index.html
new file mode 100644
index 00000000000..0c5b6b471c5
--- /dev/null
+++ b/e2e/react-router/react-compiler/index.html
@@ -0,0 +1,12 @@
+
+
+
+ React Compiler useMatchRoute test
+
+
+
+
+
+
diff --git a/e2e/react-router/react-compiler/package.json b/e2e/react-router/react-compiler/package.json
new file mode 100644
index 00000000000..d4d0e6473af
--- /dev/null
+++ b/e2e/react-router/react-compiler/package.json
@@ -0,0 +1,29 @@
+{
+ "name": "tanstack-router-e2e-react-compiler",
+ "private": true,
+ "type": "module",
+ "scripts": {
+ "dev": "vite --port 3000",
+ "dev:e2e": "vite",
+ "build": "vite build && tsc --noEmit",
+ "preview": "vite preview",
+ "start": "vite",
+ "test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
+ },
+ "dependencies": {
+ "@tanstack/react-router": "workspace:^",
+ "react": "^19.0.0",
+ "react-dom": "^19.0.0"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.29.0",
+ "@playwright/test": "^1.61.0",
+ "@rolldown/plugin-babel": "^0.2.0",
+ "@tanstack/router-e2e-utils": "workspace:^",
+ "@types/react": "^19.0.8",
+ "@types/react-dom": "^19.0.3",
+ "@vitejs/plugin-react": "^6.0.1",
+ "babel-plugin-react-compiler": "^1.0.0",
+ "vite": "^8.0.14"
+ }
+}
diff --git a/e2e/react-router/react-compiler/playwright.config.ts b/e2e/react-router/react-compiler/playwright.config.ts
new file mode 100644
index 00000000000..61a995a8155
--- /dev/null
+++ b/e2e/react-router/react-compiler/playwright.config.ts
@@ -0,0 +1,25 @@
+import { defineConfig, devices } from '@playwright/test'
+import { getTestServerPort } from '@tanstack/router-e2e-utils'
+import packageJson from './package.json' with { type: 'json' }
+
+const PORT = await getTestServerPort(packageJson.name)
+const baseURL = `http://localhost:${PORT}`
+
+export default defineConfig({
+ testDir: './tests',
+ workers: 1,
+ reporter: [['line']],
+ use: { baseURL },
+ webServer: {
+ command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`,
+ url: baseURL,
+ reuseExistingServer: !process.env.CI,
+ stdout: 'pipe',
+ },
+ projects: [
+ {
+ name: 'chromium',
+ use: { ...devices['Desktop Chrome'] },
+ },
+ ],
+})
diff --git a/e2e/react-router/react-compiler/src/main.tsx b/e2e/react-router/react-compiler/src/main.tsx
new file mode 100644
index 00000000000..e6e549da836
--- /dev/null
+++ b/e2e/react-router/react-compiler/src/main.tsx
@@ -0,0 +1,73 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import {
+ Link,
+ Outlet,
+ RouterProvider,
+ createRootRoute,
+ createRoute,
+ createRouter,
+ linkOptions,
+ useMatchRoute,
+} from '@tanstack/react-router'
+
+const links = linkOptions([
+ { to: '/home', label: 'Home' },
+ { to: '/about', label: 'About' },
+])
+
+function useRouteName() {
+ const matchRoute = useMatchRoute()
+
+ return links.find((link) => matchRoute(link))?.label ?? 'Unknown'
+}
+
+function RootComponent() {
+ const matchedRoute = useRouteName()
+
+ return (
+ <>
+
+ {links.map((link) => (
+
+
+ Matched route: {matchedRoute}
+
+
+ ,
+)
diff --git a/e2e/react-router/react-compiler/tests/use-match-route.spec.ts b/e2e/react-router/react-compiler/tests/use-match-route.spec.ts
new file mode 100644
index 00000000000..b800e3c9086
--- /dev/null
+++ b/e2e/react-router/react-compiler/tests/use-match-route.spec.ts
@@ -0,0 +1,16 @@
+import { expect, test } from '@playwright/test'
+
+test('useMatchRoute updates after navigation with React Compiler', async ({
+ page,
+}) => {
+ await page.goto('/home')
+ await expect(page.getByTestId('matched-route')).toHaveText('Home')
+
+ await page.getByRole('link', { name: 'About' }).click()
+ await expect(page).toHaveURL(/\/about$/)
+ await expect(page.getByTestId('matched-route')).toHaveText('About')
+
+ await page.getByRole('link', { name: 'Home' }).click()
+ await expect(page).toHaveURL(/\/home$/)
+ await expect(page.getByTestId('matched-route')).toHaveText('Home')
+})
diff --git a/e2e/react-router/react-compiler/tsconfig.json b/e2e/react-router/react-compiler/tsconfig.json
new file mode 100644
index 00000000000..4f6089bc08d
--- /dev/null
+++ b/e2e/react-router/react-compiler/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "compilerOptions": {
+ "strict": true,
+ "esModuleInterop": true,
+ "jsx": "react-jsx",
+ "target": "ESNext",
+ "moduleResolution": "Bundler",
+ "module": "ESNext",
+ "resolveJsonModule": true,
+ "allowJs": true,
+ "skipLibCheck": true,
+ "types": ["vite/client"]
+ },
+ "exclude": ["node_modules", "dist"]
+}
diff --git a/e2e/react-router/react-compiler/vite.config.js b/e2e/react-router/react-compiler/vite.config.js
new file mode 100644
index 00000000000..b4478aced4f
--- /dev/null
+++ b/e2e/react-router/react-compiler/vite.config.js
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import react, { reactCompilerPreset } from '@vitejs/plugin-react'
+import babel from '@rolldown/plugin-babel'
+
+export default defineConfig({
+ plugins: [react(), babel({ presets: [reactCompilerPreset()] })],
+})
diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json
index ed7328f3360..b16e484dcfc 100644
--- a/e2e/react-start/basic-react-query/package.json
+++ b/e2e/react-start/basic-react-query/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
@@ -31,10 +31,10 @@
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/react-start/query-integration/package.json b/e2e/react-start/query-integration/package.json
index 4ad18395379..52a3098514a 100644
--- a/e2e/react-start/query-integration/package.json
+++ b/e2e/react-start/query-integration/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
@@ -30,9 +30,9 @@
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/react-start/rsc-query/package.json b/e2e/react-start/rsc-query/package.json
index 24c7b488f64..218a1a1da98 100644
--- a/e2e/react-start/rsc-query/package.json
+++ b/e2e/react-start/rsc-query/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
diff --git a/e2e/react-start/selective-ssr/src/routeTree.gen.ts b/e2e/react-start/selective-ssr/src/routeTree.gen.ts
index 5c7daa4701c..63636ce9522 100644
--- a/e2e/react-start/selective-ssr/src/routeTree.gen.ts
+++ b/e2e/react-start/selective-ssr/src/routeTree.gen.ts
@@ -11,6 +11,8 @@
import { Route as rootRouteImport } from './routes/__root'
import { Route as IndexRouteImport } from './routes/index'
import { Route as Issue4614RouteImport } from './routes/issue-4614'
+import { Route as Issue7947RouteImport } from './routes/issue-7947'
+import { Route as Issue7947TargetRouteImport } from './routes/issue-7947-target'
import { Route as PostsRouteImport } from './routes/posts'
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
@@ -24,6 +26,16 @@ const Issue4614Route = Issue4614RouteImport.update({
path: '/issue-4614',
getParentRoute: () => rootRouteImport,
} as any)
+const Issue7947Route = Issue7947RouteImport.update({
+ id: '/issue-7947',
+ path: '/issue-7947',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const Issue7947TargetRoute = Issue7947TargetRouteImport.update({
+ id: '/issue-7947-target',
+ path: '/issue-7947-target',
+ getParentRoute: () => rootRouteImport,
+} as any)
const PostsRoute = PostsRouteImport.update({
id: '/posts',
path: '/posts',
@@ -38,12 +50,16 @@ const PostsPostIdRoute = PostsPostIdRouteImport.update({
export interface FileRoutesByFullPath {
'/': typeof IndexRoute
'/issue-4614': typeof Issue4614Route
+ '/issue-7947': typeof Issue7947Route
+ '/issue-7947-target': typeof Issue7947TargetRoute
'/posts': typeof PostsRouteWithChildren
'/posts/$postId': typeof PostsPostIdRoute
}
export interface FileRoutesByTo {
'/': typeof IndexRoute
'/issue-4614': typeof Issue4614Route
+ '/issue-7947': typeof Issue7947Route
+ '/issue-7947-target': typeof Issue7947TargetRoute
'/posts': typeof PostsRouteWithChildren
'/posts/$postId': typeof PostsPostIdRoute
}
@@ -51,20 +67,43 @@ export interface FileRoutesById {
__root__: typeof rootRouteImport
'/': typeof IndexRoute
'/issue-4614': typeof Issue4614Route
+ '/issue-7947': typeof Issue7947Route
+ '/issue-7947-target': typeof Issue7947TargetRoute
'/posts': typeof PostsRouteWithChildren
'/posts/$postId': typeof PostsPostIdRoute
}
export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
- fullPaths: '/' | '/issue-4614' | '/posts' | '/posts/$postId'
+ fullPaths:
+ | '/'
+ | '/issue-4614'
+ | '/issue-7947'
+ | '/issue-7947-target'
+ | '/posts'
+ | '/posts/$postId'
fileRoutesByTo: FileRoutesByTo
- to: '/' | '/issue-4614' | '/posts' | '/posts/$postId'
- id: '__root__' | '/' | '/issue-4614' | '/posts' | '/posts/$postId'
+ to:
+ | '/'
+ | '/issue-4614'
+ | '/issue-7947'
+ | '/issue-7947-target'
+ | '/posts'
+ | '/posts/$postId'
+ id:
+ | '__root__'
+ | '/'
+ | '/issue-4614'
+ | '/issue-7947'
+ | '/issue-7947-target'
+ | '/posts'
+ | '/posts/$postId'
fileRoutesById: FileRoutesById
}
export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
Issue4614Route: typeof Issue4614Route
+ Issue7947Route: typeof Issue7947Route
+ Issue7947TargetRoute: typeof Issue7947TargetRoute
PostsRoute: typeof PostsRouteWithChildren
}
@@ -84,6 +123,20 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof Issue4614RouteImport
parentRoute: typeof rootRouteImport
}
+ '/issue-7947': {
+ id: '/issue-7947'
+ path: '/issue-7947'
+ fullPath: '/issue-7947'
+ preLoaderRoute: typeof Issue7947RouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/issue-7947-target': {
+ id: '/issue-7947-target'
+ path: '/issue-7947-target'
+ fullPath: '/issue-7947-target'
+ preLoaderRoute: typeof Issue7947TargetRouteImport
+ parentRoute: typeof rootRouteImport
+ }
'/posts': {
id: '/posts'
path: '/posts'
@@ -114,6 +167,8 @@ const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren)
const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
Issue4614Route: Issue4614Route,
+ Issue7947Route: Issue7947Route,
+ Issue7947TargetRoute: Issue7947TargetRoute,
PostsRoute: PostsRouteWithChildren,
}
export const routeTree = rootRouteImport
diff --git a/e2e/react-start/selective-ssr/src/routes/issue-7947-target.tsx b/e2e/react-start/selective-ssr/src/routes/issue-7947-target.tsx
new file mode 100644
index 00000000000..b889c786f41
--- /dev/null
+++ b/e2e/react-start/selective-ssr/src/routes/issue-7947-target.tsx
@@ -0,0 +1,15 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/issue-7947-target')({
+ ssr: false,
+ // A different head shape exposes redirects that land before hydration as
+ // React's structural hydration error #418.
+ head: () => ({
+ meta: [
+ { title: 'Issue 7947 target' },
+ { name: 'robots', content: 'noindex, nofollow' },
+ { name: 'description', content: 'beforeLoad redirect target' },
+ ],
+ }),
+ component: () => Target
,
+})
diff --git a/e2e/react-start/selective-ssr/src/routes/issue-7947.tsx b/e2e/react-start/selective-ssr/src/routes/issue-7947.tsx
new file mode 100644
index 00000000000..934e60ed73e
--- /dev/null
+++ b/e2e/react-start/selective-ssr/src/routes/issue-7947.tsx
@@ -0,0 +1,10 @@
+import { createFileRoute, redirect } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/issue-7947')({
+ ssr: false,
+ head: () => ({ meta: [{ title: 'Issue 7947 origin' }] }),
+ beforeLoad: () => {
+ throw redirect({ to: '/issue-7947-target' })
+ },
+ component: () => Origin
,
+})
diff --git a/e2e/react-start/selective-ssr/tests/app.spec.ts b/e2e/react-start/selective-ssr/tests/app.spec.ts
index 89eff32caef..acf65edd0b7 100644
--- a/e2e/react-start/selective-ssr/tests/app.spec.ts
+++ b/e2e/react-start/selective-ssr/tests/app.spec.ts
@@ -4,6 +4,34 @@ import { test } from '@tanstack/router-e2e-utils'
const testCount = 7
test.describe('selective ssr', () => {
+ test('#7947: beforeLoad redirect on an ssr: false route does not cause a hydration error', async ({
+ page,
+ }) => {
+ const browserErrors: Array = []
+ // React's default onRecoverableError reports through both channels,
+ // depending on whether the development or production build is running.
+ page.on('console', (message) => {
+ if (message.type() === 'error') {
+ browserErrors.push(message.text())
+ }
+ })
+ page.on('pageerror', (error) => {
+ browserErrors.push(error.message)
+ })
+
+ await page.goto('/issue-7947')
+
+ await expect(page).toHaveURL(/\/issue-7947-target$/)
+ await expect(page.getByTestId('issue-7947-target')).toBeVisible()
+
+ const hydrationErrors = browserErrors.filter((error) =>
+ /hydrat|did not match|server rendered HTML|Minified React error #(418|423|425)\b/i.test(
+ error,
+ ),
+ )
+ expect(hydrationErrors).toEqual([])
+ })
+
test('#4614: cached parent loader data does not cache its beforeLoad context', async ({
page,
}) => {
diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json
index 7c8d4f10ca8..ef55ff39ccb 100644
--- a/e2e/react-start/server-functions/package.json
+++ b/e2e/react-start/server-functions/package.json
@@ -17,7 +17,7 @@
"test:e2e:rsbuild-cache": "playwright test -c playwright.rsbuild-cache.config.ts --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
"@tanstack/react-router-ssr-query": "workspace:^",
@@ -40,11 +40,11 @@
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"combinate": "^1.1.11",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
},
diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json
index f8082e3618f..074d26905dc 100644
--- a/e2e/react-start/server-routes/package.json
+++ b/e2e/react-start/server-routes/package.json
@@ -12,7 +12,7 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-devtools": "workspace:^",
"@tanstack/react-router-ssr-query": "workspace:^",
@@ -32,11 +32,11 @@
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"combinate": "^1.1.11",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json
index fcf78262d54..dddd52c9dab 100644
--- a/e2e/react-start/streaming-ssr/package.json
+++ b/e2e/react-start/streaming-ssr/package.json
@@ -13,7 +13,7 @@
"test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test preview-streaming.spec.ts --project=chromium"
},
"dependencies": {
- "@tanstack/react-query": "^5.80.7",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-ssr-query": "workspace:^",
"@tanstack/react-start": "workspace:^",
@@ -26,8 +26,8 @@
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "srvx": "^0.11.9",
"@typescript/native": "npm:typescript@^7.0.2",
+ "srvx": "^0.11.9",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/solid-router/basepath-file-based/package.json b/e2e/solid-router/basepath-file-based/package.json
index f7754996841..719ff2b8609 100644
--- a/e2e/solid-router/basepath-file-based/package.json
+++ b/e2e/solid-router/basepath-file-based/package.json
@@ -11,16 +11,16 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite-plugin-solid": "^3.0.0-next.23",
"vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basepath-file-based/vite.config.js b/e2e/solid-router/basepath-file-based/vite.config.js
index 29470dc9e4a..9b101abe408 100644
--- a/e2e/solid-router/basepath-file-based/vite.config.js
+++ b/e2e/solid-router/basepath-file-based/vite.config.js
@@ -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'
// https://vitejs.dev/config/
diff --git a/e2e/solid-router/basic-esbuild-file-based/package.json b/e2e/solid-router/basic-esbuild-file-based/package.json
index 80d9a7322d6..38e6c48e5c1 100644
--- a/e2e/solid-router/basic-esbuild-file-based/package.json
+++ b/e2e/solid-router/basic-esbuild-file-based/package.json
@@ -10,12 +10,12 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"zod": "^4.4.3"
},
"devDependencies": {
diff --git a/e2e/solid-router/basic-file-based-code-splitting/package.json b/e2e/solid-router/basic-file-based-code-splitting/package.json
index e3f731103e4..8a70c7aad44 100644
--- a/e2e/solid-router/basic-file-based-code-splitting/package.json
+++ b/e2e/solid-router/basic-file-based-code-splitting/package.json
@@ -11,19 +11,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts b/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts
index b5efb3bfad7..c1dfef41f49 100644
--- a/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts
+++ b/e2e/solid-router/basic-file-based-code-splitting/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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/basic-file-based/package.json b/e2e/solid-router/basic-file-based/package.json
index f7ce525af54..d8aac060263 100644
--- a/e2e/solid-router/basic-file-based/package.json
+++ b/e2e/solid-router/basic-file-based/package.json
@@ -12,21 +12,21 @@
"test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"combinate": "^1.1.11",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-file-based/vite.config.js b/e2e/solid-router/basic-file-based/vite.config.js
index bfd3a0404ec..1207e9fc582 100644
--- a/e2e/solid-router/basic-file-based/vite.config.js
+++ b/e2e/solid-router/basic-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/basic-scroll-restoration/package.json b/e2e/solid-router/basic-scroll-restoration/package.json
index 61ea000dbc8..aa8dbcc7c32 100644
--- a/e2e/solid-router/basic-scroll-restoration/package.json
+++ b/e2e/solid-router/basic-scroll-restoration/package.json
@@ -11,20 +11,20 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-virtual": "^3.13.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23",
"typescript": "~5.9.0"
}
}
diff --git a/e2e/solid-router/basic-scroll-restoration/vite.config.js b/e2e/solid-router/basic-scroll-restoration/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/e2e/solid-router/basic-scroll-restoration/vite.config.js
+++ b/e2e/solid-router/basic-scroll-restoration/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/e2e/solid-router/basic-solid-query-file-based/package.json b/e2e/solid-router/basic-solid-query-file-based/package.json
index 39acb569655..ab78c1e8a50 100644
--- a/e2e/solid-router/basic-solid-query-file-based/package.json
+++ b/e2e/solid-router/basic-solid-query-file-based/package.json
@@ -11,22 +11,22 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-solid-query-file-based/vite.config.js b/e2e/solid-router/basic-solid-query-file-based/vite.config.js
index 95863b470a8..691de8db161 100644
--- a/e2e/solid-router/basic-solid-query-file-based/vite.config.js
+++ b/e2e/solid-router/basic-solid-query-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/basic-solid-query/package.json b/e2e/solid-router/basic-solid-query/package.json
index d33019754c0..3c0bc5a7cef 100644
--- a/e2e/solid-router/basic-solid-query/package.json
+++ b/e2e/solid-router/basic-solid-query/package.json
@@ -11,20 +11,20 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-solid-query/vite.config.js b/e2e/solid-router/basic-solid-query/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/e2e/solid-router/basic-solid-query/vite.config.js
+++ b/e2e/solid-router/basic-solid-query/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/e2e/solid-router/basic-virtual-file-based/package.json b/e2e/solid-router/basic-virtual-file-based/package.json
index 0047a968ef4..51a855ff9c8 100644
--- a/e2e/solid-router/basic-virtual-file-based/package.json
+++ b/e2e/solid-router/basic-virtual-file-based/package.json
@@ -11,21 +11,21 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-virtual-file-based/vite.config.ts b/e2e/solid-router/basic-virtual-file-based/vite.config.ts
index 62bb160684e..b5a3e5d27fe 100644
--- a/e2e/solid-router/basic-virtual-file-based/vite.config.ts
+++ b/e2e/solid-router/basic-virtual-file-based/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'
import { routes } from './routes'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json
index 2a9156916cf..a409e3d007e 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json
@@ -11,21 +11,21 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts
index ec379c254de..b83b11cd241 100644
--- a/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts
+++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/basic/package.json b/e2e/solid-router/basic/package.json
index aa82fb49c99..ac973b49962 100644
--- a/e2e/solid-router/basic/package.json
+++ b/e2e/solid-router/basic/package.json
@@ -11,18 +11,18 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/basic/vite.config.js b/e2e/solid-router/basic/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/e2e/solid-router/basic/vite.config.js
+++ b/e2e/solid-router/basic/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/e2e/solid-router/generator-cli-only/package.json b/e2e/solid-router/generator-cli-only/package.json
index 22375b9f5b3..260a85acffb 100644
--- a/e2e/solid-router/generator-cli-only/package.json
+++ b/e2e/solid-router/generator-cli-only/package.json
@@ -11,19 +11,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-cli": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/generator-cli-only/vite.config.js b/e2e/solid-router/generator-cli-only/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/e2e/solid-router/generator-cli-only/vite.config.js
+++ b/e2e/solid-router/generator-cli-only/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/e2e/solid-router/js-only-file-based/package.json b/e2e/solid-router/js-only-file-based/package.json
index 12ffea795d6..423073a1681 100644
--- a/e2e/solid-router/js-only-file-based/package.json
+++ b/e2e/solid-router/js-only-file-based/package.json
@@ -11,19 +11,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/js-only-file-based/vite.config.js b/e2e/solid-router/js-only-file-based/vite.config.js
index ee3b3654493..7036e7db12d 100644
--- a/e2e/solid-router/js-only-file-based/vite.config.js
+++ b/e2e/solid-router/js-only-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/rspack-basic-file-based/package.json b/e2e/solid-router/rspack-basic-file-based/package.json
index b213e22f976..cb2978783ca 100644
--- a/e2e/solid-router/rspack-basic-file-based/package.json
+++ b/e2e/solid-router/rspack-basic-file-based/package.json
@@ -10,11 +10,11 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json
index 045fbc2a003..9b28eab4e93 100644
--- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json
@@ -10,11 +10,11 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
index 3746c37c19e..b17091410f5 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
@@ -14,20 +14,20 @@
"test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js b/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js
index e3329b79f3e..399d1d9a1f7 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/sentry-integration/package.json b/e2e/solid-router/sentry-integration/package.json
index 71f528bc69a..7f03665aa84 100644
--- a/e2e/solid-router/sentry-integration/package.json
+++ b/e2e/solid-router/sentry-integration/package.json
@@ -14,18 +14,18 @@
"@sentry/solid": "^10.32.0",
"@sentry/tracing": "^7.120.4",
"@sentry/vite-plugin": "^4.6.1",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/e2e/solid-router/sentry-integration/vite.config.js b/e2e/solid-router/sentry-integration/vite.config.js
index 0ed7f0290c1..d263417c3ba 100644
--- a/e2e/solid-router/sentry-integration/vite.config.js
+++ b/e2e/solid-router/sentry-integration/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { sentryVitePlugin } from '@sentry/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-router/view-transitions/package.json b/e2e/solid-router/view-transitions/package.json
index c6d6df4c971..5268644449b 100644
--- a/e2e/solid-router/view-transitions/package.json
+++ b/e2e/solid-router/view-transitions/package.json
@@ -11,22 +11,22 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@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"
}
}
diff --git a/e2e/solid-router/view-transitions/vite.config.js b/e2e/solid-router/view-transitions/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/e2e/solid-router/view-transitions/vite.config.js
+++ b/e2e/solid-router/view-transitions/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json
index ffcab8cc1ea..21e500e4638 100644
--- a/e2e/solid-start/basic-auth/package.json
+++ b/e2e/solid-start/basic-auth/package.json
@@ -16,16 +16,17 @@
"@libsql/client": "^0.15.15",
"@prisma/adapter-libsql": "^7.0.0",
"@prisma/client": "^7.0.0",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -35,7 +36,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/basic-auth/vite.config.ts b/e2e/solid-start/basic-auth/vite.config.ts
index eebcf3d04b4..4e321ba3827 100644
--- a/e2e/solid-start/basic-auth/vite.config.ts
+++ b/e2e/solid-start/basic-auth/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/basic-cloudflare/package.json b/e2e/solid-start/basic-cloudflare/package.json
index 103703836c9..be272ee395c 100644
--- a/e2e/solid-start/basic-cloudflare/package.json
+++ b/e2e/solid-start/basic-cloudflare/package.json
@@ -13,15 +13,16 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -29,7 +30,6 @@
"@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",
"wrangler": "^4.74.0"
}
}
diff --git a/e2e/solid-start/basic-cloudflare/vite.config.ts b/e2e/solid-start/basic-cloudflare/vite.config.ts
index b70055510b9..58fcc314091 100644
--- a/e2e/solid-start/basic-cloudflare/vite.config.ts
+++ b/e2e/solid-start/basic-cloudflare/vite.config.ts
@@ -1,7 +1,7 @@
import { defineConfig } from 'vite'
import { cloudflare } from '@cloudflare/vite-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json
index 02f5e8ee185..7f87defe3f1 100644
--- a/e2e/solid-start/basic-solid-query/package.json
+++ b/e2e/solid-start/basic-solid-query/package.json
@@ -12,20 +12,21 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-router-ssr-query": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -33,7 +34,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/basic-solid-query/vite.config.ts b/e2e/solid-start/basic-solid-query/vite.config.ts
index c0ae2c4cca2..70ab2f9f22a 100644
--- a/e2e/solid-start/basic-solid-query/vite.config.ts
+++ b/e2e/solid-start/basic-solid-query/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json
index b3ca67999b9..f1fbc62807f 100644
--- a/e2e/solid-start/basic-tsr-config/package.json
+++ b/e2e/solid-start/basic-tsr-config/package.json
@@ -11,19 +11,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
"@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"
}
}
diff --git a/e2e/solid-start/basic-tsr-config/vite.config.ts b/e2e/solid-start/basic-tsr-config/vite.config.ts
index 56b36b5c035..101392a768d 100644
--- a/e2e/solid-start/basic-tsr-config/vite.config.ts
+++ b/e2e/solid-start/basic-tsr-config/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
resolve: { tsconfigPaths: true },
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
index 563407b149f..dee9ed142e0 100644
--- a/e2e/solid-start/basic/package.json
+++ b/e2e/solid-start/basic/package.json
@@ -14,7 +14,7 @@
"test:e2e:local": "playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
@@ -22,7 +22,7 @@
"http-proxy-middleware": "^3.0.5",
"js-cookie": "^3.0.5",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
@@ -31,6 +31,7 @@
"@rsbuild/core": "^2.1.0",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^2.0.0-beta.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/postcss": "^4.2.2",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
@@ -41,8 +42,7 @@
"tailwindcss": "^4.2.2",
"@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"
},
"nx": {
"metadata": {
diff --git a/e2e/solid-start/basic/vite.config.ts b/e2e/solid-start/basic/vite.config.ts
index 3cfb9f46c89..7fd7f7925df 100644
--- a/e2e/solid-start/basic/vite.config.ts
+++ b/e2e/solid-start/basic/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import { e2eStartDummyServerForBuild } from '@tanstack/router-e2e-utils'
import { isSpaMode } from './tests/utils/isSpaMode'
import { isPrerender } from './tests/utils/isPrerender'
diff --git a/e2e/solid-start/csp/package.json b/e2e/solid-start/csp/package.json
index 9bb63a58b8f..1b0c4ac0642 100644
--- a/e2e/solid-start/csp/package.json
+++ b/e2e/solid-start/csp/package.json
@@ -11,19 +11,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
"@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"
}
}
diff --git a/e2e/solid-start/csp/vite.config.ts b/e2e/solid-start/csp/vite.config.ts
index a9913da087e..e257f5ed9e0 100644
--- a/e2e/solid-start/csp/vite.config.ts
+++ b/e2e/solid-start/csp/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
server: {
diff --git a/e2e/solid-start/css-modules/package.json b/e2e/solid-start/css-modules/package.json
index 6bd4c10be98..4ffddf31da5 100644
--- a/e2e/solid-start/css-modules/package.json
+++ b/e2e/solid-start/css-modules/package.json
@@ -14,13 +14,14 @@
"test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:*",
"@tanstack/solid-start": "workspace:*",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
"sass": "^1.97.2",
@@ -28,7 +29,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/e2e/solid-start/css-modules/vite.config.ts b/e2e/solid-start/css-modules/vite.config.ts
index 48a1788a138..e5337af8d88 100644
--- a/e2e/solid-start/css-modules/vite.config.ts
+++ b/e2e/solid-start/css-modules/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
resolve: { tsconfigPaths: true },
diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json
index 613b52e5a80..f41c8ca4fad 100644
--- a/e2e/solid-start/custom-basepath/package.json
+++ b/e2e/solid-start/custom-basepath/package.json
@@ -11,16 +11,17 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"express": "^5.2.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/express": "^5.0.6",
@@ -32,7 +33,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/e2e/solid-start/custom-basepath/vite.config.ts b/e2e/solid-start/custom-basepath/vite.config.ts
index 7f0ece5c8eb..74db2d43213 100644
--- a/e2e/solid-start/custom-basepath/vite.config.ts
+++ b/e2e/solid-start/custom-basepath/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/deferred-hydration/package.json b/e2e/solid-start/deferred-hydration/package.json
index a735999357b..0449c1edf2b 100644
--- a/e2e/solid-start/deferred-hydration/package.json
+++ b/e2e/solid-start/deferred-hydration/package.json
@@ -18,22 +18,22 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@rsbuild/core": "^2.1.0",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^2.0.0-beta.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
"@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"
},
"nx": {
"targets": {
diff --git a/e2e/solid-start/deferred-hydration/vite.config.ts b/e2e/solid-start/deferred-hydration/vite.config.ts
index 70f388638a8..ee4b99a5f5b 100644
--- a/e2e/solid-start/deferred-hydration/vite.config.ts
+++ b/e2e/solid-start/deferred-hydration/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
const outDir = process.env.E2E_DIST_DIR ?? 'dist-vite-ssr'
diff --git a/e2e/solid-start/query-integration/package.json b/e2e/solid-start/query-integration/package.json
index a567be506c3..94907ad0367 100644
--- a/e2e/solid-start/query-integration/package.json
+++ b/e2e/solid-start/query-integration/package.json
@@ -12,26 +12,26 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-router-ssr-query": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/query-integration/vite.config.ts b/e2e/solid-start/query-integration/vite.config.ts
index c0ae2c4cca2..70ab2f9f22a 100644
--- a/e2e/solid-start/query-integration/vite.config.ts
+++ b/e2e/solid-start/query-integration/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json
index 070cc20bf75..24c9d15e872 100644
--- a/e2e/solid-start/scroll-restoration/package.json
+++ b/e2e/solid-start/scroll-restoration/package.json
@@ -12,17 +12,18 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -31,7 +32,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/scroll-restoration/vite.config.ts b/e2e/solid-start/scroll-restoration/vite.config.ts
index e4bf298e6d6..fc8afa0e720 100644
--- a/e2e/solid-start/scroll-restoration/vite.config.ts
+++ b/e2e/solid-start/scroll-restoration/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json
index 00dd54d61e3..263f94d3710 100644
--- a/e2e/solid-start/selective-ssr/package.json
+++ b/e2e/solid-start/selective-ssr/package.json
@@ -12,13 +12,14 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"srvx": "^0.11.9",
@@ -26,7 +27,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/e2e/solid-start/selective-ssr/vite.config.ts b/e2e/solid-start/selective-ssr/vite.config.ts
index e4bf298e6d6..fc8afa0e720 100644
--- a/e2e/solid-start/selective-ssr/vite.config.ts
+++ b/e2e/solid-start/selective-ssr/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/serialization-adapters/package.json b/e2e/solid-start/serialization-adapters/package.json
index 4c24bf1b36e..0e08baa4130 100644
--- a/e2e/solid-start/serialization-adapters/package.json
+++ b/e2e/solid-start/serialization-adapters/package.json
@@ -12,15 +12,16 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"vite-tsconfig-paths": "^5.1.4",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -28,7 +29,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/serialization-adapters/vite.config.ts b/e2e/solid-start/serialization-adapters/vite.config.ts
index e4bf298e6d6..fc8afa0e720 100644
--- a/e2e/solid-start/serialization-adapters/vite.config.ts
+++ b/e2e/solid-start/serialization-adapters/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json
index f49db22ce4d..5e1f9ba081d 100644
--- a/e2e/solid-start/server-functions/package.json
+++ b/e2e/solid-start/server-functions/package.json
@@ -12,21 +12,22 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-router-ssr-query": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"js-cookie": "^3.0.5",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
@@ -36,7 +37,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/server-functions/vite.config.ts b/e2e/solid-start/server-functions/vite.config.ts
index fc622bbfb02..fe814d6f03e 100644
--- a/e2e/solid-start/server-functions/vite.config.ts
+++ b/e2e/solid-start/server-functions/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const FUNCTIONS_WITH_CONSTANT_ID = [
diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json
index e7f9bc8c2ef..d8e6f0b2735 100644
--- a/e2e/solid-start/server-routes/package.json
+++ b/e2e/solid-start/server-routes/package.json
@@ -12,20 +12,21 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-router-ssr-query": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"js-cookie": "^3.0.5",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
@@ -35,7 +36,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/server-routes/vite.config.ts b/e2e/solid-start/server-routes/vite.config.ts
index e4bf298e6d6..fc8afa0e720 100644
--- a/e2e/solid-start/server-routes/vite.config.ts
+++ b/e2e/solid-start/server-routes/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/solid-query-layout-suspense/package.json b/e2e/solid-start/solid-query-layout-suspense/package.json
index 7bc5265c743..2781ab357cf 100644
--- a/e2e/solid-start/solid-query-layout-suspense/package.json
+++ b/e2e/solid-start/solid-query-layout-suspense/package.json
@@ -10,19 +10,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@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"
}
}
diff --git a/e2e/solid-start/solid-query-layout-suspense/vite.config.ts b/e2e/solid-start/solid-query-layout-suspense/vite.config.ts
index e1c2d5526c4..21adb398ce2 100644
--- a/e2e/solid-start/solid-query-layout-suspense/vite.config.ts
+++ b/e2e/solid-start/solid-query-layout-suspense/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [tanstackStart(), solid({ ssr: true })],
diff --git a/e2e/solid-start/spa-mode/package.json b/e2e/solid-start/spa-mode/package.json
index d6989d456b3..5d902405743 100644
--- a/e2e/solid-start/spa-mode/package.json
+++ b/e2e/solid-start/spa-mode/package.json
@@ -12,21 +12,21 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/e2e/solid-start/spa-mode/vite.config.ts b/e2e/solid-start/spa-mode/vite.config.ts
index b0394b9bf97..45fcae2e4d1 100644
--- a/e2e/solid-start/spa-mode/vite.config.ts
+++ b/e2e/solid-start/spa-mode/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/start-manifest/package.json b/e2e/solid-start/start-manifest/package.json
index 6427e2803ef..e508e41d386 100644
--- a/e2e/solid-start/start-manifest/package.json
+++ b/e2e/solid-start/start-manifest/package.json
@@ -10,20 +10,20 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
"@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"
},
"nx": {
"targets": {
diff --git a/e2e/solid-start/start-manifest/vite.config.ts b/e2e/solid-start/start-manifest/vite.config.ts
index 896fa284f1b..e2a624d0581 100644
--- a/e2e/solid-start/start-manifest/vite.config.ts
+++ b/e2e/solid-start/start-manifest/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
server: {
diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json
index 84338d960ea..f84edafbc00 100644
--- a/e2e/solid-start/virtual-routes/package.json
+++ b/e2e/solid-start/virtual-routes/package.json
@@ -12,18 +12,19 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -32,7 +33,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/virtual-routes/vite.config.ts b/e2e/solid-start/virtual-routes/vite.config.ts
index 2dccd737ed4..498ba424e8d 100644
--- a/e2e/solid-start/virtual-routes/vite.config.ts
+++ b/e2e/solid-start/virtual-routes/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json
index 547de99c4de..d7c0c9dfbae 100644
--- a/e2e/solid-start/website/package.json
+++ b/e2e/solid-start/website/package.json
@@ -12,17 +12,18 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-start": "workspace:^",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
"@playwright/test": "^1.61.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
@@ -30,7 +31,6 @@
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/e2e/solid-start/website/vite.config.ts b/e2e/solid-start/website/vite.config.ts
index e4bf298e6d6..fc8afa0e720 100644
--- a/e2e/solid-start/website/vite.config.ts
+++ b/e2e/solid-start/website/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/e2e/vue-router/basepath-file-based/package.json b/e2e/vue-router/basepath-file-based/package.json
index c9e06e47b3a..cddebf1d0f7 100644
--- a/e2e/vue-router/basepath-file-based/package.json
+++ b/e2e/vue-router/basepath-file-based/package.json
@@ -13,7 +13,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/basic-virtual-file-based/package.json b/e2e/vue-router/basic-virtual-file-based/package.json
index 567999f255d..998ac21bde1 100644
--- a/e2e/vue-router/basic-virtual-file-based/package.json
+++ b/e2e/vue-router/basic-virtual-file-based/package.json
@@ -14,7 +14,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json
index 66f1b479553..295c9cb6f32 100644
--- a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json
@@ -14,7 +14,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/basic-vue-query-file-based/package.json b/e2e/vue-router/basic-vue-query-file-based/package.json
index 772e6303669..44417eaff44 100644
--- a/e2e/vue-router/basic-vue-query-file-based/package.json
+++ b/e2e/vue-router/basic-vue-query-file-based/package.json
@@ -13,7 +13,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/basic-vue-query/package.json b/e2e/vue-router/basic-vue-query/package.json
index b1bc2345956..a8bf14b6f48 100644
--- a/e2e/vue-router/basic-vue-query/package.json
+++ b/e2e/vue-router/basic-vue-query/package.json
@@ -12,7 +12,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/js-only-file-based/package.json b/e2e/vue-router/js-only-file-based/package.json
index d7f062038ea..f650d14f6ac 100644
--- a/e2e/vue-router/js-only-file-based/package.json
+++ b/e2e/vue-router/js-only-file-based/package.json
@@ -13,7 +13,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-router/view-transitions/package.json b/e2e/vue-router/view-transitions/package.json
index 1e693e25db2..22bb7702c56 100644
--- a/e2e/vue-router/view-transitions/package.json
+++ b/e2e/vue-router/view-transitions/package.json
@@ -13,7 +13,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json
index 9162a2b6a6a..68f23b0838f 100644
--- a/e2e/vue-start/basic-vue-query/package.json
+++ b/e2e/vue-start/basic-vue-query/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/vue-query": "^5.92.1",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^6.1.2",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
@@ -28,11 +28,11 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/vue-start/query-integration/package.json b/e2e/vue-start/query-integration/package.json
index a3b775e0ebc..b4ab0d2e037 100644
--- a/e2e/vue-start/query-integration/package.json
+++ b/e2e/vue-start/query-integration/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/vue-query": "^5.90.0",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-query-devtools": "^5.90.0",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
@@ -27,10 +27,10 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json
index 7c631b1fcca..3750c2775d7 100644
--- a/e2e/vue-start/server-functions/package.json
+++ b/e2e/vue-start/server-functions/package.json
@@ -12,7 +12,7 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/vue-query": "^5.90.9",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
"@tanstack/vue-router-ssr-query": "workspace:^",
@@ -29,12 +29,12 @@
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.10.2",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"combinate": "^1.1.11",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/e2e/vue-start/server-routes/package.json b/e2e/vue-start/server-routes/package.json
index 4407103e81e..3600196e00f 100644
--- a/e2e/vue-start/server-routes/package.json
+++ b/e2e/vue-start/server-routes/package.json
@@ -12,7 +12,7 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
- "@tanstack/vue-query": "^5.90.9",
+ "@tanstack/vue-query": "catalog:",
"@tanstack/vue-router": "workspace:^",
"@tanstack/vue-router-devtools": "workspace:^",
"@tanstack/vue-router-ssr-query": "workspace:^",
@@ -29,12 +29,12 @@
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.10.2",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"combinate": "^1.1.11",
"srvx": "^0.11.9",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json
index c6465c19405..89bc91e3bd5 100644
--- a/examples/react/authenticated-routes-firebase/package.json
+++ b/examples/react/authenticated-routes-firebase/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"firebase": "^11.4.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json
index 7e2743b760d..4d0bf221edf 100644
--- a/examples/react/authenticated-routes/package.json
+++ b/examples/react/authenticated-routes/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json
index 69239de4e0d..fd301e269b3 100644
--- a/examples/react/basic-default-search-params/package.json
+++ b/examples/react/basic-default-search-params/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -22,8 +22,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json
index 9f83a686489..7f45996dceb 100644
--- a/examples/react/basic-devtools-panel/package.json
+++ b/examples/react/basic-devtools-panel/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query-devtools": "^5.67.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json
index b13da4adca1..9c483a9003c 100644
--- a/examples/react/basic-file-based/package.json
+++ b/examples/react/basic-file-based/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json
index 0c747b097ed..75461ace4b5 100644
--- a/examples/react/basic-non-nested-devtools/package.json
+++ b/examples/react/basic-non-nested-devtools/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json
index aff759e64cd..d1dae219f8f 100644
--- a/examples/react/basic-react-query-file-based/package.json
+++ b/examples/react/basic-react-query-file-based/package.json
@@ -10,11 +10,11 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
@@ -24,8 +24,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json
index 443c16f8c86..f9f0b830e88 100644
--- a/examples/react/basic-react-query/package.json
+++ b/examples/react/basic-react-query/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -22,8 +22,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json
index c046f9e6d10..ff7a73a8412 100644
--- a/examples/react/basic-ssr-file-based/package.json
+++ b/examples/react/basic-ssr-file-based/package.json
@@ -11,8 +11,8 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"compression": "^1.8.0",
"express": "^5.2.1",
"get-port": "^7.1.0",
diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json
index f20318d88d6..d746dc9ac3d 100644
--- a/examples/react/basic-ssr-streaming-file-based/package.json
+++ b/examples/react/basic-ssr-streaming-file-based/package.json
@@ -11,8 +11,8 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"compression": "^1.8.0",
"express": "^5.2.1",
"get-port": "^7.1.0",
diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json
index b55c0b1bdf0..331faca7e92 100644
--- a/examples/react/basic-virtual-file-based/package.json
+++ b/examples/react/basic-virtual-file-based/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/virtual-file-routes": "^1.162.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json
index 473dd8a81cf..430d2fc9712 100644
--- a/examples/react/basic-virtual-inside-file-based/package.json
+++ b/examples/react/basic-virtual-inside-file-based/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/virtual-file-routes": "^1.162.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json
index c030b321f15..9e070e3e366 100644
--- a/examples/react/basic/package.json
+++ b/examples/react/basic/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json
index c36bb4fafaa..be214567c7c 100644
--- a/examples/react/deferred-data/package.json
+++ b/examples/react/deferred-data/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json
index f82d68e8cde..2b678ad81d0 100644
--- a/examples/react/i18n-paraglide/package.json
+++ b/examples/react/i18n-paraglide/package.json
@@ -11,8 +11,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"tailwindcss": "^4.2.2"
diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json
index c453ff25f68..a84776db902 100644
--- a/examples/react/kitchen-sink-file-based/package.json
+++ b/examples/react/kitchen-sink-file-based/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"immer": "^10.1.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json
index 66bce428ea0..d73c409c1cc 100644
--- a/examples/react/kitchen-sink-react-query-file-based/package.json
+++ b/examples/react/kitchen-sink-react-query-file-based/package.json
@@ -10,11 +10,11 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"immer": "^10.1.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -25,8 +25,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json
index 3ce98536f4a..f91334fcdbe 100644
--- a/examples/react/kitchen-sink-react-query/package.json
+++ b/examples/react/kitchen-sink-react-query/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"immer": "^10.1.1",
"react": "^19.0.0",
@@ -24,8 +24,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json
index 7bae6392fe4..44e34975d62 100644
--- a/examples/react/kitchen-sink/package.json
+++ b/examples/react/kitchen-sink/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"immer": "^10.1.1",
"react": "^19.0.0",
diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json
index 121a73a568d..8cfb25d8220 100644
--- a/examples/react/large-file-based/package.json
+++ b/examples/react/large-file-based/package.json
@@ -12,10 +12,10 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
@@ -25,8 +25,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json
index 34b52ef958b..e3a63e29b21 100644
--- a/examples/react/location-masking/package.json
+++ b/examples/react/location-masking/package.json
@@ -11,8 +11,8 @@
"dependencies": {
"@radix-ui/react-dialog": "^1.1.6",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -22,8 +22,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json
index cb92d282769..384b8da15ec 100644
--- a/examples/react/navigation-blocking/package.json
+++ b/examples/react/navigation-blocking/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -21,8 +21,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json
index ad2e79b6eca..77c0de6e15f 100644
--- a/examples/react/quickstart-esbuild-file-based/package.json
+++ b/examples/react/quickstart-esbuild-file-based/package.json
@@ -9,9 +9,9 @@
"start": "dev"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json
index 164630daea1..ebf82a35b03 100644
--- a/examples/react/quickstart-file-based/package.json
+++ b/examples/react/quickstart-file-based/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json
index b758b8a56c3..cf992365999 100644
--- a/examples/react/quickstart-rspack-file-based/package.json
+++ b/examples/react/quickstart-rspack-file-based/package.json
@@ -9,7 +9,7 @@
},
"dependencies": {
"@tailwindcss/postcss": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"postcss": "^8.5.1",
"react": "^19.0.0",
@@ -19,7 +19,7 @@
"devDependencies": {
"@rsbuild/core": "^2.1.0",
"@rsbuild/plugin-react": "^2.0.0",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@typescript/native": "npm:typescript@^7.0.2",
diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json
index 99386be4014..90657914768 100644
--- a/examples/react/quickstart-webpack-file-based/package.json
+++ b/examples/react/quickstart-webpack-file-based/package.json
@@ -7,14 +7,14 @@
"build": "webpack build && tsc --noEmit"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@swc/core": "^1.15.33",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"html-webpack-plugin": "^5.6.3",
diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json
index 8e57454acf3..18060c100e2 100644
--- a/examples/react/quickstart/package.json
+++ b/examples/react/quickstart/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json
index 7dfb8c6be66..cb5463380e2 100644
--- a/examples/react/router-monorepo-react-query/package.json
+++ b/examples/react/router-monorepo-react-query/package.json
@@ -10,11 +10,11 @@
"dev": "pnpm post-query build && pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
@@ -24,8 +24,8 @@
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@typescript/native": "npm:typescript@^7.0.2",
- "typescript": "npm:@typescript/typescript6@^6.0.2",
"@vitejs/plugin-react": "^6.0.1",
+ "typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
"vite-plugin-dts": "^4.5.4"
},
diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json
index 336998abe7f..0fa6999da04 100644
--- a/examples/react/router-monorepo-react-query/packages/app/package.json
+++ b/examples/react/router-monorepo-react-query/packages/app/package.json
@@ -11,21 +11,21 @@
"dependencies": {
"@router-mono-react-query/post-feature": "workspace:*",
"@router-mono-react-query/router": "workspace:*",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
+ "@tailwindcss/vite": "^4.2.2",
"@tanstack/react-router-devtools": "^1.167.1",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-dts": "^4.5.4",
- "@tailwindcss/vite": "^4.2.2"
+ "vite-plugin-dts": "^4.5.4"
},
"nx": {
"targets": {
diff --git a/examples/react/router-monorepo-react-query/packages/post-feature/package.json b/examples/react/router-monorepo-react-query/packages/post-feature/package.json
index 21dc0d77939..17f9480ba1e 100644
--- a/examples/react/router-monorepo-react-query/packages/post-feature/package.json
+++ b/examples/react/router-monorepo-react-query/packages/post-feature/package.json
@@ -8,17 +8,17 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
"@router-mono-react-query/post-query": "workspace:*",
"@router-mono-react-query/router": "workspace:*",
+ "@tanstack/react-query": "catalog:",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
"vite-plugin-dts": "^4.5.4"
diff --git a/examples/react/router-monorepo-react-query/packages/post-query/package.json b/examples/react/router-monorepo-react-query/packages/post-query/package.json
index 15b1daa4639..9c940a81ea1 100644
--- a/examples/react/router-monorepo-react-query/packages/post-query/package.json
+++ b/examples/react/router-monorepo-react-query/packages/post-query/package.json
@@ -8,13 +8,13 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"redaxios": "^0.5.1",
"zod": "^4.4.3"
},
"devDependencies": {
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json
index 8840dea47b8..47275bd87ec 100644
--- a/examples/react/router-monorepo-react-query/packages/router/package.json
+++ b/examples/react/router-monorepo-react-query/packages/router/package.json
@@ -9,10 +9,10 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@router-mono-react-query/post-query": "workspace:*",
- "@tanstack/history": "^1.162.0",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
@@ -21,8 +21,8 @@
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
"vite-plugin-dts": "^4.5.4"
diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json
index 6297e540dec..4d94d0af5cd 100644
--- a/examples/react/router-monorepo-simple-lazy/package.json
+++ b/examples/react/router-monorepo-simple-lazy/package.json
@@ -8,9 +8,9 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
diff --git a/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json b/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json
index 5e387f61f47..0103fd674c6 100644
--- a/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json
+++ b/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json
@@ -16,16 +16,16 @@
}
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
"@router-mono-simple-lazy/router": "workspace:*",
+ "@tanstack/react-query": "catalog:",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
"vite-plugin-dts": "^4.5.4"
diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json
index ee48da871fa..5b893303546 100644
--- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json
+++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json
@@ -8,9 +8,9 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/history": "^1.162.0",
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json
index b6df4df4a5e..18065c806d9 100644
--- a/examples/react/router-monorepo-simple/package.json
+++ b/examples/react/router-monorepo-simple/package.json
@@ -8,9 +8,9 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json
index b59ef63fc93..168472d5f98 100644
--- a/examples/react/router-monorepo-simple/packages/router/package.json
+++ b/examples/react/router-monorepo-simple/packages/router/package.json
@@ -8,9 +8,9 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/history": "^1.162.0",
- "@tanstack/react-router": "^1.170.19",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/react-router": "^1.170.27",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json
index 76081ff3b04..e7ee10c8e1c 100644
--- a/examples/react/scroll-restoration/package.json
+++ b/examples/react/scroll-restoration/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"@tanstack/react-virtual": "^3.13.0",
"react": "^19.0.0",
diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json
index 86700f3b13f..8e9df46d5e8 100644
--- a/examples/react/search-validator-adapters/package.json
+++ b/examples/react/search-validator-adapters/package.json
@@ -12,10 +12,10 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/arktype-adapter": "^1.167.0",
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/valibot-adapter": "^1.167.0",
"@tanstack/zod-adapter": "^1.167.0",
"arktype": "^2.1.7",
@@ -30,8 +30,8 @@
"@testing-library/react": "^16.2.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
- "@vitejs/plugin-react": "^6.0.1",
"@typescript/native": "npm:typescript@^7.0.2",
+ "@vitejs/plugin-react": "^6.0.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json
index 4afcc5b3f65..330b1d01529 100644
--- a/examples/react/start-bare/package.json
+++ b/examples/react/start-bare/package.json
@@ -10,9 +10,9 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"zod": "^4.4.3"
diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json
index c4fab434de0..56713b84304 100644
--- a/examples/react/start-basic-auth/package.json
+++ b/examples/react/start-basic-auth/package.json
@@ -14,9 +14,9 @@
"@libsql/client": "^0.15.15",
"@prisma/adapter-libsql": "^7.0.0",
"@prisma/client": "^7.0.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json
index 7648214f17c..317124a8004 100644
--- a/examples/react/start-basic-authjs/package.json
+++ b/examples/react/start-basic-authjs/package.json
@@ -11,9 +11,9 @@
},
"dependencies": {
"@auth/core": "^0.41.1",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"start-authjs": "^1.0.0",
diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json
index ffc5a68c715..95cc169a066 100644
--- a/examples/react/start-basic-cloudflare/package.json
+++ b/examples/react/start-basic-cloudflare/package.json
@@ -12,9 +12,9 @@
"postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json
index eb16a1b7eb0..2903bac7ad2 100644
--- a/examples/react/start-basic-react-query/package.json
+++ b/examples/react/start-basic-react-query/package.json
@@ -10,12 +10,12 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
@@ -26,9 +26,9 @@
"@types/node": "^22.5.4",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json
index 9de8f02a015..44afd5733f2 100644
--- a/examples/react/start-basic-rsbuild/package.json
+++ b/examples/react/start-basic-rsbuild/package.json
@@ -10,9 +10,9 @@
"start": "srvx --prod -s ../client dist/server/index.js"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"tailwind-merge": "^3.6.0",
diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json
index ac369b8faf9..d8e4c367b9b 100644
--- a/examples/react/start-basic-static/package.json
+++ b/examples/react/start-basic-static/package.json
@@ -10,10 +10,10 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
- "@tanstack/start-static-server-functions": "^1.167.20",
+ "@tanstack/react-start": "^1.168.44",
+ "@tanstack/start-static-server-functions": "^1.167.27",
"@vitejs/plugin-react": "^6.0.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json
index ade898753f4..70165026a4d 100644
--- a/examples/react/start-basic/package.json
+++ b/examples/react/start-basic/package.json
@@ -10,9 +10,9 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"tailwind-merge": "^3.6.0",
diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json
index 9c9b7e20e28..4bd6f10b481 100644
--- a/examples/react/start-bun/package.json
+++ b/examples/react/start-bun/package.json
@@ -15,11 +15,11 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-devtools": "^0.7.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/react-start": "^1.168.44",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"tailwindcss": "^4.2.2"
diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json
index eb068eb88de..7e4697e46dc 100644
--- a/examples/react/start-clerk-basic/package.json
+++ b/examples/react/start-clerk-basic/package.json
@@ -11,9 +11,9 @@
},
"dependencies": {
"@clerk/tanstack-react-start": "^0.27.14",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"@vitejs/plugin-react": "^6.0.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json
index 998eaa26b50..cdf629aaeae 100644
--- a/examples/react/start-convex-trellaux/package.json
+++ b/examples/react/start-convex-trellaux/package.json
@@ -13,12 +13,12 @@
},
"dependencies": {
"@convex-dev/react-query": "0.0.0-alpha.8",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"concurrently": "^8.2.2",
"convex": "^1.19.0",
"ky": "^1.7.4",
@@ -35,9 +35,9 @@
"@types/node": "22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json
index afaedb0b1dc..257959da0f8 100644
--- a/examples/react/start-counter/package.json
+++ b/examples/react/start-counter/package.json
@@ -10,9 +10,9 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
diff --git a/examples/react/start-i18n-paraglide/package.json b/examples/react/start-i18n-paraglide/package.json
index 88d9c81298e..f8519b2f956 100644
--- a/examples/react/start-i18n-paraglide/package.json
+++ b/examples/react/start-i18n-paraglide/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tanstack/react-devtools": "^0.7.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.1.1",
"react-dom": "^19.1.1"
},
diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json
index 369d1abe200..7f8b5349163 100644
--- a/examples/react/start-large/package.json
+++ b/examples/react/start-large/package.json
@@ -12,10 +12,10 @@
"test:types": "tsc --extendedDiagnostics"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
@@ -27,9 +27,9 @@
"@types/node": "^22.5.4",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
},
diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json
index 3b4588ef3fb..8ff3e1d6ce4 100644
--- a/examples/react/start-material-ui/package.json
+++ b/examples/react/start-material-ui/package.json
@@ -15,9 +15,9 @@
"@emotion/styled": "11.14.0",
"@fontsource-variable/roboto": "5.2.5",
"@mui/material": "6.4.7",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"zod": "^4.4.3"
diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json
index b3e98d61905..b8c448ea68b 100644
--- a/examples/react/start-rscs/package.json
+++ b/examples/react/start-rscs/package.json
@@ -10,9 +10,9 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"dexie": "^4.0.10",
"react": "^19.2.0",
"react-dom": "^19.2.0",
diff --git a/examples/react/start-streaming-data-from-server-functions/package.json b/examples/react/start-streaming-data-from-server-functions/package.json
index 0cf6b2d40a0..70e73cdb2a7 100644
--- a/examples/react/start-streaming-data-from-server-functions/package.json
+++ b/examples/react/start-streaming-data-from-server-functions/package.json
@@ -10,9 +10,9 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"zod": "^4.4.3"
diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json
index 79132b7bf60..b760367ccd8 100644
--- a/examples/react/start-supabase-basic/package.json
+++ b/examples/react/start-supabase-basic/package.json
@@ -15,9 +15,9 @@
"dependencies": {
"@supabase/ssr": "^0.5.2",
"@supabase/supabase-js": "^2.48.1",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json
index bbfa2f7dee2..711e4e5ae32 100644
--- a/examples/react/start-tailwind-v4/package.json
+++ b/examples/react/start-tailwind-v4/package.json
@@ -10,9 +10,9 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"tailwind-merge": "^3.6.0",
diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json
index 723fe3f70e4..99977c5bc92 100644
--- a/examples/react/start-trellaux/package.json
+++ b/examples/react/start-trellaux/package.json
@@ -10,12 +10,12 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"ky": "^1.7.4",
"msw": "^2.7.0",
"react": "^19.0.0",
@@ -30,9 +30,9 @@
"@types/node": "22.10.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
+ "@typescript/native": "npm:typescript@^7.0.2",
"@vitejs/plugin-react": "^6.0.1",
"tailwindcss": "^4.2.2",
- "@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
}
diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json
index 0fc2bb046cb..f4917595d40 100644
--- a/examples/react/start-workos/package.json
+++ b/examples/react/start-workos/package.json
@@ -14,9 +14,9 @@
"license": "MIT",
"dependencies": {
"@radix-ui/themes": "^3.3.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/react-start": "^1.168.36",
+ "@tanstack/react-start": "^1.168.44",
"@workos/authkit-tanstack-react-start": "^0.5.0",
"react": "^19.0.0",
"react-dom": "^19.0.0"
diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json
index a597e63551d..da746430b46 100644
--- a/examples/react/view-transitions/package.json
+++ b/examples/react/view-transitions/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json
index cbd7e1e24f4..e833154633f 100644
--- a/examples/react/with-framer-motion/package.json
+++ b/examples/react/with-framer-motion/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
"framer-motion": "^11.18.2",
"react": "^19.0.0",
diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json
index 9e623203662..492aeffaa83 100644
--- a/examples/react/with-trpc-react-query/package.json
+++ b/examples/react/with-trpc-react-query/package.json
@@ -11,11 +11,11 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-query": "^5.90.0",
+ "@tanstack/react-query": "catalog:",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@trpc/client": "^11.4.3",
"@trpc/server": "^11.4.3",
"@trpc/tanstack-react-query": "^11.4.3",
diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json
index 6b872333861..a43d01e4a0a 100644
--- a/examples/react/with-trpc/package.json
+++ b/examples/react/with-trpc/package.json
@@ -11,9 +11,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/react-router": "^1.170.19",
+ "@tanstack/react-router": "^1.170.27",
"@tanstack/react-router-devtools": "^1.167.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@trpc/client": "^11.4.3",
"@trpc/server": "^11.4.3",
"express": "^5.2.1",
diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json
index b2a8b9d3da6..030ceca9058 100644
--- a/examples/solid/authenticated-routes-firebase/package.json
+++ b/examples/solid/authenticated-routes-firebase/package.json
@@ -9,22 +9,22 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"firebase": "^11.4.0",
"redaxios": "^0.5.1",
"simple-icons": "^14.9.0",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/authenticated-routes-firebase/vite.config.js b/examples/solid/authenticated-routes-firebase/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/authenticated-routes-firebase/vite.config.js
+++ b/examples/solid/authenticated-routes-firebase/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json
index a03c23d6ca6..8e7c6c6eb23 100644
--- a/examples/solid/authenticated-routes/package.json
+++ b/examples/solid/authenticated-routes/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/authenticated-routes/vite.config.js b/examples/solid/authenticated-routes/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/authenticated-routes/vite.config.js
+++ b/examples/solid/authenticated-routes/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json
index a8986ed1392..426c58f9261 100644
--- a/examples/solid/basic-default-search-params/package.json
+++ b/examples/solid/basic-default-search-params/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/basic-default-search-params/vite.config.js b/examples/solid/basic-default-search-params/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/basic-default-search-params/vite.config.js
+++ b/examples/solid/basic-default-search-params/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json
index c6e56817f6b..d7244698399 100644
--- a/examples/solid/basic-devtools-panel/package.json
+++ b/examples/solid/basic-devtools-panel/package.json
@@ -9,18 +9,18 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/basic-devtools-panel/vite.config.js b/examples/solid/basic-devtools-panel/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/basic-devtools-panel/vite.config.js
+++ b/examples/solid/basic-devtools-panel/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json
index 560333b48dd..2824cc36d05 100644
--- a/examples/solid/basic-file-based/package.json
+++ b/examples/solid/basic-file-based/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@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"
}
}
diff --git a/examples/solid/basic-file-based/vite.config.js b/examples/solid/basic-file-based/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/basic-file-based/vite.config.js
+++ b/examples/solid/basic-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json
index 2861e6629f7..1c49b2afeee 100644
--- a/examples/solid/basic-non-nested-devtools/package.json
+++ b/examples/solid/basic-non-nested-devtools/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@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"
}
}
diff --git a/examples/solid/basic-non-nested-devtools/vite.config.js b/examples/solid/basic-non-nested-devtools/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/basic-non-nested-devtools/vite.config.js
+++ b/examples/solid/basic-non-nested-devtools/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json
index b0d6ae35472..ce4f39c1098 100644
--- a/examples/solid/basic-solid-query-file-based/package.json
+++ b/examples/solid/basic-solid-query-file-based/package.json
@@ -10,22 +10,22 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@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"
}
}
diff --git a/examples/solid/basic-solid-query-file-based/vite.config.js b/examples/solid/basic-solid-query-file-based/vite.config.js
index 95863b470a8..691de8db161 100644
--- a/examples/solid/basic-solid-query-file-based/vite.config.js
+++ b/examples/solid/basic-solid-query-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json
index 7bc4191f358..c34642df9fd 100644
--- a/examples/solid/basic-solid-query/package.json
+++ b/examples/solid/basic-solid-query/package.json
@@ -9,21 +9,21 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@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"
}
}
diff --git a/examples/solid/basic-solid-query/vite.config.js b/examples/solid/basic-solid-query/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/basic-solid-query/vite.config.js
+++ b/examples/solid/basic-solid-query/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json
index b01fab352a1..c61e3040b53 100644
--- a/examples/solid/basic-ssr-file-based/package.json
+++ b/examples/solid/basic-ssr-file-based/package.json
@@ -11,21 +11,21 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
"compression": "^1.8.0",
"express": "^5.2.1",
"get-port": "^7.1.0",
"node-fetch": "^3.3.2",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@types/express": "^5.0.6",
"@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"
}
}
diff --git a/examples/solid/basic-ssr-file-based/vite.config.ts b/examples/solid/basic-ssr-file-based/vite.config.ts
index 1d86df82a17..b2fb01412d8 100644
--- a/examples/solid/basic-ssr-file-based/vite.config.ts
+++ b/examples/solid/basic-ssr-file-based/vite.config.ts
@@ -2,7 +2,7 @@ import path from 'node:path'
import url from 'node:url'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import type { BuildEnvironmentOptions } from 'vite'
const __filename = url.fileURLToPath(import.meta.url)
diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json
index 7a75852a96d..3973737778e 100644
--- a/examples/solid/basic-ssr-streaming-file-based/package.json
+++ b/examples/solid/basic-ssr-streaming-file-based/package.json
@@ -11,25 +11,25 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"compression": "^1.8.0",
"express": "^5.2.1",
"get-port": "^7.1.0",
"node-fetch": "^3.3.2",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@types/express": "^5.0.6",
"@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"
}
}
diff --git a/examples/solid/basic-ssr-streaming-file-based/vite.config.js b/examples/solid/basic-ssr-streaming-file-based/vite.config.js
index 03bd2116e44..f3dc4ab0030 100644
--- a/examples/solid/basic-ssr-streaming-file-based/vite.config.js
+++ b/examples/solid/basic-ssr-streaming-file-based/vite.config.js
@@ -1,7 +1,7 @@
import url from 'node:url'
import path from 'node:path'
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json
index 06c7d33e129..768d4436d25 100644
--- a/examples/solid/basic-virtual-file-based/package.json
+++ b/examples/solid/basic-virtual-file-based/package.json
@@ -9,21 +9,21 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@tanstack/virtual-file-routes": "^1.162.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/basic-virtual-file-based/vite.config.ts b/examples/solid/basic-virtual-file-based/vite.config.ts
index ec379c254de..b83b11cd241 100644
--- a/examples/solid/basic-virtual-file-based/vite.config.ts
+++ b/examples/solid/basic-virtual-file-based/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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json
index df32f13ff6c..30fc2e1af80 100644
--- a/examples/solid/basic-virtual-inside-file-based/package.json
+++ b/examples/solid/basic-virtual-inside-file-based/package.json
@@ -9,21 +9,21 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@tanstack/virtual-file-routes": "^1.162.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/basic-virtual-inside-file-based/vite.config.ts b/examples/solid/basic-virtual-inside-file-based/vite.config.ts
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/basic-virtual-inside-file-based/vite.config.ts
+++ b/examples/solid/basic-virtual-inside-file-based/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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index 8719730c81e..fcb92bfa9cb 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@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"
}
}
diff --git a/examples/solid/basic/vite.config.js b/examples/solid/basic/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/basic/vite.config.js
+++ b/examples/solid/basic/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json
index 959b75dfe9d..c1b3aaf7565 100644
--- a/examples/solid/deferred-data/package.json
+++ b/examples/solid/deferred-data/package.json
@@ -9,19 +9,19 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/deferred-data/vite.config.js b/examples/solid/deferred-data/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/deferred-data/vite.config.js
+++ b/examples/solid/deferred-data/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json
index e259a9bcd65..58c5ebae750 100644
--- a/examples/solid/i18n-paraglide/package.json
+++ b/examples/solid/i18n-paraglide/package.json
@@ -10,19 +10,19 @@
"test": "vitest run"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "solid-js": "2.0.0-beta.32",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@inlang/paraglide-js": "^2.4.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.18.6",
"@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"
}
}
diff --git a/examples/solid/i18n-paraglide/vite.config.ts b/examples/solid/i18n-paraglide/vite.config.ts
index 90768fc32e3..0c9eb28a4c8 100644
--- a/examples/solid/i18n-paraglide/vite.config.ts
+++ b/examples/solid/i18n-paraglide/vite.config.ts
@@ -1,6 +1,6 @@
import { resolve } from 'node:path'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
import { paraglideVitePlugin } from '@inlang/paraglide-js'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json
index 1ddaf901c94..7887101302f 100644
--- a/examples/solid/kitchen-sink-file-based/package.json
+++ b/examples/solid/kitchen-sink-file-based/package.json
@@ -9,21 +9,21 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@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"
}
}
diff --git a/examples/solid/kitchen-sink-file-based/vite.config.js b/examples/solid/kitchen-sink-file-based/vite.config.js
index ca85ceebb47..4c47e5e07e2 100644
--- a/examples/solid/kitchen-sink-file-based/vite.config.js
+++ b/examples/solid/kitchen-sink-file-based/vite.config.js
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
-import solidPlugin from 'vite-plugin-solid'
+import solidPlugin from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json
index aafe71a8036..cdcdd950931 100644
--- a/examples/solid/kitchen-sink-solid-query-file-based/package.json
+++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json
@@ -9,23 +9,23 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/kitchen-sink-solid-query-file-based/vite.config.js b/examples/solid/kitchen-sink-solid-query-file-based/vite.config.js
index 378aa5c234c..25b144fb129 100644
--- a/examples/solid/kitchen-sink-solid-query-file-based/vite.config.js
+++ b/examples/solid/kitchen-sink-solid-query-file-based/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { TanStackRouterVite } from '@tanstack/router-plugin/vite'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json
index 692b9bb2c83..16f78034036 100644
--- a/examples/solid/kitchen-sink-solid-query/package.json
+++ b/examples/solid/kitchen-sink-solid-query/package.json
@@ -9,22 +9,22 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/kitchen-sink-solid-query/vite.config.js b/examples/solid/kitchen-sink-solid-query/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/kitchen-sink-solid-query/vite.config.js
+++ b/examples/solid/kitchen-sink-solid-query/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json
index 81f288a82e0..d4d7928fbd8 100644
--- a/examples/solid/kitchen-sink/package.json
+++ b/examples/solid/kitchen-sink/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/kitchen-sink/vite.config.js b/examples/solid/kitchen-sink/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/kitchen-sink/vite.config.js
+++ b/examples/solid/kitchen-sink/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json
index fcb46a10a50..993cedf297d 100644
--- a/examples/solid/large-file-based/package.json
+++ b/examples/solid/large-file-based/package.json
@@ -11,21 +11,21 @@
"test:types": "tsc --extendedDiagnostics"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/large-file-based/vite.config.js b/examples/solid/large-file-based/vite.config.js
index 95863b470a8..691de8db161 100644
--- a/examples/solid/large-file-based/vite.config.js
+++ b/examples/solid/large-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json
index cd4db508573..0c694055335 100644
--- a/examples/solid/location-masking/package.json
+++ b/examples/solid/location-masking/package.json
@@ -9,19 +9,19 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/location-masking/vite.config.js b/examples/solid/location-masking/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/location-masking/vite.config.js
+++ b/examples/solid/location-masking/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json
index 2d01bb83b0e..28605eecf32 100644
--- a/examples/solid/navigation-blocking/package.json
+++ b/examples/solid/navigation-blocking/package.json
@@ -9,19 +9,19 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/navigation-blocking/vite.config.js b/examples/solid/navigation-blocking/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/navigation-blocking/vite.config.js
+++ b/examples/solid/navigation-blocking/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json
index 3bc314d9457..ff945cfb9e6 100644
--- a/examples/solid/quickstart-esbuild-file-based/package.json
+++ b/examples/solid/quickstart-esbuild-file-based/package.json
@@ -9,12 +9,12 @@
"start": "dev"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json
index d1eac6412be..09fcfdff91c 100644
--- a/examples/solid/quickstart-file-based/package.json
+++ b/examples/solid/quickstart-file-based/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.24",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@tanstack/router-plugin": "^1.168.30",
"@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"
}
}
diff --git a/examples/solid/quickstart-file-based/vite.config.js b/examples/solid/quickstart-file-based/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/quickstart-file-based/vite.config.js
+++ b/examples/solid/quickstart-file-based/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json
index 5e605d90c6f..fa5046b442e 100644
--- a/examples/solid/quickstart-rspack-file-based/package.json
+++ b/examples/solid/quickstart-rspack-file-based/package.json
@@ -8,19 +8,19 @@
"preview": "rsbuild preview"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/postcss": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"postcss": "^8.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@rsbuild/core": "^2.1.0",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^2.0.0-beta.0",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2"
}
diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json
index aa3bfda5105..c60e893cfa7 100644
--- a/examples/solid/quickstart-webpack-file-based/package.json
+++ b/examples/solid/quickstart-webpack-file-based/package.json
@@ -7,18 +7,18 @@
"build": "webpack build && tsc --noEmit"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "solid-js": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/preset-typescript": "^7.27.1",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"babel-loader": "^10.0.0",
- "babel-preset-solid": "2.0.0-beta.32",
+ "babel-preset-solid": "^2.0.0-rc.0",
"css-loader": "^7.1.2",
"html-webpack-plugin": "^5.6.3",
"postcss": "^8.5.6",
diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json
index 5e972274e5a..8e26949268f 100644
--- a/examples/solid/quickstart/package.json
+++ b/examples/solid/quickstart/package.json
@@ -9,17 +9,17 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "solid-js": "2.0.0-beta.32",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/quickstart/vite.config.js b/examples/solid/quickstart/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/quickstart/vite.config.js
+++ b/examples/solid/quickstart/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json
index 0577ae1dd0f..8c889bd8b41 100644
--- a/examples/solid/router-monorepo-simple-lazy/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/package.json
@@ -8,20 +8,20 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.7.4",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-dts": "^4.5.4",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite-plugin-dts": "^4.5.4"
},
"keywords": [],
"author": "",
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/app/vite.config.ts b/examples/solid/router-monorepo-simple-lazy/packages/app/vite.config.ts
index 474d3104bdb..a81c91a24cc 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/app/vite.config.ts
+++ b/examples/solid/router-monorepo-simple-lazy/packages/app/vite.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const __filename = fileURLToPath(import.meta.url)
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/post-feature/package.json b/examples/solid/router-monorepo-simple-lazy/packages/post-feature/package.json
index 92524a47042..7ebbf409e7b 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/post-feature/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/packages/post-feature/package.json
@@ -16,13 +16,13 @@
}
},
"dependencies": {
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@router-solid-mono-simple-lazy/router": "workspace:*",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/post-feature/vite.config.ts b/examples/solid/router-monorepo-simple-lazy/packages/post-feature/vite.config.ts
index e5ab1b29f5a..c5d8be8cbe8 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/post-feature/vite.config.ts
+++ b/examples/solid/router-monorepo-simple-lazy/packages/post-feature/vite.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
index f4492661aca..b9186d78639 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
@@ -8,16 +8,16 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/history": "^1.162.0",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/router-plugin": "^1.168.24",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/vite.config.ts b/examples/solid/router-monorepo-simple-lazy/packages/router/vite.config.ts
index fd99b4b7de1..d06f41bdfb4 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/router/vite.config.ts
+++ b/examples/solid/router-monorepo-simple-lazy/packages/router/vite.config.ts
@@ -3,7 +3,7 @@ import dts from 'vite-plugin-dts'
import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json
index d97ccecb1a4..719e2ff9d69 100644
--- a/examples/solid/router-monorepo-simple/package.json
+++ b/examples/solid/router-monorepo-simple/package.json
@@ -8,20 +8,20 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.7.4",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-dts": "^4.5.4",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite-plugin-dts": "^4.5.4"
},
"keywords": [],
"author": "",
diff --git a/examples/solid/router-monorepo-simple/packages/app/package.json b/examples/solid/router-monorepo-simple/packages/app/package.json
index 514423c7f1d..87d205c595b 100644
--- a/examples/solid/router-monorepo-simple/packages/app/package.json
+++ b/examples/solid/router-monorepo-simple/packages/app/package.json
@@ -11,11 +11,11 @@
"dependencies": {
"@router-solid-mono-simple/post-feature": "workspace:*",
"@router-solid-mono-simple/router": "workspace:*",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"@tanstack/solid-router-devtools": "^2.0.0-beta.25",
diff --git a/examples/solid/router-monorepo-simple/packages/app/vite.config.ts b/examples/solid/router-monorepo-simple/packages/app/vite.config.ts
index da34410003f..c9a3fc1400e 100644
--- a/examples/solid/router-monorepo-simple/packages/app/vite.config.ts
+++ b/examples/solid/router-monorepo-simple/packages/app/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import * as path from 'node:path'
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const __filename = fileURLToPath(import.meta.url)
diff --git a/examples/solid/router-monorepo-simple/packages/post-feature/package.json b/examples/solid/router-monorepo-simple/packages/post-feature/package.json
index 228e417db14..29561dba8b2 100644
--- a/examples/solid/router-monorepo-simple/packages/post-feature/package.json
+++ b/examples/solid/router-monorepo-simple/packages/post-feature/package.json
@@ -9,11 +9,11 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@router-solid-mono-simple/router": "workspace:*",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-simple/packages/post-feature/vite.config.ts b/examples/solid/router-monorepo-simple/packages/post-feature/vite.config.ts
index fec43f13329..f0577156179 100644
--- a/examples/solid/router-monorepo-simple/packages/post-feature/vite.config.ts
+++ b/examples/solid/router-monorepo-simple/packages/post-feature/vite.config.ts
@@ -2,7 +2,7 @@ import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json
index 0714ac9c151..81de1cb47fc 100644
--- a/examples/solid/router-monorepo-simple/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple/packages/router/package.json
@@ -8,16 +8,16 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/history": "^1.162.0",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/router-plugin": "^1.168.24",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-simple/packages/router/vite.config.ts b/examples/solid/router-monorepo-simple/packages/router/vite.config.ts
index fd99b4b7de1..d06f41bdfb4 100644
--- a/examples/solid/router-monorepo-simple/packages/router/vite.config.ts
+++ b/examples/solid/router-monorepo-simple/packages/router/vite.config.ts
@@ -3,7 +3,7 @@ import dts from 'vite-plugin-dts'
import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json
index 3bc87f9ab28..0a09fd23132 100644
--- a/examples/solid/router-monorepo-solid-query/package.json
+++ b/examples/solid/router-monorepo-solid-query/package.json
@@ -10,22 +10,22 @@
"dev": "pnpm post-query build && pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.10.2",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-dts": "^4.5.4",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite-plugin-dts": "^4.5.4"
},
"keywords": [],
"author": "",
diff --git a/examples/solid/router-monorepo-solid-query/packages/app/package.json b/examples/solid/router-monorepo-solid-query/packages/app/package.json
index 9cb16583674..0c14f6f2925 100644
--- a/examples/solid/router-monorepo-solid-query/packages/app/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/app/package.json
@@ -9,14 +9,14 @@
"start": "vite"
},
"dependencies": {
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@router-solid-mono-solid-query/post-feature": "workspace:*",
"@router-solid-mono-solid-query/router": "workspace:*",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"@tanstack/solid-router-devtools": "^2.0.0-beta.25",
diff --git a/examples/solid/router-monorepo-solid-query/packages/app/vite.config.ts b/examples/solid/router-monorepo-solid-query/packages/app/vite.config.ts
index da34410003f..c9a3fc1400e 100644
--- a/examples/solid/router-monorepo-solid-query/packages/app/vite.config.ts
+++ b/examples/solid/router-monorepo-solid-query/packages/app/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import * as path from 'node:path'
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const __filename = fileURLToPath(import.meta.url)
diff --git a/examples/solid/router-monorepo-solid-query/packages/post-feature/package.json b/examples/solid/router-monorepo-solid-query/packages/post-feature/package.json
index c597f6c4a55..d9f20f0b942 100644
--- a/examples/solid/router-monorepo-solid-query/packages/post-feature/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/post-feature/package.json
@@ -8,14 +8,14 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@router-solid-mono-solid-query/post-query": "workspace:*",
"@router-solid-mono-solid-query/router": "workspace:*",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-solid-query/packages/post-feature/vite.config.ts b/examples/solid/router-monorepo-solid-query/packages/post-feature/vite.config.ts
index 58bcbd81a08..e924c1f34d3 100644
--- a/examples/solid/router-monorepo-solid-query/packages/post-feature/vite.config.ts
+++ b/examples/solid/router-monorepo-solid-query/packages/post-feature/vite.config.ts
@@ -2,7 +2,7 @@ import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/router-monorepo-solid-query/packages/post-query/package.json b/examples/solid/router-monorepo-solid-query/packages/post-query/package.json
index 4040ce53406..de141ee54ae 100644
--- a/examples/solid/router-monorepo-solid-query/packages/post-query/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/post-query/package.json
@@ -8,12 +8,12 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"redaxios": "^0.5.1",
"zod": "^4.4.3"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14"
diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json
index c7be51da0f2..8cc82c9fb16 100644
--- a/examples/solid/router-monorepo-solid-query/packages/router/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json
@@ -8,18 +8,18 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
- "@tanstack/history": "^1.162.0",
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@tanstack/history": "^1.162.1",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/router-plugin": "^1.168.24",
"@router-solid-mono-solid-query/post-query": "workspace:*",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
- "solid-js": "2.0.0-beta.32",
- "@solidjs/web": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0",
+ "@solidjs/web": "^2.0.0-rc.0"
},
"devDependencies": {
- "vite-plugin-solid": "^3.0.0-next.23",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/router-monorepo-solid-query/packages/router/vite.config.ts b/examples/solid/router-monorepo-solid-query/packages/router/vite.config.ts
index 49d522530dd..c1b0a85daf6 100644
--- a/examples/solid/router-monorepo-solid-query/packages/router/vite.config.ts
+++ b/examples/solid/router-monorepo-solid-query/packages/router/vite.config.ts
@@ -3,7 +3,7 @@ import dts from 'vite-plugin-dts'
import * as path from 'node:path'
import { fileURLToPath } from 'node:url'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json
index 894dec6abce..5a239646b50 100644
--- a/examples/solid/scroll-restoration/package.json
+++ b/examples/solid/scroll-restoration/package.json
@@ -9,18 +9,18 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@tanstack/solid-virtual": "^3.13.0",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/scroll-restoration/vite.config.js b/examples/solid/scroll-restoration/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/scroll-restoration/vite.config.js
+++ b/examples/solid/scroll-restoration/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json
index 62e6aaf7016..3e01fd7c570 100644
--- a/examples/solid/search-validator-adapters/package.json
+++ b/examples/solid/search-validator-adapters/package.json
@@ -10,27 +10,27 @@
"test:unit": "vitest"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/arktype-adapter": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@tanstack/valibot-adapter": "^1.167.0",
"@tanstack/zod-adapter": "^1.167.0",
"arktype": "^2.1.7",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"valibot": "1.0.0-beta.15",
"zod": "^3.24.2"
},
"devDependencies": {
"@solidjs/testing-library": "^0.8.10",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@testing-library/jest-dom": "^6.6.3",
"@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"
}
}
diff --git a/examples/solid/search-validator-adapters/vite.config.ts b/examples/solid/search-validator-adapters/vite.config.ts
index abb9d36cdf7..42e0edff512 100644
--- a/examples/solid/search-validator-adapters/vite.config.ts
+++ b/examples/solid/search-validator-adapters/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
import packageJson from './package.json'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json
index 43180b5b14f..465868216c9 100644
--- a/examples/solid/start-basic-auth/package.json
+++ b/examples/solid/start-basic-auth/package.json
@@ -14,15 +14,16 @@
"@libsql/client": "^0.15.15",
"@prisma/adapter-libsql": "^7.0.0",
"@prisma/client": "^7.0.0",
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"dotenv": "^17.2.3",
@@ -31,7 +32,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic-auth/vite.config.ts b/examples/solid/start-basic-auth/vite.config.ts
index 3c406c8001a..3251cd40fde 100644
--- a/examples/solid/start-basic-auth/vite.config.ts
+++ b/examples/solid/start-basic-auth/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json
index cd12af24be6..fb9ec2d2ebb 100644
--- a/examples/solid/start-basic-authjs/package.json
+++ b/examples/solid/start-basic-authjs/package.json
@@ -11,22 +11,22 @@
},
"dependencies": {
"@auth/core": "^0.41.1",
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"start-authjs": "^1.0.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic-authjs/vite.config.ts b/examples/solid/start-basic-authjs/vite.config.ts
index a18dcb874b7..090b04c7944 100644
--- a/examples/solid/start-basic-authjs/vite.config.ts
+++ b/examples/solid/start-basic-authjs/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json
index 83e001a46e8..cb67ce0f464 100644
--- a/examples/solid/start-basic-cloudflare/package.json
+++ b/examples/solid/start-basic-cloudflare/package.json
@@ -12,21 +12,21 @@
"postinstall": "npm run cf-typegen"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32"
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4",
"wrangler": "^4.74.0"
}
diff --git a/examples/solid/start-basic-cloudflare/vite.config.ts b/examples/solid/start-basic-cloudflare/vite.config.ts
index b9deb59030f..c5e66bbc901 100644
--- a/examples/solid/start-basic-cloudflare/vite.config.ts
+++ b/examples/solid/start-basic-cloudflare/vite.config.ts
@@ -1,7 +1,7 @@
import { defineConfig } from 'vite'
import { cloudflare } from '@cloudflare/vite-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json
index 09e00cf46fb..168e88e1be2 100644
--- a/examples/solid/start-basic-netlify/package.json
+++ b/examples/solid/start-basic-netlify/package.json
@@ -9,21 +9,21 @@
"preview": "vite preview"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32"
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@netlify/vite-plugin-tanstack-start": "^1.1.4",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic-netlify/vite.config.ts b/examples/solid/start-basic-netlify/vite.config.ts
index 7324d8f5851..bc011265ac6 100644
--- a/examples/solid/start-basic-netlify/vite.config.ts
+++ b/examples/solid/start-basic-netlify/vite.config.ts
@@ -1,7 +1,7 @@
import { defineConfig } from 'vite'
import netlify from '@netlify/vite-plugin-tanstack-start'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json
index 3e1258c891f..446b1cbb47f 100644
--- a/examples/solid/start-basic-nitro/package.json
+++ b/examples/solid/start-basic-nitro/package.json
@@ -9,13 +9,14 @@
"preview": "vite preview"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32"
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"nitro": "^3.0.260311-beta",
@@ -23,7 +24,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic-nitro/vite.config.ts b/examples/solid/start-basic-nitro/vite.config.ts
index db70391ee17..5c316dc390e 100644
--- a/examples/solid/start-basic-nitro/vite.config.ts
+++ b/examples/solid/start-basic-nitro/vite.config.ts
@@ -1,7 +1,7 @@
import { defineConfig } from 'vite'
import { nitro } from 'nitro/vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json
index b88f0ab42e5..e4bfe741a6a 100644
--- a/examples/solid/start-basic-solid-query/package.json
+++ b/examples/solid/start-basic-solid-query/package.json
@@ -10,25 +10,25 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-query-devtools": "^6.0.0-beta.7",
- "@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",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-query-devtools": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-router-ssr-query": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic-solid-query/vite.config.ts b/examples/solid/start-basic-solid-query/vite.config.ts
index 3c406c8001a..3251cd40fde 100644
--- a/examples/solid/start-basic-solid-query/vite.config.ts
+++ b/examples/solid/start-basic-solid-query/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json
index 52668d8d75d..1b5cfea27c7 100644
--- a/examples/solid/start-basic-static/package.json
+++ b/examples/solid/start-basic-static/package.json
@@ -10,23 +10,23 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "@tanstack/start-static-server-functions": "^1.167.20",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "@tanstack/start-static-server-functions": "^1.167.27",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.3"
}
}
diff --git a/examples/solid/start-basic-static/vite.config.ts b/examples/solid/start-basic-static/vite.config.ts
index 9d2f632fa38..c219d76382d 100644
--- a/examples/solid/start-basic-static/vite.config.ts
+++ b/examples/solid/start-basic-static/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json
index eae59396ddb..38192951628 100644
--- a/examples/solid/start-basic/package.json
+++ b/examples/solid/start-basic/package.json
@@ -10,15 +10,16 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"nitro": "^3.0.260311-beta",
@@ -26,7 +27,6 @@
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-basic/vite.config.ts b/examples/solid/start-basic/vite.config.ts
index 21afe15e794..d042a8c633b 100644
--- a/examples/solid/start-basic/vite.config.ts
+++ b/examples/solid/start-basic/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
import { nitro } from 'nitro/vite'
diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json
index 289c3f8d2c0..80000fe2e86 100644
--- a/examples/solid/start-bun/package.json
+++ b/examples/solid/start-bun/package.json
@@ -13,19 +13,20 @@
"check": "prettier --write . && eslint --fix"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
+ "@tanstack/router-plugin": "^1.168.30",
"@tanstack/solid-devtools": "^0.7.0",
- "@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",
- "solid-js": "2.0.0-beta.32",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-router-ssr-query": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@solidjs/testing-library": "^0.8.10",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tanstack/eslint-config": "^0.3.2",
"@testing-library/dom": "^10.4.1",
"@types/bun": "^1.2.22",
@@ -35,7 +36,6 @@
"@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",
"vitest": "^4.1.4",
"web-vitals": "^5.1.0"
}
diff --git a/examples/solid/start-bun/vite.config.ts b/examples/solid/start-bun/vite.config.ts
index 660dc8ed506..4df51ff1546 100644
--- a/examples/solid/start-bun/vite.config.ts
+++ b/examples/solid/start-bun/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const config = defineConfig({
diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json
index dcce25de0a4..c52f04ecf5e 100644
--- a/examples/solid/start-convex-better-auth/package.json
+++ b/examples/solid/start-convex-better-auth/package.json
@@ -12,28 +12,28 @@
},
"dependencies": {
"@convex-dev/better-auth": "^0.9.7",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"better-auth": "^1.6.19",
"clsx": "^2.1.1",
"convex": "^1.28.2",
"convex-solidjs": "^0.0.3",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.10.2",
"combinate": "^1.1.11",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-convex-better-auth/vite.config.ts b/examples/solid/start-convex-better-auth/vite.config.ts
index 659538b94f6..a963a79e034 100644
--- a/examples/solid/start-convex-better-auth/vite.config.ts
+++ b/examples/solid/start-convex-better-auth/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-counter/package.json b/examples/solid/start-counter/package.json
index 2f073d44564..0ab6d50df49 100644
--- a/examples/solid/start-counter/package.json
+++ b/examples/solid/start-counter/package.json
@@ -10,21 +10,21 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.10.2",
"combinate": "^1.1.11",
"@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"
}
}
diff --git a/examples/solid/start-counter/vite.config.ts b/examples/solid/start-counter/vite.config.ts
index e60181d9f25..133c0a49536 100644
--- a/examples/solid/start-counter/vite.config.ts
+++ b/examples/solid/start-counter/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
server: {
diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json
index 494f2e26db3..eaa85324697 100644
--- a/examples/solid/start-i18n-paraglide/package.json
+++ b/examples/solid/start-i18n-paraglide/package.json
@@ -9,21 +9,21 @@
"preview": "vite preview"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/solid-devtools": "^0.7.0",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32"
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
"@inlang/paraglide-js": "^2.4.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.18.6",
"tailwindcss": "^4.2.2",
"@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"
}
}
diff --git a/examples/solid/start-i18n-paraglide/vite.config.ts b/examples/solid/start-i18n-paraglide/vite.config.ts
index 709f9596f37..70631b52f34 100644
--- a/examples/solid/start-i18n-paraglide/vite.config.ts
+++ b/examples/solid/start-i18n-paraglide/vite.config.ts
@@ -1,7 +1,7 @@
import { paraglideVitePlugin } from '@inlang/paraglide-js'
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
const config = defineConfig({
diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json
index 14c192da5f2..9aaaa2bbe2d 100644
--- a/examples/solid/start-large/package.json
+++ b/examples/solid/start-large/package.json
@@ -12,24 +12,24 @@
"test:types": "tsc --extendedDiagnostics"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"valibot": "^1.0.0-beta.15"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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"
},
"keywords": [],
"author": "",
diff --git a/examples/solid/start-large/vite.config.ts b/examples/solid/start-large/vite.config.ts
index 3c406c8001a..3251cd40fde 100644
--- a/examples/solid/start-large/vite.config.ts
+++ b/examples/solid/start-large/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-streaming-data-from-server-functions/package.json b/examples/solid/start-streaming-data-from-server-functions/package.json
index b7793dfdf55..46a020b56f7 100644
--- a/examples/solid/start-streaming-data-from-server-functions/package.json
+++ b/examples/solid/start-streaming-data-from-server-functions/package.json
@@ -10,18 +10,18 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/node": "^22.5.4",
"@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"
}
}
diff --git a/examples/solid/start-streaming-data-from-server-functions/vite.config.ts b/examples/solid/start-streaming-data-from-server-functions/vite.config.ts
index 7a6ce913f83..f042c0f0528 100644
--- a/examples/solid/start-streaming-data-from-server-functions/vite.config.ts
+++ b/examples/solid/start-streaming-data-from-server-functions/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
export default defineConfig({
server: {
diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json
index 3eab8f874b1..8efabe1e173 100644
--- a/examples/solid/start-supabase-basic/package.json
+++ b/examples/solid/start-supabase-basic/package.json
@@ -12,23 +12,23 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@supabase/ssr": "^0.5.2",
"@supabase/supabase-js": "^2.48.1",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-supabase-basic/vite.config.ts b/examples/solid/start-supabase-basic/vite.config.ts
index 659538b94f6..a963a79e034 100644
--- a/examples/solid/start-supabase-basic/vite.config.ts
+++ b/examples/solid/start-supabase-basic/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json
index bb9a661848e..f1ad9a9503a 100644
--- a/examples/solid/start-tailwind-v4/package.json
+++ b/examples/solid/start-tailwind-v4/package.json
@@ -10,22 +10,22 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
- "@tanstack/solid-start": "^2.0.0-beta.31",
- "solid-js": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
+ "@tanstack/solid-start": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^22.5.4",
"tailwindcss": "^4.2.2",
"@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-tsconfig-paths": "^5.1.4"
}
}
diff --git a/examples/solid/start-tailwind-v4/vite.config.ts b/examples/solid/start-tailwind-v4/vite.config.ts
index 3c406c8001a..3251cd40fde 100644
--- a/examples/solid/start-tailwind-v4/vite.config.ts
+++ b/examples/solid/start-tailwind-v4/vite.config.ts
@@ -1,6 +1,6 @@
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
import { defineConfig } from 'vite'
-import viteSolid from 'vite-plugin-solid'
+import viteSolid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json
index d6c846e94eb..00ec5d21d7b 100644
--- a/examples/solid/view-transitions/package.json
+++ b/examples/solid/view-transitions/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/view-transitions/vite.config.js b/examples/solid/view-transitions/vite.config.js
index 79454008ba6..71e662f1cff 100644
--- a/examples/solid/view-transitions/vite.config.js
+++ b/examples/solid/view-transitions/vite.config.js
@@ -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'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json
index db62e74855e..c7788ed5b14 100644
--- a/examples/solid/with-framer-motion/package.json
+++ b/examples/solid/with-framer-motion/package.json
@@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"solid-motionone": "^1.0.4",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@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"
}
}
diff --git a/examples/solid/with-framer-motion/vite.config.js b/examples/solid/with-framer-motion/vite.config.js
index fb5faf92369..59c45c737c3 100644
--- a/examples/solid/with-framer-motion/vite.config.js
+++ b/examples/solid/with-framer-motion/vite.config.js
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import tailwindcss from '@tailwindcss/vite'
// https://vitejs.dev/config/
diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json
index 026ad10fcc5..e37f2fba0f0 100644
--- a/examples/solid/with-trpc/package.json
+++ b/examples/solid/with-trpc/package.json
@@ -10,23 +10,23 @@
"start": "NODE_ENV=production node dist/server/server.js"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/solid-router": "^2.0.0-beta.30",
- "@tanstack/solid-router-devtools": "^2.0.0-beta.25",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/solid-router": "^2.0.0-rc.0",
+ "@tanstack/solid-router-devtools": "^2.0.0-rc.0",
"@trpc/client": "^11.4.3",
"@trpc/server": "^11.4.3",
"express": "^5.2.1",
"redaxios": "^0.5.1",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"tailwindcss": "^4.2.2",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
"@types/express": "^5.0.6",
"tsx": "^4.20.3",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "^8.0.14"
}
}
diff --git a/examples/solid/with-trpc/vite.config.ts b/examples/solid/with-trpc/vite.config.ts
index 553d3030d16..3ee81acb5a0 100644
--- a/examples/solid/with-trpc/vite.config.ts
+++ b/examples/solid/with-trpc/vite.config.ts
@@ -1,7 +1,7 @@
import url from 'node:url'
import path from 'node:path'
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
import type { BuildEnvironmentOptions } from 'vite'
import tailwindcss from '@tailwindcss/vite'
diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json
index 5e94ab51eaf..3044b8fc366 100644
--- a/examples/vue/basic-file-based-jsx/package.json
+++ b/examples/vue/basic-file-based-jsx/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/vue-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/vue-router": "^1.170.24",
"@tanstack/vue-router-devtools": "^1.167.1",
"redaxios": "^0.5.1",
"tailwindcss": "^4.2.2",
diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json
index f2a41544cb5..61c311cf7d9 100644
--- a/examples/vue/basic-file-based-sfc/package.json
+++ b/examples/vue/basic-file-based-sfc/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.24",
- "@tanstack/vue-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.30",
+ "@tanstack/vue-router": "^1.170.24",
"@tanstack/vue-router-devtools": "^1.167.1",
"redaxios": "^0.5.1",
"tailwindcss": "^4.2.2",
diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json
index 16c55a19b59..8f848d7d1b1 100644
--- a/examples/vue/basic/package.json
+++ b/examples/vue/basic/package.json
@@ -9,7 +9,7 @@
"start": "vite"
},
"dependencies": {
- "@tanstack/vue-router": "^1.170.18",
+ "@tanstack/vue-router": "^1.170.24",
"@tanstack/vue-router-devtools": "^1.167.1",
"redaxios": "^0.5.1",
"vue": "^3.5.13",
diff --git a/packages/history/CHANGELOG.md b/packages/history/CHANGELOG.md
index dbd02474bf9..8d61013c844 100644
--- a/packages/history/CHANGELOG.md
+++ b/packages/history/CHANGELOG.md
@@ -1,5 +1,11 @@
# @tanstack/history
+## 1.162.1
+
+### Patch Changes
+
+- [#7985](https://github.com/TanStack/router/pull/7985) [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b) - perf: compact private bundle boundaries- [#7975](https://github.com/TanStack/router/issues/7975)
+
## 1.162.0
### Minor Changes
diff --git a/packages/history/package.json b/packages/history/package.json
index 52e4641a01c..3573777fc48 100644
--- a/packages/history/package.json
+++ b/packages/history/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/history",
- "version": "1.162.0",
+ "version": "1.162.1",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/history/src/index.ts b/packages/history/src/index.ts
index 0f3be8242e7..063174c7328 100644
--- a/packages/history/src/index.ts
+++ b/packages/history/src/index.ts
@@ -329,18 +329,14 @@ export function createBrowserHistory(opts?: {
let next:
| undefined
- | {
- // This is the latest location that we were attempting to push/replace
- href: string
- // This is the latest state that we were attempting to push/replace
- state: any
- // This is the latest type that we were attempting to push/replace
- isPush: boolean
- }
-
- // We need to track the current scheduled update to prevent
- // multiple updates from being scheduled at the same time.
- let scheduled: undefined | boolean
+ | [
+ // The latest location that we were attempting to push/replace
+ href: string,
+ // The latest state that we were attempting to push/replace
+ state: any,
+ // Whether any queued update needs to push rather than replace
+ isPush: boolean,
+ ]
// This function flushes the next update to the browser history
const flush = () => {
@@ -352,30 +348,30 @@ export function createBrowserHistory(opts?: {
history._ignoreSubscribers = true
// Update the browser history
- ;(next.isPush ? win.history.pushState : win.history.replaceState)(
- next.state,
+ ;(next[2 /* is push */] ? win.history.pushState : win.history.replaceState)(
+ next[1 /* state */],
'',
- next.href,
+ next[0 /* href */],
)
// Stop ignoring subscriber updates
history._ignoreSubscribers = false
- // Reset the nextIsPush flag and clear the scheduled update
+ // Clear the queued action after it reaches browser history.
next = undefined
- scheduled = false
rollbackLocation = undefined
}
// This function queues up a call to update the browser history
const queueHistoryAction = (
- type: 'push' | 'replace',
+ isPush: boolean,
destHref: string,
state: any,
) => {
const href = createHref(destHref)
+ const hasPendingAction = !!next
- if (!scheduled) {
+ if (!hasPendingAction) {
rollbackLocation = currentLocation
}
@@ -383,15 +379,10 @@ export function createBrowserHistory(opts?: {
currentLocation = parseHref(destHref, state)
// Keep track of the next location we need to flush to the URL
- next = {
- href,
- state,
- isPush: next?.isPush || type === 'push',
- }
+ next = [href, state, next?.[2 /* is push */] || isPush]
- if (!scheduled) {
+ if (!hasPendingAction) {
// Schedule an update to the browser history
- scheduled = true
queueMicrotask(() => flush())
}
}
@@ -489,8 +480,8 @@ export function createBrowserHistory(opts?: {
const history = createHistory({
getLocation,
getLength: () => win.history.length,
- pushState: (href, state) => queueHistoryAction('push', href, state),
- replaceState: (href, state) => queueHistoryAction('replace', href, state),
+ pushState: (href, state) => queueHistoryAction(true, href, state),
+ replaceState: (href, state) => queueHistoryAction(false, href, state),
back: (ignoreBlocker) => {
if (ignoreBlocker) skipBlockerNextPop = true
ignoreNextBeforeUnload = true
diff --git a/packages/history/tests/createBrowserHistory.test.ts b/packages/history/tests/createBrowserHistory.test.ts
new file mode 100644
index 00000000000..97b3c40ef3c
--- /dev/null
+++ b/packages/history/tests/createBrowserHistory.test.ts
@@ -0,0 +1,106 @@
+import { describe, expect, test, vi } from 'vitest'
+import { createBrowserHistory } from '../src'
+
+function createBrowserHistoryHarness() {
+ const location = {
+ pathname: '/',
+ search: '',
+ hash: '',
+ }
+ const pushState = vi.fn()
+ const replaceState = vi.fn()
+ const nativeHistory = {
+ state: { __TSR_index: 0, __TSR_key: 'initial' },
+ length: 1,
+ pushState,
+ replaceState,
+ back: vi.fn(),
+ forward: vi.fn(),
+ go: vi.fn(),
+ }
+ const window = {
+ location,
+ history: nativeHistory,
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ }
+ const history = createBrowserHistory({ window })
+
+ return {
+ history,
+ pushState,
+ replaceState,
+ }
+}
+
+describe('createBrowserHistory', () => {
+ test('coalesces consecutive replaces into the latest replace', async () => {
+ const { history, pushState, replaceState } = createBrowserHistoryHarness()
+
+ history.replace('/first', { value: 1 })
+ history.replace('/second', { value: 2 })
+ await Promise.resolve()
+
+ expect(pushState).not.toHaveBeenCalled()
+ expect(replaceState).toHaveBeenCalledTimes(1)
+ expect(replaceState).toHaveBeenCalledWith(
+ expect.objectContaining({ value: 2 }),
+ '',
+ '/second',
+ )
+ history.destroy()
+ })
+
+ test('promotes a queued replace to a push', async () => {
+ const { history, pushState, replaceState } = createBrowserHistoryHarness()
+
+ history.replace('/first', { value: 1 })
+ history.push('/second', { value: 2 })
+ await Promise.resolve()
+
+ expect(replaceState).not.toHaveBeenCalled()
+ expect(pushState).toHaveBeenCalledTimes(1)
+ expect(pushState).toHaveBeenCalledWith(
+ expect.objectContaining({ value: 2 }),
+ '',
+ '/second',
+ )
+ history.destroy()
+ })
+
+ test('keeps a queued push when followed by a replace', async () => {
+ const { history, pushState, replaceState } = createBrowserHistoryHarness()
+
+ history.push('/first', { value: 1 })
+ history.replace('/second', { value: 2 })
+ await Promise.resolve()
+
+ expect(replaceState).not.toHaveBeenCalled()
+ expect(pushState).toHaveBeenCalledTimes(1)
+ expect(pushState).toHaveBeenCalledWith(
+ expect.objectContaining({ value: 2 }),
+ '',
+ '/second',
+ )
+ history.destroy()
+ })
+
+ test('flushes a later action after an explicit flush', async () => {
+ const { history, pushState, replaceState } = createBrowserHistoryHarness()
+
+ history.replace('/first', { value: 1 })
+ history.flush()
+ await Promise.resolve()
+ history.replace('/second', { value: 2 })
+ await Promise.resolve()
+
+ expect(pushState).not.toHaveBeenCalled()
+ expect(replaceState).toHaveBeenCalledTimes(2)
+ expect(replaceState).toHaveBeenLastCalledWith(
+ expect.objectContaining({ value: 2 }),
+ '',
+ '/second',
+ )
+ history.destroy()
+ })
+})
diff --git a/packages/react-router-ssr-query/package.json b/packages/react-router-ssr-query/package.json
index 2967d695b09..4b3fecb4860 100644
--- a/packages/react-router-ssr-query/package.json
+++ b/packages/react-router-ssr-query/package.json
@@ -67,18 +67,18 @@
"@tanstack/router-ssr-query-core": "workspace:*"
},
"devDependencies": {
+ "@tanstack/react-query": "catalog:",
+ "@tanstack/react-router": "workspace:*",
"@vitejs/plugin-react": "^4.3.4",
"react": ">=19",
"react-dom": ">=19",
- "@tanstack/react-router": "workspace:*",
- "@tanstack/react-query": ">=5.90.0",
"vite": "*"
},
"peerDependencies": {
- "react": ">=18.0.0 || >=19.0.0",
- "react-dom": ">=18.0.0 || >=19.0.0",
"@tanstack/query-core": ">=5.90.0",
+ "@tanstack/react-query": ">=5.90.0",
"@tanstack/react-router": ">=1.127.0",
- "@tanstack/react-query": ">=5.90.0"
+ "react": ">=18.0.0 || >=19.0.0",
+ "react-dom": ">=18.0.0 || >=19.0.0"
}
}
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index 49e069817b2..ab7af2c14ed 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,81 @@
# @tanstack/react-router
+## 1.170.27
+
+### Patch Changes
+
+- [#8047](https://github.com/TanStack/router/pull/8047) [`b0817f5`](https://github.com/TanStack/router/commit/b0817f50cc639ae50b6c30cd11c5adbf7eed028c) - useMatchRoute w/ React Compiler
+
+## 1.170.26
+
+### Patch Changes
+
+- [#8045](https://github.com/TanStack/router/pull/8045) [`f500760`](https://github.com/TanStack/router/commit/f5007607d62e932b8df19de866cdc6bddcff8db3) - Warn when an Outlet is rendered inside a pending, error, or not-found component.
+
+- [#8043](https://github.com/TanStack/router/pull/8043) [`1aafca9`](https://github.com/TanStack/router/commit/1aafca9b45d24f8f0dba78e716fc9582346c6ca1) - remove the undocumented Link `isTransitioning` state and `data-transitioning` attribute
+
+- [#8044](https://github.com/TanStack/router/pull/8044) [`aa10b65`](https://github.com/TanStack/router/commit/aa10b6589eeda215f5a60ea0af95a3101d8c414e) - Apply `preloadDelay` to viewport link preloading and cancel pending preloads when links leave the viewport.
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+
+## 1.170.25
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+
+## 1.170.24
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+
+## 1.170.23
+
+### Patch Changes
+
+- [#7952](https://github.com/TanStack/router/pull/7952) [`95dec51`](https://github.com/TanStack/router/commit/95dec51018d01483949c6f1fe3094b019ccf3b4f) - bail out of `Link` re-renders when the resolved href and active state are unchanged
+
+## 1.170.22
+
+### Patch Changes
+
+- [#7992](https://github.com/TanStack/router/pull/7992) [`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9) - retain mounted UI during revalidation
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+
+## 1.170.21
+
+### Patch Changes
+
+- [#7961](https://github.com/TanStack/router/pull/7961) [`697ebb6`](https://github.com/TanStack/router/commit/697ebb6ddbd433d052b6b4707938a5c595865d58) - Prevent a blank frame before zero-delay initial pending UI by using a
+ component-scoped React transition for match publication. Pending timing,
+ boundary selection, and rendered matches continue to come from the router
+ core.
+
+- [#7970](https://github.com/TanStack/router/pull/7970) [`2435885`](https://github.com/TanStack/router/commit/2435885fa8b5e31c8c4b74d93920919f27316ebf) - createFileRoute does not rely on FileRoute class
+
+- [#7971](https://github.com/TanStack/router/pull/7971) [`86bf510`](https://github.com/TanStack/router/commit/86bf510c2923afb76804223bd04afc2a809b33e7) - clean intersection observer options in link component
+
+- [#7967](https://github.com/TanStack/router/pull/7967) [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c) - Preserve path params in their raw string form while matching routes so structured values returned by `params.parse` produce stable match IDs and do not reuse stale loader data.
+
+ `RouterCore.getMatchedRoutes()` now returns `[matchedRoutes, rawParams, foundRoute]` instead of an object.
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+ - @tanstack/history@1.162.1
+
+## 1.170.20
+
+### Patch Changes
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+
## 1.170.19
### Patch Changes
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index fdb6266ef2c..65a417d1bd4 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-router",
- "version": "1.170.19",
+ "version": "1.170.27",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/react-router/src/CatchBoundary.tsx b/packages/react-router/src/CatchBoundary.tsx
index d97e49f8f5d..f459ef3fce2 100644
--- a/packages/react-router/src/CatchBoundary.tsx
+++ b/packages/react-router/src/CatchBoundary.tsx
@@ -1,6 +1,7 @@
'use client'
import * as React from 'react'
+import { wrapInNonRouteComponentContext } from './nonRouteComponentContext'
import type { ErrorRouteComponent } from './route'
import type { ErrorInfo } from 'react'
@@ -44,12 +45,21 @@ class CatchBoundaryImpl extends React.Component<{
}
render() {
const error = this.state.error
- return error
- ? React.createElement(this.props.errorComponent ?? ErrorComponent, {
+ if (error) {
+ const element = React.createElement(
+ this.props.errorComponent ?? ErrorComponent,
+ {
error,
reset: this.reset,
- })
- : this.props.children
+ },
+ )
+
+ return process.env.NODE_ENV !== 'production'
+ ? wrapInNonRouteComponentContext(element, 'errorComponent')
+ : element
+ }
+
+ return this.props.children
}
}
diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx
index 6bca031a4dc..922c0aa5880 100644
--- a/packages/react-router/src/Match.tsx
+++ b/packages/react-router/src/Match.tsx
@@ -12,6 +12,10 @@ import { SafeFragment } from './SafeFragment'
import { renderRouteNotFound } from './renderRouteNotFound'
import { ScrollRestoration } from './scroll-restoration'
import { ClientOnly } from './ClientOnly'
+import {
+ nonRouteComponentContext,
+ wrapInNonRouteComponentContext,
+} from './nonRouteComponentContext'
import type {
AnyRoute,
AnyRouteMatch,
@@ -24,7 +28,14 @@ export function renderPending(
) {
const PendingComponent =
route?.options.pendingComponent ?? router.options.defaultPendingComponent
- return PendingComponent ? ()[1]}
+ />
+ )}
@@ -137,34 +146,40 @@ export type UseMatchRouteOptions<
* `search`, etc.) and returns either `false` (no match) or the matched params
* object when the route matches the current or pending location.
*
- * Useful for conditional rendering and active UI states.
+ * Useful for conditional rendering and active UI states because it subscribes
+ * the component to the router state used for matching. The returned function's
+ * identity changes when that state changes. For imperative checks in event
+ * handlers, get the router with `useRouter` and call `router.matchRoute(...)`
+ * to avoid that subscription.
*
* @returns A `matchRoute(options)` function that returns `false` or params.
* @link https://tanstack.com/router/latest/docs/framework/react/api/router/useMatchRouteHook
*/
-export function useMatchRoute() {
+export function useMatchRoute(): <
+ const TFrom extends string = string,
+ const TTo extends string | undefined = undefined,
+ const TMaskFrom extends string = TFrom,
+ const TMaskTo extends string = '',
+>(
+ opts: UseMatchRouteOptions,
+) => false | Expand['types']['allParams']> {
const router = useRouter()
+ if (isServer ?? router.isServer) {
+ return (opts) => {
+ const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts
- if (!(isServer ?? router.isServer)) {
- // eslint-disable-next-line react-hooks/rules-of-hooks
- useStore(router.stores.location, (location) => location.href)
- // eslint-disable-next-line react-hooks/rules-of-hooks
- useStore(router.stores.resolvedLocation, (location) => location?.href)
- // eslint-disable-next-line react-hooks/rules-of-hooks
- useStore(router.stores.status, (status) => status)
+ return router.matchRoute(rest as any, {
+ pending,
+ caseSensitive,
+ fuzzy,
+ includeSearch,
+ })
+ }
}
+ // eslint-disable-next-line react-hooks/rules-of-hooks
return React.useCallback(
- <
- const TFrom extends string = string,
- const TTo extends string | undefined = undefined,
- const TMaskFrom extends string = TFrom,
- const TMaskTo extends string = '',
- >(
- opts: UseMatchRouteOptions,
- ):
- | false
- | Expand['types']['allParams']> => {
+ (opts) => {
const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts
return router.matchRoute(rest as any, {
@@ -174,7 +189,15 @@ export function useMatchRoute() {
includeSearch,
})
},
- [router],
+ [
+ router,
+ // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps
+ useStore(router.stores.location, (location) => location.href),
+ // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps
+ useStore(router.stores.resolvedLocation, (location) => location?.href),
+ // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps
+ useStore(router.stores.status, (status) => status),
+ ],
)
}
diff --git a/packages/react-router/src/Transitioner.tsx b/packages/react-router/src/Transitioner.tsx
index 341d09ffcca..cd20673ff16 100644
--- a/packages/react-router/src/Transitioner.tsx
+++ b/packages/react-router/src/Transitioner.tsx
@@ -15,7 +15,11 @@ export function settleOwner(
settle?.(rendered)
}
-export function Transitioner() {
+export function Transitioner({
+ t,
+}: {
+ t: React.Dispatch>
+}) {
const router = useRouter()
const acknowledgement = (router._rendered ??= [])
const mounted =
@@ -28,6 +32,7 @@ export function Transitioner() {
new Promise((resolve, reject) => {
settleOwner(acknowledgement, false)
acknowledgement.push(expected, resolve)
+ t(router)
React.startTransition(() => {
try {
fn()
diff --git a/packages/react-router/src/fileRoute.ts b/packages/react-router/src/fileRoute.ts
index 46b96240a47..e5fdb4993b9 100644
--- a/packages/react-router/src/fileRoute.ts
+++ b/packages/react-router/src/fileRoute.ts
@@ -54,11 +54,14 @@ export function createFileRoute<
TFullPath extends RouteConstraints['TFullPath'] =
FileRoutesByPath[TFilePath]['fullPath'],
>(
+ // eslint-disable-next-line unused-imports/no-unused-vars
path?: TFilePath,
): FileRoute['createRoute'] {
- return new FileRoute(path, {
- silent: true,
- }).createRoute
+ return (options) => {
+ const route = createRoute(options as any)
+ ;(route as any).isRoot = false
+ return route as any
+ }
}
/**
diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx
index eddc0ac0b3b..88f18bee400 100644
--- a/packages/react-router/src/link.tsx
+++ b/packages/react-router/src/link.tsx
@@ -2,7 +2,6 @@
import * as React from 'react'
import { useStore } from '@tanstack/react-store'
-import { flushSync } from 'react-dom'
import {
deepEqual,
exactPathTest,
@@ -19,9 +18,11 @@ import { useForwardedRef, useIntersectionObserver } from './utils'
import { useHydrated } from './ClientOnly'
import type {
+ ActiveOptions,
AnyRouter,
Constrain,
LinkOptions,
+ ParsedLocation,
RegisteredRouter,
RoutePaths,
} from '@tanstack/router-core'
@@ -31,6 +32,114 @@ import type {
ValidateLinkOptionsArray,
} from './typePrimitives'
+type LinkState = [
+ href: string | undefined,
+ externalLink: string | undefined,
+ isActive: boolean,
+]
+
+// Keep a referentially stable value while the contents are equal. Links
+// routinely pass inline `params` / `search` object literals, which would
+// otherwise change `_options` identity on every parent render, rebuild the
+// store selector, and discard its memoized selection.
+//
+// `ignoreUndefined: false` is required: an explicit `undefined` clears an
+// inherited param or search key, so `{}` and `{ category: undefined }` build
+// different locations and must not be treated as equal here.
+function useValueStable(value: T): T {
+ const ref = React.useRef(value)
+ // `deepEqual` short-circuits on reference equality, so this covers both cases.
+ if (!deepEqual(ref.current, value, { ignoreUndefined: false })) {
+ ref.current = value
+ }
+ return ref.current
+}
+
+function compareLinkState(a: LinkState, b: LinkState) {
+ return a[0] === b[0] && a[1] === b[1] && a[2] === b[2]
+}
+
+function resolveExternalLink(
+ hrefOption: { href: string; external?: boolean } | undefined,
+ to: unknown,
+ protocolAllowlist: AnyRouter['protocolAllowlist'],
+): string | undefined {
+ if (hrefOption?.external) {
+ // Block dangerous protocols for external links
+ if (isDangerousProtocol(hrefOption.href, protocolAllowlist)) {
+ if (process.env.NODE_ENV !== 'production') {
+ console.warn(`Blocked Link with dangerous protocol: ${hrefOption.href}`)
+ }
+ return undefined
+ }
+ return hrefOption.href
+ }
+ if (isSafeInternal(to)) {
+ return undefined
+ }
+ if (typeof to !== 'string' || to.indexOf(':') === -1) {
+ return undefined
+ }
+ try {
+ new URL(to)
+ // Block dangerous protocols like javascript:, blob:, data:
+ if (isDangerousProtocol(to, protocolAllowlist)) {
+ if (process.env.NODE_ENV !== 'production') {
+ console.warn(`Blocked Link with dangerous protocol: ${to}`)
+ }
+ return undefined
+ }
+ return to
+ } catch {}
+ return undefined
+}
+
+function resolveIsActive(
+ location: ParsedLocation,
+ next: ParsedLocation,
+ activeOptions: ActiveOptions | undefined,
+ basepath: string,
+ isHydrated: boolean,
+ isExternal: boolean,
+): boolean {
+ if (isExternal) {
+ return false
+ }
+ if (activeOptions?.exact) {
+ const testExact = exactPathTest(location.pathname, next.pathname, basepath)
+ if (!testExact) {
+ return false
+ }
+ } else {
+ const currentPathSplit = removeTrailingSlash(location.pathname, basepath)
+ const nextPathSplit = removeTrailingSlash(next.pathname, basepath)
+
+ const pathIsFuzzyEqual =
+ currentPathSplit.startsWith(nextPathSplit) &&
+ (currentPathSplit.length === nextPathSplit.length ||
+ currentPathSplit[nextPathSplit.length] === '/')
+
+ if (!pathIsFuzzyEqual) {
+ return false
+ }
+ }
+
+ if (activeOptions?.includeSearch ?? true) {
+ const searchTest = deepEqual(location.search, next.search, {
+ partial: !activeOptions?.exact,
+ ignoreUndefined: !activeOptions?.explicitUndefined,
+ })
+ if (!searchTest) {
+ return false
+ }
+ }
+
+ if (activeOptions?.includeHash) {
+ return isHydrated && location.hash === next.hash
+ }
+ return true
+}
+
/**
* Build anchor-like props for declarative navigation and preloading.
*
@@ -56,9 +165,6 @@ export function useLinkProps<
const router = useRouter()
const innerRef = useForwardedRef(forwardedRef)
- // Determine if we're on the server - used for tree-shaking client-only code
- const _isServer = isServer ?? router.isServer
-
const {
// custom props
activeProps,
@@ -110,7 +216,9 @@ export function useLinkProps<
//
// Note: `location.hash` is not available on the server.
// ==========================================================================
- if (_isServer) {
+ // The expression must stay inlined in the `if` so bundlers fold the
+ // browser-build constant `isServer = false` and drop this server block.
+ if (isServer ?? router.isServer) {
const safeInternal = isSafeInternal(to)
// If `to` is obviously an absolute URL, treat as external and avoid
@@ -381,6 +489,12 @@ export function useLinkProps<
// eslint-disable-next-line react-hooks/rules-of-hooks
const isHydrated = useHydrated()
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ const stableSearch = useValueStable(options.search)
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ const stableParams = useValueStable(options.params)
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ const stableActiveOptions = useValueStable(activeOptions)
// eslint-disable-next-line react-hooks/rules-of-hooks
const _options = React.useMemo(
() => options,
@@ -391,136 +505,64 @@ export function useLinkProps<
options._fromLocation,
options.hash,
options.to,
- options.search,
- options.params,
+ stableSearch,
+ stableParams,
options.state,
options.mask,
options.unsafeRelative,
],
)
+ // Derive inside the selector so `compareLinkState` can bail out. Deriving after
+ // the subscription instead re-renders every link on every navigation, because
+ // the comparator only sees the location, not whether this link's output moved.
// eslint-disable-next-line react-hooks/rules-of-hooks
- const currentLocation = useStore(
- router.stores.location,
- (l) => l,
- (prev, next) => prev.href === next.href,
- )
-
- // eslint-disable-next-line react-hooks/rules-of-hooks
- const next = React.useMemo(() => {
- const opts = { _fromLocation: currentLocation, ..._options }
- return router.buildLocation(opts as any)
- }, [router, currentLocation, _options])
-
- // Use publicHref - it contains the correct href for display
- // When a rewrite changes the origin, publicHref is the full URL
- // Otherwise it's the origin-stripped path
- // This avoids constructing URL objects in the hot path
- const hrefOptionPublicHref = next.maskedLocation
- ? next.maskedLocation.publicHref
- : next.publicHref
- const hrefOptionExternal = next.maskedLocation
- ? next.maskedLocation.external
- : next.external
- // eslint-disable-next-line react-hooks/rules-of-hooks
- const hrefOption = React.useMemo(
- () =>
- getHrefOption(
- hrefOptionPublicHref,
- hrefOptionExternal,
+ const selectLinkState = React.useCallback(
+ (location: ParsedLocation): LinkState => {
+ const next = router.buildLocation({
+ _fromLocation: location,
+ ..._options,
+ } as any)
+
+ // Use publicHref - it contains the correct href for display
+ // When a rewrite changes the origin, publicHref is the full URL
+ // Otherwise it's the origin-stripped path
+ // This avoids constructing URL objects in the hot path
+ const hrefOption = getHrefOption(
+ next.maskedLocation ? next.maskedLocation.publicHref : next.publicHref,
+ next.maskedLocation ? next.maskedLocation.external : next.external,
router.history,
disabled,
- ),
- [disabled, hrefOptionExternal, hrefOptionPublicHref, router.history],
- )
-
- // eslint-disable-next-line react-hooks/rules-of-hooks
- const externalLink = React.useMemo(() => {
- if (hrefOption?.external) {
- // Block dangerous protocols for external links
- if (isDangerousProtocol(hrefOption.href, router.protocolAllowlist)) {
- if (process.env.NODE_ENV !== 'production') {
- console.warn(
- `Blocked Link with dangerous protocol: ${hrefOption.href}`,
- )
- }
- return undefined
- }
- return hrefOption.href
- }
- const safeInternal = isSafeInternal(to)
- if (safeInternal) return undefined
- if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined
- try {
- new URL(to as any)
- // Block dangerous protocols like javascript:, blob:, data:
- if (isDangerousProtocol(to, router.protocolAllowlist)) {
- if (process.env.NODE_ENV !== 'production') {
- console.warn(`Blocked Link with dangerous protocol: ${to}`)
- }
- return undefined
- }
- return to
- } catch {}
- return undefined
- }, [to, hrefOption, router.protocolAllowlist])
-
- // eslint-disable-next-line react-hooks/rules-of-hooks
- const isActive = React.useMemo(() => {
- if (externalLink) return false
- if (activeOptions?.exact) {
- const testExact = exactPathTest(
- currentLocation.pathname,
- next.pathname,
- router.basepath,
)
- if (!testExact) {
- return false
- }
- } else {
- const currentPathSplit = removeTrailingSlash(
- currentLocation.pathname,
- router.basepath,
- )
- const nextPathSplit = removeTrailingSlash(next.pathname, router.basepath)
-
- const pathIsFuzzyEqual =
- currentPathSplit.startsWith(nextPathSplit) &&
- (currentPathSplit.length === nextPathSplit.length ||
- currentPathSplit[nextPathSplit.length] === '/')
- if (!pathIsFuzzyEqual) {
- return false
- }
- }
+ const externalLink = resolveExternalLink(
+ hrefOption,
+ to,
+ router.protocolAllowlist,
+ )
- if (activeOptions?.includeSearch ?? true) {
- const searchTest = deepEqual(currentLocation.search, next.search, {
- partial: !activeOptions?.exact,
- ignoreUndefined: !activeOptions?.explicitUndefined,
- })
- if (!searchTest) {
- return false
- }
- }
+ return [
+ hrefOption?.href,
+ externalLink,
+ resolveIsActive(
+ location,
+ next,
+ stableActiveOptions,
+ router.basepath,
+ isHydrated,
+ externalLink !== undefined,
+ ),
+ ]
+ },
+ [stableActiveOptions, disabled, isHydrated, _options, router, to],
+ )
- if (activeOptions?.includeHash) {
- return isHydrated && currentLocation.hash === next.hash
- }
- return true
- }, [
- activeOptions?.exact,
- activeOptions?.explicitUndefined,
- activeOptions?.includeHash,
- activeOptions?.includeSearch,
- currentLocation,
- externalLink,
- isHydrated,
- next.hash,
- next.pathname,
- next.search,
- router.basepath,
- ])
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ const [href, externalLink, isActive] = useStore(
+ router.stores.location,
+ selectLinkState,
+ compareLinkState,
+ )
// Get the active props
const resolvedActiveProps: React.HTMLAttributes = isActive
@@ -549,13 +591,11 @@ export function useLinkProps<
...resolvedInactiveProps.style,
}
- // eslint-disable-next-line react-hooks/rules-of-hooks
- const [isTransitioning, setIsTransitioning] = React.useState(false)
// eslint-disable-next-line react-hooks/rules-of-hooks
const hasRenderFetched = React.useRef(false)
const preload =
- options.reloadDocument || externalLink
+ options.reloadDocument || externalLink || disabled
? false
: (userPreload ?? router.options.defaultPreload)
const preloadDelay =
@@ -563,42 +603,67 @@ export function useLinkProps<
// eslint-disable-next-line react-hooks/rules-of-hooks
const doPreload = React.useCallback(() => {
- router
- .preloadRoute({ ..._options, _builtLocation: next } as any)
- .catch((err) => {
- console.warn(err)
- console.warn(preloadWarning)
- })
- }, [router, _options, next])
+ // `preloadRoute` builds the location itself; it is no longer held in render
+ // state. It only reads the options, so `_options` can go through as-is.
+ router.preloadRoute(_options as any).catch((err) => {
+ console.warn(err)
+ console.warn(preloadWarning)
+ })
+ }, [router, _options])
// eslint-disable-next-line react-hooks/rules-of-hooks
- const preloadViewportIoCallback = React.useCallback(
- (entry: IntersectionObserverEntry | undefined) => {
- if (entry?.isIntersecting) {
+ const enqueuePreload = React.useCallback(
+ (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => {
+ if (!e) {
+ cancelPreload(innerRef)
+ return
+ }
+
+ if (
+ !(
+ (e as IntersectionObserverEntry).isIntersecting ??
+ preload === 'intent'
+ )
+ ) {
+ if ((e as IntersectionObserverEntry).isIntersecting === false) {
+ cancelPreload(innerRef)
+ }
+ return
+ }
+
+ if (!preloadDelay) {
doPreload()
+ return
}
+
+ if (timeoutMap.has(innerRef)) {
+ return
+ }
+
+ timeoutMap.set(
+ innerRef,
+ setTimeout(() => {
+ timeoutMap.delete(innerRef)
+ doPreload()
+ }, preloadDelay),
+ )
},
- [doPreload],
+ [doPreload, innerRef, preload, preloadDelay],
)
// eslint-disable-next-line react-hooks/rules-of-hooks
- useIntersectionObserver(
- innerRef,
- preloadViewportIoCallback,
- intersectionObserverOptions,
- { disabled: !!disabled || !(preload === 'viewport') },
- )
+ useIntersectionObserver(innerRef, enqueuePreload, preload !== 'viewport')
// eslint-disable-next-line react-hooks/rules-of-hooks
React.useEffect(() => {
if (hasRenderFetched.current) {
return
}
- if (!disabled && preload === 'render') {
+ if (preload === 'render') {
doPreload()
hasRenderFetched.current = true
}
- }, [disabled, doPreload, preload])
+ }, [doPreload, preload])
// The click handler
const handleClick = (e: React.MouseEvent) => {
@@ -617,15 +682,6 @@ export function useLinkProps<
) {
e.preventDefault()
- flushSync(() => {
- setIsTransitioning(true)
- })
-
- const unsub = router.subscribe('onResolved', () => {
- unsub()
- setIsTransitioning(false)
- })
-
// All is well? Navigate!
// N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
router.navigate({
@@ -659,39 +715,14 @@ export function useLinkProps<
}
}
- const enqueueIntentPreload = (e: React.MouseEvent | React.FocusEvent) => {
- if (disabled || preload !== 'intent') return
-
- if (!preloadDelay) {
- doPreload()
- return
- }
-
- const eventTarget = e.currentTarget
-
- if (timeoutMap.has(eventTarget)) {
- return
- }
-
- const id = setTimeout(() => {
- timeoutMap.delete(eventTarget)
- doPreload()
- }, preloadDelay)
- timeoutMap.set(eventTarget, id)
- }
-
- const handleTouchStart = (_: React.TouchEvent) => {
- if (disabled || preload !== 'intent') return
+ const handleTouchStart = () => {
+ if (preload !== 'intent') return
doPreload()
}
- const handleLeave = (e: React.MouseEvent | React.FocusEvent) => {
- if (disabled || !preload || !preloadDelay) return
- const eventTarget = e.currentTarget
- const id = timeoutMap.get(eventTarget)
- if (id) {
- clearTimeout(id)
- timeoutMap.delete(eventTarget)
+ const handleLeave = () => {
+ if (preload === 'intent') {
+ cancelPreload(innerRef)
}
}
@@ -699,12 +730,12 @@ export function useLinkProps<
...propsSafeToSpread,
...resolvedActiveProps,
...resolvedInactiveProps,
- href: hrefOption?.href,
+ href,
ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'],
onClick: composeHandlers([onClick, handleClick]),
onBlur: composeHandlers([onBlur, handleLeave]),
- onFocus: composeHandlers([onFocus, enqueueIntentPreload]),
- onMouseEnter: composeHandlers([onMouseEnter, enqueueIntentPreload]),
+ onFocus: composeHandlers([onFocus, enqueuePreload]),
+ onMouseEnter: composeHandlers([onMouseEnter, enqueuePreload]),
onMouseLeave: composeHandlers([onMouseLeave, handleLeave]),
onTouchStart: composeHandlers([onTouchStart, handleTouchStart]),
disabled: !!disabled,
@@ -713,7 +744,6 @@ export function useLinkProps<
...(resolvedClassName && { className: resolvedClassName }),
...(disabled && STATIC_DISABLED_PROPS),
...(isActive && STATIC_ACTIVE_PROPS),
- ...(isHydrated && isTransitioning && STATIC_TRANSITIONING_PROPS),
}
}
@@ -721,12 +751,11 @@ const STATIC_EMPTY_OBJECT = {}
const STATIC_ACTIVE_OBJECT = { className: 'active' }
const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true }
const STATIC_ACTIVE_PROPS = { 'data-status': 'active', 'aria-current': 'page' }
-const STATIC_TRANSITIONING_PROPS = { 'data-transitioning': 'transitioning' }
-
-const timeoutMap = new WeakMap>()
-const intersectionObserverOptions: IntersectionObserverInit = {
- rootMargin: '100px',
+const timeoutMap = new WeakMap>()
+const cancelPreload = (eventTarget: object) => {
+ clearTimeout(timeoutMap.get(eventTarget))
+ timeoutMap.delete(eventTarget)
}
const composeHandlers =
@@ -822,10 +851,7 @@ export interface LinkPropsChildren {
// If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
children?:
| React.ReactNode
- | ((state: {
- isActive: boolean
- isTransitioning: boolean
- }) => React.ReactNode)
+ | ((state: { isActive: boolean }) => React.ReactNode)
}
type LinkComponentReactProps = Omit<
@@ -912,7 +938,7 @@ export function createLink(
*
* Props:
* - `preload`: Controls route preloading (eg. 'intent', 'render', 'viewport', true/false)
- * - `preloadDelay`: Delay in ms before preloading on hover
+ * - `preloadDelay`: Delay in ms before preloading on focus, hover, or viewport entry
* - `activeProps`/`inactiveProps`: Additional props merged when link is active/inactive
* - `resetScroll`/`hashScrollIntoView`: Control scroll behavior on navigation
* - `viewTransition`/`startTransition`: Use View Transitions/React transitions for navigation
diff --git a/packages/react-router/src/nonRouteComponentContext.tsx b/packages/react-router/src/nonRouteComponentContext.tsx
new file mode 100644
index 00000000000..252ab7fd109
--- /dev/null
+++ b/packages/react-router/src/nonRouteComponentContext.tsx
@@ -0,0 +1,21 @@
+'use client'
+
+import * as React from 'react'
+
+export type NonRouteComponent =
+ | 'pendingComponent'
+ | 'errorComponent'
+ | 'notFoundComponent'
+
+export const nonRouteComponentContext =
+ process.env.NODE_ENV !== 'production'
+ ? React.createContext(undefined)
+ : undefined
+
+export function wrapInNonRouteComponentContext(
+ element: React.ReactElement,
+ component: NonRouteComponent,
+): React.ReactElement {
+ const Context = nonRouteComponentContext!
+ return {element}
+}
diff --git a/packages/react-router/src/renderRouteNotFound.tsx b/packages/react-router/src/renderRouteNotFound.tsx
index f8374ebd7c2..9e363da7f44 100644
--- a/packages/react-router/src/renderRouteNotFound.tsx
+++ b/packages/react-router/src/renderRouteNotFound.tsx
@@ -1,5 +1,6 @@
import * as React from 'react'
import { DefaultGlobalNotFound } from './not-found'
+import { wrapInNonRouteComponentContext } from './nonRouteComponentContext'
import type { AnyRoute, AnyRouter } from '@tanstack/router-core'
/**
@@ -17,7 +18,12 @@ export function renderRouteNotFound(
) {
if (!route.options.notFoundComponent) {
if (router.options.defaultNotFoundComponent) {
- return (value: T): T | null {
* When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.
*
* @param ref - The ref to observe
- * @param intersectionObserverOptions - The options to pass to the IntersectionObserver
- * @param options - The options to pass to the hook
* @param callback - The callback to call when the intersection changes
+ * @param disabled - Whether observation is disabled
* @returns The IntersectionObserver instance
* @example
* ```tsx
@@ -77,37 +76,39 @@ export function usePrevious(value: T): T | null {
* useIntersectionObserver(
* ref,
* (entry) => { doSomething(entry) },
- * { rootMargin: '10px' },
- * { disabled: false }
+ * false
* )
* return
* ```
*/
export function useIntersectionObserver(
ref: React.RefObject,
- callback: (entry: IntersectionObserverEntry | undefined) => void,
- intersectionObserverOptions: IntersectionObserverInit = {},
- options: { disabled?: boolean } = {},
+ callback: (entry?: IntersectionObserverEntry) => void,
+ disabled?: boolean,
) {
React.useEffect(() => {
if (
!ref.current ||
- options.disabled ||
+ disabled ||
typeof IntersectionObserver !== 'function'
) {
- return
+ return () => callback()
}
- const observer = new IntersectionObserver(([entry]) => {
- callback(entry)
- }, intersectionObserverOptions)
+ const observer = new IntersectionObserver(
+ (entries) => {
+ callback(entries.pop())
+ },
+ { rootMargin: '100px' },
+ )
observer.observe(ref.current)
return () => {
observer.disconnect()
+ callback()
}
- }, [callback, intersectionObserverOptions, options.disabled, ref])
+ }, [callback, disabled, ref])
}
/**
diff --git a/packages/react-router/tests/Matches.test.tsx b/packages/react-router/tests/Matches.test.tsx
index 33153a4e11f..93dca8b9c02 100644
--- a/packages/react-router/tests/Matches.test.tsx
+++ b/packages/react-router/tests/Matches.test.tsx
@@ -4,6 +4,7 @@ import {
cleanup,
fireEvent,
render,
+ renderHook,
screen,
waitFor,
} from '@testing-library/react'
@@ -12,6 +13,7 @@ import { createControlledPromise } from '@tanstack/router-core'
import {
Link,
Outlet,
+ RouterContextProvider,
RouterProvider,
createRootRoute,
createRoute,
@@ -232,6 +234,59 @@ test('useMatchRoute follows superseding pending locations', async () => {
})
})
+test('useMatchRoute callback identity tracks route matching state', async () => {
+ const root = createRootRoute()
+ const a = createRoute({
+ getParentRoute: () => root,
+ path: '/a',
+ })
+ const b = createRoute({
+ getParentRoute: () => root,
+ path: '/b',
+ })
+ const router = createRouter({
+ routeTree: root.addChildren([a, b]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+ const aLocation = router.buildLocation({ to: '/a' })
+ const bLocation = router.buildLocation({ to: '/b' })
+
+ const { result, rerender } = renderHook(() => useMatchRoute(), {
+ wrapper: ({ children }) => (
+ {children}
+ ),
+ })
+
+ let previous = result.current
+ rerender()
+ expect(result.current).toBe(previous)
+
+ async function expectCallbackInvalidated(update: () => void) {
+ previous = result.current
+ act(update)
+ await waitFor(() => expect(result.current).not.toBe(previous))
+ }
+
+ await expectCallbackInvalidated(() => {
+ router.stores.location.set(aLocation)
+ })
+ await expectCallbackInvalidated(() => {
+ router.stores.resolvedLocation.set(bLocation)
+ })
+ await expectCallbackInvalidated(() => {
+ router.stores.status.set('pending')
+ })
+
+ previous = result.current
+ act(() => {
+ router.stores.location.set({ ...aLocation })
+ router.stores.resolvedLocation.set({ ...bLocation })
+ router.stores.status.set('pending')
+ })
+ rerender()
+ expect(result.current).toBe(previous)
+})
+
test('legacy notFoundRoute drops a stale parent layout after navigation', async () => {
let legacyLoads = 0
const root = createRootRoute({ component: Outlet })
diff --git a/packages/react-router/tests/Outlet.test.tsx b/packages/react-router/tests/Outlet.test.tsx
new file mode 100644
index 00000000000..e8dc5447cbc
--- /dev/null
+++ b/packages/react-router/tests/Outlet.test.tsx
@@ -0,0 +1,146 @@
+import { afterEach, expect, test, vi } from 'vitest'
+import { cleanup, render, screen } from '@testing-library/react'
+import { createMemoryHistory } from '@tanstack/history'
+import { createControlledPromise, notFound } from '@tanstack/router-core'
+import {
+ Outlet,
+ RouterProvider,
+ createRootRoute,
+ createRoute,
+ createRouter,
+} from '../src'
+
+const outletWarning = (
+ component: 'pendingComponent' | 'errorComponent' | 'notFoundComponent',
+) =>
+ `Warning: An Root route
+ Index route ,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(()
+ const rootRoute = createRootRoute({ component: Outlet })
+ const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ component: () => Index route ,
+ })
+ const pendingRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/pending',
+ loader: () => pending,
+ pendingMs: 0,
+ pendingComponent: () => (
+ <>
+ Pending route
+ Resolved route ,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute, pendingRoute]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(Error route
+ Index route ,
+ })
+ const notFoundRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/not-found',
+ component: () => {
+ throw notFound()
+ },
+ notFoundComponent: () => (
+ <>
+ Not found route
+ ((resolve) => {
- resolveLoader = resolve
- })
-
- const rootRoute = createRootRoute()
- const indexRoute = createRoute({
- getParentRoute: () => rootRoute,
- path: '/',
- loader: () => loaderPromise,
- component: () => loaded
,
- })
-
- const router = createRouter({
- routeTree: rootRoute.addChildren([indexRoute]),
- history,
- })
- let resolveRendered!: () => void
- const rendered = new Promise((resolve) => {
- resolveRendered = resolve
- })
- const unsubscribe = router.subscribe('onRendered', (event) => {
- if (event.toLocation.pathname === '/') {
- resolveRendered()
- }
- })
-
- onTestFinished(() => {
- unsubscribe()
- resolveLoader('done')
- vi.useRealTimers()
- })
-
- render(
-
- (
- pending...
- )}
- />
- ,
- )
-
- // Fake timers keep the first macrotask frozen. An implementation that
- // publishes pending state with setTimeout cannot satisfy this assertion.
- await act(async () => {})
- expect(screen.getByTestId('pending')).toBeInTheDocument()
-
- // Sanity: the load still completes normally afterwards.
- resolveLoader('done')
- await act(() => rendered)
- expect(screen.getByTestId('loaded')).toBeInTheDocument()
- expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
- })
-})
diff --git a/packages/react-router/tests/issue-7964-param-parsing-loader.test.tsx b/packages/react-router/tests/issue-7964-param-parsing-loader.test.tsx
new file mode 100644
index 00000000000..54f6c19c47f
--- /dev/null
+++ b/packages/react-router/tests/issue-7964-param-parsing-loader.test.tsx
@@ -0,0 +1,107 @@
+import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, expect, test } from 'vitest'
+import {
+ Outlet,
+ RouterProvider,
+ createMemoryHistory,
+ createRootRoute,
+ createRoute,
+ createRouter,
+} from '../src'
+
+afterEach(() => {
+ cleanup()
+})
+
+// https://github.com/TanStack/router/issues/7964
+test('#7964: a child loader receives fresh structured params after revisiting its route', async () => {
+ const rootRoute = createRootRoute({
+ component: Outlet,
+ })
+ const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ component: () => Home page
,
+ })
+ const parsedParamRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/$parsedParam',
+ params: {
+ parse: ({ parsedParam }) => {
+ const [recordName, revisionNumber] = parsedParam.split('-')
+ return {
+ parsedParam: {
+ recordName: recordName!,
+ revisionNumber: Number(revisionNumber),
+ },
+ }
+ },
+ stringify: ({ parsedParam }) => ({
+ parsedParam: `${parsedParam.recordName}-${parsedParam.revisionNumber}`,
+ }),
+ },
+ component: Outlet,
+ })
+ const parsedParamIndexRoute = createRoute({
+ getParentRoute: () => parsedParamRoute,
+ path: '/',
+ loader: ({ params }) => params.parsedParam.revisionNumber * 100,
+ component: () => {
+ const params = parsedParamIndexRoute.useParams()
+ const loaderData = parsedParamIndexRoute.useLoaderData()
+
+ return (
+ <>
+
+ Params have {params.parsedParam.recordName} with revision{' '}
+ {params.parsedParam.revisionNumber}
+
+ Loader data is {loaderData}
+
+ )
+ },
+ })
+ const routeTree = rootRoute.addChildren([
+ indexRoute,
+ parsedParamRoute.addChildren([parsedParamIndexRoute]),
+ ])
+ const router = createRouter({
+ routeTree,
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(((resolve) => setTimeout(resolve, navigationDelay))
+}
+
+function deferred() {
+ let resolve!: () => void
+ const promise = new Promise((resolver) => {
+ resolve = resolver
+ })
+ return { promise, resolve }
+}
+
+function setup() {
+ const navigationBeforeLoadStarted = deferred()
+ let beforeLoadCalls = 0
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const layoutRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ id: 'app',
+ beforeLoad: async () => {
+ if (++beforeLoadCalls > 1) {
+ navigationBeforeLoadStarted.resolve()
+ await delayNavigation()
+ }
+ return { user: 'test' }
+ },
+ component: Outlet,
+ })
+ const projectRoute = createRoute({
+ getParentRoute: () => layoutRoute,
+ path: '/projects/$projectId',
+ validateSearch: (search: Record): { tab?: string } =>
+ typeof search.tab === 'string' ? { tab: search.tab } : {},
+ component: Project,
+ })
+
+ function Project() {
+ const { projectId } = projectRoute.useParams()
+ const { tab } = projectRoute.useSearch()
+ return (
+
+ project={projectId} tab={tab ?? 'default'}
+
+ )
+ }
+
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([layoutRoute.addChildren([projectRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/projects/p1'] }),
+ defaultPendingComponent: () => Pending
,
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ return {
+ router,
+ navigationBeforeLoadStarted,
+ }
+}
+
+test('a search-only navigation retains successful UI while beforeLoad reruns', async () => {
+ const { router, navigationBeforeLoadStarted } = setup()
+ render(
+ await act(async () => {
+ navigation = router.navigate({
+ to: '/projects/$projectId',
+ params: { projectId: 'p1' },
+ search: { tab: 'files' },
+ })
+ await navigationBeforeLoadStarted.promise
+ })
+
+ const contentWhileLoading = screen.getByTestId('content')
+ expect(contentWhileLoading).toBeVisible()
+ expect(contentWhileLoading).toHaveTextContent('project=p1 tab=default')
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(0)
+ })
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent(
+ 'project=p1 tab=default',
+ )
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(navigationDelay)
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toHaveTextContent(
+ 'project=p1 tab=files',
+ )
+})
+
+test('a path-param navigation retains successful UI while beforeLoad reruns', async () => {
+ const { router, navigationBeforeLoadStarted } = setup()
+ render(
+ await act(async () => {
+ navigation = router.navigate({
+ to: '/projects/$projectId',
+ params: { projectId: 'p2' },
+ })
+ await navigationBeforeLoadStarted.promise
+ })
+
+ const contentWhileLoading = screen.getByTestId('content')
+ expect(contentWhileLoading).toBeVisible()
+ expect(contentWhileLoading).toHaveTextContent('project=p1 tab=default')
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(0)
+ })
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent(
+ 'project=p1 tab=default',
+ )
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(navigationDelay)
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toHaveTextContent(
+ 'project=p2 tab=default',
+ )
+})
+
+test('a blocking reload retains the exact successful match', async () => {
+ const reloadStarted = deferred()
+ let loaderCalls = 0
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ validateSearch: (search: Record): { tab?: string } =>
+ typeof search.tab === 'string' ? { tab: search.tab } : {},
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (++loaderCalls === 1) {
+ return 'initial'
+ }
+ reloadStarted.resolve()
+ return delayNavigation().then(() => 'reloaded')
+ },
+ },
+ component: () => (
+
+ {pageRoute.useLoaderData()} tab=
+ {pageRoute.useSearch().tab ?? 'default'}
+
+ ),
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingComponent: () => Pending
,
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({
+ to: '/page',
+ search: { tab: 'files' },
+ })
+ await reloadStarted.promise
+ })
+
+ const contentWhileLoading = screen.getByTestId('content')
+ expect(contentWhileLoading).toBeVisible()
+ expect(contentWhileLoading).toHaveTextContent('initial tab=default')
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(0)
+ })
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent('initial tab=default')
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(navigationDelay)
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toHaveTextContent('reloaded tab=files')
+})
+
+test('a cached success retries through pending UI when an error is mounted', async () => {
+ vi.spyOn(console, 'error').mockImplementation(() => {})
+ vi.spyOn(console, 'warn').mockImplementation(() => {})
+ const retryStarted = deferred()
+ const retry = deferred()
+ let loaderCalls = 0
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ loaderCalls++
+ if (loaderCalls === 1) {
+ throw new Error('initial load failed')
+ }
+ if (loaderCalls === 2) {
+ return 'preloaded'
+ }
+ retryStarted.resolve()
+ return retry.promise.then(() => 'retried')
+ },
+ },
+ component: () => (
+ {pageRoute.useLoaderData()}
+ ),
+ pendingComponent: () => Pending
,
+ errorComponent: () => Failed
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/page' })
+ await retryStarted.promise
+ })
+
+ expect(await screen.findByTestId('pending')).toBeVisible()
+ expect(screen.getByTestId('error')).not.toBeVisible()
+
+ await act(async () => {
+ retry.resolve()
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent('retried')
+})
+
+test('a cache-only success retries through pending UI over mounted success', async () => {
+ const retryStarted = deferred()
+ const retry = deferred()
+ let loaderCalls = 0
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ const generation = ++loaderCalls
+ if (generation === 3) {
+ retryStarted.resolve()
+ return retry.promise.then(() => `generation ${generation}`)
+ }
+ return `generation ${generation}`
+ },
+ },
+ component: () => (
+ {pageRoute.useLoaderData()}
+ ),
+ pendingComponent: () => Pending
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/page' })
+ await retryStarted.promise
+ })
+
+ expect(await screen.findByTestId('pending')).toBeVisible()
+ expect(screen.getByTestId('content')).not.toBeVisible()
+
+ await act(async () => {
+ retry.resolve()
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toHaveTextContent('generation 3')
+})
+
+test('a success hidden below an error boundary retries through pending UI', async () => {
+ vi.spyOn(console, 'error').mockImplementation(() => {})
+ vi.spyOn(console, 'warn').mockImplementation(() => {})
+ const childReloadStarted = deferred()
+ const childReload = deferred()
+ let parentFails = false
+ let childReloads = false
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const parentRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/parent',
+ shouldReload: true,
+ loader: () => {
+ if (parentFails) {
+ throw new Error('parent failed')
+ }
+ return 'parent data'
+ },
+ component: Outlet,
+ errorComponent: () => Parent failed
,
+ })
+ const childRoute = createRoute({
+ getParentRoute: () => parentRoute,
+ path: '/child',
+ shouldReload: () => childReloads,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (childReloads) {
+ childReloadStarted.resolve()
+ return childReload.promise.then(() => 'reloaded child')
+ }
+ return 'initial child'
+ },
+ },
+ component: () => (
+ {childRoute.useLoaderData()}
+ ),
+ pendingComponent: () => Pending child
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/parent/child'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/parent/child' })
+ await childReloadStarted.promise
+ })
+
+ expect(await screen.findByTestId('pending')).toBeVisible()
+ expect(screen.queryByTestId('error')).not.toBeInTheDocument()
+
+ await act(async () => {
+ childReload.resolve()
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent('reloaded child')
+})
+
+test('a global not-found destination does not retain the mounted root success', async () => {
+ const missingStarted = deferred()
+ const missingLoader = deferred()
+ let loaderCalls = 0
+
+ const rootRoute = createRootRoute({
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (++loaderCalls === 1) {
+ return 'initial root'
+ }
+ missingStarted.resolve()
+ return missingLoader.promise
+ },
+ },
+ component: Outlet,
+ pendingComponent: () => Pending root
,
+ notFoundComponent: () => Missing
,
+ })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ component: () => Page
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/missing' } as any)
+ await missingStarted.promise
+ })
+
+ expect(await screen.findByTestId('pending')).toBeVisible()
+ expect(screen.getByTestId('content')).not.toBeVisible()
+
+ await act(async () => {
+ missingLoader.resolve()
+ await navigation
+ })
+
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('missing')).toBeVisible()
+})
+
+test('lazy fuzzy-boundary relocation retains the mounted parent', async () => {
+ const lazyStarted = deferred()
+ const lazyRoute = deferred()
+ const parentReloadStarted = deferred()
+ const parentReload = deferred()
+ let parentLoads = 0
+
+ const rootRoute = createRootRoute({
+ component: Outlet,
+ notFoundComponent: () => Root missing
,
+ })
+ const parentRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/parent',
+ beforeLoad: async () => {
+ if (++parentLoads > 1) {
+ parentReloadStarted.resolve()
+ await parentReload.promise
+ }
+ },
+ component: () => (
+
+ ),
+ pendingComponent: () => (
+ Parent pending
+ ),
+ notFoundComponent: () => (
+ Parent missing
+ ),
+ })
+ const childRoute = createRoute({
+ getParentRoute: () => parentRoute,
+ path: '/child',
+ }).lazy(async () => {
+ lazyStarted.resolve()
+ await lazyRoute.promise
+ return createLazyRoute('/parent/child')({
+ notFoundComponent: () => (
+ Child missing
+ ),
+ })
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/parent'] }),
+ defaultPendingComponent: () => (
+ Pending
+ ),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/parent/child/missing' as any })
+ await lazyStarted.promise
+ })
+
+ expect(screen.getByTestId('parent-content')).toBeVisible()
+ expect(screen.queryByTestId('parent-pending')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('parent-missing')).not.toBeInTheDocument()
+
+ await act(async () => {
+ lazyRoute.resolve()
+ await parentReloadStarted.promise
+ })
+
+ expect(screen.getByTestId('parent-content')).toBeVisible()
+ expect(screen.queryByTestId('parent-pending')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('parent-missing')).not.toBeInTheDocument()
+
+ await act(async () => {
+ parentReload.resolve()
+ await navigation
+ })
+
+ expect(screen.getByTestId('child-missing')).toBeVisible()
+ expect(screen.queryByTestId('root-missing')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('parent-missing')).not.toBeInTheDocument()
+})
+
+test('a superseding navigation replaces an unrelated pending presentation', async () => {
+ const otherStarted = deferred()
+ const otherLoader = deferred()
+ const pageReloadStarted = deferred()
+ const pageReload = deferred()
+ let pageLoads = 0
+
+ const rootRoute = createRootRoute({ component: Outlet })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (++pageLoads === 1) {
+ return 'initial page'
+ }
+ pageReloadStarted.resolve()
+ return pageReload.promise.then(() => 'reloaded page')
+ },
+ },
+ component: () => (
+ {pageRoute.useLoaderData()}
+ ),
+ pendingComponent: () => Page pending
,
+ })
+ const otherRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/other',
+ loader: async () => {
+ otherStarted.resolve()
+ await otherLoader.promise
+ },
+ pendingComponent: () => (
+ Other pending
+ ),
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute, otherRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(
+ await act(async () => {
+ navigation = router.navigate({ to: '/page' })
+ await pageReloadStarted.promise
+ })
+
+ await waitFor(() => {
+ expect(screen.getByTestId('page-pending')).toBeVisible()
+ expect(screen.queryByTestId('other-pending')).not.toBeInTheDocument()
+ })
+
+ await act(async () => {
+ pageReload.resolve()
+ await navigation
+ })
+ await act(async () => {
+ otherLoader.resolve()
+ await Promise.resolve()
+ })
+
+ expect(screen.queryByTestId('page-pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('content')).toBeVisible()
+ expect(screen.getByTestId('content')).toHaveTextContent('reloaded page')
+})
diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx
index f06a3a8decc..1c135361acf 100644
--- a/packages/react-router/tests/link.test.tsx
+++ b/packages/react-router/tests/link.test.tsx
@@ -31,6 +31,7 @@ import {
redirect,
retainSearchParams,
stripSearchParams,
+ useLinkProps,
useLoaderData,
useMatchRoute,
useParams,
@@ -47,12 +48,16 @@ import type { RouterHistory } from '../src'
const ioObserveMock = vi.fn()
const ioDisconnectMock = vi.fn()
+let ioCallback: IntersectionObserverCallback
let history: RouterHistory
beforeEach(() => {
const io = getIntersectionObserverMock({
observe: ioObserveMock,
disconnect: ioDisconnectMock,
+ onCreate: (callback) => {
+ ioCallback = callback
+ },
})
vi.stubGlobal('IntersectionObserver', io)
history = createBrowserHistory()
@@ -60,6 +65,7 @@ beforeEach(() => {
})
afterEach(() => {
+ vi.useRealTimers()
history.destroy()
window.history.replaceState(null, 'root', '/')
vi.resetAllMocks()
@@ -952,6 +958,26 @@ describe('Link', () => {
expect(relativeFoo).toHaveAttribute('href', '/invoices/foo')
})
})
+
+ test('relative links from root keep javascript-like segments rooted', async () => {
+ const rootRoute = createRootRoute()
+ const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ component: () =>
+ setTo((current) => (current === '/about' ? '/other' : '/about'))
+ }
+ >
+ Change destination
+
+ setPreload('intent')}>Use intent
+ setPreload(false)}>Disable preload
+ Index ,
+ })
+
+ const postsRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/posts',
+ component: () => Posts ,
+ })
+
+ const elsewhereRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/elsewhere',
+ component: () => Elsewhere ,
+ })
+
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([
+ indexRoute,
+ postsRoute,
+ elsewhereRoute,
+ ]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ return { router, renderCounts }
+ }
+
+ test('does not re-render a link a navigation cannot affect', async () => {
+ const { router, renderCounts } = setup()
+ render(
+ }) {
+ return (
+
+ >({})
+ return (
+ <>
+ setParams({ category: undefined })}
+ >
+ clear
+
+ {
const [location, matches] = lane
const signal = options[0 /* controller */].signal
@@ -433,7 +434,8 @@ async function contextualize(
}
const previousStatus = match.status
- if (previousStatus === 'success') {
+ // Retain only a success that is mounted through the same valid prefix.
+ if (previousStatus === 'success' && index >= retainedEnd) {
match.status = 'pending'
}
options[8 /* onReady */]?.()
@@ -511,40 +513,21 @@ function transferMatchResources(
router: AnyRouter,
previous: Array,
next?: Array,
+ deferSameIdFlight?: true,
): void {
const abort: Array = []
for (const match of previous as Array) {
if (!next?.includes(match)) {
- const flight = match._flight
- match._flight = undefined
- const controller = releaseOwnedFlight(router, match, flight)
- if (controller) {
- abort.push(controller)
- }
- }
- }
- for (const controller of abort) {
- controller.abort()
- }
-}
-
-function transferPredecessorResources(
- router: AnyRouter,
- previous: Array,
- next: Array,
-): void {
- const abort: Array = []
- for (const match of previous as Array) {
- if (!next.includes(match)) {
const flight = match._flight
match._flight = undefined
if (
+ deferSameIdFlight &&
flight?.[2 /* leases */] === 1 &&
router._flights?.get(match.id) === flight &&
!(
process.env.NODE_ENV !== 'production' && router._tx?.[6 /* refresh */]
) &&
- next.some((candidate) => candidate.id === match.id)
+ next?.some((candidate) => candidate.id === match.id)
) {
// The successor has not made its same-ID reload decision yet.
flight[2 /* leases */] = 0
@@ -561,19 +544,6 @@ function transferPredecessorResources(
}
}
-function releaseUnownedFlights(router: AnyRouter): void {
- const abort: Array = []
- for (const [id, flight] of router._flights ?? []) {
- if (!flight[2 /* leases */]) {
- router._flights!.delete(id)
- abort.push(flight[1 /* controller */])
- }
- }
- for (const controller of abort) {
- controller.abort()
- }
-}
-
function acquireMatchResources(matches: Array): void {
for (const match of matches as Array) {
const flight = match._flight
@@ -775,11 +745,12 @@ function createLoaderTask(
tasks: Array,
semanticParent: Promise | undefined,
options: ExecuteLaneOptions,
+ retainedEnd: number,
): Promise {
const match = lane[1 /* matches */][index]!
const route = getRoute(router, match)
const preload = !!options[4 /* preload */]
- const plannedCacheMatch = preload ? router._cache.get(match.id) : undefined
+ const plannedCacheMatch = router._cache.get(match.id)
let configured
let reload = false
let reloadFailure: LoaderOutcome | undefined
@@ -879,11 +850,9 @@ function createLoaderTask(
const acceptedFlight = match._flight
match._flight = donor
releaseOwnedFlight(router, match, acceptedFlight)?.abort()
- // A successful route without a loader has no blocking work to present. It
- // still gets a task so its chunk and derived assets participate in the
- // lane, but putting it back into pending would hide an already-rendered
- // ancestor while only a descendant is loading.
- if (match.status === 'success') {
+ // A successful route without a loader has no blocking work to present. A
+ // mounted success likewise remains renderable while its loader revalidates.
+ if (match.status === 'success' && index >= retainedEnd) {
match.status = 'pending'
}
options[8 /* onReady */]?.()
@@ -909,10 +878,16 @@ function createLoaderTask(
if (blocking) {
settleInto(match, result, preload)
if (result[0 /* kind */] === SUCCESS) {
+ // A settled generation can outlive its lane without keeping unresolved
+ // navigation work alive. Refresh generations remain private for rollback.
if (
- preload &&
routeLoader &&
- !options[0 /* controller */].signal.aborted
+ !options[0 /* controller */].signal.aborted &&
+ !(
+ process.env.NODE_ENV !== 'production' &&
+ !preload &&
+ router._tx?.[6 /* refresh */]
+ )
) {
cacheLoaderMatch(router, match, plannedCacheMatch)
}
@@ -1173,18 +1148,19 @@ async function reduceLane(
}
}
install()
+ const route = getRoute(router, match)
try {
await waitFor(
outcome
? Promise.resolve().then(() =>
loadRouteChunk(
- getRoute(router, match),
+ route,
kind === ERROR ? 'errorComponent' : 'notFoundComponent',
),
)
: Promise.all([
- loadRouteChunk(getRoute(router, match)),
- loadRouteChunk(getRoute(router, match), 'notFoundComponent'),
+ loadRouteChunk(route),
+ loadRouteChunk(route, 'notFoundComponent'),
]),
controller.signal,
)
@@ -1268,6 +1244,7 @@ async function executeClientLane(
options: ExecuteLaneOptions,
): Promise {
const matched = [location, matches as Array] as MatchedLane
+ const presented = router.stores.matches.get()
let plannedBoundary = matches.findIndex((match) => match._notFound)
if (router.options.notFoundMode !== 'root' && plannedBoundary >= 0) {
const boundary = await getNotFoundBoundary(
@@ -1284,6 +1261,24 @@ async function executeClientLane(
plannedBoundary = boundary
}
let end = plannedBoundary < 0 ? matches.length : plannedBoundary + 1
+ let retainedEnd = 0
+ while (retainedEnd < end && retainedEnd !== plannedBoundary) {
+ const match = matches[retainedEnd]!
+ const committed = options[3 /* base */][retainedEnd]
+ const visible = presented[retainedEnd]
+ if (
+ committed?.id !== match.id ||
+ committed.status !== 'success' ||
+ committed._notFound ||
+ match.preload ||
+ visible?.id !== match.id ||
+ visible.status !== 'success' ||
+ visible._notFound
+ ) {
+ break
+ }
+ retainedEnd++
+ }
const tasks: Array = []
const start = options[7 /* resolvedPrefix */] ?? 0
let semanticParent = start
@@ -1301,6 +1296,7 @@ async function executeClientLane(
tasks,
semanticParent,
options,
+ retainedEnd,
)
}
}
@@ -1313,6 +1309,7 @@ async function executeClientLane(
options,
end,
planSuccessfulLane,
+ retainedEnd,
)
if (failure) {
options[5 /* sync */] = true
@@ -1331,7 +1328,16 @@ async function executeClientLane(
planSuccessfulLane()
}
if (options[2 /* isCurrent */]() && !options[4 /* preload */]) {
- releaseUnownedFlights(router)
+ const abort: Array = []
+ for (const [id, flight] of router._flights ?? []) {
+ if (!flight[2 /* leases */]) {
+ router._flights!.delete(id)
+ abort.push(flight[1 /* controller */])
+ }
+ }
+ for (const controller of abort) {
+ controller.abort()
+ }
}
let reduced: ReducedLane | ControlOutcome
try {
@@ -1376,49 +1382,6 @@ async function executeClientLane(
)
}
-/**
- * Finds the first route that should show pending UI and its two timing values.
- * A fallback already on screen remains selected after its route loads, so we
- * do not jump to a child fallback. Matches put back into pending by invalidation
- * skip pendingMs, and a route without a usable fallback blocks pending UI for deeper routes.
- */
-function pendingConfig(
- router: AnyRouter,
- matches: Array,
-):
- | [delay: number, boundary: number, min: number, component: unknown]
- | undefined
- | void {
- const presented = router.stores.matches.get()
- for (let index = 0; index < matches.length; index++) {
- const match = matches[index]!
- const success = match.status === 'success'
- const visible =
- success &&
- presented[index]?.id === match.id &&
- presented[index]?.status === 'pending'
- if (success && !visible) {
- continue
- }
- const route = getRoute(router, match as WorkMatch)
- const delay =
- visible || match.invalid
- ? 0
- : (route.options.pendingMs ?? router.options.defaultPendingMs)
- const component =
- route.options.pendingComponent ??
- (router.options as any).defaultPendingComponent
- return component && typeof delay === 'number' && delay !== Infinity
- ? [
- delay,
- index,
- route.options.pendingMinMs ?? router.options.defaultPendingMinMs ?? 0,
- component,
- ]
- : undefined
- }
-}
-
/**
* Waits for `pendingMs`, then presents the complete lane. Rendering applies the
* selected boundary cutoff while retaining every match's structural state.
@@ -1445,12 +1408,41 @@ function offerPending(router: CoordinatorRouter, tx: LoadTransaction): void {
router._pending = session = undefined
}
}
- const config = pendingConfig(router, tx[3 /* matches */])
- if (!config) {
+ const matches = tx[3 /* matches */]
+ const presented = router.stores.matches.get()
+ let boundary = -1
+ let delay: number | undefined
+ let min!: number
+ let component: unknown
+ let presentedPending = false
+ for (let index = 0; index < matches.length; index++) {
+ const match = matches[index]!
+ const success = match.status === 'success'
+ presentedPending =
+ presented[index]?.id === match.id &&
+ presented[index]?.status === 'pending'
+ if (success && !presentedPending) {
+ continue
+ }
+ const route = getRoute(router, match as WorkMatch)
+ delay =
+ (success && presentedPending) || match.invalid
+ ? 0
+ : (route.options.pendingMs ?? router.options.defaultPendingMs)
+ component =
+ route.options.pendingComponent ??
+ (router.options as any).defaultPendingComponent
+ if (!component || typeof delay !== 'number' || delay === Infinity) {
+ return
+ }
+ boundary = index
+ min = route.options.pendingMinMs ?? router.options.defaultPendingMinMs ?? 0
+ break
+ }
+ if (boundary < 0) {
return
}
- const [delay, boundary, min, component] = config
- const matchId = tx[3 /* matches */][boundary]!.id
+ const matchId = matches[boundary]!.id
if (
!session ||
session[1 /* boundary */] !== boundary ||
@@ -1459,14 +1451,12 @@ function offerPending(router: CoordinatorRouter, tx: LoadTransaction): void {
// Hydration and redirects can preserve pending presentation without a session.
// Do not delay it again; conservatively start pendingMinMs from now.
clearTimeout(session?.[3 /* timer */])
- const presented = router.stores.matches.get()[boundary]
- const visible = presented?.id === matchId && presented.status === 'pending'
router._pending = session = [
tx,
boundary,
- visible ? Date.now() + min : tx[4 /* startedAt */] + delay,
+ presentedPending ? Date.now() + min : tx[4 /* startedAt */] + delay!,
undefined,
- visible ? Promise.resolve(true) : undefined,
+ presentedPending ? Promise.resolve(true) : undefined,
component,
]
}
@@ -1482,14 +1472,15 @@ function offerPending(router: CoordinatorRouter, tx: LoadTransaction): void {
clearTimeout(session[3 /* timer */])
const remaining = session[2 /* deadline */] - Date.now()
if (remaining > 0) {
- session[3 /* timer */] = setTimeout(() => {
- offerPending(router, tx)
- }, remaining)
+ session[3 /* timer */] = setTimeout(
+ () => offerPending(router, tx),
+ remaining,
+ )
return
}
session[2 /* deadline */] = 0
}
- const offered = tx[3 /* matches */].map((match) => ({
+ const offered = matches.map((match) => ({
...match,
_flight: undefined,
}))
@@ -2149,10 +2140,11 @@ export async function loadClientRoute(
}
}
previousOwner[0 /* controller */].abort()
- transferPredecessorResources(
+ transferMatchResources(
router,
previousOwner[3 /* matches */],
tx[3 /* matches */],
+ true,
)
}
if (router._tx !== tx) {
@@ -2165,7 +2157,11 @@ export async function loadClientRoute(
router.stores.status.set('pending')
router.stores.location.set(location)
})
- offerPending(router, tx)
+ // Cold loads have no committed UI to retain, but provisional not-found
+ // matches must wait for lazy routes to place the final boundary.
+ if (!resolvedLocation && !matches.some((match) => match._notFound)) {
+ offerPending(router, tx)
+ }
try {
await tx[5 /* done */]
} finally {
diff --git a/packages/router-core/src/new-process-route-tree.ts b/packages/router-core/src/new-process-route-tree.ts
index 6978b071ce3..2640961815a 100644
--- a/packages/router-core/src/new-process-route-tree.ts
+++ b/packages/router-core/src/new-process-route-tree.ts
@@ -199,16 +199,18 @@ function parseSegments(
start: number,
node: AnySegmentNode,
depth: number,
+ /** Each dynamic sibling list is recorded once, when it first needs sorting. */
+ dynamicListsToSort?: Array>>,
onRoute?: (route: TRouteLike) => void,
) {
onRoute?.(route)
let cursor = start
{
const path = route.fullPath ?? route.from
+ const options = route.options
const length = path.length
- const caseSensitive = route.options?.caseSensitive ?? defaultCaseSensitive
- const parseParams =
- route.options?.params?.parse ?? route.options?.parseParams
+ const caseSensitive = options?.caseSensitive ?? defaultCaseSensitive
+ const parseParams = options?.params?.parse ?? options?.parseParams
while (cursor < length) {
const segment = parseSegment(path, cursor, data)
let nextNode: AnySegmentNode
@@ -220,81 +222,29 @@ function parseSegments(
switch (kind) {
case SEGMENT_TYPE_PATHNAME: {
const value = path.substring(segment[2], segment[3])
+ let name = value
+ let staticChildren: Map>
if (caseSensitive) {
- const existingNode = node.static?.get(value)
- if (existingNode) {
- nextNode = existingNode
- } else {
- node.static ??= new Map()
- const next = createStaticNode(
- route.fullPath ?? route.from,
- )
- next.parent = node
- next.depth = depth
- nextNode = next
- node.static.set(value, next)
- }
+ staticChildren = node.static ??= new Map()
} else {
- const name = value.toLowerCase()
- const existingNode = node.staticInsensitive?.get(name)
- if (existingNode) {
- nextNode = existingNode
- } else {
- node.staticInsensitive ??= new Map()
- const next = createStaticNode(
- route.fullPath ?? route.from,
- )
- next.parent = node
- next.depth = depth
- nextNode = next
- node.staticInsensitive.set(name, next)
- }
+ name = value.toLowerCase()
+ staticChildren = node.staticInsensitive ??= new Map()
}
- break
- }
- case SEGMENT_TYPE_PARAM: {
- const prefix_raw = path.substring(start, segment[1])
- const suffix_raw = path.substring(segment[4], end)
- const actuallyCaseSensitive =
- caseSensitive && !!(prefix_raw || suffix_raw)
- const prefix = !prefix_raw
- ? undefined
- : actuallyCaseSensitive
- ? prefix_raw
- : prefix_raw.toLowerCase()
- const suffix = !suffix_raw
- ? undefined
- : actuallyCaseSensitive
- ? suffix_raw
- : suffix_raw.toLowerCase()
- const existingNode =
- !parseParams &&
- node.dynamic?.find(
- (s) =>
- !s.parse &&
- s.caseSensitive === actuallyCaseSensitive &&
- s.prefix === prefix &&
- s.suffix === suffix,
- )
+ const existingNode = staticChildren.get(name)
if (existingNode) {
nextNode = existingNode
} else {
- const next = createDynamicNode(
- SEGMENT_TYPE_PARAM,
- route.fullPath ?? route.from,
- actuallyCaseSensitive,
- prefix,
- suffix,
- )
- nextNode = next
- next.depth = depth
+ const next = createStaticNode(path)
next.parent = node
- node.dynamic ??= []
- node.dynamic.push(next)
+ next.depth = depth
+ nextNode = next
+ staticChildren.set(name, next)
}
break
}
- case SEGMENT_TYPE_OPTIONAL_PARAM: {
+ case SEGMENT_TYPE_PARAM:
+ case SEGMENT_TYPE_OPTIONAL_PARAM:
+ case SEGMENT_TYPE_WILDCARD: {
const prefix_raw = path.substring(start, segment[1])
const suffix_raw = path.substring(segment[4], end)
const actuallyCaseSensitive =
@@ -309,9 +259,18 @@ function parseSegments(
: actuallyCaseSensitive
? suffix_raw
: suffix_raw.toLowerCase()
+ const siblings =
+ kind === SEGMENT_TYPE_PARAM
+ ? node.dynamic
+ : kind === SEGMENT_TYPE_OPTIONAL_PARAM
+ ? node.optional
+ : node.wildcard
const existingNode =
+ // Keep wildcard aliases as separate match candidates, even when
+ // they have the same shape and no parser.
+ kind !== SEGMENT_TYPE_WILDCARD &&
!parseParams &&
- node.optional?.find(
+ siblings?.find(
(s) =>
!s.parse &&
s.caseSensitive === actuallyCaseSensitive &&
@@ -322,8 +281,8 @@ function parseSegments(
nextNode = existingNode
} else {
const next = createDynamicNode(
- SEGMENT_TYPE_OPTIONAL_PARAM,
- route.fullPath ?? route.from,
+ kind,
+ path,
actuallyCaseSensitive,
prefix,
suffix,
@@ -331,39 +290,21 @@ function parseSegments(
nextNode = next
next.parent = node
next.depth = depth
- node.optional ??= []
- node.optional.push(next)
+ let nodes: Array>
+ if (kind === SEGMENT_TYPE_PARAM) {
+ nodes = node.dynamic ??= []
+ } else if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) {
+ nodes = node.optional ??= []
+ } else {
+ nodes = node.wildcard ??= []
+ }
+ nodes.push(next)
+ if (nodes.length === 2) {
+ dynamicListsToSort?.push(nodes)
+ }
}
break
}
- case SEGMENT_TYPE_WILDCARD: {
- const prefix_raw = path.substring(start, segment[1])
- const suffix_raw = path.substring(segment[4], end)
- const actuallyCaseSensitive =
- caseSensitive && !!(prefix_raw || suffix_raw)
- const prefix = !prefix_raw
- ? undefined
- : actuallyCaseSensitive
- ? prefix_raw
- : prefix_raw.toLowerCase()
- const suffix = !suffix_raw
- ? undefined
- : actuallyCaseSensitive
- ? suffix_raw
- : suffix_raw.toLowerCase()
- const next = createDynamicNode(
- SEGMENT_TYPE_WILDCARD,
- route.fullPath ?? route.from,
- actuallyCaseSensitive,
- prefix,
- suffix,
- )
- nextNode = next
- next.parent = node
- next.depth = depth
- node.wildcard ??= []
- node.wildcard.push(next)
- }
}
node = nextNode
}
@@ -376,9 +317,7 @@ function parseSegments(
route.id &&
route.id.charCodeAt(route.id.lastIndexOf('/') + 1) === 95 /* '_' */
) {
- const pathlessNode = createStaticNode(
- route.fullPath ?? route.from,
- )
+ const pathlessNode = createStaticNode(path)
pathlessNode.kind = SEGMENT_TYPE_PATHLESS
pathlessNode.parent = node
depth++
@@ -391,9 +330,7 @@ function parseSegments(
const isLeaf = (route.path || !route.children) && !route.isRoot
// create index node
if (isLeaf && path.endsWith('/')) {
- const indexNode = createStaticNode(
- route.fullPath ?? route.from,
- )
+ const indexNode = createStaticNode(path)
indexNode.kind = SEGMENT_TYPE_INDEX
indexNode.parent = node
depth++
@@ -403,12 +340,12 @@ function parseSegments(
}
node.parse = parseParams ?? null
- node.priority = route.options?.params?.priority ?? 0
+ node.priority = options?.params?.priority ?? 0
// make node "matchable"
if (isLeaf && !node.route) {
node.route = route
- node.fullPath = route.fullPath ?? route.from
+ node.fullPath = path
}
}
if (route.children)
@@ -420,6 +357,7 @@ function parseSegments(
cursor,
node,
depth,
+ dynamicListsToSort,
onRoute,
)
}
@@ -464,42 +402,6 @@ function sortDynamic(
return 0
}
-function sortTreeNodes(node: SegmentNode) {
- if (node.pathless) {
- for (const child of node.pathless) {
- sortTreeNodes(child)
- }
- }
- if (node.static) {
- for (const child of node.static.values()) {
- sortTreeNodes(child)
- }
- }
- if (node.staticInsensitive) {
- for (const child of node.staticInsensitive.values()) {
- sortTreeNodes(child)
- }
- }
- if (node.dynamic?.length) {
- node.dynamic.sort(sortDynamic)
- for (const child of node.dynamic) {
- sortTreeNodes(child)
- }
- }
- if (node.optional?.length) {
- node.optional.sort(sortDynamic)
- for (const child of node.optional) {
- sortTreeNodes(child)
- }
- }
- if (node.wildcard?.length) {
- node.wildcard.sort(sortDynamic)
- for (const child of node.wildcard) {
- sortTreeNodes(child)
- }
- }
-}
-
function createStaticNode(
fullPath: string,
): StaticSegmentNode {
@@ -663,10 +565,13 @@ export function processRouteMasks<
) {
const segmentTree = createStaticNode('/')
const data = new Uint16Array(6)
+ const dynamicListsToSort: Array>> = []
for (const route of routeList) {
- parseSegments(false, data, route, 1, segmentTree, 0)
+ parseSegments(false, data, route, 1, segmentTree, 0, dynamicListsToSort)
+ }
+ for (const nodes of dynamicListsToSort) {
+ nodes.sort(sortDynamic)
}
- sortTreeNodes(segmentTree)
processedTree.masksTree = segmentTree
processedTree.flatCache = createLRUCache<
string,
@@ -789,34 +694,46 @@ export function processRouteTree<
): ProcessRouteTreeResult {
const segmentTree = createStaticNode(routeTree.fullPath)
const data = new Uint16Array(6)
+ const dynamicListsToSort: Array>> = []
const routesById = {} as Record
const routesByPath = {} as Record
let index = 0
- parseSegments(caseSensitive, data, routeTree, 1, segmentTree, 0, (route) => {
- initRoute?.(route, index)
+ parseSegments(
+ caseSensitive,
+ data,
+ routeTree,
+ 1,
+ segmentTree,
+ 0,
+ dynamicListsToSort,
+ (route) => {
+ initRoute?.(route, index)
+
+ if (route.id in routesById) {
+ if (process.env.NODE_ENV !== 'production') {
+ throw new Error(
+ `Invariant failed: Duplicate routes found with id: ${String(route.id)}`,
+ )
+ }
- if (route.id in routesById) {
- if (process.env.NODE_ENV !== 'production') {
- throw new Error(
- `Invariant failed: Duplicate routes found with id: ${String(route.id)}`,
- )
+ invariant()
}
- invariant()
- }
-
- routesById[route.id] = route
+ routesById[route.id] = route
- if (index !== 0 && route.path) {
- const trimmedFullPath = trimPathRight(route.fullPath)
- if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) {
- routesByPath[trimmedFullPath] = route
+ if (index !== 0 && route.path) {
+ const trimmedFullPath = trimPathRight(route.fullPath)
+ if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) {
+ routesByPath[trimmedFullPath] = route
+ }
}
- }
- index++
- })
- sortTreeNodes(segmentTree)
+ index++
+ },
+ )
+ for (const nodes of dynamicListsToSort) {
+ nodes.sort(sortDynamic)
+ }
const processedTree: ProcessedTree = {
segmentTree,
singleCache: createLRUCache>(1000),
@@ -992,8 +909,6 @@ type MatchStackFrame = {
node: AnySegmentNode
/** index of the segment of path */
index: number
- /** how many nodes between `node` and the root of the segment tree */
- depth: number
/**
* Bitmask of skipped optional segments.
*
@@ -1043,7 +958,6 @@ function getNodeMatch(
node: segmentTree,
index: 1,
skipped: 0,
- depth: 1,
statics: 0,
dynamics: 0,
optionals: 0,
@@ -1055,7 +969,7 @@ function getNodeMatch(
while (stack.length) {
const frame = stack.pop()!
- const { node, index, skipped, depth, statics, dynamics, optionals } = frame
+ const { node, index, skipped, statics, dynamics, optionals } = frame
let { extract, rawParams } = frame
// Wildcard candidates are pushed speculatively as fallbacks in case a
@@ -1112,7 +1026,6 @@ function getNodeMatch(
node: node.index,
index,
skipped,
- depth: depth + 1,
statics,
dynamics,
optionals,
@@ -1165,7 +1078,6 @@ function getNodeMatch(
node: segment,
index: partsLength,
skipped,
- depth: depth + 1,
statics,
dynamics,
optionals,
@@ -1177,16 +1089,15 @@ function getNodeMatch(
// 4. Try optional match
if (node.optional) {
- const nextSkipped = skipped | (1 << depth)
- const nextDepth = depth + 1
+ // A skipped optional is keyed by the child node's trie depth.
+ const nextSkipped = skipped | (1 << (node.depth + 1))
for (let i = node.optional.length - 1; i >= 0; i--) {
const segment = node.optional[i]!
- // when skipping, node and depth advance by 1, but index doesn't
+ // when skipping, the node advances by 1, but the index doesn't
stack.push({
node: segment,
index,
skipped: nextSkipped,
- depth: nextDepth,
statics,
dynamics,
optionals,
@@ -1209,7 +1120,6 @@ function getNodeMatch(
node: segment,
index: index + 1,
skipped,
- depth: nextDepth,
statics,
dynamics,
optionals: optionals + segmentScore(partsLength, index),
@@ -1236,7 +1146,6 @@ function getNodeMatch(
node: segment,
index: index + 1,
skipped,
- depth: depth + 1,
statics,
dynamics: dynamics + segmentScore(partsLength, index),
optionals,
@@ -1256,7 +1165,6 @@ function getNodeMatch(
node: match,
index: index + 1,
skipped,
- depth: depth + 1,
statics: statics + segmentScore(partsLength, index),
dynamics,
optionals,
@@ -1274,7 +1182,6 @@ function getNodeMatch(
node: match,
index: index + 1,
skipped,
- depth: depth + 1,
statics: statics + segmentScore(partsLength, index),
dynamics,
optionals,
@@ -1286,14 +1193,12 @@ function getNodeMatch(
// 0. Try pathless match
if (node.pathless) {
- const nextDepth = depth + 1
for (let i = node.pathless.length - 1; i >= 0; i--) {
const segment = node.pathless[i]!
stack.push({
node: segment,
index,
skipped,
- depth: nextDepth,
statics,
dynamics,
optionals,
@@ -1380,6 +1285,6 @@ function isFrameMoreSpecific(
(prev.node.kind === SEGMENT_TYPE_INDEX) ||
((next.node.kind === SEGMENT_TYPE_INDEX) ===
(prev.node.kind === SEGMENT_TYPE_INDEX) &&
- next.depth > prev.depth)))))))
+ next.node.depth > prev.node.depth)))))))
)
}
diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts
index 577ce00ecf0..da410e9c7d3 100644
--- a/packages/router-core/src/path.ts
+++ b/packages/router-core/src/path.ts
@@ -112,8 +112,8 @@ export function resolvePath({
trailingSlash = 'never',
cache,
}: ResolvePathOptions) {
+ const isBase = to === '.'
const isAbsolute = to.startsWith('/')
- const isBase = !isAbsolute && to === '.'
let key
if (cache) {
@@ -148,7 +148,11 @@ export function resolvePath({
// ignore inter-slashes
}
} else if (value === '..') {
- baseSegments.pop()
+ if (baseSegments.length > 1) {
+ baseSegments.pop()
+ } else {
+ baseSegments = ['']
+ }
} else if (value === '.') {
// ignore
} else {
diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts
index 5b0cbfb6be6..75c47a1c2ef 100644
--- a/packages/router-core/src/router.ts
+++ b/packages/router-core/src/router.ts
@@ -213,7 +213,8 @@ export interface RouterOptions<
*/
defaultPreload?: false | 'intent' | 'viewport' | 'render'
/**
- * The delay in milliseconds that a route must be hovered over or touched before it is preloaded.
+ * The delay in milliseconds before intent focus/hover and viewport preloading.
+ * Touch intent preloads immediately.
*
* @default 50
* @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultpreloaddelay-property)
@@ -750,13 +751,12 @@ export type ParseLocationFn = (
previousLocation?: ParsedLocation>,
) => ParsedLocation>
-export type GetMatchRoutesFn = (pathname: string) => {
- matchedRoutes: ReadonlyArray
+export type GetMatchRoutesFn = (pathname: string) => [
+ matchedRoutes: ReadonlyArray,
/** exhaustive params, still in their string form */
- routeParams: Record
- foundRoute: AnyRoute | undefined
- parseError?: unknown
-}
+ rawParams: Record,
+ foundRoute: AnyRoute | undefined,
+]
export type EmitFn = (routerEvent: RouterEvent) => void
@@ -964,12 +964,12 @@ export function runRouteLifecycle(
}
}
-type LightweightRouteMatchResult = {
- matchedRoutes: ReadonlyArray
- fullPath: string
- search: Record
- params: Record
-}
+type LightweightRouteMatchResult = [
+ matchedRoutes: ReadonlyArray,
+ fullPath: string,
+ search: Record,
+ params: Record,
+]
type LightweightRouteMatchCacheEntry = [
lastMatchId: string | undefined,
@@ -1512,16 +1512,17 @@ export class RouterCore<
next: ParsedLocation,
opts?: MatchRoutesOpts,
): Array {
- const matchedRoutesResult = this.getMatchedRoutes(next.pathname)
- const { foundRoute, routeParams } = matchedRoutesResult
- let { matchedRoutes } = matchedRoutesResult
+ const [initialMatchedRoutes, rawParams, foundRoute] = this.getMatchedRoutes(
+ next.pathname,
+ )
+ let matchedRoutes = initialMatchedRoutes
let isGlobalNotFound = false
// Check to see if the route needs a 404 entry
if (
// If we found a route, and it's not an index route and we have left over path
foundRoute
- ? foundRoute.path !== '/' && routeParams['**']
+ ? foundRoute.path !== '/' && rawParams['**']
: // Or if we didn't find a route and we have left over path
trimPathRight(next.pathname)
) {
@@ -1549,6 +1550,7 @@ export class RouterCore<
: undefined
}
+ let strictParams: AnyRouteMatch['_strictParams'] | undefined
for (let index = 0; index < matchedRoutes.length; index++) {
const route = matchedRoutes[index]!
// Take each matched route and resolve + validate its search params
@@ -1614,9 +1616,10 @@ export class RouterCore<
}
searchError ??= cause
}
+ // Match identity must only use the raw params captured from the URL.
const { interpolatedPath, usedParams } = interpolatePath({
path: route.fullPath,
- params: routeParams,
+ params: rawParams,
decoder: this.pathParamsDecoder,
server: this.isServer,
})
@@ -1639,7 +1642,9 @@ export class RouterCore<
: (this._cache.get(matchId) ??
(previousMatch?.id === matchId ? previousMatch : undefined))
- const strictParams = existingMatch?._strictParams ?? usedParams
+ // Carry parsed ancestors forward without mutating the raw route params.
+ strictParams =
+ existingMatch?._strictParams ?? Object.assign(usedParams, strictParams)
let paramsError: unknown
@@ -1661,8 +1666,6 @@ export class RouterCore<
}
}
- Object.assign(routeParams, strictParams)
-
const cause = previousMatch ? 'stay' : 'enter'
let match: AnyRouteMatch
@@ -1671,8 +1674,6 @@ export class RouterCore<
match = {
...existingMatch,
cause,
- params: previousMatch?.params ?? routeParams,
- _strictParams: strictParams,
search: previousMatch
? nullReplaceEqualDeep(previousMatch.search, preMatchSearch)
: nullReplaceEqualDeep(existingMatch.search, preMatchSearch),
@@ -1687,7 +1688,7 @@ export class RouterCore<
ssr: (isServer ?? this.isServer) ? undefined : route.options.ssr,
index,
routeId: route.id,
- params: previousMatch?.params ?? routeParams,
+ params: previousMatch?.params ?? strictParams,
_strictParams: strictParams,
pathname: interpolatedPath,
updatedAt: Date.now(),
@@ -1727,8 +1728,8 @@ export class RouterCore<
const match = matches[index]!
match.params =
match.cause === 'stay'
- ? nullReplaceEqualDeep(match.params, routeParams)
- : routeParams
+ ? nullReplaceEqualDeep(match.params, strictParams)
+ : strictParams!
if (opts?._controller) {
match.context = {}
}
@@ -1738,20 +1739,20 @@ export class RouterCore<
}
getMatchedRoutes: GetMatchRoutesFn = (pathname) => {
- const routeParams: Record = Object.create(null)
+ const rawParams: Record = Object.create(null)
const match = findRouteMatch(
trimPathRight(pathname),
this.processedTree,
true,
)
if (match) {
- Object.assign(routeParams, match.rawParams)
- }
- return {
- matchedRoutes: match?.branch || [this.routesById[rootRouteId]!],
- routeParams,
- foundRoute: match?.route,
+ Object.assign(rawParams, match.rawParams)
}
+ return [
+ match?.branch || [this.routesById[rootRouteId]!],
+ rawParams,
+ match?.route,
+ ]
}
/**
@@ -1772,9 +1773,7 @@ export class RouterCore<
return cached[1 /* result */]
}
- const { matchedRoutes, routeParams } = this.getMatchedRoutes(
- location.pathname,
- )
+ const [matchedRoutes, rawParams] = this.getMatchedRoutes(location.pathname)
const lastRoute = last(matchedRoutes)!
// I don't know if we should run the full search middleware chain, or just validateSearch
@@ -1812,7 +1811,7 @@ export class RouterCore<
// Parse params through the route chain
const strictParams: Record = Object.assign(
Object.create(null),
- routeParams,
+ rawParams,
)
for (const route of matchedRoutes) {
try {
@@ -1824,12 +1823,12 @@ export class RouterCore<
params = strictParams
}
- const result = {
+ const result: LightweightRouteMatchResult = [
matchedRoutes,
- fullPath: lastRoute.fullPath,
- search: accumulatedSearch,
+ lastRoute.fullPath,
+ accumulatedSearch,
params,
- }
+ ]
this.lightweightCache.set(location, [lastStateMatchId, result])
return result
}
@@ -1862,14 +1861,17 @@ export class RouterCore<
process.env.NODE_ENV !== 'production' &&
dest._isNavigate
) {
- const allFromMatches = this.getMatchedRoutes(dest.from).matchedRoutes
+ const [allFromMatches] = this.getMatchedRoutes(dest.from)
- const matchedFrom = findLast(lightweightResult.matchedRoutes, (d) => {
- return comparePaths(d.fullPath, dest.from!)
- })
+ const matchedFrom = findLast(
+ lightweightResult[0 /* matchedRoutes */],
+ (d) => {
+ return comparePaths(d.fullPath, dest.from!)
+ },
+ )
const matchedCurrent = findLast(allFromMatches, (d) => {
- return comparePaths(d.fullPath, lightweightResult.fullPath)
+ return comparePaths(d.fullPath, lightweightResult[1 /* fullPath */])
})
// for from to be invalid it shouldn't just be unmatched to currentLocation
@@ -1882,15 +1884,15 @@ export class RouterCore<
const defaultedFromPath =
dest.unsafeRelative === 'path'
? currentLocation.pathname
- : (dest.from ?? lightweightResult.fullPath)
+ : (dest.from ?? lightweightResult[1 /* fullPath */])
const destTo = dest.to ? `${dest.to}` : undefined
// From search should always use the current location
- const fromSearch = lightweightResult.search
+ const fromSearch = lightweightResult[2 /* search */]
// Same with params. It can't hurt to provide as many as possible
const fromParams = Object.assign(
Object.create(null),
- lightweightResult.params,
+ lightweightResult[3 /* params */],
)
const isAbsoluteTo = destTo?.charCodeAt(0) === 47
@@ -1918,14 +1920,13 @@ export class RouterCore<
// typed destination mismatch, not a concrete URL to route-match.
destRoutes = []
} else {
- const destMatchResult = this.getMatchedRoutes(nextTo)
- destRoutes = destMatchResult.matchedRoutes
+ const [matchedRoutes, rawParams, foundRoute] =
+ this.getMatchedRoutes(nextTo)
+ destRoutes = matchedRoutes
if (
this.options.notFoundRoute &&
- (!destMatchResult.foundRoute ||
- (destMatchResult.foundRoute.path !== '/' &&
- destMatchResult.routeParams['**']))
+ (!foundRoute || (foundRoute.path !== '/' && rawParams['**']))
) {
destRoutes = [...destRoutes, this.options.notFoundRoute]
}
@@ -1968,10 +1969,10 @@ export class RouterCore<
!opts.leaveParams
) {
try {
- const roundTrip = this.getMatchedRoutes(nextPathname)
- if (roundTrip.foundRoute?.id !== destRoute.id) {
+ const foundRoute = this.getMatchedRoutes(nextPathname)[2]
+ if (foundRoute?.id !== destRoute.id) {
console.warn(
- `Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${roundTrip.foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`,
+ `Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`,
)
}
} catch {
diff --git a/packages/router-core/src/searchParams.ts b/packages/router-core/src/searchParams.ts
index 740d36441c0..b93cc23206e 100644
--- a/packages/router-core/src/searchParams.ts
+++ b/packages/router-core/src/searchParams.ts
@@ -1,6 +1,10 @@
import { decode, encode } from './qss'
import type { AnySchema } from './validators'
+// JSON can start with whitespace, ", [, {, -, a digit, or fa/nu/tr.
+// False positives safely fall through to JSON.parse.
+const jsonStart = /^(?:\s|["[{\d-]|fa|nu|tr)/
+
/** Default `parseSearch` that strips leading '?' and JSON-parses values. */
export const defaultParseSearch = parseSearchWith(JSON.parse)
/** Default `stringifySearch` using JSON.stringify for complex values. */
@@ -59,15 +63,19 @@ export function stringifySearchWith(
stringify: (search: any) => string,
parser?: (str: string) => any,
) {
- const hasParser = typeof parser === 'function'
+ const isJsonParser = parser === JSON.parse
function stringifyValue(val: any) {
- if (typeof val === 'object' && val !== null) {
+ if (val && typeof val === 'object') {
try {
return stringify(val)
} catch (_err) {
// silent
}
- } else if (hasParser && typeof val === 'string') {
+ } else if (parser && typeof val === 'string') {
+ // Skip JSON.parse when the value cannot begin valid JSON.
+ if (isJsonParser && !jsonStart.test(val)) {
+ return val
+ }
try {
// Check if it's a valid parseable string.
// If it is, then stringify it again.
diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts
index 91011bfa7f0..e0665dde69c 100644
--- a/packages/router-core/src/utils.ts
+++ b/packages/router-core/src/utils.ts
@@ -299,24 +299,31 @@ export function replaceEqualDeep(
* Optimized for the common case where objects have no symbol properties.
*/
function getEnumerableOwnKeys(o: object) {
- const names = Object.getOwnPropertyNames(o)
-
- // Fast path: check all string property names are enumerable
- for (const name of names) {
- if (!isEnumerable.call(o, name)) return false
+ // `Object.keys` returns only enumerable own string keys natively (no per-key
+ // JS callback). If it has fewer entries than `getOwnPropertyNames` (all own
+ // string keys), the object has a non-enumerable own string prop and is not
+ // "clone-friendly" -> bail. This replaces an O(n) loop of
+ // `propertyIsEnumerable` calls with two native calls.
+ const keys = Object.keys(o)
+ if (keys.length !== Object.getOwnPropertyNames(o).length) {
+ return false
}
// Only check symbols if the object has any (most plain objects don't)
const symbols = Object.getOwnPropertySymbols(o)
- // Fast path: no symbols, return names directly (avoids array allocation/concat)
- if (symbols.length === 0) return names
+ // Fast path: no symbols, return enumerable string keys directly
+ if (symbols.length === 0) {
+ return keys
+ }
- // Slow path: has symbols, need to check and merge
- const keys: Array = names
+ // Slow path: has symbols, include only enumerable ones, bail on any
+ // non-enumerable symbol so it round-trips like the string-key check above.
for (const symbol of symbols) {
- if (!isEnumerable.call(o, symbol)) return false
- keys.push(symbol)
+ if (!isEnumerable.call(o, symbol)) {
+ return false
+ }
+ ;(keys as Array).push(symbol)
}
return keys
}
diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts
index ce0d5c3c988..c35937259c5 100644
--- a/packages/router-core/tests/build-location.test.ts
+++ b/packages/router-core/tests/build-location.test.ts
@@ -1300,6 +1300,31 @@ describe('buildLocation - relative paths', () => {
expect(location.pathname).toBe('/a/d')
})
+ test('over-root traversal stays rooted for javascript-like segments', async () => {
+ const rootRoute = new BaseRootRoute({})
+ const indexRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ })
+
+ const routeTree = rootRoute.addChildren([indexRoute])
+
+ const router = createTestRouter({
+ routeTree,
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ await router.load()
+
+ const location = router.buildLocation({
+ to: '../javascript:alert(1)',
+ })
+
+ expect(location.pathname).toBe('/javascript:alert(1)')
+ expect(location.href).toBe('/javascript:alert(1)')
+ expect(location.publicHref).toBe('/javascript:alert(1)')
+ })
+
test('. should stay on current route', async () => {
const rootRoute = new BaseRootRoute({})
const postsRoute = new BaseRoute({
diff --git a/packages/router-core/tests/issue-3920-on-before-navigate-after-initial-redirect.test.ts b/packages/router-core/tests/issue-3920-on-before-navigate-after-initial-redirect.test.ts
index f0de5df8dd8..6df66a08faf 100644
--- a/packages/router-core/tests/issue-3920-on-before-navigate-after-initial-redirect.test.ts
+++ b/packages/router-core/tests/issue-3920-on-before-navigate-after-initial-redirect.test.ts
@@ -1,5 +1,5 @@
import { createMemoryHistory } from '@tanstack/history'
-import { expect, test } from 'vitest'
+import { expect, onTestFinished, test } from 'vitest'
import { BaseRootRoute, BaseRoute, redirect } from '../src'
import { createTestRouter } from './routerTestUtils'
@@ -30,9 +30,10 @@ test('onBeforeNavigate fires after the initial load redirects', async () => {
expect(router.state.location.pathname).toBe('/target')
const navigatedPaths: Array = []
- router.subscribe('onBeforeNavigate', (event) => {
+ const unsub = router.subscribe('onBeforeNavigate', (event) => {
navigatedPaths.push(event.toLocation.pathname)
})
+ onTestFinished(unsub)
await router.navigate({ to: '/third' })
diff --git a/packages/router-core/tests/loader-architecture-regressions.test.ts b/packages/router-core/tests/loader-architecture-regressions.test.ts
index d8493052446..97561a9f727 100644
--- a/packages/router-core/tests/loader-architecture-regressions.test.ts
+++ b/packages/router-core/tests/loader-architecture-regressions.test.ts
@@ -154,6 +154,7 @@ test('superseding a load clears fetching state from the still-presented lane', a
await vi.waitFor(() =>
expect(router.state.matches.at(-1)).toMatchObject({
routeId: pageRoute.id,
+ status: 'success',
isFetching: 'beforeLoad',
}),
)
diff --git a/packages/router-core/tests/navigation-settled-cache.test.ts b/packages/router-core/tests/navigation-settled-cache.test.ts
new file mode 100644
index 00000000000..b45a8143495
--- /dev/null
+++ b/packages/router-core/tests/navigation-settled-cache.test.ts
@@ -0,0 +1,74 @@
+import { expect, test, vi } from 'vitest'
+import { createMemoryHistory } from '@tanstack/history'
+import { BaseRootRoute, BaseRoute } from '../src'
+import { createTestRouter } from './routerTestUtils'
+
+test('a settled loader result survives when its navigation is superseded', async () => {
+ const aLoader = vi.fn(() => 'a data')
+ let bSignal: AbortSignal | undefined
+ const bLoader = vi.fn(
+ ({ abortController }: { abortController: AbortController }) => {
+ bSignal = abortController.signal
+ return new Promise((_resolve, reject) => {
+ abortController.signal.addEventListener(
+ 'abort',
+ () => reject(abortController.signal),
+ { once: true },
+ )
+ })
+ },
+ )
+
+ const rootRoute = new BaseRootRoute({})
+ const indexRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ })
+ const aRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/a',
+ loader: aLoader,
+ staleTime: Infinity,
+ gcTime: Infinity,
+ })
+ const bRoute = new BaseRoute({
+ getParentRoute: () => aRoute,
+ path: '/b',
+ loader: bLoader,
+ })
+ const cRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/c',
+ })
+ const dRoute = new BaseRoute({
+ getParentRoute: () => cRoute,
+ path: '/d',
+ })
+ const router = createTestRouter({
+ routeTree: rootRoute.addChildren([
+ indexRoute,
+ aRoute.addChildren([bRoute]),
+ cRoute.addChildren([dRoute]),
+ ]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ await router.load()
+ const abandoned = router.navigate({ to: '/a/b' })
+ await vi.waitFor(() => {
+ expect(aLoader).toHaveBeenCalledOnce()
+ expect(bLoader).toHaveBeenCalledOnce()
+ })
+
+ await router.navigate({ to: '/c/d' })
+ await abandoned
+ expect(bSignal?.aborted).toBe(true)
+
+ await router.navigate({ to: '/a' })
+
+ expect(aLoader).toHaveBeenCalledOnce()
+ expect(router.state.matches.at(-1)).toMatchObject({
+ routeId: aRoute.id,
+ loaderData: 'a data',
+ })
+})
diff --git a/packages/router-core/tests/new-process-route-tree.test.ts b/packages/router-core/tests/new-process-route-tree.test.ts
index d93581355ea..d7e1cd977bf 100644
--- a/packages/router-core/tests/new-process-route-tree.test.ts
+++ b/packages/router-core/tests/new-process-route-tree.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { beforeAll, describe, expect, it } from 'vitest'
import {
findFlatMatch,
findRouteMatch,
@@ -114,6 +114,10 @@ describe('findRouteMatch', () => {
const tree = makeTree(['/a/{-$b}b', '/a/{-$b}'])
expect(findRouteMatch('/a/bbb', tree)?.route.id).toBe('/a/{-$b}b')
})
+ it('prefix+suffix optional wins when declared after plain optional', () => {
+ const tree = makeTree(['/a/{-$b}', '/a/b{-$b}b'])
+ expect(findRouteMatch('/a/bbb', tree)?.route.id).toBe('/a/b{-$b}b')
+ })
it('prefix+suffix wildcard wins over plain wildcard', () => {
const tree = makeTree(['/a/b{$}b', '/a/$'])
@@ -127,6 +131,90 @@ describe('findRouteMatch', () => {
const tree = makeTree(['/a/{$}b', '/a/$'])
expect(findRouteMatch('/a/bbb', tree)?.route.id).toBe('/a/{$}b')
})
+ it('sorts a third, more specific wildcard declared last', () => {
+ const tree = makeTree(['/a/$', '/a/b{$}', '/a/b{$}b'])
+ expect(findRouteMatch('/a/bbb', tree)?.route.id).toBe('/a/b{$}b')
+ })
+ })
+
+ it('sorts parser priorities after building required, optional, and wildcard siblings', () => {
+ const cases = [
+ ['pre{$value}suf', 'dynamic'],
+ ['pre{-$value}suf', 'optional'],
+ ['pre{$}suf', 'wildcard'],
+ ] as const
+
+ for (const [segment, siblingKind] of cases) {
+ let acceptHigherPriority = true
+ const fullPath = `/a/${segment}`
+ const routeTree = {
+ id: '__root__',
+ isRoot: true,
+ fullPath: '/',
+ path: '/',
+ children: [
+ {
+ id: `low-${siblingKind}`,
+ fullPath,
+ path: fullPath.slice(1),
+ options: {
+ params: {
+ priority: 1,
+ parse: (params: Record) => params,
+ },
+ },
+ },
+ {
+ id: `high-${siblingKind}`,
+ fullPath,
+ path: fullPath.slice(1),
+ options: {
+ params: {
+ priority: 2,
+ parse: (params: Record) =>
+ acceptHigherPriority ? params : false,
+ },
+ },
+ },
+ ],
+ }
+ const { processedTree } = processRouteTree(routeTree)
+ const branch = processedTree.segmentTree.staticInsensitive?.get('a')
+
+ expect(branch?.[siblingKind]).toHaveLength(2)
+ expect(findRouteMatch('/a/prewinsuf', processedTree)?.route.id).toBe(
+ `high-${siblingKind}`,
+ )
+
+ acceptHigherPriority = false
+ expect(
+ findRouteMatch('/a/prefallbacksuf', processedTree)?.route.id,
+ ).toBe(`low-${siblingKind}`)
+ }
+ })
+
+ it('reuses optional nodes with the same shape when they have no parser', () => {
+ const tree = makeTree([
+ '/a/{-$first}/first-child',
+ '/a/{-$second}/second-child',
+ ])
+ const branch = tree.segmentTree.staticInsensitive?.get('a')
+
+ expect(branch?.optional).toHaveLength(1)
+ expect(findRouteMatch('/a/value/first-child', tree)?.route.id).toBe(
+ '/a/{-$first}/first-child',
+ )
+ expect(findRouteMatch('/a/value/second-child', tree)?.route.id).toBe(
+ '/a/{-$second}/second-child',
+ )
+ })
+
+ it('keeps same-shaped wildcard aliases as separate match candidates', () => {
+ const tree = makeTree(['/a/$', '/a/{$}'])
+ const branch = tree.segmentTree.staticInsensitive?.get('a')
+
+ expect(branch?.wildcard).toHaveLength(2)
+ expect(findRouteMatch('/a/value', tree)?.route.id).toBe('/a/$')
})
describe('prefix / suffix lengths', () => {
@@ -390,6 +478,63 @@ describe('findRouteMatch', () => {
})
describe('case sensitivity competition', () => {
+ it('reuses an insensitive static node for differently cased siblings', () => {
+ const tree = {
+ id: '__root__',
+ isRoot: true,
+ fullPath: '/',
+ path: '/',
+ children: [
+ {
+ id: '/Docs/API',
+ fullPath: '/Docs/API',
+ path: 'Docs/API',
+ },
+ {
+ id: '/docs/guide',
+ fullPath: '/docs/guide',
+ path: 'docs/guide',
+ },
+ ],
+ }
+ const { processedTree } = processRouteTree(tree)
+ const docs = processedTree.segmentTree.staticInsensitive?.get('docs')
+
+ expect(processedTree.segmentTree.staticInsensitive?.size).toBe(1)
+ expect(docs?.staticInsensitive?.size).toBe(2)
+ expect(findRouteMatch('/DOCS/api', processedTree)?.route.id).toBe(
+ '/Docs/API',
+ )
+ expect(findRouteMatch('/Docs/GUIDE', processedTree)?.route.id).toBe(
+ '/docs/guide',
+ )
+ })
+ it('allows a route to override a sensitive tree default', () => {
+ const tree = {
+ id: '__root__',
+ isRoot: true,
+ fullPath: '/',
+ path: '/',
+ children: [
+ {
+ id: '/Strict',
+ fullPath: '/Strict',
+ path: 'Strict',
+ },
+ {
+ id: '/loose',
+ fullPath: '/loose',
+ path: 'loose',
+ options: { caseSensitive: false },
+ },
+ ],
+ }
+ const { processedTree } = processRouteTree(tree, true)
+
+ expect(findRouteMatch('/Strict', processedTree)?.route.id).toBe('/Strict')
+ expect(findRouteMatch('/strict', processedTree)).toBeNull()
+ expect(findRouteMatch('/LOOSE', processedTree)?.route.id).toBe('/loose')
+ })
it('a case sensitive segment early on should not prevent a case insensitive match', () => {
const tree = {
id: '__root__',
@@ -1346,6 +1491,40 @@ describe('findRouteMatch', () => {
'/_layout/a/b',
)
})
+ it('uses trie depth to break equal-specificity pathless ties', () => {
+ const tree = {
+ id: '__root__',
+ fullPath: '/',
+ path: '/',
+ isRoot: true,
+ children: [
+ {
+ id: '/a',
+ fullPath: '/a',
+ path: 'a',
+ },
+ {
+ id: '/_layout',
+ fullPath: '/',
+ options: {
+ params: {
+ parse: (params: Record) => params,
+ },
+ },
+ children: [
+ {
+ id: '/_layout/a',
+ fullPath: '/a',
+ path: 'a',
+ },
+ ],
+ },
+ ],
+ }
+ const { processedTree } = processRouteTree(tree)
+
+ expect(findRouteMatch('/a', processedTree)?.route.id).toBe('/_layout/a')
+ })
it('builds segment tree correctly', () => {
const tree = {
path: '/',
@@ -1638,15 +1817,27 @@ describe('processRouteMasks', { sequential: true }, () => {
fullPath: '/',
} as AnyRoute
const { processedTree } = processRouteTree(routeTree)
- it('processes a route masks list into a segment tree', () => {
- const routeMasks: Array> = [
- { from: '/a/b/c', routeTree },
- { from: '/a/b/d', routeTree },
- { from: '/a/$param/d', routeTree },
- { from: '/a/{-$optional}/d', routeTree },
- { from: '/a/b/{$}.txt', routeTree },
- ]
+ const routeMasks: Array> = [
+ { from: '/a/b/c', routeTree },
+ { from: '/a/b/d', routeTree },
+ { from: '/a/$param/d', routeTree },
+ { from: '/a/{-$optional}/d', routeTree },
+ { from: '/a/b/{$}.txt', routeTree },
+ { from: '/a/$', routeTree },
+ { from: '/a/foo{$}', routeTree },
+ { from: '/a/foo{$}bar', routeTree },
+ { from: '/required/$param', routeTree },
+ { from: '/required/foo{$param}bar', routeTree },
+ { from: '/optional/{-$param}', routeTree },
+ { from: '/optional/foo{-$param}bar', routeTree },
+ { from: '/Admin/Panel', routeTree },
+ ]
+
+ beforeAll(() => {
processRouteMasks(routeMasks, processedTree)
+ })
+
+ it('processes a route masks list into a segment tree', () => {
const aBranch = processedTree.masksTree?.staticInsensitive?.get('a')
expect(aBranch).toBeDefined()
expect(aBranch?.staticInsensitive?.get('b')).toBeDefined()
@@ -1657,6 +1848,10 @@ describe('processRouteMasks', { sequential: true }, () => {
const res = findFlatMatch('/a/b/c', processedTree)
expect(res?.route.from).toBe('/a/b/c')
})
+ it('matches uppercase static route masks case-insensitively', () => {
+ const res = findFlatMatch('/admin/panel', processedTree)
+ expect(res?.route.from).toBe('/Admin/Panel')
+ })
it('can match dynamic route masks w/ `findFlatMatch`', () => {
const res = findFlatMatch('/a/123/d', processedTree)
expect(res?.route.from).toBe('/a/$param/d')
@@ -1672,4 +1867,44 @@ describe('processRouteMasks', { sequential: true }, () => {
expect(res?.route.from).toBe('/a/b/{$}.txt')
expect(res?.rawParams).toEqual({ '*': 'file/path', _splat: 'file/path' })
})
+ it('sorts competing wildcard masks by specificity', () => {
+ const res = findFlatMatch('/a/fooxbar', processedTree)
+ expect(res?.route.from).toBe('/a/foo{$}bar')
+ expect(res?.rawParams).toEqual({ '*': 'x', _splat: 'x' })
+ })
+ it('sorts competing required masks by specificity', () => {
+ const res = findFlatMatch('/required/fooxbar', processedTree)
+ expect(res?.route.from).toBe('/required/foo{$param}bar')
+ expect(res?.rawParams).toEqual({ param: 'x' })
+ })
+ it('sorts competing optional masks by specificity', () => {
+ const res = findFlatMatch('/optional/fooxbar', processedTree)
+ expect(res?.route.from).toBe('/optional/foo{-$param}bar')
+ expect(res?.rawParams).toEqual({ param: 'x' })
+ })
+ it('sorts competing route masks declared least-specific first', () => {
+ const localTree = processRouteTree(routeTree).processedTree
+ processRouteMasks(
+ [
+ { from: '/dynamic/$param', routeTree },
+ { from: '/dynamic/prefix{$param}', routeTree },
+ { from: '/optional/{-$param}', routeTree },
+ { from: '/optional/prefix{-$param}', routeTree },
+ { from: '/wildcard/$', routeTree },
+ { from: '/wildcard/prefix{$}', routeTree },
+ { from: '/wildcard/prefix{$}.txt', routeTree },
+ ],
+ localTree,
+ )
+
+ expect(findFlatMatch('/dynamic/prefixvalue', localTree)?.route.from).toBe(
+ '/dynamic/prefix{$param}',
+ )
+ expect(findFlatMatch('/optional/prefixvalue', localTree)?.route.from).toBe(
+ '/optional/prefix{-$param}',
+ )
+ expect(
+ findFlatMatch('/wildcard/prefixvalue.txt', localTree)?.route.from,
+ ).toBe('/wildcard/prefix{$}.txt')
+ })
})
diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts
index 4e494122098..658bbcaa383 100644
--- a/packages/router-core/tests/path.test.ts
+++ b/packages/router-core/tests/path.test.ts
@@ -94,6 +94,9 @@ describe('resolvePath', () => {
['/', 'a/', '/a'],
['/', '/a/b', '/a/b'],
['/a', 'b', '/a/b'],
+ ['/a', '', '/'],
+ ['/a', '.well-known', '/a/.well-known'],
+ ['/a', '/absolute', '/absolute'],
['/', 'a/b', '/a/b'],
['/', './a/b', '/a/b'],
['/a/b/c', 'd', '/a/b/c/d'],
@@ -106,6 +109,8 @@ describe('resolvePath', () => {
['/a/b/c', '../..', '/a'],
['/a/b/c', '../../..', '/'],
['/a/b/c/', '../../..', '/'],
+ ['/', '../javascript:alert(1)', '/javascript:alert(1)'],
+ ['/posts', '../../data:text/html,test', '/data:text/html,test'],
])('resolves correctly', (a, b, eq) => {
it(`${a} to ${b} === ${eq}`, () => {
expect(resolvePath({ base: a, to: b })).toEqual(eq)
diff --git a/packages/router-core/tests/searchParams.bench.ts b/packages/router-core/tests/searchParams.bench.ts
new file mode 100644
index 00000000000..e2c2acb2632
--- /dev/null
+++ b/packages/router-core/tests/searchParams.bench.ts
@@ -0,0 +1,160 @@
+import { bench, describe, expect } from 'vitest'
+import { defaultStringifySearch } from '../src'
+
+const iterations = 1_000
+
+const ordinaryStrings = {
+ tab: 'specs',
+ filter: 'available',
+ category: 'hardware',
+ sort: 'newest',
+}
+const nonLiteralInitialStrings = {
+ tab: 'specs',
+ filter: 'available',
+ category: 'hardware',
+ sort: 'descending',
+}
+const jsonInitialStrings = {
+ filter: 'foo',
+ notification: 'new',
+ tab: 'tabular',
+ empty: '',
+}
+const emptyStrings = {
+ first: '',
+ second: '',
+ third: '',
+ fourth: '',
+}
+const punctuationStrings = {
+ file: '.env',
+ path: '/products',
+ positive: '+1',
+ priority: '!important',
+}
+const nonLiteralPrefixStrings = {
+ first: 'future',
+ second: 'framework',
+ third: 'name',
+ fourth: 'table',
+}
+const jsonLiteralPrefixStrings = {
+ first: 'favorite',
+ second: 'number',
+ third: 'travel',
+ fourth: 'nullish',
+}
+const jsonLiteralWordStrings = {
+ truthy: 'true_value',
+ falsy: 'false_value',
+ nullable: 'null_value',
+}
+const jsonLiteralBoundaryStrings = {
+ truthy: 'true-value',
+ falsy: 'false/value',
+ nullable: 'null.value',
+}
+const jsonStrings = {
+ number: '123',
+ boolean: 'true',
+ object: '{"nested":true}',
+ array: '[1,2,3]',
+}
+const mixedValues = {
+ tab: 'specs',
+ page: 2,
+ filters: ['available', 'featured'],
+ exactPage: '2',
+}
+let benchmarkSink = 0
+
+expect(defaultStringifySearch(ordinaryStrings)).toBe(
+ '?tab=specs&filter=available&category=hardware&sort=newest',
+)
+expect(defaultStringifySearch(nonLiteralInitialStrings)).toBe(
+ '?tab=specs&filter=available&category=hardware&sort=descending',
+)
+expect(defaultStringifySearch(jsonInitialStrings)).toBe(
+ '?filter=foo¬ification=new&tab=tabular&empty=',
+)
+expect(defaultStringifySearch(emptyStrings)).toBe(
+ '?first=&second=&third=&fourth=',
+)
+expect(defaultStringifySearch(punctuationStrings)).toBe(
+ '?file=.env&path=%2Fproducts&positive=%2B1&priority=%21important',
+)
+expect(defaultStringifySearch(nonLiteralPrefixStrings)).toBe(
+ '?first=future&second=framework&third=name&fourth=table',
+)
+expect(defaultStringifySearch(jsonLiteralPrefixStrings)).toBe(
+ '?first=favorite&second=number&third=travel&fourth=nullish',
+)
+expect(defaultStringifySearch(jsonLiteralWordStrings)).toBe(
+ '?truthy=true_value&falsy=false_value&nullable=null_value',
+)
+expect(defaultStringifySearch(jsonLiteralBoundaryStrings)).toBe(
+ '?truthy=true-value&falsy=false%2Fvalue&nullable=null.value',
+)
+expect(defaultStringifySearch(jsonStrings)).toBe(
+ '?number=%22123%22&boolean=%22true%22&object=%22%7B%5C%22nested%5C%22%3Atrue%7D%22&array=%22%5B1%2C2%2C3%5D%22',
+)
+expect(defaultStringifySearch(mixedValues)).toBe(
+ '?tab=specs&page=2&filters=%5B%22available%22%2C%22featured%22%5D&exactPage=%222%22',
+)
+
+function stringifyBatch(search: Record) {
+ let size = 0
+ for (let index = 0; index < iterations; index++) {
+ size += defaultStringifySearch(search).length
+ }
+ benchmarkSink = size
+}
+
+describe('default search serialization', () => {
+ bench('ordinary string values', () => {
+ stringifyBatch(ordinaryStrings)
+ })
+
+ bench('ordinary strings outside JSON-literal initials', () => {
+ stringifyBatch(nonLiteralInitialStrings)
+ })
+
+ bench('ordinary strings with JSON-literal initials', () => {
+ stringifyBatch(jsonInitialStrings)
+ })
+
+ bench('empty string values', () => {
+ stringifyBatch(emptyStrings)
+ })
+
+ bench('ordinary strings with non-JSON punctuation starts', () => {
+ stringifyBatch(punctuationStrings)
+ })
+
+ bench('ordinary f/n/t words outside JSON-literal prefixes', () => {
+ stringifyBatch(nonLiteralPrefixStrings)
+ })
+
+ bench('application words with JSON-literal prefixes', () => {
+ stringifyBatch(jsonLiteralPrefixStrings)
+ })
+
+ bench('application words with complete JSON-literal prefixes', () => {
+ stringifyBatch(jsonLiteralWordStrings)
+ })
+
+ bench('JSON-literal prefixes followed by punctuation', () => {
+ stringifyBatch(jsonLiteralBoundaryStrings)
+ })
+
+ bench('JSON-compatible string values', () => {
+ stringifyBatch(jsonStrings)
+ })
+
+ bench('mixed application values', () => {
+ stringifyBatch(mixedValues)
+ })
+})
+
+void benchmarkSink
diff --git a/packages/router-core/tests/searchParams.test.ts b/packages/router-core/tests/searchParams.test.ts
index 006e119be53..e56f8b7131f 100644
--- a/packages/router-core/tests/searchParams.test.ts
+++ b/packages/router-core/tests/searchParams.test.ts
@@ -1,5 +1,9 @@
-import { describe, expect, test } from 'vitest'
-import { defaultParseSearch, defaultStringifySearch } from '../src'
+import { describe, expect, test, vi } from 'vitest'
+import {
+ defaultParseSearch,
+ defaultStringifySearch,
+ stringifySearchWith,
+} from '../src'
describe('Search Params serialization and deserialization', () => {
/*
@@ -47,6 +51,64 @@ describe('Search Params serialization and deserialization', () => {
expect(defaultParseSearch(str)).toEqual({ foo: 'bar' })
})
+ test.each([
+ 'false',
+ '-1',
+ '"quoted"',
+ ' true ',
+ 'true ',
+ 'false\t',
+ 'null\r\n',
+ '\tfalse',
+ '\nnull',
+ '\r1',
+ ' ',
+ '雪',
+ '"雪"',
+ ])('preserves JSON-compatible string %j as a string', (value) => {
+ const str = defaultStringifySearch({ value })
+ expect(defaultParseSearch(str)).toEqual({ value })
+ })
+
+ test('uses custom parsers for ordinary strings', () => {
+ const stringify = stringifySearchWith(JSON.stringify, (value) => {
+ if (value === 'word') {
+ return value
+ }
+ throw new Error('not parseable')
+ })
+
+ expect(stringify({ value: 'word' })).toEqual('?value=%22word%22')
+ })
+
+ test('skips JSON.parse for strings that cannot be JSON', () => {
+ const parseSpy = vi.spyOn(JSON, 'parse')
+ try {
+ const stringify = stringifySearchWith(JSON.stringify, JSON.parse)
+
+ expect(
+ stringify({
+ empty: '',
+ filter: 'foo',
+ future: 'future',
+ name: 'name',
+ notification: 'new',
+ tab: 'tabular',
+ topic: 'topic',
+ unicode: '雪',
+ }),
+ ).toEqual(
+ '?empty=&filter=foo&future=future&name=name¬ification=new&tab=tabular&topic=topic&unicode=%E9%9B%AA',
+ )
+ expect(
+ stringify({ file: '.env', path: '/products', positive: '+1' }),
+ ).toEqual('?file=.env&path=%2Fproducts&positive=%2B1')
+ expect(parseSpy).not.toHaveBeenCalled()
+ } finally {
+ parseSpy.mockRestore()
+ }
+ })
+
test('[edge case] self-reference serializes to "object Object"', () => {
const obj = {} as any
obj.self = obj
diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts
index fff911df377..9e5c14c4138 100644
--- a/packages/router-core/tests/utils.test.ts
+++ b/packages/router-core/tests/utils.test.ts
@@ -950,6 +950,53 @@ describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => {
]
expect(replaceEqualDeep(prev, next)).toBe(prev)
})
+
+ it('preserves identity of unchanged nested subtrees when one leaf changes', () => {
+ const prev = {
+ search: { q: 'hello', f: 'live' },
+ params: { username: 'elonmusk', tweetId: '123' },
+ loaderData: {
+ user: { id: '44196397', name: 'Elon' },
+ tabs: ['a', 'b'],
+ },
+ }
+ const next = {
+ search: { q: 'hello', f: 'live' },
+ params: { username: 'elonmusk', tweetId: '123' },
+ loaderData: {
+ user: { id: '44196397', name: 'Musk' },
+ tabs: ['a', 'b'],
+ },
+ }
+ const result = replaceEqualDeep(prev, next)
+ // user.name changed -> top object is new, but every unchanged subtree
+ // (including the array) keeps its previous reference for cheap memo checks.
+ expect(result).not.toBe(prev)
+ expect(result.search).toBe(prev.search)
+ expect(result.params).toBe(prev.params)
+ expect(result.loaderData.tabs).toBe(prev.loaderData.tabs)
+ expect(result.loaderData.user).not.toBe(prev.loaderData.user)
+ expect(result.loaderData.user.name).toBe('Musk')
+ })
+
+ it('bails to next for a nested object carrying a non-enumerable prop', () => {
+ const prevInner: Record = { a: 1 }
+ Object.defineProperty(prevInner, 'hidden', {
+ value: 2,
+ enumerable: false,
+ })
+ const nextInner: Record = { a: 1 }
+ Object.defineProperty(nextInner, 'hidden', {
+ value: 2,
+ enumerable: false,
+ })
+ const prev = { shared: { x: 1 }, inner: prevInner }
+ const next = { shared: { x: 1 }, inner: nextInner }
+ const result = replaceEqualDeep(prev, next)
+ // inner is not clone-friendly -> returns nextInner; sibling subtree shared.
+ expect(result.inner).toBe(nextInner)
+ expect(result.shared).toBe(prev.shared)
+ })
})
})
diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md
index fd9dc5dceae..0f33149a54b 100644
--- a/packages/router-generator/CHANGELOG.md
+++ b/packages/router-generator/CHANGELOG.md
@@ -1,5 +1,47 @@
# @tanstack/router-generator
+## 1.167.28
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+
+## 1.167.27
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+
+## 1.167.26
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+
+## 1.167.25
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+
+## 1.167.24
+
+### Patch Changes
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+
+## 1.167.23
+
+### Patch Changes
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+
## 1.167.22
### Patch Changes
diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json
index 492c8cc726d..3946ea57876 100644
--- a/packages/router-generator/package.json
+++ b/packages/router-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-generator",
- "version": "1.167.22",
+ "version": "1.167.28",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md
index 43463e919a9..e8f0edc4278 100644
--- a/packages/router-plugin/CHANGELOG.md
+++ b/packages/router-plugin/CHANGELOG.md
@@ -1,5 +1,59 @@
# @tanstack/router-plugin
+## 1.168.30
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13), [`f500760`](https://github.com/TanStack/router/commit/f5007607d62e932b8df19de866cdc6bddcff8db3), [`1aafca9`](https://github.com/TanStack/router/commit/1aafca9b45d24f8f0dba78e716fc9582346c6ca1), [`aa10b65`](https://github.com/TanStack/router/commit/aa10b6589eeda215f5a60ea0af95a3101d8c414e)]:
+ - @tanstack/router-core@1.171.22
+ - @tanstack/react-router@1.170.26
+ - @tanstack/router-generator@1.167.28
+
+## 1.168.29
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+ - @tanstack/react-router@1.170.25
+ - @tanstack/router-generator@1.167.27
+
+## 1.168.28
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+ - @tanstack/react-router@1.170.24
+ - @tanstack/router-generator@1.167.26
+
+## 1.168.27
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/react-router@1.170.22
+ - @tanstack/router-core@1.171.19
+ - @tanstack/router-generator@1.167.25
+
+## 1.168.26
+
+### Patch Changes
+
+- Updated dependencies [[`697ebb6`](https://github.com/TanStack/router/commit/697ebb6ddbd433d052b6b4707938a5c595865d58), [`2435885`](https://github.com/TanStack/router/commit/2435885fa8b5e31c8c4b74d93920919f27316ebf), [`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`86bf510`](https://github.com/TanStack/router/commit/86bf510c2923afb76804223bd04afc2a809b33e7), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/react-router@1.170.21
+ - @tanstack/router-core@1.171.18
+ - @tanstack/router-generator@1.167.24
+
+## 1.168.25
+
+### Patch Changes
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+ - @tanstack/react-router@1.170.20
+ - @tanstack/router-generator@1.167.23
+
## 1.168.24
### Patch Changes
diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json
index 380c7e29bef..f95cbadc2d8 100644
--- a/packages/router-plugin/package.json
+++ b/packages/router-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-plugin",
- "version": "1.168.24",
+ "version": "1.168.30",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-plugin/tests/handle-route-update.test.ts b/packages/router-plugin/tests/handle-route-update.test.ts
index db371746af4..9c8e239fe27 100644
--- a/packages/router-plugin/tests/handle-route-update.test.ts
+++ b/packages/router-plugin/tests/handle-route-update.test.ts
@@ -240,7 +240,7 @@ describe('handleRouteUpdate', () => {
const routeTree = rootRoute.addChildren([asAnyRoute(itemRoute)])
const router = createTestRouter(routeTree)
- expect(router.getMatchedRoutes('/items/abc').foundRoute?.id).toBeUndefined()
+ expect(router.getMatchedRoutes('/items/abc')[2]?.id).toBeUndefined()
const restoreWindow = withWindowRouter(router)
try {
@@ -258,9 +258,7 @@ describe('handleRouteUpdate', () => {
restoreWindow()
}
- expect(router.getMatchedRoutes('/items/abc').foundRoute?.id).toBe(
- itemRoute.id,
- )
+ expect(router.getMatchedRoutes('/items/abc')[2]?.id).toBe(itemRoute.id)
})
it('hydrates the hot module route export with generated route tree state', () => {
diff --git a/packages/router-ssr-query-core/package.json b/packages/router-ssr-query-core/package.json
index c4dffe04739..3b939b16867 100644
--- a/packages/router-ssr-query-core/package.json
+++ b/packages/router-ssr-query-core/package.json
@@ -64,12 +64,12 @@
"node": ">=20.19"
},
"devDependencies": {
+ "@tanstack/query-core": "catalog:",
"@tanstack/router-core": ">=1.171.7",
- "@tanstack/query-core": ">=5.90.0",
"vite": "*"
},
"peerDependencies": {
- "@tanstack/router-core": ">=1.127.0",
- "@tanstack/query-core": ">=5.90.0"
+ "@tanstack/query-core": ">=5.90.0",
+ "@tanstack/router-core": ">=1.127.0"
}
}
diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md
index a8abbec3f2a..268659c7ea1 100644
--- a/packages/router-vite-plugin/CHANGELOG.md
+++ b/packages/router-vite-plugin/CHANGELOG.md
@@ -1,5 +1,47 @@
# @tanstack/router-vite-plugin
+## 1.167.30
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.30
+
+## 1.167.29
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.29
+
+## 1.167.28
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.28
+
+## 1.167.27
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.27
+
+## 1.167.26
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.26
+
+## 1.167.25
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.25
+
## 1.167.24
### Patch Changes
diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json
index f80dd4d53e2..94576bea45f 100644
--- a/packages/router-vite-plugin/package.json
+++ b/packages/router-vite-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-vite-plugin",
- "version": "1.167.24",
+ "version": "1.167.30",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/solid-router-devtools/CHANGELOG.md b/packages/solid-router-devtools/CHANGELOG.md
index 6f45b1758de..871b008dd35 100644
--- a/packages/solid-router-devtools/CHANGELOG.md
+++ b/packages/solid-router-devtools/CHANGELOG.md
@@ -1,5 +1,20 @@
# @tanstack/solid-router-devtools
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
+- Updated dependencies [[`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713)]:
+ - @tanstack/solid-router@2.0.0-rc.0
+
## 2.0.0-beta.25
### Patch Changes
diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json
index d32725178db..60f7af53221 100644
--- a/packages/solid-router-devtools/package.json
+++ b/packages/solid-router-devtools/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-router-devtools",
- "version": "2.0.0-beta.25",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -66,21 +66,21 @@
"node": ">=20.19"
},
"dependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/router-devtools-core": "workspace:*"
},
"devDependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@solidjs/web": "^2.0.0-rc.0",
"@types/node": ">=20",
- "solid-js": "2.0.0-beta.32",
- "vite": "*",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "solid-js": "^2.0.0-rc.0",
+ "vite": "*"
},
"peerDependencies": {
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/router-core": "workspace:^",
"@tanstack/solid-router": "workspace:^",
- "solid-js": "2.0.0-beta.32"
+ "solid-js": "^2.0.0-rc.0"
},
"peerDependenciesMeta": {
"@tanstack/router-core": {
diff --git a/packages/solid-router-devtools/vite.config.ts b/packages/solid-router-devtools/vite.config.ts
index 633c31d0051..9285e9eb897 100644
--- a/packages/solid-router-devtools/vite.config.ts
+++ b/packages/solid-router-devtools/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/vite-config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const config = defineConfig({
plugins: [solid()],
diff --git a/packages/solid-router-ssr-query/CHANGELOG.md b/packages/solid-router-ssr-query/CHANGELOG.md
index 9c8969d726b..06b71632f07 100644
--- a/packages/solid-router-ssr-query/CHANGELOG.md
+++ b/packages/solid-router-ssr-query/CHANGELOG.md
@@ -1,5 +1,17 @@
# @tanstack/solid-router-ssr-query
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
## 2.0.0-beta.31
### Patch Changes
diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json
index 3997a277a76..eba1d652209 100644
--- a/packages/solid-router-ssr-query/package.json
+++ b/packages/solid-router-ssr-query/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-router-ssr-query",
- "version": "2.0.0-beta.31",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -67,13 +67,13 @@
"@tanstack/router-ssr-query-core": "workspace:*"
},
"devDependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "@tanstack/solid-query": "^6.0.0-beta.7",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "@tanstack/solid-query": "^6.0.0-rc.0",
"@tanstack/solid-router": "workspace:*",
"eslint-plugin-solid": "^0.14.5",
- "solid-js": "2.0.0-beta.32",
- "vite": "*",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "solid-js": "^2.0.0-rc.0",
+ "vite": "*"
},
"peerDependencies": {
"@solidjs/web": ">=2.0.0-beta.17",
diff --git a/packages/solid-router-ssr-query/vite.config.ts b/packages/solid-router-ssr-query/vite.config.ts
index 52b38213cb1..3dbbbee0fb7 100644
--- a/packages/solid-router-ssr-query/vite.config.ts
+++ b/packages/solid-router-ssr-query/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/vite-config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import packageJson from './package.json'
const config = defineConfig({
diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md
index 9dde82f8786..fb6d892e8d0 100644
--- a/packages/solid-router/CHANGELOG.md
+++ b/packages/solid-router/CHANGELOG.md
@@ -1,5 +1,17 @@
# @tanstack/solid-router
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
## 2.0.0-beta.30
### Patch Changes
diff --git a/packages/solid-router/eslint.config.ts b/packages/solid-router/eslint.config.ts
index 672ce4e4da9..44f961c3043 100644
--- a/packages/solid-router/eslint.config.ts
+++ b/packages/solid-router/eslint.config.ts
@@ -1,4 +1,4 @@
-import solidPlugin from 'vite-plugin-solid'
+import solidPlugin from '@solidjs/vite-plugin'
import rootConfig from '../../eslint.config.js'
export default [
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
index e9884eb7012..c7cb8b0746a 100644
--- a/packages/solid-router/package.json
+++ b/packages/solid-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-router",
- "version": "2.0.0-beta.30",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -106,7 +106,7 @@
"dependencies": {
"@solid-devtools/logger": "^0.9.4",
"@solidjs/meta": "^0.29.4",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/history": "workspace:*",
"@tanstack/router-core": "workspace:*",
"isbot": "^5.1.22",
@@ -114,14 +114,14 @@
},
"devDependencies": {
"@solidjs/testing-library": "^0.8.10",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@solidjs/web": "^2.0.0-rc.0",
"@testing-library/jest-dom": "^6.6.3",
"@types/node": ">=20",
"combinate": "^1.1.11",
"eslint-plugin-solid": "^0.14.5",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"vite": "*",
- "vite-plugin-solid": "^3.0.0-next.23",
"zod": "^4.4.3"
},
"peerDependencies": {
diff --git a/packages/solid-router/skills/solid-router/SKILL.md b/packages/solid-router/skills/solid-router/SKILL.md
index 0cfd22ad730..a9f10fb46e9 100644
--- a/packages/solid-router/skills/solid-router/SKILL.md
+++ b/packages/solid-router/skills/solid-router/SKILL.md
@@ -42,7 +42,7 @@ npm install -D @tanstack/router-plugin @tanstack/solid-router-devtools
```ts
// vite.config.ts
import { defineConfig } from 'vite'
-import solidPlugin from 'vite-plugin-solid'
+import solidPlugin from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
export default defineConfig({
diff --git a/packages/solid-router/src/CatchBoundary.tsx b/packages/solid-router/src/CatchBoundary.tsx
index 2f79ec51627..4157ab1f852 100644
--- a/packages/solid-router/src/CatchBoundary.tsx
+++ b/packages/solid-router/src/CatchBoundary.tsx
@@ -1,5 +1,6 @@
import * as Solid from 'solid-js'
import { Dynamic } from '@solidjs/web'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
import type { ErrorRouteComponent } from './route'
import type { JSX } from '@solidjs/web'
@@ -47,7 +48,18 @@ export function CatchBoundary(
props.onCatch?.(resolvedError)
resetBoundary = reset
- return (
+ return process.env.NODE_ENV !== 'production' ? (
+ renderInNonRouteComponentContext(
+ () => (
+ {
status: match.status,
}
})
- const nearestMatch = {
- routeId: () => props.routeId,
- match: currentMatch,
- }
+ const nearestMatch = [() => props.routeId, currentMatch] as const
return (
@@ -107,7 +108,15 @@ export const Match = (props: { routeId: string }) => {
const MatchContent = () => (
@@ -123,7 +132,17 @@ export const Match = (props: { routeId: string }) => {
throw notFoundError
}
- return (
+ return process.env.NODE_ENV !== 'production' ? (
+ renderInNonRouteComponentContext(
+ () => (
+ {
{
export const MatchInner = (): any => {
const router = useRouter()
const nearestMatch = Solid.useContext(nearestMatchContext)
- const match = nearestMatch.match
- const routeId = nearestMatch.routeId
+ const match = nearestMatch[1 /* match */]
+ const routeId = nearestMatch[0 /* route id */]
const matchState = Solid.createMemo(() => {
const currentMatch = match()
@@ -212,12 +248,18 @@ export const MatchInner = (): any => {
const route = router.routesById[currentRouteId] as AnyRoute
const remount =
route.options.remountDeps ?? router.options.defaultRemountDeps
- const deps = remount?.({
- routeId: currentRouteId,
- loaderDeps: currentMatch.loaderDeps,
- params: currentMatch._strictParams,
- search: currentMatch._strictSearch,
- })
+ let componentKey: string
+ if (!remount) {
+ componentKey = currentRouteId
+ } else {
+ const deps = remount({
+ routeId: currentRouteId,
+ loaderDeps: currentMatch.loaderDeps,
+ params: currentMatch._strictParams,
+ search: currentMatch._strictSearch,
+ })
+ componentKey = JSON.stringify(deps) ?? currentRouteId
+ }
return {
route,
@@ -227,11 +269,7 @@ export const MatchInner = (): any => {
status: currentMatch.status,
error: currentMatch.error,
},
- componentKey: deps
- ? JSON.stringify(deps)
- : route.isRoot
- ? currentRouteId
- : currentMatch.id,
+ componentKey,
}
})
@@ -275,7 +313,18 @@ export const MatchInner = (): any => {
router.options.defaultErrorComponent) ||
ErrorComponent
- return (
+ return process.env.NODE_ENV !== 'production' ? (
+ renderInNonRouteComponentContext(
+ () => (
+ {
}
export const Outlet = () => {
+ if (process.env.NODE_ENV !== 'production') {
+ const nonRouteComponent = Solid.useContext(nonRouteComponentContext!)
+ if (nonRouteComponent) {
+ console.warn(
+ `Warning: An
@@ -274,7 +284,7 @@ export function useParentMatches<
>(
opts?: UseMatchesBaseOptions,
): Solid.Accessor> {
- const contextRouteId = Solid.useContext(nearestMatchContext).routeId
+ const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]
return useMatches({
select: (matches: Array>) => {
@@ -293,7 +303,7 @@ export function useChildMatches<
>(
opts?: UseMatchesBaseOptions,
): Solid.Accessor> {
- const contextRouteId = Solid.useContext(nearestMatchContext).routeId
+ const contextRouteId = Solid.useContext(nearestMatchContext)[0 /* route id */]
return useMatches({
select: (matches: Array>) => {
diff --git a/packages/solid-router/src/fileRoute.ts b/packages/solid-router/src/fileRoute.ts
index 35aa4de1717..1115ee54144 100644
--- a/packages/solid-router/src/fileRoute.ts
+++ b/packages/solid-router/src/fileRoute.ts
@@ -43,11 +43,14 @@ export function createFileRoute<
TFullPath extends RouteConstraints['TFullPath'] =
FileRoutesByPath[TFilePath]['fullPath'],
>(
+ // eslint-disable-next-line unused-imports/no-unused-vars
path?: TFilePath,
): FileRoute['createRoute'] {
- return new FileRoute(path, {
- silent: true,
- }).createRoute
+ return (options) => {
+ const route = createRoute(options as any)
+ ;(route as any).isRoot = false
+ return route as any
+ }
}
/**
diff --git a/packages/solid-router/src/link.tsx b/packages/solid-router/src/link.tsx
index 4999effdae1..c5d3691672b 100644
--- a/packages/solid-router/src/link.tsx
+++ b/packages/solid-router/src/link.tsx
@@ -61,7 +61,11 @@ function splitProps, TKey extends keyof T>(
// Note: Solid.omit uses rest params (...keys), so we must spread the array.
return [props as any, Solid.omit(props, ...(keys as any)) as any]
}
-const timeoutMap = new WeakMap>()
+const timeoutMap = new WeakMap>()
+const cancelPreload = (eventTarget: object) => {
+ clearTimeout(timeoutMap.get(eventTarget))
+ timeoutMap.delete(eventTarget)
+}
export function useLinkProps<
TRouter extends AnyRouter = RegisteredRouter,
@@ -73,7 +77,6 @@ export function useLinkProps<
options: UseLinkPropsOptions,
): ComponentProps<'a'> {
const router = useRouter()
- const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)
const shouldHydrateHash = !isServer && !!router.options.ssr
const hasHydrated = useHydrated()
@@ -208,7 +211,7 @@ export function useLinkProps<
const preload = Solid.createMemo(
() => {
- if (_options().reloadDocument || externalLink()) {
+ if (_options().reloadDocument || externalLink() || local.disabled) {
return false
}
return local.preload ?? router.options.defaultPreload
@@ -281,14 +284,6 @@ export function useLinkProps<
console.warn(preloadWarning)
})
- const preloadViewportIoCallback = (
- entry: IntersectionObserverEntry | undefined,
- ) => {
- if (entry?.isIntersecting) {
- doPreload()
- }
- }
-
const [ref, setRefSignal] = Solid.createSignal(null)
const setRef = (el: Element | null) => {
@@ -297,18 +292,49 @@ export function useLinkProps<
})
}
- useIntersectionObserver(
- ref,
- preloadViewportIoCallback,
- { rootMargin: '100px' },
- { disabled: !!local.disabled || !(Solid.untrack(preload) === 'viewport') },
- )
+ const enqueuePreload = (
+ e?: MouseEvent | FocusEvent | IntersectionObserverEntry,
+ ) => {
+ if (!e) {
+ cancelPreload(ref)
+ return
+ }
+
+ if (
+ !(
+ (e as IntersectionObserverEntry).isIntersecting ??
+ preload() === 'intent'
+ )
+ ) {
+ if ((e as IntersectionObserverEntry).isIntersecting === false) {
+ cancelPreload(ref)
+ }
+ return
+ }
+
+ if (!preloadDelay()) {
+ doPreload()
+ return
+ }
+
+ if (!timeoutMap.has(ref)) {
+ timeoutMap.set(
+ ref,
+ setTimeout(() => {
+ timeoutMap.delete(ref)
+ doPreload()
+ }, preloadDelay()),
+ )
+ }
+ }
+
+ useIntersectionObserver(ref, enqueuePreload, () => preload() !== 'viewport')
Solid.createEffect(preload, (preloadValue) => {
if (hasRenderFetched) {
return
}
- if (!local.disabled && preloadValue === 'render') {
+ if (preloadValue === 'render') {
Solid.untrack(() => doPreload())
hasRenderFetched = true
}
@@ -357,17 +383,6 @@ export function useLinkProps<
) {
e.preventDefault()
- Solid.runWithOwner(null, () => {
- setIsTransitioning(true)
- })
-
- const unsub = router.subscribe('onResolved', () => {
- unsub()
- Solid.runWithOwner(null, () => {
- setIsTransitioning(false)
- })
- })
-
// All is well? Navigate!
// N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
router.navigate({
@@ -382,40 +397,14 @@ export function useLinkProps<
}
}
- const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {
- if (local.disabled || preload() !== 'intent') return
-
- if (!preloadDelay()) {
- doPreload()
- return
- }
-
- const eventTarget = e.currentTarget || e.target
-
- if (!eventTarget || timeoutMap.has(eventTarget)) return
-
- timeoutMap.set(
- eventTarget,
- setTimeout(() => {
- timeoutMap.delete(eventTarget)
- doPreload()
- }, preloadDelay()),
- )
- }
-
- const handleTouchStart = (_: TouchEvent) => {
- if (local.disabled || preload() !== 'intent') return
+ const handleTouchStart = () => {
+ if (preload() !== 'intent') return
doPreload()
}
- const handleLeave = (e: MouseEvent | FocusEvent) => {
- if (local.disabled) return
- const eventTarget = e.currentTarget || e.target
-
- if (eventTarget) {
- const id = timeoutMap.get(eventTarget)
- clearTimeout(id)
- timeoutMap.delete(eventTarget)
+ const handleLeave = () => {
+ if (preload() === 'intent') {
+ cancelPreload(ref)
}
}
@@ -430,17 +419,14 @@ export function useLinkProps<
const onClick = createComposedHandler(() => local.onClick, handleClick)
const onBlur = createComposedHandler(() => local.onBlur, handleLeave)
- const onFocus = createComposedHandler(
- () => local.onFocus,
- enqueueIntentPreload,
- )
+ const onFocus = createComposedHandler(() => local.onFocus, enqueuePreload)
const onMouseEnter = createComposedHandler(
() => local.onMouseEnter,
- enqueueIntentPreload,
+ enqueuePreload,
)
const onMouseOver = createComposedHandler(
() => local.onMouseOver,
- enqueueIntentPreload,
+ enqueuePreload,
)
const onMouseLeave = createComposedHandler(
() => local.onMouseLeave,
@@ -552,8 +538,6 @@ export function useLinkProps<
'aria-disabled': () => (local.disabled ? 'true' : undefined),
'data-status': () => (isActive() ? 'active' : undefined),
'aria-current': () => (isActive() ? 'page' : undefined),
- 'data-transitioning': () =>
- isTransitioning() ? 'transitioning' : undefined,
class: resolvedClass,
style: resolvedStyle,
})
@@ -639,9 +623,7 @@ export type LinkProps<
export interface LinkPropsChildren {
// If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
- children?:
- | JSX.Element
- | ((state: { isActive: boolean; isTransitioning: boolean }) => JSX.Element)
+ children?: JSX.Element | ((state: { isActive: boolean }) => JSX.Element)
}
type LinkComponentSolidProps = TComp extends ValidComponent
@@ -726,9 +708,6 @@ export const Link: LinkComponent<'a'> = (props) => {
get isActive() {
return (linkProps as any)['data-status'] === 'active'
},
- get isTransitioning() {
- return (linkProps as any)['data-transitioning'] === 'transitioning'
- },
})
}
diff --git a/packages/solid-router/src/matchContext.tsx b/packages/solid-router/src/matchContext.tsx
index 50ab0d4b767..87cd32f4a83 100644
--- a/packages/solid-router/src/matchContext.tsx
+++ b/packages/solid-router/src/matchContext.tsx
@@ -1,15 +1,15 @@
import * as Solid from 'solid-js'
import type { AnyRouteMatch } from '@tanstack/router-core'
-export type NearestMatchContextValue = {
- routeId: Solid.Accessor
- match: Solid.Accessor
-}
+export type NearestMatchContextValue = readonly [
+ routeId: Solid.Accessor,
+ match: Solid.Accessor,
+]
-const defaultNearestMatchContext: NearestMatchContextValue = {
- routeId: () => undefined,
- match: () => undefined,
-}
+const defaultNearestMatchContext: NearestMatchContextValue = [
+ () => undefined,
+ () => undefined,
+]
export const nearestMatchContext =
Solid.createContext(defaultNearestMatchContext)
diff --git a/packages/solid-router/src/nonRouteComponentContext.tsx b/packages/solid-router/src/nonRouteComponentContext.tsx
new file mode 100644
index 00000000000..9d498c7cd88
--- /dev/null
+++ b/packages/solid-router/src/nonRouteComponentContext.tsx
@@ -0,0 +1,23 @@
+import * as Solid from 'solid-js'
+import type { JSX } from '@solidjs/web'
+
+export type NonRouteComponent =
+ | 'pendingComponent'
+ | 'errorComponent'
+ | 'notFoundComponent'
+
+// Solid 2's `useContext` throws for a default-less context with no mounted
+// provider, so default to `null` to keep the unset read falsy instead.
+export const nonRouteComponentContext =
+ process.env.NODE_ENV !== 'production'
+ ? /* @__PURE__ */ Solid.createContext(null)
+ : undefined
+
+export function renderInNonRouteComponentContext(
+ render: () => JSX.Element,
+ component: NonRouteComponent,
+) {
+ // In Solid 2 the context object itself is the provider component.
+ const Context = nonRouteComponentContext!
+ return {render()}
+}
diff --git a/packages/solid-router/src/renderRouteNotFound.tsx b/packages/solid-router/src/renderRouteNotFound.tsx
index 078a632e08c..9e8a09e9c7a 100644
--- a/packages/solid-router/src/renderRouteNotFound.tsx
+++ b/packages/solid-router/src/renderRouteNotFound.tsx
@@ -1,4 +1,5 @@
import { DefaultGlobalNotFound } from './not-found'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
import type { AnyRoute, AnyRouter } from '@tanstack/router-core'
/**
@@ -14,19 +15,35 @@ export function renderRouteNotFound(
route: AnyRoute,
data: any,
) {
+ if (process.env.NODE_ENV !== 'production') {
+ if (!route.options.notFoundComponent) {
+ if (router.options.defaultNotFoundComponent) {
+ const DefaultNotFoundComponent = router.options.defaultNotFoundComponent
+ return renderInNonRouteComponentContext(
+ () => Not Found
)`,
+ )
+
+ return Not Found
)`,
- )
- }
- }
-
return
* ```
*/
export function useIntersectionObserver(
ref: Solid.Accessor,
- callback: (entry: IntersectionObserverEntry | undefined) => void,
- intersectionObserverOptions: IntersectionObserverInit = {},
- options: { disabled?: boolean } = {},
+ callback: (entry?: IntersectionObserverEntry) => void,
+ disabled: Solid.Accessor,
): Solid.Accessor {
const isIntersectionObserverAvailable =
typeof IntersectionObserver === 'function'
let observerRef: IntersectionObserver | null = null
- Solid.createEffect(ref, (r) => {
- if (!r || !isIntersectionObserverAvailable || options.disabled) {
- return
- }
+ Solid.createEffect(
+ () => [ref(), disabled()] as const,
+ ([r, isDisabled]) => {
+ if (isDisabled || !r || !isIntersectionObserverAvailable) {
+ return () => callback()
+ }
- observerRef = new IntersectionObserver(([entry]) => {
- callback(entry)
- }, intersectionObserverOptions)
+ observerRef = new IntersectionObserver(
+ (entries) => {
+ callback(entries.pop())
+ },
+ { rootMargin: '100px' },
+ )
- observerRef.observe(r)
+ observerRef.observe(r)
- return () => {
- observerRef?.disconnect()
- }
- })
+ return () => {
+ observerRef?.disconnect()
+ callback()
+ }
+ },
+ )
return () => observerRef
}
diff --git a/packages/solid-router/tests/Outlet.test.tsx b/packages/solid-router/tests/Outlet.test.tsx
new file mode 100644
index 00000000000..248c710b1c3
--- /dev/null
+++ b/packages/solid-router/tests/Outlet.test.tsx
@@ -0,0 +1,146 @@
+import { afterEach, expect, test, vi } from 'vitest'
+import { cleanup, render, screen } from '@solidjs/testing-library'
+import { createMemoryHistory } from '@tanstack/history'
+import { createControlledPromise, notFound } from '@tanstack/router-core'
+import {
+ Outlet,
+ RouterProvider,
+ createRootRoute,
+ createRoute,
+ createRouter,
+} from '../src'
+
+const outletWarning = (
+ component: 'pendingComponent' | 'errorComponent' | 'notFoundComponent',
+) =>
+ `Warning: An Root route
+ Index route ,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(() => ()
+ const rootRoute = createRootRoute({ component: Outlet })
+ const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ component: () => Index route ,
+ })
+ const pendingRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/pending',
+ loader: () => pending,
+ pendingMs: 0,
+ pendingComponent: () => (
+ <>
+ Pending route
+ Resolved route ,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute, pendingRoute]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(() => Error route
+ Index route ,
+ })
+ const notFoundRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/not-found',
+ component: () => {
+ throw notFound()
+ },
+ notFoundComponent: () => (
+ <>
+ Not found route
+ Home page
,
+ })
+ const parsedParamRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/$parsedParam',
+ params: {
+ parse: ({ parsedParam }) => {
+ const [recordName, revisionNumber] = parsedParam.split('-')
+ return {
+ parsedParam: {
+ recordName: recordName!,
+ revisionNumber: Number(revisionNumber),
+ },
+ }
+ },
+ stringify: ({ parsedParam }) => ({
+ parsedParam: `${parsedParam.recordName}-${parsedParam.revisionNumber}`,
+ }),
+ },
+ component: Outlet,
+ })
+ const parsedParamIndexRoute = createRoute({
+ getParentRoute: () => parsedParamRoute,
+ path: '/',
+ loader: ({ params }) => params.parsedParam.revisionNumber * 100,
+ component: () => {
+ const params = parsedParamIndexRoute.useParams()
+ const loaderData = parsedParamIndexRoute.useLoaderData()
+
+ return (
+ <>
+
+ Params have {params().parsedParam.recordName} with revision{' '}
+ {params().parsedParam.revisionNumber}
+
+ Loader data is {loaderData()}
+
+ )
+ },
+ })
+ const routeTree = rootRoute.addChildren([
+ indexRoute,
+ parsedParamRoute.addChildren([parsedParamIndexRoute]),
+ ])
+ const router = createRouter({
+ routeTree,
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render(() => >()
+const pendingOperations = new Set>()
+
+afterEach(async () => {
+ try {
+ for (const promise of controlledPromises) {
+ if (promise.status === 'pending') {
+ promise.resolve()
+ }
+ }
+ if (vi.isFakeTimers()) {
+ await vi.runAllTimersAsync()
+ }
+ await Promise.allSettled(pendingOperations)
+ } finally {
+ controlledPromises.clear()
+ pendingOperations.clear()
+ cleanup()
+ vi.useRealTimers()
+ vi.restoreAllMocks()
+ }
+})
+
+const navigationDelay = 100
+
+function delayNavigation() {
+ return new Promise((resolve) => setTimeout(resolve, navigationDelay))
+}
+
+function controlled() {
+ const promise = createControlledPromise()
+ controlledPromises.add(promise)
+ return promise
+}
+
+function track(operation: Promise) {
+ pendingOperations.add(operation)
+ return operation
+}
+
+function setup() {
+ const navigationBeforeLoadStarted = controlled()
+ let beforeLoadCalls = 0
+
+ const rootRoute = createRootRoute({ component: () => ): { tab?: string } =>
+ typeof search.tab === 'string' ? { tab: search.tab } : {},
+ component: Project,
+ })
+
+ function Project() {
+ const params = projectRoute.useParams()
+ const search = projectRoute.useSearch()
+ return (
+
+ project={params().projectId} tab={search().tab ?? 'default'}
+
+ )
+ }
+
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([layoutRoute.addChildren([projectRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/projects/p1'] }),
+ defaultPendingComponent: () => Pending
,
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ return { router, navigationBeforeLoadStarted }
+}
+
+test('a search-only navigation retains successful UI while beforeLoad reruns', async () => {
+ const { router, navigationBeforeLoadStarted } = setup()
+ render(() => ): { tab?: string } =>
+ typeof search.tab === 'string' ? { tab: search.tab } : {},
+ shouldReload: true,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (++loaderCalls === 1) {
+ return 'initial'
+ }
+ reloadStarted.resolve()
+ return delayNavigation().then(() => 'reloaded')
+ },
+ },
+ component: () => (
+
+ {pageRoute.useLoaderData()()} tab=
+ {pageRoute.useSearch()().tab ?? 'default'}
+
+ ),
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingComponent: () => Pending
,
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => {pageRoute.useLoaderData()()}
+ ),
+ pendingComponent: () => Pending
,
+ errorComponent: () => Failed
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => {pageRoute.useLoaderData()()}
+ ),
+ pendingComponent: () => Pending
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => Parent failed
,
+ })
+ const childRoute = createRoute({
+ getParentRoute: () => parentRoute,
+ path: '/child',
+ shouldReload: () => childReloads,
+ loader: {
+ staleReloadMode: 'blocking',
+ handler: () => {
+ if (childReloads) {
+ childReloadStarted.resolve()
+ return childReload.then(() => 'reloaded child')
+ }
+ return 'initial child'
+ },
+ },
+ component: () => (
+ {childRoute.useLoaderData()()}
+ ),
+ pendingComponent: () => Pending child
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/parent/child'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => Pending root
,
+ notFoundComponent: () => Missing
,
+ })
+ const pageRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/page',
+ component: () => Page
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => Root missing
,
+ })
+ const parentRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/parent',
+ beforeLoad: async () => {
+ if (++parentLoads > 1) {
+ parentReloadStarted.resolve()
+ await parentReload
+ }
+ },
+ component: () => (
+
+ ),
+ pendingComponent: () => (
+ Parent pending
+ ),
+ notFoundComponent: () => (
+ Parent missing
+ ),
+ })
+ const childRoute = createRoute({
+ getParentRoute: () => parentRoute,
+ path: '/child',
+ }).lazy(async () => {
+ lazyStarted.resolve()
+ await lazyRoute
+ return createLazyRoute('/parent/child')({
+ notFoundComponent: () => (
+ Child missing
+ ),
+ })
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/parent'] }),
+ defaultPendingComponent: () => (
+ Pending
+ ),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => {pageRoute.useLoaderData()()}
+ ),
+ pendingComponent: () => Page pending
,
+ })
+ const otherRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/other',
+ loader: async () => {
+ otherStarted.resolve()
+ await otherLoader
+ },
+ pendingComponent: () => (
+ Other pending
+ ),
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([pageRoute, otherRoute]),
+ history: createMemoryHistory({ initialEntries: ['/page'] }),
+ defaultPendingMs: 0,
+ defaultPendingMinMs: 1,
+ })
+
+ render(() => Item {params().itemId}
+ }
+
+ const itemRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/items/$itemId',
+ component: ItemComponent,
+ remountDeps:
+ remountOnParams === 'falsy'
+ ? ({ params }) => (params.itemId === 'one' ? false : 0)
+ : remountOnParams
+ ? ({ params }) => params
+ : undefined,
+ })
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([itemRoute]),
+ history: createMemoryHistory({ initialEntries: ['/items/one'] }),
+ })
+
+ render(() => ['router'],
+) {
+ await router.navigate({
+ to: '/items/$itemId',
+ params: { itemId: 'two' },
+ })
+}
+
+test('keeps an active route component mounted when params change by default', async () => {
+ const { mounted, router, unmounted } = setup()
+
+ expect(await screen.findByText('Item one')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(1)
+ expect(unmounted).not.toHaveBeenCalled()
+
+ await navigateToSecondItem(router)
+
+ expect(await screen.findByText('Item two')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(1)
+ expect(unmounted).not.toHaveBeenCalled()
+})
+
+test('remounts an active route component when params are remount deps', async () => {
+ const { mounted, router, unmounted } = setup(true)
+
+ expect(await screen.findByText('Item one')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(1)
+
+ await navigateToSecondItem(router)
+
+ expect(await screen.findByText('Item two')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(2)
+ expect(unmounted).toHaveBeenCalledTimes(1)
+})
+
+test('remounts when remount deps change between falsy values', async () => {
+ const { mounted, router, unmounted } = setup('falsy')
+
+ expect(await screen.findByText('Item one')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(1)
+
+ await navigateToSecondItem(router)
+
+ expect(await screen.findByText('Item two')).toBeInTheDocument()
+ expect(mounted).toHaveBeenCalledTimes(2)
+ expect(unmounted).toHaveBeenCalledTimes(1)
+})
diff --git a/packages/solid-router/tests/utils.ts b/packages/solid-router/tests/utils.ts
index 6c11bea20a8..668cc9deb6a 100644
--- a/packages/solid-router/tests/utils.ts
+++ b/packages/solid-router/tests/utils.ts
@@ -20,9 +20,11 @@ export function createTimer() {
export const getIntersectionObserverMock = ({
observe,
disconnect,
+ onCreate,
}: {
observe: Mock
disconnect: Mock
+ onCreate?: (callback: IntersectionObserverCallback) => void
}) => {
return class IO implements IntersectionObserver {
root: Document | Element | null
@@ -33,6 +35,7 @@ export const getIntersectionObserverMock = ({
_cb: IntersectionObserverCallback,
options?: IntersectionObserverInit,
) {
+ onCreate?.(_cb)
this.root = options?.root ?? null
this.rootMargin = options?.rootMargin ?? '0px'
this.scrollMargin = options?.scrollMargin ?? '0px'
diff --git a/packages/solid-router/vite.config.ts b/packages/solid-router/vite.config.ts
index 5281d0561b1..a9d2a99384d 100644
--- a/packages/solid-router/vite.config.ts
+++ b/packages/solid-router/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/vite-config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md
index 52c2c67b48c..e55144b212a 100644
--- a/packages/solid-start-client/CHANGELOG.md
+++ b/packages/solid-start-client/CHANGELOG.md
@@ -1,5 +1,20 @@
# @tanstack/solid-start-client
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
+- Updated dependencies [[`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713)]:
+ - @tanstack/solid-router@2.0.0-rc.0
+
## 2.0.0-beta.30
### Patch Changes
diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json
index 4003dad49ce..072c5f9f9e3 100644
--- a/packages/solid-start-client/package.json
+++ b/packages/solid-start-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-start-client",
- "version": "2.0.0-beta.30",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -77,11 +77,11 @@
},
"devDependencies": {
"@solidjs/testing-library": "^0.8.10",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@solidjs/web": "^2.0.0-rc.0",
"@testing-library/jest-dom": "^6.6.3",
- "solid-js": "2.0.0-beta.32",
- "vite": "*",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "solid-js": "^2.0.0-rc.0",
+ "vite": "*"
},
"peerDependencies": {
"@solidjs/web": ">=2.0.0-0 <3.0.0",
diff --git a/packages/solid-start-client/src/GenericHydrate.tsx b/packages/solid-start-client/src/GenericHydrate.tsx
index 6b601fb9e1e..9026a843942 100644
--- a/packages/solid-start-client/src/GenericHydrate.tsx
+++ b/packages/solid-start-client/src/GenericHydrate.tsx
@@ -34,10 +34,10 @@ type HydrationMarkerDynamicProps = DynamicProps<'div'> & {
[key: `data-${string}`]: string | undefined
}
type PrefetchController = {
- abortController: AbortController
- hydrationRequested: boolean
- hydrationListeners: Set<() => void>
- hydrationResolvePending: boolean
+ abort: AbortController
+ requested: boolean
+ listeners: Set<() => void>
+ resolvePending: boolean
started: boolean
promise?: Promise
}
@@ -110,10 +110,10 @@ export function GenericHydrate(props: InternalHydrateProps) {
)
const [prefetchError, setPrefetchError] = Solid.createSignal()
const controller: PrefetchController = {
- abortController: new AbortController(),
- hydrationRequested: false,
- hydrationListeners: new Set<() => void>(),
- hydrationResolvePending: false,
+ abort: new AbortController(),
+ requested: false,
+ listeners: new Set<() => void>(),
+ resolvePending: false,
started: false,
}
let didPrefetch = false
@@ -151,35 +151,35 @@ export function GenericHydrate(props: InternalHydrateProps) {
}
const onHydrate = (listener: () => void) => {
- if (controller.hydrationRequested) {
+ if (controller.requested) {
listener()
return () => {}
}
- controller.hydrationListeners.add(listener)
+ controller.listeners.add(listener)
return () => {
- controller.hydrationListeners.delete(listener)
+ controller.listeners.delete(listener)
}
}
const requestHydration = () => {
- if (!controller.hydrationRequested) {
- controller.hydrationRequested = true
- controller.hydrationListeners.forEach((listener) => listener())
- controller.hydrationListeners.clear()
+ if (!controller.requested) {
+ controller.requested = true
+ controller.listeners.forEach((listener) => listener())
+ controller.listeners.clear()
}
if (!controller.promise) {
resolveGate()
return
}
- if (controller.hydrationResolvePending) return
- controller.hydrationResolvePending = true
+ if (controller.resolvePending) return
+ controller.resolvePending = true
controller.promise.then(
() => resolveGate(),
(error) => {
- if (!controller.abortController.signal.aborted) {
+ if (!controller.abort.signal.aborted) {
setPrefetchError(() => error)
}
},
@@ -188,8 +188,8 @@ export function GenericHydrate(props: InternalHydrateProps) {
const resolveGate = gate.resolve
Solid.onCleanup(() => {
- controller.abortController.abort()
- controller.hydrationListeners.clear()
+ controller.abort.abort()
+ controller.listeners.clear()
cleanupHydrationRuntime()
if (!didReleaseGate) {
didReleaseGate = true
@@ -243,12 +243,12 @@ export function GenericHydrate(props: InternalHydrateProps) {
.then(() =>
currentPrefetchStrategy({
element: markerElement ?? null,
- signal: controller.abortController.signal,
+ signal: controller.abort.signal,
preload,
waitFor: (strategy) =>
waitForHydrationPrefetchStrategy(strategy, {
element: markerElement ?? null,
- signal: controller.abortController.signal,
+ signal: controller.abort.signal,
onHydrate,
}),
}),
@@ -257,7 +257,7 @@ export function GenericHydrate(props: InternalHydrateProps) {
controller.promise = promise
promise.catch((error) => {
- if (!controller.abortController.signal.aborted) {
+ if (!controller.abort.signal.aborted) {
setPrefetchError(() => error)
}
})
diff --git a/packages/solid-start-client/vite.config.ts b/packages/solid-start-client/vite.config.ts
index dbfb60ea039..973f4721a29 100644
--- a/packages/solid-start-client/vite.config.ts
+++ b/packages/solid-start-client/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/vite-config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import packageJson from './package.json'
import type { ViteUserConfig } from 'vitest/config'
diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md
index f8c0af403ec..9b7449ac354 100644
--- a/packages/solid-start-server/CHANGELOG.md
+++ b/packages/solid-start-server/CHANGELOG.md
@@ -1,5 +1,20 @@
# @tanstack/solid-start-server
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
+- Updated dependencies [[`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713)]:
+ - @tanstack/solid-router@2.0.0-rc.0
+
## 2.0.0-beta.30
### Patch Changes
diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json
index 640510075ee..de8d26c3952 100644
--- a/packages/solid-start-server/package.json
+++ b/packages/solid-start-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-start-server",
- "version": "2.0.0-beta.30",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -63,12 +63,12 @@
"@tanstack/start-server-core": "workspace:*"
},
"devDependencies": {
- "@solidjs/web": "2.0.0-beta.32",
- "solid-js": "2.0.0-beta.32",
+ "@solidjs/vite-plugin": "^3.0.0-next.28",
+ "@solidjs/web": "^2.0.0-rc.0",
+ "solid-js": "^2.0.0-rc.0",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
- "vite": "*",
- "vite-plugin-solid": "^3.0.0-next.23"
+ "vite": "*"
},
"peerDependencies": {
"@solidjs/web": ">=2.0.0-0 <3.0.0",
diff --git a/packages/solid-start-server/vite.config.ts b/packages/solid-start-server/vite.config.ts
index 9115434d50e..3b6c4132583 100644
--- a/packages/solid-start-server/vite.config.ts
+++ b/packages/solid-start-server/vite.config.ts
@@ -1,6 +1,6 @@
import { defineConfig, mergeConfig } from 'vitest/config'
import { tanstackViteConfig } from '@tanstack/vite-config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import packageJson from './package.json'
const config = defineConfig({
diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md
index 080c1fbf8a7..c8698b08e2f 100644
--- a/packages/solid-start/CHANGELOG.md
+++ b/packages/solid-start/CHANGELOG.md
@@ -1,5 +1,22 @@
# @tanstack/solid-start
+## 2.0.0-rc.0
+
+### Patch Changes
+
+- [#8058](https://github.com/TanStack/router/pull/8058) [`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713) - 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.
+
+- Updated dependencies [[`56cc90e`](https://github.com/TanStack/router/commit/56cc90ea2c29b8d8c3aa21252b60f0995083b713)]:
+ - @tanstack/solid-router@2.0.0-rc.0
+ - @tanstack/solid-start-client@2.0.0-rc.0
+ - @tanstack/solid-start-server@2.0.0-rc.0
+
## 2.0.0-beta.31
### Patch Changes
diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json
index b1b7c58c17d..8a57325acf4 100644
--- a/packages/solid-start/package.json
+++ b/packages/solid-start/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-start",
- "version": "2.0.0-beta.31",
+ "version": "2.0.0-rc.0",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -128,10 +128,10 @@
},
"devDependencies": {
"@rsbuild/core": "^2.1.0",
- "@solidjs/web": "2.0.0-beta.32",
+ "@solidjs/web": "^2.0.0-rc.0",
"@tanstack/router-utils": "workspace:*",
"@types/node": ">=20",
- "solid-js": "2.0.0-beta.32",
+ "solid-js": "^2.0.0-rc.0",
"vite": "*"
},
"peerDependencies": {
diff --git a/packages/solid-start/skills/solid-start/SKILL.md b/packages/solid-start/skills/solid-start/SKILL.md
index d00ca60f453..0e78c779b14 100644
--- a/packages/solid-start/skills/solid-start/SKILL.md
+++ b/packages/solid-start/skills/solid-start/SKILL.md
@@ -45,7 +45,7 @@ Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCoo
```bash
npm i @tanstack/solid-start @tanstack/solid-router solid-js
-npm i -D vite vite-plugin-solid typescript
+npm i -D vite @solidjs/vite-plugin typescript
```
### 2. package.json
@@ -82,7 +82,7 @@ npm i -D vite vite-plugin-solid typescript
```ts
import { defineConfig } from 'vite'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solidPlugin from 'vite-plugin-solid'
+import solidPlugin from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [
diff --git a/packages/solid-start/src/plugin/vite.ts b/packages/solid-start/src/plugin/vite.ts
index 50e03fc7215..a72c918c6f8 100644
--- a/packages/solid-start/src/plugin/vite.ts
+++ b/packages/solid-start/src/plugin/vite.ts
@@ -9,7 +9,7 @@ import type {
} from '@tanstack/start-plugin-core/vite'
import type { PluginOption } from 'vite'
-// vite-plugin-solid's client-assets manifest: resolves the module keys its
+// @solidjs/vite-plugin's client-assets manifest: resolves the module keys its
// compiler bakes into lazy() calls to client JS/CSS assets — a live resolver
// over the dev module graph in dev, the client build's `.vite/manifest.json`
// in builds. Solid's server renderer consumes either shape natively.
@@ -95,7 +95,7 @@ export function tanstackStart(
return undefined
}
- // Only swap when the installed vite-plugin-solid actually registers
+ // Only swap when the installed @solidjs/vite-plugin actually registers
// the virtual module (older versions don't) — otherwise keep the
// inert stub.
const resolved = await this.resolve(SOLID_MANIFEST_ID, id)
diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md
index 9c4a205bacf..b127886d0bc 100644
--- a/packages/start-client-core/CHANGELOG.md
+++ b/packages/start-client-core/CHANGELOG.md
@@ -1,5 +1,67 @@
# @tanstack/start-client-core
+## 1.170.22
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+ - @tanstack/start-storage-context@1.167.24
+
+## 1.170.21
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+ - @tanstack/start-storage-context@1.167.23
+
+## 1.170.20
+
+### Patch Changes
+
+- [#8009](https://github.com/TanStack/router/pull/8009) [`c59788c`](https://github.com/TanStack/router/commit/c59788ca20f2d2e7f264a859ebe01b7646ba3154) - perf: drop consumed chunks from the client frame decoder buffer with an O(1) head pointer instead of `Array.prototype.shift()` (O(n)). The previous approach degraded to O(n^2) when a single large frame (e.g. a big `RawStream` payload) was assembled from many small network reads.
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+ - @tanstack/start-storage-context@1.167.22
+
+## 1.170.19
+
+### Patch Changes
+
+- [#7978](https://github.com/TanStack/router/pull/7978) [`2fbc99f`](https://github.com/TanStack/router/commit/2fbc99f2c262b057cb957e6ebba1ee073c655186) - compact private frame decoder result keys
+
+- [#7980](https://github.com/TanStack/router/pull/7980) [`6bede65`](https://github.com/TanStack/router/commit/6bede65d7074dcd83455151b66b4574268bc782c) - compact deferred hydration private state
+
+## 1.170.18
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+ - @tanstack/start-storage-context@1.167.21
+
+## 1.170.17
+
+### Patch Changes
+
+- [#7985](https://github.com/TanStack/router/pull/7985) [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b) - perf: compact private bundle boundaries- [#7975](https://github.com/TanStack/router/issues/7975)
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+ - @tanstack/start-storage-context@1.167.20
+
+## 1.170.16
+
+### Patch Changes
+
+- [#7962](https://github.com/TanStack/router/pull/7962) [`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5) - Update Seroval dependencies to version 1.6.2.
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+ - @tanstack/start-storage-context@1.167.19
+
## 1.170.15
### Patch Changes
diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json
index fe83f213fd0..83cbf4746ef 100644
--- a/packages/start-client-core/package.json
+++ b/packages/start-client-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/start-client-core",
- "version": "1.170.15",
+ "version": "1.170.22",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -109,7 +109,7 @@
"@tanstack/router-core": "workspace:*",
"@tanstack/start-fn-stubs": "workspace:*",
"@tanstack/start-storage-context": "workspace:*",
- "seroval": "^1.5.4"
+ "seroval": "^1.6.2"
},
"devDependencies": {
"vite": "*",
diff --git a/packages/start-client-core/src/client-rpc/frame-decoder.ts b/packages/start-client-core/src/client-rpc/frame-decoder.ts
index 9834b10a1b2..cd1a0c719fc 100644
--- a/packages/start-client-core/src/client-rpc/frame-decoder.ts
+++ b/packages/start-client-core/src/client-rpc/frame-decoder.ts
@@ -25,9 +25,9 @@ const MAX_FRAMES = 100_000 // Limit total frames to prevent CPU DoS
*/
export interface FrameDecoderResult {
/** Gets or creates a raw stream by ID (for use by deserialize plugin) */
- getOrCreateStream: (id: number) => ReadableStream
+ getStream: (id: number) => ReadableStream
/** Stream of JSON strings (NDJSON lines) */
- jsonChunks: ReadableStream
+ chunks: ReadableStream
}
/**
@@ -133,8 +133,26 @@ export function createFrameDecoder(
inputReader = reader
const bufferList: Array = []
+ // Index of the first un-consumed chunk in bufferList. Advancing this
+ // pointer is O(1); using bufferList.shift() to drop a consumed chunk is
+ // O(n) and degrades to O(n^2) when a single large frame is assembled from
+ // many small chunks (e.g. a big RawStream payload split across reads).
+ let bufferHead = 0
let totalLength = 0
+ function advanceBufferHead(): void {
+ bufferList[bufferHead++] = EMPTY_BUFFER
+
+ // Reset drained buffers immediately and compact long-lived buffers in batches.
+ if (bufferHead === bufferList.length) {
+ bufferList.length = 0
+ bufferHead = 0
+ } else if (bufferHead >= 32) {
+ bufferList.splice(0, bufferHead)
+ bufferHead = 0
+ }
+ }
+
/**
* Reads header bytes from buffer chunks without flattening.
* Returns header data or null if not enough bytes available.
@@ -146,7 +164,7 @@ export function createFrameDecoder(
} | null {
if (totalLength < FRAME_HEADER_SIZE) return null
- const first = bufferList[0]!
+ const first = bufferList[bufferHead]!
// Fast path: header fits entirely in first chunk (common case)
if (first.length >= FRAME_HEADER_SIZE) {
@@ -170,7 +188,7 @@ export function createFrameDecoder(
const headerBytes = new Uint8Array(FRAME_HEADER_SIZE)
let offset = 0
let remaining = FRAME_HEADER_SIZE
- for (let i = 0; i < bufferList.length && remaining > 0; i++) {
+ for (let i = bufferHead; i < bufferList.length && remaining > 0; i++) {
const chunk = bufferList[i]!
const toCopy = Math.min(chunk.length, remaining)
headerBytes.set(chunk.subarray(0, toCopy), offset)
@@ -207,13 +225,13 @@ export function createFrameDecoder(
// copying `count` bytes. The view shares the chunk's backing ArrayBuffer,
// which is safe because buffered chunks are never mutated in place after
// being read from the network.
- const first = bufferList[0]
+ const first = bufferList[bufferHead]
if (first && first.length >= count) {
const result = first.subarray(0, count)
if (first.length === count) {
- bufferList.shift()
+ advanceBufferHead()
} else {
- bufferList[0] = first.subarray(count)
+ bufferList[bufferHead] = first.subarray(count)
}
totalLength -= count
return result
@@ -224,9 +242,8 @@ export function createFrameDecoder(
let offset = 0
let remaining = count
- while (remaining > 0 && bufferList.length > 0) {
- const chunk = bufferList[0]
- if (!chunk) break
+ while (remaining > 0 && bufferHead < bufferList.length) {
+ const chunk = bufferList[bufferHead]!
const toCopy = Math.min(chunk.length, remaining)
result.set(chunk.subarray(0, toCopy), offset)
@@ -234,9 +251,9 @@ export function createFrameDecoder(
remaining -= toCopy
if (toCopy === chunk.length) {
- bufferList.shift()
+ advanceBufferHead()
} else {
- bufferList[0] = chunk.subarray(toCopy)
+ bufferList[bufferHead] = chunk.subarray(toCopy)
}
}
@@ -404,5 +421,5 @@ export function createFrameDecoder(
}
})()
- return { getOrCreateStream, jsonChunks }
+ return { getStream: getOrCreateStream, chunks: jsonChunks }
}
diff --git a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts
index 2e993205bcf..2534b6bb938 100644
--- a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts
+++ b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts
@@ -157,11 +157,10 @@ export async function serverFnFetcher(
let body = undefined
if (first.method === 'POST') {
- const fetchBody = await getFetchBody(first)
- if (fetchBody?.contentType) {
- headers.set('content-type', fetchBody.contentType)
+ body = await getFetchBody(first)
+ if (typeof body === 'string') {
+ headers.set('content-type', 'application/json')
}
- body = fetchBody?.body
}
return await getResponse(async () =>
@@ -204,7 +203,7 @@ async function serialize(data: any) {
async function getFetchBody(
opts: FunctionMiddlewareClientFnOptions,
-): Promise<{ body: FormData | string; contentType?: string } | undefined> {
+): Promise {
if (opts.data instanceof FormData) {
let serializedContext = undefined
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -214,11 +213,11 @@ async function getFetchBody(
if (serializedContext !== undefined) {
opts.data.set(TSS_FORMDATA_CONTEXT, serializedContext)
}
- return { body: opts.data }
+ return opts.data
}
const serializedBody = await serializePayload(opts)
if (serializedBody) {
- return { body: serializedBody, contentType: 'application/json' }
+ return serializedBody
}
return undefined
}
@@ -274,18 +273,15 @@ async function getResponse(fn: () => Promise) {
throw new Error('No response body for framed response')
}
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(
- response.body,
- )
+ const { getStream, chunks } = createFrameDecoder(response.body)
// Create deserialize plugin that wires up the raw streams
- const rawStreamPlugin =
- createRawStreamDeserializePlugin(getOrCreateStream)
+ const rawStreamPlugin = createRawStreamDeserializePlugin(getStream)
const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]
const refs = new Map()
result = await processFramedResponse({
- jsonStream: jsonChunks,
+ jsonStream: chunks,
onMessage: (msg: any) => fromCrossJSON(msg, { refs, plugins }),
onError(msg, error) {
console.error(msg, error)
diff --git a/packages/start-client-core/src/hydration/runtime.ts b/packages/start-client-core/src/hydration/runtime.ts
index b1da55195d6..307487c4f97 100644
--- a/packages/start-client-core/src/hydration/runtime.ts
+++ b/packages/start-client-core/src/hydration/runtime.ts
@@ -115,18 +115,19 @@ export function waitForHydrationPrefetchStrategy(
}
return new Promise((resolve) => {
- const state = { disposed: false }
- const cleanupStrategyRef: { current: void | (() => void) } = {
- current: undefined,
- }
+ let disposed = false
+ // The strategy may finish synchronously before returning its cleanup.
+ let cleanupStrategy: void | (() => void) = undefined
let cleanupHydrate = () => {}
const finish = (reason: HydrationPrefetchWaitReason) => {
- if (state.disposed) return
- state.disposed = true
+ if (disposed) {
+ return
+ }
+ disposed = true
options.signal.removeEventListener('abort', onAbort)
cleanupHydrate()
- runHydrationStrategyCleanup(cleanupStrategyRef.current)?.()
+ runHydrationStrategyCleanup(cleanupStrategy)?.()
resolve(reason)
}
@@ -134,12 +135,13 @@ export function waitForHydrationPrefetchStrategy(
options.signal.addEventListener('abort', onAbort, { once: true })
cleanupHydrate = options.onHydrate(() => finish('hydrate'))
- const cleanupStrategy = strategy._s?.({
+ cleanupStrategy = strategy._s?.({
element: options.element,
prefetch: () => finish('prefetch'),
})
- cleanupStrategyRef.current = cleanupStrategy
- if (state.disposed) {
+ // A synchronous finish must immediately run the cleanup just returned.
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+ if (disposed) {
runHydrationStrategyCleanup(cleanupStrategy)?.()
}
})
diff --git a/packages/start-client-core/src/hydration/visible.ts b/packages/start-client-core/src/hydration/visible.ts
index 3c3391b1de0..27855c6d688 100644
--- a/packages/start-client-core/src/hydration/visible.ts
+++ b/packages/start-client-core/src/hydration/visible.ts
@@ -7,18 +7,23 @@ export type VisibleHydrationOptions = {
threshold?: number | Array
}
-type VisibleObserverEntry = {
- key: string
- observer: IntersectionObserver
- elements: Map void>>
-}
+type VisibleObserverEntry = [
+ observer: IntersectionObserver,
+ elements: Map void>>,
+]
const observerRegistry = /* @__PURE__ */ new Map()
-function cleanupVisibleObserverEntry(observerEntry: VisibleObserverEntry) {
- if (observerEntry.elements.size > 0) return
- observerEntry.observer.disconnect()
- observerRegistry.delete(observerEntry.key)
+function cleanupVisibleObserverEntry(
+ key: string,
+ observer: IntersectionObserver,
+ elements: Map void>>,
+) {
+ if (elements.size > 0) {
+ return
+ }
+ observer.disconnect()
+ observerRegistry.delete(key)
}
/* @__NO_SIDE_EFFECTS__ */
@@ -44,46 +49,48 @@ export function visible(
let observerEntry = observerRegistry.get(key)
if (!observerEntry) {
- const entry: VisibleObserverEntry = {
- key,
- elements: new Map void>>(),
- observer: new IntersectionObserver(
- (entries) => {
- for (const intersectingEntry of entries) {
- if (!intersectingEntry.isIntersecting) continue
-
- const callbacks = entry.elements.get(intersectingEntry.target)
- if (!callbacks) continue
+ const elements = new Map void>>()
+ const observer = new IntersectionObserver(
+ (entries) => {
+ for (const intersectingEntry of entries) {
+ if (!intersectingEntry.isIntersecting) {
+ continue
+ }
- callbacks.forEach((callback) => callback())
- entry.elements.delete(intersectingEntry.target)
- entry.observer.unobserve(intersectingEntry.target)
- cleanupVisibleObserverEntry(entry)
+ const callbacks = elements.get(intersectingEntry.target)
+ if (!callbacks) {
+ continue
}
- },
- { rootMargin, threshold },
- ),
- }
- observerRegistry.set(key, entry)
- observerEntry = entry
+
+ callbacks.forEach((callback) => callback())
+ elements.delete(intersectingEntry.target)
+ observer.unobserve(intersectingEntry.target)
+ cleanupVisibleObserverEntry(key, observer, elements)
+ }
+ },
+ { rootMargin, threshold },
+ )
+ observerEntry = [observer, elements]
+ observerRegistry.set(key, observerEntry)
}
- let callbacks = observerEntry.elements.get(element)
+ const [observer, elements] = observerEntry
+ let callbacks = elements.get(element)
if (!callbacks) {
callbacks = new Set()
- observerEntry.elements.set(element, callbacks)
- observerEntry.observer.observe(element)
+ elements.set(element, callbacks)
+ observer.observe(element)
}
callbacks.add(callback)
return () => {
- const currentCallbacks = observerEntry.elements.get(element)
+ const currentCallbacks = elements.get(element)
currentCallbacks?.delete(callback)
if (currentCallbacks?.size === 0) {
- observerEntry.elements.delete(element)
- observerEntry.observer.unobserve(element)
+ elements.delete(element)
+ observer.unobserve(element)
}
- cleanupVisibleObserverEntry(observerEntry)
+ cleanupVisibleObserverEntry(key, observer, elements)
}
},
}
diff --git a/packages/start-client-core/tests/frame-decoder.test.ts b/packages/start-client-core/tests/frame-decoder.test.ts
index 3a05611392c..17862c480b8 100644
--- a/packages/start-client-core/tests/frame-decoder.test.ts
+++ b/packages/start-client-core/tests/frame-decoder.test.ts
@@ -50,7 +50,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Unknown frame type')
@@ -65,7 +65,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Invalid raw frame streamId')
@@ -84,7 +84,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Invalid JSON frame streamId')
@@ -105,7 +105,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Frame payload too large')
@@ -125,7 +125,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Incomplete frame')
@@ -140,7 +140,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await reader.cancel()
@@ -169,7 +169,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('Too many raw streams')
@@ -186,7 +186,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
await expect(reader.read()).rejects.toThrow('buffer exceeded')
@@ -207,7 +207,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
const chunks: Array = []
@@ -240,7 +240,8 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks, getOrCreateStream } = createFrameDecoder(input)
+ const { chunks: jsonChunks, getStream: getOrCreateStream } =
+ createFrameDecoder(input)
// Pre-create the stream before consuming
const stream5 = getOrCreateStream(5)
@@ -276,7 +277,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
const chunks: Array = []
@@ -301,7 +302,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
const { value } = await reader.read()
@@ -326,7 +327,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
const { value } = await reader.read()
@@ -353,7 +354,7 @@ describe('frame-decoder', () => {
},
})
- const { jsonChunks } = createFrameDecoder(input)
+ const { chunks: jsonChunks } = createFrameDecoder(input)
const reader = jsonChunks.getReader()
const { value } = await reader.read()
@@ -387,7 +388,8 @@ describe('frame-decoder', () => {
},
})
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(input)
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
// Pre-create streams before consuming
const stream1 = getOrCreateStream(1)
@@ -428,7 +430,8 @@ describe('frame-decoder', () => {
},
})
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(input)
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
// Pre-create stream 3
const stream3 = getOrCreateStream(3)
@@ -480,7 +483,8 @@ describe('frame-decoder', () => {
},
})
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(input)
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
// First, fully consume JSON stream (this processes all frames)
const jsonReader = jsonChunks.getReader()
@@ -536,7 +540,8 @@ describe('frame-decoder', () => {
},
})
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(input)
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
// Drain JSON (processes all frames)
const jsonReader = jsonChunks.getReader()
@@ -588,7 +593,8 @@ describe('frame-decoder', () => {
},
})
- const { getOrCreateStream, jsonChunks } = createFrameDecoder(input)
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
const stream11 = getOrCreateStream(11)
const jsonReader = jsonChunks.getReader()
@@ -604,5 +610,99 @@ describe('frame-decoder', () => {
}
expect(received).toEqual(Array.from(payload))
})
+
+ it('reassembles a large chunk payload delivered one byte at a time', async () => {
+ // Forces the header slow path AND many whole-chunk consumptions within a
+ // single extract, exercising the head-pointer advance + fully-drained
+ // reset. With the previous bufferList.shift() this path was O(n^2).
+ const payload = new Uint8Array(200)
+ for (let i = 0; i < payload.length; i++) {
+ payload[i] = (i * 7) % 256
+ }
+
+ const jsonFrame = encodeJSONFrame('{"ref":21}')
+ const chunkFrame = encodeChunkFrame(21, payload)
+ const endFrame = encodeEndFrame(21)
+
+ const combined = new Uint8Array(
+ jsonFrame.length + chunkFrame.length + endFrame.length,
+ )
+ combined.set(jsonFrame, 0)
+ combined.set(chunkFrame, jsonFrame.length)
+ combined.set(endFrame, jsonFrame.length + chunkFrame.length)
+
+ const input = new ReadableStream({
+ start(controller) {
+ for (let i = 0; i < combined.length; i++) {
+ controller.enqueue(combined.subarray(i, i + 1))
+ }
+ controller.close()
+ },
+ })
+
+ const { getStream: getOrCreateStream, chunks: jsonChunks } =
+ createFrameDecoder(input)
+ const stream21 = getOrCreateStream(21)
+
+ const jsonReader = jsonChunks.getReader()
+ const { value: jsonValue } = await jsonReader.read()
+ expect(jsonValue).toBe('{"ref":21}')
+
+ const rawReader = stream21.getReader()
+ const received: Array = []
+ while (true) {
+ const { done, value } = await rawReader.read()
+ if (done) {
+ break
+ }
+ if (value) {
+ received.push(...value)
+ }
+ }
+ expect(received).toEqual(Array.from(payload))
+ })
+
+ it('decodes many frames when reads never align with frame boundaries', async () => {
+ // 100-byte frames fed in 7-byte reads never align until the very end, so
+ // consumed chunks accumulate and the head pointer climbs past the
+ // compaction threshold repeatedly, exercising the splice() prefix drop.
+ const FRAME_COUNT = 7
+ const expected: Array = []
+ const frames: Array = []
+ for (let i = 0; i < FRAME_COUNT; i++) {
+ const payload = `frame-${i}`.padEnd(91, '.') // 91 bytes => 100-byte frame
+ expected.push(payload)
+ frames.push(encodeJSONFrame(payload))
+ }
+
+ const totalLen = frames.reduce((acc, f) => acc + f.length, 0)
+ const combined = new Uint8Array(totalLen)
+ let offset = 0
+ for (const f of frames) {
+ combined.set(f, offset)
+ offset += f.length
+ }
+
+ const input = new ReadableStream({
+ start(controller) {
+ for (let i = 0; i < combined.length; i += 7) {
+ controller.enqueue(combined.subarray(i, i + 7))
+ }
+ controller.close()
+ },
+ })
+
+ const { chunks: jsonChunks } = createFrameDecoder(input)
+ const reader = jsonChunks.getReader()
+ const received: Array = []
+ while (true) {
+ const { done, value } = await reader.read()
+ if (done) {
+ break
+ }
+ received.push(value)
+ }
+ expect(received).toEqual(expected)
+ })
})
})
diff --git a/packages/start-client-core/tests/hydration-runtime.test.ts b/packages/start-client-core/tests/hydration-runtime.test.ts
new file mode 100644
index 00000000000..577d329cd9c
--- /dev/null
+++ b/packages/start-client-core/tests/hydration-runtime.test.ts
@@ -0,0 +1,100 @@
+import { describe, expect, it, vi } from 'vitest'
+import { waitForHydrationPrefetchStrategy } from '../src/hydration/runtime'
+import type { HydrationPrefetchStrategy } from '../src/hydration/types'
+
+describe('waitForHydrationPrefetchStrategy', () => {
+ it('cleans up a strategy that finishes during synchronous setup', async () => {
+ const abortController = new AbortController()
+ const cleanupHydrate = vi.fn()
+ const cleanupStrategy = vi.fn()
+ let hydrate = () => {}
+
+ const strategy: HydrationPrefetchStrategy = {
+ _s: ({ prefetch }) => {
+ prefetch?.()
+ return cleanupStrategy
+ },
+ }
+
+ const result = waitForHydrationPrefetchStrategy(strategy, {
+ element: null,
+ signal: abortController.signal,
+ onHydrate: (listener) => {
+ hydrate = listener
+ return cleanupHydrate
+ },
+ })
+
+ await expect(result).resolves.toBe('prefetch')
+ expect(cleanupHydrate).toHaveBeenCalledTimes(1)
+ expect(cleanupStrategy).toHaveBeenCalledTimes(1)
+
+ hydrate()
+ abortController.abort()
+ expect(cleanupHydrate).toHaveBeenCalledTimes(1)
+ expect(cleanupStrategy).toHaveBeenCalledTimes(1)
+ })
+
+ it.each([
+ ['abort', 'abort'],
+ ['hydrate', 'hydrate'],
+ ] as const)(
+ 'settles an abort/hydrate race with %s first and cleans up once',
+ async (winner, expectedReason) => {
+ const abortController = new AbortController()
+ const cleanupHydrate = vi.fn()
+ const cleanupStrategy = vi.fn()
+ let hydrate = () => {}
+ let prefetch = () => {}
+
+ const strategy: HydrationPrefetchStrategy = {
+ _s: (context) => {
+ prefetch = context.prefetch ?? (() => {})
+ return cleanupStrategy
+ },
+ }
+
+ const result = waitForHydrationPrefetchStrategy(strategy, {
+ element: null,
+ signal: abortController.signal,
+ onHydrate: (listener) => {
+ hydrate = listener
+ return cleanupHydrate
+ },
+ })
+
+ if (winner === 'abort') {
+ abortController.abort()
+ hydrate()
+ } else {
+ hydrate()
+ abortController.abort()
+ }
+ prefetch()
+
+ await expect(result).resolves.toBe(expectedReason)
+ expect(cleanupHydrate).toHaveBeenCalledTimes(1)
+ expect(cleanupStrategy).toHaveBeenCalledTimes(1)
+ },
+ )
+
+ it('does not set up a strategy when the signal is already aborted', async () => {
+ const abortController = new AbortController()
+ abortController.abort()
+ const setup = vi.fn()
+ const onHydrate = vi.fn()
+
+ const result = waitForHydrationPrefetchStrategy(
+ { _s: setup },
+ {
+ element: null,
+ signal: abortController.signal,
+ onHydrate,
+ },
+ )
+
+ await expect(result).resolves.toBe('abort')
+ expect(setup).not.toHaveBeenCalled()
+ expect(onHydrate).not.toHaveBeenCalled()
+ })
+})
diff --git a/packages/start-client-core/tests/hydration-visible.test.ts b/packages/start-client-core/tests/hydration-visible.test.ts
new file mode 100644
index 00000000000..c0fbac0dfd9
--- /dev/null
+++ b/packages/start-client-core/tests/hydration-visible.test.ts
@@ -0,0 +1,127 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { visible } from '../src/hydration/visible'
+import type { HydrationPrefetchStrategy } from '../src/hydration/types'
+
+class IntersectionObserverMock implements IntersectionObserver {
+ readonly root: Document | Element | null
+ readonly rootMargin: string
+ readonly scrollMargin: string
+ readonly thresholds: ReadonlyArray
+ readonly observe = vi.fn((_target: Element) => {})
+ readonly unobserve = vi.fn((_target: Element) => {})
+ readonly disconnect = vi.fn(() => {})
+
+ constructor(
+ readonly callback: IntersectionObserverCallback,
+ options: IntersectionObserverInit = {},
+ ) {
+ this.root = options.root ?? null
+ this.rootMargin = options.rootMargin ?? '0px'
+ this.scrollMargin = options.scrollMargin ?? '0px'
+ this.thresholds = Array.isArray(options.threshold)
+ ? options.threshold
+ : [options.threshold ?? 0]
+ }
+
+ takeRecords(): Array {
+ return []
+ }
+
+ emit(target: Element, isIntersecting = true) {
+ this.callback(
+ [{ target, isIntersecting } as IntersectionObserverEntry],
+ this,
+ )
+ }
+}
+
+describe('visible hydration strategy', () => {
+ let observers: Array
+ const cleanups: Array<() => void> = []
+
+ beforeEach(() => {
+ observers = []
+ vi.stubGlobal(
+ 'IntersectionObserver',
+ class extends IntersectionObserverMock {
+ constructor(
+ callback: IntersectionObserverCallback,
+ options?: IntersectionObserverInit,
+ ) {
+ super(callback, options)
+ observers.push(this)
+ }
+ },
+ )
+ })
+
+ afterEach(() => {
+ cleanups.splice(0).forEach((cleanup) => cleanup())
+ vi.unstubAllGlobals()
+ })
+
+ function observe(
+ strategy: HydrationPrefetchStrategy,
+ element: Element,
+ callback: () => void,
+ ) {
+ const cleanup = strategy._s?.({ element, prefetch: callback })
+ if (cleanup) {
+ cleanups.push(cleanup)
+ }
+ return cleanup
+ }
+
+ it('shares an observer and tracks multiple callbacks for one element', () => {
+ const element = document.createElement('div')
+ const first = vi.fn()
+ const second = vi.fn()
+ const strategy = visible({ rootMargin: '25px', threshold: [0, 0.5] })
+
+ const cleanupFirst = observe(strategy, element, first)
+ observe(strategy, element, second)
+
+ expect(observers).toHaveLength(1)
+ expect(observers[0]!.observe).toHaveBeenCalledOnce()
+ expect(observers[0]!.observe).toHaveBeenCalledWith(element)
+
+ cleanupFirst?.()
+ observers[0]!.emit(element)
+
+ expect(first).not.toHaveBeenCalled()
+ expect(second).toHaveBeenCalledOnce()
+ expect(observers[0]!.unobserve).toHaveBeenCalledOnce()
+ expect(observers[0]!.unobserve).toHaveBeenCalledWith(element)
+ expect(observers[0]!.disconnect).toHaveBeenCalledOnce()
+ })
+
+ it('keeps a shared observer until every element is cleaned up', () => {
+ const firstElement = document.createElement('div')
+ const secondElement = document.createElement('div')
+ const options = { rootMargin: '50px', threshold: 0.25 }
+
+ const cleanupFirst = observe(visible(options), firstElement, vi.fn())
+ const cleanupSecond = observe(visible(options), secondElement, vi.fn())
+
+ expect(observers).toHaveLength(1)
+ expect(observers[0]!.observe).toHaveBeenCalledTimes(2)
+
+ cleanupFirst?.()
+ expect(observers[0]!.unobserve).toHaveBeenCalledWith(firstElement)
+ expect(observers[0]!.disconnect).not.toHaveBeenCalled()
+
+ cleanupSecond?.()
+ expect(observers[0]!.unobserve).toHaveBeenCalledWith(secondElement)
+ expect(observers[0]!.disconnect).toHaveBeenCalledOnce()
+
+ const cleanupThird = observe(
+ visible(options),
+ document.createElement('div'),
+ vi.fn(),
+ )
+ expect(observers).toHaveLength(2)
+
+ cleanupThird?.()
+ expect(observers[1]!.disconnect).toHaveBeenCalledOnce()
+ })
+})
diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md
index b7b0ff96da8..8b3f704c2d4 100644
--- a/packages/start-plugin-core/CHANGELOG.md
+++ b/packages/start-plugin-core/CHANGELOG.md
@@ -1,5 +1,75 @@
# @tanstack/start-plugin-core
+## 1.171.34
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+ - @tanstack/router-generator@1.167.28
+ - @tanstack/router-plugin@1.168.30
+ - @tanstack/start-server-core@1.169.26
+
+## 1.171.33
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+ - @tanstack/router-generator@1.167.27
+ - @tanstack/router-plugin@1.168.29
+ - @tanstack/start-server-core@1.169.25
+
+## 1.171.32
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+ - @tanstack/router-generator@1.167.26
+ - @tanstack/router-plugin@1.168.28
+ - @tanstack/start-server-core@1.169.24
+
+## 1.171.31
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/start-server-core@1.169.23
+ - @tanstack/router-generator@1.167.25
+
+## 1.171.30
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+ - @tanstack/router-generator@1.167.25
+ - @tanstack/router-plugin@1.168.27
+ - @tanstack/start-server-core@1.169.22
+
+## 1.171.29
+
+### Patch Changes
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+ - @tanstack/start-server-core@1.169.21
+ - @tanstack/router-generator@1.167.24
+ - @tanstack/router-plugin@1.168.26
+
+## 1.171.28
+
+### Patch Changes
+
+- [#7962](https://github.com/TanStack/router/pull/7962) [`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5) - Update Seroval dependencies to version 1.6.2.
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+ - @tanstack/start-server-core@1.169.20
+ - @tanstack/router-generator@1.167.23
+ - @tanstack/router-plugin@1.168.25
+
## 1.171.27
### Patch Changes
diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json
index 3aa6a3ef9a8..493e418f4e5 100644
--- a/packages/start-plugin-core/package.json
+++ b/packages/start-plugin-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/start-plugin-core",
- "version": "1.171.27",
+ "version": "1.171.34",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -97,7 +97,7 @@
"lightningcss": "^1.32.0",
"pathe": "^2.0.3",
"picomatch": "^4.0.3",
- "seroval": "^1.5.4",
+ "seroval": "^1.6.2",
"source-map": "^0.7.6",
"srvx": "^0.11.9",
"tinyglobby": "^0.2.15",
diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md
index f7869e4737e..e13c8fd7371 100644
--- a/packages/start-server-core/CHANGELOG.md
+++ b/packages/start-server-core/CHANGELOG.md
@@ -1,5 +1,73 @@
# @tanstack/start-server-core
+## 1.169.26
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+ - @tanstack/start-client-core@1.170.22
+ - @tanstack/start-storage-context@1.167.24
+
+## 1.169.25
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+ - @tanstack/start-client-core@1.170.21
+ - @tanstack/start-storage-context@1.167.23
+
+## 1.169.24
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`c59788c`](https://github.com/TanStack/router/commit/c59788ca20f2d2e7f264a859ebe01b7646ba3154), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+ - @tanstack/start-client-core@1.170.20
+ - @tanstack/start-storage-context@1.167.22
+
+## 1.169.23
+
+### Patch Changes
+
+- Updated dependencies [[`2fbc99f`](https://github.com/TanStack/router/commit/2fbc99f2c262b057cb957e6ebba1ee073c655186), [`6bede65`](https://github.com/TanStack/router/commit/6bede65d7074dcd83455151b66b4574268bc782c)]:
+ - @tanstack/start-client-core@1.170.19
+
+## 1.169.22
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+ - @tanstack/start-client-core@1.170.18
+ - @tanstack/start-storage-context@1.167.21
+
+## 1.169.21
+
+### Patch Changes
+
+- [#7967](https://github.com/TanStack/router/pull/7967) [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c) - Preserve path params in their raw string form while matching routes so structured values returned by `params.parse` produce stable match IDs and do not reuse stale loader data.
+
+ `RouterCore.getMatchedRoutes()` now returns `[matchedRoutes, rawParams, foundRoute]` instead of an object.
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+ - @tanstack/start-client-core@1.170.17
+ - @tanstack/history@1.162.1
+ - @tanstack/start-storage-context@1.167.20
+
+## 1.169.20
+
+### Patch Changes
+
+- [#7962](https://github.com/TanStack/router/pull/7962) [`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5) - Update Seroval dependencies to version 1.6.2.
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+ - @tanstack/start-client-core@1.170.16
+ - @tanstack/start-storage-context@1.167.19
+
## 1.169.19
### Patch Changes
diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json
index ac8787c47a5..9f8a192765d 100644
--- a/packages/start-server-core/package.json
+++ b/packages/start-server-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/start-server-core",
- "version": "1.169.19",
+ "version": "1.169.26",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -105,7 +105,7 @@
"@tanstack/start-storage-context": "workspace:*",
"fetchdts": "^0.1.6",
"h3-v2": "npm:h3@2.0.1-rc.20",
- "seroval": "^1.5.4"
+ "seroval": "^1.6.2"
},
"devDependencies": {
"@standard-schema/spec": "^1.0.0",
diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts
index 20c47631379..c7b427bfb1f 100644
--- a/packages/start-server-core/src/createStartHandler.ts
+++ b/packages/start-server-core/src/createStartHandler.ts
@@ -893,10 +893,10 @@ async function handleServerRoutes({
// this will perform a fuzzy match, however for server routes we need an exact match
// if the route is not an exact match, executeRouter will handle rendering the app router
// the match will be cached internally, so no extra work is done during the app router render
- const { matchedRoutes, foundRoute, routeParams } =
+ const [matchedRoutes, rawParams, foundRoute] =
router.getMatchedRoutes(pathname)
- const isExactMatch = foundRoute && routeParams['**'] === undefined
+ const isExactMatch = foundRoute && rawParams['**'] === undefined
// Collect and dedupe route middlewares
const routeMiddlewares: Array = []
@@ -964,7 +964,7 @@ async function handleServerRoutes({
{
request,
context,
- params: routeParams,
+ params: rawParams,
pathname,
handlerType: 'router',
},
diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md
index 6118173acfa..0ee47621aa8 100644
--- a/packages/start-static-server-functions/CHANGELOG.md
+++ b/packages/start-static-server-functions/CHANGELOG.md
@@ -1,5 +1,70 @@
# @tanstack/start-static-server-functions
+## 1.167.27
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/start-client-core@1.170.22
+ - @tanstack/react-start@1.168.43
+ - @tanstack/solid-start@1.168.42
+
+## 1.167.26
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/start-client-core@1.170.21
+ - @tanstack/react-start@1.168.42
+ - @tanstack/solid-start@1.168.41
+
+## 1.167.25
+
+### Patch Changes
+
+- Updated dependencies [[`c59788c`](https://github.com/TanStack/router/commit/c59788ca20f2d2e7f264a859ebe01b7646ba3154)]:
+ - @tanstack/start-client-core@1.170.20
+ - @tanstack/react-start@1.168.41
+ - @tanstack/solid-start@1.168.40
+
+## 1.167.24
+
+### Patch Changes
+
+- Updated dependencies [[`2fbc99f`](https://github.com/TanStack/router/commit/2fbc99f2c262b057cb957e6ebba1ee073c655186), [`6bede65`](https://github.com/TanStack/router/commit/6bede65d7074dcd83455151b66b4574268bc782c)]:
+ - @tanstack/start-client-core@1.170.19
+ - @tanstack/react-start@1.168.40
+ - @tanstack/solid-start@1.168.39
+
+## 1.167.23
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/react-start@1.168.39
+ - @tanstack/start-client-core@1.170.18
+ - @tanstack/solid-start@1.168.38
+
+## 1.167.22
+
+### Patch Changes
+
+- Updated dependencies [[`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b)]:
+ - @tanstack/start-client-core@1.170.17
+ - @tanstack/react-start@1.168.38
+ - @tanstack/solid-start@1.168.37
+
+## 1.167.21
+
+### Patch Changes
+
+- [#7962](https://github.com/TanStack/router/pull/7962) [`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5) - Update Seroval dependencies to version 1.6.2.
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/start-client-core@1.170.16
+ - @tanstack/react-start@1.168.37
+ - @tanstack/solid-start@1.168.36
+
## 1.167.20
### Patch Changes
diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json
index c828bd7a196..3eb2236f626 100644
--- a/packages/start-static-server-functions/package.json
+++ b/packages/start-static-server-functions/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/start-static-server-functions",
- "version": "1.167.20",
+ "version": "1.167.27",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
@@ -60,7 +60,7 @@
},
"dependencies": {
"@tanstack/start-client-core": "workspace:*",
- "seroval": "^1.5.4"
+ "seroval": "^1.6.2"
},
"devDependencies": {
"vite": "*",
diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md
index da8b12f4d46..c99fa652a46 100644
--- a/packages/start-storage-context/CHANGELOG.md
+++ b/packages/start-storage-context/CHANGELOG.md
@@ -1,5 +1,47 @@
# @tanstack/start-storage-context
+## 1.167.24
+
+### Patch Changes
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+
+## 1.167.23
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+
+## 1.167.22
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+
+## 1.167.21
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+
+## 1.167.20
+
+### Patch Changes
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+
+## 1.167.19
+
+### Patch Changes
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+
## 1.167.18
### Patch Changes
diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json
index 31c243b74bb..d90f909a188 100644
--- a/packages/start-storage-context/package.json
+++ b/packages/start-storage-context/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/start-storage-context",
- "version": "1.167.18",
+ "version": "1.167.24",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md
index a15a0a7eaa7..aa84fc434ce 100644
--- a/packages/vue-router/CHANGELOG.md
+++ b/packages/vue-router/CHANGELOG.md
@@ -1,5 +1,64 @@
# @tanstack/vue-router
+## 1.170.24
+
+### Patch Changes
+
+- [#8045](https://github.com/TanStack/router/pull/8045) [`f500760`](https://github.com/TanStack/router/commit/f5007607d62e932b8df19de866cdc6bddcff8db3) - Warn when an Outlet is rendered inside a pending, error, or not-found component.
+
+- [#8043](https://github.com/TanStack/router/pull/8043) [`1aafca9`](https://github.com/TanStack/router/commit/1aafca9b45d24f8f0dba78e716fc9582346c6ca1) - remove the undocumented Link `isTransitioning` state and `data-transitioning` attribute
+
+- [#8044](https://github.com/TanStack/router/pull/8044) [`aa10b65`](https://github.com/TanStack/router/commit/aa10b6589eeda215f5a60ea0af95a3101d8c414e) - Apply `preloadDelay` to viewport link preloading and cancel pending preloads when links leave the viewport.
+
+- Updated dependencies [[`7e93431`](https://github.com/TanStack/router/commit/7e93431ae9ff58c91c3c5ca10ffcb8414c1d0b13)]:
+ - @tanstack/router-core@1.171.22
+
+## 1.170.23
+
+### Patch Changes
+
+- Updated dependencies [[`51138a8`](https://github.com/TanStack/router/commit/51138a824cea053738f125c4c95073bd6286ff05)]:
+ - @tanstack/router-core@1.171.21
+
+## 1.170.22
+
+### Patch Changes
+
+- Updated dependencies [[`44a8c3e`](https://github.com/TanStack/router/commit/44a8c3e1d2af305064b2363d97fc7847c6f1a246), [`5253e70`](https://github.com/TanStack/router/commit/5253e70db2083d68a788fb7c9a043bb0c5518f2a)]:
+ - @tanstack/router-core@1.171.20
+
+## 1.170.21
+
+### Patch Changes
+
+- Updated dependencies [[`ea3a665`](https://github.com/TanStack/router/commit/ea3a665d81cbb5074c2d77ec953255ab534e7db9)]:
+ - @tanstack/router-core@1.171.19
+
+## 1.170.20
+
+### Patch Changes
+
+- [#7970](https://github.com/TanStack/router/pull/7970) [`2435885`](https://github.com/TanStack/router/commit/2435885fa8b5e31c8c4b74d93920919f27316ebf) - createFileRoute does not rely on FileRoute class
+
+- [#7985](https://github.com/TanStack/router/pull/7985) [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b) - perf: compact private bundle boundaries- [#7975](https://github.com/TanStack/router/issues/7975)
+
+- [#7971](https://github.com/TanStack/router/pull/7971) [`86bf510`](https://github.com/TanStack/router/commit/86bf510c2923afb76804223bd04afc2a809b33e7) - clean intersection observer options in link component
+
+- [#7967](https://github.com/TanStack/router/pull/7967) [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c) - Preserve path params in their raw string form while matching routes so structured values returned by `params.parse` produce stable match IDs and do not reuse stale loader data.
+
+ `RouterCore.getMatchedRoutes()` now returns `[matchedRoutes, rawParams, foundRoute]` instead of an object.
+
+- Updated dependencies [[`84db4a8`](https://github.com/TanStack/router/commit/84db4a842311df3f7e58073f6f12aaf371aeb5c7), [`9cac62a`](https://github.com/TanStack/router/commit/9cac62a5c7f99ef070991ea6f1fa7e42c746d46b), [`6aefb33`](https://github.com/TanStack/router/commit/6aefb3392595a07a93f89301d7b5e3558ff9190c)]:
+ - @tanstack/router-core@1.171.18
+ - @tanstack/history@1.162.1
+
+## 1.170.19
+
+### Patch Changes
+
+- Updated dependencies [[`b2908c6`](https://github.com/TanStack/router/commit/b2908c642ac09aa08e6d965d2a820d7186e42fd5)]:
+ - @tanstack/router-core@1.171.17
+
## 1.170.18
### Patch Changes
diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json
index 5d61f81e725..e16852285c2 100644
--- a/packages/vue-router/package.json
+++ b/packages/vue-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/vue-router",
- "version": "1.170.18",
+ "version": "1.170.24",
"description": "Modern and scalable routing for Vue applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/vue-router/src/CatchBoundary.tsx b/packages/vue-router/src/CatchBoundary.tsx
index e9124451586..d170e6fb1a1 100644
--- a/packages/vue-router/src/CatchBoundary.tsx
+++ b/packages/vue-router/src/CatchBoundary.tsx
@@ -1,4 +1,5 @@
import * as Vue from 'vue'
+import { renderInNonRouteComponentContext } from './nonRouteComponentContext'
import type { ErrorRouteComponent } from './route'
type CatchBoundaryProps = {
@@ -49,13 +50,25 @@ const VueErrorBoundary = Vue.defineComponent({
return false
})
- return () =>
- error.value
- ? Vue.h(props.errorComponent ?? ErrorComponent, {
- error: error.value,
- reset,
- })
- : (props.children as Vue.VNode)
+ return () => {
+ if (!error.value) {
+ return props.children as Vue.VNode
+ }
+
+ const errorComponent = props.errorComponent ?? ErrorComponent
+ const errorProps = {
+ error: error.value,
+ reset,
+ }
+
+ return process.env.NODE_ENV !== 'production'
+ ? renderInNonRouteComponentContext(
+ errorComponent,
+ errorProps,
+ 'errorComponent',
+ )
+ : Vue.h(errorComponent, errorProps)
+ }
},
})
diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx
index 96d81970a51..0a643447f02 100644
--- a/packages/vue-router/src/Match.tsx
+++ b/packages/vue-router/src/Match.tsx
@@ -9,6 +9,10 @@ import { CatchNotFound } from './not-found'
import { routeIdContext } from './matchContext'
import { renderRouteNotFound } from './renderRouteNotFound'
import { ScrollRestoration } from './scroll-restoration'
+import {
+ nonRouteComponentContext,
+ renderInNonRouteComponentContext,
+} from './nonRouteComponentContext'
import type { VNode } from 'vue'
import type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'
@@ -41,7 +45,13 @@ export const Match = Vue.defineComponent({
route?.options.pendingComponent ??
router.options.defaultPendingComponent
const pendingElement = PendingComponent
- ? Vue.h(PendingComponent)
+ ? process.env.NODE_ENV !== 'production'
+ ? renderInNonRouteComponentContext(
+ PendingComponent,
+ undefined,
+ 'pendingComponent',
+ )
+ : Vue.h(PendingComponent)
: undefined
const routeErrorComponent =
route?.options.errorComponent ?? router.options.defaultErrorComponent
@@ -81,7 +91,13 @@ export const Match = Vue.defineComponent({
throw error
}
- return Vue.h(routeNotFoundComponent, error)
+ return process.env.NODE_ENV !== 'production'
+ ? renderInNonRouteComponentContext(
+ routeNotFoundComponent,
+ error,
+ 'notFoundComponent',
+ )
+ : Vue.h(routeNotFoundComponent, error)
},
children: content,
})
@@ -160,19 +176,18 @@ export const MatchInner = Vue.defineComponent({
(router.routesById[matchRouteId] as AnyRoute).options.remountDeps ??
router.options.defaultRemountDeps
- const remountDeps = remountFn
- ? remountFn({
- routeId: matchRouteId,
- loaderDeps: match.loaderDeps,
- params: match._strictParams,
- search: match._strictSearch,
- })
+ const remountKey = remountFn
+ ? JSON.stringify(
+ remountFn({
+ routeId: matchRouteId,
+ loaderDeps: match.loaderDeps,
+ params: match._strictParams,
+ search: match._strictSearch,
+ }),
+ )
: undefined
- return [
- match,
- remountDeps ? JSON.stringify(remountDeps) : undefined,
- ] as const
+ return [match, remountKey] as const
})
return (): VNode | null => {
@@ -197,7 +212,7 @@ export const MatchInner = Vue.defineComponent({
// If this route has an error component, render it directly
// This is more reliable than relying on Vue's error boundary
if (RouteErrorComponent) {
- return Vue.h(RouteErrorComponent, {
+ const errorProps = {
error: match.error,
reset: () => {
router.invalidate()
@@ -205,7 +220,14 @@ export const MatchInner = Vue.defineComponent({
info: {
componentStack: '',
},
- })
+ }
+ return process.env.NODE_ENV !== 'production'
+ ? renderInNonRouteComponentContext(
+ RouteErrorComponent,
+ errorProps,
+ 'errorComponent',
+ )
+ : Vue.h(RouteErrorComponent, errorProps)
}
// If there's no error component for this route, throw the error
@@ -221,7 +243,13 @@ export const MatchInner = Vue.defineComponent({
router.options.defaultPendingComponent
if (PendingComponent) {
- return Vue.h(PendingComponent)
+ return process.env.NODE_ENV !== 'production'
+ ? renderInNonRouteComponentContext(
+ PendingComponent,
+ undefined,
+ 'pendingComponent',
+ )
+ : Vue.h(PendingComponent)
}
// If no pending component, return null while loading
@@ -249,6 +277,21 @@ export const MatchInner = Vue.defineComponent({
export const Outlet = Vue.defineComponent({
name: 'Outlet',
setup() {
+ if (process.env.NODE_ENV !== 'production') {
+ const nonRouteComponent = Vue.inject(nonRouteComponentContext!, undefined)
+ if (nonRouteComponent) {
+ Vue.watch(
+ nonRouteComponent,
+ (component) => {
+ console.warn(
+ `Warning: An
- assetScripts: Array
- mounted: boolean
- nonce?: string
-}
-
export const Scripts = Vue.defineComponent({
name: 'Scripts',
setup() {
@@ -53,20 +46,19 @@ export const Scripts = Vue.defineComponent({
})
return () => {
- const [userScripts, assetScripts] = scripts.value
- return renderScripts(router, {
- scripts: userScripts,
- assetScripts,
- mounted: mounted.value,
- nonce,
- })
+ return renderScripts(router, scripts.value, mounted.value, nonce)
}
},
})
function renderScripts(
router: ReturnType,
- { scripts, assetScripts, mounted, nonce }: ScriptsRenderState,
+ [scripts, assetScripts]: readonly [
+ Array,
+ Array,
+ ],
+ mounted: boolean,
+ nonce?: string,
) {
const allScripts: Array = []
diff --git a/packages/vue-router/src/fileRoute.ts b/packages/vue-router/src/fileRoute.ts
index 672328b5607..0e0b6c8368f 100644
--- a/packages/vue-router/src/fileRoute.ts
+++ b/packages/vue-router/src/fileRoute.ts
@@ -43,11 +43,14 @@ export function createFileRoute<
TFullPath extends RouteConstraints['TFullPath'] =
FileRoutesByPath[TFilePath]['fullPath'],
>(
+ // eslint-disable-next-line unused-imports/no-unused-vars
path?: TFilePath,
): FileRoute['createRoute'] {
- return new FileRoute(path, {
- silent: true,
- }).createRoute
+ return (options) => {
+ const route = createRoute(options as any)
+ ;(route as any).isRoot = false
+ return route as any
+ }
}
/**
diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx
index 3a5a9875a82..ccff4e90060 100644
--- a/packages/vue-router/src/link.tsx
+++ b/packages/vue-router/src/link.tsx
@@ -29,7 +29,7 @@ import type {
type EventHandler = (e: TEvent) => void
-const timeoutMap = new WeakMap>()
+const timeoutMap = new WeakMap>()
type DataAttributes = {
[K in `data-${string}`]?: unknown
@@ -58,6 +58,17 @@ type VueStyleLinkEventHandlers = {
onTouchstart?: EventHandler
}
+type LinkEventHandlers = {
+ onClick: EventHandler
+ onBlur: EventHandler
+ onFocus: EventHandler
+ onMouseenter: EventHandler
+ onMouseleave: EventHandler
+ onMouseover: EventHandler
+ onMouseout: EventHandler
+ onTouchstart: EventHandler
+}
+
interface StyledProps {
class?: LinkHTMLAttributes['class']
style?: LinkHTMLAttributes['style']
@@ -73,7 +84,9 @@ type PropsOfComponent =
? P
: Record