Merge branch 'main' of github.com:withastro/astro into astro-11454-im…

…prove-ssr-performance

.changeset/nice-poems-smoke.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes and issue where a server island component returns 404 when `base` is configured in i18n project.

packages/astro/src/core/routing/match.ts

@@ -59,7 +59,8 @@ export function isRouteServerIsland(route: RouteData): boolean {
  */
 export function isRequestServerIsland(request: Request, base = ''): boolean {
 	const url = new URL(request.url);
-	const pathname = url.pathname.slice(base.length);
+	const pathname =
+		base === '/' ? url.pathname.slice(base.length) : url.pathname.slice(base.length + 1);
 
 	return pathname.startsWith(SERVER_ISLAND_BASE_PREFIX);
 }

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

@@ -2194,3 +2194,30 @@ describe('i18n routing with server islands', () => {
 		assert.equal(serverIslandScript.length, 1, 'has the island script');
 	});
 });
+
+describe('i18n routing with server islands and base path', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	/** @type {import('./test-utils').DevServer} */
+	let devServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/i18n-server-island/',
+			base: '/custom',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	after(async () => {
+		await devServer.stop();
+	});
+
+	it('should render the en locale with server island', async () => {
+		const res = await fixture.fetch('/custom/en/island');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		const serverIslandScript = $('script[data-island-id]');
+		assert.equal(serverIslandScript.length, 1, 'has the island script');
+	});
+});