fix: include route prefix in vercel func names, fix #8401 (#8408)

* fix: include route prefix in vercel func names * chore: add changeset * chore: update pnpm lockfile * refactor: simplify logic that generates vercel func names * fix: properly remove entryFile prefix from func name * refactor: change how vercel function names are generated --------- Co-authored-by: Nate Moore <[email protected]>
withastro · Sep 6, 2023 · 9ffa1a8 · 9ffa1a8
1 parent 61ad70f
commit 9ffa1a8
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 6 deletions.
diff --git a/.changeset/modern-guests-float.md b/.changeset/modern-guests-float.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix serverless function naming conflicts for routes with identical filenames but different directory structures
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -207,14 +207,25 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
 
 				// Multiple entrypoint support
 				if (_entryPoints.size) {
-					for (const [route, entryFile] of _entryPoints) {
-						const func = basename(entryFile.toString()).replace(/\.mjs$/, '');
+					const getRouteFuncName = (route: RouteData) =>
+						route.component.replace('src/pages/', '')
+
+          const getFallbackFuncName = (entryFile: URL) =>
+            basename(entryFile.toString())
+              .replace('entry.', '')
+              .replace(/\.mjs$/, '');
+
+          for (const [route, entryFile] of _entryPoints) {
+            const func = route.component.startsWith('src/pages/')
+							? getRouteFuncName(route)
+							: getFallbackFuncName(entryFile)
+
 						await createFunctionFolder(func, entryFile, filesToInclude, logger);
 						routeDefinitions.push({
-							src: route.pattern.source,
-							dest: func,
-						});
-					}
+              src: route.pattern.source,
+              dest: func,
+            });
+          }
 				} else {
 					await createFunctionFolder(
 						'render',

diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs
@@ -0,0 +1,10 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	adapter: vercel({
+		// Pass some value to make sure it doesn't error out
+		includeFiles: ['included.js'],
+	}),
+	output: 'server'
+});
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js
@@ -0,0 +1 @@
+'works'
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-serverless-with-dynamic-routes",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/...tegrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro b/...tegrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro
@@ -0,0 +1,12 @@
+---
+export const prerender = false;
+---
+
+<html>
+	<head>
+		<title>testing {Astro.params.id}</title>
+	</head>
+	<body>
+		<h1>testing {Astro.params.id}</h1>
+	</body>
+</html>
diff --git a/...es/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js b/...es/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js
@@ -0,0 +1,7 @@
+export const prerender = false;
+
+export async function GET({ params }) {
+	return Response.json({
+		id: params.id
+	});
+}
diff --git a/...es/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro b/...es/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+export const prerender = import.meta.env.PRERENDER;
+---
+
+<html>
+	<head>
+		<title>testing</title>
+	</head>
+	<body>
+		<h1>testing</h1>
+	</body>
+</html>
diff --git a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
@@ -0,0 +1,22 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+describe('Serverless with dynamic routes', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		process.env.PRERENDER = true;
+		fixture = await loadFixture({
+			root: './fixtures/serverless-with-dynamic-routes/',
+			output: 'hybrid',
+		});
+		await fixture.build();
+	});
+
+	it('build successful', async () => {
+		expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
+		expect(await fixture.readFile('../.vercel/output/functions/[id]/index.astro.func/.vc-config.json')).to.be.ok;
+		expect(await fixture.readFile('../.vercel/output/functions/api/[id].js.func/.vc-config.json')).to.be.ok;
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml