-
Notifications
You must be signed in to change notification settings - Fork 27.3k
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
fix: Merge link
header from middleware with the ones from React
#73431
Open
amannn
wants to merge
11
commits into
vercel:canary
Choose a base branch
from
amannn:fix/link-middleware
base: canary
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
4bae4fd
fix: Merge `link` header from middleware with the ones from React
amannn 5011994
Merge branch 'canary' into fix/link-middleware
ztanner 1e6188b
improve assertion
amannn a3dd18e
Merge remote-tracking branch 'upstream/canary' into fix/link-middleware
amannn 6941d9f
run tests again
amannn 3293d23
another attempt to run tests
amannn 41c3dff
Merge branch 'canary' into fix/link-middleware
amannn 81f28f1
Merge remote-tracking branch 'upstream/canary' into fix/link-middleware
amannn 51fd66b
use `appendHeader` instead
amannn fe09dcc
rename shared function
amannn 4e9b024
Merge remote-tracking branch 'upstream/canary' into fix/link-middleware
amannn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import Image from 'next/image' | ||
import { Inter } from 'next/font/google' | ||
|
||
const inter = Inter({ subsets: ['latin'] }) | ||
|
||
export default function Page() { | ||
return ( | ||
<> | ||
<Image priority src="/favicon.ico" alt="favicon" width={16} height={16} /> | ||
<h1 className={inter.className}>Hello World</h1> | ||
</> | ||
) | ||
} |
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
Oops, something went wrong.
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.
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.
we can just use
res.appendHeader
insteads for React's onHeaders callback. I'd remove the other changes. appending is not always useful. for instance it doesn't make sense for location. If you want to resubmit the PR with justappendHeader
for the onHeaders callback I think we can merge quicklyThere 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.
Many thanks for the review @gnoff!
I've refactored the fix to use
res.appendHeader
now instead and reverted the other changes (51fd66b).I've extracted the part of setting
metadata.headers
to a shared function to be used for bothsetHeader
andappendHeader
—hope that makes sense!Let me know if there's something else left to do! I've also enabled edits by maintainers if there's something quick you'd like to adjust.
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.
Some seemingly unrelated tests failed in the last CI run (example), any chance the tests are a bit flaky?