fix(vercel): include 404.html as fallback in the static adapter (#9591)

* include 404.html as fallback * add changeset * include only when 404.astro exists * add test * route.component -> route.pathname
withastro · Jan 5, 2024 · 22a5405 · 22a5405
1 parent 64a8470
commit 22a5405
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 0 deletions.
diff --git a/.changeset/brown-turtles-invite.md b/.changeset/brown-turtles-invite.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/vercel": patch
+---
+
+Fixes an issue where 404.astro was not used in static mode.
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
@@ -125,6 +125,11 @@ export default function vercelStatic({
 							continue: true,
 						},
 						{ handle: 'filesystem' },
+						...routes.find(route => route.pathname === "/404") ? [{
+							src: `/.*`,
+							dest: `/404.html`,
+							status: 404,
+						}] : [],
 					],
 					...(imageService || imagesConfig
 						? {

diff --git a/packages/integrations/vercel/test/fixtures/static/astro.config.mjs b/packages/integrations/vercel/test/fixtures/static/astro.config.mjs
@@ -0,0 +1,6 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/static';
+
+export default defineConfig({
+	adapter: vercel()
+});
diff --git a/packages/integrations/vercel/test/fixtures/static/package.json b/packages/integrations/vercel/test/fixtures/static/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-static",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vercel/test/fixtures/static/src/pages/404.astro b/packages/integrations/vercel/test/fixtures/static/src/pages/404.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>404</title>
+	</head>
+	<body>
+		<h1>404</h1>
+	</body>
+</html>
diff --git a/packages/integrations/vercel/test/fixtures/static/src/pages/one.astro b/packages/integrations/vercel/test/fixtures/static/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/static/src/pages/two.astro b/packages/integrations/vercel/test/fixtures/static/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/static.test.js b/packages/integrations/vercel/test/static.test.js
@@ -0,0 +1,26 @@
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('maxDuration', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/static/',
+		});
+		await fixture.build();
+	});
+
+	it('falls back to 404.html', async () => {
+		const deploymentConfig = JSON.parse(
+			await fixture.readFile('../.vercel/output/config.json')
+		);
+		// change the index if necesseary
+		expect(deploymentConfig.routes[2]).to.deep.include({
+			src: '/.*',
+			dest: '/404.html',
+			status: 404
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml