fix: middleware i18n normalization #2483
Merged
Conversation
This file contains 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
📊 Package size report -0.01%↓
Unchanged files
🤖 This report was automatically generated by pkg-size-action |
eduardoboucas
previously approved these changes
Jun 17, 2024
edge-runtime/lib/next-request.ts
Outdated
| url.pathname = pathname || '/' | ||
| } | ||
| detectedLocale = detected | ||
| ;({ detectedLocale } = normalizeLocalePath(pathname, nextConfig?.i18n?.locales)) |
There was a problem hiding this comment.
nit: This reads a bit weird. Could we do a regular assignment to detectLocale, or is the linter complaining about not using destructuring?
There was a problem hiding this comment.
Good point. I realised that normalizeLocalePath will return undefined for detectedLocale if nextConfig.i18n is undefined, so the conditional wasn't necessary, meaning I can use regular destructuring to a const. Fixed in 13a8cce
orinokai
force-pushed
the
rs/riot-middleware
branch
from
5abd081 to
13a8cce
Compare
eduardoboucas
approved these changes
Jun 17, 2024
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.
Description
Fixes a regression from a previous PR that manifests itself when using the
skipMiddlewareUrlNormalizeoption innext.config.js. In this scenario, the locale was being duplicated during middleware rewrites.The cause was incorrect URL normalization logic in the middleware request handling.
Tests
Integration tests added
Relevant links (GitHub issues, etc.) or a picture of cute animal
Fixes FRA-565