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

[next]: ensure unmatched action rewrites are routed to correct handler #11686

Merged
merged 4 commits into from
Jun 4, 2024

Conversation

ztanner
Copy link
Member

@ztanner ztanner commented Jun 3, 2024

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) 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:

{
  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.

Copy link

changeset-bot bot commented Jun 3, 2024

🦋 Changeset detected

Latest commit: 37f13a0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
@vercel/next Patch
vercel Patch

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

@ztanner ztanner added the pr: automerge Automatically merge the PR when checks pass label Jun 4, 2024
@kodiakhq kodiakhq bot merged commit 7457767 into main Jun 4, 2024
109 checks passed
@kodiakhq kodiakhq bot deleted the fix/unmatched-action-rewrites branch June 4, 2024 18:05
ztanner pushed a commit that referenced this pull request Jun 4, 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@34.2.5

### Patch Changes

- Adds a route for the `.rsc` pathname as well when app has ppr enabled
but not all routes.
([#11681](#11681))

- Updated dependencies
\[[`7457767a7`](7457767),
[`4337ea065`](4337ea0)]:
    -   @vercel/next@4.2.15

## @vercel/fs-detectors@5.2.4

### Patch Changes

- Add support for detecting Turborepo 2
([#11680](#11680))

## @vercel/next@4.2.15

### Patch Changes

- ensure unmatched action rewrites are routed to correct handler
([#11686](#11686))

- Adds a route for the `.rsc` pathname as well when app has ppr enabled
but not all routes.
([#11681](#11681))

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
kodiakhq bot pushed a commit that referenced this pull request Jun 4, 2024
…11688)

Same reasoning as:

- #11686

Split this into a separate PR so it can be tested/released separately.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: automerge Automatically merge the PR when checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants