fix(i18n): localised index pages are overwritten (#10250)

* fix(i18n): localised index pages are overwritten * chore: add changeset * chore: add pnpm lock
withastro · Feb 28, 2024 · 57655a9 · 57655a9
1 parent 8ae5d99
commit 57655a9
Show file tree

Hide file tree

Showing 9 changed files with 252 additions and 7 deletions.
diff --git a/.changeset/loud-pianos-pretend.md b/.changeset/loud-pianos-pretend.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes the overwriting of localised index pages with redirects
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
@@ -327,12 +327,6 @@ async function getPathsForRoute(
 	if (route.pathname) {
 		paths.push(route.pathname);
 		builtPaths.add(route.pathname);
-		for (const virtualRoute of route.fallbackRoutes) {
-			if (virtualRoute.pathname) {
-				paths.push(virtualRoute.pathname);
-				builtPaths.add(virtualRoute.pathname);
-			}
-		}
 	} else {
 		const staticPaths = await callGetStaticPaths({
 			mod,
@@ -485,6 +479,19 @@ async function generatePath(
 		addPageName(pathname, options);
 	}
 
+	// Do not render the fallback route if there is already a translated page
+	// with the same path
+	if (
+		route.type === 'fallback' &&
+		// If route is index page, continue rendering. The index page should
+		// always be rendered
+		route.pathname !== '/' &&
+		// Check if there is a translated page with the same path
+		Object.values(options.allPages).some((val) => pathname.match(val.route.pattern))
+	) {
+		return;
+	}
+
 	const url = getUrlForPath(
 		pathname,
 		config.base,

diff --git a/packages/astro/test/fixtures/i18n-routing-fallback-index/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-fallback-index/astro.config.mjs
@@ -0,0 +1,15 @@
+import { defineConfig } from "astro/config";
+
+export default defineConfig({
+	base: "new-site",
+	i18n: {
+		defaultLocale: 'en',
+		locales: [
+			'en', 'pt', 'it'
+		],
+		fallback: {
+			"it": "en",
+			pt: "en"
+		}
+	}
+})
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback-index/package.json b/packages/astro/test/fixtures/i18n-routing-fallback-index/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/i18n-routing-fallback-index",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/index.astro b/packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/index.astro
@@ -0,0 +1,13 @@
+<html>
+<head>
+	<title>Astro</title>
+	<script>
+		console.log("this is a script")
+	</script>
+</head>
+<body>
+	Hello
+</body>
+</html>
+
+
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/pt/index.astro b/packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/pt/index.astro
@@ -0,0 +1,12 @@
+---
+const currentLocale = Astro.currentLocale;
+---
+
+<html>
+<head>
+	<title>Astro</title>
+</head>
+<body>
+Oi essa e index: {currentLocale}
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback/package.json b/packages/astro/test/fixtures/i18n-routing-fallback/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@test/i18n-routing-fallabck",
+  "name": "@test/i18n-routing-fallback",
   "version": "0.0.0",
   "private": true,
   "dependencies": {

diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
@@ -935,6 +935,37 @@ describe('[SSG] i18n routing', () => {
 			let $ = cheerio.load(html);
 			assert.equal($('script').text().includes('console.log("this is a script")'), true);
 		});
+
+		describe('with localised index pages', () => {
+			before(async () => {
+				fixture = await loadFixture({
+					root: './fixtures/i18n-routing-fallback-index/',
+					i18n: {
+						defaultLocale: 'en',
+						locales: [
+							'en',
+							'pt',
+							'it',
+							{
+								path: 'spanish',
+								codes: ['es', 'es-AR'],
+							},
+						],
+						fallback: {
+							it: 'en',
+							spanish: 'en',
+						},
+					},
+				});
+				await fixture.build();
+			});
+
+			it('should render correctly', async () => {
+				let html = await fixture.readFile('/pt/index.html');
+				let $ = cheerio.load(html);
+				assert.equal($('body').text().includes('Oi essa e index'), true);
+			});
+		})
 	});
 
 	describe('i18n routing with fallback and [pathname-prefix-always]', () => {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml