From ee7cd45746ec8dbb5b09a548f826bf758f9ae393 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:03:36 -0800
Subject: [PATCH] [fix] set platform to neutral for cloudflare build (#8083)

* [fix] set platform to neutral for cloudflare build

* set esbuild platform to neutral

* consolidate changesets

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/chilly-pumas-look.md              | 8 ++++++++
 packages/adapter-cloudflare-workers/index.js | 7 ++++---
 packages/adapter-cloudflare/index.js         | 5 +++--
 packages/adapter-netlify/index.js            | 4 ++--
 packages/adapter-vercel/index.js             | 4 ++--
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/chilly-pumas-look.md

diff --git a/.changeset/chilly-pumas-look.md b/.changeset/chilly-pumas-look.md
new file mode 100644
index 000000000000..14fd1ac0e770
--- /dev/null
+++ b/.changeset/chilly-pumas-look.md
@@ -0,0 +1,8 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+[fix] set esbuild platform to neutral
diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js
index a2c106d1a9b3..4cef854fd5b9 100644
--- a/packages/adapter-cloudflare-workers/index.js
+++ b/packages/adapter-cloudflare-workers/index.js
@@ -62,14 +62,15 @@ export default function ({ config = 'wrangler.toml' } = {}) {
 			);
 
 			await esbuild.build({
-				platform: 'browser',
+				platform: 'neutral',
+				mainFields: ['module', 'main'],
+				conditions: ['worker'],
 				sourcemap: 'linked',
 				target: 'es2020',
 				entryPoints: [`${tmp}/entry.js`],
 				outfile: main,
 				bundle: true,
-				external: ['__STATIC_CONTENT_MANIFEST'],
-				format: 'esm'
+				external: ['__STATIC_CONTENT_MANIFEST']
 			});
 
 			builder.log.minor('Copying assets...');
diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js
index fd5a60c3e230..bcb5bab68371 100644
--- a/packages/adapter-cloudflare/index.js
+++ b/packages/adapter-cloudflare/index.js
@@ -54,13 +54,14 @@ export default function () {
 			});
 
 			await esbuild.build({
-				platform: 'browser',
+				platform: 'neutral',
+				mainFields: ['module', 'main'],
+				conditions: ['worker'],
 				sourcemap: 'linked',
 				target: 'es2020',
 				entryPoints: [`${tmp}/_worker.js`],
 				outfile: `${dest}/_worker.js`,
 				allowOverwrite: true,
-				format: 'esm',
 				bundle: true
 			});
 		}
diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
index 99b0aa85a6e5..31158ed6bd0d 100644
--- a/packages/adapter-netlify/index.js
+++ b/packages/adapter-netlify/index.js
@@ -129,11 +129,11 @@ async function generate_edge_functions({ builder }) {
 	);
 
 	await esbuild.build({
+		platform: 'neutral',
+		mainFields: ['module', 'main'],
 		entryPoints: [`${tmp}/entry.js`],
 		outfile: '.netlify/edge-functions/render.js',
 		bundle: true,
-		format: 'esm',
-		platform: 'browser',
 		sourcemap: 'linked',
 		target: 'es2020'
 	});
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
index 69ab0a8ba9d5..28eaa5ee1b93 100644
--- a/packages/adapter-vercel/index.js
+++ b/packages/adapter-vercel/index.js
@@ -122,12 +122,12 @@ const plugin = function ({ external = [], edge, split } = {}) {
 				);
 
 				await esbuild.build({
+					platform: 'neutral',
+					mainFields: ['module', 'main'],
 					entryPoints: [`${tmp}/edge.js`],
 					outfile: `${dirs.functions}/${name}.func/index.js`,
 					target: 'es2020', // TODO verify what the edge runtime supports
 					bundle: true,
-					platform: 'browser',
-					format: 'esm',
 					external,
 					sourcemap: 'linked',
 					banner: { js: 'globalThis.global = globalThis;' }