Use .mjs extension when building for netlify edge and vercel serverless (#6317)

bluwy · web-flow · commit b16b7a4d5cf3 · 2023-02-21T22:14:47.000+08:00
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
@@ -30,7 +30,7 @@
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test-fn": "mocha --exit --timeout 20000 test/functions/",
-    "test-edge": "deno test --allow-run --allow-read --allow-net ./test/edge-functions/",
+    "test-edge": "deno test --allow-run --allow-read --allow-net --allow-env ./test/edge-functions/",
     "test": "npm run test-fn"
   },
   "dependencies": {
diff --git a/packages/integrations/netlify/src/integration-edge-functions.ts b/packages/integrations/netlify/src/integration-edge-functions.ts
@@ -122,7 +122,7 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {})
 					build: {
 						client: outDir,
 						server: new URL('./.netlify/edge-functions/', config.root),
-						serverEntry: 'entry.js',
+						serverEntry: 'entry.mjs',
 					},
 				});
 			},
diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs b/packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs
@@ -0,0 +1,9 @@
+import { defineConfig } from 'astro/config';
+import { netlifyEdgeFunctions } from '@astrojs/netlify';
+
+export default defineConfig({
+	adapter: netlifyEdgeFunctions({
+		dist: new URL('./dist/', import.meta.url),
+	}),
+	output: 'server',
+})
diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/prerender/package.json b/packages/integrations/netlify/test/edge-functions/fixtures/prerender/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-netlify-prerender",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/netlify": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/prerender/src/pages/index.astro b/packages/integrations/netlify/test/edge-functions/fixtures/prerender/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+export const prerender = true
+---
+
+<html>
+	<head>
+		<title>testing</title>
+	</head>
+	<body>
+		<h1>testing</h1>
+	</body>
+</html>
diff --git a/packages/integrations/netlify/test/edge-functions/prerender.test.ts b/packages/integrations/netlify/test/edge-functions/prerender.test.ts
@@ -0,0 +1,18 @@
+// @ts-ignore
+import { runBuild } from './test-utils.ts';
+// @ts-ignore
+import { assertEquals } from './deps.ts';
+
+// @ts-ignore
+Deno.test({
+	name: 'Prerender',
+	async fn() {
+		let close = await runBuild('./fixtures/prerender/');
+		const { default: handler } = await import(
+			'./fixtures/prerender/.netlify/edge-functions/entry.mjs'
+		);
+		const response = await handler(new Request('http://example.com/index.html'));
+		assertEquals(response, undefined, 'No response because this is an asset');
+		await close();
+	},
+});
