Skip to content

fix(core): do not reject promise right away - only when promise gets used #9576

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

Merged
merged 4 commits into from
Aug 19, 2025
+11 −5
Merged

fix(core): do not reject promise right away - only when promise gets used #9576

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d613c2a
fix(core): do not reject promise right away - only when `promise` get…
TkDodo Aug 18, 2025
b507746
Apply suggestion from @TkDodo
TkDodo Aug 19, 2025
ccfe95b
Merge branch 'main' into feature/8209-experimental_prefetchInRender-p…
TkDodo Aug 19, 2025
4a51a54
fix: status check
TkDodo Aug 19, 2025
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
13 changes: 8 additions & 5 deletions packages/query-core/src/queryObserver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ export class QueryObserver<
this.#client = client
this.#selectError = null
this.#currentThenable = pendingThenable()
if (!this.options.experimental_prefetchInRender) {
this.#currentThenable.reject(
new Error('experimental_prefetchInRender feature flag is not enabled'),
)
}

this.bindMethods()
this.setOptions(options)
Expand Down Expand Up @@ -272,6 +267,14 @@ export class QueryObserver<
get: (target, key) => {
this.trackProp(key as keyof QueryObserverResult)
onPropTracked?.(key as keyof QueryObserverResult)
if (key === 'promise' && !this.options.experimental_prefetchInRender) {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
;(this.#currentThenable as PendingThenable<TData>).reject?.(
new Error(
'experimental_prefetchInRender feature flag is not enabled',
),
)
}
return Reflect.get(target, key)
},
})
Expand Down
Loading