fix: dynamic not-prerendered routes revalidate tracking #2771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pieh
added
the
test all versions
📊 Package size report 0.02%↑
Unchanged files
🤖 This report was automatically generated by pkg-size-action |
pieh
force-pushed
the
fix/cache-handler-adjustments-for-new-versions
branch
from
c9ba1e0 to
eb76546
Compare
orinokai
approved these changes
Mar 7, 2025
| @@ -413,12 +413,12 @@ test.describe('Simple Page Router (no basePath, no i18n)', () => { | |||
| expect(date1.localeCompare(beforeFirstFetch)).toBeGreaterThan(0) | |||
|
|
|||
| // allow page to get stale | |||
| await page.waitForTimeout(60_000) | |||
| await page.waitForTimeout(61_000) | |||
There was a problem hiding this comment.
ah yes, I got tripped up by this too 😄
| @@ -355,22 +374,25 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions { | |||
| if (isCachedRouteValue(data)) { | |||
| return { | |||
| ...data, | |||
| revalidate: context.revalidate, | |||
| revalidate: context.revalidate ?? context.cacheControl?.revalidate, | |||
| cacheControl: context.cacheControl, | |||
There was a problem hiding this comment.
i'm assuming we don't have to do this at build time too?
There was a problem hiding this comment.
We still record initialRevalidateSeconds from prerender-manifest.json under revalidate
Which is enough for how we read this value later for own needs (like figuring out initial cdn max age in some cases - like recently merged 404 caching fixes or preventing double SWR ) and Next.js also uses prerender-manifest.json directly for anything that was prerendered ( https://github.com/vercel/next.js/blob/7e5e69dd2592e2b8d165d15b267ba3491f7d8174/packages/next/src/server/lib/incremental-cache/shared-cache-controls.ts#L36-L67 ), so we don't have to actually do the same at build time - otherwise we would also need to adjust our own code in places we rely on revalidate field.
That is possibly something to think about, because cacheControl field does contain expire together revalidate, so this would allow exact stale-while-revalidate= value for cases that use
opennextjs-netlify/src/run/headers.ts
Lines 201 to 212 in 3301077
So technically it might not be correct not to store it, but it probably be better for some follow up as amount it's already here is addressing substantial problem (with those next versions we never cache not-prerendered dynamic pages on cdn now)
There was a problem hiding this comment.
So I'll go ahead and merge this
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adjustment to
revalidatetracking after vercel/next.js#76207Tests
No new tests - we already have tests that were failing with latest/canary versions and this change make them pass again
Some unrelated test fixes: