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

interception routes: fix interception for dynamic routes #58198

Merged
merged 2 commits into from
Nov 8, 2023

Conversation

feedthejim
Copy link
Contributor

@feedthejim feedthejim commented Nov 8, 2023

This PR fixes the bug in which interception routes of the form (.)[param] would not intercept navigations.

The bug happened because we would not create a dynamic route matcher for the intercepted route, so we would never match the correct dynamic route when hitting the server, falling back to the base one.

The fix consists of fixing the logic that checks for a dynamic route so that it checks the correct path when handling an interception route.

There's probably a better fix here, advice welcome

fixes #52533

@feedthejim
Copy link
Contributor Author

feedthejim commented Nov 8, 2023

Copy link
Contributor

github-actions bot commented Nov 8, 2023

All broken links are now fixed, thank you!

@feedthejim feedthejim changed the title fix-local-siblings interception routes: fix interception for dynamic routes Nov 8, 2023
@ijjk
Copy link
Member

ijjk commented Nov 8, 2023

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
buildDuration 10.3s 10.4s N/A
buildDurationCached 6.1s 6.6s ⚠️ +580ms
nodeModulesSize 175 MB 175 MB ⚠️ +38.6 kB
nextStartRea..uration (ms) 401ms 402ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
199-HASH.js gzip 29.2 kB 29.3 kB N/A
3f784ff6-HASH.js gzip 53.2 kB 53.2 kB
494.HASH.js gzip 180 B 181 B N/A
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 241 B 239 B N/A
main-HASH.js gzip 31.7 kB 31.8 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB
Overall change 100 kB 100 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
_app-HASH.js gzip 194 B 195 B N/A
_error-HASH.js gzip 182 B 181 B N/A
amp-HASH.js gzip 504 B 506 B N/A
css-HASH.js gzip 322 B 323 B N/A
dynamic-HASH.js gzip 2.5 kB 2.5 kB
edge-ssr-HASH.js gzip 253 B 255 B N/A
head-HASH.js gzip 348 B 347 B N/A
hooks-HASH.js gzip 369 B 368 B N/A
image-HASH.js gzip 4.3 kB 4.3 kB N/A
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.65 kB 2.65 kB N/A
routerDirect..HASH.js gzip 311 B 311 B
script-HASH.js gzip 384 B 383 B N/A
withRouter-HASH.js gzip 307 B 308 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 3.17 kB 3.17 kB
Client Build Manifests
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
_buildManifest.js gzip 483 B 484 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
index.html gzip 529 B 528 B N/A
link.html gzip 541 B 541 B
withRouter.html gzip 524 B 522 B N/A
Overall change 541 B 541 B
Edge SSR bundle Size Overall increase ⚠️
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
edge-ssr.js gzip 92.2 kB 92.5 kB ⚠️ +298 B
page.js gzip 145 kB 145 kB ⚠️ +391 B
Overall change 237 kB 238 kB ⚠️ +689 B
Middleware size
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
middleware-b..fest.js gzip 627 B 626 B N/A
middleware-r..fest.js gzip 150 B 151 B N/A
middleware.js gzip 24.8 kB 24.8 kB N/A
edge-runtime..pack.js gzip 1.92 kB 1.92 kB
Overall change 1.92 kB 1.92 kB
Next Runtimes Overall increase ⚠️
vercel/next.js canary vercel/next.js 11-08-fix-local-siblings Change
app-page-exp...dev.js gzip 166 kB 166 kB
app-page-exp..prod.js gzip 93.4 kB 93.4 kB
app-page-tur..prod.js gzip 94.1 kB 94.1 kB
app-page-tur..prod.js gzip 88.8 kB 88.8 kB
app-page.run...dev.js gzip 136 kB 136 kB
app-page.run..prod.js gzip 88.1 kB 88.1 kB
app-route-ex...dev.js gzip 23.5 kB 23.5 kB
app-route-ex..prod.js gzip 16.4 kB 16.4 kB
app-route-tu..prod.js gzip 16.4 kB 16.4 kB
app-route-tu..prod.js gzip 16 kB 16 kB
app-route.ru...dev.js gzip 22.9 kB 22.9 kB
app-route.ru..prod.js gzip 16 kB 16 kB
pages-api-tu..prod.js gzip 9.37 kB 9.37 kB
pages-api.ru...dev.js gzip 9.64 kB 9.64 kB
pages-api.ru..prod.js gzip 9.37 kB 9.37 kB
pages-turbo...prod.js gzip 21.5 kB 21.8 kB ⚠️ +352 B
pages.runtim...dev.js gzip 22.2 kB 22.5 kB ⚠️ +341 B
pages.runtim..prod.js gzip 21.5 kB 21.8 kB ⚠️ +353 B
server.runti..prod.js gzip 48.6 kB 48.8 kB ⚠️ +254 B
Overall change 920 kB 921 kB ⚠️ +1.3 kB
Diff details
Diff for page.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for main-HASH.js

Diff too large to display

Diff for pages-turbo...time.prod.js

Diff too large to display

Diff for pages.runtime.dev.js

Diff too large to display

Diff for pages.runtime.prod.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: d4a9f55

@feedthejim feedthejim marked this pull request as ready for review November 8, 2023 14:59
@ijjk
Copy link
Member

ijjk commented Nov 8, 2023

Tests Passed

@kodiakhq kodiakhq bot merged commit 536d2db into canary Nov 8, 2023
54 of 59 checks passed
@kodiakhq kodiakhq bot deleted the 11-08-fix-local-siblings branch November 8, 2023 18:57
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 23, 2023
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.

Intercepting parallel routes including dynamic route not working within the same directory
3 participants