Solid router main merge

.agents/skills/bundle-size-optimization

@@ -0,0 +1 @@
+../../skills/bundle-size-optimization

.changeset/empty-olives-melt.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+Perf improvement of useMatch and derived hooks when navigating away from previous match

.changeset/four-carrots-post.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+useMatches can skip useRef for structural sharing during SSR

.changeset/large-insects-own.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/start-server-core': patch
+---
+
+Skip a full router.update for faster createStartHandler

.changeset/major-poems-drop.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+Reduce Match rerenders during navigations (PR #7596)

.changeset/proud-clubs-buy.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Remove unnecessary setTimeout from Match components

.changeset/silent-ghosts-sit.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+Reduce bundle size by sharing structuralSharing selector logic

.changeset/upset-eagles-happen.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+Silence AbortError in renderRouterToStream, this is normal operation

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

@@ -47,7 +47,6 @@ jobs:
         uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main
 
       - name: Run ${{ matrix.benchmark }}:${{ matrix.framework }} CodSpeed benchmark
-        continue-on-error: true
         uses: CodSpeedHQ/action@9d332c4d90b43981c3e55ae8e38e68709996240f # v4.17.0
         with:
           mode: simulation

.prettierignore

@@ -16,4 +16,5 @@ node_modules
 **/tests/generator/**/routeTree*.snapshot.ts
 /.nx/workspace-data
 **/src/routeTree.gen.ts
-packages/router-plugin/tests/**/test-files/**
+packages/router-plugin/tests/**/test-files/**
+.nx/self-healing

AGENTS.md

@@ -21,6 +21,7 @@ TanStack Router is a type-safe router with built-in caching and URL state manage
 - Framework-agnostic core logic separated from React/Solid bindings
 - Type-safe routing with search params and path params
 - Use workspace protocol for internal dependencies (`workspace:*`)
+- Always use curly braces for `if`, `else`, loops, and similar control statements. Never write one-line bodies like `if (foo) x = 1`.
 
 ## Dev environment tips
 

_artifacts/skill_spec.md

@@ -67,7 +67,7 @@ TanStack Router is a type-safe router for React and Solid applications with buil
 
 | #   | Mistake                                       | Priority | Source                        | Cross-skill? |
 | --- | --------------------------------------------- | -------- | ----------------------------- | ------------ |
-| 1   | Interpolating path params into to string      | CRITICAL | docs/guide/navigation         | navigation   |
+| 1   | Interpolating path params into `to` string    | CRITICAL | docs/guide/navigation         | navigation   |
 | 2   | Using \* for splat routes instead of $        | MEDIUM   | docs/routing/routing-concepts | —            |
 | 3   | Using curly braces for basic dynamic segments | MEDIUM   | docs/guide/path-params        | —            |
 

_artifacts/start_domain_map.yaml

@@ -134,7 +134,7 @@ skills:
       - '@tanstack/start-server-core'
     covers:
       - createServerFn (GET/POST)
-      - inputValidator (Zod or function)
+      - validator (Zod or function)
       - useServerFn hook
       - Server context utilities (getRequest, getRequestHeader, setResponseHeader, setResponseStatus)
       - Error handling (throw errors, redirect, notFound)
@@ -229,7 +229,7 @@ skills:
       - Middleware factories
       - Fetch override precedence
       - Header merging
-      - Method order enforcement (middleware → inputValidator → client → server)
+      - Method order enforcement (middleware → validator → client → server)
     tasks:
       - 'Add authentication middleware'
       - 'Pass context through middleware chain'
@@ -247,7 +247,7 @@ skills:
 
       - mistake: 'Wrong middleware method order'
         mechanism: >-
-          TypeScript enforces method order: middleware → inputValidator
+          TypeScript enforces method order: middleware → validator
           → client → server. Wrong order causes type errors and
           runtime failures.
         source: 'docs/start/framework/react/guide/middleware.md'

_artifacts/start_skill_tree.yaml

@@ -37,7 +37,7 @@ skills:
     path: 'skills/start-core/server-functions/SKILL.md'
     package: 'packages/start-client-core'
     description: >-
-      createServerFn (GET/POST), inputValidator (Zod or function),
+      createServerFn (GET/POST), validator (Zod or function),
       useServerFn hook, server context utilities (getRequest,
       getRequestHeader, setResponseHeader, setResponseStatus), error
       handling (throw errors, redirect, notFound), streaming

benchmarks/bundle-size/README.md

@@ -32,11 +32,41 @@ Each package has `minimal` and `full` scenarios:
 pnpm nx run @benchmarks/bundle-size:build
 ```
 
+Run one or more scenarios during local optimization:
+
+```bash
+pnpm nx run @benchmarks/bundle-size:build -- --scenario react-router.minimal
+pnpm nx run @benchmarks/bundle-size:build -- --scenario react-router.minimal,react-router.full
+```
+
+Filtered runs build only the package projects needed by selected scenarios. Full runs build all package projects needed by all scenarios. If the required packages are already built and unchanged, skip that step:
+
+```bash
+pnpm nx run @benchmarks/bundle-size:build -- --scenario react-router.minimal --skip-package-builds
+```
+
 This writes:
 
 - `benchmarks/bundle-size/results/current.json`
 - `benchmarks/bundle-size/results/benchmark-action.json`
 
+`current.json` includes run status, selected package build projects, per-scenario totals, per-file sizes, and the emitted JS files used for measurement. Dist paths use `scenarioDir`/`outDir`, e.g. `react-router.minimal` maps to `benchmarks/bundle-size/dist/react-router-minimal/`.
+
+## Local Query Tools
+
+```bash
+pnpm benchmark:bundle-size:query --id react-router.minimal
+pnpm benchmark:bundle-size:diff --baseline /tmp/base-current.json --id react-router.minimal
+pnpm benchmark:bundle-size:history --id react-router.minimal --top-deltas 20
+```
+
+For source attribution, run an analysis build. This uses hidden source maps and writes source estimates into `current.json`; those estimates are for investigation only, not tracking.
+
+```bash
+pnpm nx run @benchmarks/bundle-size:build -- --scenario react-router.minimal --analysis
+pnpm benchmark:bundle-size:analyze --id react-router.minimal --top-sources 30
+```
+
 ## CI Reporting
 
 - PR workflow generates a sticky comment with:
@@ -56,6 +86,10 @@ The measurement script supports optional interfaces for historical backfilling:
 - `--sha`
 - `--measured-at`
 - `--append-history`
+- `--scenario`
+- `--analysis`
+- `--sourcemap`
+- `--skip-package-builds`
 
 These are intended for one-off scripts that replay historical commits and append results to the same history dataset shape used for chart generation.
 If `--append-history` points at a `data.js` file, output is written as `window.BENCHMARK_DATA = ...` for direct GitHub Pages compatibility.

benchmarks/bundle-size/package.json

@@ -3,7 +3,28 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs"
+    "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds"
+  },
+  "nx": {
+    "targets": {
+      "build": {
+        "cache": false,
+        "dependsOn": [
+          {
+            "projects": [
+              "@tanstack/react-router",
+              "@tanstack/react-start",
+              "@tanstack/router-plugin",
+              "@tanstack/solid-router",
+              "@tanstack/solid-start",
+              "@tanstack/vue-router",
+              "@tanstack/vue-start"
+            ],
+            "target": "build"
+          }
+        ]
+      }
+    }
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
@@ -12,6 +33,7 @@
     "@tanstack/solid-router": "workspace:^",
     "@tanstack/solid-start": "workspace:^",
     "@tanstack/vue-router": "workspace:^",
+    "@tanstack/vue-start": "workspace:^",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "solid-js": "2.0.0-beta.14",

benchmarks/bundle-size/scenarios/react-router-full/src/routes/index.tsx

@@ -1,6 +1,18 @@
-import { createFileRoute } from '@tanstack/react-router'
+import {
+  createFileRoute,
+  retainSearchParams,
+  stripSearchParams,
+} from '@tanstack/react-router'
+
+const defaultSearch = { page: 1 }
 
 export const Route = createFileRoute('/')({
+  search: {
+    middlewares: [
+      retainSearchParams<Record<string, unknown>>(['persist']),
+      stripSearchParams(defaultSearch),
+    ],
+  },
   component: IndexComponent,
 })
 

benchmarks/bundle-size/scenarios/react-start-minimal/rsbuild.config.ts

@@ -3,10 +3,20 @@ import { pluginReact } from '@rsbuild/plugin-react'
 import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild'
 
 const outDir = process.env.BUNDLE_SIZE_DIST_DIR ?? 'dist-rsbuild'
+const clientOutput = process.env.BUNDLE_SIZE_RSB_CLIENT_OUTPUT
+const startOptions = clientOutput
+  ? {
+      rsbuild: {
+        client: {
+          output: clientOutput as 'module' | 'iife',
+        },
+      },
+    }
+  : undefined
 
 export default defineConfig({
   logLevel: 'silent',
-  plugins: [pluginReact({ splitChunks: false }), tanstackStart()],
+  plugins: [pluginReact({ splitChunks: false }), tanstackStart(startOptions)],
   output: {
     distPath: {
       root: outDir,

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

@@ -1,6 +1,18 @@
-import { createFileRoute } from '@tanstack/solid-router'
+import {
+  createFileRoute,
+  retainSearchParams,
+  stripSearchParams,
+} from '@tanstack/solid-router'
+
+const defaultSearch = { page: 1 }
 
 export const Route = createFileRoute('/')({
+  search: {
+    middlewares: [
+      retainSearchParams<Record<string, unknown>>(['persist']),
+      stripSearchParams(defaultSearch),
+    ],
+  },
   component: IndexComponent,
 })
 

benchmarks/bundle-size/scenarios/vue-router-full/src/routes/index.tsx

@@ -1,6 +1,18 @@
-import { createFileRoute } from '@tanstack/vue-router'
+import {
+  createFileRoute,
+  retainSearchParams,
+  stripSearchParams,
+} from '@tanstack/vue-router'
+
+const defaultSearch = { page: 1 }
 
 export const Route = createFileRoute('/')({
+  search: {
+    middlewares: [
+      retainSearchParams<Record<string, unknown>>(['persist']),
+      stripSearchParams(defaultSearch),
+    ],
+  },
   component: IndexComponent,
 })
 

benchmarks/bundle-size/scenarios/vue-start-full/src/router.tsx

@@ -0,0 +1,9 @@
+import { createRouter } from '@tanstack/vue-router'
+import { routeTree } from './routeTree.gen'
+
+export function getRouter() {
+  return createRouter({
+    routeTree,
+    scrollRestoration: true,
+  })
+}