From 0054ce6a43d832d79509e25f020422c0a9960e8d Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 11 Dec 2022 20:38:45 -0800 Subject: [PATCH 1/3] [fix] set platform to neutral for cloudflare build --- .changeset/fifty-yaks-cheer.md | 6 ++++++ packages/adapter-cloudflare-workers/index.js | 4 +++- packages/adapter-cloudflare/index.js | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .changeset/fifty-yaks-cheer.md diff --git a/.changeset/fifty-yaks-cheer.md b/.changeset/fifty-yaks-cheer.md new file mode 100644 index 000000000000..ebd44fb47dc9 --- /dev/null +++ b/.changeset/fifty-yaks-cheer.md @@ -0,0 +1,6 @@ +--- +'@sveltejs/adapter-cloudflare': patch +'@sveltejs/adapter-cloudflare-workers': patch +--- + +[fix] set platform to neutral for cloudflare build diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index a2c106d1a9b3..6d1421416d3f 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -62,7 +62,9 @@ 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`], diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index fd5a60c3e230..c6decd3db118 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -54,7 +54,9 @@ export default function () { }); await esbuild.build({ - platform: 'browser', + platform: 'neutral', + mainFields: ['module', 'main'], + conditions: ['worker'], sourcemap: 'linked', target: 'es2020', entryPoints: [`${tmp}/_worker.js`], From 5c9aa3823f7bc117e34310c2f2e8ca48b67a26f3 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 12 Dec 2022 09:37:18 -0500 Subject: [PATCH 2/3] set esbuild platform to neutral --- .changeset/chilly-pumas-look.md | 6 ++++++ packages/adapter-cloudflare-workers/index.js | 3 +-- packages/adapter-cloudflare/index.js | 1 - packages/adapter-netlify/index.js | 4 ++-- packages/adapter-vercel/index.js | 4 ++-- 5 files changed, 11 insertions(+), 7 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..5669b80e5d0c --- /dev/null +++ b/.changeset/chilly-pumas-look.md @@ -0,0 +1,6 @@ +--- +'@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 6d1421416d3f..4cef854fd5b9 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -70,8 +70,7 @@ export default function ({ config = 'wrangler.toml' } = {}) { 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 c6decd3db118..bcb5bab68371 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -62,7 +62,6 @@ export default function () { 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;' } From 0f94998c77c6ec2ac9424181225754adf775cf75 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 12 Dec 2022 09:38:04 -0500 Subject: [PATCH 3/3] consolidate changesets --- .changeset/chilly-pumas-look.md | 2 ++ .changeset/fifty-yaks-cheer.md | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 .changeset/fifty-yaks-cheer.md diff --git a/.changeset/chilly-pumas-look.md b/.changeset/chilly-pumas-look.md index 5669b80e5d0c..14fd1ac0e770 100644 --- a/.changeset/chilly-pumas-look.md +++ b/.changeset/chilly-pumas-look.md @@ -1,4 +1,6 @@ --- +'@sveltejs/adapter-cloudflare': patch +'@sveltejs/adapter-cloudflare-workers': patch '@sveltejs/adapter-netlify': patch '@sveltejs/adapter-vercel': patch --- diff --git a/.changeset/fifty-yaks-cheer.md b/.changeset/fifty-yaks-cheer.md deleted file mode 100644 index ebd44fb47dc9..000000000000 --- a/.changeset/fifty-yaks-cheer.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@sveltejs/adapter-cloudflare': patch -'@sveltejs/adapter-cloudflare-workers': patch ---- - -[fix] set platform to neutral for cloudflare build