Merge branch 'main' into 5534

nlynzaad · web-flow · commit ba624dd29c00 · 2025-10-28T23:31:36.000+02:00
diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json
@@ -11,7 +11,7 @@
     "test:e2e": "playwright test --project=chromium"
   },
   "dependencies": {
-    "@tanstack/react-query": "5.90.0",
+    "@tanstack/react-query": "^5.90.0",
     "@tanstack/react-router": "workspace:^",
     "@tanstack/react-router-devtools": "workspace:^",
     "@tanstack/react-router-ssr-query": "workspace:^",
diff --git a/e2e/solid-start/basic-solid-query/src/router.tsx b/e2e/solid-start/basic-solid-query/src/router.tsx
@@ -9,8 +9,7 @@ export function getRouter() {
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
-        // Enable only on client to avoid hydration mismatches
-        experimental_prefetchInRender: typeof window !== 'undefined',
+        experimental_prefetchInRender: true,
       },
     },
   })
diff --git a/e2e/solid-start/query-integration/src/router.tsx b/e2e/solid-start/query-integration/src/router.tsx
@@ -4,7 +4,13 @@ import { setupRouterSsrQueryIntegration } from '@tanstack/solid-router-ssr-query
 import { routeTree } from './routeTree.gen'
 
 export function getRouter() {
-  const queryClient = new QueryClient()
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        experimental_prefetchInRender: true,
+      },
+    },
+  })
   const router = createRouter({
     routeTree,
     context: { queryClient },
diff --git a/e2e/solid-start/query-integration/src/routes/useQuery.tsx b/e2e/solid-start/query-integration/src/routes/useQuery.tsx
@@ -7,7 +7,7 @@ const qOptions = makeQueryOptions('useQuery')
 export const Route = createFileRoute('/useQuery')({
   loader: ({ context }) => context.queryClient.ensureQueryData(qOptions),
   component: RouteComponent,
-  ssr: 'data-only',
+  ssr: true,
 })
 
 function RouteComponent() {
diff --git a/e2e/solid-start/server-functions/src/router.tsx b/e2e/solid-start/server-functions/src/router.tsx
@@ -6,7 +6,13 @@ import { DefaultCatchBoundary } from './components/DefaultCatchBoundary'
 import { NotFound } from './components/NotFound'
 
 export function getRouter() {
-  const queryClient = new QueryClient()
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        experimental_prefetchInRender: true,
+      },
+    },
+  })
   const router = createRouter({
     routeTree,
     defaultPreload: 'intent',
diff --git a/e2e/solid-start/server-functions/src/routes/primitives/index.tsx b/e2e/solid-start/server-functions/src/routes/primitives/index.tsx
@@ -5,7 +5,7 @@ import { For, Show } from 'solid-js'
 import { z } from 'zod'
 export const Route = createFileRoute('/primitives/')({
   component: RouteComponent,
-  ssr: 'data-only',
+  ssr: true,
 })
 
 function stringify(data: any) {
diff --git a/examples/solid/start-basic-solid-query/src/router.tsx b/examples/solid/start-basic-solid-query/src/router.tsx
@@ -6,7 +6,13 @@ import { DefaultCatchBoundary } from './components/DefaultCatchBoundary'
 import { NotFound } from './components/NotFound'
 
 export function getRouter() {
-  const queryClient = new QueryClient()
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        experimental_prefetchInRender: true,
+      },
+    },
+  })
 
   const router = createRouter({
     routeTree,
