Handle unmatched 404 when using prerender in dev mode (#5983)

* fix(#5975): unmatched static paths should 404 during dev * chore: add changeset Co-authored-by: Nate Moore <[email protected]>
withastro · Jan 25, 2023 · b53e071 · b53e071
1 parent 03e374f
commit b53e071
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.changeset/fluffy-cherries-shake.md b/.changeset/fluffy-cherries-shake.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a dev server edge case where prerender + getStaticPaths would not 404 on an unmatched route
diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts
@@ -47,7 +47,7 @@ export async function getParamsAndProps(
 			routeCache.set(route, routeCacheEntry);
 		}
 		const matchedStaticPath = findPathItemByKey(routeCacheEntry.staticPaths, params, route);
-		if (!matchedStaticPath && !ssr) {
+		if (!matchedStaticPath && (ssr ? mod.prerender : true)) {
 			return GetParamsAndPropsError.NoMatchingStaticPath;
 		}
 		// Note: considered using Object.create(...) for performance

diff --git a/packages/astro/test/ssr-prerender-get-static-paths.test.js b/packages/astro/test/ssr-prerender-get-static-paths.test.js
@@ -72,7 +72,9 @@ describe('prerender getStaticPaths - 404 behavior', () => {
 
 	it('resolves 404 on pattern match without static path - named params', async () => {
 		const res = await fixture.fetch('/pizza/provolone-pineapple');
+		const html = await res.text();
 		expect(res.status).to.equal(404);
+		expect(html).to.match(/404/);
 	});
 
 	it('resolves 200 on matching static path - rest params', async () => {
@@ -82,7 +84,9 @@ describe('prerender getStaticPaths - 404 behavior', () => {
 
 	it('resolves 404 on pattern match without static path - rest params', async () => {
 		const res = await fixture.fetch('/pizza/pizza-hut');
+		const html = await res.text();
 		expect(res.status).to.equal(404);
+		expect(html).to.match(/404/);
 	});
 });