Fix: [i18n] Dynamic spread route in [locale] folder causes false-positive match when i18n.fallbackType = "rewrite" (#14059)

Co-authored-by: Emanuele Stoppa <[email protected]>


Co-authored-by: florian-lefebvre <[email protected]>
Co-authored-by: ematipico <[email protected]>

Author: 3 people

.changeset/rare-lights-camp.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug in i18n implementation, where Astro didn't emit the correct pages when `fallback` is enabled, and a locale uses a catch-all route, e.g. `src/pages/es/[...catchAll].astro`

packages/astro/src/core/build/generate.ts

@@ -14,6 +14,7 @@ import {
 	joinPaths,
 	removeLeadingForwardSlash,
 	removeTrailingForwardSlash,
+	trimSlashes,
 } from '../../core/path.js';
 import { toFallbackType, toRoutingStrategy } from '../../i18n/utils.js';
 import { runHookBuildGenerated, toIntegrationResolvedRoute } from '../../integrations/hooks.js';
@@ -525,15 +526,23 @@ async function generatePath(
 	// Do not render the fallback route if there is already a translated page
 	// with the same path
 	if (route.type === 'fallback' && route.pathname !== '/') {
-		// Get the locale from the pathname
-		let locale = removeLeadingForwardSlash(pathname).split('/')[0];
 		if (
 			Object.values(options.allPages).some((val) => {
 				if (val.route.pattern.test(pathname)) {
 					// Check if we've matched a dynamic route
-					if (val.route.segments && val.route.segments.length !== 0) {
-						// Check that the route is in a matching locale folder
-						if (val.route.segments[0][0].content !== locale) return false;
+					if (val.route.params && val.route.params.length !== 0) {
+						// Make sure the pathname matches an entry in distURL
+						if (
+							val.route.distURL &&
+							!val.route.distURL.find(
+								(url) =>
+									url.href
+										.replace(config.outDir.toString(), '')
+										.replace(/(?:\/index\.html|\.html)$/, '') == trimSlashes(pathname),
+							)
+						) {
+							return false;
+						}
 					}
 					// Route matches
 					return true;

packages/astro/test/fixtures/i18n-routing-fallback-rewrite/src/pages/es/[...tags].astro

@@ -0,0 +1,9 @@
+---
+export async function getStaticPaths() {
+  return [
+    { params: { tags: 'tags/tag-1' } }, 
+  ];
+}
+const { tags } = Astro.params;
+---
+<span id="tag">{tags}</span>

packages/astro/test/fixtures/i18n-routing-fallback-rewrite/src/pages/test.astro

@@ -0,0 +1,5 @@
+---
+
+---
+<span id="test">test</span>
+

packages/astro/test/i18n-routing.test.js

@@ -1095,6 +1095,10 @@ describe('[SSG] i18n routing', () => {
 			let html = await fixture.readFile('/es/page/page-1/index.html');
 			assert.equal(html.includes('page/page-1'), true);
 		});
+		it('should rewrite a fallback route when a dynamic spread route exists in the locale folder', async () => {
+			let html = await fixture.readFile('/es/test/index.html');
+			assert.equal(html.includes('test'), true);
+		});
 	});
 
 	describe('i18n routing with fallback rewrite from dynamic route and config.build.format: file', () => {
@@ -1123,6 +1127,10 @@ describe('[SSG] i18n routing', () => {
 			let html = await fixture.readFile('/es/page/page-1.html');
 			assert.equal(html.includes('page/page-1'), true);
 		});
+		it('should rewrite a fallback route when a dynamic spread route exists in the locale folder', async () => {
+			let html = await fixture.readFile('/es/test.html');
+			assert.equal(html.includes('test'), true);
+		});
 	});
 
 	describe('i18n routing with fallback rewrite from dynamic route with base', () => {