From bedefb6ac955165cecba475690fa88abafccbab7 Mon Sep 17 00:00:00 2001
From: Birk Skyum <birk.skyum@pm.me>
Date: Tue, 28 Oct 2025 02:53:17 +0100
Subject: [PATCH 1/2] fix(solid-query): enable experimental_prefetchInRender by
 default for solid on server

---
 packages/solid-query/src/useBaseQuery.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/solid-query/src/useBaseQuery.ts b/packages/solid-query/src/useBaseQuery.ts
index d312e95f38..f2dbf3a74f 100644
--- a/packages/solid-query/src/useBaseQuery.ts
+++ b/packages/solid-query/src/useBaseQuery.ts
@@ -132,6 +132,9 @@ export function useBaseQuery<
     if (isServer) {
       defaultOptions.retry = false
       defaultOptions.throwOnError = true
+      // Enable prefetch during render for SSR - required for createResource to work
+      // Without this, queries wait for effects which never run on the server
+      defaultOptions.experimental_prefetchInRender = true
     }
     return defaultOptions
   })

From b84bbeb67e46f42f74b8b5013e36cd9cae14a0d9 Mon Sep 17 00:00:00 2001
From: Dominik Dorfmeister <office@dorfmeister.cc>
Date: Sat, 1 Nov 2025 15:31:58 +0100
Subject: [PATCH 2/2] Update solid-query to enable experimental prefetch

Enable experimental_prefetchInRender by default for @tanstack/solid-query.
---
 .changeset/thirty-poems-yell.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/thirty-poems-yell.md

diff --git a/.changeset/thirty-poems-yell.md b/.changeset/thirty-poems-yell.md
new file mode 100644
index 0000000000..bf275e4c09
--- /dev/null
+++ b/.changeset/thirty-poems-yell.md
@@ -0,0 +1,5 @@
+---
+"@tanstack/solid-query": patch
+---
+
+fix(solid-query): enable experimental_prefetchInRender by default for…