-
Notifications
You must be signed in to change notification settings - Fork 91
fix: support segment data in cache entries #3093
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.
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
Conversation
This file contains hidden or 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
pieh
added
the
test all versions
Run e2e tests against old and canary versions of Next.js
label
Sep 2, 2025
📊 Package size report 0.04%↑
Unchanged files
🤖 This report was automatically generated by pkg-size-action |
pieh
pieh
commented
Sep 2, 2025
// Next.js stores rscData as buffer, while we store it as base64 encoded string
// Next.js stores rscData as Buffer, while we store it as base64 encoded string
rscData: string | undefined
// Next.js stores segmentData as Map<string, Buffer>, while we store it as Record<string, string>, where value is base64 encoded string
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for clarity - we have to use JSON serializable primitives for our storage in blobs, hence why we need to swap between Map->Record and Buffer->Base64 string
pieh
pieh
commented
Sep 2, 2025
Comment on lines
+124
to
+127
!(
typeof meta.headers?.['x-next-cache-tags'] === 'string' &&
meta.headers?.['x-next-cache-tags'].includes('/@')
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note here - I typed meta (see line 80) above, and because headers is typed as OutgoingHttpHeaders (and not Record<string,string>) it required some additional type guard here to satisfy type checking
pieh
pieh
commented
Sep 2, 2025
> & {
kind: 'APP_PAGE'
}
}&Pick<IncrementalCachedAppPageValueForNewVersions,'segmentData'>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is terrible (stitching type from different next versions, but if I just tried to use types for newer version, all hell broke lose, so this, while awful, felt like only reasonable option without getting stuck in fixing bunch of types
mrstork
mrstork
approved these changes
Sep 2, 2025
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.
Uh oh!
There was an error while loading. Please reload this page.
Description
For
clientSegmentCachesupport.Tests
Mainly relies on vercel/next.js tests like https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/segment-cache/basic/segment-cache-basic.test.ts
This is experimental feature, we will look to maybe some of our tests in the future