Merge branch 'main' into cursor/add-jsdoc-annotations-to-public-api-38a6

tannerlinsley · web-flow · commit d0b42737157a · 2025-10-21T14:34:41.000-06:00
diff --git a/e2e/solid-router/basic-file-based-code-splitting/package.json b/e2e/solid-router/basic-file-based-code-splitting/package.json
@@ -26,6 +26,6 @@
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/e2e/solid-router/basic-file-based/package.json b/e2e/solid-router/basic-file-based/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "combinate": "^1.1.11",
     "vite": "^7.1.7"
   }
diff --git a/e2e/solid-router/basic-scroll-restoration/package.json b/e2e/solid-router/basic-scroll-restoration/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/basic-solid-query-file-based/package.json b/e2e/solid-router/basic-solid-query-file-based/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/basic-solid-query/package.json b/e2e/solid-router/basic-solid-query/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/basic-virtual-file-based/package.json b/e2e/solid-router/basic-virtual-file-based/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/basic/package.json b/e2e/solid-router/basic/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite": "^7.1.7"
   }
 }
diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json
@@ -26,7 +26,7 @@
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
     "@types/node": "^22.10.2",
-    "vite-plugin-solid": "^2.11.9",
+    "vite-plugin-solid": "^2.11.10",
     "autoprefixer": "^10.4.20",
     "postcss": "^8.5.1",
     "tailwindcss": "^3.4.17",
diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json
@@ -31,7 +31,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json
@@ -22,7 +22,7 @@
     "@types/node": "^22.10.2",
     "srvx": "^0.8.6",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
@@ -36,7 +36,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json
@@ -30,7 +30,7 @@
     "tsx": "^4.20.3",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/query-integration/package.json b/e2e/solid-start/query-integration/package.json
@@ -30,7 +30,7 @@
     "postcss": "^8.5.1",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json
@@ -31,7 +31,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json
@@ -23,7 +23,7 @@
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json
@@ -32,7 +32,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json
@@ -32,7 +32,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/e2e/solid-start/spa-mode/package.json b/e2e/solid-start/spa-mode/package.json
@@ -24,6 +24,6 @@
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
     "vite-tsconfig-paths": "^5.1.4",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json
@@ -25,7 +25,7 @@
     "@playwright/test": "^1.50.1",
     "@tanstack/router-e2e-utils": "workspace:^",
     "@types/node": "^22.10.2",
-    "vite-plugin-solid": "^2.11.9",
+    "vite-plugin-solid": "^2.11.10",
     "autoprefixer": "^10.4.20",
     "combinate": "^1.1.11",
     "postcss": "^8.5.1",
diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json
@@ -29,7 +29,7 @@
     "srvx": "^0.8.6",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json
@@ -18,7 +18,7 @@
     "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "typescript": "^5.7.2",
     "vite": "^7.1.7"
   }
diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json
@@ -22,6 +22,6 @@
     "@tanstack/router-plugin": "^1.133.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json
@@ -22,6 +22,6 @@
     "@types/react-dom": "^19.0.3",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json
@@ -25,6 +25,6 @@
     "@tanstack/router-plugin": "^1.133.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json
@@ -23,6 +23,6 @@
     "@tanstack/router-plugin": "^1.133.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json
@@ -29,6 +29,6 @@
     "@types/express": "^4.17.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
@@ -22,6 +22,6 @@
     "@types/react-dom": "^19.0.3",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json
@@ -23,6 +23,6 @@
     "@tanstack/router-plugin": "^1.133.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json
@@ -23,7 +23,7 @@
     "zod": "^3.24.2"
   },
   "devDependencies": {
-    "vite-plugin-solid": "^2.11.6",
+    "vite-plugin-solid": "^2.11.10",
     "typescript": "^5.7.2",
     "vite": "^6.1.0"
   }
diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json
@@ -22,7 +22,7 @@
     "zod": "^3.24.2"
   },
   "devDependencies": {
-    "vite-plugin-solid": "^2.11.6",
+    "vite-plugin-solid": "^2.11.10",
     "typescript": "^5.7.2",
     "vite": "^6.1.0"
   }
diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json
@@ -22,6 +22,6 @@
     "@tanstack/router-plugin": "^1.133.21",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.10.2",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "combinate": "^1.1.11",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json
@@ -20,7 +20,7 @@
     "tailwind-merge": "^2.6.0"
   },
   "devDependencies": {
-    "vite-plugin-solid": "^2.11.9",
+    "vite-plugin-solid": "^2.11.10",
     "@types/node": "^22.5.4",
     "postcss": "^8.5.1",
     "autoprefixer": "^10.4.20",
diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.13.7",
     "@types/node": "^22.5.4",
-    "vite-plugin-solid": "^2.11.9",
+    "vite-plugin-solid": "^2.11.10",
     "autoprefixer": "^10.4.20",
     "postcss": "^8.5.1",
     "tailwindcss": "^3.4.17",
diff --git a/examples/solid/start-basic-cloudflare/vite.config.ts b/examples/solid/start-basic-cloudflare/vite.config.ts
@@ -3,20 +3,6 @@ import tsConfigPaths from 'vite-tsconfig-paths'
 import { cloudflare } from '@cloudflare/vite-plugin'
 import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
 import viteSolid from 'vite-plugin-solid'
-import type { Plugin } from 'vite'
-
-// Plugin to clear resolve.external for Cloudflare compatibility
-function clearSsrExternal(): Plugin {
-  return {
-    name: 'clear-ssr-external',
-    enforce: 'pre',
-    configResolved(config) {
-      // Clear external packages from SSR environment for Cloudflare compatibility
-      const ssrEnv = config.environments.ssr
-      ssrEnv.resolve.external = []
-    },
-  }
-}
 
 export default defineConfig({
   server: {
@@ -26,7 +12,6 @@ export default defineConfig({
     tsConfigPaths({
       projects: ['./tsconfig.json'],
     }),
-    clearSsrExternal(),
     cloudflare({ viteEnvironment: { name: 'ssr' } }),
     tanstackStart(),
     viteSolid({ ssr: true }),
diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.5.4",
-    "vite-plugin-solid": "^2.11.9",
+    "vite-plugin-solid": "^2.11.10",
     "postcss": "^8.5.1",
     "autoprefixer": "^10.4.20",
     "tailwindcss": "^3.4.17",
diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json
@@ -25,6 +25,6 @@
     "typescript": "^5.6.2",
     "vite": "^7.1.7",
     "vite-tsconfig-paths": "^5.1.3",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   }
 }
diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json
@@ -23,7 +23,7 @@
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
     "vite": "^7.1.7",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }
diff --git a/packages/react-router/src/useNavigate.tsx b/packages/react-router/src/useNavigate.tsx
@@ -7,6 +7,7 @@ import type {
   RegisteredRouter,
   UseNavigateResult,
 } from '@tanstack/router-core'
+
 /**
  * Imperative navigation hook.
  *
diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "solid-js": "^1.9.5",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "^2.11.10"
   },
   "peerDependencies": {
     "@tanstack/router-core": "workspace:^",
diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json
@@ -128,7 +128,7 @@
     "@rsbuild/core": ">=1.0.2",
     "@tanstack/react-router": "workspace:^",
     "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0",
-    "vite-plugin-solid": "^2.11.8",
+    "vite-plugin-solid": "^2.11.10",
     "webpack": ">=5.92.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json
diff --git a/packages/solid-router-ssr-query/package.json b/packages/solid-router-ssr-query/package.json
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json
diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@`
`26`	`26`	`"@playwright/test": "^1.50.1",`
`27`	`27`	`"@tanstack/router-e2e-utils": "workspace:^",`
`28`	`28`	`"vite": "^7.1.7",`
`29`		`- "vite-plugin-solid": "^2.11.8"`
	`29`	`+ "vite-plugin-solid": "^2.11.10"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"devDependencies": {`
`26`	`26`	`"@playwright/test": "^1.50.1",`
`27`	`27`	`"@tanstack/router-e2e-utils": "workspace:^",`
`28`		`- "vite-plugin-solid": "^2.11.8",`
	`28`	`+ "vite-plugin-solid": "^2.11.10",`
`29`	`29`	`"combinate": "^1.1.11",`
`30`	`30`	`"vite": "^7.1.7"`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"devDependencies": {`
`24`	`24`	`"@playwright/test": "^1.50.1",`
`25`	`25`	`"@tanstack/router-e2e-utils": "workspace:^",`
`26`		`- "vite-plugin-solid": "^2.11.8",`
	`26`	`+ "vite-plugin-solid": "^2.11.10",`
`27`	`27`	`"vite": "^7.1.7"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"devDependencies": {`
`27`	`27`	`"@playwright/test": "^1.50.1",`
`28`	`28`	`"@tanstack/router-e2e-utils": "workspace:^",`
`29`		`- "vite-plugin-solid": "^2.11.8",`
	`29`	`+ "vite-plugin-solid": "^2.11.10",`
`30`	`30`	`"vite": "^7.1.7"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"devDependencies": {`
`25`	`25`	`"@playwright/test": "^1.50.1",`
`26`	`26`	`"@tanstack/router-e2e-utils": "workspace:^",`
`27`		`- "vite-plugin-solid": "^2.11.8",`
	`27`	`+ "vite-plugin-solid": "^2.11.10",`
`28`	`28`	`"vite": "^7.1.7"`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"devDependencies": {`
`23`	`23`	`"@playwright/test": "^1.50.1",`
`24`	`24`	`"@tanstack/router-e2e-utils": "workspace:^",`
`25`		`- "vite-plugin-solid": "^2.11.8",`
	`25`	`+ "vite-plugin-solid": "^2.11.10",`
`26`	`26`	`"vite": "^7.1.7"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"devDependencies": {`
`29`	`29`	`"@playwright/test": "^1.50.1",`
`30`	`30`	`"@tanstack/router-e2e-utils": "workspace:^",`
`31`		`- "vite-plugin-solid": "^2.11.8",`
	`31`	`+ "vite-plugin-solid": "^2.11.10",`
`32`	`32`	`"vite": "^7.1.7"`
`33`	`33`	`}`
`34`	`34`	`}`