[next]: ensure unmatched rsc rewrites are routed to correct handler#11688
Merged
kodiakhq[bot] merged 2 commits intomainfrom Jun 4, 2024
Merged
[next]: ensure unmatched rsc rewrites are routed to correct handler#11688kodiakhq[bot] merged 2 commits intomainfrom
kodiakhq[bot] merged 2 commits intomainfrom
Conversation
🦋 Changeset detectedLatest commit: 4682799 The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
ijjk
previously approved these changes
Jun 3, 2024
ijjk
reviewed
Jun 3, 2024
kodiakhq bot
pushed a commit
that referenced
this pull request
Jun 4, 2024
#11686) User defined rewrites are "normalized" so that our internal rewrites are still properly handled. Before normalizing these rewrites, the Next.js builder will attempt to match server action requests to a`.action` variant. Then the user-defined rewrites flow through the afterFiles normalization ([this part](https://github.com/vercel/vercel/blob/fix/unmatched-action-rewrites/packages/next/src/server-build.ts#L254-L279)) so that when we add `.action` in the builder, we don't drop the suffix. But this normalization can lead to a malformed `dest`. e.g., if I had rewrite like this: ```js { source: '/greedy-rewrite/static/:path*', destination: '/static/:path*', } ``` The builder would go through this flow on an action request to `/greedy-rewrite/static`: 1. It'll attempt to match it to a `.action` output, so `/greedy-rewrite/static` -> `/greedy-rewrite/static.action` 2. The afterFiles normalization will take place, so the original `dest` of `/static/$1` will become `/static/$1$rscsuff` 3. $1 will be an empty string, because it doesn't match the existing capture group. So now `/greedy-rewrite/static.action` -> `/greedy-rewrite/static/.action` 4. `static/.action` is not a valid output, so it'll 404 and the action will break. Existing handling exists for `.rsc` outputs for a similar reason, but only on the index route. I added a similar fix for this in #11688.
ijjk
approved these changes
Jun 4, 2024
Merged
EndangeredMassa
pushed a commit
that referenced
this pull request
Jun 7, 2024
This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @vercel/build-utils@8.2.2 ### Patch Changes - Change node 16.x EOL for Vercel ([#11704](#11704)) - Improve error message and refactor ([#11706](#11706)) - [built-utils] Handle case of not having lockfile when corepack is enabled ([#11697](#11697)) ## vercel@34.2.6 ### Patch Changes - [built-utils] Handle case of not having lockfile when corepack is enabled ([#11697](#11697)) - Updated dependencies \[[`5c12ed695`](5c12ed6), [`21444a38e`](21444a3), [`fa9789a93`](fa9789a), [`c925dc4a1`](c925dc4), [`06d2d860e`](06d2d86), [`b735f37fd`](b735f37)]: - @vercel/build-utils@8.2.2 - @vercel/next@4.2.16 - @vercel/redwood@2.0.10 - @vercel/remix-builder@2.1.7 - @vercel/node@3.1.7 - @vercel/static-build@2.5.11 ## @vercel/client@13.2.9 ### Patch Changes - Updated dependencies \[[`5c12ed695`](5c12ed6), [`21444a38e`](21444a3), [`06d2d860e`](06d2d86)]: - @vercel/build-utils@8.2.2 ## @vercel/gatsby-plugin-vercel-builder@2.0.33 ### Patch Changes - Updated dependencies \[[`5c12ed695`](5c12ed6), [`21444a38e`](21444a3), [`06d2d860e`](06d2d86)]: - @vercel/build-utils@8.2.2 ## @vercel/next@4.2.16 ### Patch Changes - prevent /index from being incorrectly normalized in rewrites ([#11707](#11707)) - Upgrade to @vercel/nft 0.27.2 with browser remapping support ([#11700](#11700)) - ensure unmatched rsc rewrites are routed to correct handler ([#11688](#11688)) ## @vercel/node@3.1.7 ### Patch Changes - Upgrade to @vercel/nft 0.27.2 with browser remapping support ([#11700](#11700)) - Updated dependencies \[[`5c12ed695`](5c12ed6), [`21444a38e`](21444a3), [`06d2d860e`](06d2d86)]: - @vercel/build-utils@8.2.2 ## @vercel/redwood@2.0.10 ### Patch Changes - Upgrade to @vercel/nft 0.27.2 with browser remapping support ([#11700](#11700)) ## @vercel/remix-builder@2.1.7 ### Patch Changes - Upgrade to @vercel/nft 0.27.2 with browser remapping support ([#11700](#11700)) ## @vercel/static-build@2.5.11 ### Patch Changes - Updated dependencies \[]: - @vercel/gatsby-plugin-vercel-builder@2.0.33 ## @vercel-internals/types@1.0.38 ### Patch Changes - Updated dependencies \[[`5c12ed695`](5c12ed6), [`21444a38e`](21444a3), [`06d2d860e`](06d2d86)]: - @vercel/build-utils@8.2.2 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Same reasoning as:
Split this into a separate PR so it can be tested/released separately.