withastro · ematipico · Apr 16, 2025 · Apr 16, 2025
diff --git a/.changeset/orange-cloths-camp.md b/.changeset/orange-cloths-camp.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a regression where using `next('/')` didn't correctly return the requested route.
diff --git a/packages/astro/src/core/routing/rewrite.ts b/packages/astro/src/core/routing/rewrite.ts
@@ -80,7 +80,7 @@ export function findRouteToRewrite({
 	}
 
 	// Convert '/' to '' for trailingSlash: 'never'
-	if (pathname === '/' && !shouldAppendSlash) {
+	if (pathname === '/' && base !== '/' && !shouldAppendSlash) {
 		pathname = '';
 	}
 

diff --git a/packages/astro/test/fixtures/rewrite-issue-13633/astro.config.mjs b/packages/astro/test/fixtures/rewrite-issue-13633/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+	base: '',
+	trailingSlash: 'never',
+	output: 'server'
+});
diff --git a/packages/astro/test/fixtures/rewrite-issue-13633/package.json b/packages/astro/test/fixtures/rewrite-issue-13633/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/rewrite-issue13633",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/rewrite-issue-13633/src/middleware.js b/packages/astro/test/fixtures/rewrite-issue-13633/src/middleware.js
@@ -0,0 +1,4 @@
+export const onRequest = async (ctx, next) => {
+	const response = await next('/');
+	return response;
+};
diff --git a/packages/astro/test/fixtures/rewrite-issue-13633/src/pages/about.astro b/packages/astro/test/fixtures/rewrite-issue-13633/src/pages/about.astro
@@ -0,0 +1,12 @@
+---
+
+---
+
+<html lang="en">
+<head>
+	<title>About page</title>
+</head>
+<body>
+<h1>About page</h1>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/rewrite-issue-13633/src/pages/index.astro b/packages/astro/test/fixtures/rewrite-issue-13633/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+
+---
+
+<html lang="en">
+<head>
+	<title>Index page</title>
+</head>
+<body>
+<h1>Index page</h1>
+</body>
+</html>
diff --git a/packages/astro/test/rewrite.test.js b/packages/astro/test/rewrite.test.js
@@ -728,3 +728,28 @@ describe('Runtime error in SSR, custom 500', () => {
 		assert.equal($('h1').text(), 'Expected http status of index page is 200');
 	});
 });
+
+describe('Issue 13633', async () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	let devServer;
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/rewrite-issue-13633/',
+			output: 'server',
+			adapter: testAdapter(),
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	after(async () => {
+		await devServer.stop();
+	});
+
+	it('should correctly rewrite to be homepage', async () => {
+		const html = await fixture.fetch('/foo').then((res) => res.text());
+		const $ = cheerioLoad(html);
+
+		assert.equal($('h1').text(), 'Index page');
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml