fix(i18n): pass search params to fallback (#12547)

* fix(i18n): pass search params to fallback * test(i18n): add test for search param fix * test(i18n): resolve mantainer comments
withastro · Dec 5, 2024 · 6b6e18d · 6b6e18d
1 parent dec0305
commit 6b6e18d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/.changeset/kind-mayflies-argue.md b/.changeset/kind-mayflies-argue.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug where URL search parameters weren't passed when using the i18n `fallback` feature.
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
@@ -375,9 +375,9 @@ export function redirectToFallback({
 				}
 
 				if (fallbackType === 'rewrite') {
-					return await context.rewrite(newPathname);
+					return await context.rewrite(newPathname + context.url.search);
 				} else {
-					return context.redirect(newPathname);
+					return context.redirect(newPathname + context.url.search);
 				}
 			}
 		}

diff --git a/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/pt/start.astro b/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/pt/start.astro
@@ -1,5 +1,6 @@
 ---
 const currentLocale = Astro.currentLocale;
+const search = Astro.url.search.toString()
 ---
 
 <html>
@@ -8,5 +9,6 @@ const currentLocale = Astro.currentLocale;
 </head>
 <body>
 Oi essa e start: {currentLocale}
+Search: {search}
 </body>
 </html>
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/start.astro b/packages/astro/test/fixtures/i18n-routing-fallback/src/pages/start.astro
@@ -1,8 +1,12 @@
+---
+const search = Astro.url.search
+---
 <html>
 <head>
 	<title>Astro</title>
 </head>
 <body>
 Start
+Search: {search}
 </body>
 </html>
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
@@ -1,6 +1,6 @@
+import * as cheerio from 'cheerio';
 import * as assert from 'node:assert/strict';
 import { after, afterEach, before, describe, it } from 'node:test';
-import * as cheerio from 'cheerio';
 import testAdapter from './test-adapter.js';
 import { loadFixture } from './test-utils.js';
 
@@ -1582,6 +1582,22 @@ describe('[SSR] i18n routing', () => {
 			assert.equal(response.status, 404);
 		});
 
+		it('should pass search to render when using requested locale', async () => {
+			let request = new Request('http://example.com/new-site/pt/start?search=1');
+			let response = await app.render(request);
+			assert.equal(response.status, 200);
+			const text = await response.text();
+			assert.match(text, /Oi essa e start/);
+			assert.match(text, /search=1/);
+		});
+
+		it('should include search on the redirect when using fallback', async () => {
+			let request = new Request('http://example.com/new-site/it/start?search=1');
+			let response = await app.render(request);
+			assert.equal(response.status, 302);
+			assert.equal(response.headers.get('location'), '/new-site/start?search=1');
+		});
+
 		describe('with routing strategy [pathname-prefix-always]', () => {
 			before(async () => {
 				fixture = await loadFixture({