fix(i18n): fallback index when routing is prefix-always #9032
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
|
github-actions
bot
added
the
pkg: astro
ematipico
commented
Nov 9, 2023
Comment on lines
+529
to
+559
| if (i18n.routingStrategy === 'prefix-always') { | ||
| // we attempt to retrieve the index page of the default locale | ||
| const defaultLocaleRoutes = routesByLocale.get(i18n.defaultLocale); | ||
| if (defaultLocaleRoutes) { | ||
| const indexDefaultRoute = defaultLocaleRoutes.find((routeData) => { | ||
| // it should be safe to assume that an index page has "index" in their name | ||
| return routeData.component.includes('index'); | ||
| }); | ||
| if (indexDefaultRoute) { | ||
| // we found the index of the default locale, now we create a root index that will redirect to the index of the default locale | ||
| const pathname = '/'; | ||
| const route = '/'; | ||
|
|
||
| const segments = removeLeadingForwardSlash(route) | ||
| .split(path.posix.sep) | ||
| .filter(Boolean) | ||
| .map((s: string) => { | ||
| validateSegment(s); | ||
| return getParts(s, route); | ||
| }); | ||
| routes.push({ | ||
| ...indexDefaultRoute, | ||
| pathname, | ||
| route, | ||
| segments, | ||
| pattern: getPattern(segments, config), | ||
| type: 'fallback', | ||
| }); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This is the additional code. The rest was just moved to be like this:
if (i18n) {
// new block
if (i18n.routingStrategy === 'prefix-always') {}
if (i18n.falklback) {}
}
matthewp
reviewed
Nov 9, 2023
matthewp
approved these changes
Nov 9, 2023
natemoo-re
pushed a commit
that referenced
this pull request
Nov 22, 2023
* fix(i18n): fallback index when routing is prefix-always * chore: add comment as per feedback
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.
Changes
This PR fixes a case where the
routingStrategyisprefix-alwaysand thesrc/pages/index.astroisn't present.The routing strategy is pretty clear about what it does (now):
This works fine if
src/pages/index.astrois present but it won't if the file isn't there.This PR fixes the issue in dev and SSG (SSR is already handled):
index.htmlfile that redirects to/enTesting
I deleted the
src/pages/index.astrofrom the fixture ofprefix-alwaysand the assertions should still be valid.Docs