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.

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: default relative canonical url should not contain search #63843

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Mar 28, 2024

What

Strip the search query for the urlPathname passed down to metadata handling.

Why

This is because the urlPathname from staticGenerationStore contains query, so it will contain ?rsc query for client navigation, which lead to the relative path canonical url (e.g. ./) will have the search query along with it. This PR is to remove that and make sure always uses pathname.

Reported by @pacocoursey

Closes NEXT-2963

@huozhi huozhi enabled auto-merge (squash) March 28, 2024 22:48
@ijjk
Copy link
Member

ijjk commented Mar 28, 2024

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
buildDuration 14.6s 14.6s N/A
buildDurationCached 9s 6.9s N/A
nodeModulesSize 199 MB 199 MB ⚠️ +2.13 kB
nextStartRea..uration (ms) 415ms 420ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
2453-HASH.js gzip 31.4 kB 31.3 kB N/A
3304.HASH.js gzip 181 B 181 B
3f784ff6-HASH.js gzip 53.7 kB 53.7 kB
8299-HASH.js gzip 5.04 kB 5.04 kB N/A
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 241 B 241 B
main-HASH.js gzip 32.2 kB 32.2 kB N/A
webpack-HASH.js gzip 1.68 kB 1.68 kB N/A
Overall change 99.3 kB 99.3 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
_app-HASH.js gzip 196 B 197 B N/A
_error-HASH.js gzip 184 B 184 B
amp-HASH.js gzip 505 B 505 B
css-HASH.js gzip 324 B 325 B N/A
dynamic-HASH.js gzip 2.5 kB 2.5 kB N/A
edge-ssr-HASH.js gzip 258 B 258 B
head-HASH.js gzip 352 B 352 B
hooks-HASH.js gzip 370 B 371 B N/A
image-HASH.js gzip 4.21 kB 4.21 kB
index-HASH.js gzip 259 B 259 B
link-HASH.js gzip 2.67 kB 2.67 kB N/A
routerDirect..HASH.js gzip 314 B 312 B N/A
script-HASH.js gzip 386 B 386 B
withRouter-HASH.js gzip 309 B 309 B
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 6.57 kB 6.57 kB
Client Build Manifests
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
_buildManifest.js gzip 481 B 484 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
index.html gzip 530 B 528 B N/A
link.html gzip 541 B 540 B N/A
withRouter.html gzip 525 B 522 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
edge-ssr.js gzip 95.3 kB 95.3 kB N/A
page.js gzip 3.04 kB 3.04 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
middleware-b..fest.js gzip 626 B 626 B
middleware-r..fest.js gzip 151 B 151 B
middleware.js gzip 25.5 kB 25.5 kB N/A
edge-runtime..pack.js gzip 839 B 839 B
Overall change 1.62 kB 1.62 kB
Next Runtimes
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
app-page-exp...dev.js gzip 170 kB 170 kB N/A
app-page-exp..prod.js gzip 97 kB 97 kB N/A
app-page-tur..prod.js gzip 98.8 kB 98.8 kB N/A
app-page-tur..prod.js gzip 93 kB 93 kB N/A
app-page.run...dev.js gzip 144 kB 144 kB N/A
app-page.run..prod.js gzip 91.5 kB 91.5 kB N/A
app-route-ex...dev.js gzip 21.4 kB 21.4 kB
app-route-ex..prod.js gzip 15.1 kB 15.1 kB
app-route-tu..prod.js gzip 15.1 kB 15.1 kB
app-route-tu..prod.js gzip 14.8 kB 14.8 kB
app-route.ru...dev.js gzip 21 kB 21 kB
app-route.ru..prod.js gzip 14.8 kB 14.8 kB
pages-api-tu..prod.js gzip 9.55 kB 9.55 kB
pages-api.ru...dev.js gzip 9.82 kB 9.82 kB
pages-api.ru..prod.js gzip 9.55 kB 9.55 kB
pages-turbo...prod.js gzip 22.5 kB 22.5 kB
pages.runtim...dev.js gzip 23.1 kB 23.1 kB
pages.runtim..prod.js gzip 22.4 kB 22.4 kB
server.runti..prod.js gzip 51 kB 51 kB
Overall change 250 kB 250 kB
build cache Overall increase ⚠️
vercel/next.js canary vercel/next.js fix/metadata-canonical-url-navigation Change
0.pack gzip 1.58 MB 1.58 MB N/A
index.pack gzip 106 kB 106 kB ⚠️ +646 B
Overall change 106 kB 106 kB ⚠️ +646 B
Diff details
Diff for middleware.js

Diff too large to display

Diff for app-page-exp..ntime.dev.js

Diff too large to display

Diff for app-page-exp..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page.runtime.dev.js

Diff too large to display

Diff for app-page.runtime.prod.js

Diff too large to display

Commit: 3fe3bee

@huozhi huozhi merged commit 488984c into canary Mar 28, 2024
77 checks passed
@huozhi huozhi deleted the fix/metadata-canonical-url-navigation branch March 28, 2024 23:16
huozhi added a commit that referenced this pull request Mar 29, 2024
…#63845)

We're incorrectly showing warnings for `viewport` if you manually merge
metadata.
Found this while fixing #63843 

Closes NEXT-2964
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants