Prevent Vercel serverless generate static redirect pages (#8896)

withastro · Oct 24, 2023 · 5dd1ed5 · 5dd1ed5
1 parent d7fff03
commit 5dd1ed5
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 0 deletions.
diff --git a/.changeset/poor-steaks-confess.md b/.changeset/poor-steaks-confess.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Prevents the Vercel serverless adapter from generating static redirect pages in hybrid mode
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -175,6 +175,7 @@ export default function vercelServerless({
 						serverEntry: 'entry.mjs',
 						client: new URL('./static/', outDir),
 						server: new URL('./dist/', config.root),
+						redirects: false,
 					},
 					vite: {
 						...getSpeedInsightsViteConfig(speedInsights?.enabled || analytics),

diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs b/packages/integrations/vercel/test/fixtures/redirects-serverless/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	output: 'hybrid',
+	adapter: vercel(),
+});
diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json b/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-redirects-serverless",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/src/pages/index.astro b/packages/integrations/vercel/test/fixtures/redirects-serverless/src/pages/index.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Testing</title>
+	</head>
+	<body>
+		<h1>Testing</h1>
+	</body>
+</html>
diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/src/pages/subpage.astro b/packages/integrations/vercel/test/fixtures/redirects-serverless/src/pages/subpage.astro
diff --git a/packages/integrations/vercel/test/redirects-serverless.test.js b/packages/integrations/vercel/test/redirects-serverless.test.js
@@ -0,0 +1,28 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+describe('Redirects Serverless', () => {
+	/** @type {import('astro/test/test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/redirects-serverless/',
+			redirects: {
+				'/one': '/',
+				'/other': '/subpage',
+			},
+		});
+		await fixture.build();
+	});
+
+	it('does not create .html files', async () => {
+		let hasErrored = false;
+		try {
+			await fixture.readFile('../.vercel/output/static/other/index.html');
+		} catch {
+			hasErrored = true;
+		}
+		expect(hasErrored).to.equal(true, 'this file should not exist');
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml