diff --git a/.changeset/pre.json b/.changeset/pre.json
index c512b52916..1a984db1bf 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -41,7 +41,9 @@
     "@tanstack/vue-start": "1.166.8",
     "@tanstack/vue-start-client": "1.166.7",
     "@tanstack/vue-start-server": "1.166.7",
-    "@tanstack/zod-adapter": "1.166.7"
+    "@tanstack/zod-adapter": "1.166.7",
+    "@tanstack/eslint-plugin-start": "0.1.0",
+    "@tanstack/react-start-rsc": "0.1.17"
   },
   "changesets": [
     "brave-pans-create",
@@ -66,6 +68,7 @@
     "social-rules-fold",
     "solid-kings-help",
     "three-carrots-return",
+    "tiny-beds-tan",
     "tired-pants-eat",
     "violet-turkeys-cross",
     "wicked-olives-poke"
diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json
index 5d3fe36d3c..6b7955b141 100644
--- a/examples/solid/authenticated-routes-firebase/package.json
+++ b/examples/solid/authenticated-routes-firebase/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "firebase": "^11.4.0",
     "redaxios": "^0.5.1",
     "simple-icons": "^14.9.0",
diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json
index 4fdad905c9..1a39f4e6f8 100644
--- a/examples/solid/authenticated-routes/package.json
+++ b/examples/solid/authenticated-routes/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json
index 6ce2da40e1..ccabb70c1b 100644
--- a/examples/solid/basic-default-search-params/package.json
+++ b/examples/solid/basic-default-search-params/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json
index 4cf548fd0e..7ebb2d452d 100644
--- a/examples/solid/basic-devtools-panel/package.json
+++ b/examples/solid/basic-devtools-panel/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json
index 47f624a582..036c3e84f7 100644
--- a/examples/solid/basic-file-based/package.json
+++ b/examples/solid/basic-file-based/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json
index 522df27ce2..b7e2f945ec 100644
--- a/examples/solid/basic-non-nested-devtools/package.json
+++ b/examples/solid/basic-non-nested-devtools/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json
index dc2d9a768a..0be5de9972 100644
--- a/examples/solid/basic-solid-query-file-based/package.json
+++ b/examples/solid/basic-solid-query-file-based/package.json
@@ -14,8 +14,8 @@
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json
index 05d07c5561..7b64f34795 100644
--- a/examples/solid/basic-solid-query/package.json
+++ b/examples/solid/basic-solid-query/package.json
@@ -13,8 +13,8 @@
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json
index cafc16996b..89469e39aa 100644
--- a/examples/solid/basic-ssr-file-based/package.json
+++ b/examples/solid/basic-ssr-file-based/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
     "compression": "^1.8.0",
     "express": "^5.2.1",
     "get-port": "^7.1.0",
@@ -21,7 +21,7 @@
     "solid-js": "2.0.0-beta.14"
   },
   "devDependencies": {
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@types/express": "^5.0.6",
     "typescript": "^6.0.2",
     "vite": "^8.0.14",
diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json
index 6b39a3c87f..1c2d616fc6 100644
--- a/examples/solid/basic-ssr-streaming-file-based/package.json
+++ b/examples/solid/basic-ssr-streaming-file-based/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "compression": "^1.8.0",
     "express": "^5.2.1",
     "get-port": "^7.1.0",
diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json
index 01fc5907e3..b408bf3c0c 100644
--- a/examples/solid/basic-virtual-file-based/package.json
+++ b/examples/solid/basic-virtual-file-based/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@tanstack/virtual-file-routes": "^1.162.0",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json
index 4e442b5242..d9a67248f3 100644
--- a/examples/solid/basic-virtual-inside-file-based/package.json
+++ b/examples/solid/basic-virtual-inside-file-based/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@tanstack/virtual-file-routes": "^1.162.0",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index 3c9da90d8c..babd4fd37a 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json
index 705bbcaf0a..343d1bb158 100644
--- a/examples/solid/deferred-data/package.json
+++ b/examples/solid/deferred-data/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json
index d3c0fbc0a0..7fe2394a94 100644
--- a/examples/solid/i18n-paraglide/package.json
+++ b/examples/solid/i18n-paraglide/package.json
@@ -13,7 +13,7 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
     "solid-js": "2.0.0-beta.14",
     "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 dcfb4c53c6..4b66ffeaf1 100644
--- a/examples/solid/kitchen-sink-file-based/package.json
+++ b/examples/solid/kitchen-sink-file-based/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "immer": "^10.1.1",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
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 1d2473a7d4..95f739ffeb 100644
--- a/examples/solid/kitchen-sink-solid-query-file-based/package.json
+++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json
@@ -14,8 +14,8 @@
     "@tanstack/router-plugin": "^1.168.13",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "immer": "^10.1.1",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json
index 58e633f7a0..8c37e4ff48 100644
--- a/examples/solid/kitchen-sink-solid-query/package.json
+++ b/examples/solid/kitchen-sink-solid-query/package.json
@@ -13,8 +13,8 @@
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "immer": "^10.1.1",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json
index 49b43c2fcd..0cb2b40620 100644
--- a/examples/solid/kitchen-sink/package.json
+++ b/examples/solid/kitchen-sink/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "immer": "^10.1.1",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json
index 96ec7ae840..6ea831808f 100644
--- a/examples/solid/large-file-based/package.json
+++ b/examples/solid/large-file-based/package.json
@@ -15,8 +15,8 @@
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json
index 84ae5a4817..ccc759ec6c 100644
--- a/examples/solid/location-masking/package.json
+++ b/examples/solid/location-masking/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json
index 237c4d7de1..de2b635b7c 100644
--- a/examples/solid/navigation-blocking/package.json
+++ b/examples/solid/navigation-blocking/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json
index a845ab3263..575639d4a9 100644
--- a/examples/solid/quickstart-esbuild-file-based/package.json
+++ b/examples/solid/quickstart-esbuild-file-based/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json
index b4405922cc..f06cd8c3fe 100644
--- a/examples/solid/quickstart-file-based/package.json
+++ b/examples/solid/quickstart-file-based/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json
index 46e1418ad5..dc2d13c5f3 100644
--- a/examples/solid/quickstart-rspack-file-based/package.json
+++ b/examples/solid/quickstart-rspack-file-based/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/postcss": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "postcss": "^8.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json
index e7ddcec76a..76d6078de3 100644
--- a/examples/solid/quickstart-webpack-file-based/package.json
+++ b/examples/solid/quickstart-webpack-file-based/package.json
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
   },
diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json
index 0030db26fc..c27565544c 100644
--- a/examples/solid/quickstart/package.json
+++ b/examples/solid/quickstart/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "solid-js": "2.0.0-beta.14",
     "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 8651b519da..6ad8fd1351 100644
--- a/examples/solid/router-monorepo-simple-lazy/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14"
   },
diff --git a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json
index db25061aed..4ed5f5054e 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json
@@ -19,7 +19,7 @@
     "@types/react-dom": "^19.0.3",
     "@vitejs/plugin-react": "^6.0.1",
     "typescript": "^6.0.2",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "tailwindcss": "^4.2.2",
     "vite": "^8.0.14",
     "vite-plugin-dts": "^4.5.4",
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 64119996f2..d866a02477 100644
--- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json
@@ -9,7 +9,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@tanstack/history": "^1.162.0",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
     "@tanstack/router-plugin": "^1.168.13",
     "redaxios": "^0.5.1",
     "zod": "^4.4.3",
diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json
index 1934328a4f..bcb6712f60 100644
--- a/examples/solid/router-monorepo-simple/package.json
+++ b/examples/solid/router-monorepo-simple/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14"
   },
diff --git a/examples/solid/router-monorepo-simple/packages/app/package.json b/examples/solid/router-monorepo-simple/packages/app/package.json
index 868d8f108e..22518d91d8 100644
--- a/examples/solid/router-monorepo-simple/packages/app/package.json
+++ b/examples/solid/router-monorepo-simple/packages/app/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "vite-plugin-solid": "^3.0.0-next.5",
     "typescript": "^6.0.2",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "vite": "^8.0.14",
     "tailwindcss": "^4.2.2",
     "vite-plugin-dts": "^4.5.4",
diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json
index 1b5c71c1d0..3c547be8f0 100644
--- a/examples/solid/router-monorepo-simple/packages/router/package.json
+++ b/examples/solid/router-monorepo-simple/packages/router/package.json
@@ -9,7 +9,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@tanstack/history": "^1.162.0",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
     "@tanstack/router-plugin": "^1.168.13",
     "redaxios": "^0.5.1",
     "zod": "^4.4.3",
diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json
index ad58231aab..df66d40dd6 100644
--- a/examples/solid/router-monorepo-solid-query/package.json
+++ b/examples/solid/router-monorepo-solid-query/package.json
@@ -14,8 +14,8 @@
     "@tanstack/router-plugin": "^1.168.13",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14"
   },
diff --git a/examples/solid/router-monorepo-solid-query/packages/app/package.json b/examples/solid/router-monorepo-solid-query/packages/app/package.json
index e8ffcfb0f6..445b751c04 100644
--- a/examples/solid/router-monorepo-solid-query/packages/app/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/app/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "vite-plugin-solid": "^3.0.0-next.5",
     "typescript": "^6.0.2",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "tailwindcss": "^4.2.2",
     "vite": "^8.0.14",
     "vite-plugin-dts": "^4.5.4",
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 1cbceccaed..f5e5df1b06 100644
--- a/examples/solid/router-monorepo-solid-query/packages/router/package.json
+++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@tanstack/history": "^1.162.0",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
     "@tanstack/router-plugin": "^1.168.13",
     "@router-solid-mono-solid-query/post-query": "workspace:*",
     "redaxios": "^0.5.1",
diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json
index 8cc6c35293..71acdb990b 100644
--- a/examples/solid/scroll-restoration/package.json
+++ b/examples/solid/scroll-restoration/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@tanstack/solid-virtual": "^3.13.0",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2"
diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json
index cd814e9f03..2ffa30ea40 100644
--- a/examples/solid/search-validator-adapters/package.json
+++ b/examples/solid/search-validator-adapters/package.json
@@ -15,8 +15,8 @@
     "@tanstack/arktype-adapter": "^1.167.0",
     "@tanstack/router-plugin": "^1.168.13",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@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 c85702e8c3..694ecd1b43 100644
--- a/examples/solid/start-basic-auth/package.json
+++ b/examples/solid/start-basic-auth/package.json
@@ -15,9 +15,9 @@
     "@prisma/adapter-libsql": "^7.0.0",
     "@prisma/client": "^7.0.0",
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json
index d9d34826a2..4aa6a5a8eb 100644
--- a/examples/solid/start-basic-authjs/package.json
+++ b/examples/solid/start-basic-authjs/package.json
@@ -12,9 +12,9 @@
   "dependencies": {
     "@auth/core": "^0.41.1",
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14",
     "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 2cfb22e13b..49113ada4f 100644
--- a/examples/solid/start-basic-cloudflare/package.json
+++ b/examples/solid/start-basic-cloudflare/package.json
@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14"
   },
   "devDependencies": {
diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json
index 1fc4a7033f..c0b38700b9 100644
--- a/examples/solid/start-basic-netlify/package.json
+++ b/examples/solid/start-basic-netlify/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14"
   },
   "devDependencies": {
diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json
index 552bd90315..8b0b5219f8 100644
--- a/examples/solid/start-basic-nitro/package.json
+++ b/examples/solid/start-basic-nitro/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14"
   },
   "devDependencies": {
diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json
index 8eb7d5718a..a41a6f1e4a 100644
--- a/examples/solid/start-basic-solid-query/package.json
+++ b/examples/solid/start-basic-solid-query/package.json
@@ -13,10 +13,10 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.20",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.21",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json
index 27984131b6..1b38d16df6 100644
--- a/examples/solid/start-basic-static/package.json
+++ b/examples/solid/start-basic-static/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "@tanstack/start-static-server-functions": "^1.167.11",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json
index 30d2b8af55..c9a5df3677 100644
--- a/examples/solid/start-basic/package.json
+++ b/examples/solid/start-basic/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^3.6.0"
diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json
index ea44da634f..d499eef129 100644
--- a/examples/solid/start-bun/package.json
+++ b/examples/solid/start-bun/package.json
@@ -17,10 +17,10 @@
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
     "@tanstack/solid-devtools": "^0.7.0",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.20",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.21",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14",
     "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 31a4aa107a..87de6501fe 100644
--- a/examples/solid/start-convex-better-auth/package.json
+++ b/examples/solid/start-convex-better-auth/package.json
@@ -14,9 +14,9 @@
     "@convex-dev/better-auth": "^0.9.7",
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "better-auth": "^1.3.27",
     "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 a594a0b300..426f1b3598 100644
--- a/examples/solid/start-counter/package.json
+++ b/examples/solid/start-counter/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^3.6.0",
diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json
index e60f55f6e3..121473479b 100644
--- a/examples/solid/start-i18n-paraglide/package.json
+++ b/examples/solid/start-i18n-paraglide/package.json
@@ -11,9 +11,9 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/solid-devtools": "^0.7.0",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14"
   },
   "devDependencies": {
diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json
index 792154c572..e102a3a351 100644
--- a/examples/solid/start-large/package.json
+++ b/examples/solid/start-large/package.json
@@ -14,9 +14,9 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "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 f9df4baf38..4e56786c50 100644
--- a/examples/solid/start-streaming-data-from-server-functions/package.json
+++ b/examples/solid/start-streaming-data-from-server-functions/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14",
     "zod": "^4.4.3"
   },
diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json
index 20bc6517e1..f323e77b0c 100644
--- a/examples/solid/start-supabase-basic/package.json
+++ b/examples/solid/start-supabase-basic/package.json
@@ -15,9 +15,9 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@supabase/ssr": "^0.5.2",
     "@supabase/supabase-js": "^2.48.1",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14"
   },
diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json
index 81a4036948..f934006ed3 100644
--- a/examples/solid/start-tailwind-v4/package.json
+++ b/examples/solid/start-tailwind-v4/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
-    "@tanstack/solid-start": "^2.0.0-beta.20",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
+    "@tanstack/solid-start": "^2.0.0-beta.21",
     "solid-js": "2.0.0-beta.14",
     "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 bd433fb2d6..7f7cab838a 100644
--- a/examples/solid/view-transitions/package.json
+++ b/examples/solid/view-transitions/package.json
@@ -12,8 +12,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json
index 613c921b67..2d9f53bfe5 100644
--- a/examples/solid/with-framer-motion/package.json
+++ b/examples/solid/with-framer-motion/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "solid-motionone": "^1.0.4",
diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json
index 9a4a6b6c33..a85d92292c 100644
--- a/examples/solid/with-trpc/package.json
+++ b/examples/solid/with-trpc/package.json
@@ -13,8 +13,8 @@
     "@solidjs/web": "2.0.0-beta.14",
     "@tailwindcss/vite": "^4.2.2",
     "@tanstack/router-plugin": "^1.168.13",
-    "@tanstack/solid-router": "^2.0.0-beta.19",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.15",
+    "@tanstack/solid-router": "^2.0.0-beta.20",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.16",
     "@trpc/client": "^11.4.3",
     "@trpc/server": "^11.4.3",
     "express": "^5.2.1",
diff --git a/packages/solid-router-devtools/CHANGELOG.md b/packages/solid-router-devtools/CHANGELOG.md
index daa66f3109..ad25b595eb 100644
--- a/packages/solid-router-devtools/CHANGELOG.md
+++ b/packages/solid-router-devtools/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/solid-router-devtools
 
+## 2.0.0-beta.16
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
+- Updated dependencies [[`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f)]:
+  - @tanstack/solid-router@2.0.0-beta.20
+
 ## 2.0.0-beta.15
 
 ### Patch Changes
diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json
index e728d01a99..7d0c579966 100644
--- a/packages/solid-router-devtools/package.json
+++ b/packages/solid-router-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router-devtools",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
diff --git a/packages/solid-router-ssr-query/CHANGELOG.md b/packages/solid-router-ssr-query/CHANGELOG.md
index 35f0d6f3ac..1da8ea8d9d 100644
--- a/packages/solid-router-ssr-query/CHANGELOG.md
+++ b/packages/solid-router-ssr-query/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/solid-router-ssr-query
 
+## 2.0.0-beta.21
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
 ## 2.0.0-beta.20
 
 ### Patch Changes
diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json
index 455484439f..aa61cab5ca 100644
--- a/packages/solid-router-ssr-query/package.json
+++ b/packages/solid-router-ssr-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router-ssr-query",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md
index ab56bbd965..a706f4e62a 100644
--- a/packages/solid-router/CHANGELOG.md
+++ b/packages/solid-router/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/solid-router
 
+## 2.0.0-beta.20
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
 ## 2.0.0-beta.19
 
 ### Patch Changes
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
index f29c2777ad..90386ca4de 100644
--- a/packages/solid-router/package.json
+++ b/packages/solid-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.20",
   "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 022a4111d3..bd9a1d1d2e 100644
--- a/packages/solid-start-client/CHANGELOG.md
+++ b/packages/solid-start-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/solid-start-client
 
+## 2.0.0-beta.20
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
+- Updated dependencies [[`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f)]:
+  - @tanstack/solid-router@2.0.0-beta.20
+
 ## 2.0.0-beta.19
 
 ### Patch Changes
diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json
index 0a74644957..2928b026d5 100644
--- a/packages/solid-start-client/package.json
+++ b/packages/solid-start-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-start-client",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.20",
   "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 f54b79afc9..0629ea3c2c 100644
--- a/packages/solid-start-server/CHANGELOG.md
+++ b/packages/solid-start-server/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/solid-start-server
 
+## 2.0.0-beta.20
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
+- Updated dependencies [[`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f)]:
+  - @tanstack/solid-router@2.0.0-beta.20
+
 ## 2.0.0-beta.19
 
 ### Patch Changes
diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json
index d418328431..5af6b1efab 100644
--- a/packages/solid-start-server/package.json
+++ b/packages/solid-start-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-start-server",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.20",
   "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 d1f87f3ab9..e22f94dde3 100644
--- a/packages/solid-start/CHANGELOG.md
+++ b/packages/solid-start/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @tanstack/solid-start
 
+## 2.0.0-beta.21
+
+### Patch Changes
+
+- [#7528](https://github.com/TanStack/router/pull/7528) [`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f) - sync main
+
+- Updated dependencies [[`440a0c9`](https://github.com/TanStack/router/commit/440a0c92708c977d146e694fe828707dc7e61c3f)]:
+  - @tanstack/solid-start-client@2.0.0-beta.20
+  - @tanstack/solid-start-server@2.0.0-beta.20
+  - @tanstack/solid-router@2.0.0-beta.20
+
 ## 2.0.0-beta.20
 
 ### Patch Changes
diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json
index d4a5baf9ad..09a7f52320 100644
--- a/packages/solid-start/package.json
+++ b/packages/solid-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-start",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -104,19 +104,7 @@
         "default": "./dist/esm/client-only.js"
       }
     },
-    "./package.json": "./package.json",
-    "./hydration": {
-      "import": {
-        "types": "./dist/esm/hydration.d.ts",
-        "default": "./dist/esm/hydration.js"
-      }
-    },
-    "./plugin/rsbuild": {
-      "import": {
-        "types": "./dist/esm/plugin/rsbuild.d.ts",
-        "default": "./dist/esm/plugin/rsbuild.js"
-      }
-    }
+    "./package.json": "./package.json"
   },
   "sideEffects": false,
   "files": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 66e7eeb102..77819ee62a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10256,7 +10256,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10296,7 +10296,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10339,7 +10339,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10382,7 +10382,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10419,7 +10419,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10453,7 +10453,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10493,7 +10493,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10539,7 +10539,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10582,7 +10582,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10622,7 +10622,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       compression:
         specifier: ^1.8.0
@@ -10665,7 +10665,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10723,7 +10723,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10766,7 +10766,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10846,7 +10846,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       solid-js:
         specifier: 2.0.0-beta.14
@@ -10880,7 +10880,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10920,7 +10920,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10969,7 +10969,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11018,7 +11018,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11064,7 +11064,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11104,7 +11104,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11141,7 +11141,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11175,7 +11175,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11206,7 +11206,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11240,7 +11240,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11280,7 +11280,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11317,7 +11317,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11381,7 +11381,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11418,7 +11418,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11461,7 +11461,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11498,7 +11498,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11541,7 +11541,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11590,7 +11590,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11648,7 +11648,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11703,7 +11703,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11749,7 +11749,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11795,7 +11795,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11838,7 +11838,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11887,7 +11887,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(@tanstack/solid-query@6.0.0-beta.4(solid-js@2.0.0-beta.14))(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11936,7 +11936,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11994,7 +11994,7 @@ importers:
         specifier: ^0.7.0
         version: 0.7.14(csstype@3.2.3)(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12061,7 +12061,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12122,7 +12122,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12168,7 +12168,7 @@ importers:
         specifier: ^0.7.0
         version: 0.7.14(csstype@3.2.3)(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12211,7 +12211,7 @@ importers:
         specifier: ^6.0.0-beta.4
         version: 6.0.0-beta.4(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12257,7 +12257,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12297,7 +12297,7 @@ importers:
         specifier: ^2.48.1
         version: 2.48.1
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12340,7 +12340,7 @@ importers:
         specifier: 2.0.0-beta.14
         version: 2.0.0-beta.14(solid-js@2.0.0-beta.14)
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12392,7 +12392,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12429,7 +12429,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.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12472,7 +12472,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.19
+        specifier: ^2.0.0-beta.20
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^