diff --git a/.changeset/pre.json b/.changeset/pre.json
index 4e0015109c..e70a9f64e5 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -48,6 +48,7 @@
     "clever-apples-jog",
     "clever-bears-stand",
     "clever-vans-yawn",
+    "cruel-tips-shine",
     "cuddly-drinks-count",
     "curly-times-sip",
     "cyan-otters-notice",
diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json
index f6c34aba91..09205d6d3b 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 e7987e0fe6..d27047d697 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 a50138d545..d2e545abfc 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 f9026c533f..3c0f29f474 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 1bbd0fad3c..2f92aa3e24 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 b9207d3b97..123696adc8 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 5cc92ffc9f..a7d476b9f7 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 01c5e7d66b..67d43db46b 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 5af79fd5d5..78dfa0d7b8 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
     "compression": "^1.8.0",
     "express": "^4.21.2",
     "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.13",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@types/express": "^4.17.23",
     "typescript": "^6.0.2",
     "vite": "^8.0.0",
diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json
index 8c9011f5a2..8c0b4bc944 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "compression": "^1.8.0",
     "express": "^4.21.2",
     "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 19f9b92516..38b4fafc85 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@tanstack/virtual-file-routes": "^1.161.7",
     "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 2b21efa6d6..9502164671 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@tanstack/virtual-file-routes": "^1.161.7",
     "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 bf61d78a09..b723ac5ed3 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 2cefaa27ce..0422dda501 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 7c1e10bdeb..571f58bcba 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
     "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 2e9853a64b..7db1276799 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 463ae8c21e..2f6598af5e 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.167.12",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 53b7377e57..b190337f62 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 e0d1af21c3..a10ae35809 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 639dcf067c..71313e9020 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.167.12",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 f2c164e92b..2099b87f60 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 6d489cb33e..6e97ecdf47 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 80c24421db..d13549ede6 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 4a5c738def..a35c99b701 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 3ff4dce026..393eb799a7 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 08f2227702..f16285e305 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 ad6edd67b8..439147743e 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 9be628c921..850757f4ba 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 416af5a618..bfd8ca7dd5 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.13",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
     "vite": "^8.0.0",
     "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 2340284af9..90b59db6a5 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.161.6",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
     "@tanstack/router-plugin": "^1.167.12",
     "redaxios": "^0.5.1",
     "zod": "^3.24.2",
diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json
index 474dc288e4..b35df5e2af 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 c7ca758810..ef4ca4f966 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.13",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "vite": "^8.0.0",
     "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 73eecaf3be..240d6681d7 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.161.6",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
     "@tanstack/router-plugin": "^1.167.12",
     "redaxios": "^0.5.1",
     "zod": "^3.24.2",
diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json
index a5517404f9..e0f29a45d2 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.167.12",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 089604b1be..93323461b9 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.13",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "tailwindcss": "^4.2.2",
     "vite": "^8.0.0",
     "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 d66edd2372..c685bd0700 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.161.6",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
     "@tanstack/router-plugin": "^1.167.12",
     "@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 f78537161a..862e9851db 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@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 badf4b0111..363b65e23c 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.166.9",
     "@tanstack/router-plugin": "^1.167.12",
     "@tanstack/solid-query": "^6.0.0-beta.4",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@tanstack/valibot-adapter": "^1.166.9",
     "@tanstack/zod-adapter": "^1.166.9",
     "arktype": "^2.1.7",
diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json
index af8371ab70..c543cae9e4 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.6.0"
diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json
index 96b7b650de..4cb77f14bb 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "solid-js": "2.0.0-beta.14",
     "start-authjs": "^1.0.0",
     "tailwind-merge": "^2.6.0"
diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json
index 2abaef610c..e9d1163175 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 61b5c7b88f..ab85fe787e 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 19fc4d2efe..cbe085d511 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 4d7319528c..58a7318516 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.18",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.19",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.6.0"
diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json
index bab7d23b12..d8d4d36176 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "@tanstack/start-static-server-functions": "^1.166.25",
     "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 6fb4cd0f87..93076e7460 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.6.0"
diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json
index fad13a59c3..fb76ee4415 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.167.12",
     "@tanstack/solid-devtools": "^0.7.0",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.18",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-router-ssr-query": "^2.0.0-beta.19",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 7a6c841488..8171e597b0 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 776fe845c9..0f05c91055 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.6.0",
diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json
index fe661f3aa3..f70a010cb6 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 99cabf4c87..92293e7782 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "redaxios": "^0.5.1",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.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 f2fbac65d9..8dc99cdff9 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "solid-js": "2.0.0-beta.14",
     "zod": "^3.24.2"
   },
diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json
index b75e576088..f918e953b9 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "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 c1004c2c0a..5206b03911 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
-    "@tanstack/solid-start": "^2.0.0-beta.18",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
+    "@tanstack/solid-start": "^2.0.0-beta.19",
     "solid-js": "2.0.0-beta.14",
     "tailwind-merge": "^2.6.0",
     "zod": "^3.24.2"
diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json
index 30b967cb5a..d9f43fdd9f 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 1a9d2a0a65..d8086f604f 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.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "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 295422036f..c95678a4b9 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.167.12",
-    "@tanstack/solid-router": "^2.0.0-beta.17",
-    "@tanstack/solid-router-devtools": "^2.0.0-beta.13",
+    "@tanstack/solid-router": "^2.0.0-beta.18",
+    "@tanstack/solid-router-devtools": "^2.0.0-beta.14",
     "@trpc/client": "^11.4.3",
     "@trpc/server": "^11.4.3",
     "express": "^4.21.2",
diff --git a/packages/solid-router-devtools/CHANGELOG.md b/packages/solid-router-devtools/CHANGELOG.md
index 6cbbda332c..cc5d874d4b 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.14
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
+- Updated dependencies [[`e69ffb3`](https://github.com/TanStack/router/commit/e69ffb3734003a7663c786b2ce81931900c05eca)]:
+  - @tanstack/solid-router@2.0.0-beta.18
+
 ## 2.0.0-beta.13
 
 ### Patch Changes
diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json
index 7cc4d6937c..5255b57f73 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.13",
+  "version": "2.0.0-beta.14",
   "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 cb5dbe583c..77e3a9a091 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.19
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
 ## 2.0.0-beta.18
 
 ### Patch Changes
diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json
index e969ba0094..41fa22c5e1 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.18",
+  "version": "2.0.0-beta.19",
   "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 53d1592d27..a63699c1f3 100644
--- a/packages/solid-router/CHANGELOG.md
+++ b/packages/solid-router/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/solid-router
 
+## 2.0.0-beta.18
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
 ## 2.0.0-beta.17
 
 ### Patch Changes
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
index 5e00535f8a..bf7efd10ad 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.17",
+  "version": "2.0.0-beta.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 feb130661c..603550e9e6 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.18
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
+- Updated dependencies [[`e69ffb3`](https://github.com/TanStack/router/commit/e69ffb3734003a7663c786b2ce81931900c05eca)]:
+  - @tanstack/solid-router@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes
diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json
index 04c06e755d..f805b7763a 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.17",
+  "version": "2.0.0-beta.18",
   "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 ab4843b630..9485e95bcf 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.18
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
+- Updated dependencies [[`e69ffb3`](https://github.com/TanStack/router/commit/e69ffb3734003a7663c786b2ce81931900c05eca)]:
+  - @tanstack/solid-router@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes
diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json
index 908bfa7b26..1f41bd0835 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.17",
+  "version": "2.0.0-beta.18",
   "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 becaeba52c..52fb620cde 100644
--- a/packages/solid-start/CHANGELOG.md
+++ b/packages/solid-start/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @tanstack/solid-start
 
+## 2.0.0-beta.19
+
+### Patch Changes
+
+- Upgrade to solidjs beta 14 ([#7415](https://github.com/TanStack/router/pull/7415))
+
+- Updated dependencies [[`e69ffb3`](https://github.com/TanStack/router/commit/e69ffb3734003a7663c786b2ce81931900c05eca)]:
+  - @tanstack/solid-start-client@2.0.0-beta.18
+  - @tanstack/solid-start-server@2.0.0-beta.18
+  - @tanstack/solid-router@2.0.0-beta.18
+
 ## 2.0.0-beta.18
 
 ### Patch Changes
diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json
index e2879ed459..4bfbcbedba 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.18",
+  "version": "2.0.0-beta.19",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5b810248d6..31af67137b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9794,7 +9794,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -9834,7 +9834,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -9877,7 +9877,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -9920,7 +9920,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -9957,7 +9957,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -9991,7 +9991,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10031,7 +10031,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10077,7 +10077,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10120,7 +10120,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10160,7 +10160,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       compression:
         specifier: ^1.8.0
@@ -10203,7 +10203,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10261,7 +10261,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10304,7 +10304,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10344,7 +10344,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10384,7 +10384,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       solid-js:
         specifier: 2.0.0-beta.14
@@ -10418,7 +10418,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10458,7 +10458,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10507,7 +10507,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10556,7 +10556,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10602,7 +10602,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10642,7 +10642,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10679,7 +10679,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10713,7 +10713,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10744,7 +10744,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10778,7 +10778,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10818,7 +10818,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10855,7 +10855,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10919,7 +10919,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10956,7 +10956,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -10999,7 +10999,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11036,7 +11036,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11079,7 +11079,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11128,7 +11128,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11186,7 +11186,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11241,7 +11241,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11287,7 +11287,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11333,7 +11333,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11376,7 +11376,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11425,7 +11425,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11474,7 +11474,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11532,7 +11532,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11599,7 +11599,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11660,7 +11660,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11706,7 +11706,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11749,7 +11749,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.17
+        specifier: ^2.0.0-beta.18
         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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11835,7 +11835,7 @@ importers:
         specifier: ^2.48.1
         version: 2.48.1
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11878,7 +11878,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.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11930,7 +11930,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -11967,7 +11967,7 @@ importers:
         specifier: ^4.2.2
         version: 4.2.2(vite@8.0.0(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.6.1)(sass-embedded@1.97.2)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.8.1))
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^
@@ -12010,7 +12010,7 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/router-plugin
       '@tanstack/solid-router':
-        specifier: ^2.0.0-beta.17
+        specifier: ^2.0.0-beta.18
         version: link:../../../packages/solid-router
       '@tanstack/solid-router-devtools':
         specifier: workspace:^