Commit b423e776 authored by Jimmy Lai's avatar Jimmy Lai

fix: ensure split flight returns root render and skip redundant getExpiration

- Remove NEXT_ROUTER_STATE_TREE_HEADER from internal request to ensure
  root render, allowing client to use navigateToSeededRoute directly
- Skip getExpiration when previouslyRevalidatedTags is set since
  isRecentlyRevalidatedTag already handles tag checking
- Filter tags to only forward updateTag() calls (profile === undefined)
- Check for ActionDidRevalidateDynamicOnly for refresh() detection

🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: 's avatarClaude Opus 4.5 <noreply@anthropic.com>
parent 04733878
...@@ -45,6 +45,7 @@ import { ...@@ -45,6 +45,7 @@ import {
NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER, NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER,
NEXT_SPLIT_FLIGHT_HEADER, NEXT_SPLIT_FLIGHT_HEADER,
FLIGHT_STREAM_BOUNDARY, FLIGHT_STREAM_BOUNDARY,
NEXT_CACHE_IMPLICIT_TAG_ID,
} from '../../lib/constants' } from '../../lib/constants'
import { concatenateFlightStreams } from '../stream-utils/node-web-streams-helper' import { concatenateFlightStreams } from '../stream-utils/node-web-streams-helper'
import { getClientReferenceManifest } from './manifests-singleton' import { getClientReferenceManifest } from './manifests-singleton'
...@@ -71,6 +72,7 @@ import { getRequestMeta } from '../request-meta' ...@@ -71,6 +72,7 @@ import { getRequestMeta } from '../request-meta'
import { setCacheBustingSearchParam } from '../../client/components/router-reducer/set-cache-busting-search-param' import { setCacheBustingSearchParam } from '../../client/components/router-reducer/set-cache-busting-search-param'
import { import {
ActionDidNotRevalidate, ActionDidNotRevalidate,
ActionDidRevalidateDynamicOnly,
ActionDidRevalidateStaticAndDynamic, ActionDidRevalidateStaticAndDynamic,
} from '../../shared/lib/action-revalidation-kind' } from '../../shared/lib/action-revalidation-kind'
...@@ -487,10 +489,18 @@ async function createInternalRequestRenderResult( ...@@ -487,10 +489,18 @@ async function createInternalRequestRenderResult(
const fetchUrl = new URL(`${origin}${basePath}${pagePath}`) const fetchUrl = new URL(`${origin}${basePath}${pagePath}`)
if (workStore.pendingRevalidatedTags?.length) { // Forward tags for explicit updateTag() calls so the receiving server
// knows which tags were invalidated
const tagsToForward = workStore.pendingRevalidatedTags?.filter(
(item) =>
item.profile === undefined &&
!item.tag.startsWith(NEXT_CACHE_IMPLICIT_TAG_ID)
)
if (tagsToForward?.length) {
forwardedHeaders.set( forwardedHeaders.set(
NEXT_CACHE_REVALIDATED_TAGS_HEADER, NEXT_CACHE_REVALIDATED_TAGS_HEADER,
workStore.pendingRevalidatedTags.map((item) => item.tag).join(',') tagsToForward.map((item) => item.tag).join(',')
) )
forwardedHeaders.set( forwardedHeaders.set(
NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER, NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER,
...@@ -499,11 +509,14 @@ async function createInternalRequestRenderResult( ...@@ -499,11 +509,14 @@ async function createInternalRequestRenderResult(
) )
} }
// Keep the router state tree header for partial rendering - Next.js's
// group revalidation will handle writing the full HTML cache
// Remove action header since this is now a page render request // Remove action header since this is now a page render request
forwardedHeaders.delete(ACTION_HEADER) forwardedHeaders.delete(ACTION_HEADER)
// Remove router state tree header to ensure we get a root render.
// This is needed so the client can use navigateToSeededRoute instead of
// making another server request.
forwardedHeaders.delete(NEXT_ROUTER_STATE_TREE_HEADER)
try { try {
setCacheBustingSearchParam(fetchUrl, { setCacheBustingSearchParam(fetchUrl, {
[NEXT_ROUTER_PREFETCH_HEADER]: forwardedHeaders.get( [NEXT_ROUTER_PREFETCH_HEADER]: forwardedHeaders.get(
...@@ -1189,16 +1202,18 @@ export async function handleAction({ ...@@ -1189,16 +1202,18 @@ export async function handleAction({
addRevalidationHeader(res, { workStore, requestStore }) addRevalidationHeader(res, { workStore, requestStore })
}) })
// For updateTag() or refresh() calls, use internal request to ensure // For updateTag() or refresh() calls, use split flight to ensure the HTML cache
// the HTML cache gets populated with the same data the action caller sees. // gets populated with the same data the action caller sees (read-your-own-writes).
// This provides read-your-own-writes consistency between User A (action caller) //
// and User B (subsequent cold visitor). // Note: revalidatePath() is NOT included because the path being revalidated
// might differ from the current route (e.g., revalidatePath('/') from '/modal').
const hasUpdateTagCalls = workStore.pendingRevalidatedTags?.some( const hasUpdateTagCalls = workStore.pendingRevalidatedTags?.some(
(item) => item.profile === undefined (item) =>
item.profile === undefined &&
!item.tag.startsWith(NEXT_CACHE_IMPLICIT_TAG_ID)
) )
const hasRefreshCall = const hasRefreshCall =
workStore.pathWasRevalidated !== undefined && workStore.pathWasRevalidated === ActionDidRevalidateDynamicOnly
workStore.pathWasRevalidated !== ActionDidNotRevalidate
const shouldUseSplitFlightResponse = hasUpdateTagCalls || hasRefreshCall const shouldUseSplitFlightResponse = hasUpdateTagCalls || hasRefreshCall
......
...@@ -1433,7 +1433,14 @@ export async function cache( ...@@ -1433,7 +1433,14 @@ export async function cache(
const implicitTags = workUnitStore?.implicitTags?.tags ?? [] const implicitTags = workUnitStore?.implicitTags?.tags ?? []
let implicitTagsExpiration = 0 let implicitTagsExpiration = 0
if (workUnitStore?.implicitTags) { // Only call getExpiration if we don't already know about recently
// revalidated tags. When tags were just revalidated (e.g., via
// updateTag in a server action), isRecentlyRevalidatedTag will catch
// those in shouldDiscardCacheEntry, so we don't need to call
// getExpiration to check historical expiration times.
const skipGetExpiration = workStore.previouslyRevalidatedTags.length > 0
if (workUnitStore?.implicitTags && !skipGetExpiration) {
const lazyExpiration = const lazyExpiration =
workUnitStore.implicitTags.expirationsByCacheKind.get(kind) workUnitStore.implicitTags.expirationsByCacheKind.get(kind)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment