Skip to content

fix: set undefined ODB 404 TTLs to 60 seconds #1647

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

Merged
merged 7 commits into from
Oct 4, 2022
Merged

fix: set undefined ODB 404 TTLs to 60 seconds #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0607405
fix: cache 404s for max 60 seconds
orinokai Sep 30, 2022
6ce930b
feat: add new demo page to test ISR returning notFound
orinokai Oct 3, 2022
34e72c2
test: update test snapshots with new page
orinokai Oct 3, 2022
62c42a2
chore: debug test errors
orinokai Oct 3, 2022
51c4cd3
chore: update test debugging
orinokai Oct 3, 2022
b6d5e6b
fix: remove api call from new revalidate page
orinokai Oct 3, 2022
13585a4
Merge branch 'main' into rs/fix-odb-404
orinokai Oct 4, 2022
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
21 changes: 21 additions & 0 deletions demos/default/pages/getStaticProps/with-revalidate-404.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Link from 'next/link'

const Show = () => (
<div>
<p>This page is ISR, but will return a 404 if the current time ends in 0-4.</p>

<Link href="/">
<a>Go back home</a>
</Link>
</div>
)

export async function getStaticProps(context) {
return {
props: {},
notFound: new Date().getMinutes() % 10 < 5,
revalidate: 60,
}
}

export default Show
11 changes: 9 additions & 2 deletions packages/runtime/src/templates/getHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,15 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
const ttl = getMaxAge(cacheHeader)
// Long-expiry TTL is basically no TTL, so we'll skip it
if (ttl > 0 && ttl < ONE_YEAR_IN_SECONDS) {
result.ttl = ttl
requestMode = `odb ttl=${ttl}`
// ODBs currently have a minimum TTL of 60 seconds
result.ttl = Math.max(ttl, 60)
}
// Only cache 404s ephemerally
if (ttl === ONE_YEAR_IN_SECONDS && result.statusCode === 404) {
result.ttl = 60
}
if (result.ttl > 0) {
requestMode = `odb ttl=${result.ttl}`
}
}
multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate']
Expand Down
40 changes: 40 additions & 0 deletions test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ exports.resolvePages = () => {
require.resolve('../../../.next/server/pages/getStaticProps/[id].js')
require.resolve('../../../.next/server/pages/getStaticProps/env.js')
require.resolve('../../../.next/server/pages/getStaticProps/static.js')
require.resolve('../../../.next/server/pages/getStaticProps/with-revalidate-404.js')
require.resolve('../../../.next/server/pages/getStaticProps/with-revalidate.js')
require.resolve('../../../.next/server/pages/getStaticProps/withFallback/[...slug].js')
require.resolve('../../../.next/server/pages/getStaticProps/withFallback/[id].js')
Expand Down Expand Up @@ -55,6 +56,7 @@ exports.resolvePages = () => {
require.resolve('../../../.next/server/pages/getStaticProps/[id].js')
require.resolve('../../../.next/server/pages/getStaticProps/env.js')
require.resolve('../../../.next/server/pages/getStaticProps/static.js')
require.resolve('../../../.next/server/pages/getStaticProps/with-revalidate-404.js')
require.resolve('../../../.next/server/pages/getStaticProps/with-revalidate.js')
require.resolve('../../../.next/server/pages/getStaticProps/withFallback/[...slug].js')
require.resolve('../../../.next/server/pages/getStaticProps/withFallback/[id].js')
Expand Down Expand Up @@ -90,6 +92,7 @@ exports.resolvePages = () => {
require.resolve('../../../web/.next/server/pages/getStaticProps/[id].js')
require.resolve('../../../web/.next/server/pages/getStaticProps/env.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/static.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/with-revalidate-404.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/with-revalidate.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/withFallback/[...slug].js')
require.resolve('../../../web/.next/server/pages/getStaticProps/withFallback/[id].js')
Expand Down Expand Up @@ -125,6 +128,7 @@ exports.resolvePages = () => {
require.resolve('../../../web/.next/server/pages/getStaticProps/[id].js')
require.resolve('../../../web/.next/server/pages/getStaticProps/env.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/static.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/with-revalidate-404.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/with-revalidate.js')
require.resolve('../../../web/.next/server/pages/getStaticProps/withFallback/[...slug].js')
require.resolve('../../../web/.next/server/pages/getStaticProps/withFallback/[id].js')
Expand Down Expand Up @@ -501,6 +505,12 @@ Array [
"status": 200,
"to": "/.netlify/functions/___netlify-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/en/getStaticProps/with-revalidate-404.json",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/en/getStaticProps/with-revalidate.json",
Expand Down Expand Up @@ -723,6 +733,12 @@ Array [
"status": 200,
"to": "/.netlify/functions/___netlify-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/es/getStaticProps/with-revalidate-404.json",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/es/getStaticProps/with-revalidate.json",
Expand Down Expand Up @@ -909,6 +925,12 @@ Array [
"status": 200,
"to": "/.netlify/functions/___netlify-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/fr/getStaticProps/with-revalidate-404.json",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/_next/data/build-id/fr/getStaticProps/with-revalidate.json",
Expand Down Expand Up @@ -1202,6 +1224,12 @@ Array [
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/es/getStaticProps/with-revalidate-404",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": false,
"from": "/es/getStaticProps/withFallback/:id",
Expand Down Expand Up @@ -1394,6 +1422,12 @@ Array [
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/fr/getStaticProps/with-revalidate-404",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": false,
"from": "/fr/getStaticProps/withFallback/:id",
Expand Down Expand Up @@ -1538,6 +1572,12 @@ Array [
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": true,
"from": "/getStaticProps/with-revalidate-404",
"status": 200,
"to": "/.netlify/builders/___netlify-odb-handler",
},
Object {
"force": false,
"from": "/getStaticProps/withFallback/:id",
Expand Down