Skip to content

add handling to skip prefetch payloads if partial #89340

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

Closed
ztanner wants to merge 1 commit into from
Closed

add handling to skip prefetch payloads if partial #89340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion packages/next/src/client/components/router-reducer/ppr-navigations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,14 @@ function createCacheNodeForSegment(
doesSegmentNeedDynamicRequest = isCachedRscPartial
}

if (isCachedRscPartial) {
// Partial prefetch payloads may include unresolved thenables that never
// resolve during prefetch. We must not render them as initial UI, or a
// Suspense boundary can remain stuck in its fallback indefinitely. Only
// the dynamic response should fulfill missing data.
prefetchRsc = null
}

// If this is a page segment, we need to do the same for the head. This
// follows analogous logic to the segment data above.
// TODO: We don't need to store the head on the page segment's CacheNode; we
Expand All @@ -1082,10 +1090,10 @@ function createCacheNodeForSegment(
let prefetchHead: HeadData | null = null
let head: React.ReactNode | null = null
let doesHeadNeedDynamicRequest: boolean = isPage
let isCachedHeadPartial: boolean = true

if (isPage) {
let cachedHead: HeadData | null = null
let isCachedHeadPartial: boolean = true
if (metadataVaryPath !== null) {
const metadataEntry = readSegmentCacheEntry(now, metadataVaryPath)
if (metadataEntry !== null) {
Expand Down Expand Up @@ -1154,6 +1162,12 @@ function createCacheNodeForSegment(
}
}

if (isPage && isCachedHeadPartial) {
// Same rationale as prefetchRsc: avoid rendering partial head data that may
// contain unresolved thenables.
prefetchHead = null
}

// Now that we're creating a new segment, write its data to the BFCache. A
// subsequent back/forward navigation will reuse this same data, until or
// unless it's cleared by a refresh/revalidation.
Expand Down
Loading