fix(solid-query): Allow disabled queries to be SSR'd (#7300)

TanStack · Apr 18, 2024 · 6e5a4a8 · 6e5a4a8
1 parent 405135d
commit 6e5a4a8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts
@@ -74,6 +74,7 @@ const hydratableObserverResult = <
   query: Query<TQueryFnData, TError, TData, TQueryKey>,
   result: QueryObserverResult<TDataHydratable, TError>,
 ) => {
+  if (!isServer) return result
   const obj: any = {
     ...unwrap(result),
     // During SSR, functions cannot be serialized, so we need to remove them
@@ -255,7 +256,9 @@ export function createBaseQuery<
         }
         if (!observerResult.isLoading) {
           resolver = null
-          return resolve(observerResult)
+          return resolve(
+            hydratableObserverResult(obs.getCurrentQuery(), observerResult),
+          )
         }
 
         setStateWithReconciliation(observerResult)