fix(vercel): fallback to static 404.html (#9648)

withastro · Jan 10, 2024 · d7f1903 · d7f1903
1 parent a700a20
commit d7f1903
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 3 deletions.
diff --git a/.changeset/stale-pandas-count.md b/.changeset/stale-pandas-count.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/vercel": patch
+---
+
+Fixes an issue where the serverless function could not respond with a prerendered 404 page.
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -287,9 +287,15 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
 						excludeFiles,
 						maxDuration,
 					});
-					routeDefinitions.push({ src: '/.*', dest: 'render' });
+					for (const route of routes) {
+						if (route.prerender) continue
+						routeDefinitions.push({
+							src: route.pattern.source,
+							dest: 'render',
+						})
+					}
 				}
-
+				const fourOhFourRoute = routes.find((route) => route.pathname === '/404');
 				// Output configuration
 				// https://vercel.com/docs/build-output-api/v3#build-output-configuration
 				await writeJson(new URL(`./config.json`, _config.outDir), {
@@ -303,6 +309,11 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
 						},
 						{ handle: 'filesystem' },
 						...routeDefinitions,
+						...fourOhFourRoute ? [{
+								src: '/.*',
+								dest: fourOhFourRoute.prerender ? '/404.html' : 'render',
+								status: 404,
+							}] : [],
 					],
 					...(imageService || imagesConfig
 						? {

diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/astro.config.mjs b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	output: 'server',
+	adapter: vercel()
+});
diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-prerendered-error-pages",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/404.astro b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/404.astro
@@ -0,0 +1,4 @@
+---
+export const prerender = true
+---
+<h1>404</h1>
diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/one.astro b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/one.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>One</title>
+	</head>
+	<body>
+		<h1>One</h1>
+	</body>
+</html>
diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/two.astro b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/src/pages/two.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Two</title>
+	</head>
+	<body>
+		<h1>Two</h1>
+	</body>
+</html>
diff --git a/packages/integrations/vercel/test/prerendered-error-pages.test.js b/packages/integrations/vercel/test/prerendered-error-pages.test.js
@@ -0,0 +1,23 @@
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('prerendered error pages routing', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/prerendered-error-pages/',
+		});
+		await fixture.build();
+	});
+
+	it('falls back to 404.html', async () => {
+		const deploymentConfig = JSON.parse(await fixture.readFile('../.vercel/output/config.json'));
+		expect(deploymentConfig.routes.at(-1)).to.deep.include({
+			src: '/.*',
+			dest: '/404.html',
+			status: 404,
+		});
+	});
+});
diff --git a/packages/integrations/vercel/test/static.test.js b/packages/integrations/vercel/test/static.test.js
@@ -1,7 +1,7 @@
 import { loadFixture } from './test-utils.js';
 import { expect } from 'chai';
 
-describe('maxDuration', () => {
+describe('static routing', () => {
 	/** @type {import('./test-utils.js').Fixture} */
 	let fixture;
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml