From 0d54afd7ed9497014c71327019799609866f2c0d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Apr 2022 16:07:18 -0400
Subject: [PATCH] fix adapter-netlify

---
 .changeset/great-lies-agree.md                 |  5 +++++
 packages/adapter-netlify/index.js              | 18 +++++++++---------
 packages/adapter-netlify/package.json          |  2 +-
 packages/adapter-netlify/rollup.config.js      |  2 +-
 .../src/{edge_function.js => edge.js}          |  0
 .../src/{handler.js => serverless.js}          |  0
 6 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/great-lies-agree.md
 rename packages/adapter-netlify/src/{edge_function.js => edge.js} (100%)
 rename packages/adapter-netlify/src/{handler.js => serverless.js} (100%)

diff --git a/.changeset/great-lies-agree.md b/.changeset/great-lies-agree.md
new file mode 100644
index 000000000000..c4f6eb0b9c59
--- /dev/null
+++ b/.changeset/great-lies-agree.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-netlify': patch
+---
+
+Fix adapter-netlify edge functions
diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
index 3810dcb1a17d..917dabe00e65 100644
--- a/packages/adapter-netlify/index.js
+++ b/packages/adapter-netlify/index.js
@@ -29,13 +29,13 @@ import toml from '@iarna/toml';
  */
 
 const files = fileURLToPath(new URL('./files', import.meta.url).href);
-const src = fileURLToPath(new URL('./src', import.meta.url).href);
-const edgeSetInEnvVar =
+
+const edge_set_in_env_var =
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === 'true' ||
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === '1';
 
 /** @type {import('.')} */
-export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
+export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 	return {
 		name: '@sveltejs/adapter-netlify',
 
@@ -50,7 +50,7 @@ export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
 			builder.rimraf('.netlify/functions-internal');
 			builder.rimraf('.netlify/server');
 			builder.rimraf('.netlify/package.json');
-			builder.rimraf('.netlify/handler.js');
+			builder.rimraf('.netlify/serverless.js');
 
 			builder.log.minor(`Publishing to "${publish}"`);
 
@@ -114,7 +114,7 @@ async function generate_edge_functions({ builder }) {
 	builder.log.minor('Generating Edge Function...');
 	const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
-	builder.copy(`${src}/edge_function.js`, `${tmp}/entry.js`, {
+	builder.copy(`${files}/edge.js`, `${tmp}/entry.js`, {
 		replace: {
 			'0SERVER': `${relativePath}/index.js`,
 			MANIFEST: './manifest.js'
@@ -205,8 +205,8 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 					});
 
 					const fn = esm
-						? `import { init } from '../handler.js';\n\nexport const handler = init(${manifest});\n`
-						: `const { init } = require('../handler.js');\n\nexports.handler = init(${manifest});\n`;
+						? `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`
+						: `const { init } = require('../serverless.js');\n\nexports.handler = init(${manifest});\n`;
 
 					writeFileSync(`.netlify/functions-internal/${name}.js`, fn);
 
@@ -223,8 +223,8 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 		});
 
 		const fn = esm
-			? `import { init } from '../handler.js';\n\nexport const handler = init(${manifest});\n`
-			: `const { init } = require('../handler.js');\n\nexports.handler = init(${manifest});\n`;
+			? `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`
+			: `const { init } = require('../serverless.js');\n\nexports.handler = init(${manifest});\n`;
 
 		writeFileSync('.netlify/functions-internal/render.js', fn);
 		redirects.push('* /.netlify/functions/render 200');
diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
index 69cbf0c1e7ac..42a22e8cf0f1 100644
--- a/packages/adapter-netlify/package.json
+++ b/packages/adapter-netlify/package.json
@@ -23,7 +23,7 @@
 	],
 	"scripts": {
 		"dev": "rimraf files && rollup -cw",
-		"build": "rimraf files && rollup -c",
+		"build": "rimraf files && rollup -c && cp src/edge.js files/edge.js",
 		"test": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
 		"check": "tsc",
 		"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js
index ffbdb912e0e9..7e4e1a1bad3d 100644
--- a/packages/adapter-netlify/rollup.config.js
+++ b/packages/adapter-netlify/rollup.config.js
@@ -5,7 +5,7 @@ import json from '@rollup/plugin-json';
 /** @type {import('rollup').RollupOptions} */
 const config = {
 	input: {
-		handler: 'src/handler.js',
+		serverless: 'src/serverless.js',
 		shims: 'src/shims.js'
 	},
 	output: [
diff --git a/packages/adapter-netlify/src/edge_function.js b/packages/adapter-netlify/src/edge.js
similarity index 100%
rename from packages/adapter-netlify/src/edge_function.js
rename to packages/adapter-netlify/src/edge.js
diff --git a/packages/adapter-netlify/src/handler.js b/packages/adapter-netlify/src/serverless.js
similarity index 100%
rename from packages/adapter-netlify/src/handler.js
rename to packages/adapter-netlify/src/serverless.js