node: skip ssr for pre-rendered pages

.changeset/ready-tigers-try.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/node': patch
+---
+
+Fixes an issue where the Node.js adapter could fail to serve a 404 page matching a pre-rendered dynamic route pattern.

packages/integrations/node/src/serve-app.ts

@@ -50,7 +50,8 @@ export function createAppHandler(app: NodeApp, options: Options): RequestHandler
 		// Redirects are considered prerendered routes in static mode, but we want to
 		// handle them dynamically, so prerendered routes are included here.
 		const routeData = app.match(request, true);
-		if (routeData) {
+		// But we still want to skip prerendered pages.
+		if (routeData && !(routeData.type === 'page' && routeData.prerender)) {
 			const response = await als.run(request.url, () =>
 				app.render(request, {
 					addCookieHeader: true,

packages/integrations/node/test/fixtures/prerender/src/pages/dogs/[dog].astro

@@ -0,0 +1,15 @@
+---
+export const prerender = true
+
+export function getStaticPaths() {
+  return [
+    { params: { dog: "clifford" }},
+    { params: { dog: "rover" }},
+    { params: { dog: "spot" }},
+  ];
+}
+
+const { dog } = Astro.params;
+---
+
+<h1>Good dog, {dog}!</h1>

packages/integrations/node/test/prerender.test.js

@@ -84,6 +84,21 @@ describe('Prerendering', () => {
 			assert.equal(res.status, 200);
 			assert.equal($('h1').text(), 'Two');
 		});
+
+		it('Can render prerendered dynamic route', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/some-base/dogs/rover`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			assert.equal(res.status, 200);
+			assert.equal($('h1').text(), 'Good dog, rover!');
+		});
+
+		it('Can render 404 matching a prerendered dynamic route pattern', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/some-base/dogs/unknown`);
+
+			assert.equal(res.status, 404);
+		});
 	});
 
 	describe('Without base', async () => {
@@ -146,6 +161,21 @@ describe('Prerendering', () => {
 			assert.equal(res.status, 200);
 			assert.equal($('h1').text(), 'Two');
 		});
+
+		it('Can render prerendered dynamic route', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/dogs/rover`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			assert.equal(res.status, 200);
+			assert.equal($('h1').text(), 'Good dog, rover!');
+		});
+
+		it('Can render 404 matching a prerendered dynamic route pattern', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/dogs/unknown`);
+
+			assert.equal(res.status, 404);
+		});
 	});
 
 	describe('Via integration', () => {
@@ -318,6 +348,21 @@ describe('Hybrid rendering', () => {
 			assert.equal(res.status, 200);
 			assert.equal($('h1').text(), 'One');
 		});
+
+		it('Can render prerendered dynamic route', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/some-base/dogs/rover`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			assert.equal(res.status, 200);
+			assert.equal($('h1').text(), 'Good dog, rover!');
+		});
+
+		it('Can render 404 matching a prerendered dynamic route pattern', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/some-base/dogs/unknown`);
+
+			assert.equal(res.status, 404);
+		});
 	});
 
 	describe('Without base', () => {
@@ -379,6 +424,21 @@ describe('Hybrid rendering', () => {
 			assert.equal(res.status, 200);
 			assert.equal($('h1').text(), 'One');
 		});
+
+		it('Can render prerendered dynamic route', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/dogs/rover`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			assert.equal(res.status, 200);
+			assert.equal($('h1').text(), 'Good dog, rover!');
+		});
+
+		it('Can render 404 matching a prerendered dynamic route pattern', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/dogs/unknown`);
+
+			assert.equal(res.status, 404);
+		});
 	});
 
 	describe('Shared modules', () => {