()
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/__root.tsx
new file mode 100644
index 0000000000..28dd4e847a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/__root.tsx
@@ -0,0 +1,53 @@
+import * as Vue from 'vue'
+import { Link, Outlet, createRootRoute } from '@tanstack/vue-router'
+import { leafParamSets, midParams } from '../../../shared'
+
+const RootComponent = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+ >
+ )
+ },
+})
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/index.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/index.tsx
new file mode 100644
index 0000000000..f3ffc58610
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const HomePage = Vue.defineComponent({
+ setup() {
+ return () => home
+ },
+})
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx
new file mode 100644
index 0000000000..756c31e1a9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx
@@ -0,0 +1,86 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.h),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.h}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxH,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxH * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelH = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+ return () => (
+ <>
+
+
+
+
+
+ {[
+ params.value.a,
+ params.value.b,
+ params.value.c,
+ params.value.d,
+ params.value.e,
+ params.value.f,
+ params.value.g,
+ params.value.h,
+ ].join('.')}
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f/$g/$h')({
+ params: {
+ parse: (params) => ({ ...params, h: normalizeParam(params.h) }),
+ stringify: (params) => ({ ...params, h: String(params.h) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxH: smallHash(params.h) }),
+ component: LevelH,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx
new file mode 100644
index 0000000000..d6b9ccde83
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.g),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.g}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxG,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxG * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelG = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f/$g')({
+ params: {
+ parse: (params) => ({ ...params, g: normalizeParam(params.g) }),
+ stringify: (params) => ({ ...params, g: String(params.g) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxG: smallHash(params.g) }),
+ component: LevelG,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.tsx
new file mode 100644
index 0000000000..76ed24904c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.$f.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.f),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.f}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxF,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxF * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelF = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f')({
+ params: {
+ parse: (params) => ({ ...params, f: normalizeParam(params.f) }),
+ stringify: (params) => ({ ...params, f: String(params.f) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxF: smallHash(params.f) }),
+ component: LevelF,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.tsx
new file mode 100644
index 0000000000..e24d3dc373
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.$e.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.e),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.e}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxE,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxE * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelE = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c/$d/$e')({
+ params: {
+ parse: (params) => ({ ...params, e: normalizeParam(params.e) }),
+ stringify: (params) => ({ ...params, e: String(params.e) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxE: smallHash(params.e) }),
+ component: LevelE,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.tsx
new file mode 100644
index 0000000000..7785638ee7
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.$d.tsx
@@ -0,0 +1,83 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.d),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.d}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxD,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxD * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelD = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+ return () => (
+ <>
+
+
+
+
+
+ {[
+ params.value.a,
+ params.value.b,
+ params.value.c,
+ params.value.d,
+ ].join('.')}
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c/$d')({
+ params: {
+ parse: (params) => ({ ...params, d: normalizeParam(params.d) }),
+ stringify: (params) => ({ ...params, d: String(params.d) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxD: smallHash(params.d) }),
+ component: LevelD,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.tsx
new file mode 100644
index 0000000000..0d0adc65ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.$c.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.c),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.c}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxC,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxC * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelC = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b/$c')({
+ params: {
+ parse: (params) => ({ ...params, c: normalizeParam(params.c) }),
+ stringify: (params) => ({ ...params, c: String(params.c) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxC: smallHash(params.c) }),
+ component: LevelC,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.tsx
new file mode 100644
index 0000000000..f013d865af
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.$b.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.b),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.b}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxB,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxB * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelB = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a/$b')({
+ params: {
+ parse: (params) => ({ ...params, b: normalizeParam(params.b) }),
+ stringify: (params) => ({ ...params, b: String(params.b) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxB: smallHash(params.b) }),
+ component: LevelB,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.tsx b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.tsx
new file mode 100644
index 0000000000..d5764c0985
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/src/routes/l.$a.tsx
@@ -0,0 +1,74 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { normalizeParam, smallHash } from '../../../shared'
+
+const ParamsSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(params.a),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ParamsSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useParams({
+ select: (params) => smallHash(`${params.a}:2`),
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberOne = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => context.ctxA,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const ContextSubscriberTwo = Vue.defineComponent({
+ setup() {
+ const value = Route.useRouteContext({
+ select: (context) => (context.ctxA * 31 + 7) >>> 0,
+ })
+ return () => {
+ void value.value
+ return null
+ }
+ },
+})
+
+const LevelA = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+
+
+
+ >
+ )
+ },
+})
+
+export const Route = createFileRoute('/l/$a')({
+ params: {
+ parse: (params) => ({ ...params, a: normalizeParam(params.a) }),
+ stringify: (params) => ({ ...params, a: String(params.a) }),
+ },
+ beforeLoad: ({ params }) => ({ ctxA: smallHash(params.a) }),
+ component: LevelA,
+})
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/tsconfig.json b/benchmarks/client-nav/scenarios/nested-params/vue/tsconfig.json
new file mode 100644
index 0000000000..7786fc3da9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "vue",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/vite.config.ts b/benchmarks/client-nav/scenarios/nested-params/vue/vite.config.ts
new file mode 100644
index 0000000000..59a4af48ef
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/nested-params/vue/vite.config.ts
@@ -0,0 +1,42 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'vue',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ vue(),
+ vueJsx(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav nested-params (vue)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/preload/react/project.json b/benchmarks/client-nav/scenarios/preload/react/project.json
new file mode 100644
index 0000000000..f095228746
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-preload-react",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/preload/react/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/setup.ts b/benchmarks/client-nav/scenarios/preload/react/setup.ts
new file mode 100644
index 0000000000..5409df903c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, scenarioSteps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'React',
+ mount: mountTestApp,
+ steps: scenarioSteps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts
new file mode 100644
index 0000000000..c869ebdcfb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-preload', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-preload interaction loop (react)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/preload/react/speed.flame.ts b/benchmarks/client-nav/scenarios/preload/react/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/main.tsx b/benchmarks/client-nav/scenarios/preload/react/src/main.tsx
new file mode 100644
index 0000000000..6f8942c118
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/main.tsx
@@ -0,0 +1,38 @@
+import { RouterProvider, createRouter } from '@tanstack/react-router'
+import { createRoot } from 'react-dom/client'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultPreload: 'intent',
+ defaultPreloadDelay: 0,
+ defaultPreloadStaleTime: 0,
+ })
+}
+
+declare module '@tanstack/react-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const reactRoot = createRoot(container)
+ reactRoot.render()
+
+ return {
+ router,
+ unmount() {
+ reactRoot.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/react/src/routeTree.gen.ts
new file mode 100644
index 0000000000..0c76e85974
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as DocsRouteImport } from './routes/docs'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SectionsSectionRouteImport } from './routes/sections.$section'
+
+const DocsRoute = DocsRouteImport.update({
+ id: '/docs',
+ path: '/docs',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SectionsSectionRoute = SectionsSectionRouteImport.update({
+ id: '/sections/$section',
+ path: '/sections/$section',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/docs' | '/sections/$section'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/docs' | '/sections/$section'
+ id: '__root__' | '/' | '/docs' | '/sections/$section'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ DocsRoute: typeof DocsRoute
+ SectionsSectionRoute: typeof SectionsSectionRoute
+}
+
+declare module '@tanstack/react-router' {
+ interface FileRoutesByPath {
+ '/docs': {
+ id: '/docs'
+ path: '/docs'
+ fullPath: '/docs'
+ preLoaderRoute: typeof DocsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sections/$section': {
+ id: '/sections/$section'
+ path: '/sections/$section'
+ fullPath: '/sections/$section'
+ preLoaderRoute: typeof SectionsSectionRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ DocsRoute: DocsRoute,
+ SectionsSectionRoute: SectionsSectionRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/preload/react/src/routes/__root.tsx
new file mode 100644
index 0000000000..b659fe4d26
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/routes/__root.tsx
@@ -0,0 +1,32 @@
+import { Link, Outlet, createRootRoute } from '@tanstack/react-router'
+import { sections } from '../../../shared'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+function RootComponent() {
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/routes/docs.tsx b/benchmarks/client-nav/scenarios/preload/react/src/routes/docs.tsx
new file mode 100644
index 0000000000..1f87530bac
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/routes/docs.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/react-router'
+import { docsMarker } from '../../../shared'
+
+export const Route = createFileRoute('/docs')({
+ component: DocsPage,
+})
+
+function DocsPage() {
+ return (
+
+ {docsMarker}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/routes/index.tsx b/benchmarks/client-nav/scenarios/preload/react/src/routes/index.tsx
new file mode 100644
index 0000000000..2b8c83ebab
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/routes/index.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/react-router'
+import { homeMarker } from '../../../shared'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ {homeMarker}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/src/routes/sections.$section.tsx b/benchmarks/client-nav/scenarios/preload/react/src/routes/sections.$section.tsx
new file mode 100644
index 0000000000..42962b8be7
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/src/routes/sections.$section.tsx
@@ -0,0 +1,32 @@
+import { createFileRoute } from '@tanstack/react-router'
+import { sectionItems } from '../../../shared'
+
+export const Route = createFileRoute('/sections/$section')({
+ loader: ({ params }) => {
+ const items = sectionItems(params.section)
+ const checksum = items.reduce(
+ (sum, item) => (sum + item.value) % 1_000_000_007,
+ 0,
+ )
+ return { items, checksum }
+ },
+ staleTime: 0,
+ gcTime: 0,
+ component: SectionPage,
+})
+
+function SectionPage() {
+ const params = Route.useParams()
+ const data = Route.useLoaderData()
+
+ return (
+
+ {`${params.section}:${data.checksum}`}
+
+ {data.items.map((item) => (
+ - {`${item.name}=${item.value}`}
+ ))}
+
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/tsconfig.json b/benchmarks/client-nav/scenarios/preload/react/tsconfig.json
new file mode 100644
index 0000000000..1d59cbb450
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "jsxImportSource": "react",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/preload/react/vite.config.ts b/benchmarks/client-nav/scenarios/preload/react/vite.config.ts
new file mode 100644
index 0000000000..ff51686959
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/react/vite.config.ts
@@ -0,0 +1,40 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import react from '@vitejs/plugin-react'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'react',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ react(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav preload (react)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/preload/shared.ts b/benchmarks/client-nav/scenarios/preload/shared.ts
new file mode 100644
index 0000000000..d061f99451
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/shared.ts
@@ -0,0 +1,119 @@
+/**
+ * Shared definition of the `preload` scenario: intent preloading via link
+ * hover, programmatic `router.preloadRoute`, and commit-time preload-cache
+ * maintenance. The router is configured with `defaultPreload: 'intent'`,
+ * `defaultPreloadDelay: 0` (no wall-clock debounce timer) and
+ * `defaultPreloadStaleTime: 0` — the default 30s wall-clock threshold would
+ * flip cache-hit behavior mid-run; with 0 every hover re-runs the preload
+ * work, keeping the loop stationary.
+ *
+ * Hover-intent preloading was verified manually per adapter (standalone jsdom
+ * run inspecting the router's cached matches after dispatching `mouseover` on
+ * a link). The harness hover step dispatches a single `mouseover`, which
+ * triggers the preload pipeline exactly once in every adapter: React
+ * synthesizes mouseEnter from it, Solid/Vue attach a native `mouseover`
+ * handler. (Solid/Vue also listen to `mouseenter`; dispatching both events
+ * would preload twice for them but once for React.)
+ */
+import type { ScenarioStep } from '../harness'
+
+export const sections = ['a', 'b', 'c', 'd', 'e'] as const
+
+export const SECTION_ITEM_COUNT = 30
+
+/** Deterministic LCG stream seeded from a string — no Math.random. */
+function seededValues(seedText: string, count: number) {
+ let value = 0
+ for (let i = 0; i < seedText.length; i++) {
+ value = (value * 31 + seedText.charCodeAt(i)) >>> 0
+ }
+
+ const values: Array = []
+ for (let i = 0; i < count; i++) {
+ value = (value * 1664525 + 1013904223) >>> 0
+ values.push(value % 100_000)
+ }
+ return values
+}
+
+export interface SectionItem {
+ name: string
+ value: number
+}
+
+export function sectionItems(section: string): Array {
+ return seededValues(`section-${section}`, SECTION_ITEM_COUNT).map(
+ (value, index) => ({
+ name: `item-${section}-${index}`,
+ value,
+ }),
+ )
+}
+
+export function sectionChecksum(section: string) {
+ return sectionItems(section).reduce(
+ (sum, item) => (sum + item.value) % 1_000_000_007,
+ 0,
+ )
+}
+
+export function sectionMarker(section: string) {
+ return `${section}:${sectionChecksum(section)}`
+}
+
+export const docsMarker = 'docs'
+export const homeMarker = 'home'
+
+interface StepDef {
+ step: ScenarioStep
+ /** Expected page marker after the step; undefined for non-navigation steps. */
+ marker?: string
+}
+
+export const stepDefs: ReadonlyArray = [
+ { step: { type: 'hover', testId: 's-a' } },
+ { step: { type: 'hover', testId: 's-b' } },
+ { step: 's-a', marker: sectionMarker('a') },
+ { step: { type: 'hover', testId: 's-c' } },
+ { step: 's-c', marker: sectionMarker('c') },
+ {
+ step: {
+ type: 'preload',
+ getOptions: () => ({
+ to: '/sections/$section',
+ params: { section: 'd' },
+ }),
+ },
+ },
+ { step: 's-d', marker: sectionMarker('d') },
+ { step: { type: 'hover', testId: 's-e' } },
+ { step: 'go-docs', marker: docsMarker },
+ { step: 'go-home', marker: homeMarker },
+]
+
+export const scenarioSteps: ReadonlyArray = stepDefs.map(
+ (def) => def.step,
+)
+
+export function assertStepResult(stepIndex: number, container: HTMLElement) {
+ const def = stepDefs[stepIndex]!
+ if (!def.marker) {
+ return
+ }
+
+ const marker = container.querySelector('[data-testid="page-state"]')
+ if (marker?.textContent !== def.marker) {
+ throw new Error(
+ `Expected page marker "${def.marker}" after step ${stepIndex}, received "${marker?.textContent}"`,
+ )
+ }
+}
+
+// Two laps through the 10-step sequence per benchmark iteration.
+export const ticksPerIteration = 20
+
+export const benchOptions = {
+ warmupIterations: 50,
+ time: 10_000,
+ throws: true,
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/project.json b/benchmarks/client-nav/scenarios/preload/solid/project.json
new file mode 100644
index 0000000000..a186879335
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-preload-solid",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/preload/solid/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/setup.ts b/benchmarks/client-nav/scenarios/preload/solid/setup.ts
new file mode 100644
index 0000000000..34270fe8a4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, scenarioSteps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Solid',
+ mount: mountTestApp,
+ steps: scenarioSteps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts
new file mode 100644
index 0000000000..ff2771985b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-preload', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-preload interaction loop (solid)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/preload/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/preload/solid/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
new file mode 100644
index 0000000000..72e414c0a0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
@@ -0,0 +1,35 @@
+import { render } from 'solid-js/web'
+import { RouterProvider, createRouter } from '@tanstack/solid-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultPreload: 'intent',
+ defaultPreloadDelay: 0,
+ defaultPreloadStaleTime: 0,
+ })
+}
+
+declare module '@tanstack/solid-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const unmount = render(() => , container)
+
+ return {
+ router,
+ unmount,
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts
new file mode 100644
index 0000000000..645d925238
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as DocsRouteImport } from './routes/docs'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SectionsSectionRouteImport } from './routes/sections.$section'
+
+const DocsRoute = DocsRouteImport.update({
+ id: '/docs',
+ path: '/docs',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SectionsSectionRoute = SectionsSectionRouteImport.update({
+ id: '/sections/$section',
+ path: '/sections/$section',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/docs' | '/sections/$section'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/docs' | '/sections/$section'
+ id: '__root__' | '/' | '/docs' | '/sections/$section'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ DocsRoute: typeof DocsRoute
+ SectionsSectionRoute: typeof SectionsSectionRoute
+}
+
+declare module '@tanstack/solid-router' {
+ interface FileRoutesByPath {
+ '/docs': {
+ id: '/docs'
+ path: '/docs'
+ fullPath: '/docs'
+ preLoaderRoute: typeof DocsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sections/$section': {
+ id: '/sections/$section'
+ path: '/sections/$section'
+ fullPath: '/sections/$section'
+ preLoaderRoute: typeof SectionsSectionRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ DocsRoute: DocsRoute,
+ SectionsSectionRoute: SectionsSectionRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/routes/__root.tsx
new file mode 100644
index 0000000000..a805ed0feb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/routes/__root.tsx
@@ -0,0 +1,34 @@
+import { For } from 'solid-js'
+import { Link, Outlet, createRootRoute } from '@tanstack/solid-router'
+import { sections } from '../../../shared'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+function RootComponent() {
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routes/docs.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/routes/docs.tsx
new file mode 100644
index 0000000000..b077cfd18f
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/routes/docs.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/solid-router'
+import { docsMarker } from '../../../shared'
+
+export const Route = createFileRoute('/docs')({
+ component: DocsPage,
+})
+
+function DocsPage() {
+ return (
+
+ {docsMarker}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routes/index.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/routes/index.tsx
new file mode 100644
index 0000000000..72fbfe387a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/routes/index.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/solid-router'
+import { homeMarker } from '../../../shared'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ {homeMarker}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routes/sections.$section.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/routes/sections.$section.tsx
new file mode 100644
index 0000000000..2a7fb2ad1b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/routes/sections.$section.tsx
@@ -0,0 +1,33 @@
+import { For } from 'solid-js'
+import { createFileRoute } from '@tanstack/solid-router'
+import { sectionItems } from '../../../shared'
+
+export const Route = createFileRoute('/sections/$section')({
+ loader: ({ params }) => {
+ const items = sectionItems(params.section)
+ const checksum = items.reduce(
+ (sum, item) => (sum + item.value) % 1_000_000_007,
+ 0,
+ )
+ return { items, checksum }
+ },
+ staleTime: 0,
+ gcTime: 0,
+ component: SectionPage,
+})
+
+function SectionPage() {
+ const params = Route.useParams()
+ const data = Route.useLoaderData()
+
+ return (
+
+ {`${params().section}:${data().checksum}`}
+
+
+ {(item) => - {`${item.name}=${item.value}`}
}
+
+
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json b/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json
new file mode 100644
index 0000000000..98d76ad6b8
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts b/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts
new file mode 100644
index 0000000000..b542834469
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts
@@ -0,0 +1,48 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import solid from 'vite-plugin-solid'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'solid',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ solid({ hot: false, dev: false }),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ resolve: {
+ conditions: ['solid', 'browser'],
+ },
+ test: {
+ name: '@benchmarks/client-nav preload (solid)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ server: {
+ deps: {
+ inline: [/@solidjs/, /@tanstack\/solid-store/],
+ },
+ },
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/project.json b/benchmarks/client-nav/scenarios/preload/vue/project.json
new file mode 100644
index 0000000000..404476723d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-preload-vue",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/preload/vue/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/vue/setup.ts b/benchmarks/client-nav/scenarios/preload/vue/setup.ts
new file mode 100644
index 0000000000..f70a154909
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, scenarioSteps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Vue',
+ mount: mountTestApp,
+ steps: scenarioSteps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts
new file mode 100644
index 0000000000..2e790e9240
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-preload', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-preload interaction loop (vue)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/preload/vue/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/main.tsx b/benchmarks/client-nav/scenarios/preload/vue/src/main.tsx
new file mode 100644
index 0000000000..1e325392a4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/main.tsx
@@ -0,0 +1,42 @@
+import * as Vue from 'vue'
+import { RouterProvider, createRouter } from '@tanstack/vue-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultPreload: 'intent',
+ defaultPreloadDelay: 0,
+ defaultPreloadStaleTime: 0,
+ })
+}
+
+declare module '@tanstack/vue-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const component =
+ const app = Vue.createApp({
+ render: () => component,
+ })
+
+ app.mount(container)
+
+ return {
+ router,
+ unmount() {
+ app.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts
new file mode 100644
index 0000000000..05a751060b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as DocsRouteImport } from './routes/docs'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SectionsSectionRouteImport } from './routes/sections.$section'
+
+const DocsRoute = DocsRouteImport.update({
+ id: '/docs',
+ path: '/docs',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SectionsSectionRoute = SectionsSectionRouteImport.update({
+ id: '/sections/$section',
+ path: '/sections/$section',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/docs': typeof DocsRoute
+ '/sections/$section': typeof SectionsSectionRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/docs' | '/sections/$section'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/docs' | '/sections/$section'
+ id: '__root__' | '/' | '/docs' | '/sections/$section'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ DocsRoute: typeof DocsRoute
+ SectionsSectionRoute: typeof SectionsSectionRoute
+}
+
+declare module '@tanstack/vue-router' {
+ interface FileRoutesByPath {
+ '/docs': {
+ id: '/docs'
+ path: '/docs'
+ fullPath: '/docs'
+ preLoaderRoute: typeof DocsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sections/$section': {
+ id: '/sections/$section'
+ path: '/sections/$section'
+ fullPath: '/sections/$section'
+ preLoaderRoute: typeof SectionsSectionRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ DocsRoute: DocsRoute,
+ SectionsSectionRoute: SectionsSectionRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/preload/vue/src/routes/__root.tsx
new file mode 100644
index 0000000000..bf91ba3770
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/routes/__root.tsx
@@ -0,0 +1,35 @@
+import * as Vue from 'vue'
+import { Link, Outlet, createRootRoute } from '@tanstack/vue-router'
+import { sections } from '../../../shared'
+
+const RootComponent = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+ >
+ )
+ },
+})
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routes/docs.tsx b/benchmarks/client-nav/scenarios/preload/vue/src/routes/docs.tsx
new file mode 100644
index 0000000000..07d0a989ad
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/routes/docs.tsx
@@ -0,0 +1,17 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+import { docsMarker } from '../../../shared'
+
+const DocsPage = Vue.defineComponent({
+ setup() {
+ return () => (
+
+ {docsMarker}
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/docs')({
+ component: DocsPage,
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routes/index.tsx b/benchmarks/client-nav/scenarios/preload/vue/src/routes/index.tsx
new file mode 100644
index 0000000000..f04a9f5796
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/routes/index.tsx
@@ -0,0 +1,17 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+import { homeMarker } from '../../../shared'
+
+const HomePage = Vue.defineComponent({
+ setup() {
+ return () => (
+
+ {homeMarker}
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routes/sections.$section.tsx b/benchmarks/client-nav/scenarios/preload/vue/src/routes/sections.$section.tsx
new file mode 100644
index 0000000000..aeb617a86f
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/src/routes/sections.$section.tsx
@@ -0,0 +1,37 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+import { sectionItems } from '../../../shared'
+
+const SectionPage = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+ const data = Route.useLoaderData()
+
+ return () => (
+
+
+ {`${params.value.section}:${data.value.checksum}`}
+
+
+ {data.value.items.map((item) => (
+ - {`${item.name}=${item.value}`}
+ ))}
+
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/sections/$section')({
+ loader: ({ params }) => {
+ const items = sectionItems(params.section)
+ const checksum = items.reduce(
+ (sum, item) => (sum + item.value) % 1_000_000_007,
+ 0,
+ )
+ return { items, checksum }
+ },
+ staleTime: 0,
+ gcTime: 0,
+ component: SectionPage,
+})
diff --git a/benchmarks/client-nav/scenarios/preload/vue/tsconfig.json b/benchmarks/client-nav/scenarios/preload/vue/tsconfig.json
new file mode 100644
index 0000000000..7786fc3da9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "vue",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/preload/vue/vite.config.ts b/benchmarks/client-nav/scenarios/preload/vue/vite.config.ts
new file mode 100644
index 0000000000..25e64b5bef
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/preload/vue/vite.config.ts
@@ -0,0 +1,42 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'vue',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ vue(),
+ vueJsx(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav preload (vue)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/project.json b/benchmarks/client-nav/scenarios/rewrites/react/project.json
new file mode 100644
index 0000000000..d98c6e1412
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-rewrites-react",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/rewrites/react/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/setup.ts b/benchmarks/client-nav/scenarios/rewrites/react/setup.ts
new file mode 100644
index 0000000000..0c5df273ed
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/setup.ts
@@ -0,0 +1,18 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, initialUrl, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'React',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ initialUrl,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts
new file mode 100644
index 0000000000..9b77a79838
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-rewrites', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-rewrites navigation loop (react)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/speed.flame.ts b/benchmarks/client-nav/scenarios/rewrites/react/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/main.tsx b/benchmarks/client-nav/scenarios/rewrites/react/src/main.tsx
new file mode 100644
index 0000000000..47746bb0fb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/main.tsx
@@ -0,0 +1,38 @@
+import { RouterProvider, createRouter } from '@tanstack/react-router'
+import { createRoot } from 'react-dom/client'
+import { routeTree } from './routeTree.gen'
+import { basepath, localeRewrite } from '../../shared'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ basepath,
+ rewrite: localeRewrite,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/react-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const reactRoot = createRoot(container)
+ reactRoot.render()
+
+ return {
+ router,
+ unmount() {
+ reactRoot.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/rewrites/react/src/routeTree.gen.ts
new file mode 100644
index 0000000000..b6ab8c8be4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/routeTree.gen.ts
@@ -0,0 +1,103 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as PARouteImport } from './routes/p.$a'
+import { Route as PABRouteImport } from './routes/p.$a.$b'
+
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PARoute = PARouteImport.update({
+ id: '/p/$a',
+ path: '/p/$a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PABRoute = PABRouteImport.update({
+ id: '/$b',
+ path: '/$b',
+ getParentRoute: () => PARoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/p/$a' | '/p/$a/$b'
+ id: '__root__' | '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ PARoute: typeof PARouteWithChildren
+}
+
+declare module '@tanstack/react-router' {
+ interface FileRoutesByPath {
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a': {
+ id: '/p/$a'
+ path: '/p/$a'
+ fullPath: '/p/$a'
+ preLoaderRoute: typeof PARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a/$b': {
+ id: '/p/$a/$b'
+ path: '/$b'
+ fullPath: '/p/$a/$b'
+ preLoaderRoute: typeof PABRouteImport
+ parentRoute: typeof PARoute
+ }
+ }
+}
+
+interface PARouteChildren {
+ PABRoute: typeof PABRoute
+}
+
+const PARouteChildren: PARouteChildren = {
+ PABRoute: PABRoute,
+}
+
+const PARouteWithChildren = PARoute._addFileChildren(PARouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ PARoute: PARouteWithChildren,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/__root.tsx
new file mode 100644
index 0000000000..ad14ff51f1
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/__root.tsx
@@ -0,0 +1,61 @@
+import {
+ Link,
+ Outlet,
+ createRootRoute,
+ useLocation,
+} from '@tanstack/react-router'
+import type { SearchSchemaInput } from '@tanstack/react-router'
+
+export const Route = createRootRoute({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ ({
+ _locale: typeof search._locale === 'string' ? search._locale : undefined,
+ }) as { _locale?: string },
+ component: RootComponent,
+})
+
+function RootComponent() {
+ const pathname = useLocation({ select: (location) => location.pathname })
+
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/routes/index.tsx b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/index.tsx
new file mode 100644
index 0000000000..821cfe4a7c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/index.tsx
@@ -0,0 +1,13 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ Home
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.$b.tsx b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.$b.tsx
new file mode 100644
index 0000000000..ec1163e5c2
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.$b.tsx
@@ -0,0 +1,16 @@
+import { createFileRoute } from '@tanstack/react-router'
+import { itemLabel } from '../../../shared'
+
+export const Route = createFileRoute('/p/$a/$b')({
+ component: ItemPage,
+})
+
+function ItemPage() {
+ const params = Route.useParams()
+
+ return (
+
+ {itemLabel(params.a, params.b)}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.tsx b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.tsx
new file mode 100644
index 0000000000..f4937494f0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/src/routes/p.$a.tsx
@@ -0,0 +1,17 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+import { sectionLabel } from '../../../shared'
+
+export const Route = createFileRoute('/p/$a')({
+ component: SectionPage,
+})
+
+function SectionPage() {
+ const params = Route.useParams()
+
+ return (
+
+ {sectionLabel(params.a)}
+
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/tsconfig.json b/benchmarks/client-nav/scenarios/rewrites/react/tsconfig.json
new file mode 100644
index 0000000000..1d59cbb450
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "jsxImportSource": "react",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/react/vite.config.ts b/benchmarks/client-nav/scenarios/rewrites/react/vite.config.ts
new file mode 100644
index 0000000000..8c07cff4fb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/react/vite.config.ts
@@ -0,0 +1,40 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import react from '@vitejs/plugin-react'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'react',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ react(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav rewrites (react)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/shared.ts b/benchmarks/client-nav/scenarios/rewrites/shared.ts
new file mode 100644
index 0000000000..c45b15d503
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/shared.ts
@@ -0,0 +1,101 @@
+/**
+ * Shared definition of the `rewrites` scenario: composed client-side location
+ * rewrites — router `basepath` plus a locale input/output rewrite (the client
+ * analog of the SSR `rewrites` scenario). Externally URLs look like
+ * `/app/{locale}/p/...`; internally the router sees `/p/...` with the locale
+ * carried in the `_locale` search param. Every navigation runs the composed
+ * output rewrite when building hrefs/committing and the input rewrite when
+ * parsing the committed location.
+ */
+import type { ScenarioStep } from '../harness'
+
+export const basepath = '/app'
+export const defaultLocale = 'en'
+
+const localePrefixRe = /^\/(fr|de|es)(\/.*)$/
+
+// Framework-agnostic rewrite pair consumed by all three apps' createRouter.
+export const localeRewrite = {
+ input: ({ url }: { url: URL }) => {
+ const match = url.pathname.match(localePrefixRe)
+
+ if (match) {
+ url.pathname = match[2]!
+ url.searchParams.set('_locale', match[1]!)
+ return url
+ }
+
+ return undefined
+ },
+ output: ({ url }: { url: URL }) => {
+ const locale = url.searchParams.get('_locale')
+
+ if (locale) {
+ url.searchParams.delete('_locale')
+ url.pathname = `/${locale}${url.pathname}`
+ }
+
+ return url
+ },
+}
+
+export function sectionLabel(a: string) {
+ return `Section ${a}`
+}
+
+export function itemLabel(a: string, b: string) {
+ return `Item ${a}/${b}`
+}
+
+interface StepDef {
+ testId: string
+ /** Internal router pathname expected after the step. */
+ routerPath: string
+ /** External window.location pathname expected after the step. */
+ windowPath: string
+}
+
+// Circular lap: alternates sections, depths, and locales so every step runs
+// the composed rewrites in both directions, then returns to the start.
+export const stepDefs: ReadonlyArray = [
+ { testId: 'go-x', routerPath: '/p/x', windowPath: '/app/p/x' },
+ { testId: 'go-x-1-fr', routerPath: '/p/x/1', windowPath: '/app/fr/p/x/1' },
+ { testId: 'go-y-de', routerPath: '/p/y', windowPath: '/app/de/p/y' },
+ { testId: 'go-y-2', routerPath: '/p/y/2', windowPath: '/app/p/y/2' },
+ { testId: 'go-x-es', routerPath: '/p/x', windowPath: '/app/es/p/x' },
+ { testId: 'go-home', routerPath: '/', windowPath: '/app/' },
+] as const
+
+export const steps: ReadonlyArray = stepDefs.map(
+ (step) => step.testId,
+)
+
+export function assertStepResult(stepIndex: number, container: HTMLElement) {
+ const expected = stepDefs[stepIndex]!
+ const marker = container.querySelector('[data-testid="loc"]')
+ const routerPath = marker?.textContent
+
+ if (routerPath !== expected.routerPath) {
+ throw new Error(
+ `Expected router pathname "${expected.routerPath}" after step ${stepIndex}, received "${routerPath}"`,
+ )
+ }
+
+ if (window.location.pathname !== expected.windowPath) {
+ throw new Error(
+ `Expected window pathname "${expected.windowPath}" after step ${stepIndex}, received "${window.location.pathname}"`,
+ )
+ }
+}
+
+// The app starts on the external root inside the basepath.
+export const initialUrl = '/app'
+
+// Three laps through the 6-step sequence per benchmark iteration.
+export const ticksPerIteration = 18
+
+export const benchOptions = {
+ warmupIterations: 100,
+ time: 10_000,
+ throws: true,
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/project.json b/benchmarks/client-nav/scenarios/rewrites/solid/project.json
new file mode 100644
index 0000000000..4b2f763032
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-rewrites-solid",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/rewrites/solid/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/setup.ts b/benchmarks/client-nav/scenarios/rewrites/solid/setup.ts
new file mode 100644
index 0000000000..5796df712d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/setup.ts
@@ -0,0 +1,18 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, initialUrl, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Solid',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ initialUrl,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts
new file mode 100644
index 0000000000..30d3436071
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-rewrites', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-rewrites navigation loop (solid)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/rewrites/solid/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
new file mode 100644
index 0000000000..a80de580fb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
@@ -0,0 +1,35 @@
+import { render } from 'solid-js/web'
+import { RouterProvider, createRouter } from '@tanstack/solid-router'
+import { routeTree } from './routeTree.gen'
+import { basepath, localeRewrite } from '../../shared'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ basepath,
+ rewrite: localeRewrite,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/solid-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const unmount = render(() => , container)
+
+ return {
+ router,
+ unmount,
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/rewrites/solid/src/routeTree.gen.ts
new file mode 100644
index 0000000000..2d35f899c9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/routeTree.gen.ts
@@ -0,0 +1,103 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as PARouteImport } from './routes/p.$a'
+import { Route as PABRouteImport } from './routes/p.$a.$b'
+
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PARoute = PARouteImport.update({
+ id: '/p/$a',
+ path: '/p/$a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PABRoute = PABRouteImport.update({
+ id: '/$b',
+ path: '/$b',
+ getParentRoute: () => PARoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/p/$a' | '/p/$a/$b'
+ id: '__root__' | '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ PARoute: typeof PARouteWithChildren
+}
+
+declare module '@tanstack/solid-router' {
+ interface FileRoutesByPath {
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a': {
+ id: '/p/$a'
+ path: '/p/$a'
+ fullPath: '/p/$a'
+ preLoaderRoute: typeof PARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a/$b': {
+ id: '/p/$a/$b'
+ path: '/$b'
+ fullPath: '/p/$a/$b'
+ preLoaderRoute: typeof PABRouteImport
+ parentRoute: typeof PARoute
+ }
+ }
+}
+
+interface PARouteChildren {
+ PABRoute: typeof PABRoute
+}
+
+const PARouteChildren: PARouteChildren = {
+ PABRoute: PABRoute,
+}
+
+const PARouteWithChildren = PARoute._addFileChildren(PARouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ PARoute: PARouteWithChildren,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/__root.tsx
new file mode 100644
index 0000000000..3a78f2c3cf
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/__root.tsx
@@ -0,0 +1,61 @@
+import {
+ Link,
+ Outlet,
+ createRootRoute,
+ useLocation,
+} from '@tanstack/solid-router'
+import type { SearchSchemaInput } from '@tanstack/solid-router'
+
+export const Route = createRootRoute({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ ({
+ _locale: typeof search._locale === 'string' ? search._locale : undefined,
+ }) as { _locale?: string },
+ component: RootComponent,
+})
+
+function RootComponent() {
+ const pathname = useLocation({ select: (location) => location.pathname })
+
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/index.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/index.tsx
new file mode 100644
index 0000000000..5ee381ff05
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/index.tsx
@@ -0,0 +1,13 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ Home
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.$b.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.$b.tsx
new file mode 100644
index 0000000000..febcad35e3
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.$b.tsx
@@ -0,0 +1,16 @@
+import { createFileRoute } from '@tanstack/solid-router'
+import { itemLabel } from '../../../shared'
+
+export const Route = createFileRoute('/p/$a/$b')({
+ component: ItemPage,
+})
+
+function ItemPage() {
+ const params = Route.useParams()
+
+ return (
+
+ {itemLabel(params().a, params().b)}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.tsx
new file mode 100644
index 0000000000..adfb7bc3b6
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/routes/p.$a.tsx
@@ -0,0 +1,17 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+import { sectionLabel } from '../../../shared'
+
+export const Route = createFileRoute('/p/$a')({
+ component: SectionPage,
+})
+
+function SectionPage() {
+ const params = Route.useParams()
+
+ return (
+
+ {sectionLabel(params().a)}
+
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json b/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json
new file mode 100644
index 0000000000..98d76ad6b8
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts b/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts
new file mode 100644
index 0000000000..41613c2ad4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts
@@ -0,0 +1,48 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import solid from 'vite-plugin-solid'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'solid',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ solid({ hot: false, dev: false }),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ resolve: {
+ conditions: ['solid', 'browser'],
+ },
+ test: {
+ name: '@benchmarks/client-nav rewrites (solid)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ server: {
+ deps: {
+ inline: [/@solidjs/, /@tanstack\/solid-store/],
+ },
+ },
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/project.json b/benchmarks/client-nav/scenarios/rewrites/vue/project.json
new file mode 100644
index 0000000000..9b7cb5d198
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-rewrites-vue",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/rewrites/vue/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/setup.ts b/benchmarks/client-nav/scenarios/rewrites/vue/setup.ts
new file mode 100644
index 0000000000..e26b4d05ca
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/setup.ts
@@ -0,0 +1,18 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, initialUrl, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Vue',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ initialUrl,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts
new file mode 100644
index 0000000000..c10b8723bb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-rewrites', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-rewrites navigation loop (vue)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/rewrites/vue/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/main.tsx b/benchmarks/client-nav/scenarios/rewrites/vue/src/main.tsx
new file mode 100644
index 0000000000..83e430038d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/main.tsx
@@ -0,0 +1,42 @@
+import * as Vue from 'vue'
+import { RouterProvider, createRouter } from '@tanstack/vue-router'
+import { routeTree } from './routeTree.gen'
+import { basepath, localeRewrite } from '../../shared'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ basepath,
+ rewrite: localeRewrite,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/vue-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const component =
+ const app = Vue.createApp({
+ render: () => component,
+ })
+
+ app.mount(container)
+
+ return {
+ router,
+ unmount() {
+ app.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/rewrites/vue/src/routeTree.gen.ts
new file mode 100644
index 0000000000..6eca4e8ce5
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/routeTree.gen.ts
@@ -0,0 +1,103 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as PARouteImport } from './routes/p.$a'
+import { Route as PABRouteImport } from './routes/p.$a.$b'
+
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PARoute = PARouteImport.update({
+ id: '/p/$a',
+ path: '/p/$a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const PABRoute = PABRouteImport.update({
+ id: '/$b',
+ path: '/$b',
+ getParentRoute: () => PARoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/p/$a': typeof PARouteWithChildren
+ '/p/$a/$b': typeof PABRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/p/$a' | '/p/$a/$b'
+ id: '__root__' | '/' | '/p/$a' | '/p/$a/$b'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ PARoute: typeof PARouteWithChildren
+}
+
+declare module '@tanstack/vue-router' {
+ interface FileRoutesByPath {
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a': {
+ id: '/p/$a'
+ path: '/p/$a'
+ fullPath: '/p/$a'
+ preLoaderRoute: typeof PARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/p/$a/$b': {
+ id: '/p/$a/$b'
+ path: '/$b'
+ fullPath: '/p/$a/$b'
+ preLoaderRoute: typeof PABRouteImport
+ parentRoute: typeof PARoute
+ }
+ }
+}
+
+interface PARouteChildren {
+ PABRoute: typeof PABRoute
+}
+
+const PARouteChildren: PARouteChildren = {
+ PABRoute: PABRoute,
+}
+
+const PARouteWithChildren = PARoute._addFileChildren(PARouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ PARoute: PARouteWithChildren,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/__root.tsx
new file mode 100644
index 0000000000..ae89645005
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/__root.tsx
@@ -0,0 +1,64 @@
+import * as Vue from 'vue'
+import {
+ Link,
+ Outlet,
+ createRootRoute,
+ useLocation,
+} from '@tanstack/vue-router'
+import type { SearchSchemaInput } from '@tanstack/vue-router'
+
+const RootComponent = Vue.defineComponent({
+ setup() {
+ const pathname = useLocation({ select: (location) => location.pathname })
+
+ return () => (
+ <>
+
+
+ >
+ )
+ },
+})
+
+export const Route = createRootRoute({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ ({
+ _locale: typeof search._locale === 'string' ? search._locale : undefined,
+ }) as { _locale?: string },
+ component: RootComponent,
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/index.tsx b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/index.tsx
new file mode 100644
index 0000000000..d5405b52d2
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/index.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const HomePage = Vue.defineComponent({
+ setup() {
+ return () => (
+
+ Home
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx
new file mode 100644
index 0000000000..062c0903b9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx
@@ -0,0 +1,19 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+import { itemLabel } from '../../../shared'
+
+const ItemPage = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+
+ {itemLabel(params.value.a, params.value.b)}
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/p/$a/$b')({
+ component: ItemPage,
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.tsx b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.tsx
new file mode 100644
index 0000000000..552700d402
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/src/routes/p.$a.tsx
@@ -0,0 +1,20 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+import { sectionLabel } from '../../../shared'
+
+const SectionPage = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+
+ {sectionLabel(params.value.a)}
+
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/p/$a')({
+ component: SectionPage,
+})
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/tsconfig.json b/benchmarks/client-nav/scenarios/rewrites/vue/tsconfig.json
new file mode 100644
index 0000000000..7786fc3da9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "vue",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/vite.config.ts b/benchmarks/client-nav/scenarios/rewrites/vue/vite.config.ts
new file mode 100644
index 0000000000..39e22b6c3e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/rewrites/vue/vite.config.ts
@@ -0,0 +1,42 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'vue',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ vue(),
+ vueJsx(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav rewrites (vue)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/project.json b/benchmarks/client-nav/scenarios/route-tree-scale/react/project.json
new file mode 100644
index 0000000000..3291738f79
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-route-tree-scale-react",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/route-tree-scale/react/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/setup.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/setup.ts
new file mode 100644
index 0000000000..130583b190
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'React',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts
new file mode 100644
index 0000000000..50cc26d5d6
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-route-tree-scale', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-route-tree-scale navigation loop (react)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.flame.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/main.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/main.tsx
new file mode 100644
index 0000000000..ef0b99555c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/main.tsx
@@ -0,0 +1,35 @@
+import { RouterProvider, createRouter } from '@tanstack/react-router'
+import { createRoot } from 'react-dom/client'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/react-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const reactRoot = createRoot(container)
+ reactRoot.render()
+
+ return {
+ router,
+ unmount() {
+ reactRoot.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routeTree.gen.ts
new file mode 100644
index 0000000000..b58b75180f
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routeTree.gen.ts
@@ -0,0 +1,881 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as SecFRouteImport } from './routes/sec-f'
+import { Route as SecERouteImport } from './routes/sec-e'
+import { Route as SecDRouteImport } from './routes/sec-d'
+import { Route as SecCRouteImport } from './routes/sec-c'
+import { Route as SecBRouteImport } from './routes/sec-b'
+import { Route as SecARouteImport } from './routes/sec-a'
+import { Route as LayoutRouteImport } from './routes/_layout'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SecFIndexRouteImport } from './routes/sec-f.index'
+import { Route as SecEIndexRouteImport } from './routes/sec-e.index'
+import { Route as SecDIndexRouteImport } from './routes/sec-d.index'
+import { Route as SecCIndexRouteImport } from './routes/sec-c.index'
+import { Route as SecBIndexRouteImport } from './routes/sec-b.index'
+import { Route as SecAIndexRouteImport } from './routes/sec-a.index'
+import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings'
+import { Route as SecFAboutRouteImport } from './routes/sec-f.about'
+import { Route as SecFIdRouteImport } from './routes/sec-f.$id'
+import { Route as SecESettingsRouteImport } from './routes/sec-e.settings'
+import { Route as SecEAboutRouteImport } from './routes/sec-e.about'
+import { Route as SecEIdRouteImport } from './routes/sec-e.$id'
+import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings'
+import { Route as SecDAboutRouteImport } from './routes/sec-d.about'
+import { Route as SecDIdRouteImport } from './routes/sec-d.$id'
+import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings'
+import { Route as SecCAboutRouteImport } from './routes/sec-c.about'
+import { Route as SecCIdRouteImport } from './routes/sec-c.$id'
+import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings'
+import { Route as SecBAboutRouteImport } from './routes/sec-b.about'
+import { Route as SecBIdRouteImport } from './routes/sec-b.$id'
+import { Route as SecASettingsRouteImport } from './routes/sec-a.settings'
+import { Route as SecAAboutRouteImport } from './routes/sec-a.about'
+import { Route as SecAIdRouteImport } from './routes/sec-a.$id'
+import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}'
+import { Route as FilesSplatRouteImport } from './routes/files.$'
+import { Route as LayoutBetaRouteImport } from './routes/_layout.beta'
+import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha'
+import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo'
+import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing'
+
+const SecFRoute = SecFRouteImport.update({
+ id: '/sec-f',
+ path: '/sec-f',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecERoute = SecERouteImport.update({
+ id: '/sec-e',
+ path: '/sec-e',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecDRoute = SecDRouteImport.update({
+ id: '/sec-d',
+ path: '/sec-d',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecCRoute = SecCRouteImport.update({
+ id: '/sec-c',
+ path: '/sec-c',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecBRoute = SecBRouteImport.update({
+ id: '/sec-b',
+ path: '/sec-b',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecARoute = SecARouteImport.update({
+ id: '/sec-a',
+ path: '/sec-a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutRoute = LayoutRouteImport.update({
+ id: '/_layout',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecFIndexRoute = SecFIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecEIndexRoute = SecEIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDIndexRoute = SecDIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCIndexRoute = SecCIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBIndexRoute = SecBIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecAIndexRoute = SecAIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecFSettingsRoute = SecFSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFAboutRoute = SecFAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFIdRoute = SecFIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecESettingsRoute = SecESettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEAboutRoute = SecEAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEIdRoute = SecEIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDSettingsRoute = SecDSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDAboutRoute = SecDAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDIdRoute = SecDIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCSettingsRoute = SecCSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCAboutRoute = SecCAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCIdRoute = SecCIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBSettingsRoute = SecBSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBAboutRoute = SecBAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBIdRoute = SecBIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecASettingsRoute = SecASettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAAboutRoute = SecAAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAIdRoute = SecAIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecARoute,
+} as any)
+const ReleaseVChar123versionChar125Route =
+ ReleaseVChar123versionChar125RouteImport.update({
+ id: '/release/v{$version}',
+ path: '/release/v{$version}',
+ getParentRoute: () => rootRouteImport,
+ } as any)
+const FilesSplatRoute = FilesSplatRouteImport.update({
+ id: '/files/$',
+ path: '/files/$',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutBetaRoute = LayoutBetaRouteImport.update({
+ id: '/beta',
+ path: '/beta',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const LayoutAlphaRoute = LayoutAlphaRouteImport.update({
+ id: '/alpha',
+ path: '/alpha',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const marketingPromoRoute = marketingPromoRouteImport.update({
+ id: '/(marketing)/promo',
+ path: '/promo',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const marketingPricingRoute = marketingPricingRouteImport.update({
+ id: '/(marketing)/pricing',
+ path: '/pricing',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a': typeof SecAIndexRoute
+ '/sec-b': typeof SecBIndexRoute
+ '/sec-c': typeof SecCIndexRoute
+ '/sec-d': typeof SecDIndexRoute
+ '/sec-e': typeof SecEIndexRoute
+ '/sec-f': typeof SecFIndexRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/_layout': typeof LayoutRouteWithChildren
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/(marketing)/pricing': typeof marketingPricingRoute
+ '/(marketing)/promo': typeof marketingPromoRoute
+ '/_layout/alpha': typeof LayoutAlphaRoute
+ '/_layout/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths:
+ | '/'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesByTo: FileRoutesByTo
+ to:
+ | '/'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ id:
+ | '__root__'
+ | '/'
+ | '/_layout'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/(marketing)/pricing'
+ | '/(marketing)/promo'
+ | '/_layout/alpha'
+ | '/_layout/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ LayoutRoute: typeof LayoutRouteWithChildren
+ SecARoute: typeof SecARouteWithChildren
+ SecBRoute: typeof SecBRouteWithChildren
+ SecCRoute: typeof SecCRouteWithChildren
+ SecDRoute: typeof SecDRouteWithChildren
+ SecERoute: typeof SecERouteWithChildren
+ SecFRoute: typeof SecFRouteWithChildren
+ marketingPricingRoute: typeof marketingPricingRoute
+ marketingPromoRoute: typeof marketingPromoRoute
+ FilesSplatRoute: typeof FilesSplatRoute
+ ReleaseVChar123versionChar125Route: typeof ReleaseVChar123versionChar125Route
+}
+
+declare module '@tanstack/react-router' {
+ interface FileRoutesByPath {
+ '/sec-f': {
+ id: '/sec-f'
+ path: '/sec-f'
+ fullPath: '/sec-f'
+ preLoaderRoute: typeof SecFRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-e': {
+ id: '/sec-e'
+ path: '/sec-e'
+ fullPath: '/sec-e'
+ preLoaderRoute: typeof SecERouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-d': {
+ id: '/sec-d'
+ path: '/sec-d'
+ fullPath: '/sec-d'
+ preLoaderRoute: typeof SecDRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-c': {
+ id: '/sec-c'
+ path: '/sec-c'
+ fullPath: '/sec-c'
+ preLoaderRoute: typeof SecCRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-b': {
+ id: '/sec-b'
+ path: '/sec-b'
+ fullPath: '/sec-b'
+ preLoaderRoute: typeof SecBRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-a': {
+ id: '/sec-a'
+ path: '/sec-a'
+ fullPath: '/sec-a'
+ preLoaderRoute: typeof SecARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout': {
+ id: '/_layout'
+ path: ''
+ fullPath: '/'
+ preLoaderRoute: typeof LayoutRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-f/': {
+ id: '/sec-f/'
+ path: '/'
+ fullPath: '/sec-f/'
+ preLoaderRoute: typeof SecFIndexRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/': {
+ id: '/sec-e/'
+ path: '/'
+ fullPath: '/sec-e/'
+ preLoaderRoute: typeof SecEIndexRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/': {
+ id: '/sec-d/'
+ path: '/'
+ fullPath: '/sec-d/'
+ preLoaderRoute: typeof SecDIndexRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/': {
+ id: '/sec-c/'
+ path: '/'
+ fullPath: '/sec-c/'
+ preLoaderRoute: typeof SecCIndexRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/': {
+ id: '/sec-b/'
+ path: '/'
+ fullPath: '/sec-b/'
+ preLoaderRoute: typeof SecBIndexRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/': {
+ id: '/sec-a/'
+ path: '/'
+ fullPath: '/sec-a/'
+ preLoaderRoute: typeof SecAIndexRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-f/settings': {
+ id: '/sec-f/settings'
+ path: '/settings'
+ fullPath: '/sec-f/settings'
+ preLoaderRoute: typeof SecFSettingsRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/about': {
+ id: '/sec-f/about'
+ path: '/about'
+ fullPath: '/sec-f/about'
+ preLoaderRoute: typeof SecFAboutRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/$id': {
+ id: '/sec-f/$id'
+ path: '/$id'
+ fullPath: '/sec-f/$id'
+ preLoaderRoute: typeof SecFIdRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/settings': {
+ id: '/sec-e/settings'
+ path: '/settings'
+ fullPath: '/sec-e/settings'
+ preLoaderRoute: typeof SecESettingsRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/about': {
+ id: '/sec-e/about'
+ path: '/about'
+ fullPath: '/sec-e/about'
+ preLoaderRoute: typeof SecEAboutRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/$id': {
+ id: '/sec-e/$id'
+ path: '/$id'
+ fullPath: '/sec-e/$id'
+ preLoaderRoute: typeof SecEIdRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/settings': {
+ id: '/sec-d/settings'
+ path: '/settings'
+ fullPath: '/sec-d/settings'
+ preLoaderRoute: typeof SecDSettingsRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/about': {
+ id: '/sec-d/about'
+ path: '/about'
+ fullPath: '/sec-d/about'
+ preLoaderRoute: typeof SecDAboutRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/$id': {
+ id: '/sec-d/$id'
+ path: '/$id'
+ fullPath: '/sec-d/$id'
+ preLoaderRoute: typeof SecDIdRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/settings': {
+ id: '/sec-c/settings'
+ path: '/settings'
+ fullPath: '/sec-c/settings'
+ preLoaderRoute: typeof SecCSettingsRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/about': {
+ id: '/sec-c/about'
+ path: '/about'
+ fullPath: '/sec-c/about'
+ preLoaderRoute: typeof SecCAboutRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/$id': {
+ id: '/sec-c/$id'
+ path: '/$id'
+ fullPath: '/sec-c/$id'
+ preLoaderRoute: typeof SecCIdRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/settings': {
+ id: '/sec-b/settings'
+ path: '/settings'
+ fullPath: '/sec-b/settings'
+ preLoaderRoute: typeof SecBSettingsRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/about': {
+ id: '/sec-b/about'
+ path: '/about'
+ fullPath: '/sec-b/about'
+ preLoaderRoute: typeof SecBAboutRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/$id': {
+ id: '/sec-b/$id'
+ path: '/$id'
+ fullPath: '/sec-b/$id'
+ preLoaderRoute: typeof SecBIdRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/settings': {
+ id: '/sec-a/settings'
+ path: '/settings'
+ fullPath: '/sec-a/settings'
+ preLoaderRoute: typeof SecASettingsRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/about': {
+ id: '/sec-a/about'
+ path: '/about'
+ fullPath: '/sec-a/about'
+ preLoaderRoute: typeof SecAAboutRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/$id': {
+ id: '/sec-a/$id'
+ path: '/$id'
+ fullPath: '/sec-a/$id'
+ preLoaderRoute: typeof SecAIdRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/release/v{$version}': {
+ id: '/release/v{$version}'
+ path: '/release/v{$version}'
+ fullPath: '/release/v{$version}'
+ preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/files/$': {
+ id: '/files/$'
+ path: '/files/$'
+ fullPath: '/files/$'
+ preLoaderRoute: typeof FilesSplatRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout/beta': {
+ id: '/_layout/beta'
+ path: '/beta'
+ fullPath: '/beta'
+ preLoaderRoute: typeof LayoutBetaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/_layout/alpha': {
+ id: '/_layout/alpha'
+ path: '/alpha'
+ fullPath: '/alpha'
+ preLoaderRoute: typeof LayoutAlphaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/(marketing)/promo': {
+ id: '/(marketing)/promo'
+ path: '/promo'
+ fullPath: '/promo'
+ preLoaderRoute: typeof marketingPromoRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/(marketing)/pricing': {
+ id: '/(marketing)/pricing'
+ path: '/pricing'
+ fullPath: '/pricing'
+ preLoaderRoute: typeof marketingPricingRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+interface LayoutRouteChildren {
+ LayoutAlphaRoute: typeof LayoutAlphaRoute
+ LayoutBetaRoute: typeof LayoutBetaRoute
+}
+
+const LayoutRouteChildren: LayoutRouteChildren = {
+ LayoutAlphaRoute: LayoutAlphaRoute,
+ LayoutBetaRoute: LayoutBetaRoute,
+}
+
+const LayoutRouteWithChildren =
+ LayoutRoute._addFileChildren(LayoutRouteChildren)
+
+interface SecARouteChildren {
+ SecAIdRoute: typeof SecAIdRoute
+ SecAAboutRoute: typeof SecAAboutRoute
+ SecASettingsRoute: typeof SecASettingsRoute
+ SecAIndexRoute: typeof SecAIndexRoute
+}
+
+const SecARouteChildren: SecARouteChildren = {
+ SecAIdRoute: SecAIdRoute,
+ SecAAboutRoute: SecAAboutRoute,
+ SecASettingsRoute: SecASettingsRoute,
+ SecAIndexRoute: SecAIndexRoute,
+}
+
+const SecARouteWithChildren = SecARoute._addFileChildren(SecARouteChildren)
+
+interface SecBRouteChildren {
+ SecBIdRoute: typeof SecBIdRoute
+ SecBAboutRoute: typeof SecBAboutRoute
+ SecBSettingsRoute: typeof SecBSettingsRoute
+ SecBIndexRoute: typeof SecBIndexRoute
+}
+
+const SecBRouteChildren: SecBRouteChildren = {
+ SecBIdRoute: SecBIdRoute,
+ SecBAboutRoute: SecBAboutRoute,
+ SecBSettingsRoute: SecBSettingsRoute,
+ SecBIndexRoute: SecBIndexRoute,
+}
+
+const SecBRouteWithChildren = SecBRoute._addFileChildren(SecBRouteChildren)
+
+interface SecCRouteChildren {
+ SecCIdRoute: typeof SecCIdRoute
+ SecCAboutRoute: typeof SecCAboutRoute
+ SecCSettingsRoute: typeof SecCSettingsRoute
+ SecCIndexRoute: typeof SecCIndexRoute
+}
+
+const SecCRouteChildren: SecCRouteChildren = {
+ SecCIdRoute: SecCIdRoute,
+ SecCAboutRoute: SecCAboutRoute,
+ SecCSettingsRoute: SecCSettingsRoute,
+ SecCIndexRoute: SecCIndexRoute,
+}
+
+const SecCRouteWithChildren = SecCRoute._addFileChildren(SecCRouteChildren)
+
+interface SecDRouteChildren {
+ SecDIdRoute: typeof SecDIdRoute
+ SecDAboutRoute: typeof SecDAboutRoute
+ SecDSettingsRoute: typeof SecDSettingsRoute
+ SecDIndexRoute: typeof SecDIndexRoute
+}
+
+const SecDRouteChildren: SecDRouteChildren = {
+ SecDIdRoute: SecDIdRoute,
+ SecDAboutRoute: SecDAboutRoute,
+ SecDSettingsRoute: SecDSettingsRoute,
+ SecDIndexRoute: SecDIndexRoute,
+}
+
+const SecDRouteWithChildren = SecDRoute._addFileChildren(SecDRouteChildren)
+
+interface SecERouteChildren {
+ SecEIdRoute: typeof SecEIdRoute
+ SecEAboutRoute: typeof SecEAboutRoute
+ SecESettingsRoute: typeof SecESettingsRoute
+ SecEIndexRoute: typeof SecEIndexRoute
+}
+
+const SecERouteChildren: SecERouteChildren = {
+ SecEIdRoute: SecEIdRoute,
+ SecEAboutRoute: SecEAboutRoute,
+ SecESettingsRoute: SecESettingsRoute,
+ SecEIndexRoute: SecEIndexRoute,
+}
+
+const SecERouteWithChildren = SecERoute._addFileChildren(SecERouteChildren)
+
+interface SecFRouteChildren {
+ SecFIdRoute: typeof SecFIdRoute
+ SecFAboutRoute: typeof SecFAboutRoute
+ SecFSettingsRoute: typeof SecFSettingsRoute
+ SecFIndexRoute: typeof SecFIndexRoute
+}
+
+const SecFRouteChildren: SecFRouteChildren = {
+ SecFIdRoute: SecFIdRoute,
+ SecFAboutRoute: SecFAboutRoute,
+ SecFSettingsRoute: SecFSettingsRoute,
+ SecFIndexRoute: SecFIndexRoute,
+}
+
+const SecFRouteWithChildren = SecFRoute._addFileChildren(SecFRouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ LayoutRoute: LayoutRouteWithChildren,
+ SecARoute: SecARouteWithChildren,
+ SecBRoute: SecBRouteWithChildren,
+ SecCRoute: SecCRouteWithChildren,
+ SecDRoute: SecDRouteWithChildren,
+ SecERoute: SecERouteWithChildren,
+ SecFRoute: SecFRouteWithChildren,
+ marketingPricingRoute: marketingPricingRoute,
+ marketingPromoRoute: marketingPromoRoute,
+ FilesSplatRoute: FilesSplatRoute,
+ ReleaseVChar123versionChar125Route: ReleaseVChar123versionChar125Route,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/pricing.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/pricing.tsx
new file mode 100644
index 0000000000..ac2a376549
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/pricing.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/(marketing)/pricing')({
+ component: Page,
+})
+
+function Page() {
+ return pricing
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/promo.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/promo.tsx
new file mode 100644
index 0000000000..b71962254e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/(marketing)/promo.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/(marketing)/promo')({
+ component: Page,
+})
+
+function Page() {
+ return promo
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/__root.tsx
new file mode 100644
index 0000000000..7ed47da924
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/__root.tsx
@@ -0,0 +1,58 @@
+import { Link, Outlet, createRootRoute } from '@tanstack/react-router'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+function RootComponent() {
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.alpha.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.alpha.tsx
new file mode 100644
index 0000000000..893419cef5
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.alpha.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/_layout/alpha')({
+ component: Page,
+})
+
+function Page() {
+ return alpha
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.beta.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.beta.tsx
new file mode 100644
index 0000000000..d20c6007ee
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.beta.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/_layout/beta')({
+ component: Page,
+})
+
+function Page() {
+ return beta
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.tsx
new file mode 100644
index 0000000000..961feb50f1
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/_layout.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/_layout')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/files.$.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/files.$.tsx
new file mode 100644
index 0000000000..028aa43d5a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/files.$.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/files/$')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`files:${params._splat}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/index.tsx
new file mode 100644
index 0000000000..8a7ffca9e7
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/')({
+ component: Page,
+})
+
+function Page() {
+ return home
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/release.v{$version}.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/release.v{$version}.tsx
new file mode 100644
index 0000000000..dfe8e31905
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/release.v{$version}.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/release/v{$version}')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`release:${params.version}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.$id.tsx
new file mode 100644
index 0000000000..8be053a040
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-a/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-a:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.about.tsx
new file mode 100644
index 0000000000..54c1b28618
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-a/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.index.tsx
new file mode 100644
index 0000000000..3c793a94f5
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-a/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.settings.tsx
new file mode 100644
index 0000000000..0037f6463d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-a/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.tsx
new file mode 100644
index 0000000000..846f96b67b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-a.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-a')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.$id.tsx
new file mode 100644
index 0000000000..0dd7f94feb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-b/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-b:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.about.tsx
new file mode 100644
index 0000000000..fde4647472
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-b/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.index.tsx
new file mode 100644
index 0000000000..51b69cf664
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-b/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.settings.tsx
new file mode 100644
index 0000000000..977b7438b1
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-b/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.tsx
new file mode 100644
index 0000000000..77d7e6475d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-b.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-b')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.$id.tsx
new file mode 100644
index 0000000000..eb3be796c0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-c/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-c:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.about.tsx
new file mode 100644
index 0000000000..7910acf332
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-c/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.index.tsx
new file mode 100644
index 0000000000..f6ae102f2d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-c/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.settings.tsx
new file mode 100644
index 0000000000..bf2be30788
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-c/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.tsx
new file mode 100644
index 0000000000..77ac5644c6
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-c.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-c')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.$id.tsx
new file mode 100644
index 0000000000..d34aee8972
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-d/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-d:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.about.tsx
new file mode 100644
index 0000000000..1f095cb2ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-d/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.index.tsx
new file mode 100644
index 0000000000..8fc698a4d4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-d/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.settings.tsx
new file mode 100644
index 0000000000..76c7a178ea
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-d/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.tsx
new file mode 100644
index 0000000000..5f3d281b5e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-d.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-d')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.$id.tsx
new file mode 100644
index 0000000000..6e31d0c5d1
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-e/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-e:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.about.tsx
new file mode 100644
index 0000000000..5a2835917b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-e/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.index.tsx
new file mode 100644
index 0000000000..0f23b8d484
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-e/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.settings.tsx
new file mode 100644
index 0000000000..b566a1ffaa
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-e/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.tsx
new file mode 100644
index 0000000000..e573a71d98
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-e.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-e')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.$id.tsx
new file mode 100644
index 0000000000..a71c17f96e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-f/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-f:${params.id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.about.tsx
new file mode 100644
index 0000000000..06831063ad
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-f/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.index.tsx
new file mode 100644
index 0000000000..4cd54b6a7f
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-f/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.settings.tsx
new file mode 100644
index 0000000000..92bdca5e44
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-f/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.tsx
new file mode 100644
index 0000000000..2fa27873e8
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/src/routes/sec-f.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/sec-f')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/tsconfig.json b/benchmarks/client-nav/scenarios/route-tree-scale/react/tsconfig.json
new file mode 100644
index 0000000000..1d59cbb450
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "jsxImportSource": "react",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/vite.config.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/vite.config.ts
new file mode 100644
index 0000000000..686907a506
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/vite.config.ts
@@ -0,0 +1,43 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import react from '@vitejs/plugin-react'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'react',
+ // Real file-based apps code-split by default; this scenario keeps it on
+ // so navigations also exercise lazy route-chunk resolution.
+ autoCodeSplitting: true,
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ react(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav route-tree-scale (react)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/shared.ts b/benchmarks/client-nav/scenarios/route-tree-scale/shared.ts
new file mode 100644
index 0000000000..8af5996804
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/shared.ts
@@ -0,0 +1,64 @@
+/**
+ * Shared definition of the `route-tree-scale` scenario: route matching,
+ * location building, and link-target resolution over a wide route tree
+ * (~40 routes) mixing static segments, dynamic params, prefixed params,
+ * splats, pathless layouts, and route groups. Navigations jump between
+ * distant branches so matching cannot reuse the previous branch.
+ */
+
+export const sections = [
+ 'sec-a',
+ 'sec-b',
+ 'sec-c',
+ 'sec-d',
+ 'sec-e',
+ 'sec-f',
+] as const
+
+export const steps = [
+ 'go-sec-a-id',
+ 'go-sec-f-settings',
+ 'go-files',
+ 'go-release',
+ 'go-alpha',
+ 'go-promo',
+ 'go-sec-c-id',
+ 'go-sec-d-about',
+ 'go-home',
+] as const
+
+// The dynamic ids and the splat carry characters that need percent-encoding
+// (spaces, `&`, `%`, `+`, unicode) so matching also exercises the segment
+// encode/decode paths.
+const expectedMarkers = [
+ 'sec-a:item 11%',
+ 'sec-f:settings',
+ 'files:x/ü y/z',
+ 'release:9',
+ 'alpha',
+ 'promo',
+ 'sec-c:q&a+42',
+ 'sec-d:about',
+ 'home',
+] as const
+
+export function assertStepResult(stepIndex: number) {
+ const expected = expectedMarkers[stepIndex]!
+ const actual = document.querySelector(
+ '[data-testid="scale-state"]',
+ )?.textContent
+ if (actual !== expected) {
+ throw new Error(
+ `Expected scale-state marker "${expected}" after step ${stepIndex}, received "${actual}"`,
+ )
+ }
+}
+
+// Three laps through the 9-step sequence per benchmark iteration.
+export const ticksPerIteration = 27
+
+export const benchOptions = {
+ warmupIterations: 100,
+ time: 10_000,
+ throws: true,
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/project.json b/benchmarks/client-nav/scenarios/route-tree-scale/solid/project.json
new file mode 100644
index 0000000000..c568e41196
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-route-tree-scale-solid",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/route-tree-scale/solid/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/setup.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/setup.ts
new file mode 100644
index 0000000000..6a46971603
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Solid',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts
new file mode 100644
index 0000000000..3d7a22a027
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-route-tree-scale', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-route-tree-scale navigation loop (solid)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
new file mode 100644
index 0000000000..817045bd02
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
@@ -0,0 +1,32 @@
+import { render } from 'solid-js/web'
+import { RouterProvider, createRouter } from '@tanstack/solid-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/solid-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const unmount = render(() => , container)
+
+ return {
+ router,
+ unmount,
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts
new file mode 100644
index 0000000000..20b4af6146
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts
@@ -0,0 +1,881 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as SecFRouteImport } from './routes/sec-f'
+import { Route as SecERouteImport } from './routes/sec-e'
+import { Route as SecDRouteImport } from './routes/sec-d'
+import { Route as SecCRouteImport } from './routes/sec-c'
+import { Route as SecBRouteImport } from './routes/sec-b'
+import { Route as SecARouteImport } from './routes/sec-a'
+import { Route as LayoutRouteImport } from './routes/_layout'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SecFIndexRouteImport } from './routes/sec-f.index'
+import { Route as SecEIndexRouteImport } from './routes/sec-e.index'
+import { Route as SecDIndexRouteImport } from './routes/sec-d.index'
+import { Route as SecCIndexRouteImport } from './routes/sec-c.index'
+import { Route as SecBIndexRouteImport } from './routes/sec-b.index'
+import { Route as SecAIndexRouteImport } from './routes/sec-a.index'
+import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings'
+import { Route as SecFAboutRouteImport } from './routes/sec-f.about'
+import { Route as SecFIdRouteImport } from './routes/sec-f.$id'
+import { Route as SecESettingsRouteImport } from './routes/sec-e.settings'
+import { Route as SecEAboutRouteImport } from './routes/sec-e.about'
+import { Route as SecEIdRouteImport } from './routes/sec-e.$id'
+import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings'
+import { Route as SecDAboutRouteImport } from './routes/sec-d.about'
+import { Route as SecDIdRouteImport } from './routes/sec-d.$id'
+import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings'
+import { Route as SecCAboutRouteImport } from './routes/sec-c.about'
+import { Route as SecCIdRouteImport } from './routes/sec-c.$id'
+import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings'
+import { Route as SecBAboutRouteImport } from './routes/sec-b.about'
+import { Route as SecBIdRouteImport } from './routes/sec-b.$id'
+import { Route as SecASettingsRouteImport } from './routes/sec-a.settings'
+import { Route as SecAAboutRouteImport } from './routes/sec-a.about'
+import { Route as SecAIdRouteImport } from './routes/sec-a.$id'
+import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}'
+import { Route as FilesSplatRouteImport } from './routes/files.$'
+import { Route as LayoutBetaRouteImport } from './routes/_layout.beta'
+import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha'
+import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo'
+import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing'
+
+const SecFRoute = SecFRouteImport.update({
+ id: '/sec-f',
+ path: '/sec-f',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecERoute = SecERouteImport.update({
+ id: '/sec-e',
+ path: '/sec-e',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecDRoute = SecDRouteImport.update({
+ id: '/sec-d',
+ path: '/sec-d',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecCRoute = SecCRouteImport.update({
+ id: '/sec-c',
+ path: '/sec-c',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecBRoute = SecBRouteImport.update({
+ id: '/sec-b',
+ path: '/sec-b',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecARoute = SecARouteImport.update({
+ id: '/sec-a',
+ path: '/sec-a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutRoute = LayoutRouteImport.update({
+ id: '/_layout',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecFIndexRoute = SecFIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecEIndexRoute = SecEIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDIndexRoute = SecDIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCIndexRoute = SecCIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBIndexRoute = SecBIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecAIndexRoute = SecAIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecFSettingsRoute = SecFSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFAboutRoute = SecFAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFIdRoute = SecFIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecESettingsRoute = SecESettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEAboutRoute = SecEAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEIdRoute = SecEIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDSettingsRoute = SecDSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDAboutRoute = SecDAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDIdRoute = SecDIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCSettingsRoute = SecCSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCAboutRoute = SecCAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCIdRoute = SecCIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBSettingsRoute = SecBSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBAboutRoute = SecBAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBIdRoute = SecBIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecASettingsRoute = SecASettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAAboutRoute = SecAAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAIdRoute = SecAIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecARoute,
+} as any)
+const ReleaseVChar123versionChar125Route =
+ ReleaseVChar123versionChar125RouteImport.update({
+ id: '/release/v{$version}',
+ path: '/release/v{$version}',
+ getParentRoute: () => rootRouteImport,
+ } as any)
+const FilesSplatRoute = FilesSplatRouteImport.update({
+ id: '/files/$',
+ path: '/files/$',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutBetaRoute = LayoutBetaRouteImport.update({
+ id: '/beta',
+ path: '/beta',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const LayoutAlphaRoute = LayoutAlphaRouteImport.update({
+ id: '/alpha',
+ path: '/alpha',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const marketingPromoRoute = marketingPromoRouteImport.update({
+ id: '/(marketing)/promo',
+ path: '/promo',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const marketingPricingRoute = marketingPricingRouteImport.update({
+ id: '/(marketing)/pricing',
+ path: '/pricing',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a': typeof SecAIndexRoute
+ '/sec-b': typeof SecBIndexRoute
+ '/sec-c': typeof SecCIndexRoute
+ '/sec-d': typeof SecDIndexRoute
+ '/sec-e': typeof SecEIndexRoute
+ '/sec-f': typeof SecFIndexRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/_layout': typeof LayoutRouteWithChildren
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/(marketing)/pricing': typeof marketingPricingRoute
+ '/(marketing)/promo': typeof marketingPromoRoute
+ '/_layout/alpha': typeof LayoutAlphaRoute
+ '/_layout/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths:
+ | '/'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesByTo: FileRoutesByTo
+ to:
+ | '/'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ id:
+ | '__root__'
+ | '/'
+ | '/_layout'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/(marketing)/pricing'
+ | '/(marketing)/promo'
+ | '/_layout/alpha'
+ | '/_layout/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ LayoutRoute: typeof LayoutRouteWithChildren
+ SecARoute: typeof SecARouteWithChildren
+ SecBRoute: typeof SecBRouteWithChildren
+ SecCRoute: typeof SecCRouteWithChildren
+ SecDRoute: typeof SecDRouteWithChildren
+ SecERoute: typeof SecERouteWithChildren
+ SecFRoute: typeof SecFRouteWithChildren
+ marketingPricingRoute: typeof marketingPricingRoute
+ marketingPromoRoute: typeof marketingPromoRoute
+ FilesSplatRoute: typeof FilesSplatRoute
+ ReleaseVChar123versionChar125Route: typeof ReleaseVChar123versionChar125Route
+}
+
+declare module '@tanstack/solid-router' {
+ interface FileRoutesByPath {
+ '/sec-f': {
+ id: '/sec-f'
+ path: '/sec-f'
+ fullPath: '/sec-f'
+ preLoaderRoute: typeof SecFRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-e': {
+ id: '/sec-e'
+ path: '/sec-e'
+ fullPath: '/sec-e'
+ preLoaderRoute: typeof SecERouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-d': {
+ id: '/sec-d'
+ path: '/sec-d'
+ fullPath: '/sec-d'
+ preLoaderRoute: typeof SecDRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-c': {
+ id: '/sec-c'
+ path: '/sec-c'
+ fullPath: '/sec-c'
+ preLoaderRoute: typeof SecCRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-b': {
+ id: '/sec-b'
+ path: '/sec-b'
+ fullPath: '/sec-b'
+ preLoaderRoute: typeof SecBRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-a': {
+ id: '/sec-a'
+ path: '/sec-a'
+ fullPath: '/sec-a'
+ preLoaderRoute: typeof SecARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout': {
+ id: '/_layout'
+ path: ''
+ fullPath: '/'
+ preLoaderRoute: typeof LayoutRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-f/': {
+ id: '/sec-f/'
+ path: '/'
+ fullPath: '/sec-f/'
+ preLoaderRoute: typeof SecFIndexRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/': {
+ id: '/sec-e/'
+ path: '/'
+ fullPath: '/sec-e/'
+ preLoaderRoute: typeof SecEIndexRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/': {
+ id: '/sec-d/'
+ path: '/'
+ fullPath: '/sec-d/'
+ preLoaderRoute: typeof SecDIndexRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/': {
+ id: '/sec-c/'
+ path: '/'
+ fullPath: '/sec-c/'
+ preLoaderRoute: typeof SecCIndexRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/': {
+ id: '/sec-b/'
+ path: '/'
+ fullPath: '/sec-b/'
+ preLoaderRoute: typeof SecBIndexRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/': {
+ id: '/sec-a/'
+ path: '/'
+ fullPath: '/sec-a/'
+ preLoaderRoute: typeof SecAIndexRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-f/settings': {
+ id: '/sec-f/settings'
+ path: '/settings'
+ fullPath: '/sec-f/settings'
+ preLoaderRoute: typeof SecFSettingsRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/about': {
+ id: '/sec-f/about'
+ path: '/about'
+ fullPath: '/sec-f/about'
+ preLoaderRoute: typeof SecFAboutRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/$id': {
+ id: '/sec-f/$id'
+ path: '/$id'
+ fullPath: '/sec-f/$id'
+ preLoaderRoute: typeof SecFIdRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/settings': {
+ id: '/sec-e/settings'
+ path: '/settings'
+ fullPath: '/sec-e/settings'
+ preLoaderRoute: typeof SecESettingsRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/about': {
+ id: '/sec-e/about'
+ path: '/about'
+ fullPath: '/sec-e/about'
+ preLoaderRoute: typeof SecEAboutRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/$id': {
+ id: '/sec-e/$id'
+ path: '/$id'
+ fullPath: '/sec-e/$id'
+ preLoaderRoute: typeof SecEIdRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/settings': {
+ id: '/sec-d/settings'
+ path: '/settings'
+ fullPath: '/sec-d/settings'
+ preLoaderRoute: typeof SecDSettingsRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/about': {
+ id: '/sec-d/about'
+ path: '/about'
+ fullPath: '/sec-d/about'
+ preLoaderRoute: typeof SecDAboutRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/$id': {
+ id: '/sec-d/$id'
+ path: '/$id'
+ fullPath: '/sec-d/$id'
+ preLoaderRoute: typeof SecDIdRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/settings': {
+ id: '/sec-c/settings'
+ path: '/settings'
+ fullPath: '/sec-c/settings'
+ preLoaderRoute: typeof SecCSettingsRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/about': {
+ id: '/sec-c/about'
+ path: '/about'
+ fullPath: '/sec-c/about'
+ preLoaderRoute: typeof SecCAboutRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/$id': {
+ id: '/sec-c/$id'
+ path: '/$id'
+ fullPath: '/sec-c/$id'
+ preLoaderRoute: typeof SecCIdRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/settings': {
+ id: '/sec-b/settings'
+ path: '/settings'
+ fullPath: '/sec-b/settings'
+ preLoaderRoute: typeof SecBSettingsRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/about': {
+ id: '/sec-b/about'
+ path: '/about'
+ fullPath: '/sec-b/about'
+ preLoaderRoute: typeof SecBAboutRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/$id': {
+ id: '/sec-b/$id'
+ path: '/$id'
+ fullPath: '/sec-b/$id'
+ preLoaderRoute: typeof SecBIdRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/settings': {
+ id: '/sec-a/settings'
+ path: '/settings'
+ fullPath: '/sec-a/settings'
+ preLoaderRoute: typeof SecASettingsRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/about': {
+ id: '/sec-a/about'
+ path: '/about'
+ fullPath: '/sec-a/about'
+ preLoaderRoute: typeof SecAAboutRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/$id': {
+ id: '/sec-a/$id'
+ path: '/$id'
+ fullPath: '/sec-a/$id'
+ preLoaderRoute: typeof SecAIdRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/release/v{$version}': {
+ id: '/release/v{$version}'
+ path: '/release/v{$version}'
+ fullPath: '/release/v{$version}'
+ preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/files/$': {
+ id: '/files/$'
+ path: '/files/$'
+ fullPath: '/files/$'
+ preLoaderRoute: typeof FilesSplatRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout/beta': {
+ id: '/_layout/beta'
+ path: '/beta'
+ fullPath: '/beta'
+ preLoaderRoute: typeof LayoutBetaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/_layout/alpha': {
+ id: '/_layout/alpha'
+ path: '/alpha'
+ fullPath: '/alpha'
+ preLoaderRoute: typeof LayoutAlphaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/(marketing)/promo': {
+ id: '/(marketing)/promo'
+ path: '/promo'
+ fullPath: '/promo'
+ preLoaderRoute: typeof marketingPromoRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/(marketing)/pricing': {
+ id: '/(marketing)/pricing'
+ path: '/pricing'
+ fullPath: '/pricing'
+ preLoaderRoute: typeof marketingPricingRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+interface LayoutRouteChildren {
+ LayoutAlphaRoute: typeof LayoutAlphaRoute
+ LayoutBetaRoute: typeof LayoutBetaRoute
+}
+
+const LayoutRouteChildren: LayoutRouteChildren = {
+ LayoutAlphaRoute: LayoutAlphaRoute,
+ LayoutBetaRoute: LayoutBetaRoute,
+}
+
+const LayoutRouteWithChildren =
+ LayoutRoute._addFileChildren(LayoutRouteChildren)
+
+interface SecARouteChildren {
+ SecAIdRoute: typeof SecAIdRoute
+ SecAAboutRoute: typeof SecAAboutRoute
+ SecASettingsRoute: typeof SecASettingsRoute
+ SecAIndexRoute: typeof SecAIndexRoute
+}
+
+const SecARouteChildren: SecARouteChildren = {
+ SecAIdRoute: SecAIdRoute,
+ SecAAboutRoute: SecAAboutRoute,
+ SecASettingsRoute: SecASettingsRoute,
+ SecAIndexRoute: SecAIndexRoute,
+}
+
+const SecARouteWithChildren = SecARoute._addFileChildren(SecARouteChildren)
+
+interface SecBRouteChildren {
+ SecBIdRoute: typeof SecBIdRoute
+ SecBAboutRoute: typeof SecBAboutRoute
+ SecBSettingsRoute: typeof SecBSettingsRoute
+ SecBIndexRoute: typeof SecBIndexRoute
+}
+
+const SecBRouteChildren: SecBRouteChildren = {
+ SecBIdRoute: SecBIdRoute,
+ SecBAboutRoute: SecBAboutRoute,
+ SecBSettingsRoute: SecBSettingsRoute,
+ SecBIndexRoute: SecBIndexRoute,
+}
+
+const SecBRouteWithChildren = SecBRoute._addFileChildren(SecBRouteChildren)
+
+interface SecCRouteChildren {
+ SecCIdRoute: typeof SecCIdRoute
+ SecCAboutRoute: typeof SecCAboutRoute
+ SecCSettingsRoute: typeof SecCSettingsRoute
+ SecCIndexRoute: typeof SecCIndexRoute
+}
+
+const SecCRouteChildren: SecCRouteChildren = {
+ SecCIdRoute: SecCIdRoute,
+ SecCAboutRoute: SecCAboutRoute,
+ SecCSettingsRoute: SecCSettingsRoute,
+ SecCIndexRoute: SecCIndexRoute,
+}
+
+const SecCRouteWithChildren = SecCRoute._addFileChildren(SecCRouteChildren)
+
+interface SecDRouteChildren {
+ SecDIdRoute: typeof SecDIdRoute
+ SecDAboutRoute: typeof SecDAboutRoute
+ SecDSettingsRoute: typeof SecDSettingsRoute
+ SecDIndexRoute: typeof SecDIndexRoute
+}
+
+const SecDRouteChildren: SecDRouteChildren = {
+ SecDIdRoute: SecDIdRoute,
+ SecDAboutRoute: SecDAboutRoute,
+ SecDSettingsRoute: SecDSettingsRoute,
+ SecDIndexRoute: SecDIndexRoute,
+}
+
+const SecDRouteWithChildren = SecDRoute._addFileChildren(SecDRouteChildren)
+
+interface SecERouteChildren {
+ SecEIdRoute: typeof SecEIdRoute
+ SecEAboutRoute: typeof SecEAboutRoute
+ SecESettingsRoute: typeof SecESettingsRoute
+ SecEIndexRoute: typeof SecEIndexRoute
+}
+
+const SecERouteChildren: SecERouteChildren = {
+ SecEIdRoute: SecEIdRoute,
+ SecEAboutRoute: SecEAboutRoute,
+ SecESettingsRoute: SecESettingsRoute,
+ SecEIndexRoute: SecEIndexRoute,
+}
+
+const SecERouteWithChildren = SecERoute._addFileChildren(SecERouteChildren)
+
+interface SecFRouteChildren {
+ SecFIdRoute: typeof SecFIdRoute
+ SecFAboutRoute: typeof SecFAboutRoute
+ SecFSettingsRoute: typeof SecFSettingsRoute
+ SecFIndexRoute: typeof SecFIndexRoute
+}
+
+const SecFRouteChildren: SecFRouteChildren = {
+ SecFIdRoute: SecFIdRoute,
+ SecFAboutRoute: SecFAboutRoute,
+ SecFSettingsRoute: SecFSettingsRoute,
+ SecFIndexRoute: SecFIndexRoute,
+}
+
+const SecFRouteWithChildren = SecFRoute._addFileChildren(SecFRouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ LayoutRoute: LayoutRouteWithChildren,
+ SecARoute: SecARouteWithChildren,
+ SecBRoute: SecBRouteWithChildren,
+ SecCRoute: SecCRouteWithChildren,
+ SecDRoute: SecDRouteWithChildren,
+ SecERoute: SecERouteWithChildren,
+ SecFRoute: SecFRouteWithChildren,
+ marketingPricingRoute: marketingPricingRoute,
+ marketingPromoRoute: marketingPromoRoute,
+ FilesSplatRoute: FilesSplatRoute,
+ ReleaseVChar123versionChar125Route: ReleaseVChar123versionChar125Route,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/pricing.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/pricing.tsx
new file mode 100644
index 0000000000..0965507de6
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/pricing.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/(marketing)/pricing')({
+ component: Page,
+})
+
+function Page() {
+ return pricing
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/promo.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/promo.tsx
new file mode 100644
index 0000000000..220bd06a68
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/(marketing)/promo.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/(marketing)/promo')({
+ component: Page,
+})
+
+function Page() {
+ return promo
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/__root.tsx
new file mode 100644
index 0000000000..a4e4113d9a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/__root.tsx
@@ -0,0 +1,58 @@
+import { Link, Outlet, createRootRoute } from '@tanstack/solid-router'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+function RootComponent() {
+ return (
+ <>
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.alpha.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.alpha.tsx
new file mode 100644
index 0000000000..234b8488a9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.alpha.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/_layout/alpha')({
+ component: Page,
+})
+
+function Page() {
+ return alpha
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.beta.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.beta.tsx
new file mode 100644
index 0000000000..39bc716efa
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.beta.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/_layout/beta')({
+ component: Page,
+})
+
+function Page() {
+ return beta
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.tsx
new file mode 100644
index 0000000000..f1e499d3b3
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/_layout.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/_layout')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/files.$.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/files.$.tsx
new file mode 100644
index 0000000000..47b1a5eea9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/files.$.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/files/$')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`files:${params()._splat}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/index.tsx
new file mode 100644
index 0000000000..25b1c03c1a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/')({
+ component: Page,
+})
+
+function Page() {
+ return home
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/release.v{$version}.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/release.v{$version}.tsx
new file mode 100644
index 0000000000..0dbcee35ca
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/release.v{$version}.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/release/v{$version}')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`release:${params().version}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.$id.tsx
new file mode 100644
index 0000000000..18731a2844
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-a/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-a:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.about.tsx
new file mode 100644
index 0000000000..1699360a1c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-a/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.index.tsx
new file mode 100644
index 0000000000..e71e525d07
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-a/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.settings.tsx
new file mode 100644
index 0000000000..49d470190e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-a/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-a:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.tsx
new file mode 100644
index 0000000000..2861169fb9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-a.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-a')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.$id.tsx
new file mode 100644
index 0000000000..86fe71d7c0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-b/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-b:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.about.tsx
new file mode 100644
index 0000000000..586b829cd0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-b/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.index.tsx
new file mode 100644
index 0000000000..7098416658
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-b/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.settings.tsx
new file mode 100644
index 0000000000..c2e0f47650
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-b/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-b:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.tsx
new file mode 100644
index 0000000000..f2905da9ca
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-b.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-b')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.$id.tsx
new file mode 100644
index 0000000000..3e07e8033a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-c/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-c:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.about.tsx
new file mode 100644
index 0000000000..86ed5043a3
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-c/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.index.tsx
new file mode 100644
index 0000000000..aa9ed2dc6c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-c/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.settings.tsx
new file mode 100644
index 0000000000..d0dd3e952c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-c/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-c:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.tsx
new file mode 100644
index 0000000000..fa53825238
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-c.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-c')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.$id.tsx
new file mode 100644
index 0000000000..3722012d7c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-d/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-d:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.about.tsx
new file mode 100644
index 0000000000..860d2b9e5b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-d/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.index.tsx
new file mode 100644
index 0000000000..ec7b8eaf2c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-d/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.settings.tsx
new file mode 100644
index 0000000000..d83e3885fd
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-d/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-d:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.tsx
new file mode 100644
index 0000000000..e71391e2a3
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-d.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-d')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.$id.tsx
new file mode 100644
index 0000000000..e58d9d77ac
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-e/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-e:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.about.tsx
new file mode 100644
index 0000000000..3ef4d2c763
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-e/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.index.tsx
new file mode 100644
index 0000000000..88bf7ca271
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-e/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.settings.tsx
new file mode 100644
index 0000000000..8a9945926d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-e/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-e:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.tsx
new file mode 100644
index 0000000000..8b5ef24519
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-e.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-e')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.$id.tsx
new file mode 100644
index 0000000000..2b81ef96ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.$id.tsx
@@ -0,0 +1,11 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-f/$id')({
+ component: Page,
+})
+
+function Page() {
+ const params = Route.useParams()
+
+ return {`sec-f:${params().id}`}
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.about.tsx
new file mode 100644
index 0000000000..1c4e3a5474
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.about.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-f/about')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:about
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.index.tsx
new file mode 100644
index 0000000000..65803ee848
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.index.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-f/')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:index
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.settings.tsx
new file mode 100644
index 0000000000..5761138262
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.settings.tsx
@@ -0,0 +1,9 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-f/settings')({
+ component: Page,
+})
+
+function Page() {
+ return sec-f:settings
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.tsx
new file mode 100644
index 0000000000..c7f25eecdd
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routes/sec-f.tsx
@@ -0,0 +1,9 @@
+import { Outlet, createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/sec-f')({
+ component: Layout,
+})
+
+function Layout() {
+ return
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json b/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json
new file mode 100644
index 0000000000..98d76ad6b8
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts
new file mode 100644
index 0000000000..dd0bd234e0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts
@@ -0,0 +1,51 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import solid from 'vite-plugin-solid'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'solid',
+ // Real file-based apps code-split by default; this scenario keeps it on
+ // so navigations also exercise lazy route-chunk resolution.
+ autoCodeSplitting: true,
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ solid({ hot: false, dev: false }),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ resolve: {
+ conditions: ['solid', 'browser'],
+ },
+ test: {
+ name: '@benchmarks/client-nav route-tree-scale (solid)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ server: {
+ deps: {
+ inline: [/@solidjs/, /@tanstack\/solid-store/],
+ },
+ },
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/project.json b/benchmarks/client-nav/scenarios/route-tree-scale/vue/project.json
new file mode 100644
index 0000000000..f613070038
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-route-tree-scale-vue",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/route-tree-scale/vue/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/setup.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/setup.ts
new file mode 100644
index 0000000000..97b74b3892
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Vue',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts
new file mode 100644
index 0000000000..a767b8d220
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-route-tree-scale', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-route-tree-scale navigation loop (vue)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/main.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/main.tsx
new file mode 100644
index 0000000000..c96d3f3a2e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/main.tsx
@@ -0,0 +1,39 @@
+import * as Vue from 'vue'
+import { RouterProvider, createRouter } from '@tanstack/vue-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+}
+
+declare module '@tanstack/vue-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const component =
+ const app = Vue.createApp({
+ render: () => component,
+ })
+
+ app.mount(container)
+
+ return {
+ router,
+ unmount() {
+ app.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts
new file mode 100644
index 0000000000..a03c051a79
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts
@@ -0,0 +1,881 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as SecFRouteImport } from './routes/sec-f'
+import { Route as SecERouteImport } from './routes/sec-e'
+import { Route as SecDRouteImport } from './routes/sec-d'
+import { Route as SecCRouteImport } from './routes/sec-c'
+import { Route as SecBRouteImport } from './routes/sec-b'
+import { Route as SecARouteImport } from './routes/sec-a'
+import { Route as LayoutRouteImport } from './routes/_layout'
+import { Route as IndexRouteImport } from './routes/index'
+import { Route as SecFIndexRouteImport } from './routes/sec-f.index'
+import { Route as SecEIndexRouteImport } from './routes/sec-e.index'
+import { Route as SecDIndexRouteImport } from './routes/sec-d.index'
+import { Route as SecCIndexRouteImport } from './routes/sec-c.index'
+import { Route as SecBIndexRouteImport } from './routes/sec-b.index'
+import { Route as SecAIndexRouteImport } from './routes/sec-a.index'
+import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings'
+import { Route as SecFAboutRouteImport } from './routes/sec-f.about'
+import { Route as SecFIdRouteImport } from './routes/sec-f.$id'
+import { Route as SecESettingsRouteImport } from './routes/sec-e.settings'
+import { Route as SecEAboutRouteImport } from './routes/sec-e.about'
+import { Route as SecEIdRouteImport } from './routes/sec-e.$id'
+import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings'
+import { Route as SecDAboutRouteImport } from './routes/sec-d.about'
+import { Route as SecDIdRouteImport } from './routes/sec-d.$id'
+import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings'
+import { Route as SecCAboutRouteImport } from './routes/sec-c.about'
+import { Route as SecCIdRouteImport } from './routes/sec-c.$id'
+import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings'
+import { Route as SecBAboutRouteImport } from './routes/sec-b.about'
+import { Route as SecBIdRouteImport } from './routes/sec-b.$id'
+import { Route as SecASettingsRouteImport } from './routes/sec-a.settings'
+import { Route as SecAAboutRouteImport } from './routes/sec-a.about'
+import { Route as SecAIdRouteImport } from './routes/sec-a.$id'
+import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}'
+import { Route as FilesSplatRouteImport } from './routes/files.$'
+import { Route as LayoutBetaRouteImport } from './routes/_layout.beta'
+import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha'
+import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo'
+import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing'
+
+const SecFRoute = SecFRouteImport.update({
+ id: '/sec-f',
+ path: '/sec-f',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecERoute = SecERouteImport.update({
+ id: '/sec-e',
+ path: '/sec-e',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecDRoute = SecDRouteImport.update({
+ id: '/sec-d',
+ path: '/sec-d',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecCRoute = SecCRouteImport.update({
+ id: '/sec-c',
+ path: '/sec-c',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecBRoute = SecBRouteImport.update({
+ id: '/sec-b',
+ path: '/sec-b',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecARoute = SecARouteImport.update({
+ id: '/sec-a',
+ path: '/sec-a',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutRoute = LayoutRouteImport.update({
+ id: '/_layout',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const SecFIndexRoute = SecFIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecEIndexRoute = SecEIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDIndexRoute = SecDIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCIndexRoute = SecCIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBIndexRoute = SecBIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecAIndexRoute = SecAIndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecFSettingsRoute = SecFSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFAboutRoute = SecFAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecFIdRoute = SecFIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecFRoute,
+} as any)
+const SecESettingsRoute = SecESettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEAboutRoute = SecEAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecEIdRoute = SecEIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecERoute,
+} as any)
+const SecDSettingsRoute = SecDSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDAboutRoute = SecDAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecDIdRoute = SecDIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecDRoute,
+} as any)
+const SecCSettingsRoute = SecCSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCAboutRoute = SecCAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecCIdRoute = SecCIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecCRoute,
+} as any)
+const SecBSettingsRoute = SecBSettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBAboutRoute = SecBAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecBIdRoute = SecBIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecBRoute,
+} as any)
+const SecASettingsRoute = SecASettingsRouteImport.update({
+ id: '/settings',
+ path: '/settings',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAAboutRoute = SecAAboutRouteImport.update({
+ id: '/about',
+ path: '/about',
+ getParentRoute: () => SecARoute,
+} as any)
+const SecAIdRoute = SecAIdRouteImport.update({
+ id: '/$id',
+ path: '/$id',
+ getParentRoute: () => SecARoute,
+} as any)
+const ReleaseVChar123versionChar125Route =
+ ReleaseVChar123versionChar125RouteImport.update({
+ id: '/release/v{$version}',
+ path: '/release/v{$version}',
+ getParentRoute: () => rootRouteImport,
+ } as any)
+const FilesSplatRoute = FilesSplatRouteImport.update({
+ id: '/files/$',
+ path: '/files/$',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const LayoutBetaRoute = LayoutBetaRouteImport.update({
+ id: '/beta',
+ path: '/beta',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const LayoutAlphaRoute = LayoutAlphaRouteImport.update({
+ id: '/alpha',
+ path: '/alpha',
+ getParentRoute: () => LayoutRoute,
+} as any)
+const marketingPromoRoute = marketingPromoRouteImport.update({
+ id: '/(marketing)/promo',
+ path: '/promo',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const marketingPricingRoute = marketingPricingRouteImport.update({
+ id: '/(marketing)/pricing',
+ path: '/pricing',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/pricing': typeof marketingPricingRoute
+ '/promo': typeof marketingPromoRoute
+ '/alpha': typeof LayoutAlphaRoute
+ '/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a': typeof SecAIndexRoute
+ '/sec-b': typeof SecBIndexRoute
+ '/sec-c': typeof SecCIndexRoute
+ '/sec-d': typeof SecDIndexRoute
+ '/sec-e': typeof SecEIndexRoute
+ '/sec-f': typeof SecFIndexRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/_layout': typeof LayoutRouteWithChildren
+ '/sec-a': typeof SecARouteWithChildren
+ '/sec-b': typeof SecBRouteWithChildren
+ '/sec-c': typeof SecCRouteWithChildren
+ '/sec-d': typeof SecDRouteWithChildren
+ '/sec-e': typeof SecERouteWithChildren
+ '/sec-f': typeof SecFRouteWithChildren
+ '/(marketing)/pricing': typeof marketingPricingRoute
+ '/(marketing)/promo': typeof marketingPromoRoute
+ '/_layout/alpha': typeof LayoutAlphaRoute
+ '/_layout/beta': typeof LayoutBetaRoute
+ '/files/$': typeof FilesSplatRoute
+ '/release/v{$version}': typeof ReleaseVChar123versionChar125Route
+ '/sec-a/$id': typeof SecAIdRoute
+ '/sec-a/about': typeof SecAAboutRoute
+ '/sec-a/settings': typeof SecASettingsRoute
+ '/sec-b/$id': typeof SecBIdRoute
+ '/sec-b/about': typeof SecBAboutRoute
+ '/sec-b/settings': typeof SecBSettingsRoute
+ '/sec-c/$id': typeof SecCIdRoute
+ '/sec-c/about': typeof SecCAboutRoute
+ '/sec-c/settings': typeof SecCSettingsRoute
+ '/sec-d/$id': typeof SecDIdRoute
+ '/sec-d/about': typeof SecDAboutRoute
+ '/sec-d/settings': typeof SecDSettingsRoute
+ '/sec-e/$id': typeof SecEIdRoute
+ '/sec-e/about': typeof SecEAboutRoute
+ '/sec-e/settings': typeof SecESettingsRoute
+ '/sec-f/$id': typeof SecFIdRoute
+ '/sec-f/about': typeof SecFAboutRoute
+ '/sec-f/settings': typeof SecFSettingsRoute
+ '/sec-a/': typeof SecAIndexRoute
+ '/sec-b/': typeof SecBIndexRoute
+ '/sec-c/': typeof SecCIndexRoute
+ '/sec-d/': typeof SecDIndexRoute
+ '/sec-e/': typeof SecEIndexRoute
+ '/sec-f/': typeof SecFIndexRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths:
+ | '/'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesByTo: FileRoutesByTo
+ to:
+ | '/'
+ | '/pricing'
+ | '/promo'
+ | '/alpha'
+ | '/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ id:
+ | '__root__'
+ | '/'
+ | '/_layout'
+ | '/sec-a'
+ | '/sec-b'
+ | '/sec-c'
+ | '/sec-d'
+ | '/sec-e'
+ | '/sec-f'
+ | '/(marketing)/pricing'
+ | '/(marketing)/promo'
+ | '/_layout/alpha'
+ | '/_layout/beta'
+ | '/files/$'
+ | '/release/v{$version}'
+ | '/sec-a/$id'
+ | '/sec-a/about'
+ | '/sec-a/settings'
+ | '/sec-b/$id'
+ | '/sec-b/about'
+ | '/sec-b/settings'
+ | '/sec-c/$id'
+ | '/sec-c/about'
+ | '/sec-c/settings'
+ | '/sec-d/$id'
+ | '/sec-d/about'
+ | '/sec-d/settings'
+ | '/sec-e/$id'
+ | '/sec-e/about'
+ | '/sec-e/settings'
+ | '/sec-f/$id'
+ | '/sec-f/about'
+ | '/sec-f/settings'
+ | '/sec-a/'
+ | '/sec-b/'
+ | '/sec-c/'
+ | '/sec-d/'
+ | '/sec-e/'
+ | '/sec-f/'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ LayoutRoute: typeof LayoutRouteWithChildren
+ SecARoute: typeof SecARouteWithChildren
+ SecBRoute: typeof SecBRouteWithChildren
+ SecCRoute: typeof SecCRouteWithChildren
+ SecDRoute: typeof SecDRouteWithChildren
+ SecERoute: typeof SecERouteWithChildren
+ SecFRoute: typeof SecFRouteWithChildren
+ marketingPricingRoute: typeof marketingPricingRoute
+ marketingPromoRoute: typeof marketingPromoRoute
+ FilesSplatRoute: typeof FilesSplatRoute
+ ReleaseVChar123versionChar125Route: typeof ReleaseVChar123versionChar125Route
+}
+
+declare module '@tanstack/vue-router' {
+ interface FileRoutesByPath {
+ '/sec-f': {
+ id: '/sec-f'
+ path: '/sec-f'
+ fullPath: '/sec-f'
+ preLoaderRoute: typeof SecFRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-e': {
+ id: '/sec-e'
+ path: '/sec-e'
+ fullPath: '/sec-e'
+ preLoaderRoute: typeof SecERouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-d': {
+ id: '/sec-d'
+ path: '/sec-d'
+ fullPath: '/sec-d'
+ preLoaderRoute: typeof SecDRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-c': {
+ id: '/sec-c'
+ path: '/sec-c'
+ fullPath: '/sec-c'
+ preLoaderRoute: typeof SecCRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-b': {
+ id: '/sec-b'
+ path: '/sec-b'
+ fullPath: '/sec-b'
+ preLoaderRoute: typeof SecBRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-a': {
+ id: '/sec-a'
+ path: '/sec-a'
+ fullPath: '/sec-a'
+ preLoaderRoute: typeof SecARouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout': {
+ id: '/_layout'
+ path: ''
+ fullPath: '/'
+ preLoaderRoute: typeof LayoutRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/sec-f/': {
+ id: '/sec-f/'
+ path: '/'
+ fullPath: '/sec-f/'
+ preLoaderRoute: typeof SecFIndexRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/': {
+ id: '/sec-e/'
+ path: '/'
+ fullPath: '/sec-e/'
+ preLoaderRoute: typeof SecEIndexRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/': {
+ id: '/sec-d/'
+ path: '/'
+ fullPath: '/sec-d/'
+ preLoaderRoute: typeof SecDIndexRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/': {
+ id: '/sec-c/'
+ path: '/'
+ fullPath: '/sec-c/'
+ preLoaderRoute: typeof SecCIndexRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/': {
+ id: '/sec-b/'
+ path: '/'
+ fullPath: '/sec-b/'
+ preLoaderRoute: typeof SecBIndexRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/': {
+ id: '/sec-a/'
+ path: '/'
+ fullPath: '/sec-a/'
+ preLoaderRoute: typeof SecAIndexRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-f/settings': {
+ id: '/sec-f/settings'
+ path: '/settings'
+ fullPath: '/sec-f/settings'
+ preLoaderRoute: typeof SecFSettingsRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/about': {
+ id: '/sec-f/about'
+ path: '/about'
+ fullPath: '/sec-f/about'
+ preLoaderRoute: typeof SecFAboutRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-f/$id': {
+ id: '/sec-f/$id'
+ path: '/$id'
+ fullPath: '/sec-f/$id'
+ preLoaderRoute: typeof SecFIdRouteImport
+ parentRoute: typeof SecFRoute
+ }
+ '/sec-e/settings': {
+ id: '/sec-e/settings'
+ path: '/settings'
+ fullPath: '/sec-e/settings'
+ preLoaderRoute: typeof SecESettingsRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/about': {
+ id: '/sec-e/about'
+ path: '/about'
+ fullPath: '/sec-e/about'
+ preLoaderRoute: typeof SecEAboutRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-e/$id': {
+ id: '/sec-e/$id'
+ path: '/$id'
+ fullPath: '/sec-e/$id'
+ preLoaderRoute: typeof SecEIdRouteImport
+ parentRoute: typeof SecERoute
+ }
+ '/sec-d/settings': {
+ id: '/sec-d/settings'
+ path: '/settings'
+ fullPath: '/sec-d/settings'
+ preLoaderRoute: typeof SecDSettingsRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/about': {
+ id: '/sec-d/about'
+ path: '/about'
+ fullPath: '/sec-d/about'
+ preLoaderRoute: typeof SecDAboutRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-d/$id': {
+ id: '/sec-d/$id'
+ path: '/$id'
+ fullPath: '/sec-d/$id'
+ preLoaderRoute: typeof SecDIdRouteImport
+ parentRoute: typeof SecDRoute
+ }
+ '/sec-c/settings': {
+ id: '/sec-c/settings'
+ path: '/settings'
+ fullPath: '/sec-c/settings'
+ preLoaderRoute: typeof SecCSettingsRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/about': {
+ id: '/sec-c/about'
+ path: '/about'
+ fullPath: '/sec-c/about'
+ preLoaderRoute: typeof SecCAboutRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-c/$id': {
+ id: '/sec-c/$id'
+ path: '/$id'
+ fullPath: '/sec-c/$id'
+ preLoaderRoute: typeof SecCIdRouteImport
+ parentRoute: typeof SecCRoute
+ }
+ '/sec-b/settings': {
+ id: '/sec-b/settings'
+ path: '/settings'
+ fullPath: '/sec-b/settings'
+ preLoaderRoute: typeof SecBSettingsRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/about': {
+ id: '/sec-b/about'
+ path: '/about'
+ fullPath: '/sec-b/about'
+ preLoaderRoute: typeof SecBAboutRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-b/$id': {
+ id: '/sec-b/$id'
+ path: '/$id'
+ fullPath: '/sec-b/$id'
+ preLoaderRoute: typeof SecBIdRouteImport
+ parentRoute: typeof SecBRoute
+ }
+ '/sec-a/settings': {
+ id: '/sec-a/settings'
+ path: '/settings'
+ fullPath: '/sec-a/settings'
+ preLoaderRoute: typeof SecASettingsRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/about': {
+ id: '/sec-a/about'
+ path: '/about'
+ fullPath: '/sec-a/about'
+ preLoaderRoute: typeof SecAAboutRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/sec-a/$id': {
+ id: '/sec-a/$id'
+ path: '/$id'
+ fullPath: '/sec-a/$id'
+ preLoaderRoute: typeof SecAIdRouteImport
+ parentRoute: typeof SecARoute
+ }
+ '/release/v{$version}': {
+ id: '/release/v{$version}'
+ path: '/release/v{$version}'
+ fullPath: '/release/v{$version}'
+ preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/files/$': {
+ id: '/files/$'
+ path: '/files/$'
+ fullPath: '/files/$'
+ preLoaderRoute: typeof FilesSplatRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/_layout/beta': {
+ id: '/_layout/beta'
+ path: '/beta'
+ fullPath: '/beta'
+ preLoaderRoute: typeof LayoutBetaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/_layout/alpha': {
+ id: '/_layout/alpha'
+ path: '/alpha'
+ fullPath: '/alpha'
+ preLoaderRoute: typeof LayoutAlphaRouteImport
+ parentRoute: typeof LayoutRoute
+ }
+ '/(marketing)/promo': {
+ id: '/(marketing)/promo'
+ path: '/promo'
+ fullPath: '/promo'
+ preLoaderRoute: typeof marketingPromoRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/(marketing)/pricing': {
+ id: '/(marketing)/pricing'
+ path: '/pricing'
+ fullPath: '/pricing'
+ preLoaderRoute: typeof marketingPricingRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+interface LayoutRouteChildren {
+ LayoutAlphaRoute: typeof LayoutAlphaRoute
+ LayoutBetaRoute: typeof LayoutBetaRoute
+}
+
+const LayoutRouteChildren: LayoutRouteChildren = {
+ LayoutAlphaRoute: LayoutAlphaRoute,
+ LayoutBetaRoute: LayoutBetaRoute,
+}
+
+const LayoutRouteWithChildren =
+ LayoutRoute._addFileChildren(LayoutRouteChildren)
+
+interface SecARouteChildren {
+ SecAIdRoute: typeof SecAIdRoute
+ SecAAboutRoute: typeof SecAAboutRoute
+ SecASettingsRoute: typeof SecASettingsRoute
+ SecAIndexRoute: typeof SecAIndexRoute
+}
+
+const SecARouteChildren: SecARouteChildren = {
+ SecAIdRoute: SecAIdRoute,
+ SecAAboutRoute: SecAAboutRoute,
+ SecASettingsRoute: SecASettingsRoute,
+ SecAIndexRoute: SecAIndexRoute,
+}
+
+const SecARouteWithChildren = SecARoute._addFileChildren(SecARouteChildren)
+
+interface SecBRouteChildren {
+ SecBIdRoute: typeof SecBIdRoute
+ SecBAboutRoute: typeof SecBAboutRoute
+ SecBSettingsRoute: typeof SecBSettingsRoute
+ SecBIndexRoute: typeof SecBIndexRoute
+}
+
+const SecBRouteChildren: SecBRouteChildren = {
+ SecBIdRoute: SecBIdRoute,
+ SecBAboutRoute: SecBAboutRoute,
+ SecBSettingsRoute: SecBSettingsRoute,
+ SecBIndexRoute: SecBIndexRoute,
+}
+
+const SecBRouteWithChildren = SecBRoute._addFileChildren(SecBRouteChildren)
+
+interface SecCRouteChildren {
+ SecCIdRoute: typeof SecCIdRoute
+ SecCAboutRoute: typeof SecCAboutRoute
+ SecCSettingsRoute: typeof SecCSettingsRoute
+ SecCIndexRoute: typeof SecCIndexRoute
+}
+
+const SecCRouteChildren: SecCRouteChildren = {
+ SecCIdRoute: SecCIdRoute,
+ SecCAboutRoute: SecCAboutRoute,
+ SecCSettingsRoute: SecCSettingsRoute,
+ SecCIndexRoute: SecCIndexRoute,
+}
+
+const SecCRouteWithChildren = SecCRoute._addFileChildren(SecCRouteChildren)
+
+interface SecDRouteChildren {
+ SecDIdRoute: typeof SecDIdRoute
+ SecDAboutRoute: typeof SecDAboutRoute
+ SecDSettingsRoute: typeof SecDSettingsRoute
+ SecDIndexRoute: typeof SecDIndexRoute
+}
+
+const SecDRouteChildren: SecDRouteChildren = {
+ SecDIdRoute: SecDIdRoute,
+ SecDAboutRoute: SecDAboutRoute,
+ SecDSettingsRoute: SecDSettingsRoute,
+ SecDIndexRoute: SecDIndexRoute,
+}
+
+const SecDRouteWithChildren = SecDRoute._addFileChildren(SecDRouteChildren)
+
+interface SecERouteChildren {
+ SecEIdRoute: typeof SecEIdRoute
+ SecEAboutRoute: typeof SecEAboutRoute
+ SecESettingsRoute: typeof SecESettingsRoute
+ SecEIndexRoute: typeof SecEIndexRoute
+}
+
+const SecERouteChildren: SecERouteChildren = {
+ SecEIdRoute: SecEIdRoute,
+ SecEAboutRoute: SecEAboutRoute,
+ SecESettingsRoute: SecESettingsRoute,
+ SecEIndexRoute: SecEIndexRoute,
+}
+
+const SecERouteWithChildren = SecERoute._addFileChildren(SecERouteChildren)
+
+interface SecFRouteChildren {
+ SecFIdRoute: typeof SecFIdRoute
+ SecFAboutRoute: typeof SecFAboutRoute
+ SecFSettingsRoute: typeof SecFSettingsRoute
+ SecFIndexRoute: typeof SecFIndexRoute
+}
+
+const SecFRouteChildren: SecFRouteChildren = {
+ SecFIdRoute: SecFIdRoute,
+ SecFAboutRoute: SecFAboutRoute,
+ SecFSettingsRoute: SecFSettingsRoute,
+ SecFIndexRoute: SecFIndexRoute,
+}
+
+const SecFRouteWithChildren = SecFRoute._addFileChildren(SecFRouteChildren)
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ LayoutRoute: LayoutRouteWithChildren,
+ SecARoute: SecARouteWithChildren,
+ SecBRoute: SecBRouteWithChildren,
+ SecCRoute: SecCRouteWithChildren,
+ SecDRoute: SecDRouteWithChildren,
+ SecERoute: SecERouteWithChildren,
+ SecFRoute: SecFRouteWithChildren,
+ marketingPricingRoute: marketingPricingRoute,
+ marketingPromoRoute: marketingPromoRoute,
+ FilesSplatRoute: FilesSplatRoute,
+ ReleaseVChar123versionChar125Route: ReleaseVChar123versionChar125Route,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/pricing.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/pricing.tsx
new file mode 100644
index 0000000000..f606c10b4b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/pricing.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => pricing
+ },
+})
+
+export const Route = createFileRoute('/(marketing)/pricing')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/promo.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/promo.tsx
new file mode 100644
index 0000000000..61c3eb3ec9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/(marketing)/promo.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => promo
+ },
+})
+
+export const Route = createFileRoute('/(marketing)/promo')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/__root.tsx
new file mode 100644
index 0000000000..d2e1483106
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/__root.tsx
@@ -0,0 +1,61 @@
+import * as Vue from 'vue'
+import { Link, Outlet, createRootRoute } from '@tanstack/vue-router'
+
+const RootComponent = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+
+
+ >
+ )
+ },
+})
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.alpha.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.alpha.tsx
new file mode 100644
index 0000000000..ff6ad5350e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.alpha.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => alpha
+ },
+})
+
+export const Route = createFileRoute('/_layout/alpha')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.beta.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.beta.tsx
new file mode 100644
index 0000000000..2f7cab6c0a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.beta.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => beta
+ },
+})
+
+export const Route = createFileRoute('/_layout/beta')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.tsx
new file mode 100644
index 0000000000..e8221f0f65
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/_layout.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/_layout')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/files.$.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/files.$.tsx
new file mode 100644
index 0000000000..221fae01be
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/files.$.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`files:${params.value._splat}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/files/$')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/index.tsx
new file mode 100644
index 0000000000..b3e94f37c4
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => home
+ },
+})
+
+export const Route = createFileRoute('/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/release.v{$version}.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/release.v{$version}.tsx
new file mode 100644
index 0000000000..86b1a2c8f0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/release.v{$version}.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`release:${params.value.version}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/release/v{$version}')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.$id.tsx
new file mode 100644
index 0000000000..864074940d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-a:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-a/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.about.tsx
new file mode 100644
index 0000000000..715ab9548c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-a:about
+ },
+})
+
+export const Route = createFileRoute('/sec-a/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.index.tsx
new file mode 100644
index 0000000000..baef08547c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-a:index
+ },
+})
+
+export const Route = createFileRoute('/sec-a/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.settings.tsx
new file mode 100644
index 0000000000..9e6a56b913
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-a:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-a/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.tsx
new file mode 100644
index 0000000000..a9fb557aea
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-a.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-a')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.$id.tsx
new file mode 100644
index 0000000000..9a03a8fe01
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-b:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-b/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.about.tsx
new file mode 100644
index 0000000000..2ef1100995
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-b:about
+ },
+})
+
+export const Route = createFileRoute('/sec-b/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.index.tsx
new file mode 100644
index 0000000000..652e5f895c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-b:index
+ },
+})
+
+export const Route = createFileRoute('/sec-b/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.settings.tsx
new file mode 100644
index 0000000000..e8fa36377e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-b:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-b/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.tsx
new file mode 100644
index 0000000000..ba31612633
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-b.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-b')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.$id.tsx
new file mode 100644
index 0000000000..7f0407d84e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-c:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-c/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.about.tsx
new file mode 100644
index 0000000000..d26776d439
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-c:about
+ },
+})
+
+export const Route = createFileRoute('/sec-c/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.index.tsx
new file mode 100644
index 0000000000..1835eff9b7
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-c:index
+ },
+})
+
+export const Route = createFileRoute('/sec-c/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.settings.tsx
new file mode 100644
index 0000000000..1bf85fd6d9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-c:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-c/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.tsx
new file mode 100644
index 0000000000..009f814b93
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-c.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-c')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.$id.tsx
new file mode 100644
index 0000000000..ff5aab05e3
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-d:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-d/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.about.tsx
new file mode 100644
index 0000000000..25a8078626
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-d:about
+ },
+})
+
+export const Route = createFileRoute('/sec-d/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.index.tsx
new file mode 100644
index 0000000000..cd9b89664a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-d:index
+ },
+})
+
+export const Route = createFileRoute('/sec-d/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.settings.tsx
new file mode 100644
index 0000000000..8e4309de32
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-d:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-d/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.tsx
new file mode 100644
index 0000000000..6b12b514da
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-d.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-d')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.$id.tsx
new file mode 100644
index 0000000000..4525051967
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-e:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-e/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.about.tsx
new file mode 100644
index 0000000000..71a32bd36b
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-e:about
+ },
+})
+
+export const Route = createFileRoute('/sec-e/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.index.tsx
new file mode 100644
index 0000000000..9b467ca53e
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-e:index
+ },
+})
+
+export const Route = createFileRoute('/sec-e/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.settings.tsx
new file mode 100644
index 0000000000..a01066488c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-e:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-e/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.tsx
new file mode 100644
index 0000000000..38f4da91fb
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-e.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-e')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.$id.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.$id.tsx
new file mode 100644
index 0000000000..c740f9d223
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.$id.tsx
@@ -0,0 +1,16 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ const params = Route.useParams()
+
+ return () => (
+ {`sec-f:${params.value.id}`}
+ )
+ },
+})
+
+export const Route = createFileRoute('/sec-f/$id')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.about.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.about.tsx
new file mode 100644
index 0000000000..229dab22a2
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.about.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-f:about
+ },
+})
+
+export const Route = createFileRoute('/sec-f/about')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.index.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.index.tsx
new file mode 100644
index 0000000000..14e3f46a13
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.index.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-f:index
+ },
+})
+
+export const Route = createFileRoute('/sec-f/')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.settings.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.settings.tsx
new file mode 100644
index 0000000000..da2c7483b9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.settings.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const Page = Vue.defineComponent({
+ setup() {
+ return () => sec-f:settings
+ },
+})
+
+export const Route = createFileRoute('/sec-f/settings')({
+ component: Page,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.tsx
new file mode 100644
index 0000000000..3b389c8144
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routes/sec-f.tsx
@@ -0,0 +1,12 @@
+import * as Vue from 'vue'
+import { Outlet, createFileRoute } from '@tanstack/vue-router'
+
+const Layout = Vue.defineComponent({
+ setup() {
+ return () =>
+ },
+})
+
+export const Route = createFileRoute('/sec-f')({
+ component: Layout,
+})
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/tsconfig.json b/benchmarks/client-nav/scenarios/route-tree-scale/vue/tsconfig.json
new file mode 100644
index 0000000000..7786fc3da9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "vue",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/vite.config.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/vite.config.ts
new file mode 100644
index 0000000000..a547406198
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/vite.config.ts
@@ -0,0 +1,45 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'vue',
+ // Real file-based apps code-split by default; this scenario keeps it on
+ // so navigations also exercise lazy route-chunk resolution.
+ autoCodeSplitting: true,
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ vue(),
+ vueJsx(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav route-tree-scale (vue)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/react/project.json b/benchmarks/client-nav/scenarios/search-params/react/project.json
new file mode 100644
index 0000000000..f2d743f5f9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-search-params-react",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/react-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/search-params/react/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/setup.ts b/benchmarks/client-nav/scenarios/search-params/react/setup.ts
new file mode 100644
index 0000000000..130583b190
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'React',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts
new file mode 100644
index 0000000000..c534611bd0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-search-params', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-search-params navigation loop (react)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/react/speed.flame.ts b/benchmarks/client-nav/scenarios/search-params/react/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/main.tsx b/benchmarks/client-nav/scenarios/search-params/react/src/main.tsx
new file mode 100644
index 0000000000..a68ef7bbb2
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/main.tsx
@@ -0,0 +1,36 @@
+import { RouterProvider, createRouter } from '@tanstack/react-router'
+import { createRoot } from 'react-dom/client'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultStructuralSharing: true,
+ })
+}
+
+declare module '@tanstack/react-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const reactRoot = createRoot(container)
+ reactRoot.render()
+
+ return {
+ router,
+ unmount() {
+ reactRoot.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/react/src/routeTree.gen.ts
new file mode 100644
index 0000000000..7380b704e1
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as ProductsRouteImport } from './routes/products'
+import { Route as CatalogRouteImport } from './routes/catalog'
+import { Route as IndexRouteImport } from './routes/index'
+
+const ProductsRoute = ProductsRouteImport.update({
+ id: '/products',
+ path: '/products',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const CatalogRoute = CatalogRouteImport.update({
+ id: '/catalog',
+ path: '/catalog',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/catalog' | '/products'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/catalog' | '/products'
+ id: '__root__' | '/' | '/catalog' | '/products'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ CatalogRoute: typeof CatalogRoute
+ ProductsRoute: typeof ProductsRoute
+}
+
+declare module '@tanstack/react-router' {
+ interface FileRoutesByPath {
+ '/products': {
+ id: '/products'
+ path: '/products'
+ fullPath: '/products'
+ preLoaderRoute: typeof ProductsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/catalog': {
+ id: '/catalog'
+ path: '/catalog'
+ fullPath: '/catalog'
+ preLoaderRoute: typeof CatalogRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ CatalogRoute: CatalogRoute,
+ ProductsRoute: ProductsRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/search-params/react/src/routes/__root.tsx
new file mode 100644
index 0000000000..86399d0175
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/routes/__root.tsx
@@ -0,0 +1,116 @@
+import {
+ Link,
+ Outlet,
+ createRootRoute,
+ useSearch,
+} from '@tanstack/react-router'
+import {
+ changedCategories,
+ computeChecksum,
+ initialProductsSearch,
+} from '../../../shared'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+const rootSubscribers = Array.from({ length: 4 }, (_, index) => index)
+
+function RootSearchSubscriber() {
+ const value = useSearch({
+ strict: false,
+ select: (search) => computeChecksum(Number(search.page ?? 0)),
+ })
+
+ void computeChecksum(value)
+ return null
+}
+
+function RootComponent() {
+ return (
+ <>
+ {rootSubscribers.map((index) => (
+
+ ))}
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/routes/catalog.tsx b/benchmarks/client-nav/scenarios/search-params/react/src/routes/catalog.tsx
new file mode 100644
index 0000000000..73f59c13b0
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/routes/catalog.tsx
@@ -0,0 +1,42 @@
+import { createFileRoute, retainSearchParams } from '@tanstack/react-router'
+import type { SearchSchemaInput } from '@tanstack/react-router'
+import {
+ catalogMarkerText,
+ computeChecksum,
+ normalizeCatalogSearch,
+} from '../../../shared'
+
+export const Route = createFileRoute('/catalog')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeCatalogSearch(search),
+ search: {
+ middlewares: [retainSearchParams(['perPage', 'sort'])],
+ },
+ component: CatalogPage,
+})
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+function ViewSubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.view.length * 5 + search.page * 11),
+ })
+
+ void computeChecksum(value)
+ return null
+}
+
+function CatalogPage() {
+ const search = Route.useSearch()
+
+ return (
+
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ Catalog
+ {catalogMarkerText(search)}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/routes/index.tsx b/benchmarks/client-nav/scenarios/search-params/react/src/routes/index.tsx
new file mode 100644
index 0000000000..5879ad518d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/routes/index.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ Search Params Bench
+ home
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/src/routes/products.tsx b/benchmarks/client-nav/scenarios/search-params/react/src/routes/products.tsx
new file mode 100644
index 0000000000..d22e99c4bf
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/src/routes/products.tsx
@@ -0,0 +1,91 @@
+import {
+ createFileRoute,
+ retainSearchParams,
+ stripSearchParams,
+} from '@tanstack/react-router'
+import type { SearchSchemaInput } from '@tanstack/react-router'
+import {
+ computeChecksum,
+ normalizeProductsSearch,
+ productsLoaderChecksum,
+ productsMarkerText,
+} from '../../../shared'
+
+export const Route = createFileRoute('/products')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeProductsSearch(search),
+ search: {
+ middlewares: [
+ retainSearchParams(['perPage', 'sort']),
+ stripSearchParams({ page: 1 }),
+ ],
+ },
+ loaderDeps: ({ search }) => ({
+ page: search.page,
+ sort: search.sort,
+ filters: search.filters,
+ }),
+ loader: ({ deps }) => ({
+ checksum: productsLoaderChecksum(deps),
+ }),
+ staleTime: 1e9,
+ gcTime: 1e9,
+ component: ProductsPage,
+})
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+function PageSubscriber() {
+ const value = Route.useSearch({
+ select: (search) => computeChecksum(search.page * 31 + search.perPage),
+ })
+
+ void computeChecksum(value)
+ return null
+}
+
+function FiltersSubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(
+ search.filters.categories.length * 7 +
+ (search.filters.price.max - search.filters.price.min) +
+ search.filters.tags.length * 3,
+ ),
+ })
+
+ void computeChecksum(value)
+ return null
+}
+
+function QuerySubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.q.length * 13 + search.sort.length),
+ })
+
+ void computeChecksum(value)
+ return null
+}
+
+function ProductsPage() {
+ const search = Route.useSearch()
+ const loaderData = Route.useLoaderData()
+
+ return (
+
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ Products
+ {productsMarkerText(search)}
+ {`checksum ${loaderData.checksum}`}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/tsconfig.json b/benchmarks/client-nav/scenarios/search-params/react/tsconfig.json
new file mode 100644
index 0000000000..1d59cbb450
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "react-jsx",
+ "jsxImportSource": "react",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/react/vite.config.ts b/benchmarks/client-nav/scenarios/search-params/react/vite.config.ts
new file mode 100644
index 0000000000..b220ae7d0d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/react/vite.config.ts
@@ -0,0 +1,40 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import react from '@vitejs/plugin-react'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'react',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ react(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav search-params (react)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/shared.ts b/benchmarks/client-nav/scenarios/search-params/shared.ts
new file mode 100644
index 0000000000..343e319ded
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/shared.ts
@@ -0,0 +1,200 @@
+/**
+ * Shared definition of the `search-params` scenario: search schema
+ * normalizers, the click sequence, and per-step sanity assertions. The three
+ * framework apps consume these builders so the workload is identical modulo
+ * the rendering layer.
+ *
+ * Isolates: validateSearch execution, search middlewares
+ * (retainSearchParams/stripSearchParams), parse/stringify of medium-complex
+ * search objects, functional search updaters, structural sharing, and
+ * useSearch selector subscriptions.
+ */
+
+import type { ScenarioStep } from '../harness'
+
+export function computeChecksum(seed: number) {
+ let value = Math.trunc(seed) | 0
+
+ for (let index = 0; index < 40; index++) {
+ value = (value * 1664525 + 1013904223 + index) >>> 0
+ }
+
+ return value
+}
+
+export interface ProductsSearch {
+ page: number
+ perPage: number
+ sort: 'asc' | 'desc'
+ q: string
+ filters: {
+ categories: Array
+ price: { min: number; max: number }
+ tags: Array
+ }
+}
+
+export interface CatalogSearch {
+ view: 'grid' | 'list'
+ page: number
+ perPage: number
+ sort: 'asc' | 'desc'
+}
+
+function normalizeNumber(value: unknown, fallback: number) {
+ const num = Number(value)
+ return Number.isFinite(num) && num >= 0 ? Math.trunc(num) : fallback
+}
+
+function normalizeString(value: unknown, fallback: string) {
+ return typeof value === 'string' ? value : fallback
+}
+
+function normalizeSort(value: unknown): 'asc' | 'desc' {
+ return value === 'desc' ? 'desc' : 'asc'
+}
+
+function normalizeStringArray(value: unknown): Array {
+ if (!Array.isArray(value)) {
+ return []
+ }
+ return value.filter((entry): entry is string => typeof entry === 'string')
+}
+
+export function normalizeProductsSearch(
+ search: Record,
+): ProductsSearch {
+ const filters =
+ typeof search.filters === 'object' && search.filters !== null
+ ? (search.filters as Record)
+ : {}
+ const price =
+ typeof filters.price === 'object' && filters.price !== null
+ ? (filters.price as Record)
+ : {}
+
+ return {
+ page: Math.max(1, normalizeNumber(search.page, 1)),
+ perPage: Math.max(1, normalizeNumber(search.perPage, 20)),
+ sort: normalizeSort(search.sort),
+ q: normalizeString(search.q, ''),
+ filters: {
+ categories: normalizeStringArray(filters.categories),
+ price: {
+ min: normalizeNumber(price.min, 0),
+ max: normalizeNumber(price.max, 1000),
+ },
+ tags: normalizeStringArray(filters.tags),
+ },
+ }
+}
+
+export function normalizeCatalogSearch(
+ search: Record,
+): CatalogSearch {
+ return {
+ view: search.view === 'list' ? 'list' : 'grid',
+ page: Math.max(1, normalizeNumber(search.page, 1)),
+ perPage: Math.max(1, normalizeNumber(search.perPage, 20)),
+ sort: normalizeSort(search.sort),
+ }
+}
+
+export const initialProductsSearch = {
+ page: 2,
+ perPage: 50,
+ sort: 'desc',
+ q: 'gadget',
+ filters: {
+ categories: ['audio', 'video'],
+ price: { min: 10, max: 200 },
+ tags: ['new', 'sale'],
+ },
+} satisfies ProductsSearch
+
+export const changedCategories = ['x-ray', 'yield', 'zeta']
+
+export function productsMarkerText(search: ProductsSearch) {
+ return `${search.page}|${search.sort}|${search.filters.categories.join(',')}`
+}
+
+export function catalogMarkerText(search: CatalogSearch) {
+ return `${search.view}|${search.page}|${search.perPage}|${search.sort}`
+}
+
+export function productsLoaderChecksum(deps: {
+ page: number
+ sort: string
+ filters: ProductsSearch['filters']
+}) {
+ return computeChecksum(
+ deps.page * 31 +
+ deps.sort.length * 7 +
+ deps.filters.categories.join('').length * 13 +
+ deps.filters.tags.length * 3 +
+ (deps.filters.price.max - deps.filters.price.min),
+ )
+}
+
+export const steps: ReadonlyArray = [
+ 'go-products',
+ 'products-next-page',
+ 'products-categories',
+ 'products-sort',
+ 'products-reset',
+ 'go-catalog',
+ 'catalog-next-page',
+ 'products-partial',
+ 'go-home',
+]
+
+interface ExpectedState {
+ testId: string
+ text?: string
+}
+
+const expectedStates: ReadonlyArray = [
+ // Full search literal from home.
+ { testId: 'products-state', text: '2|desc|audio,video' },
+ // Functional updater bumping the page.
+ { testId: 'products-state', text: '3|desc|audio,video' },
+ // Functional updater replacing filters.categories.
+ { testId: 'products-state', text: '3|desc|x-ray,yield,zeta' },
+ // Functional updater flipping sort desc -> asc.
+ { testId: 'products-state', text: '3|asc|x-ray,yield,zeta' },
+ // Functional updater resetting page to 1 (stripSearchParams removes it).
+ { testId: 'products-state', text: '1|asc|x-ray,yield,zeta' },
+ // search: true carries the current products search into catalog.
+ { testId: 'catalog-state', text: 'grid|1|50|asc' },
+ // Functional updater bumping the catalog page.
+ { testId: 'catalog-state', text: 'grid|2|50|asc' },
+ // Partial search literal; retainSearchParams fills perPage/sort from catalog.
+ { testId: 'products-state', text: '1|asc|' },
+ { testId: 'home-state' },
+]
+
+export function assertStepResult(stepIndex: number, container: HTMLElement) {
+ const expected = expectedStates[stepIndex]!
+ const element = container.querySelector(`[data-testid="${expected.testId}"]`)
+
+ if (!element) {
+ throw new Error(
+ `Expected marker "${expected.testId}" to exist after step ${stepIndex}`,
+ )
+ }
+
+ if (expected.text !== undefined && element.textContent !== expected.text) {
+ throw new Error(
+ `Expected marker "${expected.testId}" to read "${expected.text}" after step ${stepIndex}, received "${element.textContent}"`,
+ )
+ }
+}
+
+// Two laps through the 9-step sequence per benchmark iteration.
+export const ticksPerIteration = 18
+
+export const benchOptions = {
+ warmupIterations: 100,
+ time: 10_000,
+ throws: true,
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/project.json b/benchmarks/client-nav/scenarios/search-params/solid/project.json
new file mode 100644
index 0000000000..af48217e03
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-search-params-solid",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/solid-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/search-params/solid/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/setup.ts b/benchmarks/client-nav/scenarios/search-params/solid/setup.ts
new file mode 100644
index 0000000000..6a46971603
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Solid',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts
new file mode 100644
index 0000000000..df6a24dc15
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-search-params', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-search-params navigation loop (solid)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/speed.flame.ts b/benchmarks/client-nav/scenarios/search-params/solid/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
new file mode 100644
index 0000000000..e95846e12d
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
@@ -0,0 +1,33 @@
+import { render } from 'solid-js/web'
+import { RouterProvider, createRouter } from '@tanstack/solid-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultStructuralSharing: true,
+ })
+}
+
+declare module '@tanstack/solid-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const unmount = render(() => , container)
+
+ return {
+ router,
+ unmount,
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts
new file mode 100644
index 0000000000..96d211d64c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as ProductsRouteImport } from './routes/products'
+import { Route as CatalogRouteImport } from './routes/catalog'
+import { Route as IndexRouteImport } from './routes/index'
+
+const ProductsRoute = ProductsRouteImport.update({
+ id: '/products',
+ path: '/products',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const CatalogRoute = CatalogRouteImport.update({
+ id: '/catalog',
+ path: '/catalog',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/catalog' | '/products'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/catalog' | '/products'
+ id: '__root__' | '/' | '/catalog' | '/products'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ CatalogRoute: typeof CatalogRoute
+ ProductsRoute: typeof ProductsRoute
+}
+
+declare module '@tanstack/solid-router' {
+ interface FileRoutesByPath {
+ '/products': {
+ id: '/products'
+ path: '/products'
+ fullPath: '/products'
+ preLoaderRoute: typeof ProductsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/catalog': {
+ id: '/catalog'
+ path: '/catalog'
+ fullPath: '/catalog'
+ preLoaderRoute: typeof CatalogRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ CatalogRoute: CatalogRoute,
+ ProductsRoute: ProductsRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx
new file mode 100644
index 0000000000..30c042f9c5
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx
@@ -0,0 +1,120 @@
+import { createRenderEffect } from 'solid-js'
+import {
+ Link,
+ Outlet,
+ createRootRoute,
+ useSearch,
+} from '@tanstack/solid-router'
+import {
+ changedCategories,
+ computeChecksum,
+ initialProductsSearch,
+} from '../../../shared'
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
+
+const rootSubscribers = Array.from({ length: 4 }, (_, index) => index)
+
+function PerfValue(props: { value: () => number }) {
+ createRenderEffect(() => {
+ void props.value()
+ })
+
+ return null
+}
+
+function RootSearchSubscriber() {
+ const value = useSearch({
+ strict: false,
+ select: (search) => computeChecksum(Number(search.page ?? 0)),
+ })
+
+ return computeChecksum(value())} />
+}
+
+function RootComponent() {
+ return (
+ <>
+ {rootSubscribers.map(() => (
+
+ ))}
+
+
+ >
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx
new file mode 100644
index 0000000000..60cf8e7896
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx
@@ -0,0 +1,50 @@
+import { createRenderEffect } from 'solid-js'
+import { createFileRoute, retainSearchParams } from '@tanstack/solid-router'
+import type { SearchSchemaInput } from '@tanstack/solid-router'
+import {
+ catalogMarkerText,
+ computeChecksum,
+ normalizeCatalogSearch,
+} from '../../../shared'
+
+export const Route = createFileRoute('/catalog')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeCatalogSearch(search),
+ search: {
+ middlewares: [retainSearchParams(['perPage', 'sort'])],
+ },
+ component: CatalogPage,
+})
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+function PerfValue(props: { value: () => number }) {
+ createRenderEffect(() => {
+ void props.value()
+ })
+
+ return null
+}
+
+function ViewSubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.view.length * 5 + search.page * 11),
+ })
+
+ return computeChecksum(value())} />
+}
+
+function CatalogPage() {
+ const search = Route.useSearch()
+
+ return (
+
+ {subscriberIndexes.map(() => (
+
+ ))}
+ Catalog
+ {catalogMarkerText(search())}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/index.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/index.tsx
new file mode 100644
index 0000000000..0bbb913d83
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/index.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
+
+function HomePage() {
+ return (
+
+ Search Params Bench
+ home
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx
new file mode 100644
index 0000000000..8b2a252155
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx
@@ -0,0 +1,97 @@
+import { createRenderEffect } from 'solid-js'
+import {
+ createFileRoute,
+ retainSearchParams,
+ stripSearchParams,
+} from '@tanstack/solid-router'
+import type { SearchSchemaInput } from '@tanstack/solid-router'
+import {
+ computeChecksum,
+ normalizeProductsSearch,
+ productsLoaderChecksum,
+ productsMarkerText,
+} from '../../../shared'
+
+export const Route = createFileRoute('/products')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeProductsSearch(search),
+ search: {
+ middlewares: [
+ retainSearchParams(['perPage', 'sort']),
+ stripSearchParams({ page: 1 }),
+ ],
+ },
+ loaderDeps: ({ search }) => ({
+ page: search.page,
+ sort: search.sort,
+ filters: search.filters,
+ }),
+ loader: ({ deps }) => ({
+ checksum: productsLoaderChecksum(deps),
+ }),
+ staleTime: 1e9,
+ gcTime: 1e9,
+ component: ProductsPage,
+})
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+function PerfValue(props: { value: () => number }) {
+ createRenderEffect(() => {
+ void props.value()
+ })
+
+ return null
+}
+
+function PageSubscriber() {
+ const value = Route.useSearch({
+ select: (search) => computeChecksum(search.page * 31 + search.perPage),
+ })
+
+ return computeChecksum(value())} />
+}
+
+function FiltersSubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(
+ search.filters.categories.length * 7 +
+ (search.filters.price.max - search.filters.price.min) +
+ search.filters.tags.length * 3,
+ ),
+ })
+
+ return computeChecksum(value())} />
+}
+
+function QuerySubscriber() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.q.length * 13 + search.sort.length),
+ })
+
+ return computeChecksum(value())} />
+}
+
+function ProductsPage() {
+ const search = Route.useSearch()
+ const loaderData = Route.useLoaderData()
+
+ return (
+
+ {subscriberIndexes.map(() => (
+
+ ))}
+ {subscriberIndexes.map(() => (
+
+ ))}
+ {subscriberIndexes.map(() => (
+
+ ))}
+ Products
+ {productsMarkerText(search())}
+ {`checksum ${loaderData().checksum}`}
+
+ )
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json b/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json
new file mode 100644
index 0000000000..98d76ad6b8
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts b/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts
new file mode 100644
index 0000000000..c2f4b32806
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts
@@ -0,0 +1,48 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import solid from 'vite-plugin-solid'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'solid',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ solid({ hot: false, dev: false }),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ resolve: {
+ conditions: ['solid', 'browser'],
+ },
+ test: {
+ name: '@benchmarks/client-nav search-params (solid)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ server: {
+ deps: {
+ inline: [/@solidjs/, /@tanstack\/solid-store/],
+ },
+ },
+ },
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/project.json b/benchmarks/client-nav/scenarios/search-params/vue/project.json
new file mode 100644
index 0000000000..47b9712a2c
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/project.json
@@ -0,0 +1,40 @@
+{
+ "name": "@benchmarks/client-nav-search-params-vue",
+ "projectType": "application",
+ "targets": {
+ "build:client": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "NODE_ENV=production vite build --config {projectRoot}/vite.config.ts"
+ }
+ },
+ "test:types:client": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ {
+ "projects": ["@tanstack/vue-router", "@tanstack/router-plugin"],
+ "target": "build"
+ }
+ ],
+ "options": {
+ "command": "tsc -p {projectRoot}/tsconfig.json --noEmit"
+ }
+ },
+ "test:flame": {
+ "executor": "nx:run-commands",
+ "cache": false,
+ "dependsOn": ["build:client"],
+ "options": {
+ "command": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./scenarios/search-params/vue/speed.flame.ts",
+ "cwd": "benchmarks/client-nav"
+ }
+ }
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/setup.ts b/benchmarks/client-nav/scenarios/search-params/vue/setup.ts
new file mode 100644
index 0000000000..97b74b3892
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/setup.ts
@@ -0,0 +1,17 @@
+import { createScenarioSetup } from '../../harness'
+import { assertStepResult, steps } from '../shared'
+import type * as App from './src/main'
+
+const appModulePath = './dist/app.js'
+const { mountTestApp } = (await import(
+ /* @vite-ignore */ appModulePath
+)) as typeof App
+
+export function setup() {
+ return createScenarioSetup({
+ frameworkLabel: 'Vue',
+ mount: mountTestApp,
+ steps,
+ assertAfterStep: assertStepResult,
+ })
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts
new file mode 100644
index 0000000000..0b394bbe27
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts
@@ -0,0 +1,34 @@
+import { afterAll, beforeAll, bench, describe } from 'vitest'
+import { benchOptions, ticksPerIteration } from '../shared'
+import { setup } from './setup'
+
+describe('client-search-params', () => {
+ const test = setup()
+
+ /**
+ * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`,
+ * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic.
+ *
+ * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`,
+ * but it does support `beforeAll` and `afterAll`.
+ *
+ * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended.
+ */
+
+ beforeAll(test.before)
+ afterAll(test.after)
+
+ bench(
+ 'client-search-params navigation loop (vue)',
+ async () => {
+ for (let i = 0; i < ticksPerIteration; i++) {
+ await test.tick()
+ }
+ },
+ {
+ ...benchOptions,
+ setup: test.before,
+ teardown: test.after,
+ },
+ )
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/speed.flame.ts b/benchmarks/client-nav/scenarios/search-params/vue/speed.flame.ts
new file mode 100644
index 0000000000..f4a0b4e6ff
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/speed.flame.ts
@@ -0,0 +1,18 @@
+import { window } from '../../../jsdom.ts'
+import { setup } from './setup.ts'
+
+const DURATION_MS = 10_000
+
+const test = setup()
+
+try {
+ await test.before()
+
+ const startedAt = performance.now()
+ while (performance.now() - startedAt < DURATION_MS) {
+ await test.tick()
+ }
+} finally {
+ test.after()
+ window.close()
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/main.tsx b/benchmarks/client-nav/scenarios/search-params/vue/src/main.tsx
new file mode 100644
index 0000000000..1454b8d547
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/main.tsx
@@ -0,0 +1,40 @@
+import * as Vue from 'vue'
+import { RouterProvider, createRouter } from '@tanstack/vue-router'
+import { routeTree } from './routeTree.gen'
+
+export function createTestRouter() {
+ return createRouter({
+ routeTree,
+ scrollRestoration: true,
+ // Key the scroll-restoration cache by pathname instead of the default
+ // random per-entry location key: with push navigations the default mints
+ // a fresh key per navigation and the module-level cache grows one entry
+ // per push for the whole run, which is non-stationary.
+ getScrollRestorationKey: (location) => location.pathname,
+ defaultStructuralSharing: true,
+ })
+}
+
+declare module '@tanstack/vue-router' {
+ interface Register {
+ router: ReturnType
+ }
+}
+
+export function mountTestApp(container: HTMLElement) {
+ const router = createTestRouter()
+
+ const component =
+ const app = Vue.createApp({
+ render: () => component,
+ })
+
+ app.mount(container)
+
+ return {
+ router,
+ unmount() {
+ app.unmount()
+ },
+ }
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts
new file mode 100644
index 0000000000..b95b667803
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as ProductsRouteImport } from './routes/products'
+import { Route as CatalogRouteImport } from './routes/catalog'
+import { Route as IndexRouteImport } from './routes/index'
+
+const ProductsRoute = ProductsRouteImport.update({
+ id: '/products',
+ path: '/products',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const CatalogRoute = CatalogRouteImport.update({
+ id: '/catalog',
+ path: '/catalog',
+ getParentRoute: () => rootRouteImport,
+} as any)
+const IndexRoute = IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesByTo {
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRoutesById {
+ __root__: typeof rootRouteImport
+ '/': typeof IndexRoute
+ '/catalog': typeof CatalogRoute
+ '/products': typeof ProductsRoute
+}
+export interface FileRouteTypes {
+ fileRoutesByFullPath: FileRoutesByFullPath
+ fullPaths: '/' | '/catalog' | '/products'
+ fileRoutesByTo: FileRoutesByTo
+ to: '/' | '/catalog' | '/products'
+ id: '__root__' | '/' | '/catalog' | '/products'
+ fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+ IndexRoute: typeof IndexRoute
+ CatalogRoute: typeof CatalogRoute
+ ProductsRoute: typeof ProductsRoute
+}
+
+declare module '@tanstack/vue-router' {
+ interface FileRoutesByPath {
+ '/products': {
+ id: '/products'
+ path: '/products'
+ fullPath: '/products'
+ preLoaderRoute: typeof ProductsRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/catalog': {
+ id: '/catalog'
+ path: '/catalog'
+ fullPath: '/catalog'
+ preLoaderRoute: typeof CatalogRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ '/': {
+ id: '/'
+ path: '/'
+ fullPath: '/'
+ preLoaderRoute: typeof IndexRouteImport
+ parentRoute: typeof rootRouteImport
+ }
+ }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+ IndexRoute: IndexRoute,
+ CatalogRoute: CatalogRoute,
+ ProductsRoute: ProductsRoute,
+}
+export const routeTree = rootRouteImport
+ ._addFileChildren(rootRouteChildren)
+ ._addFileTypes()
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/__root.tsx
new file mode 100644
index 0000000000..b4cb07f2ae
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/__root.tsx
@@ -0,0 +1,114 @@
+import * as Vue from 'vue'
+import { Link, Outlet, createRootRoute, useSearch } from '@tanstack/vue-router'
+import {
+ changedCategories,
+ computeChecksum,
+ initialProductsSearch,
+} from '../../../shared'
+
+const rootSubscribers = Array.from({ length: 4 }, (_, index) => index)
+
+const RootSearchSubscriber = Vue.defineComponent({
+ setup() {
+ const value = useSearch({
+ strict: false,
+ select: (search) => computeChecksum(Number(search.page ?? 0)),
+ })
+
+ return () => {
+ void computeChecksum(value.value)
+ return null
+ }
+ },
+})
+
+const RootComponent = Vue.defineComponent({
+ setup() {
+ return () => (
+ <>
+ {rootSubscribers.map((index) => (
+
+ ))}
+
+
+ >
+ )
+ },
+})
+
+export const Route = createRootRoute({
+ component: RootComponent,
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routes/catalog.tsx b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/catalog.tsx
new file mode 100644
index 0000000000..6a09efdd4a
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/catalog.tsx
@@ -0,0 +1,49 @@
+import * as Vue from 'vue'
+import { createFileRoute, retainSearchParams } from '@tanstack/vue-router'
+import type { SearchSchemaInput } from '@tanstack/vue-router'
+import {
+ catalogMarkerText,
+ computeChecksum,
+ normalizeCatalogSearch,
+} from '../../../shared'
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+const ViewSubscriber = Vue.defineComponent({
+ setup() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.view.length * 5 + search.page * 11),
+ })
+
+ return () => {
+ void computeChecksum(value.value)
+ return null
+ }
+ },
+})
+
+const CatalogPage = Vue.defineComponent({
+ setup() {
+ const search = Route.useSearch()
+
+ return () => (
+
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ Catalog
+ {catalogMarkerText(search.value)}
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/catalog')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeCatalogSearch(search),
+ search: {
+ middlewares: [retainSearchParams(['perPage', 'sort'])],
+ },
+ component: CatalogPage,
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routes/index.tsx b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/index.tsx
new file mode 100644
index 0000000000..081aa7b4fd
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/index.tsx
@@ -0,0 +1,17 @@
+import * as Vue from 'vue'
+import { createFileRoute } from '@tanstack/vue-router'
+
+const HomePage = Vue.defineComponent({
+ setup() {
+ return () => (
+
+ Search Params Bench
+ home
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/')({
+ component: HomePage,
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routes/products.tsx b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/products.tsx
new file mode 100644
index 0000000000..8be1683e14
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/src/routes/products.tsx
@@ -0,0 +1,108 @@
+import * as Vue from 'vue'
+import {
+ createFileRoute,
+ retainSearchParams,
+ stripSearchParams,
+} from '@tanstack/vue-router'
+import type { SearchSchemaInput } from '@tanstack/vue-router'
+import {
+ computeChecksum,
+ normalizeProductsSearch,
+ productsLoaderChecksum,
+ productsMarkerText,
+} from '../../../shared'
+
+const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
+
+const PageSubscriber = Vue.defineComponent({
+ setup() {
+ const value = Route.useSearch({
+ select: (search) => computeChecksum(search.page * 31 + search.perPage),
+ })
+
+ return () => {
+ void computeChecksum(value.value)
+ return null
+ }
+ },
+})
+
+const FiltersSubscriber = Vue.defineComponent({
+ setup() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(
+ search.filters.categories.length * 7 +
+ (search.filters.price.max - search.filters.price.min) +
+ search.filters.tags.length * 3,
+ ),
+ })
+
+ return () => {
+ void computeChecksum(value.value)
+ return null
+ }
+ },
+})
+
+const QuerySubscriber = Vue.defineComponent({
+ setup() {
+ const value = Route.useSearch({
+ select: (search) =>
+ computeChecksum(search.q.length * 13 + search.sort.length),
+ })
+
+ return () => {
+ void computeChecksum(value.value)
+ return null
+ }
+ },
+})
+
+const ProductsPage = Vue.defineComponent({
+ setup() {
+ const search = Route.useSearch()
+ const loaderData = Route.useLoaderData()
+
+ return () => (
+
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ {subscriberIndexes.map((index) => (
+
+ ))}
+ Products
+
+ {productsMarkerText(search.value)}
+
+ {`checksum ${loaderData.value.checksum}`}
+
+ )
+ },
+})
+
+export const Route = createFileRoute('/products')({
+ validateSearch: (search: Record & SearchSchemaInput) =>
+ normalizeProductsSearch(search),
+ search: {
+ middlewares: [
+ retainSearchParams(['perPage', 'sort']),
+ stripSearchParams({ page: 1 }),
+ ],
+ },
+ loaderDeps: ({ search }) => ({
+ page: search.page,
+ sort: search.sort,
+ filters: search.filters,
+ }),
+ loader: ({ deps }) => ({
+ checksum: productsLoaderChecksum(deps),
+ }),
+ staleTime: 1e9,
+ gcTime: 1e9,
+ component: ProductsPage,
+})
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/tsconfig.json b/benchmarks/client-nav/scenarios/search-params/vue/tsconfig.json
new file mode 100644
index 0000000000..7786fc3da9
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../../tsconfig.json",
+ "compilerOptions": {
+ "jsx": "preserve",
+ "jsxImportSource": "vue",
+ "allowImportingTsExtensions": true,
+ "types": ["node", "vite/client", "vitest/globals"]
+ },
+ "include": [
+ "speed.bench.ts",
+ "speed.flame.ts",
+ "setup.ts",
+ "vite.config.ts",
+ "../shared.ts",
+ "../../harness.ts",
+ "../../../setup-helpers.ts",
+ "../../../jsdom.ts",
+ "../../../vitest.setup.ts",
+ "./src/**/*"
+ ]
+}
diff --git a/benchmarks/client-nav/scenarios/search-params/vue/vite.config.ts b/benchmarks/client-nav/scenarios/search-params/vue/vite.config.ts
new file mode 100644
index 0000000000..9a3b82d066
--- /dev/null
+++ b/benchmarks/client-nav/scenarios/search-params/vue/vite.config.ts
@@ -0,0 +1,42 @@
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import codspeedPlugin from '@codspeed/vitest-plugin'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+
+const rootDir = fileURLToPath(new URL('.', import.meta.url))
+
+export default defineConfig({
+ root: rootDir,
+ define: {
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ },
+ plugins: [
+ !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
+ codspeedPlugin(),
+ tanstackRouter({
+ target: 'vue',
+ routesDirectory: `${rootDir}src/routes`,
+ generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
+ }),
+ vue(),
+ vueJsx(),
+ ],
+ build: {
+ outDir: './dist',
+ emptyOutDir: true,
+ minify: false,
+ lib: {
+ entry: './src/main.tsx',
+ formats: ['es'],
+ fileName: 'app',
+ },
+ },
+ test: {
+ name: '@benchmarks/client-nav search-params (vue)',
+ watch: false,
+ environment: 'jsdom',
+ setupFiles: ['../../../vitest.setup.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/solid/vite.config.ts b/benchmarks/client-nav/solid/vite.config.ts
index 24db8fe745..bd11fe8de9 100644
--- a/benchmarks/client-nav/solid/vite.config.ts
+++ b/benchmarks/client-nav/solid/vite.config.ts
@@ -1,8 +1,14 @@
+import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import solid from 'vite-plugin-solid'
import codspeedPlugin from '@codspeed/vitest-plugin'
+// Anchor the project root to the package directory so this config resolves
+// identically when run directly and as part of an aggregate `projects` config.
+const rootDir = fileURLToPath(new URL('..', import.meta.url))
+
export default defineConfig({
+ root: rootDir,
define: {
'process.env.NODE_ENV': JSON.stringify('production'),
},
@@ -28,7 +34,7 @@ export default defineConfig({
name: '@benchmarks/client-nav (solid)',
watch: false,
environment: 'jsdom',
- setupFiles: ['./vitest.setup.ts'],
+ setupFiles: [`${rootDir}vitest.setup.ts`],
server: {
deps: {
inline: [/@solidjs/, /@tanstack\/solid-store/],
diff --git a/benchmarks/client-nav/vitest.config.ts b/benchmarks/client-nav/vitest.config.ts
index 14776452ed..808e7fc724 100644
--- a/benchmarks/client-nav/vitest.config.ts
+++ b/benchmarks/client-nav/vitest.config.ts
@@ -7,6 +7,9 @@ export default defineConfig({
'./react/vite.config.ts',
'./solid/vite.config.ts',
'./vue/vite.config.ts',
+ './scenarios/*/react/vite.config.ts',
+ './scenarios/*/solid/vite.config.ts',
+ './scenarios/*/vue/vite.config.ts',
],
},
})
diff --git a/benchmarks/client-nav/vitest.react.config.ts b/benchmarks/client-nav/vitest.react.config.ts
new file mode 100644
index 0000000000..a397ad929e
--- /dev/null
+++ b/benchmarks/client-nav/vitest.react.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+ test: {
+ watch: false,
+ projects: ['./react/vite.config.ts', './scenarios/*/react/vite.config.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/vitest.solid.config.ts b/benchmarks/client-nav/vitest.solid.config.ts
new file mode 100644
index 0000000000..b8827b86aa
--- /dev/null
+++ b/benchmarks/client-nav/vitest.solid.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+ test: {
+ watch: false,
+ projects: ['./solid/vite.config.ts', './scenarios/*/solid/vite.config.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/vitest.vue.config.ts b/benchmarks/client-nav/vitest.vue.config.ts
new file mode 100644
index 0000000000..17960d7569
--- /dev/null
+++ b/benchmarks/client-nav/vitest.vue.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+ test: {
+ watch: false,
+ projects: ['./vue/vite.config.ts', './scenarios/*/vue/vite.config.ts'],
+ },
+})
diff --git a/benchmarks/client-nav/vue/vite.config.ts b/benchmarks/client-nav/vue/vite.config.ts
index d917c82e2d..4c44c09fdd 100644
--- a/benchmarks/client-nav/vue/vite.config.ts
+++ b/benchmarks/client-nav/vue/vite.config.ts
@@ -1,9 +1,15 @@
+import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import codspeedPlugin from '@codspeed/vitest-plugin'
+// Anchor the project root to the package directory so this config resolves
+// identically when run directly and as part of an aggregate `projects` config.
+const rootDir = fileURLToPath(new URL('..', import.meta.url))
+
export default defineConfig({
+ root: rootDir,
define: {
'process.env.NODE_ENV': JSON.stringify('production'),
},
@@ -27,6 +33,6 @@ export default defineConfig({
name: '@benchmarks/client-nav (vue)',
watch: false,
environment: 'jsdom',
- setupFiles: ['./vitest.setup.ts'],
+ setupFiles: [`${rootDir}vitest.setup.ts`],
},
})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 62525d6c48..96847b4044 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -285,6 +285,9 @@ importers:
'@platformatic/flame':
specifier: ^1.6.0
version: 1.6.0
+ '@tanstack/router-plugin':
+ specifier: workspace:*
+ version: link:../../packages/router-plugin
'@testing-library/react':
specifier: ^16.2.0
version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
From d644dbb5c226852e7d05d7da93135a054e249e47 Mon Sep 17 00:00:00 2001
From: Flo
Date: Fri, 3 Jul 2026 21:43:51 +0200
Subject: [PATCH 008/363] bench(memory): settle-until-quiescent GC barrier
between iterations (#7739)
* bench(memory): settle-until-quiescent GC barrier between iterations
The fixed-turn settle before the pinned collection was hardware-fragile:
teardown needing one more event-loop turn on a given runner leaked a whole
payload of garbage past the collection point and flipped the measured peak
bimodally (serialization-payload solid/react resurfacing the pre-#7730
6.2MB attractor on some CI runners). Replace it with an adaptive barrier
that hops and collects until the post-GC heap size stops moving, with a
minimum-turn floor matching the fixed count it replaces (React's stream
teardown spans several turns and races a shorter floor).
Also pin collections in request-churn and the aborted-requests drain:
their peak floated on GC scheduling even with bit-identical work (18%
spread on CI for solid churn). Reachable accumulation stays visible to
the metric - a forced collection cannot reclaim leaked or cached objects,
it only removes floating garbage, whose collection timing was the
dominant cross-run noise source. Verified with a synthetic reachable
leak: +4.7% peak over a 0.6% A/A noise floor, where the old 18% noise
would have swallowed it.
Local A/A spreads (3x codspeed run per suite): solid <=1%, react <=2.2%
except request-churn (rare +130KB mode, framework teardown variance),
vue <=2.3% except aborted-requests (~8%, intra-iteration work variance,
down from 21% on CI).
Co-Authored-By: Claude Fable 5
* bench(memory): fixed-count settle barrier, drop adaptive quiescence exit
The adaptive exit (collect until post-GC heap size stops moving) made the
collection points land at data-dependent turns on CI: heap readings never
fully stabilize there, so the exit point - and every subsequent GC point -
shifted between identical runs. The first CI A/A pair showed it flipping
serialization-payload (vue) to a 6MB mode (67%), inflating peak-large-page
(vue) 3.4x, and adding 7-8% swings to the react/vue abort scenarios, while
fixing the solid suite.
Every step is now a fixed count: 16 settle turns (enough for React/Vue
multi-turn teardown that the original 2-turn barrier raced), one pinned
collection, one turn, one more collection for finalizer fallout. Fixed
counts make the GC points identical across runs by construction, which is
the property the barrier exists to provide.
Co-Authored-By: Claude Fable 5
* bench(memory): size iteration counts to the 2-10s measured-run window
On CI (eBPF instrument + --no-opt) one pinned iteration costs ~0.1-0.6s,
so the previous counts put request-churn at ~36s measured and the error
-paths/server-fn benches at 0.1-0.5s - outside the useful 2-10s range in
both directions. Retune: request-churn/aborted-requests/error-paths/
server-fn-churn to 40 iterations, serialization-payload to 12;
peak-large-page and streaming-peak already sit in range at 20.
The floor is raised by pinning error-paths and server-fn-churn rather
than inflating their iteration counts: thousands of unpinned iterations
would cross V8's own GC scheduling and reintroduce the timing noise the
barrier removes, while the pin's fixed per-iteration cost lifts them into
range at 40 iterations and makes their collection points deterministic.
Note: fewer churn iterations proportionally shrink the accumulation
window, so peak-based leak sensitivity drops accordingly; leaks remain
visible in total-allocated (forced compactions re-copy the growing live
set every iteration).
Co-Authored-By: Claude Fable 5
* bench(memory): disable V8 bytecode flushing in memory bench workers
The retuned (shorter) runs exposed a recurring V8 internal event - a
+7-13MB allocation burst with the signature of bytecode flush + lazy
recompile - that lands inside or outside the measured window at random,
flipping peaks by whole MBs between identical CI runs (request-churn vue
785KB vs 3.2MB). The pinned collections age code fast enough for V8 to
flush unused bytecode mid-run; --no-flush-bytecode keeps compiled code
alive for the process lifetime so the measured window sees no recompile
bursts. Vite's mergeConfig concatenates the scenario's test.execArgv with
the flags the CodSpeed plugin injects, so both apply to the fork workers.
Co-Authored-By: Claude Fable 5
* bench(memory): pre-size V8 heap geometry in memory bench workers
--no-flush-bytecode alone did not stop the run-to-run flips: the
recurring event is heap-space growth, which allocates several MB at a
run-dependent moment inside the shortened measured windows (error-paths
unmatched vue 674KB vs 2MB, serialization-payload solid resurfacing its
6.4MB attractor on one run in three). Pre-sizing old space and pinning
the semi-space size removes mid-measurement growth while leaving the
per-iteration page map/unmap signal intact - local runs confirm peaks
still track payload sizes exactly (serialization 3.5MB, streaming
30.3MB, levels unchanged).
Co-Authored-By: Claude Fable 5
* bench(memory): size tiny benches just above the 2s measured-run floor
error-paths and server-fn-churn sat at 5-8s measured on CI; fewer
iterations bring them to ~2.3-3.4s, keeping the 2s floor while shrinking
the window a stray allocator event can land in.
Co-Authored-By: Claude Fable 5
* bench(memory): verify the pinned collection against the heap floor
The residual CI flips all share one signature: exactly one iteration's
payload added to the measured peak (serialization-payload vue 3.5 vs
6.9MB, peak-large-page vue 780 vs 1349KB, error-paths redirect vue 300 vs
885KB). On some runners the response teardown holds the payload past the
fixed settle window - released only by a later internal timer - so it
survives the pinned collection and bleeds into the next iteration.
After the fixed 16-turn settle and collection, compare the post-GC heap
against the smallest post-collection size seen this run (the inter-
iteration floor): while it has not returned to the floor, keep hopping
and collecting, bounded at 64 turns. The barrier stays fixed-count in the
common case and extends only in exactly the failure case. Workloads that
genuinely accumulate reachable memory raise the floor as they go, so
accumulation still measures.
Co-Authored-By: Claude Fable 5
* bench(memory): restrict floor verification to peak-shape scenarios
The floor-verified barrier fixed its target - the serialization family
went to <=0.45% across three CI runs, attractor gone - but destabilized
churn/abort scenarios (request-churn solid 420KB vs 3.4MB): their inter-
iteration floor legitimately drifts, so the verification capped out
chronically and the ~48 extra collections per iteration eventually hit a
compaction that double-copies the live set. Split by scenario shape:
serialization-payload, peak-large-page and streaming-peak keep the
verified barrier (flat floor, proven fix); churn and abort scenarios go
back to the plain fixed-count barrier that held them at <=1.7% in the
two previous CI rounds.
Co-Authored-By: Claude Fable 5
---------
Co-authored-by: Claude Fable 5
---
benchmarks/memory/server/bench-utils.ts | 116 +++++++++++++++---
.../aborted-requests/react/vite.config.ts | 13 ++
.../scenarios/aborted-requests/shared.ts | 17 ++-
.../aborted-requests/solid/vite.config.ts | 13 ++
.../aborted-requests/vue/vite.config.ts | 13 ++
.../error-paths/react/vite.config.ts | 13 ++
.../server/scenarios/error-paths/shared.ts | 8 +-
.../error-paths/solid/vite.config.ts | 13 ++
.../scenarios/error-paths/vue/vite.config.ts | 13 ++
.../peak-large-page/react/vite.config.ts | 13 ++
.../scenarios/peak-large-page/shared.ts | 1 +
.../peak-large-page/solid/vite.config.ts | 13 ++
.../peak-large-page/vue/vite.config.ts | 13 ++
.../request-churn/react/vite.config.ts | 13 ++
.../server/scenarios/request-churn/shared.ts | 3 +-
.../request-churn/solid/vite.config.ts | 13 ++
.../request-churn/vue/vite.config.ts | 13 ++
.../react/vite.config.ts | 13 ++
.../scenarios/serialization-payload/shared.ts | 3 +-
.../solid/vite.config.ts | 13 ++
.../serialization-payload/vue/vite.config.ts | 13 ++
.../server-fn-churn/react/vite.config.ts | 13 ++
.../scenarios/server-fn-churn/shared.ts | 5 +-
.../server-fn-churn/solid/vite.config.ts | 13 ++
.../server-fn-churn/vue/vite.config.ts | 13 ++
.../streaming-peak/react/vite.config.ts | 13 ++
.../server/scenarios/streaming-peak/shared.ts | 1 +
.../streaming-peak/solid/vite.config.ts | 13 ++
.../streaming-peak/vue/vite.config.ts | 13 ++
29 files changed, 398 insertions(+), 29 deletions(-)
diff --git a/benchmarks/memory/server/bench-utils.ts b/benchmarks/memory/server/bench-utils.ts
index bc167c6379..b8a09fdd8e 100644
--- a/benchmarks/memory/server/bench-utils.ts
+++ b/benchmarks/memory/server/bench-utils.ts
@@ -17,15 +17,24 @@ export type RunSequentialRequestLoopOptions =
iterations?: number
buildRequest: (random: () => number, index: number) => Request
validateResponse?: (response: Response, request: Request) => void
- // For peak-shape scenarios only. Their signal is the footprint of a
- // single request, but whether V8 collects iteration i's garbage before
- // iteration i+1 allocates its payload is not reproducible run to run —
- // the measured peak flips by a whole payload depending on GC timing.
- // Forcing a collection between iterations pins the GC points so peak
- // deterministically measures max(single-request footprint). Churn
- // scenarios must never set this: their signal is accumulation across
- // iterations, which a forced GC would mask.
+ // Whether V8 collects iteration i's garbage before iteration i+1
+ // allocates its payload is not reproducible run to run — the measured
+ // peak flips by a whole payload depending on GC timing, which shifts
+ // with runner hardware. Forcing a collection between iterations pins
+ // the GC points so peak deterministically measures the largest
+ // single-iteration footprint plus any reachable accumulation.
+ // Accumulation signals stay visible: leaked or cached objects are
+ // still referenced, so a forced collection cannot reclaim them — it
+ // only removes floating garbage, whose collection timing is the
+ // dominant cross-run noise source.
pinGcBetweenIterations?: boolean
+ // For peak-shape scenarios ONLY (flat inter-iteration heap floor):
+ // verify each pinned collection actually returned the heap to the
+ // floor, extending the barrier when a runner's late teardown holds the
+ // payload past the fixed window. Churn/abort scenarios must not set
+ // this: their floor legitimately drifts, so the verification caps out
+ // chronically and the extra collections it fires destabilize the peak.
+ verifyGcFloor?: boolean
}
export const memoryBenchOptions = {
@@ -78,6 +87,7 @@ export async function runSequentialRequestLoop(
buildRequest,
validateResponse,
pinGcBetweenIterations = false,
+ verifyGcFloor = false,
} = options
const random =
options.seed !== undefined
@@ -93,6 +103,8 @@ export async function runSequentialRequestLoop(
}
})
+ const gcPinState = verifyGcFloor ? createGcPinState() : undefined
+
for (let index = 0; index < iterations; index++) {
const request = buildRequest(random, index)
const response = await handler.fetch(request)
@@ -102,13 +114,87 @@ export async function runSequentialRequestLoop(
await drainResponse(response)
if (pinGcBetweenIterations) {
- // Two 0ms timer hops first, so trailing renderer/stream teardown
- // scheduled for the next turns runs before the collection — otherwise
- // its garbage survives into the next iteration's measurements.
- await new Promise((resolve) => setTimeout(resolve, 0))
- await new Promise((resolve) => setTimeout(resolve, 0))
- // Present under CodSpeed (--expose-gc); absent in plain smoke runs.
- ;(globalThis as { gc?: () => void }).gc?.()
+ await settleAndPinGc(gcPinState)
}
}
}
+
+// Renderer/stream teardown spans several event-loop turns (React and Vue
+// need more than the two turns the original barrier allowed for), and a
+// too-short settle window leaks a whole payload of garbage past the
+// collection point, flipping the measured peak bimodally between runs.
+// The settle length is a fixed count on purpose: an adaptive exit (collect
+// until the post-GC heap size stops moving) makes the collection points
+// land at data-dependent turns, which re-introduces exactly the run-to-run
+// variance this barrier exists to remove — heap-size readings never fully
+// stabilize under the instrumented CI environment, so the exit point (and
+// with it every subsequent GC point) shifted between identical runs.
+const settleTurnsBeforeGc = 16
+const maxSettleTurns = 64
+// Below every scenario's payload size, above normal inter-iteration jitter.
+const settledHeapSlackBytes = 256 * 1024
+
+// Tracks the smallest post-collection heap size seen in a workload run:
+// the inter-iteration floor the heap must return to before the next
+// iteration may start.
+export interface GcPinState {
+ floorHeapUsed: number
+}
+
+export function createGcPinState(): GcPinState {
+ return { floorHeapUsed: Infinity }
+}
+
+// Settle trailing renderer/stream teardown with a fixed number of 0ms timer
+// hops (one full event-loop turn each, microtasks flushing between hops),
+// then pin a collection point. The second collection one turn later picks
+// up whatever the first collection's finalizers released. gc() is present
+// under CodSpeed (--expose-gc); in plain smoke runs there is nothing to
+// pin, so only the settle hops run.
+//
+// The collection is then verified against the inter-iteration heap floor:
+// on some runners the response teardown holds the payload past the fixed
+// settle window (released only by a later internal timer), and that one
+// still-reachable payload survives the collection and bleeds into the next
+// iteration's measured peak. When the post-collection heap has not returned
+// to the floor, keep hopping and collecting — bounded — until the payload
+// is actually released, so the barrier self-heals in exactly the case where
+// the fixed-count barrier fails. A workload that genuinely accumulates
+// reachable memory raises the floor as it goes (the floor is the minimum
+// seen), so accumulation still measures; it only pays the turn cap.
+export async function settleAndPinGc(state?: GcPinState) {
+ for (let turn = 0; turn < settleTurnsBeforeGc; turn++) {
+ await new Promise((resolve) => setTimeout(resolve, 0))
+ }
+
+ const gc = (globalThis as { gc?: () => void }).gc
+
+ if (!gc) {
+ return
+ }
+
+ gc()
+ await new Promise((resolve) => setTimeout(resolve, 0))
+ gc()
+
+ if (!state) {
+ return
+ }
+
+ let heapUsed = process.memoryUsage().heapUsed
+
+ for (
+ let turn = settleTurnsBeforeGc;
+ turn < maxSettleTurns &&
+ heapUsed > state.floorHeapUsed + settledHeapSlackBytes;
+ turn++
+ ) {
+ await new Promise((resolve) => setTimeout(resolve, 0))
+ gc()
+ heapUsed = process.memoryUsage().heapUsed
+ }
+
+ if (heapUsed < state.floorHeapUsed) {
+ state.floorHeapUsed = heapUsed
+ }
+}
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/react/vite.config.ts b/benchmarks/memory/server/scenarios/aborted-requests/react/vite.config.ts
index a3f4836091..2ce925e406 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server aborted-requests (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
index 00a5353e67..c94d42afd6 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
@@ -1,3 +1,4 @@
+import { settleAndPinGc } from '#memory-server/bench-utils'
import type { StartRequestHandler } from '#memory-server/bench-utils'
export type { StartRequestHandler }
@@ -12,7 +13,7 @@ type AbortedRequestMode = {
cancelMode: AbortedRequestCancelMode
}
-const abortedRequestIterations = 100
+const abortedRequestIterations = 40
let abortedRequestCounter = 0
const eagerMarker = 'data-bench="aborted-requests-eager"'
const alphaFallbackMarker = 'data-bench="aborted-requests-alpha-fallback"'
@@ -183,16 +184,12 @@ async function cancelReader(
await reader.cancel()
}
-const cancellationDrainTicks = 8
-
-// Fixed-count settlement barrier: each 0ms timer hop runs one full event-loop
-// turn (microtasks flush between hops), so post-abort renderer teardown
-// finishes within a deterministic number of turns instead of bleeding a
-// load-dependent amount of work into later iterations of the measured run.
+// Post-abort settlement barrier. Settles renderer teardown across a fixed
+// number of event-loop turns, then (under CodSpeed) pins a collection point
+// after every aborted request, so the measured peak cannot drift with how
+// much floating garbage the previous iterations happened to leave behind.
async function drainCancellation() {
- for (let tick = 0; tick < cancellationDrainTicks; tick++) {
- await new Promise((resolve) => setTimeout(resolve, 0))
- }
+ await settleAndPinGc()
}
async function assertAbortedRequestsSanity(
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts b/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
index d3a374cab7..5ee4e152af 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server aborted-requests (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/vue/vite.config.ts b/benchmarks/memory/server/scenarios/aborted-requests/vue/vite.config.ts
index 2b42e2be39..5ccc9f5d1d 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server aborted-requests (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/error-paths/react/vite.config.ts b/benchmarks/memory/server/scenarios/error-paths/react/vite.config.ts
index 2a4fd9818a..bc67b1cfc7 100644
--- a/benchmarks/memory/server/scenarios/error-paths/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server error-paths (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/error-paths/shared.ts b/benchmarks/memory/server/scenarios/error-paths/shared.ts
index d4c1877465..f65d150477 100644
--- a/benchmarks/memory/server/scenarios/error-paths/shared.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/shared.ts
@@ -9,7 +9,9 @@ export type { StartRequestHandler }
type Framework = 'react' | 'solid' | 'vue'
-const errorPathsIterations = 50
+// Sized to sit just above the 2s measured-run floor on CI (per-iteration
+// cost with the pinned collection is ~0.13-0.19s across frameworks).
+const errorPathsIterations = 18
const redirectSeed = 0xdecafbad
const notFoundSeed = 0xdecafb0d
const errorSeed = 0xdecafbed
@@ -142,6 +144,7 @@ export function createWorkloadGroup(
iterations: errorPathsIterations,
buildRequest: buildRedirectRequest,
validateResponse: validateRedirectResponse,
+ pinGcBetweenIterations: true,
})
const runNotFound = () =>
@@ -150,6 +153,7 @@ export function createWorkloadGroup(
iterations: errorPathsIterations,
buildRequest: buildNotFoundRequest,
validateResponse: validateNotFoundResponse,
+ pinGcBetweenIterations: true,
})
const runError = () =>
@@ -158,6 +162,7 @@ export function createWorkloadGroup(
iterations: errorPathsIterations,
buildRequest: buildErrorRequest,
validateResponse: validateErrorResponse,
+ pinGcBetweenIterations: true,
})
const runUnmatched = () =>
@@ -166,6 +171,7 @@ export function createWorkloadGroup(
iterations: errorPathsIterations,
buildRequest: buildUnmatchedRequest,
validateResponse: validateNotFoundResponse,
+ pinGcBetweenIterations: true,
})
return {
diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts b/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
index 7f89abb099..401d1e5f25 100644
--- a/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server error-paths (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/vite.config.ts b/benchmarks/memory/server/scenarios/error-paths/vue/vite.config.ts
index b5cf79924a..9a0ca28a25 100644
--- a/benchmarks/memory/server/scenarios/error-paths/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server error-paths (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/react/vite.config.ts b/benchmarks/memory/server/scenarios/peak-large-page/react/vite.config.ts
index 7d4fa70196..adaacda86e 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server peak-large-page (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
index b09c16e667..bb58034be6 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
@@ -55,6 +55,7 @@ export function createWorkloadGroup(
buildRequest: buildPeakLargePageRequest,
validateResponse: validatePeakLargePageResponse,
pinGcBetweenIterations: true,
+ verifyGcFloor: true,
})
return {
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts b/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
index ffc80b43aa..27d4dd65f7 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server peak-large-page (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/vite.config.ts b/benchmarks/memory/server/scenarios/peak-large-page/vue/vite.config.ts
index 67bdf9b79d..0f238bd7f7 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server peak-large-page (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/request-churn/react/vite.config.ts b/benchmarks/memory/server/scenarios/request-churn/react/vite.config.ts
index 4b75255eb1..1e956958ec 100644
--- a/benchmarks/memory/server/scenarios/request-churn/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server request-churn (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/request-churn/shared.ts b/benchmarks/memory/server/scenarios/request-churn/shared.ts
index 1739e4cc59..50a2151135 100644
--- a/benchmarks/memory/server/scenarios/request-churn/shared.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/shared.ts
@@ -10,7 +10,7 @@ export type { StartRequestHandler }
type Framework = 'react' | 'solid' | 'vue'
const benchmarkSeed = 0xdecafbad
-const requestChurnIterations = 200
+const requestChurnIterations = 40
const itemPageMarker = 'data-bench="request-churn-item"'
// Module-level so CodSpeed warmups and measurement never replay URLs.
const benchmarkRandom = createDeterministicRandom(benchmarkSeed)
@@ -68,6 +68,7 @@ export function createWorkloadGroup(
iterations: requestChurnIterations,
buildRequest: buildItemRequest,
validateResponse: validateItemResponse,
+ pinGcBetweenIterations: true,
})
return {
diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts b/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
index 8ff879e9e0..fbf8df9491 100644
--- a/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server request-churn (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/request-churn/vue/vite.config.ts b/benchmarks/memory/server/scenarios/request-churn/vue/vite.config.ts
index bcfa82b0ca..a551a96e2f 100644
--- a/benchmarks/memory/server/scenarios/request-churn/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server request-churn (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/react/vite.config.ts b/benchmarks/memory/server/scenarios/serialization-payload/react/vite.config.ts
index cfcc305c1a..de5549de3b 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server serialization-payload (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
index c6809bee0a..11cf020420 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
@@ -9,7 +9,7 @@ export type { StartRequestHandler }
type Framework = 'react' | 'solid' | 'vue'
const benchmarkSeed = 0x51eaa11
-const serializationPayloadIterations = 20
+const serializationPayloadIterations = 12
const payloadPageMarker = 'data-bench="serialization-payload"'
const requestInit = {
@@ -62,6 +62,7 @@ export function createWorkloadGroup(
buildRequest: buildPayloadRequest,
validateResponse: validatePayloadResponse,
pinGcBetweenIterations: true,
+ verifyGcFloor: true,
})
return {
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts b/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
index 26f57c9baa..926646ee12 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server serialization-payload (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/vue/vite.config.ts b/benchmarks/memory/server/scenarios/serialization-payload/vue/vite.config.ts
index b67693e559..41a5596adf 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server serialization-payload (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/react/vite.config.ts b/benchmarks/memory/server/scenarios/server-fn-churn/react/vite.config.ts
index 8a3eea0d36..68d9ed839b 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server server-fn-churn (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
index ad1022c836..c0bbc119fc 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
@@ -38,7 +38,9 @@ type SerovalNode =
const benchmarkSeed = 0xdecafbad
const payloadSeed = 0x51f0cafe
const fixtureCount = 16
-const serverFnChurnIterations = 150
+// Sized to sit just above the 2s measured-run floor on CI (per-iteration
+// cost with the pinned collection is ~0.08-0.11s across frameworks).
+const serverFnChurnIterations = 30
const origin = 'http://localhost'
const tssContentTypeFramed = 'application/x-tss-framed'
const acceptHeader = `${tssContentTypeFramed}, application/x-ndjson, application/json`
@@ -206,6 +208,7 @@ export async function createWorkloadGroup(
runSequentialRequestLoop(handler, {
seed: benchmarkSeed,
iterations: serverFnChurnIterations,
+ pinGcBetweenIterations: true,
buildRequest: (_random, index) => {
const fixtureIndex = Math.floor(index / 2) % fixtureCount
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
index 8ffdc48227..8d6d226e97 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server server-fn-churn (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/vue/vite.config.ts b/benchmarks/memory/server/scenarios/server-fn-churn/vue/vite.config.ts
index 02b404808e..0e249b9f3b 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server server-fn-churn (vue)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/react/vite.config.ts b/benchmarks/memory/server/scenarios/streaming-peak/react/vite.config.ts
index 733aabb76d..5af0f0d138 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/react/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/react/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server streaming-peak (react)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
index f01217fdd2..651b3cbb6e 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
@@ -99,6 +99,7 @@ export function createWorkloadGroup(
buildRequest: buildStreamingRequest,
validateResponse: validateStreamingResponse,
pinGcBetweenIterations: true,
+ verifyGcFloor: true,
})
return {
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/solid/vite.config.ts b/benchmarks/memory/server/scenarios/streaming-peak/solid/vite.config.ts
index b7d98e709c..18bf5b2d04 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/solid/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server streaming-peak (solid)',
watch: false,
environment: 'node',
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/vue/vite.config.ts b/benchmarks/memory/server/scenarios/streaming-peak/vue/vite.config.ts
index 9634031b31..7cd481da0b 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/vue/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/vue/vite.config.ts
@@ -22,6 +22,19 @@ export default defineConfig({
minify: false,
},
test: {
+ // Keep lazily-compiled code alive for the whole run: the pinned
+ // collections age code fast enough for V8 to flush unused bytecode,
+ // and the mid-measurement recompile injects a multi-MB allocation
+ // burst at a run-dependent time.
+ execArgv: [
+ '--no-flush-bytecode',
+ // Pre-size the V8 heap so no space has to grow mid-measurement:
+ // heap-growth events allocate several MB at a run-dependent moment,
+ // which flips the measured peak bimodally between identical runs.
+ '--initial-old-space-size=64',
+ '--min-semi-space-size=16',
+ '--max-semi-space-size=16',
+ ],
name: '@benchmarks/memory-server streaming-peak (vue)',
watch: false,
environment: 'node',
From a3e24c35a58d9ac149a05d6321f68aa5d541b6b4 Mon Sep 17 00:00:00 2001
From: Flo
Date: Fri, 3 Jul 2026 22:29:29 +0200
Subject: [PATCH 009/363] bench(memory): prefix client and server benchmark
names (#7743)
---
.../client/scenarios/interrupted-navigations/shared.ts | 2 +-
.../client/scenarios/loader-data-retention/shared.ts | 2 +-
.../memory/client/scenarios/mount-unmount/shared.ts | 2 +-
.../memory/client/scenarios/navigation-churn/shared.ts | 2 +-
.../memory/client/scenarios/preload-churn/shared.ts | 2 +-
.../client/scenarios/unique-location-churn/shared.ts | 2 +-
.../memory/server/scenarios/aborted-requests/shared.ts | 2 +-
benchmarks/memory/server/scenarios/error-paths/shared.ts | 8 ++++----
.../memory/server/scenarios/peak-large-page/shared.ts | 2 +-
.../memory/server/scenarios/request-churn/shared.ts | 2 +-
.../server/scenarios/serialization-payload/shared.ts | 2 +-
.../memory/server/scenarios/server-fn-churn/shared.ts | 2 +-
.../memory/server/scenarios/streaming-peak/shared.ts | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/shared.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/shared.ts
index 0e01e92e08..f7f3a7cd8b 100644
--- a/benchmarks/memory/client/scenarios/interrupted-navigations/shared.ts
+++ b/benchmarks/memory/client/scenarios/interrupted-navigations/shared.ts
@@ -296,7 +296,7 @@ export function createWorkload(
}
return {
- name: `mem interrupted-navigations (${framework})`,
+ name: `mem client interrupted-navigations (${framework})`,
before,
interrupt,
async run() {
diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/shared.ts b/benchmarks/memory/client/scenarios/loader-data-retention/shared.ts
index a5c496cb81..bd90c023f0 100644
--- a/benchmarks/memory/client/scenarios/loader-data-retention/shared.ts
+++ b/benchmarks/memory/client/scenarios/loader-data-retention/shared.ts
@@ -163,7 +163,7 @@ export function createWorkload(
}
return {
- name: `mem loader-data-retention (${framework})`,
+ name: `mem client loader-data-retention (${framework})`,
before,
navigate: (id: string) => navigateTo(id),
async run() {
diff --git a/benchmarks/memory/client/scenarios/mount-unmount/shared.ts b/benchmarks/memory/client/scenarios/mount-unmount/shared.ts
index 4f9b9f430f..01cfe8c46a 100644
--- a/benchmarks/memory/client/scenarios/mount-unmount/shared.ts
+++ b/benchmarks/memory/client/scenarios/mount-unmount/shared.ts
@@ -58,7 +58,7 @@ export function createWorkload(
}
return {
- name: `mem mount-unmount (${framework})`,
+ name: `mem client mount-unmount (${framework})`,
cycle,
async run() {
for (let index = 0; index < mountUnmountIterations; index++) {
diff --git a/benchmarks/memory/client/scenarios/navigation-churn/shared.ts b/benchmarks/memory/client/scenarios/navigation-churn/shared.ts
index 0745de2116..7eaf1a8b66 100644
--- a/benchmarks/memory/client/scenarios/navigation-churn/shared.ts
+++ b/benchmarks/memory/client/scenarios/navigation-churn/shared.ts
@@ -105,7 +105,7 @@ export function createWorkload(
}
return {
- name: `mem navigation-churn (${framework})`,
+ name: `mem client navigation-churn (${framework})`,
before,
navigate: (target: Target) => navigateTo(target),
async run() {
diff --git a/benchmarks/memory/client/scenarios/preload-churn/shared.ts b/benchmarks/memory/client/scenarios/preload-churn/shared.ts
index 78e35c42ad..8cea4aca81 100644
--- a/benchmarks/memory/client/scenarios/preload-churn/shared.ts
+++ b/benchmarks/memory/client/scenarios/preload-churn/shared.ts
@@ -180,7 +180,7 @@ export function createWorkload(
}
return {
- name: `mem preload-churn (${framework})`,
+ name: `mem client preload-churn (${framework})`,
before,
preload: (id: string) => preloadItem(id),
evictPreloads,
diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/shared.ts b/benchmarks/memory/client/scenarios/unique-location-churn/shared.ts
index 95b382269d..3b36c7811e 100644
--- a/benchmarks/memory/client/scenarios/unique-location-churn/shared.ts
+++ b/benchmarks/memory/client/scenarios/unique-location-churn/shared.ts
@@ -123,7 +123,7 @@ export function createWorkload(
}
return {
- name: `mem unique-location-churn (${framework})`,
+ name: `mem client unique-location-churn (${framework})`,
before,
navigate: (location: ItemLocation) => navigateTo(location),
async run() {
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
index c94d42afd6..f7f63c17e6 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts
@@ -265,7 +265,7 @@ export function createWorkloadGroup(
sanity: () => assertAbortedRequestsSanity(handler, mode),
workloads: [
{
- name: `mem aborted-requests (${framework})`,
+ name: `mem server aborted-requests (${framework})`,
run,
},
],
diff --git a/benchmarks/memory/server/scenarios/error-paths/shared.ts b/benchmarks/memory/server/scenarios/error-paths/shared.ts
index f65d150477..57e229b7e3 100644
--- a/benchmarks/memory/server/scenarios/error-paths/shared.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/shared.ts
@@ -178,19 +178,19 @@ export function createWorkloadGroup(
sanity: () => assertErrorPathsSanity(handler),
workloads: [
{
- name: `mem error-paths redirect (${framework})`,
+ name: `mem server error-paths redirect (${framework})`,
run: runRedirect,
},
{
- name: `mem error-paths not-found (${framework})`,
+ name: `mem server error-paths not-found (${framework})`,
run: runNotFound,
},
{
- name: `mem error-paths error (${framework})`,
+ name: `mem server error-paths error (${framework})`,
run: runError,
},
{
- name: `mem error-paths unmatched (${framework})`,
+ name: `mem server error-paths unmatched (${framework})`,
run: runUnmatched,
},
],
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
index bb58034be6..578fc9c5a2 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts
@@ -62,7 +62,7 @@ export function createWorkloadGroup(
sanity: () => assertPeakLargePageSanity(handler),
workloads: [
{
- name: `mem peak-large-page (${framework})`,
+ name: `mem server peak-large-page (${framework})`,
run,
},
],
diff --git a/benchmarks/memory/server/scenarios/request-churn/shared.ts b/benchmarks/memory/server/scenarios/request-churn/shared.ts
index 50a2151135..a196eec8b5 100644
--- a/benchmarks/memory/server/scenarios/request-churn/shared.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/shared.ts
@@ -75,7 +75,7 @@ export function createWorkloadGroup(
sanity: () => assertRequestChurnSanity(handler),
workloads: [
{
- name: `mem request-churn (${framework})`,
+ name: `mem server request-churn (${framework})`,
run,
},
],
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
index 11cf020420..ce095b5e10 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts
@@ -69,7 +69,7 @@ export function createWorkloadGroup(
sanity: () => assertSerializationPayloadSanity(handler),
workloads: [
{
- name: `mem serialization-payload (${framework})`,
+ name: `mem server serialization-payload (${framework})`,
run,
},
],
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
index c0bbc119fc..6e2959e757 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
@@ -227,7 +227,7 @@ export async function createWorkloadGroup(
sanity: () => assertServerFnChurnSanity(handler, urls),
workloads: [
{
- name: `mem server-fn-churn (${framework})`,
+ name: `mem server server-fn-churn (${framework})`,
run,
},
],
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
index 651b3cbb6e..6b45470329 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts
@@ -106,7 +106,7 @@ export function createWorkloadGroup(
sanity: () => assertStreamingPeakSanity(handler),
workloads: [
{
- name: `mem streaming-peak chunked (${framework})`,
+ name: `mem server streaming-peak chunked (${framework})`,
run,
},
],
From 41f7bf32837e751b2874e7d827f7456f8a5bd716 Mon Sep 17 00:00:00 2001
From: Soheil Nikroo <62501144+soheilnikroo@users.noreply.github.com>
Date: Sun, 12 Jul 2026 17:01:18 +0330
Subject: [PATCH 010/363] =?UTF-8?q?Update=20README=20for=20WorkOS=20exampl?=
=?UTF-8?q?e:=20change=20WORKOS=5FREDIRECT=5FURI=20to=20point=E2=80=A6=20(?=
=?UTF-8?q?#7802)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update README for WorkOS example: change WORKOS_REDIRECT_URI to point to /api/auth/callback
---
examples/react/start-workos/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/react/start-workos/README.md b/examples/react/start-workos/README.md
index d6e222c7ba..52dde9410a 100644
--- a/examples/react/start-workos/README.md
+++ b/examples/react/start-workos/README.md
@@ -30,7 +30,7 @@ You will need a [WorkOS account](https://dashboard.workos.com/signup).
WORKOS_CLIENT_ID=
WORKOS_API_KEY=
WORKOS_COOKIE_PASSWORD=
- WORKOS_REDIRECT_URI=http://localhost:3000/callback
+ WORKOS_REDIRECT_URI=http://localhost:3000/api/auth/callback
```
`WORKOS_COOKIE_PASSWORD` is the private key used to encrypt the session cookie. It has to be at least 32 characters long. You can use the [1Password generator](https://1password.com/password-generator/) or the `openssl` library to generate a strong password via the command line:
```bash
From e65f0c84c12010eb33b3f51b4034d2243e510e29 Mon Sep 17 00:00:00 2001
From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com>
Date: Mon, 13 Jul 2026 21:44:44 +0200
Subject: [PATCH 011/363] fix deps in example (#7809)
---
examples/react/start-rscs/package.json | 2 +-
pnpm-lock.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json
index 980f43eff9..4e6da2d402 100644
--- a/examples/react/start-rscs/package.json
+++ b/examples/react/start-rscs/package.json
@@ -27,7 +27,7 @@
"@types/react-dom": "^19.2.2",
"@vitejs/plugin-react": "^6.0.1",
"@vitejs/plugin-rsc": "^0.5.20",
- "nitro": "npm:nitro-nightly@latest",
+ "nitro": "^3.0.260311-beta",
"tailwindcss": "^4.1.18",
"typescript": "^5.7.2",
"vite": "^8.0.14"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 96847b4044..afd15b62bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9809,8 +9809,8 @@ importers:
specifier: ^0.5.20
version: 0.5.20(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
nitro:
- specifier: npm:nitro-nightly@latest
- version: nitro-nightly@4.0.0-20251010-091516-7cafddba(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@4.0.3)(ioredis@5.9.2)(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
+ specifier: ^3.0.260311-beta
+ version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(dotenv@17.4.2)(giget@2.0.0)(jiti@2.7.0)(lru-cache@11.5.1)(miniflare@4.20260317.0)(mysql2@3.15.3)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
tailwindcss:
specifier: ^4.1.18
version: 4.2.2
From e2dd2049cb42eb219d3b447b8605066d19d9c1fa Mon Sep 17 00:00:00 2001
From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com>
Date: Mon, 13 Jul 2026 21:45:55 +0200
Subject: [PATCH 012/363] fix(router-core): handle window and element scroll
restoration independently (#7807)
---
.changeset/fix-independent-scroll-targets.md | 13 +
.../scroll-restoration/src/routeTree.gen.ts | 71 +++++
.../scroll-restoration/src/router.tsx | 21 +-
.../src/routes/(tests)/hash-scroll-about.tsx | 16 +-
.../src/routes/(tests)/hash-scroll-repro.tsx | 46 ++++
.../src/routes/(tests)/issue-7687.detail.tsx | 16 ++
.../src/routes/(tests)/issue-7687.index.tsx | 46 ++++
.../src/routes/(tests)/issue-7687.tsx | 49 ++++
.../src/routes/(tests)/ssr-scroll-key.tsx | 17 ++
.../tests/hash-scroll-repro.spec.ts | 121 +++++++--
.../tests/issue-7687.spec.ts | 242 +++++++++++++++++
.../tests/ssr-scroll-key.spec.ts | 74 ++++++
packages/router-core/src/router.ts | 12 +-
.../router-core/src/scroll-restoration.ts | 96 +++----
.../tests/scroll-restoration.test.ts | 249 +++++++++++++++++-
15 files changed, 998 insertions(+), 91 deletions(-)
create mode 100644 .changeset/fix-independent-scroll-targets.md
create mode 100644 e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.detail.tsx
create mode 100644 e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.index.tsx
create mode 100644 e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.tsx
create mode 100644 e2e/react-start/scroll-restoration/tests/issue-7687.spec.ts
diff --git a/.changeset/fix-independent-scroll-targets.md b/.changeset/fix-independent-scroll-targets.md
new file mode 100644
index 0000000000..d47294ee3e
--- /dev/null
+++ b/.changeset/fix-independent-scroll-targets.md
@@ -0,0 +1,13 @@
+---
+'@tanstack/router-core': patch
+---
+
+fix(router-core): handle window and element scroll restoration independently
+
+Window and element scroll targets are now handled independently. Restoring one target no longer suppresses resets for other uncached configured targets, and a restored element is no longer reset when the window has no cached position.
+
+Hash navigation no longer resets elements configured through `scrollToTopSelectors` and retains precedence over stale window positions through destination invalidations.
+
+Scroll positions are sampled when leaving a route, preserving live changes made after the most recent scroll event. This also prevents client hydration from undoing nested positions restored by the SSR script.
+
+Fixes #7687.
diff --git a/e2e/react-start/scroll-restoration/src/routeTree.gen.ts b/e2e/react-start/scroll-restoration/src/routeTree.gen.ts
index 1df27a0424..7acedcb1d7 100644
--- a/e2e/react-start/scroll-restoration/src/routeTree.gen.ts
+++ b/e2e/react-start/scroll-restoration/src/routeTree.gen.ts
@@ -21,8 +21,11 @@ import { Route as testsNestedScrollSearchRouteImport } from './routes/(tests)/ne
import { Route as testsNestedScrollCarryOverBRouteImport } from './routes/(tests)/nested-scroll-carry-over-b'
import { Route as testsNestedScrollCarryOverARouteImport } from './routes/(tests)/nested-scroll-carry-over-a'
import { Route as testsNestedScrollAwayRouteImport } from './routes/(tests)/nested-scroll-away'
+import { Route as testsIssue7687RouteImport } from './routes/(tests)/issue-7687'
import { Route as testsHashScrollReproRouteImport } from './routes/(tests)/hash-scroll-repro'
import { Route as testsHashScrollAboutRouteImport } from './routes/(tests)/hash-scroll-about'
+import { Route as testsIssue7687IndexRouteImport } from './routes/(tests)/issue-7687.index'
+import { Route as testsIssue7687DetailRouteImport } from './routes/(tests)/issue-7687.detail'
const IndexRoute = IndexRouteImport.update({
id: '/',
@@ -86,6 +89,11 @@ const testsNestedScrollAwayRoute = testsNestedScrollAwayRouteImport.update({
path: '/nested-scroll-away',
getParentRoute: () => rootRouteImport,
} as any)
+const testsIssue7687Route = testsIssue7687RouteImport.update({
+ id: '/(tests)/issue-7687',
+ path: '/issue-7687',
+ getParentRoute: () => rootRouteImport,
+} as any)
const testsHashScrollReproRoute = testsHashScrollReproRouteImport.update({
id: '/(tests)/hash-scroll-repro',
path: '/hash-scroll-repro',
@@ -96,11 +104,22 @@ const testsHashScrollAboutRoute = testsHashScrollAboutRouteImport.update({
path: '/hash-scroll-about',
getParentRoute: () => rootRouteImport,
} as any)
+const testsIssue7687IndexRoute = testsIssue7687IndexRouteImport.update({
+ id: '/',
+ path: '/',
+ getParentRoute: () => testsIssue7687Route,
+} as any)
+const testsIssue7687DetailRoute = testsIssue7687DetailRouteImport.update({
+ id: '/detail',
+ path: '/detail',
+ getParentRoute: () => testsIssue7687Route,
+} as any)
export interface FileRoutesByFullPath {
'/': typeof IndexRoute
'/hash-scroll-about': typeof testsHashScrollAboutRoute
'/hash-scroll-repro': typeof testsHashScrollReproRoute
+ '/issue-7687': typeof testsIssue7687RouteWithChildren
'/nested-scroll-away': typeof testsNestedScrollAwayRoute
'/nested-scroll-carry-over-a': typeof testsNestedScrollCarryOverARoute
'/nested-scroll-carry-over-b': typeof testsNestedScrollCarryOverBRoute
@@ -112,6 +131,8 @@ export interface FileRoutesByFullPath {
'/ssr-scroll-key': typeof testsSsrScrollKeyRoute
'/with-loader': typeof testsWithLoaderRoute
'/with-search': typeof testsWithSearchRoute
+ '/issue-7687/detail': typeof testsIssue7687DetailRoute
+ '/issue-7687/': typeof testsIssue7687IndexRoute
}
export interface FileRoutesByTo {
'/': typeof IndexRoute
@@ -128,12 +149,15 @@ export interface FileRoutesByTo {
'/ssr-scroll-key': typeof testsSsrScrollKeyRoute
'/with-loader': typeof testsWithLoaderRoute
'/with-search': typeof testsWithSearchRoute
+ '/issue-7687/detail': typeof testsIssue7687DetailRoute
+ '/issue-7687': typeof testsIssue7687IndexRoute
}
export interface FileRoutesById {
__root__: typeof rootRouteImport
'/': typeof IndexRoute
'/(tests)/hash-scroll-about': typeof testsHashScrollAboutRoute
'/(tests)/hash-scroll-repro': typeof testsHashScrollReproRoute
+ '/(tests)/issue-7687': typeof testsIssue7687RouteWithChildren
'/(tests)/nested-scroll-away': typeof testsNestedScrollAwayRoute
'/(tests)/nested-scroll-carry-over-a': typeof testsNestedScrollCarryOverARoute
'/(tests)/nested-scroll-carry-over-b': typeof testsNestedScrollCarryOverBRoute
@@ -145,6 +169,8 @@ export interface FileRoutesById {
'/(tests)/ssr-scroll-key': typeof testsSsrScrollKeyRoute
'/(tests)/with-loader': typeof testsWithLoaderRoute
'/(tests)/with-search': typeof testsWithSearchRoute
+ '/(tests)/issue-7687/detail': typeof testsIssue7687DetailRoute
+ '/(tests)/issue-7687/': typeof testsIssue7687IndexRoute
}
export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
@@ -152,6 +178,7 @@ export interface FileRouteTypes {
| '/'
| '/hash-scroll-about'
| '/hash-scroll-repro'
+ | '/issue-7687'
| '/nested-scroll-away'
| '/nested-scroll-carry-over-a'
| '/nested-scroll-carry-over-b'
@@ -163,6 +190,8 @@ export interface FileRouteTypes {
| '/ssr-scroll-key'
| '/with-loader'
| '/with-search'
+ | '/issue-7687/detail'
+ | '/issue-7687/'
fileRoutesByTo: FileRoutesByTo
to:
| '/'
@@ -179,11 +208,14 @@ export interface FileRouteTypes {
| '/ssr-scroll-key'
| '/with-loader'
| '/with-search'
+ | '/issue-7687/detail'
+ | '/issue-7687'
id:
| '__root__'
| '/'
| '/(tests)/hash-scroll-about'
| '/(tests)/hash-scroll-repro'
+ | '/(tests)/issue-7687'
| '/(tests)/nested-scroll-away'
| '/(tests)/nested-scroll-carry-over-a'
| '/(tests)/nested-scroll-carry-over-b'
@@ -195,12 +227,15 @@ export interface FileRouteTypes {
| '/(tests)/ssr-scroll-key'
| '/(tests)/with-loader'
| '/(tests)/with-search'
+ | '/(tests)/issue-7687/detail'
+ | '/(tests)/issue-7687/'
fileRoutesById: FileRoutesById
}
export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
testsHashScrollAboutRoute: typeof testsHashScrollAboutRoute
testsHashScrollReproRoute: typeof testsHashScrollReproRoute
+ testsIssue7687Route: typeof testsIssue7687RouteWithChildren
testsNestedScrollAwayRoute: typeof testsNestedScrollAwayRoute
testsNestedScrollCarryOverARoute: typeof testsNestedScrollCarryOverARoute
testsNestedScrollCarryOverBRoute: typeof testsNestedScrollCarryOverBRoute
@@ -300,6 +335,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof testsNestedScrollAwayRouteImport
parentRoute: typeof rootRouteImport
}
+ '/(tests)/issue-7687': {
+ id: '/(tests)/issue-7687'
+ path: '/issue-7687'
+ fullPath: '/issue-7687'
+ preLoaderRoute: typeof testsIssue7687RouteImport
+ parentRoute: typeof rootRouteImport
+ }
'/(tests)/hash-scroll-repro': {
id: '/(tests)/hash-scroll-repro'
path: '/hash-scroll-repro'
@@ -314,13 +356,42 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof testsHashScrollAboutRouteImport
parentRoute: typeof rootRouteImport
}
+ '/(tests)/issue-7687/': {
+ id: '/(tests)/issue-7687/'
+ path: '/'
+ fullPath: '/issue-7687/'
+ preLoaderRoute: typeof testsIssue7687IndexRouteImport
+ parentRoute: typeof testsIssue7687Route
+ }
+ '/(tests)/issue-7687/detail': {
+ id: '/(tests)/issue-7687/detail'
+ path: '/detail'
+ fullPath: '/issue-7687/detail'
+ preLoaderRoute: typeof testsIssue7687DetailRouteImport
+ parentRoute: typeof testsIssue7687Route
+ }
}
}
+interface testsIssue7687RouteChildren {
+ testsIssue7687DetailRoute: typeof testsIssue7687DetailRoute
+ testsIssue7687IndexRoute: typeof testsIssue7687IndexRoute
+}
+
+const testsIssue7687RouteChildren: testsIssue7687RouteChildren = {
+ testsIssue7687DetailRoute: testsIssue7687DetailRoute,
+ testsIssue7687IndexRoute: testsIssue7687IndexRoute,
+}
+
+const testsIssue7687RouteWithChildren = testsIssue7687Route._addFileChildren(
+ testsIssue7687RouteChildren,
+)
+
const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
testsHashScrollAboutRoute: testsHashScrollAboutRoute,
testsHashScrollReproRoute: testsHashScrollReproRoute,
+ testsIssue7687Route: testsIssue7687RouteWithChildren,
testsNestedScrollAwayRoute: testsNestedScrollAwayRoute,
testsNestedScrollCarryOverARoute: testsNestedScrollCarryOverARoute,
testsNestedScrollCarryOverBRoute: testsNestedScrollCarryOverBRoute,
diff --git a/e2e/react-start/scroll-restoration/src/router.tsx b/e2e/react-start/scroll-restoration/src/router.tsx
index eb81f5bfa9..27d68369db 100644
--- a/e2e/react-start/scroll-restoration/src/router.tsx
+++ b/e2e/react-start/scroll-restoration/src/router.tsx
@@ -7,13 +7,32 @@ export function getRouter() {
const router = createRouter({
routeTree,
scrollRestoration: true,
- scrollToTopSelectors: ['[data-scroll-restoration-id="carry-over-reset"]'],
+ scrollToTopSelectors: [
+ '[data-scroll-restoration-id="carry-over-reset"]',
+ '#hash-scroll-nested',
+ '#hash-scroll-reset-target',
+ '#issue-7687-reset-probe',
+ '#issue-7687-scroller',
+ () =>
+ typeof document === 'undefined'
+ ? undefined
+ : document.getElementById('issue-7687-stale-selector'),
+ '#ssr-scroll-key-nested',
+ ],
getScrollRestorationKey: (location) => {
if (location.pathname === '/ssr-scroll-key') {
return 'ssr-scroll-key'
}
if (location.pathname === '/hash-scroll-repro') {
+ const scrollKey =
+ 'scrollKey' in location.search ? location.search.scrollKey : undefined
+ return typeof scrollKey === 'string'
+ ? `${location.pathname}:${scrollKey}`
+ : location.pathname
+ }
+
+ if (location.pathname.startsWith('/issue-7687')) {
return location.pathname
}
diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-about.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-about.tsx
index 2c2748e6a5..1ee24f4b1f 100644
--- a/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-about.tsx
+++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-about.tsx
@@ -1,5 +1,5 @@
import * as React from 'react'
-import { createFileRoute } from '@tanstack/react-router'
+import { Link, createFileRoute } from '@tanstack/react-router'
import { sleep } from '~/utils/posts'
export const Route = createFileRoute('/(tests)/hash-scroll-about')({
@@ -17,6 +17,20 @@ function Component() {
This route exists so hover preloading can reproduce the hash scroll bug.
+
+ Return to #one
+
+
+ Return to the destination key
+
)
}
diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-repro.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-repro.tsx
index 1017b63bc3..c2c681247a 100644
--- a/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-repro.tsx
+++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/hash-scroll-repro.tsx
@@ -1,8 +1,13 @@
import * as React from 'react'
import { Link, createFileRoute, useRouter } from '@tanstack/react-router'
+import { z } from 'zod'
import { sleep } from '~/utils/posts'
export const Route = createFileRoute('/(tests)/hash-scroll-repro')({
+ validateSearch: z.object({
+ scrollKey: z.string().optional(),
+ invalidateOnMount: z.boolean().optional(),
+ }),
loader: async () => {
await sleep(50)
return null
@@ -14,7 +19,20 @@ const sectionIds = ['one', 'two', 'three', 'four', 'five'] as const
function Component() {
const router = useRouter()
+ const { invalidateOnMount } = Route.useSearch()
const [invalidateCount, setInvalidateCount] = React.useState(0)
+ const invalidatedOnMount = React.useRef(false)
+
+ React.useLayoutEffect(() => {
+ if (!invalidateOnMount || invalidatedOnMount.current) {
+ return
+ }
+
+ invalidatedOnMount.current = true
+ void router.invalidate().then(() => {
+ setInvalidateCount((count) => count + 1)
+ })
+ }, [invalidateOnMount, router])
return (
@@ -61,6 +79,24 @@ function Component() {
>
#four no reset
+
+ #one different key
+
+
+ #one and invalidate in layout effect
+
@@ -74,6 +110,16 @@ function Component() {
))}
+
+
{sectionIds.map((sectionId) => (
+ issue-7687-detail
+ {Array.from({ length: 40 }).map((_, i) => (
+ Detail row {i}
+ ))}
+
+ )
+}
diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.index.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.index.tsx
new file mode 100644
index 0000000000..82450e43f3
--- /dev/null
+++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.index.tsx
@@ -0,0 +1,46 @@
+import * as React from 'react'
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/(tests)/issue-7687/')({
+ component: Component,
+})
+
+const visitKey = 'issue-7687-list-visits'
+
+function ResetProbe() {
+ const ref = React.useRef(null)
+
+ React.useLayoutEffect(() => {
+ const visits = Number(window.sessionStorage.getItem(visitKey) ?? 0)
+ window.sessionStorage.setItem(visitKey, String(visits + 1))
+
+ if (visits > 0 && ref.current) {
+ ref.current.scrollTop = 80
+ }
+ }, [])
+
+ return (
+
+ {Array.from({ length: 20 }).map((_, i) => (
+
Reset probe row {i}
+ ))}
+
+ )
+}
+
+function Component() {
+ return (
+
+
issue-7687-list
+
+ {Array.from({ length: 40 }).map((_, i) => (
+
List row {i}
+ ))}
+
+ )
+}
diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.tsx
new file mode 100644
index 0000000000..f7091cd829
--- /dev/null
+++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/issue-7687.tsx
@@ -0,0 +1,49 @@
+import { Link, Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/(tests)/issue-7687')({
+ component: Component,
+})
+
+function Component() {
+ return (
+
+
+
+
+
+
+
+
+ {Array.from({ length: 20 }).map((_, i) => (
+
Stale selector row {i}
+ ))}
+
+
+
+
+ )
+}
diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/ssr-scroll-key.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/ssr-scroll-key.tsx
index e224ed9137..dd7375660b 100644
--- a/e2e/react-start/scroll-restoration/src/routes/(tests)/ssr-scroll-key.tsx
+++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/ssr-scroll-key.tsx
@@ -7,9 +7,26 @@ export const Route = createFileRoute('/(tests)/ssr-scroll-key')({
})
function Component() {
+ const [hydrated, setHydrated] = React.useState(false)
+
+ React.useEffect(() => {
+ setHydrated(true)
+ }, [])
+
return (
ssr-scroll-key
+ {hydrated ?
: null}
+
)
diff --git a/e2e/react-start/scroll-restoration/tests/hash-scroll-repro.spec.ts b/e2e/react-start/scroll-restoration/tests/hash-scroll-repro.spec.ts
index d203ea8c26..7a6aa72161 100644
--- a/e2e/react-start/scroll-restoration/tests/hash-scroll-repro.spec.ts
+++ b/e2e/react-start/scroll-restoration/tests/hash-scroll-repro.spec.ts
@@ -103,43 +103,59 @@ test('hash navigation wins over stale same-tab scroll restoration entries', asyn
expect(scrollYAfterHashNavigation).toBeLessThan(staleScrollY)
})
-test('hash navigation still runs when only nested scroll entries restore', async ({
+test('hash navigation wins when the destination invalidates in a layout effect', async ({
page,
}) => {
await goToRepro(page)
-
- const nestedScrollTop = await page.evaluate(() => {
- const nested = document.querySelector('[data-testid="hash-scroll-nested"]')
- if (!(nested instanceof HTMLElement)) {
- throw new Error('Missing nested scroller')
- }
-
- nested.scrollTop = 80
- window.dispatchEvent(new PageTransitionEvent('pagehide'))
- return nested.scrollTop
- })
-
- expect(nestedScrollTop).toBeGreaterThan(0)
+ const staleScrollY = await scrollUpFromHashTarget(page)
await page.reload()
await page.waitForLoadState('networkidle')
await expect(
page.getByTestId('hash-scroll-repro-invalidate-count'),
+ ).toHaveText('Invalidate count: 0')
+
+ await page.getByTestId('hash-scroll-layout-invalidate-link').click()
+ await expect(page).toHaveURL(/invalidateOnMount=true#one$/)
+ await expect(
+ page.getByTestId('hash-scroll-repro-invalidate-count'),
+ ).toHaveText('Invalidate count: 1')
+
+ await expect(page.getByTestId('hash-scroll-section-one')).toBeInViewport()
+ await expect(
+ page.getByTestId('hash-scroll-section-five'),
+ ).not.toBeInViewport()
+
+ const scrollYAfterHashNavigation = await page.evaluate(() => window.scrollY)
+ expect(scrollYAfterHashNavigation).toBeLessThan(staleScrollY)
+})
+
+test('hash navigation still runs when a configured nested target restores', async ({
+ page,
+}) => {
+ await goToRepro(page)
+
+ const nested = page.getByTestId('hash-scroll-nested')
+ const cachedScrollTop = await nested.evaluate(async (element) => {
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+ return element.scrollTop
+ })
+
+ expect(cachedScrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('hash-scroll-about-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'hash-scroll-about' }),
).toBeVisible()
- await page.getByTestId('hash-scroll-section-one-link').click()
+ await page.getByTestId('hash-scroll-restore-link').click()
await expect(page.getByTestId('hash-scroll-section-one')).toBeInViewport()
await expect
- .poll(async () => {
- return page.evaluate(() => {
- const nested = document.querySelector(
- '[data-testid="hash-scroll-nested"]',
- )
- return nested instanceof HTMLElement ? nested.scrollTop : 0
- })
- })
- .toBe(nestedScrollTop)
+ .poll(async () => nested.evaluate((element) => element.scrollTop))
+ .toBe(cachedScrollTop)
})
test('hash navigation scrolls when resetScroll is false', async ({ page }) => {
@@ -157,3 +173,60 @@ test('hash navigation scrolls when resetScroll is false', async ({ page }) => {
.poll(async () => page.evaluate(() => window.scrollY))
.toBeGreaterThan(scrollYBeforeHashNavigation)
})
+
+test('hash navigation does not reset configured nested targets', async ({
+ page,
+}) => {
+ await goToRepro(page)
+
+ const resetTarget = page.getByTestId('hash-scroll-reset-target')
+ const scrollTop = await resetTarget.evaluate((element) => {
+ element.scrollTop = 80
+ return element.scrollTop
+ })
+ expect(scrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('hash-scroll-section-one-link').click()
+ await expect(page).toHaveURL(/#one$/)
+ await expect(page.getByTestId('hash-scroll-section-one')).toBeInViewport()
+ await expect
+ .poll(async () => resetTarget.evaluate((el) => el.scrollTop))
+ .toBe(scrollTop)
+})
+
+test('hash navigation does not carry configured targets into a different key', async ({
+ page,
+}) => {
+ await goToRepro(page)
+
+ const resetTarget = page.getByTestId('hash-scroll-reset-target')
+ const sourceScrollTop = await resetTarget.evaluate(async (element) => {
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+ return element.scrollTop
+ })
+ expect(sourceScrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('hash-scroll-different-key-link').click()
+ await expect(page).toHaveURL(/scrollKey=destination#one$/)
+ await expect(page.getByTestId('hash-scroll-section-one')).toBeInViewport()
+ await expect
+ .poll(async () => resetTarget.evaluate((element) => element.scrollTop))
+ .toBe(sourceScrollTop)
+
+ await page.getByTestId('hash-scroll-about-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'hash-scroll-about' }),
+ ).toBeVisible()
+
+ await page.getByTestId('hash-scroll-destination-link').click()
+ await expect(page).toHaveURL(/scrollKey=destination$/)
+ await expect
+ .poll(async () =>
+ page
+ .getByTestId('hash-scroll-reset-target')
+ .evaluate((element) => element.scrollTop),
+ )
+ .toBe(0)
+})
diff --git a/e2e/react-start/scroll-restoration/tests/issue-7687.spec.ts b/e2e/react-start/scroll-restoration/tests/issue-7687.spec.ts
new file mode 100644
index 0000000000..85a5bd5d43
--- /dev/null
+++ b/e2e/react-start/scroll-restoration/tests/issue-7687.spec.ts
@@ -0,0 +1,242 @@
+import { expect, test } from '@playwright/test'
+import type { Page } from '@playwright/test'
+
+async function goToList(page: Page) {
+ await page.goto('/issue-7687')
+ await page.waitForLoadState('networkidle')
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+}
+
+test('restores a configured nested target independently from the window', async ({
+ page,
+}) => {
+ await goToList(page)
+
+ const scroller = page.getByTestId('issue-7687-scroller')
+ const scrollTop = await scroller.evaluate((element) => {
+ element.scrollTop = 400
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ return element.scrollTop
+ })
+
+ expect(scrollTop).toBeGreaterThan(0)
+ expect(await page.evaluate(() => window.scrollY)).toBe(0)
+
+ await page.getByTestId('issue-7687-detail-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+ await expect.poll(async () => scroller.evaluate((el) => el.scrollTop)).toBe(0)
+
+ const outgoingWindowScrollY = await page.evaluate(() => {
+ window.scrollTo(0, 600)
+ window.dispatchEvent(new Event('scroll'))
+ return window.scrollY
+ })
+ expect(outgoingWindowScrollY).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-list-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+
+ await expect
+ .poll(async () => scroller.evaluate((el) => el.scrollTop))
+ .toBe(scrollTop)
+ await expect.poll(async () => page.evaluate(() => window.scrollY)).toBe(0)
+ await expect
+ .poll(async () =>
+ page.getByTestId('issue-7687-reset-probe').evaluate((el) => el.scrollTop),
+ )
+ .toBe(0)
+})
+
+test('resets an uncached configured target when the window restores', async ({
+ page,
+}) => {
+ await goToList(page)
+
+ const windowScrollY = await page.evaluate(() => {
+ window.scrollTo(0, 600)
+ window.dispatchEvent(new Event('scroll'))
+ return window.scrollY
+ })
+ expect(windowScrollY).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-detail-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+ await expect.poll(async () => page.evaluate(() => window.scrollY)).toBe(0)
+
+ await page.getByTestId('issue-7687-list-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+
+ await expect
+ .poll(async () => page.evaluate(() => window.scrollY))
+ .toBe(windowScrollY)
+ await expect
+ .poll(async () =>
+ page.getByTestId('issue-7687-reset-probe').evaluate((el) => el.scrollTop),
+ )
+ .toBe(0)
+})
+
+test('restores and resets nested targets independently on browser back', async ({
+ page,
+}) => {
+ await goToList(page)
+
+ const cachedScrollTop = await page
+ .getByTestId('issue-7687-scroller')
+ .evaluate(async (element) => {
+ element.scrollTop = 400
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+ return element.scrollTop
+ })
+ expect(cachedScrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-detail-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+
+ await page.goBack()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+
+ await expect
+ .poll(async () =>
+ page
+ .getByTestId('issue-7687-scroller')
+ .evaluate((element) => element.scrollTop),
+ )
+ .toBe(cachedScrollTop)
+ await expect
+ .poll(async () =>
+ page
+ .getByTestId('issue-7687-reset-probe')
+ .evaluate((element) => element.scrollTop),
+ )
+ .toBe(0)
+})
+
+test('resets a live configured target when its cached selector becomes stale', async ({
+ page,
+}) => {
+ await goToList(page)
+
+ const target = page.getByTestId('issue-7687-stale-selector')
+ const cachedScrollTop = await target.evaluate(async (element) => {
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+ return element.scrollTop
+ })
+ expect(cachedScrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-detail-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+ await expect.poll(async () => target.evaluate((el) => el.scrollTop)).toBe(0)
+
+ const outgoingScrollTop = await target.evaluate(async (element) => {
+ element.dataset.scrollRestorationId = 'issue-7687-stale-current'
+ element.scrollTop = 40
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+ return element.scrollTop
+ })
+ expect(outgoingScrollTop).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-list-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+
+ await expect.poll(async () => target.evaluate((el) => el.scrollTop)).toBe(0)
+})
+
+test('resetScroll false preserves window and configured nested targets', async ({
+ page,
+}) => {
+ await goToList(page)
+
+ const positions = await page.evaluate(() => {
+ const scroller = document.querySelector(
+ '[data-testid="issue-7687-scroller"]',
+ )
+ if (!(scroller instanceof HTMLElement)) {
+ throw new Error('Missing issue-7687 scroller')
+ }
+
+ scroller.scrollTop = 400
+ scroller.dispatchEvent(new Event('scroll', { bubbles: true }))
+ window.scrollTo(0, 600)
+ window.dispatchEvent(new Event('scroll'))
+
+ return { nested: scroller.scrollTop, window: window.scrollY }
+ })
+
+ expect(positions.nested).toBeGreaterThan(0)
+ expect(positions.window).toBeGreaterThan(0)
+
+ await page.getByTestId('issue-7687-detail-no-reset-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+
+ await expect
+ .poll(async () => page.evaluate(() => window.scrollY))
+ .toBe(positions.window)
+ await expect
+ .poll(async () =>
+ page.getByTestId('issue-7687-scroller').evaluate((el) => el.scrollTop),
+ )
+ .toBe(positions.nested)
+
+ await page.getByTestId('issue-7687-list-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-list' }),
+ ).toBeVisible()
+
+ const changedPositions = await page.evaluate(async () => {
+ const scroller = document.querySelector(
+ '[data-testid="issue-7687-scroller"]',
+ )
+ if (!(scroller instanceof HTMLElement)) {
+ throw new Error('Missing issue-7687 scroller')
+ }
+
+ scroller.scrollTop = 200
+ scroller.dispatchEvent(new Event('scroll', { bubbles: true }))
+ window.scrollTo(0, 300)
+ window.dispatchEvent(new Event('scroll'))
+ await new Promise((resolve) => requestAnimationFrame(resolve))
+
+ return { nested: scroller.scrollTop, window: window.scrollY }
+ })
+
+ expect(changedPositions.nested).not.toBe(positions.nested)
+ expect(changedPositions.window).not.toBe(positions.window)
+
+ await page.getByTestId('issue-7687-detail-link').click()
+ await expect(
+ page.getByRole('heading', { name: 'issue-7687-detail' }),
+ ).toBeVisible()
+ await expect
+ .poll(async () => page.evaluate(() => window.scrollY))
+ .toBe(positions.window)
+ await expect
+ .poll(async () =>
+ page.getByTestId('issue-7687-scroller').evaluate((el) => el.scrollTop),
+ )
+ .toBe(positions.nested)
+})
diff --git a/e2e/react-start/scroll-restoration/tests/ssr-scroll-key.spec.ts b/e2e/react-start/scroll-restoration/tests/ssr-scroll-key.spec.ts
index 737695a0cf..eb61a279d2 100644
--- a/e2e/react-start/scroll-restoration/tests/ssr-scroll-key.spec.ts
+++ b/e2e/react-start/scroll-restoration/tests/ssr-scroll-key.spec.ts
@@ -38,3 +38,77 @@ test('SSR scroll restoration uses a custom restoration key', async ({
.poll(async () => page.evaluate(() => window.scrollY))
.toBe(customKeyScrollY)
})
+
+test('SSR restores a configured nested target without client JavaScript', async ({
+ page,
+}) => {
+ const nestedScrollTop = 80
+
+ await page.addInitScript(
+ ({ nestedScrollTop, storageKey }) => {
+ window.sessionStorage.setItem(
+ storageKey,
+ JSON.stringify({
+ 'ssr-scroll-key': {
+ '[data-scroll-restoration-id="ssr-scroll-key-nested"]': {
+ scrollX: 0,
+ scrollY: nestedScrollTop,
+ },
+ },
+ }),
+ )
+ },
+ { nestedScrollTop, storageKey },
+ )
+ await page.route(/\/assets\/.*\.js$/, (route) => route.abort())
+
+ await page.goto('/ssr-scroll-key', { waitUntil: 'domcontentloaded' })
+ await expect(
+ page.getByRole('heading', { name: 'ssr-scroll-key' }),
+ ).toBeVisible()
+ await expect(page.getByTestId('ssr-scroll-key-hydrated')).toHaveCount(0)
+ await expect
+ .poll(async () =>
+ page
+ .getByTestId('ssr-scroll-key-nested')
+ .evaluate((element) => element.scrollTop),
+ )
+ .toBe(nestedScrollTop)
+})
+
+test('hydration does not reset a configured nested target restored by SSR', async ({
+ page,
+}) => {
+ const nestedScrollTop = 80
+
+ await page.addInitScript(
+ ({ nestedScrollTop, storageKey }) => {
+ window.sessionStorage.setItem(
+ storageKey,
+ JSON.stringify({
+ 'ssr-scroll-key': {
+ '[data-scroll-restoration-id="ssr-scroll-key-nested"]': {
+ scrollX: 0,
+ scrollY: nestedScrollTop,
+ },
+ },
+ }),
+ )
+ },
+ { nestedScrollTop, storageKey },
+ )
+
+ await page.goto('/ssr-scroll-key')
+ await page.waitForLoadState('networkidle')
+ await expect(
+ page.getByRole('heading', { name: 'ssr-scroll-key' }),
+ ).toBeVisible()
+ await expect(page.getByTestId('ssr-scroll-key-hydrated')).toBeAttached()
+ await expect
+ .poll(async () =>
+ page
+ .getByTestId('ssr-scroll-key-nested')
+ .evaluate((element) => element.scrollTop),
+ )
+ .toBe(nestedScrollTop)
+})
diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts
index 2197dab737..df9251a739 100644
--- a/packages/router-core/src/router.ts
+++ b/packages/router-core/src/router.ts
@@ -904,11 +904,6 @@ export function getLocationChangeInfo(
return { fromLocation, toLocation, pathChanged, hrefChanged, hashChanged }
}
-export const locationHistoryActions = new WeakMap<
- ParsedLocation,
- HistoryAction
->()
-
type LightweightRouteMatchResult = {
matchedRoutes: ReadonlyArray
fullPath: string
@@ -978,6 +973,8 @@ export class RouterCore<
)}`
_scroll: {
next: boolean
+ // True until the current PUSH/REPLACE renders, so its hash owns window scroll.
+ hash?: boolean
restoring?: boolean
restoration?: boolean
reset?: boolean
@@ -2475,9 +2472,8 @@ export class RouterCore<
try {
this.beforeLoad()
if (historyAction) {
- locationHistoryActions.set(this.latestLocation, historyAction)
- } else {
- locationHistoryActions.delete(this.latestLocation)
+ this._scroll.hash =
+ historyAction === 'PUSH' || historyAction === 'REPLACE'
}
const next = this.latestLocation
const prevLocation = this.stores.resolvedLocation.get()
diff --git a/packages/router-core/src/scroll-restoration.ts b/packages/router-core/src/scroll-restoration.ts
index 6287a6fce0..5e4ae0d3ee 100644
--- a/packages/router-core/src/scroll-restoration.ts
+++ b/packages/router-core/src/scroll-restoration.ts
@@ -1,5 +1,4 @@
import { isServer } from '@tanstack/router-core/isServer'
-import { locationHistoryActions } from './router'
import type { AnyRouter } from './router'
import type { ParsedLocation } from './location'
@@ -133,7 +132,6 @@ export function getElementScrollRestorationEntry(
let ignoreScroll = false
const windowScrollTarget = 'window'
-type ScrollTarget = typeof windowScrollTarget | Element
function getElement(selector: string | (() => Element | null | undefined)) {
try {
@@ -148,8 +146,8 @@ function getScrollToTopElements(
scrollToTopSelectors: NonNullable<
AnyRouter['options']['scrollToTopSelectors']
>,
-): Array {
- const elements: Array = []
+) {
+ const elements = new Set()
for (const selector of scrollToTopSelectors) {
if (selector === windowScrollTarget) {
@@ -158,7 +156,7 @@ function getScrollToTopElements(
const element = getElement(selector)
if (element) {
- elements.push(element)
+ elements.add(element)
}
}
@@ -180,46 +178,21 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
const getKey =
router.options.getScrollRestorationKey || defaultGetScrollRestorationKey
- const trackedScrollEntries = new Map()
- const setTrackedScrollEntry = (
- target: ScrollTarget,
- scrollX: number,
- scrollY: number,
- ) => {
- const entry =
- trackedScrollEntries.get(target) || ({} as ScrollRestorationEntry)
- entry.scrollX = scrollX
- entry.scrollY = scrollY
- trackedScrollEntries.set(target, entry)
- }
-
- const onScroll = (event: Event) => {
- if (ignoreScroll || !scroll.restoring) {
- return
- }
-
- if (event.target === document) {
- setTrackedScrollEntry(windowScrollTarget, scrollX, scrollY)
- } else {
- const target = event.target as Element
- setTrackedScrollEntry(target, target.scrollLeft, target.scrollTop)
- }
- }
+ const trackedScrollTargets = new Set()
// Snapshot the current page's tracked scroll targets before navigation or unload.
const snapshotCurrentScrollTargets = (restoreKey: string) => {
- if (!scroll.restoring) {
- return
- }
-
const keyEntry = (scrollRestorationCache[restoreKey] ||=
{} as ScrollRestorationByElement)
- for (const [target, position] of trackedScrollEntries) {
- if (target === windowScrollTarget) {
- keyEntry[windowScrollTarget] = position
- } else if (target.isConnected) {
- keyEntry[getScrollRestorationSelector(target)] = position
+ for (const target of trackedScrollTargets) {
+ if (target === document) {
+ keyEntry[windowScrollTarget] = { scrollX, scrollY }
+ } else if ((target as Element).isConnected) {
+ keyEntry[getScrollRestorationSelector(target as Element)] = {
+ scrollX: (target as Element).scrollLeft,
+ scrollY: (target as Element).scrollTop,
+ }
}
}
}
@@ -230,12 +203,21 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
history.scrollRestoration = 'manual'
- document.addEventListener('scroll', onScroll, true)
+ document.addEventListener(
+ 'scroll',
+ (event) => {
+ if (ignoreScroll) {
+ return
+ }
+ trackedScrollTargets.add(event.target as Document | Element)
+ },
+ true,
+ )
router.subscribe('onBeforeLoad', (event) => {
if (event.fromLocation) {
snapshotCurrentScrollTargets(getKey(event.fromLocation))
}
- trackedScrollEntries.clear()
+ trackedScrollTargets.clear()
})
addEventListener('pagehide', () => {
snapshotCurrentScrollTargets(
@@ -258,12 +240,11 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
const behavior = router.options.scrollRestorationBehavior
const scrollToTopSelectors = router.options.scrollToTopSelectors
const shouldResetScroll = scroll.next
- let scrollToTopElements: Array | undefined
- trackedScrollEntries.clear()
-
- if (!shouldResetScroll) {
- scroll.next = true
- }
+ const hashNavigation = scroll.hash
+ let scrollToTopElements: Set | undefined
+ trackedScrollTargets.clear()
+ scroll.next = true
+ scroll.hash = false
if (
typeof router.options.scrollRestoration === 'function' &&
@@ -295,7 +276,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
if (shouldResetScroll && scrollToTopSelectors) {
scrollToTopElements ??=
getScrollToTopElements(scrollToTopSelectors)
- if (scrollToTopElements.includes(element)) {
+ if (scrollToTopElements.has(element)) {
continue
}
}
@@ -321,11 +302,12 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
let windowRestored = false
if (shouldResetScroll) {
- const action = locationHistoryActions.get(event.toLocation)
+ if (!hash && scrollToTopSelectors) {
+ scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors)
+ }
+
const skipWindowRestore =
- hash &&
- hashScrollIntoViewOptions &&
- (action === 'PUSH' || action === 'REPLACE')
+ hash && hashScrollIntoViewOptions && hashNavigation
const elementEntries = scroll.restoring
? scrollRestorationCache[cacheKey]
@@ -351,21 +333,23 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
if (element) {
element.scrollLeft = scrollX
element.scrollTop = scrollY
+ scrollToTopElements?.delete(element)
}
}
}
}
- if (!windowRestored && !hash) {
+ if (!hash) {
const scrollOptions = {
top: 0,
left: 0,
behavior,
}
- scrollTo(scrollOptions)
- if (scrollToTopSelectors) {
- scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors)
+ if (!windowRestored) {
+ scrollTo(scrollOptions)
+ }
+ if (scrollToTopElements) {
for (const element of scrollToTopElements) {
element.scrollTo(scrollOptions)
}
diff --git a/packages/router-core/tests/scroll-restoration.test.ts b/packages/router-core/tests/scroll-restoration.test.ts
index 188d13bb68..c02a8f8783 100644
--- a/packages/router-core/tests/scroll-restoration.test.ts
+++ b/packages/router-core/tests/scroll-restoration.test.ts
@@ -2,8 +2,15 @@ import { createMemoryHistory } from '@tanstack/history'
import { afterEach, describe, expect, test, vi } from 'vitest'
import { BaseRootRoute, BaseRoute } from '../src'
import { createTestRouter } from './routerTestUtils'
+import type { ParsedLocation } from '../src'
-function createRouter(options: { scrollRestoration?: boolean } = {}) {
+function createRouter(
+ options: {
+ scrollRestoration?: boolean
+ scrollToTopSelectors?: Array Element | null | undefined)>
+ getScrollRestorationKey?: (location: ParsedLocation) => string
+ } = {},
+) {
const rootRoute = new BaseRootRoute({})
const indexRoute = new BaseRoute({
getParentRoute: () => rootRoute,
@@ -18,9 +25,39 @@ function createRouter(options: { scrollRestoration?: boolean } = {}) {
}
afterEach(() => {
+ document.body.replaceChildren()
+ window.sessionStorage.clear()
vi.restoreAllMocks()
+ vi.unstubAllGlobals()
})
+function getLocation(
+ router: ReturnType,
+ pathname: string,
+) {
+ return {
+ ...router.latestLocation,
+ href: pathname,
+ pathname,
+ }
+}
+
+function emitNavigation(
+ router: ReturnType,
+ type: 'onBeforeLoad' | 'onRendered',
+ fromLocation: ParsedLocation,
+ toLocation: ParsedLocation,
+) {
+ router.emit({
+ type,
+ fromLocation,
+ toLocation,
+ pathChanged: true,
+ hrefChanged: true,
+ hashChanged: false,
+ })
+}
+
describe('setupScrollRestoration', () => {
test('sets up scroll restoration when scrollRestoration is true', () => {
const windowAddEventListener = vi.spyOn(window, 'addEventListener')
@@ -46,6 +83,63 @@ describe('setupScrollRestoration', () => {
window.history.scrollRestoration = previousScrollRestoration
})
+ test('snapshots the live position when it changed after the latest scroll event', () => {
+ const element = document.createElement('div')
+ element.id = 'unit-live-snapshot-element'
+ document.body.append(element)
+ vi.stubGlobal('scrollTo', vi.fn())
+
+ const router = createRouter({
+ scrollRestoration: true,
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-live-snapshot-source')
+ const destination = getLocation(router, '/unit-live-snapshot-destination')
+
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ element.scrollTop = 120
+
+ emitNavigation(router, 'onBeforeLoad', source, destination)
+ element.scrollTop = 0
+ emitNavigation(router, 'onRendered', source, destination)
+
+ expect(element.scrollTop).toBe(120)
+ })
+
+ test('snapshots the live window position when it changed after the latest scroll event', () => {
+ const windowScrollTo = vi.fn()
+ vi.stubGlobal('scrollTo', windowScrollTo)
+ vi.stubGlobal('scrollX', 0)
+ vi.stubGlobal('scrollY', 80)
+
+ const router = createRouter({
+ scrollRestoration: true,
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-live-window-snapshot-source')
+ const destination = getLocation(
+ router,
+ '/unit-live-window-snapshot-destination',
+ )
+
+ document.dispatchEvent(new Event('scroll'))
+ vi.stubGlobal('scrollY', 120)
+
+ emitNavigation(router, 'onBeforeLoad', source, destination)
+ emitNavigation(router, 'onRendered', source, destination)
+ windowScrollTo.mockClear()
+
+ emitNavigation(router, 'onBeforeLoad', destination, source)
+ emitNavigation(router, 'onRendered', destination, source)
+
+ expect(windowScrollTo).toHaveBeenCalledWith({
+ top: 120,
+ left: 0,
+ behavior: undefined,
+ })
+ })
+
test.each([
['omitted', undefined],
['false', false],
@@ -81,4 +175,157 @@ describe('setupScrollRestoration', () => {
window.history.scrollRestoration = previousScrollRestoration
},
)
+
+ test('restores a configured element independently from the window', () => {
+ const element = document.createElement('div')
+ element.id = 'unit-restored-element'
+ element.dataset.scrollRestorationId = 'unit-restored-element'
+ document.body.append(element)
+
+ const elementScrollTo = vi.fn((options: ScrollToOptions) => {
+ element.scrollTop = options.top ?? element.scrollTop
+ })
+ element.scrollTo = elementScrollTo as typeof element.scrollTo
+ const windowScrollTo = vi.fn()
+ vi.stubGlobal('scrollTo', windowScrollTo)
+
+ const router = createRouter({
+ scrollRestoration: true,
+ scrollToTopSelectors: ['#unit-restored-element'],
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-element-source')
+ const destination = getLocation(router, '/unit-element-destination')
+
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+
+ emitNavigation(router, 'onBeforeLoad', source, destination)
+ emitNavigation(router, 'onRendered', source, destination)
+ expect(element.scrollTop).toBe(0)
+
+ elementScrollTo.mockClear()
+ windowScrollTo.mockClear()
+ vi.stubGlobal('scrollX', 0)
+ vi.stubGlobal('scrollY', 120)
+ document.dispatchEvent(new Event('scroll'))
+ emitNavigation(router, 'onBeforeLoad', destination, source)
+ emitNavigation(router, 'onRendered', destination, source)
+
+ expect(element.scrollTop).toBe(80)
+ expect(elementScrollTo).not.toHaveBeenCalled()
+ expect(windowScrollTo).toHaveBeenCalledWith({
+ top: 0,
+ left: 0,
+ behavior: undefined,
+ })
+ })
+
+ test('resets an uncached configured element when the window restores', () => {
+ const element = document.createElement('div')
+ element.id = 'unit-reset-element'
+ document.body.append(element)
+
+ const elementScrollTo = vi.fn((options: ScrollToOptions) => {
+ element.scrollTop = options.top ?? element.scrollTop
+ })
+ element.scrollTo = elementScrollTo as typeof element.scrollTo
+
+ const windowScrollTo = vi.fn()
+ vi.stubGlobal('scrollX', 0)
+ vi.stubGlobal('scrollY', 120)
+ vi.stubGlobal('scrollTo', windowScrollTo)
+
+ const router = createRouter({
+ scrollRestoration: true,
+ scrollToTopSelectors: ['#unit-reset-element'],
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-window-source')
+ const destination = getLocation(router, '/unit-window-destination')
+
+ document.dispatchEvent(new Event('scroll'))
+ emitNavigation(router, 'onBeforeLoad', source, destination)
+ emitNavigation(router, 'onRendered', source, destination)
+
+ elementScrollTo.mockClear()
+ windowScrollTo.mockClear()
+ element.scrollTop = 80
+
+ emitNavigation(router, 'onBeforeLoad', destination, source)
+ emitNavigation(router, 'onRendered', destination, source)
+
+ expect(windowScrollTo).toHaveBeenCalledWith({
+ top: 120,
+ left: 0,
+ behavior: undefined,
+ })
+ expect(element.scrollTop).toBe(0)
+ expect(elementScrollTo).toHaveBeenCalledWith({
+ top: 0,
+ left: 0,
+ behavior: undefined,
+ })
+ })
+
+ test('resets a configured element when its cached selector becomes stale', () => {
+ const element = document.createElement('div')
+ element.id = 'unit-stale-selector-element'
+ element.dataset.scrollRestorationId = 'unit-stale-selector-source'
+ document.body.append(element)
+
+ const elementScrollTo = vi.fn((options: ScrollToOptions) => {
+ element.scrollTop = options.top ?? element.scrollTop
+ })
+ element.scrollTo = elementScrollTo as typeof element.scrollTo
+ vi.stubGlobal('scrollTo', vi.fn())
+
+ const router = createRouter({
+ scrollRestoration: true,
+ scrollToTopSelectors: [() => element],
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-stale-selector-source')
+ const destination = getLocation(router, '/unit-stale-selector-destination')
+
+ element.scrollTop = 80
+ element.dispatchEvent(new Event('scroll', { bubbles: true }))
+ emitNavigation(router, 'onBeforeLoad', source, destination)
+ emitNavigation(router, 'onRendered', source, destination)
+ expect(element.scrollTop).toBe(0)
+
+ element.dataset.scrollRestorationId = 'unit-stale-selector-current'
+ element.scrollTop = 40
+ elementScrollTo.mockClear()
+ emitNavigation(router, 'onBeforeLoad', destination, source)
+ emitNavigation(router, 'onRendered', destination, source)
+
+ expect(element.scrollTop).toBe(0)
+ expect(elementScrollTo).toHaveBeenCalledWith({
+ top: 0,
+ left: 0,
+ behavior: undefined,
+ })
+ })
+
+ test('does not resolve configured selectors for hash navigation without source entries', () => {
+ const element = document.createElement('div')
+ document.body.append(element)
+ const getElement = vi.fn(() => element)
+
+ const router = createRouter({
+ scrollRestoration: true,
+ scrollToTopSelectors: [getElement],
+ getScrollRestorationKey: (location) => location.pathname,
+ })
+ const source = getLocation(router, '/unit-hash-source')
+ const destination = {
+ ...getLocation(router, '/unit-hash-destination'),
+ hash: 'section',
+ }
+
+ emitNavigation(router, 'onRendered', source, destination)
+
+ expect(getElement).not.toHaveBeenCalled()
+ })
})
From caebc57045acb84fbb666c9e4ca352075f42840e Mon Sep 17 00:00:00 2001
From: Manuel Schiller <6340397+schiller-manuel@users.noreply.github.com>
Date: Mon, 13 Jul 2026 23:10:34 +0200
Subject: [PATCH 013/363] fix deps (#7810)
---
pnpm-workspace.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index de56e54dd7..ffd19c8155 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -10,6 +10,7 @@ trustPolicyExclude:
- 'semver@6.3.1' # installed by babel, ecosystem has been on v7 for 7 years now, but babel is horribly out of date, 6.3.1 is the latest v6 and was released 3 years ago
- 'undici@6.21.2' # installed by cheerio@1.0.0 -> html-link-extractor@1.0.5 -> markdown-link-extractor@4.0.3, is only 1 year old, v6, v7 and v8 are maintained in parallel
- '@netlify/edge-bundler@14.7.0' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks
+ - '@platformatic/flame@1.7.0' # trusted publishing failed due to a missing sigstore module in npm, then an established maintainer published it manually
- '@netlify/serverless-functions-api@2.7.1' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks
- '@netlify/zip-it-and-ship-it@14.1.11' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks
From 58c005fcb1a0618ec8c5b96b2b5fe3ccab5736c5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Jul 2026 23:31:08 +0200
Subject: [PATCH 014/363] ci: Version Packages (#7811)
---
.changeset/fix-independent-scroll-targets.md | 13 -
.../package.json | 4 +-
.../react/authenticated-routes/package.json | 4 +-
.../basic-default-search-params/package.json | 2 +-
.../react/basic-devtools-panel/package.json | 2 +-
examples/react/basic-file-based/package.json | 4 +-
.../basic-non-nested-devtools/package.json | 2 +-
.../basic-react-query-file-based/package.json | 4 +-
examples/react/basic-react-query/package.json | 2 +-
.../react/basic-ssr-file-based/package.json | 4 +-
.../package.json | 4 +-
.../basic-virtual-file-based/package.json | 4 +-
.../package.json | 4 +-
examples/react/basic/package.json | 2 +-
examples/react/deferred-data/package.json | 2 +-
examples/react/i18n-paraglide/package.json | 4 +-
.../kitchen-sink-file-based/package.json | 4 +-
.../package.json | 4 +-
.../kitchen-sink-react-query/package.json | 2 +-
examples/react/kitchen-sink/package.json | 2 +-
examples/react/large-file-based/package.json | 4 +-
examples/react/location-masking/package.json | 2 +-
.../react/navigation-blocking/package.json | 2 +-
.../package.json | 4 +-
.../react/quickstart-file-based/package.json | 4 +-
.../quickstart-rspack-file-based/package.json | 4 +-
.../package.json | 4 +-
examples/react/quickstart/package.json | 2 +-
.../router-monorepo-react-query/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../router-monorepo-simple-lazy/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../react/router-monorepo-simple/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../react/scroll-restoration/package.json | 2 +-
.../search-validator-adapters/package.json | 4 +-
examples/react/start-bare/package.json | 4 +-
examples/react/start-basic-auth/package.json | 4 +-
.../react/start-basic-authjs/package.json | 4 +-
.../react/start-basic-cloudflare/package.json | 4 +-
.../start-basic-react-query/package.json | 4 +-
.../react/start-basic-static/package.json | 6 +-
examples/react/start-basic/package.json | 4 +-
examples/react/start-bun/package.json | 6 +-
examples/react/start-clerk-basic/package.json | 4 +-
.../react/start-convex-trellaux/package.json | 4 +-
examples/react/start-counter/package.json | 4 +-
.../react/start-i18n-paraglide/package.json | 4 +-
examples/react/start-large/package.json | 4 +-
examples/react/start-material-ui/package.json | 4 +-
examples/react/start-rscs/package.json | 4 +-
.../package.json | 4 +-
.../react/start-supabase-basic/package.json | 4 +-
examples/react/start-tailwind-v4/package.json | 4 +-
examples/react/start-trellaux/package.json | 4 +-
examples/react/start-workos/package.json | 4 +-
examples/react/view-transitions/package.json | 4 +-
.../react/with-framer-motion/package.json | 2 +-
.../react/with-trpc-react-query/package.json | 4 +-
examples/react/with-trpc/package.json | 4 +-
.../package.json | 4 +-
.../solid/authenticated-routes/package.json | 4 +-
.../basic-default-search-params/package.json | 2 +-
.../solid/basic-devtools-panel/package.json | 2 +-
examples/solid/basic-file-based/package.json | 4 +-
.../basic-non-nested-devtools/package.json | 2 +-
.../basic-solid-query-file-based/package.json | 4 +-
examples/solid/basic-solid-query/package.json | 4 +-
.../solid/basic-ssr-file-based/package.json | 4 +-
.../package.json | 4 +-
.../basic-virtual-file-based/package.json | 4 +-
.../package.json | 4 +-
examples/solid/basic/package.json | 2 +-
examples/solid/deferred-data/package.json | 2 +-
examples/solid/i18n-paraglide/package.json | 4 +-
.../kitchen-sink-file-based/package.json | 4 +-
.../package.json | 4 +-
.../kitchen-sink-solid-query/package.json | 2 +-
examples/solid/kitchen-sink/package.json | 2 +-
examples/solid/large-file-based/package.json | 4 +-
examples/solid/location-masking/package.json | 2 +-
.../solid/navigation-blocking/package.json | 2 +-
.../package.json | 4 +-
.../solid/quickstart-file-based/package.json | 4 +-
.../quickstart-rspack-file-based/package.json | 4 +-
.../package.json | 4 +-
examples/solid/quickstart/package.json | 2 +-
.../router-monorepo-simple-lazy/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../solid/router-monorepo-simple/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../router-monorepo-solid-query/package.json | 4 +-
.../packages/router/package.json | 4 +-
.../solid/scroll-restoration/package.json | 2 +-
.../search-validator-adapters/package.json | 4 +-
examples/solid/start-basic-auth/package.json | 4 +-
.../solid/start-basic-authjs/package.json | 4 +-
.../solid/start-basic-cloudflare/package.json | 4 +-
.../solid/start-basic-netlify/package.json | 4 +-
examples/solid/start-basic-nitro/package.json | 4 +-
.../start-basic-solid-query/package.json | 4 +-
.../solid/start-basic-static/package.json | 6 +-
examples/solid/start-basic/package.json | 4 +-
examples/solid/start-bun/package.json | 6 +-
.../start-convex-better-auth/package.json | 4 +-
examples/solid/start-counter/package.json | 4 +-
.../solid/start-i18n-paraglide/package.json | 4 +-
examples/solid/start-large/package.json | 4 +-
.../package.json | 4 +-
.../solid/start-supabase-basic/package.json | 4 +-
examples/solid/start-tailwind-v4/package.json | 4 +-
examples/solid/view-transitions/package.json | 4 +-
.../solid/with-framer-motion/package.json | 2 +-
examples/solid/with-trpc/package.json | 4 +-
.../vue/basic-file-based-jsx/package.json | 4 +-
.../vue/basic-file-based-sfc/package.json | 4 +-
examples/vue/basic/package.json | 2 +-
packages/react-router/CHANGELOG.md | 7 +
packages/react-router/package.json | 2 +-
packages/react-start-client/CHANGELOG.md | 9 +
packages/react-start-client/package.json | 2 +-
packages/react-start-rsc/CHANGELOG.md | 12 +
packages/react-start-rsc/package.json | 2 +-
packages/react-start-server/CHANGELOG.md | 9 +
packages/react-start-server/package.json | 2 +-
packages/react-start/CHANGELOG.md | 13 +
packages/react-start/package.json | 2 +-
packages/router-cli/CHANGELOG.md | 7 +
packages/router-cli/package.json | 2 +-
packages/router-core/CHANGELOG.md | 14 +
packages/router-core/package.json | 2 +-
packages/router-generator/CHANGELOG.md | 7 +
packages/router-generator/package.json | 2 +-
packages/router-plugin/CHANGELOG.md | 9 +
packages/router-plugin/package.json | 2 +-
packages/router-vite-plugin/CHANGELOG.md | 7 +
packages/router-vite-plugin/package.json | 2 +-
packages/solid-router/CHANGELOG.md | 7 +
packages/solid-router/package.json | 2 +-
packages/solid-start-client/CHANGELOG.md | 9 +
packages/solid-start-client/package.json | 2 +-
packages/solid-start-server/CHANGELOG.md | 9 +
packages/solid-start-server/package.json | 2 +-
packages/solid-start/CHANGELOG.md | 12 +
packages/solid-start/package.json | 2 +-
packages/start-client-core/CHANGELOG.md | 8 +
packages/start-client-core/package.json | 2 +-
packages/start-plugin-core/CHANGELOG.md | 10 +
packages/start-plugin-core/package.json | 2 +-
packages/start-server-core/CHANGELOG.md | 9 +
packages/start-server-core/package.json | 2 +-
.../CHANGELOG.md | 9 +
.../package.json | 2 +-
packages/start-storage-context/CHANGELOG.md | 7 +
packages/start-storage-context/package.json | 2 +-
packages/vue-router/CHANGELOG.md | 7 +
packages/vue-router/package.json | 2 +-
packages/vue-start-client/CHANGELOG.md | 9 +
packages/vue-start-client/package.json | 2 +-
packages/vue-start-server/CHANGELOG.md | 9 +
packages/vue-start-server/package.json | 2 +-
packages/vue-start/CHANGELOG.md | 12 +
packages/vue-start/package.json | 2 +-
pnpm-lock.yaml | 340 +++++-------------
164 files changed, 528 insertions(+), 502 deletions(-)
delete mode 100644 .changeset/fix-independent-scroll-targets.md
diff --git a/.changeset/fix-independent-scroll-targets.md b/.changeset/fix-independent-scroll-targets.md
deleted file mode 100644
index d47294ee3e..0000000000
--- a/.changeset/fix-independent-scroll-targets.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@tanstack/router-core': patch
----
-
-fix(router-core): handle window and element scroll restoration independently
-
-Window and element scroll targets are now handled independently. Restoring one target no longer suppresses resets for other uncached configured targets, and a restored element is no longer reset when the window has no cached position.
-
-Hash navigation no longer resets elements configured through `scrollToTopSelectors` and retains precedence over stale window positions through destination invalidations.
-
-Scroll positions are sampled when leaving a route, preserving live changes made after the most recent scroll event. This also prevents client hydration from undoing nested positions restored by the SSR script.
-
-Fixes #7687.
diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json
index 58c677ed26..ed0c97607c 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 5517800c01..b47b6a38a2 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 97bfd6d8d4..d3062bbb11 100644
--- a/examples/react/basic-default-search-params/package.json
+++ b/examples/react/basic-default-search-params/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json
index 9ff1c8fefb..3147d73064 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 bca55ff7d5..7aecf29cce 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 fe6f2a04bd..7ace128a31 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 501a22dcc3..e0fa7c1a36 100644
--- a/examples/react/basic-react-query-file-based/package.json
+++ b/examples/react/basic-react-query-file-based/package.json
@@ -12,9 +12,9 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json
index b56851bdac..160c426dc1 100644
--- a/examples/react/basic-react-query/package.json
+++ b/examples/react/basic-react-query/package.json
@@ -12,7 +12,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json
index 3fa61c784f..c7f7da2e0c 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.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"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 b24243e276..f022ebb718 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.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"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 922c460906..7cf590ef31 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@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 a24bf519d9..255facb7ff 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@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 d245cc9f0e..f380281baa 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 b55fb41ccc..c1ca6ba2e1 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 d9a9602c02..55079cfebb 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.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"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 2e18eb4358..989367745e 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 f712e86a8f..378ad424c4 100644
--- a/examples/react/kitchen-sink-react-query-file-based/package.json
+++ b/examples/react/kitchen-sink-react-query-file-based/package.json
@@ -12,9 +12,9 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"immer": "^10.1.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json
index 3003408f70..c03d144726 100644
--- a/examples/react/kitchen-sink-react-query/package.json
+++ b/examples/react/kitchen-sink-react-query/package.json
@@ -12,7 +12,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"immer": "^10.1.1",
"react": "^19.0.0",
diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json
index 4414b457f2..ebba4eb683 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 16fd095515..e57ed59fbc 100644
--- a/examples/react/large-file-based/package.json
+++ b/examples/react/large-file-based/package.json
@@ -13,9 +13,9 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json
index 76d00658a4..a43f090245 100644
--- a/examples/react/location-masking/package.json
+++ b/examples/react/location-masking/package.json
@@ -12,7 +12,7 @@
"@radix-ui/react-dialog": "^1.1.6",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json
index 757ae9f2e6..ebb1b4d3b1 100644
--- a/examples/react/navigation-blocking/package.json
+++ b/examples/react/navigation-blocking/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json
index 300650c666..57203d5eec 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 31a70cf36c..f89da750cc 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 f3525defde..5ae8e4e737 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"postcss": "^8.5.1",
"react": "^19.0.0",
@@ -19,7 +19,7 @@
"devDependencies": {
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"typescript": "^6.0.2"
diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json
index 4c778eab28..d5a729b1ff 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@swc/core": "^1.15.33",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@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 00269e8524..983e3a00f6 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 75532f61b1..b5cc722a6b 100644
--- a/examples/react/router-monorepo-react-query/package.json
+++ b/examples/react/router-monorepo-react-query/package.json
@@ -12,9 +12,9 @@
"dependencies": {
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
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 136535b761..56d50596df 100644
--- a/examples/react/router-monorepo-react-query/packages/router/package.json
+++ b/examples/react/router-monorepo-react-query/packages/router/package.json
@@ -11,8 +11,8 @@
"@router-mono-react-query/post-query": "workspace:*",
"@tanstack/history": "^1.162.0",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json
index dd06440bf3..e259aba770 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1"
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 8b0b87a474..c9ff6bb101 100644
--- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json
+++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json
@@ -9,8 +9,8 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@tanstack/history": "^1.162.0",
- "@tanstack/react-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"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 77cf9ecdf5..e126976126 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 6bdb5ec943..0eae7a368b 100644
--- a/examples/react/router-monorepo-simple/packages/router/package.json
+++ b/examples/react/router-monorepo-simple/packages/router/package.json
@@ -9,8 +9,8 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@tanstack/history": "^1.162.0",
- "@tanstack/react-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"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 7a503801e5..caf8329f07 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"@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 234abba717..cfdeba55d5 100644
--- a/examples/react/search-validator-adapters/package.json
+++ b/examples/react/search-validator-adapters/package.json
@@ -13,9 +13,9 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/arktype-adapter": "^1.167.0",
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@tanstack/valibot-adapter": "^1.167.0",
"@tanstack/zod-adapter": "^1.167.0",
"arktype": "^2.1.7",
diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json
index 5a15546ef6..d0ff2ea336 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 abee47dc52..4533b4bee1 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 a28f1c313f..ba1628938d 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 f74602ab83..78a01c103a 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 40a18be142..a39283577f 100644
--- a/examples/react/start-basic-react-query/package.json
+++ b/examples/react/start-basic-react-query/package.json
@@ -12,10 +12,10 @@
"dependencies": {
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json
index 8ea4c54edc..c167f5ce79 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
- "@tanstack/start-static-server-functions": "^1.167.18",
+ "@tanstack/react-start": "^1.168.28",
+ "@tanstack/start-static-server-functions": "^1.167.19",
"@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 931df2a45d..9fd4e517a6 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 a4ab34310f..c0571fea19 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.27",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/react-start": "^1.168.28",
+ "@tanstack/router-plugin": "^1.168.20",
"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 7e15b08073..7aeffb6a9b 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"@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 f2ec73bfe8..356a7cab2d 100644
--- a/examples/react/start-convex-trellaux/package.json
+++ b/examples/react/start-convex-trellaux/package.json
@@ -15,10 +15,10 @@
"@convex-dev/react-query": "0.0.0-alpha.8",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"concurrently": "^8.2.2",
"convex": "^1.19.0",
"ky": "^1.7.4",
diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json
index a7a8397b74..03a572f79c 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 936f5e040d..b4a62068a3 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 d7300fc815..f4822d3eba 100644
--- a/examples/react/start-large/package.json
+++ b/examples/react/start-large/package.json
@@ -13,9 +13,9 @@
},
"dependencies": {
"@tanstack/react-query": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json
index a7623d10f0..0efed05e33 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 4e6da2d402..8d39c00a79 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 e5d50b902f..82ddd0726e 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 30083cbe1d..c28c4c0972 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 f8e537c9b4..840669580e 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"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 29bf8bba30..58d3386253 100644
--- a/examples/react/start-trellaux/package.json
+++ b/examples/react/start-trellaux/package.json
@@ -12,10 +12,10 @@
"dependencies": {
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"@tanstack/react-router-ssr-query": "^1.167.1",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"ky": "^1.7.4",
"msw": "^2.7.0",
"react": "^19.0.0",
diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json
index 935c7a0a5f..3639294bac 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/react-start": "^1.168.27",
+ "@tanstack/react-start": "^1.168.28",
"@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 a5cc8bc839..4170f718e9 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"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 c4d861b689..b690bb1c9a 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
"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 48e7eaa6cb..8831056e3d 100644
--- a/examples/react/with-trpc-react-query/package.json
+++ b/examples/react/with-trpc-react-query/package.json
@@ -13,9 +13,9 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/react-query": "^5.90.0",
"@tanstack/react-query-devtools": "^5.90.0",
- "@tanstack/react-router": "^1.170.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@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 3474e12a6b..6ec641420c 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.17",
+ "@tanstack/react-router": "^1.170.18",
"@tanstack/react-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@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 fdb0cd4400..0ed139ce36 100644
--- a/examples/solid/authenticated-routes-firebase/package.json
+++ b/examples/solid/authenticated-routes-firebase/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"firebase": "^11.4.0",
"redaxios": "^0.5.1",
diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json
index 4e3fac9dec..979f85c8a9 100644
--- a/examples/solid/authenticated-routes/package.json
+++ b/examples/solid/authenticated-routes/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json
index f1f806b647..a41e918fe4 100644
--- a/examples/solid/basic-default-search-params/package.json
+++ b/examples/solid/basic-default-search-params/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json
index 6bc2dacd1f..fcc8d093ed 100644
--- a/examples/solid/basic-devtools-panel/package.json
+++ b/examples/solid/basic-devtools-panel/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json
index 40e93847d0..b032501a85 100644
--- a/examples/solid/basic-file-based/package.json
+++ b/examples/solid/basic-file-based/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
@@ -18,7 +18,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json
index 4cf678441f..64bf1df09f 100644
--- a/examples/solid/basic-non-nested-devtools/package.json
+++ b/examples/solid/basic-non-nested-devtools/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json
index bae59ef0e5..e70255d71e 100644
--- a/examples/solid/basic-solid-query-file-based/package.json
+++ b/examples/solid/basic-solid-query-file-based/package.json
@@ -13,7 +13,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json
index 8efdd34c10..a3aaeb30da 100644
--- a/examples/solid/basic-solid-query/package.json
+++ b/examples/solid/basic-solid-query/package.json
@@ -12,14 +12,14 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json
index 1e8a57559f..6a298c782e 100644
--- a/examples/solid/basic-ssr-file-based/package.json
+++ b/examples/solid/basic-ssr-file-based/package.json
@@ -11,8 +11,8 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"compression": "^1.8.0",
"express": "^5.2.1",
"get-port": "^7.1.0",
diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json
index cbdda9063b..7e8e90bb09 100644
--- a/examples/solid/basic-ssr-streaming-file-based/package.json
+++ b/examples/solid/basic-ssr-streaming-file-based/package.json
@@ -12,7 +12,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"compression": "^1.8.0",
"express": "^5.2.1",
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@types/express": "^5.0.6",
"typescript": "^6.0.2",
"vite": "^8.0.14",
diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json
index 17ba921082..461b72f958 100644
--- a/examples/solid/basic-virtual-file-based/package.json
+++ b/examples/solid/basic-virtual-file-based/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@tanstack/virtual-file-routes": "^1.162.0",
"redaxios": "^0.5.1",
diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json
index e24fd542d1..449c620d69 100644
--- a/examples/solid/basic-virtual-inside-file-based/package.json
+++ b/examples/solid/basic-virtual-inside-file-based/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@tanstack/virtual-file-routes": "^1.162.0",
"redaxios": "^0.5.1",
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index 9b42dafb14..f13e5f3afb 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json
index 5286f94c06..c9851e71e5 100644
--- a/examples/solid/deferred-data/package.json
+++ b/examples/solid/deferred-data/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json
index f9506ebbdc..a6c4136a40 100644
--- a/examples/solid/i18n-paraglide/package.json
+++ b/examples/solid/i18n-paraglide/package.json
@@ -11,8 +11,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"solid-js": "^1.9.10",
"tailwindcss": "^4.2.2"
},
diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json
index 956a852426..d38afe3bb5 100644
--- a/examples/solid/kitchen-sink-file-based/package.json
+++ b/examples/solid/kitchen-sink-file-based/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
@@ -19,7 +19,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
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 78c95f0cdf..fe71bf13e9 100644
--- a/examples/solid/kitchen-sink-solid-query-file-based/package.json
+++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json
@@ -10,10 +10,10 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json
index eca233210a..73b9eb16aa 100644
--- a/examples/solid/kitchen-sink-solid-query/package.json
+++ b/examples/solid/kitchen-sink-solid-query/package.json
@@ -12,7 +12,7 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json
index 8d588e4f27..25833261e7 100644
--- a/examples/solid/kitchen-sink/package.json
+++ b/examples/solid/kitchen-sink/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"immer": "^10.1.1",
"redaxios": "^0.5.1",
diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json
index a8b59cae3b..bfdff9eaba 100644
--- a/examples/solid/large-file-based/package.json
+++ b/examples/solid/large-file-based/package.json
@@ -12,9 +12,9 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json
index cd42e50706..5b0b9df7e3 100644
--- a/examples/solid/location-masking/package.json
+++ b/examples/solid/location-masking/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"solid-js": "^1.9.10",
"redaxios": "^0.5.1",
diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json
index e433b54680..9b2ef78745 100644
--- a/examples/solid/navigation-blocking/package.json
+++ b/examples/solid/navigation-blocking/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"solid-js": "^1.9.10",
"redaxios": "^0.5.1",
diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json
index 425a39e4f6..71bac328eb 100644
--- a/examples/solid/quickstart-esbuild-file-based/package.json
+++ b/examples/solid/quickstart-esbuild-file-based/package.json
@@ -9,8 +9,8 @@
"start": "dev"
},
"dependencies": {
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json
index 4774fa54ba..619c6d00f7 100644
--- a/examples/solid/quickstart-file-based/package.json
+++ b/examples/solid/quickstart-file-based/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
@@ -18,7 +18,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json
index 290a88219a..5b80ce7428 100644
--- a/examples/solid/quickstart-rspack-file-based/package.json
+++ b/examples/solid/quickstart-rspack-file-based/package.json
@@ -9,7 +9,7 @@
},
"dependencies": {
"@tailwindcss/postcss": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"postcss": "^8.5.1",
"solid-js": "^1.9.10",
@@ -19,7 +19,7 @@
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^1.1.1",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"typescript": "^6.0.2"
}
}
diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json
index daa70edd1b..e8b66516d7 100644
--- a/examples/solid/quickstart-webpack-file-based/package.json
+++ b/examples/solid/quickstart-webpack-file-based/package.json
@@ -7,7 +7,7 @@
"build": "webpack build && tsc --noEmit"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"solid-js": "^1.9.10",
"tailwindcss": "^4.2.2"
@@ -15,7 +15,7 @@
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/preset-typescript": "^7.27.1",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"babel-loader": "^10.0.0",
"babel-preset-solid": "^1.9.10",
"css-loader": "^7.1.2",
diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json
index 6cec309396..b8ee528ba1 100644
--- a/examples/solid/quickstart/package.json
+++ b/examples/solid/quickstart/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"solid-js": "^1.9.10",
"tailwindcss": "^4.2.2"
diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json
index 34cdf6023f..ccbe70b582 100644
--- a/examples/solid/router-monorepo-simple-lazy/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/package.json
@@ -8,9 +8,9 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"solid-js": "^1.9.10",
"redaxios": "^0.5.1"
},
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 83afc30958..d6f18e536d 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
@@ -9,8 +9,8 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@tanstack/history": "^1.162.0",
- "@tanstack/solid-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
"solid-js": "^1.9.10"
diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json
index f9fbd5fc29..52a1d9386a 100644
--- a/examples/solid/router-monorepo-simple/package.json
+++ b/examples/solid/router-monorepo-simple/package.json
@@ -8,9 +8,9 @@
"dev": "pnpm router build && pnpm post-feature build && pnpm app dev"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"solid-js": "^1.9.10",
"redaxios": "^0.5.1"
},
diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json
index 37fb3f8b40..b1ac76acab 100644
--- a/examples/solid/router-monorepo-simple/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple/packages/router/package.json
@@ -9,8 +9,8 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@tanstack/history": "^1.162.0",
- "@tanstack/solid-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
"solid-js": "^1.9.10"
diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json
index a781b16bff..9acd494517 100644
--- a/examples/solid/router-monorepo-solid-query/package.json
+++ b/examples/solid/router-monorepo-solid-query/package.json
@@ -12,9 +12,9 @@
"dependencies": {
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"solid-js": "^1.9.10",
"redaxios": "^0.5.1"
},
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 dcdd421751..d96aa3ab09 100644
--- a/examples/solid/router-monorepo-solid-query/packages/router/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json
@@ -10,8 +10,8 @@
"dependencies": {
"@tanstack/history": "^1.162.0",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-router": "^1.170.18",
+ "@tanstack/router-plugin": "^1.168.20",
"@router-solid-mono-solid-query/post-query": "workspace:*",
"redaxios": "^0.5.1",
"zod": "^4.4.3",
diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json
index 562ec8e1e3..e80c7aea3b 100644
--- a/examples/solid/scroll-restoration/package.json
+++ b/examples/solid/scroll-restoration/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@tanstack/solid-virtual": "^3.13.0",
"solid-js": "^1.9.10",
diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json
index 9003a5ae4d..17e74dcc7a 100644
--- a/examples/solid/search-validator-adapters/package.json
+++ b/examples/solid/search-validator-adapters/package.json
@@ -13,9 +13,9 @@
"@tailwindcss/vite": "^4.2.2",
"@tanstack/arktype-adapter": "^1.167.0",
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/router-plugin": "^1.168.20",
"@tanstack/valibot-adapter": "^1.167.0",
"@tanstack/zod-adapter": "^1.167.0",
"arktype": "^2.1.7",
diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json
index 05f435903d..108a260b20 100644
--- a/examples/solid/start-basic-auth/package.json
+++ b/examples/solid/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/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json
index 6f9bf8dc7f..f6fde8367f 100644
--- a/examples/solid/start-basic-authjs/package.json
+++ b/examples/solid/start-basic-authjs/package.json
@@ -11,9 +11,9 @@
},
"dependencies": {
"@auth/core": "^0.41.1",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10",
"start-authjs": "^1.0.0",
"tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json
index a5effede65..936fb0d20d 100644
--- a/examples/solid/start-basic-cloudflare/package.json
+++ b/examples/solid/start-basic-cloudflare/package.json
@@ -12,9 +12,9 @@
"postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10"
},
"devDependencies": {
diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json
index 64f1b48d11..c727191374 100644
--- a/examples/solid/start-basic-netlify/package.json
+++ b/examples/solid/start-basic-netlify/package.json
@@ -9,9 +9,9 @@
"preview": "vite preview"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10"
},
"devDependencies": {
diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json
index c3f4d06cbe..a0fad2103f 100644
--- a/examples/solid/start-basic-nitro/package.json
+++ b/examples/solid/start-basic-nitro/package.json
@@ -9,9 +9,9 @@
"preview": "vite preview"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10"
},
"devDependencies": {
diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json
index 20855e3faa..5fe6a67c26 100644
--- a/examples/solid/start-basic-solid-query/package.json
+++ b/examples/solid/start-basic-solid-query/package.json
@@ -12,10 +12,10 @@
"dependencies": {
"@tanstack/solid-query": "^5.90.9",
"@tanstack/solid-query-devtools": "^5.90.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@tanstack/solid-router-ssr-query": "^1.167.1",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json
index efd5a53347..636e3cc8db 100644
--- a/examples/solid/start-basic-static/package.json
+++ b/examples/solid/start-basic-static/package.json
@@ -10,10 +10,10 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
- "@tanstack/start-static-server-functions": "^1.167.18",
+ "@tanstack/solid-start": "^1.168.28",
+ "@tanstack/start-static-server-functions": "^1.167.19",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json
index 8ad81cb612..2c7d7936d5 100644
--- a/examples/solid/start-basic/package.json
+++ b/examples/solid/start-basic/package.json
@@ -10,9 +10,9 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json
index f82dff17e6..7ae945fa42 100644
--- a/examples/solid/start-bun/package.json
+++ b/examples/solid/start-bun/package.json
@@ -15,11 +15,11 @@
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-devtools": "^0.7.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@tanstack/solid-router-ssr-query": "^1.167.1",
- "@tanstack/solid-start": "^1.168.27",
- "@tanstack/router-plugin": "^1.168.19",
+ "@tanstack/solid-start": "^1.168.28",
+ "@tanstack/router-plugin": "^1.168.20",
"solid-js": "^1.9.10",
"tailwindcss": "^4.2.2"
},
diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json
index cc288155e6..7924c5e68d 100644
--- a/examples/solid/start-convex-better-auth/package.json
+++ b/examples/solid/start-convex-better-auth/package.json
@@ -13,9 +13,9 @@
"dependencies": {
"@convex-dev/better-auth": "^0.9.7",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"better-auth": "^1.6.19",
"clsx": "^2.1.1",
"convex": "^1.28.2",
diff --git a/examples/solid/start-counter/package.json b/examples/solid/start-counter/package.json
index 8e4042ce00..0f5ea8e496 100644
--- a/examples/solid/start-counter/package.json
+++ b/examples/solid/start-counter/package.json
@@ -10,9 +10,9 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0",
diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json
index 8ca4adebce..d81127d045 100644
--- a/examples/solid/start-i18n-paraglide/package.json
+++ b/examples/solid/start-i18n-paraglide/package.json
@@ -10,9 +10,9 @@
},
"dependencies": {
"@tanstack/solid-devtools": "^0.7.0",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10"
},
"devDependencies": {
diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json
index b14f2ae995..0e941745d5 100644
--- a/examples/solid/start-large/package.json
+++ b/examples/solid/start-large/package.json
@@ -13,9 +13,9 @@
},
"dependencies": {
"@tanstack/solid-query": "^5.90.9",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0",
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 60ab77080e..6ca3946475 100644
--- a/examples/solid/start-streaming-data-from-server-functions/package.json
+++ b/examples/solid/start-streaming-data-from-server-functions/package.json
@@ -10,9 +10,9 @@
"start": "pnpx srvx --prod -s ../client dist/server/server.js"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10",
"zod": "^4.4.3"
},
diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json
index 604b32cdd7..a003a3eb47 100644
--- a/examples/solid/start-supabase-basic/package.json
+++ b/examples/solid/start-supabase-basic/package.json
@@ -14,9 +14,9 @@
"dependencies": {
"@supabase/ssr": "^0.5.2",
"@supabase/supabase-js": "^2.48.1",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.9",
"redaxios": "^0.5.1"
},
diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json
index d53d59325c..57adb50957 100644
--- a/examples/solid/start-tailwind-v4/package.json
+++ b/examples/solid/start-tailwind-v4/package.json
@@ -10,9 +10,9 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
- "@tanstack/solid-start": "^1.168.27",
+ "@tanstack/solid-start": "^1.168.28",
"solid-js": "^1.9.10",
"tailwind-merge": "^3.6.0",
"zod": "^4.4.3"
diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json
index e3a702f5d5..cf4631b96f 100644
--- a/examples/solid/view-transitions/package.json
+++ b/examples/solid/view-transitions/package.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json
index 6c16858a6d..898d248ec9 100644
--- a/examples/solid/with-framer-motion/package.json
+++ b/examples/solid/with-framer-motion/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"solid-js": "^1.9.10",
diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json
index 3166804ece..8b68448842 100644
--- a/examples/solid/with-trpc/package.json
+++ b/examples/solid/with-trpc/package.json
@@ -11,8 +11,8 @@
},
"dependencies": {
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/router-plugin": "^1.168.19",
- "@tanstack/solid-router": "^1.170.17",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/solid-router": "^1.170.18",
"@tanstack/solid-router-devtools": "^1.167.0",
"@trpc/client": "^11.4.3",
"@trpc/server": "^11.4.3",
diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json
index 7573628b17..fdeefd2f88 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.19",
- "@tanstack/vue-router": "^1.170.16",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/vue-router": "^1.170.17",
"@tanstack/vue-router-devtools": "^1.167.0",
"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 91581cc30d..bef5799572 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.19",
- "@tanstack/vue-router": "^1.170.16",
+ "@tanstack/router-plugin": "^1.168.20",
+ "@tanstack/vue-router": "^1.170.17",
"@tanstack/vue-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"tailwindcss": "^4.2.2",
diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json
index 046be6614d..49b88fa665 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.16",
+ "@tanstack/vue-router": "^1.170.17",
"@tanstack/vue-router-devtools": "^1.167.0",
"redaxios": "^0.5.1",
"vue": "^3.5.13",
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index dc138ae4ed..46909b1699 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/react-router
+## 1.170.18
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+
## 1.170.17
### Patch Changes
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 2e63f8d973..9f4bbd6b90 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-router",
- "version": "1.170.17",
+ "version": "1.170.18",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md
index a3dd36024e..3407c7af4d 100644
--- a/packages/react-start-client/CHANGELOG.md
+++ b/packages/react-start-client/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/react-start-client
+## 1.168.16
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/react-router@1.170.18
+ - @tanstack/start-client-core@1.170.14
+
## 1.168.15
### Patch Changes
diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json
index 634c565af9..0385ecf135 100644
--- a/packages/react-start-client/package.json
+++ b/packages/react-start-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-start-client",
- "version": "1.168.15",
+ "version": "1.168.16",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md
index 69627dbebb..48185a4c10 100644
--- a/packages/react-start-rsc/CHANGELOG.md
+++ b/packages/react-start-rsc/CHANGELOG.md
@@ -1,5 +1,17 @@
# @tanstack/react-start-rsc
+## 0.1.27
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/react-router@1.170.18
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/start-plugin-core@1.171.20
+ - @tanstack/start-server-core@1.169.17
+ - @tanstack/start-storage-context@1.167.17
+
## 0.1.26
### Patch Changes
diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json
index 498a5aff80..6e57053107 100644
--- a/packages/react-start-rsc/package.json
+++ b/packages/react-start-rsc/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-start-rsc",
- "version": "0.1.26",
+ "version": "0.1.27",
"description": "React Server Components support for TanStack Start",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md
index a56f3cc481..849c59b65b 100644
--- a/packages/react-start-server/CHANGELOG.md
+++ b/packages/react-start-server/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/react-start-server
+## 1.167.22
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/react-router@1.170.18
+ - @tanstack/start-server-core@1.169.17
+
## 1.167.21
### Patch Changes
diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json
index 62c02c7268..f7136a3bc4 100644
--- a/packages/react-start-server/package.json
+++ b/packages/react-start-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-start-server",
- "version": "1.167.21",
+ "version": "1.167.22",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md
index 90a0ad039f..5b38d1acf0 100644
--- a/packages/react-start/CHANGELOG.md
+++ b/packages/react-start/CHANGELOG.md
@@ -1,5 +1,18 @@
# @tanstack/react-start
+## 1.168.28
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/react-router@1.170.18
+ - @tanstack/react-start-client@1.168.16
+ - @tanstack/react-start-rsc@0.1.27
+ - @tanstack/react-start-server@1.167.22
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/start-plugin-core@1.171.20
+ - @tanstack/start-server-core@1.169.17
+
## 1.168.27
### Patch Changes
diff --git a/packages/react-start/package.json b/packages/react-start/package.json
index c015ecfcf2..e1c915b749 100644
--- a/packages/react-start/package.json
+++ b/packages/react-start/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/react-start",
- "version": "1.168.27",
+ "version": "1.168.28",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md
index 7895121dbd..d0933353be 100644
--- a/packages/router-cli/CHANGELOG.md
+++ b/packages/router-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/router-cli
+## 1.167.19
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-generator@1.167.19
+
## 1.167.18
### Patch Changes
diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json
index 50aa6f8d4b..7bff76b1b8 100644
--- a/packages/router-cli/package.json
+++ b/packages/router-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-cli",
- "version": "1.167.18",
+ "version": "1.167.19",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md
index a0082099fa..360436487b 100644
--- a/packages/router-core/CHANGELOG.md
+++ b/packages/router-core/CHANGELOG.md
@@ -1,5 +1,19 @@
# @tanstack/router-core
+## 1.171.15
+
+### Patch Changes
+
+- [#7807](https://github.com/TanStack/router/pull/7807) [`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa) - fix(router-core): handle window and element scroll restoration independently
+
+ Window and element scroll targets are now handled independently. Restoring one target no longer suppresses resets for other uncached configured targets, and a restored element is no longer reset when the window has no cached position.
+
+ Hash navigation no longer resets elements configured through `scrollToTopSelectors` and retains precedence over stale window positions through destination invalidations.
+
+ Scroll positions are sampled when leaving a route, preserving live changes made after the most recent scroll event. This also prevents client hydration from undoing nested positions restored by the SSR script.
+
+ Fixes [#7687](https://github.com/TanStack/router/issues/7687).
+
## 1.171.14
### Patch Changes
diff --git a/packages/router-core/package.json b/packages/router-core/package.json
index 303e7eca24..8f8f23f639 100644
--- a/packages/router-core/package.json
+++ b/packages/router-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-core",
- "version": "1.171.14",
+ "version": "1.171.15",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md
index cf16585672..005d25c061 100644
--- a/packages/router-generator/CHANGELOG.md
+++ b/packages/router-generator/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/router-generator
+## 1.167.19
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+
## 1.167.18
### Patch Changes
diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json
index 8abf6f6d0b..3f2c64a545 100644
--- a/packages/router-generator/package.json
+++ b/packages/router-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-generator",
- "version": "1.167.18",
+ "version": "1.167.19",
"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 50dca919fa..e951de2462 100644
--- a/packages/router-plugin/CHANGELOG.md
+++ b/packages/router-plugin/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/router-plugin
+## 1.168.20
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/react-router@1.170.18
+ - @tanstack/router-generator@1.167.19
+
## 1.168.19
### Patch Changes
diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json
index 117ef4bb14..b9a1a3fc84 100644
--- a/packages/router-plugin/package.json
+++ b/packages/router-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/router-plugin",
- "version": "1.168.19",
+ "version": "1.168.20",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md
index dbd469a8d2..accae2e5f1 100644
--- a/packages/router-vite-plugin/CHANGELOG.md
+++ b/packages/router-vite-plugin/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/router-vite-plugin
+## 1.167.20
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/router-plugin@1.168.20
+
## 1.167.19
### Patch Changes
diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json
index aed06c1a13..684a7a7f9f 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.19",
+ "version": "1.167.20",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md
index e916479ced..e63a5a7f25 100644
--- a/packages/solid-router/CHANGELOG.md
+++ b/packages/solid-router/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/solid-router
+## 1.170.18
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+
## 1.170.17
### Patch Changes
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
index 1561e3eb4c..96880c4147 100644
--- a/packages/solid-router/package.json
+++ b/packages/solid-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-router",
- "version": "1.170.17",
+ "version": "1.170.18",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md
index b06ca0c723..7c8f57cdc3 100644
--- a/packages/solid-start-client/CHANGELOG.md
+++ b/packages/solid-start-client/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/solid-start-client
+## 1.168.16
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/solid-router@1.170.18
+ - @tanstack/start-client-core@1.170.14
+
## 1.168.15
### Patch Changes
diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json
index 10f1c33064..afea6d4454 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": "1.168.15",
+ "version": "1.168.16",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md
index fe7eb3ce66..1f6be110c6 100644
--- a/packages/solid-start-server/CHANGELOG.md
+++ b/packages/solid-start-server/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/solid-start-server
+## 1.167.22
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/solid-router@1.170.18
+ - @tanstack/start-server-core@1.169.17
+
## 1.167.21
### Patch Changes
diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json
index 79f77b1a1b..aa74b81277 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": "1.167.21",
+ "version": "1.167.22",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md
index 810d640920..22b034ef6b 100644
--- a/packages/solid-start/CHANGELOG.md
+++ b/packages/solid-start/CHANGELOG.md
@@ -1,5 +1,17 @@
# @tanstack/solid-start
+## 1.168.28
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/solid-router@1.170.18
+ - @tanstack/solid-start-client@1.168.16
+ - @tanstack/solid-start-server@1.167.22
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/start-plugin-core@1.171.20
+ - @tanstack/start-server-core@1.169.17
+
## 1.168.27
### Patch Changes
diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json
index ddbbf925ed..cf7a33210f 100644
--- a/packages/solid-start/package.json
+++ b/packages/solid-start/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/solid-start",
- "version": "1.168.27",
+ "version": "1.168.28",
"description": "Modern and scalable routing for Solid applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md
index 29696bad29..11bb9192d3 100644
--- a/packages/start-client-core/CHANGELOG.md
+++ b/packages/start-client-core/CHANGELOG.md
@@ -1,5 +1,13 @@
# @tanstack/start-client-core
+## 1.170.14
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/start-storage-context@1.167.17
+
## 1.170.13
### Patch Changes
diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json
index e999c97c80..30cc0a8b7a 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.13",
+ "version": "1.170.14",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md
index a25d8fc634..03108f0528 100644
--- a/packages/start-plugin-core/CHANGELOG.md
+++ b/packages/start-plugin-core/CHANGELOG.md
@@ -1,5 +1,15 @@
# @tanstack/start-plugin-core
+## 1.171.20
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/router-generator@1.167.19
+ - @tanstack/router-plugin@1.168.20
+ - @tanstack/start-server-core@1.169.17
+
## 1.171.19
### Patch Changes
diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json
index 1b60d95f05..5cbae2851f 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.19",
+ "version": "1.171.20",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/start-server-core/CHANGELOG.md b/packages/start-server-core/CHANGELOG.md
index a07a1b30b7..18b68b4bb9 100644
--- a/packages/start-server-core/CHANGELOG.md
+++ b/packages/start-server-core/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/start-server-core
+## 1.169.17
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/start-storage-context@1.167.17
+
## 1.169.16
### Patch Changes
diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json
index 1bbb1010a7..daf3530a7c 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.16",
+ "version": "1.169.17",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/start-static-server-functions/CHANGELOG.md b/packages/start-static-server-functions/CHANGELOG.md
index 1191099aa4..27584fb74f 100644
--- a/packages/start-static-server-functions/CHANGELOG.md
+++ b/packages/start-static-server-functions/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/start-static-server-functions
+## 1.167.19
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/react-start@1.168.28
+ - @tanstack/solid-start@1.168.28
+
## 1.167.18
### Patch Changes
diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json
index 61196bffdf..d5f54bec0a 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.18",
+ "version": "1.167.19",
"description": "Modern and scalable routing for React applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md
index 0d28073b4f..d569880484 100644
--- a/packages/start-storage-context/CHANGELOG.md
+++ b/packages/start-storage-context/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/start-storage-context
+## 1.167.17
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+
## 1.167.16
### Patch Changes
diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json
index 0fa3359847..0d33fe8d8f 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.16",
+ "version": "1.167.17",
"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 6ae02b6762..1638058127 100644
--- a/packages/vue-router/CHANGELOG.md
+++ b/packages/vue-router/CHANGELOG.md
@@ -1,5 +1,12 @@
# @tanstack/vue-router
+## 1.170.17
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+
## 1.170.16
### Patch Changes
diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json
index c302ba4600..96dc3fde40 100644
--- a/packages/vue-router/package.json
+++ b/packages/vue-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/vue-router",
- "version": "1.170.16",
+ "version": "1.170.17",
"description": "Modern and scalable routing for Vue applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md
index 54e1239b1f..88d3855bbf 100644
--- a/packages/vue-start-client/CHANGELOG.md
+++ b/packages/vue-start-client/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/vue-start-client
+## 1.167.19
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/vue-router@1.170.17
+
## 1.167.18
### Patch Changes
diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json
index f191cb60fc..53427881ac 100644
--- a/packages/vue-start-client/package.json
+++ b/packages/vue-start-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/vue-start-client",
- "version": "1.167.18",
+ "version": "1.167.19",
"description": "Modern and scalable routing for Vue applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/vue-start-server/CHANGELOG.md b/packages/vue-start-server/CHANGELOG.md
index 379dfdda9e..90583544fd 100644
--- a/packages/vue-start-server/CHANGELOG.md
+++ b/packages/vue-start-server/CHANGELOG.md
@@ -1,5 +1,14 @@
# @tanstack/vue-start-server
+## 1.167.22
+
+### Patch Changes
+
+- Updated dependencies [[`e2dd204`](https://github.com/TanStack/router/commit/e2dd2049cb42eb219d3b447b8605066d19d9c1fa)]:
+ - @tanstack/router-core@1.171.15
+ - @tanstack/start-server-core@1.169.17
+ - @tanstack/vue-router@1.170.17
+
## 1.167.21
### Patch Changes
diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json
index bf704e93ea..9d83a25178 100644
--- a/packages/vue-start-server/package.json
+++ b/packages/vue-start-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/vue-start-server",
- "version": "1.167.21",
+ "version": "1.167.22",
"description": "Modern and scalable routing for Vue applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md
index 1322cce2bf..9212ab4035 100644
--- a/packages/vue-start/CHANGELOG.md
+++ b/packages/vue-start/CHANGELOG.md
@@ -1,5 +1,17 @@
# @tanstack/vue-start
+## 1.168.27
+
+### Patch Changes
+
+- Updated dependencies []:
+ - @tanstack/start-client-core@1.170.14
+ - @tanstack/start-plugin-core@1.171.20
+ - @tanstack/start-server-core@1.169.17
+ - @tanstack/vue-router@1.170.17
+ - @tanstack/vue-start-client@1.167.19
+ - @tanstack/vue-start-server@1.167.22
+
## 1.168.26
### Patch Changes
diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json
index 78e746056f..92c9929437 100644
--- a/packages/vue-start/package.json
+++ b/packages/vue-start/package.json
@@ -1,6 +1,6 @@
{
"name": "@tanstack/vue-start",
- "version": "1.168.26",
+ "version": "1.168.27",
"description": "Modern and scalable routing for Vue applications",
"author": "Tanner Linsley",
"license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index afd15b62bd..a8ccd3ec25 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2305,7 +2305,7 @@ importers:
devDependencies:
'@platformatic/flame':
specifier: latest
- version: 1.6.0
+ version: 1.7.0
'@vitejs/plugin-react':
specifier: ^6.0.1
version: 6.0.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -10295,7 +10295,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10332,7 +10332,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10372,7 +10372,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10412,7 +10412,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10446,7 +10446,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10477,7 +10477,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10514,7 +10514,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10557,7 +10557,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10597,7 +10597,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10634,7 +10634,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
compression:
specifier: ^1.8.0
@@ -10674,7 +10674,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10729,7 +10729,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10769,7 +10769,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10806,7 +10806,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10843,7 +10843,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
solid-js:
specifier: 1.9.12
@@ -10874,7 +10874,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10911,7 +10911,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -10957,7 +10957,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11003,7 +11003,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11046,7 +11046,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11083,7 +11083,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11117,7 +11117,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11148,7 +11148,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11176,7 +11176,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11207,7 +11207,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11244,7 +11244,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11278,7 +11278,7 @@ importers:
examples/solid/quickstart-webpack-file-based:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11339,7 +11339,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11373,7 +11373,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11413,7 +11413,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11447,7 +11447,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11487,7 +11487,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11533,7 +11533,7 @@ importers:
examples/solid/start-basic:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11585,7 +11585,7 @@ importers:
specifier: ^7.0.0
version: 7.0.0(prisma@7.0.0(@types/react@19.2.9)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@6.0.2))(typescript@6.0.2)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11634,7 +11634,7 @@ importers:
specifier: ^0.41.1
version: 0.41.1
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11674,7 +11674,7 @@ importers:
examples/solid/start-basic-cloudflare:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11714,7 +11714,7 @@ importers:
examples/solid/start-basic-netlify:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11751,7 +11751,7 @@ importers:
examples/solid/start-basic-nitro:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11794,7 +11794,7 @@ importers:
specifier: ^5.90.0
version: 5.90.4(@tanstack/solid-query@5.99.0(solid-js@1.9.12))(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11837,7 +11837,7 @@ importers:
examples/solid/start-basic-static:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11889,7 +11889,7 @@ importers:
specifier: ^0.7.0
version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -11953,7 +11953,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12008,7 +12008,7 @@ importers:
examples/solid/start-counter:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12051,7 +12051,7 @@ importers:
specifier: ^0.7.0
version: 0.7.14(csstype@3.2.3)(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12091,7 +12091,7 @@ importers:
specifier: ^5.99.0
version: 5.99.0(solid-js@1.9.12)
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12134,7 +12134,7 @@ importers:
examples/solid/start-streaming-data-from-server-functions:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12171,7 +12171,7 @@ importers:
specifier: ^2.48.1
version: 2.48.1
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12208,7 +12208,7 @@ importers:
examples/solid/start-tailwind-v4:
dependencies:
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12254,7 +12254,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12288,7 +12288,7 @@ importers:
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -12328,7 +12328,7 @@ importers:
specifier: workspace:*
version: link:../../../packages/router-plugin
'@tanstack/solid-router':
- specifier: ^1.170.17
+ specifier: ^1.170.18
version: link:../../../packages/solid-router
'@tanstack/solid-router-devtools':
specifier: workspace:^
@@ -14505,6 +14505,10 @@ packages:
resolution: {integrity: sha512-Th8u7pvoguTfbUx/mlZLHD9TxFCHO+wRAvlEaYFAYAmMvbPLww4YowvTy1UMvpi8LbUbwil3Fo8rKCrilvXHhQ==}
engines: {node: '>=16'}
+ '@datadog/pprof@5.15.1':
+ resolution: {integrity: sha512-4mI750tX6okNROS4YKvGQjyAQ+VqfzDqzysCytOJhL2E2ktK/q4M0PtC7j70tiirGb/fO9fjma3IMNSRLYX+xQ==}
+ engines: {node: '>=16'}
+
'@dependents/detective-less@5.0.1':
resolution: {integrity: sha512-Y6+WUMsTFWE5jb20IFP4YGa5IrGY/+a/FbOSjDF/wz9gepU2hwCYSXRHP/vPwBvwcY3SVMASt4yXxbXNXigmZQ==}
engines: {node: '>=18'}
@@ -17180,6 +17184,11 @@ packages:
engines: {node: '>=22.6.0'}
hasBin: true
+ '@platformatic/flame@1.7.0':
+ resolution: {integrity: sha512-WGCrRcRJBMbSb1y7d8L+VOewBDk0Rfs+JQ1K/LLqPkstsNebLFprzk180P8jgHgT3yXe8TyxTwKVcuZkKviLFA==}
+ engines: {node: '>=22.6.0'}
+ hasBin: true
+
'@playwright/test@1.58.0':
resolution: {integrity: sha512-fWza+Lpbj6SkQKCrU6si4iu+fD2dD3gxNHFhUPxsfXBPhnv3rRSQVd0NtBUT9Z/RhF/boCBcuUaMUSTRTopjZg==}
engines: {node: '>=18'}
@@ -22574,15 +22583,6 @@ packages:
crossws:
optional: true
- h3@2.0.1-rc.2:
- resolution: {integrity: sha512-2vS7OETzPDzGQxmmcs6ttu7p0NW25zAdkPXYOr43dn4GZf81uUljJvupa158mcpUGpsQUqIy4O4THWUQT1yVeA==}
- engines: {node: '>=20.11.1'}
- peerDependencies:
- crossws: ^0.4.1
- peerDependenciesMeta:
- crossws:
- optional: true
-
h3@2.0.1-rc.20:
resolution: {integrity: sha512-28ljodXuUp0fZovdiSRq4G9OgrxCztrJe5VdYzXAB7ueRvI7pIUqLU14Xi3XqdYJ/khXjfpUOOD2EQa6CmBgsg==}
engines: {node: '>=20.11.1'}
@@ -23856,31 +23856,12 @@ packages:
netlify-redirector@0.5.0:
resolution: {integrity: sha512-4zdzIP+6muqPCuE8avnrgDJ6KW/2+UpHTRcTbMXCIRxiRmyrX+IZ4WSJGZdHPWF3WmQpXpy603XxecZ9iygN7w==}
- nf3@0.1.12:
- resolution: {integrity: sha512-qbMXT7RTGh74MYWPeqTIED8nDW70NXOULVHpdWcdZ7IVHVnAsMV9fNugSNnvooipDc1FMOzpis7T9nXJEbJhvQ==}
-
nf3@0.3.11:
resolution: {integrity: sha512-ObKp/SA3f1g1f/OMeDlRWaZmqGgk7A0NnDIbeO7c/MV4r/quMlpP/BsqMGuTi3lUlXbC1On8YH7ICM2u2bIAOw==}
nf3@0.3.6:
resolution: {integrity: sha512-/XRUUILTAyuy1XunyVQuqGp8aEmZ2TfRTn8Rji+FA4xqv20qzL4jV7Reqbuey2XucKgPeRVcEYGScmJM0UnB6Q==}
- nitro-nightly@4.0.0-20251010-091516-7cafddba:
- resolution: {integrity: sha512-biADkmoR/Nb9OmUURTfDI2BpGo2IMEt2RbsiMhjqdwz2w3tEm+tx0Hd28LXjBCwid+l8jpqyfmpwc8jzwdng3w==}
- engines: {node: ^20.19.0 || >=22.12.0}
- hasBin: true
- peerDependencies:
- rolldown: '*'
- vite: ^8.0.14
- xml2js: ^0.6.2
- peerDependenciesMeta:
- rolldown:
- optional: true
- vite:
- optional: true
- xml2js:
- optional: true
-
nitro@3.0.1-alpha.2:
resolution: {integrity: sha512-YviDY5J/trS821qQ1fpJtpXWIdPYiOizC/meHavlm1Hfuhx//H+Egd1+4C5SegJRgtWMnRPW9n//6Woaw81cTQ==}
engines: {node: ^20.19.0 || >=22.12.0}
@@ -24496,6 +24477,11 @@ packages:
engines: {node: '>=22.6.0'}
hasBin: true
+ pprof-to-md@0.2.0:
+ resolution: {integrity: sha512-+xo3aSoDHI+M6DnM5jW6Iva4I0LS3NmAAkci3fGSIj6JiP8hs5o8IWpmkTtoQ62l9joDC8eSSOZE9dt1t38HHw==}
+ engines: {node: '>=22.6.0'}
+ hasBin: true
+
preact-render-to-string@6.5.11:
resolution: {integrity: sha512-ubnauqoGczeGISiOh6RjX0/cdaF8v/oDXIjO85XALCQjwQP+SB4RDXXtvZ6yTYSjG+PC1QRP2AhPgCEsM2EvUw==}
peerDependencies:
@@ -24886,10 +24872,6 @@ packages:
renderkid@3.0.0:
resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
- rendu@0.0.6:
- resolution: {integrity: sha512-nZ512Dw0MxKiIYfCVv8DPe6ig4m0Qt3FOYBJEXrammjIYBBPuHaudc0AGfYx+iyOw2q0itAtPywiVZXtTFCsig==}
- hasBin: true
-
repeat-string@1.6.1:
resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
engines: {node: '>=0.10'}
@@ -25399,11 +25381,6 @@ packages:
engines: {node: '>=20.16.0'}
hasBin: true
- srvx@0.8.16:
- resolution: {integrity: sha512-hmcGW4CgroeSmzgF1Ihwgl+Ths0JqAJ7HwjP2X7e3JzY7u4IydLMcdnlqGQiQGUswz+PO9oh/KtCpOISIvs9QQ==}
- engines: {node: '>=20.16.0'}
- hasBin: true
-
stable-hash-x@0.2.0:
resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==}
engines: {node: '>=12.0.0'}
@@ -25978,9 +25955,6 @@ packages:
resolution: {integrity: sha512-uZsKNuzQxDMUY6M3pIMvy5tvlGmtq8XJ2oLAkfRKGNu+1VQAIvLy2xIVG5ATZl5wDXl/tddByAWCizRbOme+TA==}
engines: {node: '>=20.18.1'}
- unenv@2.0.0-rc.21:
- resolution: {integrity: sha512-Wj7/AMtE9MRnAXa6Su3Lk0LNCfqDYgfwVjwRFVum9U7wsto1imuHqk4kTm7Jni+5A0Hn7dttL6O/zjvUvoo+8A==}
-
unenv@2.0.0-rc.24:
resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==}
@@ -26096,80 +26070,6 @@ packages:
uploadthing:
optional: true
- unstorage@2.0.0-alpha.3:
- resolution: {integrity: sha512-BeoqISVh8jxqnPseHH7/92twe2VkQztrudXg8RFZVbXb4ckkFdpLk1LnNvsUndDltyodBMVxgI6V7JcbJYt2VQ==}
- peerDependencies:
- '@azure/app-configuration': ^1.8.0
- '@azure/cosmos': ^4.2.0
- '@azure/data-tables': ^13.3.0
- '@azure/identity': ^4.6.0
- '@azure/keyvault-secrets': ^4.9.0
- '@azure/storage-blob': ^12.26.0
- '@capacitor/preferences': ^6.0.3 || ^7.0.0
- '@deno/kv': '>=0.9.0'
- '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0
- '@planetscale/database': ^1.19.0
- '@upstash/redis': ^1.34.3
- '@vercel/blob': '>=0.27.1'
- '@vercel/functions': ^2.2.12 || ^3.0.0
- '@vercel/kv': ^1.0.1
- aws4fetch: ^1.0.20
- chokidar: ^4.0.3
- db0: '>=0.2.1'
- idb-keyval: ^6.2.1
- ioredis: ^5.4.2
- lru-cache: ^11.2.2
- mongodb: ^6.20.0
- ofetch: ^1.4.1
- uploadthing: ^7.4.4
- peerDependenciesMeta:
- '@azure/app-configuration':
- optional: true
- '@azure/cosmos':
- optional: true
- '@azure/data-tables':
- optional: true
- '@azure/identity':
- optional: true
- '@azure/keyvault-secrets':
- optional: true
- '@azure/storage-blob':
- optional: true
- '@capacitor/preferences':
- optional: true
- '@deno/kv':
- optional: true
- '@netlify/blobs':
- optional: true
- '@planetscale/database':
- optional: true
- '@upstash/redis':
- optional: true
- '@vercel/blob':
- optional: true
- '@vercel/functions':
- optional: true
- '@vercel/kv':
- optional: true
- aws4fetch:
- optional: true
- chokidar:
- optional: true
- db0:
- optional: true
- idb-keyval:
- optional: true
- ioredis:
- optional: true
- lru-cache:
- optional: true
- mongodb:
- optional: true
- ofetch:
- optional: true
- uploadthing:
- optional: true
-
unstorage@2.0.0-alpha.5:
resolution: {integrity: sha512-Sj8btci21Twnd6M+N+MHhjg3fVn6lAPElPmvFTe0Y/wR0WImErUdA1PzlAaUavHylJ7uDiFwlZDQKm0elG4b7g==}
peerDependencies:
@@ -28130,6 +28030,12 @@ snapshots:
pprof-format: 2.2.1
source-map: 0.7.6
+ '@datadog/pprof@5.15.1':
+ dependencies:
+ node-gyp-build: 4.8.4
+ pprof-format: 2.2.1
+ source-map: 0.7.6
+
'@dependents/detective-less@5.0.1':
dependencies:
gonzales-pe: 4.3.0
@@ -30656,6 +30562,14 @@ snapshots:
pprof-to-md: 0.1.0
react-pprof: 1.4.0
+ '@platformatic/flame@1.7.0':
+ dependencies:
+ '@datadog/pprof': 5.15.1
+ fastify: 5.7.1
+ pprof-format: 2.2.1
+ pprof-to-md: 0.2.0
+ react-pprof: 1.4.0
+
'@playwright/test@1.58.0':
dependencies:
playwright: 1.58.0
@@ -35344,10 +35258,6 @@ snapshots:
srvx: 0.11.15
optional: true
- crossws@0.4.5(srvx@0.8.16):
- optionalDependencies:
- srvx: 0.8.16
-
css-loader@7.1.2(webpack@5.97.1):
dependencies:
icss-utils: 5.1.0(postcss@8.5.6)
@@ -36920,15 +36830,6 @@ snapshots:
optionalDependencies:
crossws: 0.4.4(srvx@0.11.15)
- h3@2.0.1-rc.2(crossws@0.4.5(srvx@0.8.16)):
- dependencies:
- cookie-es: 2.0.0
- fetchdts: 0.1.7
- rou3: 0.7.12
- srvx: 0.8.16
- optionalDependencies:
- crossws: 0.4.5(srvx@0.8.16)
-
h3@2.0.1-rc.20(crossws@0.4.5(srvx@0.11.15)):
dependencies:
rou3: 0.8.1
@@ -38213,63 +38114,10 @@ snapshots:
netlify-redirector@0.5.0: {}
- nf3@0.1.12: {}
-
nf3@0.3.11: {}
nf3@0.3.6: {}
- nitro-nightly@4.0.0-20251010-091516-7cafddba(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@4.0.3)(ioredis@5.9.2)(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)):
- dependencies:
- consola: 3.4.2
- cookie-es: 2.0.0
- crossws: 0.4.5(srvx@0.8.16)
- db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3)
- esbuild: 0.25.10
- fetchdts: 0.1.7
- h3: 2.0.1-rc.2(crossws@0.4.5(srvx@0.8.16))
- jiti: 2.7.0
- nf3: 0.1.12
- ofetch: 1.5.1
- ohash: 2.0.11
- rendu: 0.0.6
- rollup: 4.56.0
- srvx: 0.8.16
- undici: 7.27.2
- unenv: 2.0.0-rc.21
- unstorage: 2.0.0-alpha.3(@netlify/blobs@10.1.0)(chokidar@4.0.3)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.9.2)(lru-cache@11.5.1)(ofetch@1.5.1)
- optionalDependencies:
- rolldown: 1.0.2
- vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)
- transitivePeerDependencies:
- - '@azure/app-configuration'
- - '@azure/cosmos'
- - '@azure/data-tables'
- - '@azure/identity'
- - '@azure/keyvault-secrets'
- - '@azure/storage-blob'
- - '@capacitor/preferences'
- - '@deno/kv'
- - '@electric-sql/pglite'
- - '@libsql/client'
- - '@netlify/blobs'
- - '@planetscale/database'
- - '@upstash/redis'
- - '@vercel/blob'
- - '@vercel/functions'
- - '@vercel/kv'
- - aws4fetch
- - better-sqlite3
- - chokidar
- - drizzle-orm
- - idb-keyval
- - ioredis
- - lru-cache
- - mongodb
- - mysql2
- - sqlite3
- - uploadthing
-
nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@libsql/client@0.15.15)(@netlify/blobs@10.1.0)(chokidar@5.0.0)(ioredis@5.9.2)(lru-cache@11.5.1)(mysql2@3.15.3)(rolldown@1.0.2)(rollup@4.56.0)(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)):
dependencies:
consola: 3.4.2
@@ -39200,6 +39048,10 @@ snapshots:
dependencies:
pprof-format: 2.2.1
+ pprof-to-md@0.2.0:
+ dependencies:
+ pprof-format: 2.2.1
+
preact-render-to-string@6.5.11(preact@10.24.3):
dependencies:
preact: 10.24.3
@@ -39664,11 +39516,6 @@ snapshots:
lodash: 4.17.21
strip-ansi: 6.0.1
- rendu@0.0.6:
- dependencies:
- cookie-es: 2.0.0
- srvx: 0.8.16
-
repeat-string@1.6.1: {}
require-directory@2.1.1: {}
@@ -40301,8 +40148,6 @@ snapshots:
srvx@0.11.15: {}
- srvx@0.8.16: {}
-
stable-hash-x@0.2.0: {}
stack-trace@0.0.10: {}
@@ -40824,14 +40669,6 @@ snapshots:
undici@7.27.2: {}
- unenv@2.0.0-rc.21:
- dependencies:
- defu: 6.1.4
- exsolve: 1.0.8
- ohash: 2.0.11
- pathe: 2.0.3
- ufo: 1.6.3
-
unenv@2.0.0-rc.24:
dependencies:
pathe: 2.0.3
@@ -40933,15 +40770,6 @@ snapshots:
db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3)
ioredis: 5.9.2
- unstorage@2.0.0-alpha.3(@netlify/blobs@10.1.0)(chokidar@4.0.3)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.9.2)(lru-cache@11.5.1)(ofetch@1.5.1):
- optionalDependencies:
- '@netlify/blobs': 10.1.0
- chokidar: 4.0.3
- db0: 0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3)
- ioredis: 5.9.2
- lru-cache: 11.5.1
- ofetch: 1.5.1
-
unstorage@2.0.0-alpha.5(@netlify/blobs@10.1.0)(chokidar@5.0.0)(db0@0.3.4(@electric-sql/pglite@0.3.2)(@libsql/client@0.15.15)(mysql2@3.15.3))(ioredis@5.9.2)(lru-cache@11.5.1)(ofetch@2.0.0-alpha.3):
optionalDependencies:
'@netlify/blobs': 10.1.0
From 4d4171fdda0ffd36eae1f91564e61ae51b12d845 Mon Sep 17 00:00:00 2001
From: Florian Fehrenbacher
Date: Mon, 13 Jul 2026 23:38:26 +0200
Subject: [PATCH 015/363] fix: use relative path for srvx static files (#7799)
---
docs/start/framework/react/guide/hosting.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/start/framework/react/guide/hosting.md b/docs/start/framework/react/guide/hosting.md
index 23fdd63226..aa1806c6bf 100644
--- a/docs/start/framework/react/guide/hosting.md
+++ b/docs/start/framework/react/guide/hosting.md
@@ -298,7 +298,7 @@ npm install srvx
```json
"build": "rsbuild build",
- "start": "srvx --prod -s dist/client dist/server/index.js"
+ "start": "srvx --prod -s ../client dist/server/index.js"
```
Express or any other custom Node.js server works too, as long as it serves the client assets and calls the server entry's `fetch` handler for dynamic requests.
From a41f26547c817cc90a342fafdbfddd70db9b203b Mon Sep 17 00:00:00 2001
From: Pierre-Luc Auclair
Date: Mon, 13 Jul 2026 18:06:59 -0400
Subject: [PATCH 016/363] chore(deps): bump @playwright/test to ^1.61.0 across
the workspace (#7772)
---
.../basepath-file-based/package.json | 2 +-
.../basic-esbuild-file-based/package.json | 2 +-
.../package.json | 2 +-
.../basic-file-based/package.json | 2 +-
.../basic-react-query-file-based/package.json | 2 +-
.../basic-react-query/package.json | 2 +-
.../basic-scroll-restoration/package.json | 2 +-
.../basic-virtual-file-based/package.json | 2 +-
.../package.json | 2 +-
e2e/react-router/basic/package.json | 2 +-
.../escaped-special-strings/package.json | 2 +-
.../generator-cli-only/package.json | 2 +-
e2e/react-router/i18n-paraglide/package.json | 2 +-
.../js-only-file-based/package.json | 2 +-
e2e/react-router/match-params/package.json | 2 +-
.../rspack-basic-file-based/package.json | 2 +-
.../package.json | 2 +-
.../package.json | 2 +-
.../sentry-integration/package.json | 2 +-
.../view-transitions/package.json | 2 +-
e2e/react-start/basic-auth/package.json | 2 +-
e2e/react-start/basic-cloudflare/package.json | 2 +-
.../basic-react-query/package.json | 2 +-
e2e/react-start/basic/package.json | 2 +-
e2e/react-start/clerk-basic/package.json | 2 +-
e2e/react-start/csp/package.json | 2 +-
e2e/react-start/css-inline/package.json | 2 +-
e2e/react-start/css-modules/package.json | 2 +-
e2e/react-start/custom-basepath/package.json | 2 +-
.../custom-server-rsbuild/package.json | 2 +-
e2e/react-start/dev-ssr-styles/package.json | 2 +-
e2e/react-start/early-hints/package.json | 2 +-
e2e/react-start/hmr/package.json | 2 +-
e2e/react-start/i18n-paraglide/package.json | 2 +-
.../package.json | 2 +-
.../import-protection/package.json | 2 +-
.../query-integration/package.json | 2 +-
.../rsc-deferred-hydration/package.json | 2 +-
e2e/react-start/rsc-query/package.json | 2 +-
e2e/react-start/rsc-rsbuild/package.json | 2 +-
e2e/react-start/rsc/package.json | 2 +-
.../scroll-restoration/package.json | 2 +-
.../package.json | 2 +-
e2e/react-start/server-functions/package.json | 2 +-
.../package.json | 2 +-
e2e/react-start/server-routes/package.json | 2 +-
.../split-base-and-basepath/package.json | 2 +-
e2e/react-start/start-manifest/package.json | 2 +-
.../static-server-functions/package.json | 2 +-
e2e/react-start/streaming-ssr/package.json | 2 +-
.../transform-asset-urls/package.json | 2 +-
e2e/react-start/virtual-routes/package.json | 2 +-
e2e/react-start/website/package.json | 2 +-
.../basepath-file-based/package.json | 2 +-
.../basic-esbuild-file-based/package.json | 2 +-
.../package.json | 2 +-
.../basic-file-based/package.json | 2 +-
.../basic-scroll-restoration/package.json | 2 +-
.../basic-solid-query-file-based/package.json | 2 +-
.../basic-solid-query/package.json | 2 +-
.../basic-virtual-file-based/package.json | 2 +-
.../package.json | 2 +-
e2e/solid-router/basic/package.json | 2 +-
.../generator-cli-only/package.json | 2 +-
.../js-only-file-based/package.json | 2 +-
.../rspack-basic-file-based/package.json | 2 +-
.../package.json | 2 +-
.../package.json | 2 +-
.../sentry-integration/package.json | 2 +-
.../view-transitions/package.json | 2 +-
e2e/solid-start/basic-auth/package.json | 2 +-
e2e/solid-start/basic-cloudflare/package.json | 2 +-
.../basic-solid-query/package.json | 2 +-
e2e/solid-start/basic/package.json | 2 +-
e2e/solid-start/csp/package.json | 2 +-
e2e/solid-start/css-modules/package.json | 2 +-
e2e/solid-start/custom-basepath/package.json | 2 +-
.../query-integration/package.json | 2 +-
.../scroll-restoration/package.json | 2 +-
e2e/solid-start/server-functions/package.json | 2 +-
e2e/solid-start/server-routes/package.json | 2 +-
.../solid-query-layout-suspense/package.json | 2 +-
e2e/solid-start/start-manifest/package.json | 2 +-
e2e/solid-start/virtual-routes/package.json | 2 +-
e2e/solid-start/website/package.json | 2 +-
.../basepath-file-based/package.json | 2 +-
.../basic-esbuild-file-based/package.json | 2 +-
.../basic-file-based-jsx/package.json | 2 +-
.../basic-file-based-sfc/package.json | 2 +-
.../basic-scroll-restoration/package.json | 2 +-
.../basic-virtual-file-based/package.json | 2 +-
.../package.json | 2 +-
.../basic-vue-query-file-based/package.json | 2 +-
e2e/vue-router/basic-vue-query/package.json | 2 +-
e2e/vue-router/basic/package.json | 2 +-
.../generator-cli-only/package.json | 2 +-
.../js-only-file-based/package.json | 2 +-
.../rspack-basic-file-based/package.json | 2 +-
.../package.json | 2 +-
.../package.json | 2 +-
.../sentry-integration/package.json | 2 +-
e2e/vue-router/view-transitions/package.json | 2 +-
e2e/vue-start/basic-auth/package.json | 2 +-
e2e/vue-start/basic-cloudflare/package.json | 2 +-
e2e/vue-start/basic-vue-query/package.json | 2 +-
e2e/vue-start/basic/package.json | 2 +-
e2e/vue-start/css-modules/package.json | 2 +-
e2e/vue-start/custom-basepath/package.json | 2 +-
e2e/vue-start/query-integration/package.json | 2 +-
e2e/vue-start/scroll-restoration/package.json | 2 +-
e2e/vue-start/server-functions/package.json | 2 +-
e2e/vue-start/server-routes/package.json | 2 +-
e2e/vue-start/start-manifest/package.json | 2 +-
e2e/vue-start/virtual-routes/package.json | 2 +-
e2e/vue-start/website/package.json | 2 +-
pnpm-lock.yaml | 488 +++++++++---------
pnpm-workspace.yaml | 2 +-
117 files changed, 360 insertions(+), 360 deletions(-)
diff --git a/e2e/react-router/basepath-file-based/package.json b/e2e/react-router/basepath-file-based/package.json
index dd0956e96f..a155cc2173 100644
--- a/e2e/react-router/basepath-file-based/package.json
+++ b/e2e/react-router/basepath-file-based/package.json
@@ -18,7 +18,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-esbuild-file-based/package.json b/e2e/react-router/basic-esbuild-file-based/package.json
index 93e1263d11..2ff977a4f4 100644
--- a/e2e/react-router/basic-esbuild-file-based/package.json
+++ b/e2e/react-router/basic-esbuild-file-based/package.json
@@ -19,7 +19,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-file-based-code-splitting/package.json b/e2e/react-router/basic-file-based-code-splitting/package.json
index 14a8f0373f..f3654137be 100644
--- a/e2e/react-router/basic-file-based-code-splitting/package.json
+++ b/e2e/react-router/basic-file-based-code-splitting/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-file-based/package.json b/e2e/react-router/basic-file-based/package.json
index da2df215af..be3d8add30 100644
--- a/e2e/react-router/basic-file-based/package.json
+++ b/e2e/react-router/basic-file-based/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
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 dd6c71afdd..6548381772 100644
--- a/e2e/react-router/basic-react-query-file-based/package.json
+++ b/e2e/react-router/basic-react-query-file-based/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-react-query/package.json b/e2e/react-router/basic-react-query/package.json
index b66abda5fb..81eb9eb67b 100644
--- a/e2e/react-router/basic-react-query/package.json
+++ b/e2e/react-router/basic-react-query/package.json
@@ -22,7 +22,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-scroll-restoration/package.json b/e2e/react-router/basic-scroll-restoration/package.json
index ab00360d48..d8ebcb414b 100644
--- a/e2e/react-router/basic-scroll-restoration/package.json
+++ b/e2e/react-router/basic-scroll-restoration/package.json
@@ -21,7 +21,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-virtual-file-based/package.json b/e2e/react-router/basic-virtual-file-based/package.json
index 7b9c5945ee..891f1d6328 100644
--- a/e2e/react-router/basic-virtual-file-based/package.json
+++ b/e2e/react-router/basic-virtual-file-based/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json
index f3dbf81ce0..d3872b01e6 100644
--- a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/basic/package.json b/e2e/react-router/basic/package.json
index c7c1661933..a8de9acc3f 100644
--- a/e2e/react-router/basic/package.json
+++ b/e2e/react-router/basic/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/escaped-special-strings/package.json b/e2e/react-router/escaped-special-strings/package.json
index 961d2423cd..71a3cb08ca 100644
--- a/e2e/react-router/escaped-special-strings/package.json
+++ b/e2e/react-router/escaped-special-strings/package.json
@@ -18,7 +18,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/generator-cli-only/package.json b/e2e/react-router/generator-cli-only/package.json
index 9fbe253126..6bbcccf4bd 100644
--- a/e2e/react-router/generator-cli-only/package.json
+++ b/e2e/react-router/generator-cli-only/package.json
@@ -21,7 +21,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/i18n-paraglide/package.json b/e2e/react-router/i18n-paraglide/package.json
index 94a36498ed..31a22eb66b 100644
--- a/e2e/react-router/i18n-paraglide/package.json
+++ b/e2e/react-router/i18n-paraglide/package.json
@@ -19,7 +19,7 @@
},
"devDependencies": {
"@inlang/paraglide-js": "^2.4.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-router/js-only-file-based/package.json b/e2e/react-router/js-only-file-based/package.json
index 6505c4a1e4..d18d4da143 100644
--- a/e2e/react-router/js-only-file-based/package.json
+++ b/e2e/react-router/js-only-file-based/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
"@types/react": "^19.0.8",
diff --git a/e2e/react-router/match-params/package.json b/e2e/react-router/match-params/package.json
index 033a1bb5fe..3282e5e5c2 100644
--- a/e2e/react-router/match-params/package.json
+++ b/e2e/react-router/match-params/package.json
@@ -14,7 +14,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/rspack-basic-file-based/package.json b/e2e/react-router/rspack-basic-file-based/package.json
index 74659b51e1..f54f8f83ca 100644
--- a/e2e/react-router/rspack-basic-file-based/package.json
+++ b/e2e/react-router/rspack-basic-file-based/package.json
@@ -17,7 +17,7 @@
"redaxios": "^0.5.1"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json
index a7b9eb58d4..18e7851ac9 100644
--- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/package.json
@@ -17,7 +17,7 @@
"redaxios": "^0.5.1"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/package.json b/e2e/react-router/scroll-restoration-sandbox-vite/package.json
index 215de36a70..a7fc908019 100644
--- a/e2e/react-router/scroll-restoration-sandbox-vite/package.json
+++ b/e2e/react-router/scroll-restoration-sandbox-vite/package.json
@@ -25,7 +25,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/sentry-integration/package.json b/e2e/react-router/sentry-integration/package.json
index d97446da9f..e275758b83 100644
--- a/e2e/react-router/sentry-integration/package.json
+++ b/e2e/react-router/sentry-integration/package.json
@@ -23,7 +23,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-router/view-transitions/package.json b/e2e/react-router/view-transitions/package.json
index 1c675b7258..1f068d690a 100644
--- a/e2e/react-router/view-transitions/package.json
+++ b/e2e/react-router/view-transitions/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json
index 4475cf5adf..5976695006 100644
--- a/e2e/react-start/basic-auth/package.json
+++ b/e2e/react-start/basic-auth/package.json
@@ -25,7 +25,7 @@
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/basic-cloudflare/package.json b/e2e/react-start/basic-cloudflare/package.json
index 4d90b4124e..45ea13f9da 100644
--- a/e2e/react-start/basic-cloudflare/package.json
+++ b/e2e/react-start/basic-cloudflare/package.json
@@ -21,7 +21,7 @@
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json
index 242636c63f..c804a89eb3 100644
--- a/e2e/react-start/basic-react-query/package.json
+++ b/e2e/react-start/basic-react-query/package.json
@@ -25,7 +25,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json
index 37a3f4a0e2..f11df33f3f 100644
--- a/e2e/react-start/basic/package.json
+++ b/e2e/react-start/basic/package.json
@@ -31,7 +31,7 @@
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-start/clerk-basic/package.json b/e2e/react-start/clerk-basic/package.json
index 2ff6a85a3a..137a0e7fda 100644
--- a/e2e/react-start/clerk-basic/package.json
+++ b/e2e/react-start/clerk-basic/package.json
@@ -21,7 +21,7 @@
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/csp/package.json b/e2e/react-start/csp/package.json
index 4d3c4fd264..22ffb81237 100644
--- a/e2e/react-start/csp/package.json
+++ b/e2e/react-start/csp/package.json
@@ -17,7 +17,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/css-inline/package.json b/e2e/react-start/css-inline/package.json
index a7bc5d023f..5e0b6d104d 100644
--- a/e2e/react-start/css-inline/package.json
+++ b/e2e/react-start/css-inline/package.json
@@ -23,7 +23,7 @@
"srvx": "^0.11.9"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tanstack/router-e2e-utils": "workspace:^",
diff --git a/e2e/react-start/css-modules/package.json b/e2e/react-start/css-modules/package.json
index 1610f62a61..381fa13b3a 100644
--- a/e2e/react-start/css-modules/package.json
+++ b/e2e/react-start/css-modules/package.json
@@ -35,7 +35,7 @@
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json
index f32c9772b9..4bf492acca 100644
--- a/e2e/react-start/custom-basepath/package.json
+++ b/e2e/react-start/custom-basepath/package.json
@@ -20,7 +20,7 @@
"redaxios": "^0.5.1"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/express": "^5.0.6",
diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json
index 75634f79f5..87acfacd05 100644
--- a/e2e/react-start/custom-server-rsbuild/package.json
+++ b/e2e/react-start/custom-server-rsbuild/package.json
@@ -20,7 +20,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-start/dev-ssr-styles/package.json b/e2e/react-start/dev-ssr-styles/package.json
index 91c5cc1281..829eddedd3 100644
--- a/e2e/react-start/dev-ssr-styles/package.json
+++ b/e2e/react-start/dev-ssr-styles/package.json
@@ -37,7 +37,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-core": "workspace:*",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json
index 932ab20cdc..a1a0efbd37 100644
--- a/e2e/react-start/early-hints/package.json
+++ b/e2e/react-start/early-hints/package.json
@@ -19,7 +19,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/node-forge": "^1.3.14",
diff --git a/e2e/react-start/hmr/package.json b/e2e/react-start/hmr/package.json
index b3a58125b9..7c5b6133c1 100644
--- a/e2e/react-start/hmr/package.json
+++ b/e2e/react-start/hmr/package.json
@@ -20,7 +20,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-start/i18n-paraglide/package.json b/e2e/react-start/i18n-paraglide/package.json
index bfb7b5eb26..39e5d3e137 100644
--- a/e2e/react-start/i18n-paraglide/package.json
+++ b/e2e/react-start/i18n-paraglide/package.json
@@ -19,7 +19,7 @@
},
"devDependencies": {
"@inlang/paraglide-js": "^2.4.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/import-protection-custom-config/package.json b/e2e/react-start/import-protection-custom-config/package.json
index 1175bd4ac0..ff0e9e7bdf 100644
--- a/e2e/react-start/import-protection-custom-config/package.json
+++ b/e2e/react-start/import-protection-custom-config/package.json
@@ -19,7 +19,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/import-protection/package.json b/e2e/react-start/import-protection/package.json
index 65ad70126b..0efd1c2048 100644
--- a/e2e/react-start/import-protection/package.json
+++ b/e2e/react-start/import-protection/package.json
@@ -24,7 +24,7 @@
"react-tweet": "^3.3.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tanstack/router-e2e-utils": "workspace:^",
diff --git a/e2e/react-start/query-integration/package.json b/e2e/react-start/query-integration/package.json
index 6a22be7871..a2a325f9c8 100644
--- a/e2e/react-start/query-integration/package.json
+++ b/e2e/react-start/query-integration/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/rsc-deferred-hydration/package.json b/e2e/react-start/rsc-deferred-hydration/package.json
index e14d919490..e1cc5f28e4 100644
--- a/e2e/react-start/rsc-deferred-hydration/package.json
+++ b/e2e/react-start/rsc-deferred-hydration/package.json
@@ -31,7 +31,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/rsc-query/package.json b/e2e/react-start/rsc-query/package.json
index 6049fa77a9..c909b53edf 100644
--- a/e2e/react-start/rsc-query/package.json
+++ b/e2e/react-start/rsc-query/package.json
@@ -22,7 +22,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/rsc-rsbuild/package.json b/e2e/react-start/rsc-rsbuild/package.json
index 6dc5f5f5a1..992ae65684 100644
--- a/e2e/react-start/rsc-rsbuild/package.json
+++ b/e2e/react-start/rsc-rsbuild/package.json
@@ -27,7 +27,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.8",
"@rsbuild/plugin-react": "^2.0.0",
"@tanstack/router-e2e-utils": "workspace:^",
diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json
index 36f822e660..805286a18e 100644
--- a/e2e/react-start/rsc/package.json
+++ b/e2e/react-start/rsc/package.json
@@ -39,7 +39,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tanstack/eslint-plugin-start": "workspace:^",
diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json
index 3dff10b56e..caf6ccbef4 100644
--- a/e2e/react-start/scroll-restoration/package.json
+++ b/e2e/react-start/scroll-restoration/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/server-functions-global-middleware/package.json b/e2e/react-start/server-functions-global-middleware/package.json
index 9af23a0df5..fbbe413417 100644
--- a/e2e/react-start/server-functions-global-middleware/package.json
+++ b/e2e/react-start/server-functions-global-middleware/package.json
@@ -18,7 +18,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json
index 5efdf6c42a..f523ec2b80 100644
--- a/e2e/react-start/server-functions/package.json
+++ b/e2e/react-start/server-functions/package.json
@@ -30,7 +30,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-react": "^2.0.0",
"@tailwindcss/postcss": "^4.2.2",
diff --git a/e2e/react-start/server-routes-global-middleware/package.json b/e2e/react-start/server-routes-global-middleware/package.json
index 0757885b5c..f5c37a00e0 100644
--- a/e2e/react-start/server-routes-global-middleware/package.json
+++ b/e2e/react-start/server-routes-global-middleware/package.json
@@ -18,7 +18,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json
index 41d6c6743b..201ece3dda 100644
--- a/e2e/react-start/server-routes/package.json
+++ b/e2e/react-start/server-routes/package.json
@@ -25,7 +25,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
diff --git a/e2e/react-start/split-base-and-basepath/package.json b/e2e/react-start/split-base-and-basepath/package.json
index 5f4e7a14c1..751e75586b 100644
--- a/e2e/react-start/split-base-and-basepath/package.json
+++ b/e2e/react-start/split-base-and-basepath/package.json
@@ -20,7 +20,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/start-manifest/package.json b/e2e/react-start/start-manifest/package.json
index 7c932cb5d5..ebda3b2160 100644
--- a/e2e/react-start/start-manifest/package.json
+++ b/e2e/react-start/start-manifest/package.json
@@ -15,7 +15,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/static-server-functions/package.json b/e2e/react-start/static-server-functions/package.json
index 47d8a73156..84d72fee03 100644
--- a/e2e/react-start/static-server-functions/package.json
+++ b/e2e/react-start/static-server-functions/package.json
@@ -20,7 +20,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json
index 0cbadeae74..d1e585ade8 100644
--- a/e2e/react-start/streaming-ssr/package.json
+++ b/e2e/react-start/streaming-ssr/package.json
@@ -21,7 +21,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/transform-asset-urls/package.json b/e2e/react-start/transform-asset-urls/package.json
index 40ffdd2569..979f7c4f76 100644
--- a/e2e/react-start/transform-asset-urls/package.json
+++ b/e2e/react-start/transform-asset-urls/package.json
@@ -40,7 +40,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@types/react": "^19.0.8",
diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json
index 0ba0855037..938f770947 100644
--- a/e2e/react-start/virtual-routes/package.json
+++ b/e2e/react-start/virtual-routes/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json
index ad1ab75d5b..2e7c1363bb 100644
--- a/e2e/react-start/website/package.json
+++ b/e2e/react-start/website/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-router/basepath-file-based/package.json b/e2e/solid-router/basepath-file-based/package.json
index a026e7da87..4b27235857 100644
--- a/e2e/solid-router/basepath-file-based/package.json
+++ b/e2e/solid-router/basepath-file-based/package.json
@@ -17,7 +17,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite-plugin-solid": "^2.11.11",
"vite": "^8.0.14"
diff --git a/e2e/solid-router/basic-esbuild-file-based/package.json b/e2e/solid-router/basic-esbuild-file-based/package.json
index ff950365a5..5fd22b3474 100644
--- a/e2e/solid-router/basic-esbuild-file-based/package.json
+++ b/e2e/solid-router/basic-esbuild-file-based/package.json
@@ -18,7 +18,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"esbuild": "^0.27.4",
"esbuild-plugin-solid": "^0.6.0"
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 d18f13a208..a970ce9e5a 100644
--- a/e2e/solid-router/basic-file-based-code-splitting/package.json
+++ b/e2e/solid-router/basic-file-based-code-splitting/package.json
@@ -20,7 +20,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/basic-file-based/package.json b/e2e/solid-router/basic-file-based/package.json
index 3d4b26633a..53dfa340ee 100644
--- a/e2e/solid-router/basic-file-based/package.json
+++ b/e2e/solid-router/basic-file-based/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"combinate": "^1.1.11",
"vite": "^8.0.14",
diff --git a/e2e/solid-router/basic-scroll-restoration/package.json b/e2e/solid-router/basic-scroll-restoration/package.json
index 94c64398cf..88a97d8c60 100644
--- a/e2e/solid-router/basic-scroll-restoration/package.json
+++ b/e2e/solid-router/basic-scroll-restoration/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11",
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 77d3df28d8..fbd773493c 100644
--- a/e2e/solid-router/basic-solid-query-file-based/package.json
+++ b/e2e/solid-router/basic-solid-query-file-based/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/basic-solid-query/package.json b/e2e/solid-router/basic-solid-query/package.json
index aad0845b10..b0cb6d4712 100644
--- a/e2e/solid-router/basic-solid-query/package.json
+++ b/e2e/solid-router/basic-solid-query/package.json
@@ -21,7 +21,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/basic-virtual-file-based/package.json b/e2e/solid-router/basic-virtual-file-based/package.json
index ee1565fd7d..0a0a8eb849 100644
--- a/e2e/solid-router/basic-virtual-file-based/package.json
+++ b/e2e/solid-router/basic-virtual-file-based/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
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 bc222e7d25..803d6a139e 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
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/basic/package.json b/e2e/solid-router/basic/package.json
index 0ccbef8581..0c89f513e7 100644
--- a/e2e/solid-router/basic/package.json
+++ b/e2e/solid-router/basic/package.json
@@ -19,7 +19,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/generator-cli-only/package.json b/e2e/solid-router/generator-cli-only/package.json
index 1d6718af6b..81678d6a70 100644
--- a/e2e/solid-router/generator-cli-only/package.json
+++ b/e2e/solid-router/generator-cli-only/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite-plugin-solid": "^2.11.11",
"vite": "^8.0.14"
diff --git a/e2e/solid-router/js-only-file-based/package.json b/e2e/solid-router/js-only-file-based/package.json
index 755415c99e..fa288bcf4d 100644
--- a/e2e/solid-router/js-only-file-based/package.json
+++ b/e2e/solid-router/js-only-file-based/package.json
@@ -19,7 +19,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
"vite-plugin-solid": "^2.11.11",
diff --git a/e2e/solid-router/rspack-basic-file-based/package.json b/e2e/solid-router/rspack-basic-file-based/package.json
index 5641433737..a7f558f57c 100644
--- a/e2e/solid-router/rspack-basic-file-based/package.json
+++ b/e2e/solid-router/rspack-basic-file-based/package.json
@@ -16,7 +16,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^1.1.1",
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 f298b42ca6..a6ca91d17f 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
@@ -16,7 +16,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^1.1.1",
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
index 7b0c690a68..06bc438114 100644
--- a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
+++ b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite": "^8.0.14",
"vite-plugin-solid": "^2.11.11"
diff --git a/e2e/solid-router/sentry-integration/package.json b/e2e/solid-router/sentry-integration/package.json
index b3c8a52b88..84ea4bb90e 100644
--- a/e2e/solid-router/sentry-integration/package.json
+++ b/e2e/solid-router/sentry-integration/package.json
@@ -22,7 +22,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"vite-plugin-solid": "^2.11.11",
"vite": "^8.0.14"
diff --git a/e2e/solid-router/view-transitions/package.json b/e2e/solid-router/view-transitions/package.json
index 67a28f584c..f047fcec11 100644
--- a/e2e/solid-router/view-transitions/package.json
+++ b/e2e/solid-router/view-transitions/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"typescript": "^6.0.2",
"vite": "^8.0.14",
diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json
index dc99d114fe..2e32dd3cba 100644
--- a/e2e/solid-start/basic-auth/package.json
+++ b/e2e/solid-start/basic-auth/package.json
@@ -24,7 +24,7 @@
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/basic-cloudflare/package.json b/e2e/solid-start/basic-cloudflare/package.json
index 9026db1619..0433f7e35b 100644
--- a/e2e/solid-start/basic-cloudflare/package.json
+++ b/e2e/solid-start/basic-cloudflare/package.json
@@ -20,7 +20,7 @@
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json
index 210f02afcc..4af9bdad34 100644
--- a/e2e/solid-start/basic-solid-query/package.json
+++ b/e2e/solid-start/basic-solid-query/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
index 1993225f61..2092b8b301 100644
--- a/e2e/solid-start/basic/package.json
+++ b/e2e/solid-start/basic/package.json
@@ -26,7 +26,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-solid": "^1.1.1",
diff --git a/e2e/solid-start/csp/package.json b/e2e/solid-start/csp/package.json
index 0457f7a908..4124d87aee 100644
--- a/e2e/solid-start/csp/package.json
+++ b/e2e/solid-start/csp/package.json
@@ -16,7 +16,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
diff --git a/e2e/solid-start/css-modules/package.json b/e2e/solid-start/css-modules/package.json
index e6d052ba65..9939806556 100644
--- a/e2e/solid-start/css-modules/package.json
+++ b/e2e/solid-start/css-modules/package.json
@@ -19,7 +19,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
"sass": "^1.97.2",
diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json
index 363a2e0453..219c87c883 100644
--- a/e2e/solid-start/custom-basepath/package.json
+++ b/e2e/solid-start/custom-basepath/package.json
@@ -19,7 +19,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/express": "^5.0.6",
diff --git a/e2e/solid-start/query-integration/package.json b/e2e/solid-start/query-integration/package.json
index e7c9604edb..df10d5fe32 100644
--- a/e2e/solid-start/query-integration/package.json
+++ b/e2e/solid-start/query-integration/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json
index 87951c16ea..d4177790fd 100644
--- a/e2e/solid-start/scroll-restoration/package.json
+++ b/e2e/solid-start/scroll-restoration/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json
index ab4a3335b4..978e43f6cd 100644
--- a/e2e/solid-start/server-functions/package.json
+++ b/e2e/solid-start/server-functions/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json
index 2a8de94070..5f59515d8e 100644
--- a/e2e/solid-start/server-routes/package.json
+++ b/e2e/solid-start/server-routes/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
diff --git a/e2e/solid-start/solid-query-layout-suspense/package.json b/e2e/solid-start/solid-query-layout-suspense/package.json
index 512e6ea7b7..9e97c1a7c0 100644
--- a/e2e/solid-start/solid-query-layout-suspense/package.json
+++ b/e2e/solid-start/solid-query-layout-suspense/package.json
@@ -16,7 +16,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"typescript": "^6.0.2",
diff --git a/e2e/solid-start/start-manifest/package.json b/e2e/solid-start/start-manifest/package.json
index 262dd23d9a..1cec90d994 100644
--- a/e2e/solid-start/start-manifest/package.json
+++ b/e2e/solid-start/start-manifest/package.json
@@ -15,7 +15,7 @@
"solid-js": "^1.9.10"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"srvx": "^0.11.9",
diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json
index 93b73fa52f..5f61a98b82 100644
--- a/e2e/solid-start/virtual-routes/package.json
+++ b/e2e/solid-start/virtual-routes/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json
index 7379e5ca5f..d8c93ba240 100644
--- a/e2e/solid-start/website/package.json
+++ b/e2e/solid-start/website/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-router/basepath-file-based/package.json b/e2e/vue-router/basepath-file-based/package.json
index 4e3deac1c7..0ed990a8ff 100644
--- a/e2e/vue-router/basepath-file-based/package.json
+++ b/e2e/vue-router/basepath-file-based/package.json
@@ -22,7 +22,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/basic-esbuild-file-based/package.json b/e2e/vue-router/basic-esbuild-file-based/package.json
index e5422cd436..e27d749899 100644
--- a/e2e/vue-router/basic-esbuild-file-based/package.json
+++ b/e2e/vue-router/basic-esbuild-file-based/package.json
@@ -20,7 +20,7 @@
},
"devDependencies": {
"@eslint/js": "^9.36.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@typescript-eslint/eslint-plugin": "^8.44.1",
"@typescript-eslint/parser": "^8.44.1",
diff --git a/e2e/vue-router/basic-file-based-jsx/package.json b/e2e/vue-router/basic-file-based-jsx/package.json
index b029b1ab4f..e4d20d72e9 100644
--- a/e2e/vue-router/basic-file-based-jsx/package.json
+++ b/e2e/vue-router/basic-file-based-jsx/package.json
@@ -22,7 +22,7 @@
},
"devDependencies": {
"@eslint/js": "^9.36.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@typescript-eslint/eslint-plugin": "^8.44.1",
"@typescript-eslint/parser": "^8.44.1",
diff --git a/e2e/vue-router/basic-file-based-sfc/package.json b/e2e/vue-router/basic-file-based-sfc/package.json
index 369a0b1fdc..0f1934b9a9 100644
--- a/e2e/vue-router/basic-file-based-sfc/package.json
+++ b/e2e/vue-router/basic-file-based-sfc/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/basic-scroll-restoration/package.json b/e2e/vue-router/basic-scroll-restoration/package.json
index daa2519eed..86c91c62ca 100644
--- a/e2e/vue-router/basic-scroll-restoration/package.json
+++ b/e2e/vue-router/basic-scroll-restoration/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/basic-virtual-file-based/package.json b/e2e/vue-router/basic-virtual-file-based/package.json
index 946addb3bf..3a341e0e7d 100644
--- a/e2e/vue-router/basic-virtual-file-based/package.json
+++ b/e2e/vue-router/basic-virtual-file-based/package.json
@@ -23,7 +23,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
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 f73d3ad8b2..08815d8265 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
@@ -23,7 +23,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
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 75395b20f8..2cd6d23ba0 100644
--- a/e2e/vue-router/basic-vue-query-file-based/package.json
+++ b/e2e/vue-router/basic-vue-query-file-based/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/basic-vue-query/package.json b/e2e/vue-router/basic-vue-query/package.json
index be46a064c6..288d96018d 100644
--- a/e2e/vue-router/basic-vue-query/package.json
+++ b/e2e/vue-router/basic-vue-query/package.json
@@ -21,7 +21,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/basic/package.json b/e2e/vue-router/basic/package.json
index c779a572e9..ce95750e12 100644
--- a/e2e/vue-router/basic/package.json
+++ b/e2e/vue-router/basic/package.json
@@ -19,7 +19,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"typescript": "~5.8.3",
diff --git a/e2e/vue-router/generator-cli-only/package.json b/e2e/vue-router/generator-cli-only/package.json
index 14cdafcd48..410a14b742 100644
--- a/e2e/vue-router/generator-cli-only/package.json
+++ b/e2e/vue-router/generator-cli-only/package.json
@@ -20,7 +20,7 @@
"tailwindcss": "^4.2.2"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/js-only-file-based/package.json b/e2e/vue-router/js-only-file-based/package.json
index 05a86b7cf1..d7f062038e 100644
--- a/e2e/vue-router/js-only-file-based/package.json
+++ b/e2e/vue-router/js-only-file-based/package.json
@@ -22,7 +22,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/rspack-basic-file-based/package.json b/e2e/vue-router/rspack-basic-file-based/package.json
index 5d8a072d87..ba0ae7efde 100644
--- a/e2e/vue-router/rspack-basic-file-based/package.json
+++ b/e2e/vue-router/rspack-basic-file-based/package.json
@@ -16,7 +16,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-vue": "^1.2.7",
diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json
index 11f61237d3..9b55dcc6f9 100644
--- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json
+++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json
@@ -16,7 +16,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.1.2",
"@rsbuild/plugin-vue": "^1.2.7",
diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json
index a7dc67fd6b..ebcea6fb39 100644
--- a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json
+++ b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-router/sentry-integration/package.json b/e2e/vue-router/sentry-integration/package.json
index cbf6bf8499..897331f1b8 100644
--- a/e2e/vue-router/sentry-integration/package.json
+++ b/e2e/vue-router/sentry-integration/package.json
@@ -22,7 +22,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"typescript": "~5.8.3",
diff --git a/e2e/vue-router/view-transitions/package.json b/e2e/vue-router/view-transitions/package.json
index 493b3e45ce..82f88dbe64 100644
--- a/e2e/vue-router/view-transitions/package.json
+++ b/e2e/vue-router/view-transitions/package.json
@@ -22,7 +22,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json
index 3a572536e9..25de0c6b80 100644
--- a/e2e/vue-start/basic-auth/package.json
+++ b/e2e/vue-start/basic-auth/package.json
@@ -24,7 +24,7 @@
"vue": "^3.5.25"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/basic-cloudflare/package.json b/e2e/vue-start/basic-cloudflare/package.json
index c7e55f7937..05b2158c0e 100644
--- a/e2e/vue-start/basic-cloudflare/package.json
+++ b/e2e/vue-start/basic-cloudflare/package.json
@@ -20,7 +20,7 @@
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.29.0",
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json
index 3189e8e867..6b1335d8bd 100644
--- a/e2e/vue-start/basic-vue-query/package.json
+++ b/e2e/vue-start/basic-vue-query/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json
index 073627701a..dacbcc2154 100644
--- a/e2e/vue-start/basic/package.json
+++ b/e2e/vue-start/basic/package.json
@@ -26,7 +26,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@rsbuild/core": "^2.0.11",
"@rsbuild/plugin-babel": "^1.0.5",
"@rsbuild/plugin-vue": "^1.2.2",
diff --git a/e2e/vue-start/css-modules/package.json b/e2e/vue-start/css-modules/package.json
index 9b7d36333d..7e28e9d5a8 100644
--- a/e2e/vue-start/css-modules/package.json
+++ b/e2e/vue-start/css-modules/package.json
@@ -19,7 +19,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:*",
"@types/node": "^22.10.2",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-start/custom-basepath/package.json b/e2e/vue-start/custom-basepath/package.json
index 759e13b48e..3d0208de01 100644
--- a/e2e/vue-start/custom-basepath/package.json
+++ b/e2e/vue-start/custom-basepath/package.json
@@ -19,7 +19,7 @@
"vue": "^3.5.25"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/express": "^5.0.6",
diff --git a/e2e/vue-start/query-integration/package.json b/e2e/vue-start/query-integration/package.json
index d44bd58376..4cb22b48be 100644
--- a/e2e/vue-start/query-integration/package.json
+++ b/e2e/vue-start/query-integration/package.json
@@ -23,7 +23,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/scroll-restoration/package.json b/e2e/vue-start/scroll-restoration/package.json
index 871200e852..cbc04f23ec 100644
--- a/e2e/vue-start/scroll-restoration/package.json
+++ b/e2e/vue-start/scroll-restoration/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json
index 2e84c6238e..5752c48b73 100644
--- a/e2e/vue-start/server-functions/package.json
+++ b/e2e/vue-start/server-functions/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
diff --git a/e2e/vue-start/server-routes/package.json b/e2e/vue-start/server-routes/package.json
index 6e5c7cdced..4f9db26152 100644
--- a/e2e/vue-start/server-routes/package.json
+++ b/e2e/vue-start/server-routes/package.json
@@ -24,7 +24,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/js-cookie": "^3.0.6",
diff --git a/e2e/vue-start/start-manifest/package.json b/e2e/vue-start/start-manifest/package.json
index 841aa5da85..358e8e0c04 100644
--- a/e2e/vue-start/start-manifest/package.json
+++ b/e2e/vue-start/start-manifest/package.json
@@ -15,7 +15,7 @@
"vue": "^3.5.16"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
"@vitejs/plugin-vue-jsx": "^5.1.5",
diff --git a/e2e/vue-start/virtual-routes/package.json b/e2e/vue-start/virtual-routes/package.json
index 41b1355414..6c2011e1ea 100644
--- a/e2e/vue-start/virtual-routes/package.json
+++ b/e2e/vue-start/virtual-routes/package.json
@@ -22,7 +22,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/e2e/vue-start/website/package.json b/e2e/vue-start/website/package.json
index 8ec13f6dbc..bfbb042de5 100644
--- a/e2e/vue-start/website/package.json
+++ b/e2e/vue-start/website/package.json
@@ -21,7 +21,7 @@
"zod": "^4.4.3"
},
"devDependencies": {
- "@playwright/test": "^1.50.1",
+ "@playwright/test": "^1.61.0",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-e2e-utils": "workspace:^",
"@types/node": "^22.10.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a8ccd3ec25..a91aaea20f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,7 +15,7 @@ overrides:
eslint: ^9.22.0
vite: ^8.0.14
'@types/node': 25.0.9
- '@playwright/test': ^1.57.0
+ '@playwright/test': ^1.61.0
'@tanstack/query-core': ^5.99.0
'@tanstack/react-query': ^5.99.0
'@tanstack/solid-query': ^5.99.0
@@ -80,8 +80,8 @@ importers:
specifier: 22.7.5
version: 22.7.5(nx@22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)(typescript@6.0.2))(@swc/core@1.15.33(@swc/helpers@0.5.23))(debug@4.4.3))
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@swc-node/core':
specifier: ^1.14.1
version: 1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)
@@ -566,8 +566,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -609,8 +609,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -652,8 +652,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -698,8 +698,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -747,8 +747,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -796,8 +796,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -851,8 +851,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -897,8 +897,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -952,8 +952,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1004,8 +1004,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1038,8 +1038,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1084,8 +1084,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1124,8 +1124,8 @@ importers:
specifier: ^2.4.0
version: 2.4.0(babel-plugin-macros@3.1.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1176,8 +1176,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1210,8 +1210,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1244,8 +1244,8 @@ importers:
version: 0.5.1
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -1296,8 +1296,8 @@ importers:
version: 0.5.1
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -1363,8 +1363,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1415,8 +1415,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1464,8 +1464,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1519,8 +1519,8 @@ importers:
version: 3.6.0
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -1604,8 +1604,8 @@ importers:
version: 3.6.0
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -1662,8 +1662,8 @@ importers:
specifier: ^1.29.0
version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -1732,8 +1732,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -1830,8 +1830,8 @@ importers:
version: 3.6.0
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -1876,8 +1876,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -1922,8 +1922,8 @@ importers:
version: 0.11.15
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -1971,8 +1971,8 @@ importers:
specifier: ^1.29.0
version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:*
version: link:../../e2e-utils
@@ -2032,8 +2032,8 @@ importers:
version: 0.5.1
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -2093,8 +2093,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -2197,8 +2197,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-core':
specifier: workspace:*
version: link:../../../packages/router-core
@@ -2249,8 +2249,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -2341,8 +2341,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -2402,8 +2402,8 @@ importers:
specifier: ^2.4.0
version: 2.4.0(babel-plugin-macros@3.1.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -2451,8 +2451,8 @@ importers:
version: 3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -2500,8 +2500,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -2561,8 +2561,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -2610,8 +2610,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -2671,8 +2671,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -2729,8 +2729,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -2775,8 +2775,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.8
version: 2.0.8
@@ -2830,8 +2830,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3007,8 +3007,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -3071,8 +3071,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3141,8 +3141,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3196,8 +3196,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3291,8 +3291,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3334,8 +3334,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3383,8 +3383,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:*
version: link:../../e2e-utils
@@ -3429,8 +3429,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3472,8 +3472,8 @@ importers:
version: 19.2.3(react@19.2.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3530,8 +3530,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3594,8 +3594,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -3643,8 +3643,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3677,8 +3677,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3711,8 +3711,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3751,8 +3751,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3791,8 +3791,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3828,8 +3828,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3871,8 +3871,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3917,8 +3917,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -3960,8 +3960,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4003,8 +4003,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4040,8 +4040,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4074,8 +4074,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4105,8 +4105,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -4151,8 +4151,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -4212,8 +4212,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4255,8 +4255,8 @@ importers:
version: 4.2.2
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4295,8 +4295,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4344,8 +4344,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -4420,8 +4420,8 @@ importers:
version: 3.6.0
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4472,8 +4472,8 @@ importers:
specifier: ^1.29.0
version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4533,8 +4533,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4607,8 +4607,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -4641,8 +4641,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:*
version: link:../../e2e-utils
@@ -4687,8 +4687,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4794,8 +4794,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4843,8 +4843,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -4987,8 +4987,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -5054,8 +5054,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -5103,8 +5103,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5171,8 +5171,8 @@ importers:
version: 1.9.12
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5220,8 +5220,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -5275,8 +5275,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -5333,8 +5333,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5376,8 +5376,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5422,8 +5422,8 @@ importers:
specifier: ^9.36.0
version: 9.36.0
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5483,8 +5483,8 @@ importers:
specifier: ^9.36.0
version: 9.36.0
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5544,8 +5544,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5590,8 +5590,8 @@ importers:
version: 3.5.25(typescript@5.9.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5645,8 +5645,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5700,8 +5700,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5749,8 +5749,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5804,8 +5804,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5850,8 +5850,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5902,8 +5902,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -5933,8 +5933,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -5988,8 +5988,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -6055,8 +6055,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -6107,8 +6107,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -6156,8 +6156,8 @@ importers:
version: 3.5.25(typescript@5.8.3)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -6211,8 +6211,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@rsbuild/core':
specifier: ^2.0.11
version: 2.0.14
@@ -6293,8 +6293,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6348,8 +6348,8 @@ importers:
specifier: ^1.29.0
version: 1.29.1(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))(workerd@1.20260317.1)(wrangler@4.75.0)
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6449,8 +6449,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6492,8 +6492,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:*
version: link:../../e2e-utils
@@ -6538,8 +6538,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6608,8 +6608,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6660,8 +6660,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6816,8 +6816,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6886,8 +6886,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -6975,8 +6975,8 @@ importers:
version: 3.5.25(typescript@6.0.2)
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tanstack/router-e2e-utils':
specifier: workspace:^
version: link:../../e2e-utils
@@ -7024,8 +7024,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -7082,8 +7082,8 @@ importers:
version: 4.4.3
devDependencies:
'@playwright/test':
- specifier: ^1.57.0
- version: 1.58.0
+ specifier: ^1.61.0
+ version: 1.61.1
'@tailwindcss/vite':
specifier: ^4.2.2
version: 4.2.2(vite@8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0))
@@ -17189,8 +17189,8 @@ packages:
engines: {node: '>=22.6.0'}
hasBin: true
- '@playwright/test@1.58.0':
- resolution: {integrity: sha512-fWza+Lpbj6SkQKCrU6si4iu+fD2dD3gxNHFhUPxsfXBPhnv3rRSQVd0NtBUT9Z/RhF/boCBcuUaMUSTRTopjZg==}
+ '@playwright/test@1.61.1':
+ resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==}
engines: {node: '>=18'}
hasBin: true
@@ -24377,13 +24377,13 @@ packages:
resolution: {integrity: sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==}
engines: {node: '>=16.0.0'}
- playwright-core@1.58.0:
- resolution: {integrity: sha512-aaoB1RWrdNi3//rOeKuMiS65UCcgOVljU46At6eFcOFPFHWtd2weHRRow6z/n+Lec0Lvu0k9ZPKJSjPugikirw==}
+ playwright-core@1.61.1:
+ resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
engines: {node: '>=18'}
hasBin: true
- playwright@1.58.0:
- resolution: {integrity: sha512-2SVA0sbPktiIY/MCOPX8e86ehA/e+tDNq+e5Y8qjKYti2Z/JG7xnronT/TXTIkKbYGWlCbuucZ6dziEgkoEjQQ==}
+ playwright@1.61.1:
+ resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
engines: {node: '>=18'}
hasBin: true
@@ -30570,9 +30570,9 @@ snapshots:
pprof-to-md: 0.2.0
react-pprof: 1.4.0
- '@playwright/test@1.58.0':
+ '@playwright/test@1.61.1':
dependencies:
- playwright: 1.58.0
+ playwright: 1.61.1
'@polka/url@1.0.0-next.28': {}
@@ -38953,11 +38953,11 @@ snapshots:
pvutils: 1.1.3
tslib: 2.8.1
- playwright-core@1.58.0: {}
+ playwright-core@1.61.1: {}
- playwright@1.58.0:
+ playwright@1.61.1:
dependencies:
- playwright-core: 1.58.0
+ playwright-core: 1.61.1
optionalDependencies:
fsevents: 2.3.2
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ffd19c8155..aca73336f9 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -41,7 +41,7 @@ catalog:
eslint: ^9.22.0
vite: ^8.0.14
'@types/node': 25.0.9
- '@playwright/test': ^1.57.0
+ '@playwright/test': ^1.61.0
'@tanstack/query-core': ^5.99.0
'@tanstack/react-query': ^5.99.0
'@tanstack/solid-query': ^5.99.0
From 11a6a0d8ba4db37714a6b1d723910bdf7dbe38af Mon Sep 17 00:00:00 2001
From: Flo
Date: Tue, 14 Jul 2026 01:44:02 +0200
Subject: [PATCH 017/363] test: add regression coverage for existing router
behavior (#7812)
---
.../tests/issue-2182-root-pending.test.tsx | 55 ++++++++
.../issue-7367-pending-min-redirect.test.tsx | 78 +++++++++++
...ue-7457-redirect-chain-first-load.test.tsx | 109 +++++++++++++++
...-7638-invalidate-transition-error.test.tsx | 130 ++++++++++++++++++
...ssue-4684-head-on-beforeload-error.test.ts | 86 ++++++++++++
...search-default-normalization-abort.test.ts | 109 +++++++++++++++
6 files changed, 567 insertions(+)
create mode 100644 packages/react-router/tests/issue-2182-root-pending.test.tsx
create mode 100644 packages/react-router/tests/issue-7367-pending-min-redirect.test.tsx
create mode 100644 packages/react-router/tests/issue-7457-redirect-chain-first-load.test.tsx
create mode 100644 packages/react-router/tests/issue-7638-invalidate-transition-error.test.tsx
create mode 100644 packages/router-core/tests/issue-4684-head-on-beforeload-error.test.ts
create mode 100644 packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts
diff --git a/packages/react-router/tests/issue-2182-root-pending.test.tsx b/packages/react-router/tests/issue-2182-root-pending.test.tsx
new file mode 100644
index 0000000000..9cf3f82cb7
--- /dev/null
+++ b/packages/react-router/tests/issue-2182-root-pending.test.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react'
+import { act, cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, test, vi } from 'vitest'
+import {
+ RouterProvider,
+ createControlledPromise,
+ createMemoryHistory,
+ createRootRoute,
+ createRouter,
+} from '../src'
+
+afterEach(() => {
+ cleanup()
+ vi.useRealTimers()
+})
+
+// https://github.com/TanStack/router/issues/2182
+test('root pending fallback remains visible through pendingMinMs', async () => {
+ vi.useFakeTimers()
+
+ const loaderGate = createControlledPromise()
+ const rootRoute = createRootRoute({
+ pendingMs: 0,
+ pendingMinMs: 100,
+ pendingComponent: () => Pending
,
+ loader: () => loaderGate,
+ component: () => Loaded
,
+ })
+ const router = createRouter({
+ routeTree: rootRoute,
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(0)
+ })
+ expect(screen.getByTestId('root-pending')).toBeInTheDocument()
+ expect(screen.queryByTestId('root-content')).not.toBeInTheDocument()
+
+ loaderGate.resolve('loaded')
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(99)
+ })
+ expect(screen.getByTestId('root-pending')).toBeInTheDocument()
+ expect(screen.queryByTestId('root-content')).not.toBeInTheDocument()
+
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(1)
+ })
+ expect(screen.queryByTestId('root-pending')).not.toBeInTheDocument()
+ expect(screen.getByTestId('root-content')).toBeInTheDocument()
+})
diff --git a/packages/react-router/tests/issue-7367-pending-min-redirect.test.tsx b/packages/react-router/tests/issue-7367-pending-min-redirect.test.tsx
new file mode 100644
index 0000000000..666f1d3e4b
--- /dev/null
+++ b/packages/react-router/tests/issue-7367-pending-min-redirect.test.tsx
@@ -0,0 +1,78 @@
+import * as React from 'react'
+import { cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, test, vi } from 'vitest'
+
+import {
+ Outlet,
+ RouterProvider,
+ createMemoryHistory,
+ createRootRoute,
+ createRoute,
+ createRouter,
+ redirect,
+} from '../src'
+import { sleep } from './utils'
+
+afterEach(() => {
+ vi.restoreAllMocks()
+ cleanup()
+})
+
+// https://github.com/TanStack/router/issues/7367
+// Root route shows a spinner immediately (pendingMs: 0) while beforeLoad
+// decides where to send the user, keeps it up for pendingMinMs, and then
+// redirects. This used to crash in MatchInnerImpl (white screen) because the
+// redirected match was rendered/thrown after its loadPromise was cleared.
+test('immediate pending spinner (pendingMs: 0 + pendingMinMs) with root beforeLoad redirect renders the target without render errors', async () => {
+ const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+ let hasRedirected = false
+
+ const rootRoute = createRootRoute({
+ component: () => ,
+ pendingMs: 0,
+ pendingMinMs: 100,
+ pendingComponent: () => loading
,
+ errorComponent: ({ error }) => (
+ {String(error)}
+ ),
+ beforeLoad: async () => {
+ await sleep(50)
+ if (!hasRedirected) {
+ hasRedirected = true
+ throw redirect({ to: '/welcome', replace: true })
+ }
+ },
+ })
+
+ const indexRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/',
+ component: () => Index
,
+ })
+
+ const welcomeRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/welcome',
+ component: () => Welcome
,
+ })
+
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([indexRoute, welcomeRoute]),
+ history: createMemoryHistory({ initialEntries: ['/'] }),
+ })
+
+ render()
+
+ // pendingMs: 0 — the spinner must show right away.
+ expect(await screen.findByTestId('pending')).toBeInTheDocument()
+
+ // The redirect must complete: the target renders, no error boundary output
+ // and no render crash.
+ expect(
+ await screen.findByTestId('welcome-page', undefined, { timeout: 5_000 }),
+ ).toBeInTheDocument()
+ expect(screen.queryByTestId('pending')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('root-error')).not.toBeInTheDocument()
+ expect(router.state.location.pathname).toBe('/welcome')
+ expect(consoleError).not.toHaveBeenCalled()
+})
diff --git a/packages/react-router/tests/issue-7457-redirect-chain-first-load.test.tsx b/packages/react-router/tests/issue-7457-redirect-chain-first-load.test.tsx
new file mode 100644
index 0000000000..3583190d79
--- /dev/null
+++ b/packages/react-router/tests/issue-7457-redirect-chain-first-load.test.tsx
@@ -0,0 +1,109 @@
+import * as React from 'react'
+import { cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, test, vi } from 'vitest'
+
+import {
+ Outlet,
+ RouterProvider,
+ createMemoryHistory,
+ createRootRoute,
+ createRoute,
+ createRouter,
+ redirect,
+} from '../src'
+import { sleep } from './utils'
+
+afterEach(() => {
+ vi.restoreAllMocks()
+ cleanup()
+})
+
+// https://github.com/TanStack/router/issues/7457
+// A chain of async layout beforeLoad redirects during the very first load
+// (search-stripping self-redirect -> layout redirect -> child redirect) used
+// to leave a match rendering with a nulled loadPromise, crashing
+// MatchInnerImpl with an uncaught `undefined`. Pending UI is enabled for
+// every match (defaultPendingMs: 0) to force pending publication mid-chain.
+test('chained layout beforeLoad redirects on first load render the final target without throwing from MatchInner', async () => {
+ const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+ const rootRoute = createRootRoute({ component: () => })
+
+ const userLayout = createRoute({
+ id: 'user',
+ getParentRoute: () => rootRoute,
+ validateSearch: (search: Record): { flag?: boolean } => ({
+ flag: search.flag === true || search.flag === 'true' ? true : undefined,
+ }),
+ beforeLoad: async ({ search }) => {
+ if (search.flag) {
+ await sleep(20)
+ throw redirect({
+ to: '.',
+ replace: true,
+ search: (prev: any) => ({ ...prev, flag: undefined }),
+ })
+ }
+ },
+ component: () => ,
+ })
+
+ const dashboardLayout = createRoute({
+ id: 'dashboard',
+ getParentRoute: () => userLayout,
+ beforeLoad: async () => {
+ await sleep(30)
+ throw redirect({ to: '/intro', replace: true })
+ },
+ component: () => ,
+ })
+
+ const homeRoute = createRoute({
+ getParentRoute: () => dashboardLayout,
+ path: '/home',
+ component: () => Home
,
+ })
+
+ const introLayout = createRoute({
+ getParentRoute: () => userLayout,
+ path: '/intro',
+ beforeLoad: ({ location }) => {
+ if (location.pathname !== '/intro/step') {
+ throw redirect({ to: '/intro/step', replace: true })
+ }
+ },
+ component: () => ,
+ })
+
+ const introIndexRoute = createRoute({
+ getParentRoute: () => introLayout,
+ path: '/',
+ component: () => Intro index
,
+ })
+
+ const introStepRoute = createRoute({
+ getParentRoute: () => introLayout,
+ path: 'step',
+ component: () => Intro step
,
+ })
+
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([
+ userLayout.addChildren([
+ dashboardLayout.addChildren([homeRoute]),
+ introLayout.addChildren([introIndexRoute, introStepRoute]),
+ ]),
+ ]),
+ defaultPendingMs: 0,
+ defaultPendingComponent: () => loading
,
+ history: createMemoryHistory({ initialEntries: ['/home?flag=true'] }),
+ })
+
+ render()
+
+ expect(
+ await screen.findByTestId('intro-step', undefined, { timeout: 5_000 }),
+ ).toBeInTheDocument()
+ expect(router.state.location.pathname).toBe('/intro/step')
+ expect(consoleError).not.toHaveBeenCalled()
+})
diff --git a/packages/react-router/tests/issue-7638-invalidate-transition-error.test.tsx b/packages/react-router/tests/issue-7638-invalidate-transition-error.test.tsx
new file mode 100644
index 0000000000..eb31703b0a
--- /dev/null
+++ b/packages/react-router/tests/issue-7638-invalidate-transition-error.test.tsx
@@ -0,0 +1,130 @@
+import * as React from 'react'
+import { afterEach, expect, test, vi } from 'vitest'
+import {
+ cleanup,
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+} from '@testing-library/react'
+import {
+ Outlet,
+ RouterProvider,
+ createMemoryHistory,
+ createRootRoute,
+ createRoute,
+ createRouter,
+ useRouter,
+} from '../src'
+import type { ErrorComponentProps } from '../src'
+
+afterEach(() => {
+ vi.restoreAllMocks()
+ cleanup()
+})
+
+// https://github.com/TanStack/router/issues/7638
+// router.invalidate() called inside React.startTransition while a nested
+// route is showing its errorComponent must complete the reload and land back
+// on the error UI without crashing React with
+// "Rendered more hooks than during the previous render."
+function setup({ failVia }: { failVia: 'render' | 'loader' }) {
+ const rootRoute = createRootRoute({ component: () => })
+
+ const testRoute = createRoute({
+ getParentRoute: () => rootRoute,
+ path: '/test',
+ component: function TestComponent() {
+ const router = useRouter()
+ const [isPending, startTransition] = React.useTransition()
+ return (
+
+
+
+
+ )
+ },
+ })
+
+ const childLoader = vi.fn(() => {
+ if (failVia === 'loader') {
+ throw new Error('test error')
+ }
+ return 'data'
+ })
+
+ const testIndexRoute = createRoute({
+ getParentRoute: () => testRoute,
+ path: '/',
+ loader: childLoader,
+ component: function ChildComponent() {
+ if (failVia === 'render') {
+ throw new Error('test error')
+ }
+ return child content
+ },
+ })
+
+ let errorRenders = 0
+ const router = createRouter({
+ routeTree: rootRoute.addChildren([testRoute.addChildren([testIndexRoute])]),
+ history: createMemoryHistory({ initialEntries: ['/test'] }),
+ defaultErrorComponent: (props: ErrorComponentProps) => {
+ errorRenders++
+ return error: {props.error.message}
+ },
+ })
+
+ return { router, childLoader, getErrorRenders: () => errorRenders }
+}
+
+test.each(['render', 'loader'] as const)(
+ 'invalidate() inside startTransition through a nested %s-error route does not crash',
+ async (failVia) => {
+ // Error boundaries log caught errors through console.error, and so does a
+ // hooks-order crash. Capture instead of polluting the test output, then
+ // inspect the captured calls for the crash signature.
+ const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+ const { router, childLoader, getErrorRenders } = setup({ failVia })
+ render()
+
+ expect(await screen.findByTestId('error-ui')).toBeInTheDocument()
+ const initialErrorRenders = getErrorRenders()
+ const initialLoaderCalls = childLoader.mock.calls.length
+
+ fireEvent.click(screen.getByTestId('invalidate'))
+
+ // The invalidated reload must actually complete: the loader re-ran ...
+ await waitFor(() => {
+ expect(childLoader.mock.calls.length).toBeGreaterThan(initialLoaderCalls)
+ })
+
+ // ... the error UI is rendered again after the reload ...
+ await waitFor(() => {
+ expect(screen.getByTestId('error-ui')).toBeInTheDocument()
+ expect(getErrorRenders()).toBeGreaterThan(initialErrorRenders)
+ })
+
+ // React must not have torn the tree down with a hooks-order violation.
+ const hooksCrash = consoleError.mock.calls.find((call) =>
+ call.some((arg) =>
+ String(arg?.message ?? arg).includes('Rendered more hooks'),
+ ),
+ )
+ expect(hooksCrash).toBeUndefined()
+ // The surrounding route (the issue's "frozen" parent) is still mounted
+ // and interactive.
+ expect(screen.getByTestId('invalidate')).toBeInTheDocument()
+ },
+)
diff --git a/packages/router-core/tests/issue-4684-head-on-beforeload-error.test.ts b/packages/router-core/tests/issue-4684-head-on-beforeload-error.test.ts
new file mode 100644
index 0000000000..05960c8290
--- /dev/null
+++ b/packages/router-core/tests/issue-4684-head-on-beforeload-error.test.ts
@@ -0,0 +1,86 @@
+import { createMemoryHistory } from '@tanstack/history'
+import { describe, expect, test, vi } from 'vitest'
+import { BaseRootRoute, BaseRoute } from '../src'
+import { createTestRouter } from './routerTestUtils'
+
+// https://github.com/TanStack/router/issues/4684
+//
+// When beforeLoad throws, head() must still execute for the retained lane —
+// the root head owns global stylesheets/title that the errorComponent page
+// depends on, and the failing route's own head can provide error-specific
+// head content.
+describe('issue #4684: head executes when beforeLoad throws', () => {
+ const setup = (isServer: boolean) => {
+ const beforeLoadError = new Error('beforeLoad failed')
+ const rootHead = vi.fn(() => ({
+ meta: [{ title: 'Root title' }],
+ links: [{ rel: 'stylesheet', href: '/global.css' }],
+ }))
+ const failingHead = vi.fn(({ match }: any) => ({
+ meta: [{ title: match.error ? 'Error title' : 'Success title' }],
+ }))
+
+ const rootRoute = new BaseRootRoute({ head: rootHead })
+ const failingRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/fail',
+ beforeLoad: () => {
+ throw beforeLoadError
+ },
+ head: failingHead,
+ errorComponent: () => 'error',
+ })
+
+ const router = createTestRouter({
+ routeTree: rootRoute.addChildren([failingRoute]),
+ history: createMemoryHistory({ initialEntries: ['/fail'] }),
+ isServer,
+ })
+
+ return { router, rootRoute, failingRoute, rootHead, failingHead }
+ }
+
+ test('server load projects root and failing-route heads for the error lane', async () => {
+ const { router, rootRoute, failingRoute, rootHead, failingHead } =
+ setup(true)
+
+ await router.load()
+
+ expect(router.state.statusCode).toBe(500)
+ expect(rootHead).toHaveBeenCalledTimes(1)
+ expect(failingHead).toHaveBeenCalledTimes(1)
+
+ const rootMatch = router.state.matches.find(
+ (match) => match.routeId === rootRoute.id,
+ )
+ const failingMatch = router.state.matches.find(
+ (match) => match.routeId === failingRoute.id,
+ )
+ expect(rootMatch?.meta).toEqual([{ title: 'Root title' }])
+ expect(rootMatch?.links).toEqual([
+ { rel: 'stylesheet', href: '/global.css' },
+ ])
+ expect(failingMatch?.status).toBe('error')
+ expect(failingMatch?.meta).toEqual([{ title: 'Error title' }])
+ })
+
+ test('client load projects root and failing-route heads for the error lane', async () => {
+ const { router, rootRoute, failingRoute, rootHead, failingHead } =
+ setup(false)
+
+ await router.load()
+
+ expect(rootHead).toHaveBeenCalledTimes(1)
+ expect(failingHead).toHaveBeenCalledTimes(1)
+
+ const rootMatch = router.state.matches.find(
+ (match) => match.routeId === rootRoute.id,
+ )
+ const failingMatch = router.state.matches.find(
+ (match) => match.routeId === failingRoute.id,
+ )
+ expect(rootMatch?.meta).toEqual([{ title: 'Root title' }])
+ expect(failingMatch?.status).toBe('error')
+ expect(failingMatch?.meta).toEqual([{ title: 'Error title' }])
+ })
+})
diff --git a/packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts b/packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts
new file mode 100644
index 0000000000..a52a7f183d
--- /dev/null
+++ b/packages/router-core/tests/issue-6371-search-default-normalization-abort.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, test, vi } from 'vitest'
+import { createMemoryHistory } from '@tanstack/history'
+import { BaseRootRoute, BaseRoute, trimPathRight } from '../src'
+import { createTestRouter } from './routerTestUtils'
+
+/**
+ * Repro for https://github.com/TanStack/router/issues/6371
+ *
+ * Entering a route directly via URL without search params, while
+ * validateSearch supplies defaults, makes the framework Transitioner commit a
+ * canonical replace-navigation (URL with the defaulted search) right after
+ * the mount load already started. That replace supersedes the first load
+ * pass and aborts its match's abortController. A loader that forwarded that
+ * signal to fetch() re-throws an AbortError ("signal is aborted without
+ * reason"): it belongs to the abandoned pass and must not surface as a route
+ * error; the follow-up canonical load must complete normally.
+ */
+
+const waitForMacrotask = () =>
+ new Promise((resolve) => {
+ setTimeout(resolve, 0)
+ })
+
+describe('issue #6371: search default normalization aborts the mount load silently', () => {
+ test('canonical replace after validateSearch defaults does not surface AbortError', async () => {
+ const invocations: Array<{ resolve: () => void; signal: AbortSignal }> = []
+
+ const rootRoute = new BaseRootRoute({})
+ const aboutRoute = new BaseRoute({
+ getParentRoute: () => rootRoute,
+ path: '/about',
+ validateSearch: (search: Record) => ({
+ page: typeof search.page === 'number' ? search.page : 1,
+ }),
+ loader: ({ abortController }: { abortController: AbortController }) =>
+ new Promise((resolve, reject) => {
+ invocations.push({
+ resolve: () => resolve('about data'),
+ signal: abortController.signal,
+ })
+ abortController.signal.addEventListener('abort', () => {
+ const abortError = new Error('signal is aborted without reason')
+ abortError.name = 'AbortError'
+ reject(abortError)
+ })
+ }),
+ })
+
+ const router = createTestRouter({
+ routeTree: rootRoute.addChildren([aboutRoute]),
+ history: createMemoryHistory({ initialEntries: ['/about'] }),
+ })
+
+ // Mount load for the raw URL (no search params in the href yet).
+ const initialLoad = router.load()
+ await vi.waitFor(() => expect(invocations.length).toBe(1))
+
+ // What the framework Transitioner does on mount: rebuild the canonical
+ // location with validated search and replace if the public href differs.
+ const nextLocation = router.buildLocation({
+ to: router.latestLocation.pathname,
+ search: true,
+ params: true,
+ hash: true,
+ state: true,
+ _includeValidateSearch: true,
+ } as any)
+
+ expect(nextLocation.publicHref).toContain('page=1')
+ expect(trimPathRight(router.latestLocation.publicHref)).not.toBe(
+ trimPathRight(nextLocation.publicHref),
+ )
+
+ // In core (no history subscribers) commitLocation starts the second load.
+ void router.commitLocation({ ...nextLocation, replace: true } as any)
+
+ await vi.waitFor(() => expect(invocations.length).toBe(2))
+
+ // The superseded mount-load generation was aborted (its fetch canceled).
+ expect(invocations[0]!.signal.aborted).toBe(true)
+
+ // Give the aborted rejection time to (incorrectly) commit as an error.
+ await waitForMacrotask()
+ await waitForMacrotask()
+
+ for (const match of router.state.matches) {
+ expect(match.status).not.toBe('error')
+ expect((match.error as Error | undefined)?.name).not.toBe('AbortError')
+ }
+
+ invocations[1]!.resolve()
+ // Awaiting the superseded mount load also awaits the superseding chain.
+ await initialLoad
+
+ // No runaway normalization loop: exactly one aborted + one canonical run.
+ expect(invocations.length).toBe(2)
+
+ const aboutMatch = router.state.matches.find(
+ (match) => match.routeId === aboutRoute.id,
+ )!
+ expect(aboutMatch.status).toBe('success')
+ expect(aboutMatch.error).toBeUndefined()
+ expect(aboutMatch.loaderData).toBe('about data')
+ expect(aboutMatch.search).toEqual({ page: 1 })
+
+ expect(router.state.location.search).toEqual({ page: 1 })
+ expect(router.latestLocation.publicHref).toContain('page=1')
+ })
+})
From 0b178a79e2e872df0107bd7f0faa891c4c9815ef Mon Sep 17 00:00:00 2001
From: Flo
Date: Wed, 15 Jul 2026 09:48:19 +0200
Subject: [PATCH 018/363] test: add more regression coverage for existing
router behavior (#7822)
---
e2e/react-start/basic/src/routes/posts.tsx | 8 +
e2e/react-start/basic/tests/not-found.spec.ts | 18 +++
.../tests/errorComponent.test.tsx | 73 +++++++++
...ssue-2905-root-beforeload-pending.test.tsx | 59 +++++++
...8-router-provider-context-preload.test.tsx | 113 +++++++++++++
...-7638-invalidate-transition-error.test.tsx | 119 ++++++++++----
packages/react-router/tests/loaders.test.tsx | 15 +-
.../issue-3293-on-enter-after-loader.test.ts | 108 +++++++++++++
...4078-loader-notfound-root-boundary.test.ts | 111 +++++++++++++
...arent-context-search-normalization.test.ts | 102 ++++++++++++
...ue-5106-hydrated-notfound-boundary.test.ts | 151 ++++++++++++++++++
11 files changed, 835 insertions(+), 42 deletions(-)
create mode 100644 packages/react-router/tests/issue-2905-root-beforeload-pending.test.tsx
create mode 100644 packages/react-router/tests/issue-5778-router-provider-context-preload.test.tsx
create mode 100644 packages/router-core/tests/issue-3293-on-enter-after-loader.test.ts
create mode 100644 packages/router-core/tests/issue-4078-loader-notfound-root-boundary.test.ts
create mode 100644 packages/router-core/tests/issue-4696-parent-context-search-normalization.test.ts
create mode 100644 packages/router-core/tests/issue-5106-hydrated-notfound-boundary.test.ts
diff --git a/e2e/react-start/basic/src/routes/posts.tsx b/e2e/react-start/basic/src/routes/posts.tsx
index 0f69c18341..22fb7e60a8 100644
--- a/e2e/react-start/basic/src/routes/posts.tsx
+++ b/e2e/react-start/basic/src/routes/posts.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react'
import { Link, Outlet, createFileRoute } from '@tanstack/react-router'
import { fetchPosts } from '~/utils/posts'
@@ -16,9 +17,16 @@ export const Route = createFileRoute('/posts')({
function PostsComponent() {
const posts = Route.useLoaderData()
+ const [hydrationCount, setHydrationCount] = useState(0)
return (
+