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 middleware catch-all rewrite case #63254

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Mar 13, 2024

This ensures we properly set the matched header when applying a middleware skip optimization so that the client router has enough context to finish resolving the dynamic route params.

Fixes: #59561

Closes NEXT-2803

@ijjk
Copy link
Member Author

ijjk commented Mar 13, 2024

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
buildDuration 13.7s 13.8s N/A
buildDurationCached 8.4s 6.1s N/A
nodeModulesSize 198 MB 198 MB ⚠️ +600 B
nextStartRea..uration (ms) 437ms 436ms N/A
Client Bundles (main, webpack)
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
2453-HASH.js gzip 30.4 kB 30.4 kB N/A
3304.HASH.js gzip 181 B 181 B
3f784ff6-HASH.js gzip 53.7 kB 53.7 kB N/A
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 242 B 242 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 45.6 kB 45.6 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case 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 ijjk/next.js fix/middleware-rewrite-case Change
_buildManifest.js gzip 481 B 484 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
index.html gzip 530 B 527 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 ijjk/next.js fix/middleware-rewrite-case Change
edge-ssr.js gzip 95.1 kB 95.1 kB N/A
page.js gzip 3.07 kB 3.07 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
middleware-b..fest.js gzip 627 B 624 B N/A
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 990 B 990 B
Next Runtimes
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
app-page-exp...dev.js gzip 171 kB 171 kB
app-page-exp..prod.js gzip 96.6 kB 96.6 kB
app-page-tur..prod.js gzip 98.3 kB 98.3 kB
app-page-tur..prod.js gzip 92.8 kB 92.8 kB
app-page.run...dev.js gzip 149 kB 149 kB
app-page.run..prod.js gzip 91.3 kB 91.3 kB
app-route-ex...dev.js gzip 21.3 kB 21.3 kB
app-route-ex..prod.js gzip 15 kB 15 kB
app-route-tu..prod.js gzip 15 kB 15 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.52 kB 9.52 kB
pages-api.ru...dev.js gzip 9.8 kB 9.8 kB
pages-api.ru..prod.js gzip 9.52 kB 9.52 kB
pages-turbo...prod.js gzip 22.3 kB 22.3 kB
pages.runtim...dev.js gzip 22.9 kB 22.9 kB
pages.runtim..prod.js gzip 22.3 kB 22.3 kB
server.runti..prod.js gzip 50.5 kB 50.6 kB N/A
Overall change 897 kB 897 kB
build cache Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/middleware-rewrite-case Change
0.pack gzip 1.55 MB 1.55 MB ⚠️ +662 B
index.pack gzip 105 kB 105 kB N/A
Overall change 1.55 MB 1.55 MB ⚠️ +662 B
Diff details
Diff for middleware.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: e39a5e5

@ijjk ijjk marked this pull request as ready for review March 13, 2024 19:10
@ijjk ijjk enabled auto-merge (squash) March 13, 2024 20:21
@ijjk ijjk merged commit 8f09bc4 into vercel:canary Mar 13, 2024
61 checks passed
@ijjk ijjk deleted the fix/middleware-rewrite-case branch March 13, 2024 21:15
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 28, 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.

Router.query has missing parameters when using a catch-all rewrite in comination with middleware
2 participants