fix(vercel): copy static assets after all integrations (#508)

* fix(vercel): copy static assets after all integrations * Format * Fix logic * Format
withastro · Jan 20, 2025 · af69a12 · af69a12
1 parent ce66003
commit af69a12
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 6 deletions.
diff --git a/.changeset/fluffy-icons-beg.md b/.changeset/fluffy-icons-beg.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fixes a bug that prevented static assets generated by integrations from being deployed
diff --git a/packages/vercel/src/index.ts b/packages/vercel/src/index.ts
@@ -215,6 +215,20 @@ export default function vercelAdapter({
 						format: 'directory',
 						redirects: false,
 					},
+					integrations: [
+						{
+							name: 'astro:copy-vercel-output',
+							hooks: {
+								'astro:build:done': async () => {
+									if (_buildOutput === 'static') {
+										cpSync(_config.outDir, new URL('./.vercel/output/static/', _config.root), {
+											recursive: true,
+										});
+									}
+								},
+							},
+						},
+					],
 					vite: {
 						ssr: {
 							external: ['@vercel/nft'],
@@ -308,13 +322,13 @@ export default function vercelAdapter({
 					if (existsSync(staticDir)) {
 						emptyDir(staticDir);
 					}
-					mkdirSync(new URL('./.vercel/output/static/', _config.root), { recursive: true });
+					mkdirSync(new URL('./.vercel/output/static/', _config.root), {
+						recursive: true,
+					});
 
-					if (_buildOutput === 'static' && staticDir) {
-						cpSync(_config.outDir, new URL('./.vercel/output/static/', _config.root), {
-							recursive: true,
-						});
-					} else {
+					mkdirSync(new URL('./.vercel/output/server/', _config.root));
+
+					if (_buildOutput !== 'static') {
 						cpSync(_config.build.client, new URL('./.vercel/output/static/', _config.root), {
 							recursive: true,
 						});

diff --git a/packages/vercel/test/fixtures/integration-assets/astro.config.mjs b/packages/vercel/test/fixtures/integration-assets/astro.config.mjs
@@ -0,0 +1,10 @@
+import vercel from '@astrojs/vercel';
+import { defineConfig } from 'astro/config';
+
+import sitemap from '@astrojs/sitemap';
+
+export default defineConfig({
+  site: 'https://example.com',
+  adapter: vercel({}),
+  integrations: [sitemap()]
+});
diff --git a/packages/vercel/test/fixtures/integration-assets/package.json b/packages/vercel/test/fixtures/integration-assets/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@test/astro-vercel-integration-assets",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/sitemap": "^3.2.1",
+    "@astrojs/vercel": "workspace:*",
+    "astro": "^5.1.6"
+  }
+}
diff --git a/packages/vercel/test/fixtures/integration-assets/src/pages/one.astro b/packages/vercel/test/fixtures/integration-assets/src/pages/one.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>One</title>
+	</head>
+	<body>
+		<h1>One</h1>
+	</body>
+</html>
diff --git a/packages/vercel/test/fixtures/integration-assets/src/pages/two.astro b/packages/vercel/test/fixtures/integration-assets/src/pages/two.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Two</title>
+	</head>
+	<body>
+		<h1>Two</h1>
+	</body>
+</html>
diff --git a/packages/vercel/test/integration-assets.test.js b/packages/vercel/test/integration-assets.test.js
@@ -0,0 +1,20 @@
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
+import { loadFixture } from './test-utils.js';
+
+describe('Assets generated by integrations', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/integration-assets/',
+		});
+		await fixture.build();
+	});
+
+	it('moves static assets generated by integrations to the correct location', async () => {
+		const sitemap = await fixture.readFile('../.vercel/output/static/sitemap-index.xml');
+		assert(sitemap.includes('<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'));
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml