Skip to content

fix(hydration): set dataUpdatedAt when pending query resolves before hydration #10610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DORI2001 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(hydration): set dataUpdatedAt when pending query resolves before hydration #10610

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a4c8db
fix(hydration): set dataUpdatedAt when pending query resolves before …
DORI2001 Apr 29, 2026
177a0a5
test(hydration): add cases for dataUpdatedAt when streamed query reso…
DORI2001 May 5, 2026
37124e1
Merge branch 'main' into fix/hydration-dateupdatedat-streamed-query
DORI2001 May 5, 2026
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 packages/query-core/src/hydration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ export function hydrate(
...(state.status === 'pending' &&
data !== undefined && {
status: 'success' as const,
dataUpdatedAt: dehydratedAt ?? Date.now(),
// Preserve existing fetchStatus if the existing query is actively fetching.
...(!existingQueryIsFetching && {
fetchStatus: 'idle' as const,
Expand Down Expand Up @@ -284,6 +285,10 @@ export function hydrate(
state.status === 'pending' && data !== undefined
? 'success'
: state.status,
...(state.status === 'pending' &&
data !== undefined && {
dataUpdatedAt: dehydratedAt ?? Date.now(),
}),
},
)
}
Expand Down
Loading