Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/settled-ssr-state.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tanstack/solid-query': patch
---

Expose settled query state when rendering deferred queries during SSR.
10 changes: 10 additions & 0 deletions packages/solid-query/src/useBaseQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,16 @@ export function useBaseQuery<
target: QueryObserverResult<TData, TError>,
prop: keyof QueryObserverResult<TData, TError>,
): any {
// The server subscriber resolves the resource without updating `state`.
// Read the settled resource so deferred SSR renders do not stay frozen
// on the initial optimistic result.
if (isServer) {
const resolved = queryResource()
if (resolved && prop in resolved) {
return Reflect.get(resolved, prop)
}
}

if (prop === 'data') {
if (state.data !== undefined) {
return queryResource.latest?.data
Expand Down