fix: increase default locale match specificity to avoid false positives

orinokai · orinokai · commit 7cef5fefc184 · 2023-01-16T10:38:15.000Z
diff --git a/packages/runtime/src/helpers/redirects.ts b/packages/runtime/src/helpers/redirects.ts
@@ -143,7 +143,7 @@ const generateStaticIsrRewrites = ({
       return
     }
     // The default locale is served from the root, not the localised path
-    if (i18n?.defaultLocale && route.startsWith(`/${i18n.defaultLocale}`)) {
+    if (i18n?.defaultLocale && (route.startsWith(`/${i18n.defaultLocale}/`) || route === `/${i18n.defaultLocale}`)) {
       route = route.slice(i18n.defaultLocale.length + 1) || '/'
       staticRoutePaths.add(route)
       if (matchesMiddleware(middleware, route)) {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ const generateStaticIsrRewrites = ({`
`143`	`143`	`return`
`144`	`144`	`}`
`145`	`145`	`// The default locale is served from the root, not the localised path`
`146`		- if (i18n?.defaultLocale && route.startsWith(`/${i18n.defaultLocale}`)) {
	`146`	+ if (i18n?.defaultLocale && (route.startsWith(`/${i18n.defaultLocale}/`) \|\| route === `/${i18n.defaultLocale}`)) {
`147`	`147`	`route = route.slice(i18n.defaultLocale.length + 1) \|\| '/'`
`148`	`148`	`staticRoutePaths.add(route)`
`149`	`149`	`if (matchesMiddleware(middleware, route)) {`