Skip to content
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

Jump to bottom

fix: Add Next-Url to http vary in consideration of intercept routes. #52746

Merged
merged 11 commits into from
Jul 22, 2023
Merged

fix: Add Next-Url to http vary in consideration of intercept routes. #52746

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82fd22b
fix: Add `Next-Url` to http vary in consideration of intercept routes.
AkifumiSato Jul 16, 2023
eb88544
add `Next-Url` to cache query hash
AkifumiSato Jul 17, 2023
705a775
Merge branch 'canary' into fix-vary-header
AkifumiSato Jul 17, 2023
ec0acfa
Merge branch 'canary' into fix-vary-header
feedthejim Jul 19, 2023
293f680
Merge branch 'canary' into fix-vary-header
feedthejim Jul 20, 2023
961eb6f
Added test case: `_rsc` is calculated based on `Next-Url
AkifumiSato Jul 21, 2023
2803487
Merge branch 'canary' into fix-vary-header
AkifumiSato Jul 21, 2023
d5494c4
rename test case: `_rsc` is calculated based on `Next-Url`
AkifumiSato Jul 21, 2023
e55f692
Update test
huozhi Jul 22, 2023
b536ae8
fix test
huozhi Jul 22, 2023
4c582cb
Merge branch 'canary' into fix-vary-header
huozhi Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/src/client/components/app-router-headers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const NEXT_URL = 'Next-Url' as const
export const FETCH_CACHE_HEADER = 'x-vercel-sc-headers' as const
export const RSC_CONTENT_TYPE_HEADER = 'text/x-component' as const
export const RSC_VARY_HEADER =
`${RSC}, ${NEXT_ROUTER_STATE_TREE}, ${NEXT_ROUTER_PREFETCH}` as const
`${RSC}, ${NEXT_ROUTER_STATE_TREE}, ${NEXT_ROUTER_PREFETCH}, ${NEXT_URL}` as const

export const FLIGHT_PARAMETERS = [
[RSC],
Expand Down
1 change: 1 addition & 0 deletions packages/next/src/client/components/router-reducer/fetch-server-response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export async function fetchServerResponse(
[
headers[NEXT_ROUTER_PREFETCH] || '0',
headers[NEXT_ROUTER_STATE_TREE],
headers[NEXT_URL],
].join(',')
)

Expand Down