fix(i18n): fallback SSR (withastro#10755)

* fix(i18n): fallback SSR * Update .changeset/old-pugs-jog.md Co-authored-by: Florian Lefebvre <[email protected]> --------- Co-authored-by: Florian Lefebvre <[email protected]>
PeterDraex · Apr 23, 2024 · 432369a · 432369a
1 parent ceffbb1
commit 432369a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/.changeset/old-pugs-jog.md b/.changeset/old-pugs-jog.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes a case where the i18n fallback failed to correctly redirect to the index page with SSR enabled
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
@@ -343,6 +343,7 @@ export function redirectToFallback({
 	locales,
 	defaultLocale,
 	strategy,
+	base,
 }: MiddlewarePayload) {
 	return function (context: APIContext, response: Response): Response {
 		if (response.status >= 300 && fallback) {
@@ -370,7 +371,11 @@ export function redirectToFallback({
 				// If a locale falls back to the default locale, we want to **remove** the locale because
 				// the default locale doesn't have a prefix
 				if (pathFallbackLocale === defaultLocale && strategy === 'pathname-prefix-other-locales') {
-					newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
+					if (context.url.pathname.includes(`${base}`)) {
+						newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
+					} else {
+						newPathname = context.url.pathname.replace(`/${urlLocale}`, `/`);
+					}
 				} else {
 					newPathname = context.url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);
 				}

diff --git a/packages/astro/src/i18n/middleware.ts b/packages/astro/src/i18n/middleware.ts
@@ -3,7 +3,6 @@ import type { SSRManifestI18n } from '../core/app/types.js';
 import { ROUTE_TYPE_HEADER } from '../core/constants.js';
 import {
 	type MiddlewarePayload,
-	getPathByLocale,
 	normalizeTheLocale,
 	notFound,
 	redirectToDefaultLocale,

diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
@@ -1871,3 +1871,36 @@ describe('i18n routing does not break assets and endpoints', () => {
 		});
 	});
 });
+
+describe('SSR fallback from missing locale index to default locale index', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	let app;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/i18n-routing-prefix-other-locales/',
+			output: 'server',
+			adapter: testAdapter(),
+			i18n: {
+				defaultLocale: 'en',
+				locales: ['en', 'fr'],
+				routing: {
+					prefixDefaultLocale: false,
+				},
+				fallback: {
+					fr: 'en',
+				},
+			},
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('should correctly redirect', async () => {
+		let request = new Request('http://example.com/fr');
+		let response = await app.render(request);
+		assert.equal(response.status, 302);
+		assert.equal(response.headers.get('location'), '/');
+	});
+});