Skip to content

fix: improved cdn cache hooks for dynamic 404 pages #2786

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 14 commits into from
Apr 2, 2025
Merged

fix: improved cdn cache hooks for dynamic 404 pages #2786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2ea0e52
test: fixture for dynamic cms results
mrstork Mar 31, 2025
d278f66
test: case for invalidating dynamic 404 pages
mrstork Mar 31, 2025
beec5f5
fix: wip - fix for caching issues on catch all routes
mrstork Mar 31, 2025
e95639a
test: not all versions of next support next.config.ts
mrstork Apr 1, 2025
1aee505
test: older versions of next have different cache headers
mrstork Apr 1, 2025
2b0280b
test: edge cache response depends on the node we hit
mrstork Apr 1, 2025
0fd916d
fix: set cache tags on 404 pages
mrstork Apr 1, 2025
d96b20c
chore: clean up variable names
mrstork Apr 1, 2025
de960f4
chore: remove previous attempt to set cache tags on 404s
mrstork Apr 1, 2025
4cf7b2f
fix: also target 404 pages when purging cache
mrstork Apr 1, 2025
298bd8b
Merge remote-tracking branch 'origin/main' into FRB-1708/purge-cache-…
mrstork Apr 1, 2025
ca7ca4e
chore: remove wip check for cached api calls
mrstork Apr 1, 2025
cf47c74
chore: run format:fix
mrstork Apr 1, 2025
9e49b26
Merge branch 'main' into FRB-1708/purge-cache-catch-all-routes
mrstork Apr 2, 2025
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
Prev Previous commit
Next Next commit
chore: run format:fix
  • Loading branch information
@mrstork
mrstork committed Apr 1, 2025
commit cf47c741d27f84c64542ab0829a9b481c6b21a0a
6 changes: 5 additions & 1 deletion src/run/handlers/cache.cts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,11 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
return null
}

const staleByTags = await this.checkCacheEntryStaleByTags(blob, context.tags, context.softTags)
const staleByTags = await this.checkCacheEntryStaleByTags(
blob,
context.tags,
context.softTags,
)

if (staleByTags) {
span.addEvent('Stale', { staleByTags, key, ttl })
Expand Down
5 changes: 1 addition & 4 deletions src/run/headers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,7 @@ export const setCacheControlHeaders = (
}
}

export const setCacheTagsHeaders = (
headers: Headers,
requestContext: RequestContext,
) => {
export const setCacheTagsHeaders = (headers: Headers, requestContext: RequestContext) => {
if (!headers.has('cache-control') && !headers.has('netlify-cdn-cache-control')) {
return
}
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/dynamic-cms.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test.describe('Dynamic CMS', () => {
)
expect(headers1['netlify-cache-tag']).toEqual('_n_t_/content/blog')
expect(headers1['netlify-cdn-cache-control']).toMatch(
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/,
)

// 2. Publish the blob, revalidate the dynamic page, and wait to regenerate
Expand All @@ -33,7 +33,7 @@ test.describe('Dynamic CMS', () => {
)
expect(headers2['netlify-cache-tag']).toEqual('_n_t_/content/blog')
expect(headers2['netlify-cdn-cache-control']).toMatch(
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/,
)

// 4. Unpublish the blob, revalidate the dynamic page, and wait to regenerate
Expand All @@ -52,7 +52,7 @@ test.describe('Dynamic CMS', () => {
)
expect(headers3['netlify-cache-tag']).toEqual('_n_t_/content/blog')
expect(headers3['netlify-cdn-cache-control']).toMatch(
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/
/s-maxage=31536000,( stale-while-revalidate=31536000,)? durable/,
)
})
})
Loading