Unverified Commit dee4137f authored by Josh Story's avatar Josh Story Committed by GitHub

Treat empty resume bodies as dynamic render requests (#94729)

Distinguish an absent postponed state from an empty one so cold RDC
resume requests perform a full dynamic RSC render instead of being
rejected or treated as revalidation.
parent d056188b
...@@ -376,7 +376,7 @@ export async function handler( ...@@ -376,7 +376,7 @@ export async function handler(
} }
if ( if (
!getRequestMeta(req, 'postponed') && typeof getRequestMeta(req, 'postponed') !== 'string' &&
couldSupportPPR && couldSupportPPR &&
req.headers[NEXT_RESUME_HEADER] === '1' && req.headers[NEXT_RESUME_HEADER] === '1' &&
req.method === 'POST' req.method === 'POST'
...@@ -470,6 +470,7 @@ export async function handler( ...@@ -470,6 +470,7 @@ export async function handler(
const minimalPostponed = isRoutePPREnabled const minimalPostponed = isRoutePPREnabled
? getRequestMeta(req, 'postponed') ? getRequestMeta(req, 'postponed')
: undefined : undefined
const hasPostponedState = typeof minimalPostponed === 'string'
// If PPR is enabled, and this is a RSC request (but not a prefetch), then // If PPR is enabled, and this is a RSC request (but not a prefetch), then
// we can use this fact to only generate the flight data for the request // we can use this fact to only generate the flight data for the request
...@@ -486,11 +487,11 @@ export async function handler( ...@@ -486,11 +487,11 @@ export async function handler(
// Only do this for routes that have a concrete prefetchDataRoute. // Only do this for routes that have a concrete prefetchDataRoute.
!staticPrefetchDataRoute !staticPrefetchDataRoute
// During a PPR revalidation, the RSC request is not dynamic if we do not have the postponed data. // During a PPR revalidation, the RSC request is not dynamic if postponed
// We only attach the postponed data during a resume. If there's no postponed data, then it must be a revalidation. // metadata is absent. An empty string represents a resume request without
// This is to ensure that we don't bypass the cache during a revalidation. // postponed state, which should perform a full dynamic render.
if (isMinimalMode) { if (isMinimalMode) {
isDynamicRSCRequest = isDynamicRSCRequest && !!minimalPostponed isDynamicRSCRequest = isDynamicRSCRequest && hasPostponedState
} }
// Need to read this before it's stripped by stripFlightHeaders. We don't // Need to read this before it's stripped by stripFlightHeaders. We don't
...@@ -546,7 +547,7 @@ export async function handler( ...@@ -546,7 +547,7 @@ export async function handler(
!isSSG || !isSSG ||
// If this request has provided postponed data, it supports dynamic // If this request has provided postponed data, it supports dynamic
// HTML. // HTML.
typeof minimalPostponed === 'string' || hasPostponedState ||
// If this handler supports onCacheEntryV2, then we can only support // If this handler supports onCacheEntryV2, then we can only support
// dynamic responses if it's a dynamic RSC request and not in minimal mode. If it // dynamic responses if it's a dynamic RSC request and not in minimal mode. If it
// doesn't support it we must fallback to the default behavior. // doesn't support it we must fallback to the default behavior.
...@@ -583,7 +584,7 @@ export async function handler( ...@@ -583,7 +584,7 @@ export async function handler(
isSSG && isSSG &&
!supportsDynamicResponse && !supportsDynamicResponse &&
!isPossibleServerAction && !isPossibleServerAction &&
!minimalPostponed && !hasPostponedState &&
!isDynamicRSCRequest !isDynamicRSCRequest
) { ) {
// For normal SSG routes we cache by the fully resolved pathname. For // For normal SSG routes we cache by the fully resolved pathname. For
...@@ -1595,7 +1596,7 @@ export async function handler( ...@@ -1595,7 +1596,7 @@ export async function handler(
// If this is a resume request in minimal mode it is streamed with dynamic // If this is a resume request in minimal mode it is streamed with dynamic
// content and should not be cached. // content and should not be cached.
if (minimalPostponed) { if (hasPostponedState) {
cacheControl = { revalidate: 0, expire: undefined } cacheControl = { revalidate: 0, expire: undefined }
} }
......
...@@ -1131,7 +1131,7 @@ export default abstract class Server< ...@@ -1131,7 +1131,7 @@ export default abstract class Server<
// we should error, as it represents an unprocessable request. // we should error, as it represents an unprocessable request.
if ( if (
getRequestMeta(req, 'isNextDataReq') && getRequestMeta(req, 'isNextDataReq') &&
getRequestMeta(req, 'postponed') typeof getRequestMeta(req, 'postponed') === 'string'
) { ) {
// The server understood that this is a PPR resume request, as the // The server understood that this is a PPR resume request, as the
// headers were included to correctly indicate a resume request, but // headers were included to correctly indicate a resume request, but
...@@ -2266,6 +2266,7 @@ export default abstract class Server< ...@@ -2266,6 +2266,7 @@ export default abstract class Server<
const minimalPostponed = isRoutePPREnabled const minimalPostponed = isRoutePPREnabled
? getRequestMeta(req, 'postponed') ? getRequestMeta(req, 'postponed')
: undefined : undefined
const hasPostponedState = typeof minimalPostponed === 'string'
// we need to ensure the status code if /404 is visited directly // we need to ensure the status code if /404 is visited directly
if (is404Page && !isNextDataRequest && !isRSCRequest) { if (is404Page && !isNextDataRequest && !isRSCRequest) {
...@@ -2282,7 +2283,7 @@ export default abstract class Server< ...@@ -2282,7 +2283,7 @@ export default abstract class Server<
// Server actions can use non-GET/HEAD methods. // Server actions can use non-GET/HEAD methods.
!isPossibleServerAction && !isPossibleServerAction &&
// Resume can use non-GET/HEAD methods. // Resume can use non-GET/HEAD methods.
!minimalPostponed && !hasPostponedState &&
!is404Page && !is404Page &&
!is500Page && !is500Page &&
pathname !== '/_error' && pathname !== '/_error' &&
......
import { connection } from 'next/server'
export function generateStaticParams() {
return [{ slug: 'a' }]
}
export default async function Page({
params,
}: {
params: Promise<{ slug: string }>
}) {
await connection()
const { slug } = await params
return <p id="slug">{slug}</p>
}
import { ReactNode, Suspense } from 'react'
export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>
<Suspense fallback="loading">{children}</Suspense>
</body>
</html>
)
}
import { nextTestSetup } from 'e2e-utils'
import { createNowRouteMatches } from 'next-test-utils'
describe('empty resume', () => {
const { next } = nextTestSetup({
files: __dirname,
// This test synthesizes an adapter invocation using private runtime
// switches; it does not exercise the deployed platform proxy.
skipDeployment: true,
env: {
NEXT_PRIVATE_TEST_HEADERS: '1',
NEXT_PRIVATE_MINIMAL_MODE: '1',
},
})
it('treats an empty Next-Resume body as a dynamic RSC request', async () => {
const slug = 'cold-rdc'
const response = await next.fetch(`/dynamic/${slug}.rsc`, {
method: 'POST',
headers: {
rsc: '1',
'next-resume': '1',
'next-router-state-tree': JSON.stringify(['', {}, null, 'refetch']),
// These headers emulate the platform routing a concrete pathname to
// the generated dynamic route entrypoint.
'x-matched-path': '/dynamic/[slug]',
'x-now-route-matches': createNowRouteMatches({ slug }).toString(),
},
// An empty postponed state represents a cold RDC lookup. Next.js
// should perform a full dynamic render instead of attempting a resume.
body: '',
})
expect(response.status).toBe(200)
expect(response.headers.get('content-type')).toContain('text/x-component')
expect(response.headers.get('cache-control')).toContain('no-store')
expect(await response.text()).toContain(slug)
})
it('treats an empty Next-Resume body as a full dynamic HTML render', async () => {
const slug = 'cold-html'
const response = await next.fetch(`/dynamic/${slug}`, {
method: 'POST',
headers: {
'next-resume': '1',
'x-matched-path': '/dynamic/[slug]',
'x-now-route-matches': createNowRouteMatches({ slug }).toString(),
},
body: '',
})
expect(response.status).toBe(200)
expect(response.headers.get('content-type')).toContain('text/html')
expect(response.headers.get('cache-control')).toContain('no-store')
const html = await response.text()
expect(html).toContain(slug)
expect(html).toContain('</html>')
})
})
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
cacheComponents: true,
}
module.exports = nextConfig
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