Commit 1c286dd5 authored by JJ Kasper's avatar JJ Kasper Committed by Jiachi Liu

Fix missing revalidate with notFound() (#75009)

This is follow-up to https://github.com/vercel/next.js/pull/74607
ensuring we also don't lose the revalidate value configured when
`notFound()` or similar is used.

x-ref: [slack
thread](https://vercel.slack.com/archives/C02K2HCH5V4/p1736954974909349)
parent 48f2588b
...@@ -3774,9 +3774,18 @@ async function prerenderToStream( ...@@ -3774,9 +3774,18 @@ async function prerenderToStream(
type: 'prerender-legacy', type: 'prerender-legacy',
phase: 'render', phase: 'render',
implicitTags: implicitTags, implicitTags: implicitTags,
revalidate: INFINITE_CACHE, revalidate:
expire: INFINITE_CACHE, typeof prerenderStore?.revalidate !== 'undefined'
stale: INFINITE_CACHE, ? prerenderStore.revalidate
: INFINITE_CACHE,
expire:
typeof prerenderStore?.expire !== 'undefined'
? prerenderStore.expire
: INFINITE_CACHE,
stale:
typeof prerenderStore?.stale !== 'undefined'
? prerenderStore.stale
: INFINITE_CACHE,
tags: [...(prerenderStore?.tags || implicitTags)], tags: [...(prerenderStore?.tags || implicitTags)],
}) })
const errorRSCPayload = await workUnitAsyncStorage.run( const errorRSCPayload = await workUnitAsyncStorage.run(
......
...@@ -976,6 +976,10 @@ describe('app-dir static/dynamic handling', () => { ...@@ -976,6 +976,10 @@ describe('app-dir static/dynamic handling', () => {
"prerendered-not-found/first.rsc", "prerendered-not-found/first.rsc",
"prerendered-not-found/second.html", "prerendered-not-found/second.html",
"prerendered-not-found/second.rsc", "prerendered-not-found/second.rsc",
"prerendered-not-found/segment-revalidate.html",
"prerendered-not-found/segment-revalidate.rsc",
"prerendered-not-found/segment-revalidate/page.js",
"prerendered-not-found/segment-revalidate/page_client-reference-manifest.js",
"react-fetch-deduping-edge/page.js", "react-fetch-deduping-edge/page.js",
"react-fetch-deduping-edge/page_client-reference-manifest.js", "react-fetch-deduping-edge/page_client-reference-manifest.js",
"react-fetch-deduping-node/page.js", "react-fetch-deduping-node/page.js",
...@@ -2008,6 +2012,30 @@ describe('app-dir static/dynamic handling', () => { ...@@ -2008,6 +2012,30 @@ describe('app-dir static/dynamic handling', () => {
"initialRevalidateSeconds": false, "initialRevalidateSeconds": false,
"srcRoute": "/prerendered-not-found/[slug]", "srcRoute": "/prerendered-not-found/[slug]",
}, },
"/prerendered-not-found/segment-revalidate": {
"allowHeader": [
"host",
"x-matched-path",
"x-prerender-revalidate",
"x-prerender-revalidate-if-generated",
"x-next-revalidated-tags",
"x-next-revalidate-tag-token",
],
"dataRoute": "/prerendered-not-found/segment-revalidate.rsc",
"experimentalBypassFor": [
{
"key": "Next-Action",
"type": "header",
},
{
"key": "content-type",
"type": "header",
"value": "multipart/form-data;.*",
},
],
"initialRevalidateSeconds": 3,
"srcRoute": "/prerendered-not-found/segment-revalidate",
},
"/route-handler/no-store-force-static": { "/route-handler/no-store-force-static": {
"allowHeader": [ "allowHeader": [
"host", "host",
......
import React from 'react'
import { notFound } from 'next/navigation'
export const revalidate = 3
export default async function Page() {
await fetch('https://next-data-api.vercel.app/api/random', {
next: {
tags: ['explicit-tag'],
},
})
if (process.env.NEXT_PHASE === 'phase-production-build') {
notFound()
}
return (
<>
<p>/prerendered-not-found/segment-revalidate</p>
<p>{Date.now()}</p>
</>
)
}
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