withastro · bluwy · Mar 16, 2023 · Mar 15, 2023 · Mar 15, 2023
diff --git a/.changeset/yellow-grapes-design.md b/.changeset/yellow-grapes-design.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix prerendered 404 page handling in SSR
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
@@ -102,7 +102,9 @@ export class App {
 			if (routeData.prerender) return undefined;
 			return routeData;
 		} else if (matchNotFound) {
-			return matchRoute('/404', this.#manifestData);
+			const notFoundRouteData = matchRoute('/404', this.#manifestData);
+			if (notFoundRouteData?.prerender) return undefined;
+			return notFoundRouteData;
 		} else {
 			return undefined;
 		}

diff --git a/packages/astro/test/fixtures/ssr-prerender-404/package.json b/packages/astro/test/fixtures/ssr-prerender-404/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/ssr-prerender-404",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/ssr-prerender-404/src/pages/404.astro b/packages/astro/test/fixtures/ssr-prerender-404/src/pages/404.astro
@@ -0,0 +1,5 @@
+---
+export const prerender = true
+---
+
+Page does not exist
diff --git a/packages/astro/test/fixtures/ssr-prerender-404/src/pages/static.astro b/packages/astro/test/fixtures/ssr-prerender-404/src/pages/static.astro
@@ -0,0 +1,18 @@
+---
+export const prerender = true;
+
+const { searchParams } = Astro.url;
+---
+
+<html>
+<head>
+	<title>Static Page</title>
+	<script>
+		console.log('hello world');
+	</script>
+</head>
+	<body>
+		<h1 id="greeting">Hello world!</h1>
+		<div id="searchparams">{searchParams.get('q')}</div>
+	</body>
+</html>
diff --git a/packages/astro/test/ssr-prerender-404.test.js b/packages/astro/test/ssr-prerender-404.test.js
@@ -0,0 +1,33 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+import testAdapter from './test-adapter.js';
+
+describe('SSR: prerender 404', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/ssr-prerender-404/',
+			output: 'server',
+			adapter: testAdapter(),
+			experimental: {
+				prerender: true,
+			},
+		});
+		await fixture.build();
+	});
+
+	describe('Prerendering', () => {
+		it('Prerendered 404.astro page is not rendered', async () => {
+			const app = await fixture.loadTestAdapterApp();
+			const request = new Request('http://example.com/non-existent-page');
+			const response = await app.render(request);
+			expect(response.status).to.equal(404);
+			expect(response.statusText).to.equal(
+				'Not found',
+				'should be actual 404 response, not 404 page'
+			);
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml