mirror of
https://github.com/hanzoai/next.js.git
synced 2026-09-24 17:00:51 +00:00
Zack TannerandGitHub
ae3f9f5187
In #91158, I wired up the plumbing to indicate whether a partial fallback shell is upgradeable. The previous heuristic was too coarse. This wires up the handling in `next start`. This PR teaches the runtime to complete a fallback shell only as far as prerendering allows. Instead of promoting a generic shell like `/[one]/[two]` directly to `/c/foo`, it promotes it to the most specific prerendered shell for that branch, `/c/[two]`, where `[one]` has `generateStaticParams`. That means later requests can reuse the more complete shell, while fully dynamic params continue to stream as dynamic content. With this change: - the first request still serves the generic fallback shell immediately - the background revalidate writes a more specific shell, not a fully concrete route - later requests for the same prerendered branch reuse that shell - upgrading stops once only fully dynamic params remain This keeps the runtime behavior aligned with the build-time `remainingPrerenderableParams` contract from the downstack PR.
75 lines
2.5 KiB
TypeScript
75 lines
2.5 KiB
TypeScript
import cheerio from 'cheerio'
|
|
import { nextTestSetup } from 'e2e-utils'
|
|
import { splitResponseWithPPRSentinel } from 'e2e-utils/ppr'
|
|
|
|
const isAdapterTest = Boolean(process.env.NEXT_ENABLE_ADAPTER)
|
|
|
|
describe('partial-fallback-root-blocking', () => {
|
|
const { next, isNextDev, isNextDeploy } = nextTestSetup({
|
|
files: __dirname,
|
|
// The latest changes to support this behavior on deployed infra are available in the adapter,
|
|
// and are not being backported to the CLI
|
|
skipDeployment: !isAdapterTest,
|
|
})
|
|
|
|
if (isNextDev) {
|
|
it('skipped in dev', () => {})
|
|
return
|
|
}
|
|
|
|
async function fetchSplitHTML(pathname: string) {
|
|
let response: Awaited<ReturnType<typeof next.fetch>> | undefined
|
|
const [staticPart, dynamicPart] = await splitResponseWithPPRSentinel(
|
|
async () => {
|
|
response = await next.fetch(pathname)
|
|
expect(response.status).toBe(200)
|
|
|
|
if (!response.body) {
|
|
throw new Error(`Expected a streamed response body for ${pathname}`)
|
|
}
|
|
|
|
return response.body
|
|
}
|
|
)
|
|
|
|
return {
|
|
response: response!,
|
|
staticPart,
|
|
dynamicPart,
|
|
static$: cheerio.load(staticPart),
|
|
}
|
|
}
|
|
|
|
// TODO: Re-enable once infra supports multiple layers of fallbacks
|
|
if (!isNextDeploy) {
|
|
it('should not reuse a shared shell cache entry for unknown root branches', async () => {
|
|
const firstResult = await fetchSplitHTML('/fr/two')
|
|
|
|
expect(firstResult.response.status).toBe(200)
|
|
expect(firstResult.static$('#lang-fallback').length).toBe(0)
|
|
expect(firstResult.static$('#lang').text()).toBe('fr')
|
|
expect(firstResult.static$('#slug').text()).toBe('two')
|
|
expect(firstResult.dynamicPart).toBe('')
|
|
|
|
const secondResult = await fetchSplitHTML('/fr/other')
|
|
|
|
expect(secondResult.response.status).toBe(200)
|
|
expect(secondResult.static$('#lang-fallback').length).toBe(0)
|
|
expect(secondResult.static$('#lang').text()).toBe('fr')
|
|
expect(secondResult.static$('#slug').text()).toBe('other')
|
|
expect(secondResult.dynamicPart).toBe('')
|
|
})
|
|
}
|
|
|
|
it('should still serve a fallback shell for generated root branches', async () => {
|
|
const result = await fetchSplitHTML('/en/two')
|
|
|
|
expect(result.response.status).toBe(200)
|
|
expect(result.static$('#lang').text()).toBe('en')
|
|
expect(result.static$('#lang-fallback').length).toBe(0)
|
|
expect(result.static$('#slug-fallback').text()).toBe('loading slug...')
|
|
expect(result.static$('#slug').length).toBe(0)
|
|
expect(result.dynamicPart).toContain('<div id="slug">two</div>')
|
|
})
|
|
})
|