From 13c68ec779b1e555606a3baa39dd9a1bbb628cd1 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 13 Dec 2022 09:35:04 -0500 Subject: [PATCH 1/4] Revert "[fix] set platform to neutral for cloudflare build (#8083)" This reverts commit ee7cd45746ec8dbb5b09a548f826bf758f9ae393. --- .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, 9 insertions(+), 19 deletions(-) delete mode 100644 .changeset/chilly-pumas-look.md diff --git a/.changeset/chilly-pumas-look.md b/.changeset/chilly-pumas-look.md deleted file mode 100644 index 14fd1ac0e770..000000000000 --- a/.changeset/chilly-pumas-look.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@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 4cef854fd5b9..a2c106d1a9b3 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -62,15 +62,14 @@ export default function ({ config = 'wrangler.toml' } = {}) { ); await esbuild.build({ - platform: 'neutral', - mainFields: ['module', 'main'], - conditions: ['worker'], + platform: 'browser', sourcemap: 'linked', target: 'es2020', entryPoints: [`${tmp}/entry.js`], outfile: main, bundle: true, - external: ['__STATIC_CONTENT_MANIFEST'] + external: ['__STATIC_CONTENT_MANIFEST'], + format: 'esm' }); builder.log.minor('Copying assets...'); diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index bcb5bab68371..fd5a60c3e230 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -54,14 +54,13 @@ export default function () { }); await esbuild.build({ - platform: 'neutral', - mainFields: ['module', 'main'], - conditions: ['worker'], + platform: 'browser', 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 31158ed6bd0d..99b0aa85a6e5 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 28eaa5ee1b93..69ab0a8ba9d5 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 0e1d6fefa2be47c6300a567817c0ba998b7106d2 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 13 Dec 2022 09:37:31 -0500 Subject: [PATCH 2/4] add the old changeset back --- .changeset/chilly-pumas-look.md | 8 ++++++++ 1 file changed, 8 insertions(+) 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 From 32517206fd4763afc8eef7e068aade1c2ecf8ba4 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 13 Dec 2022 09:38:16 -0500 Subject: [PATCH 3/4] changeset --- .changeset/smooth-pianos-kiss.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/smooth-pianos-kiss.md diff --git a/.changeset/smooth-pianos-kiss.md b/.changeset/smooth-pianos-kiss.md new file mode 100644 index 000000000000..af25c7abe1b6 --- /dev/null +++ b/.changeset/smooth-pianos-kiss.md @@ -0,0 +1,8 @@ +--- +'@sveltejs/adapter-cloudflare': patch +'@sveltejs/adapter-cloudflare-workers': patch +'@sveltejs/adapter-netlify': patch +'@sveltejs/adapter-vercel': patch +--- + +[fix] revert platform change from browser to neutral From 2f760f6e59a24a80874a14ea26439cc459c7d71a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 13 Dec 2022 09:43:18 -0500 Subject: [PATCH 4/4] add conditions --- packages/adapter-cloudflare-workers/index.js | 1 + packages/adapter-cloudflare/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index a2c106d1a9b3..ee3b45caf4ec 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -63,6 +63,7 @@ export default function ({ config = 'wrangler.toml' } = {}) { await esbuild.build({ platform: 'browser', + conditions: ['worker', 'browser'], sourcemap: 'linked', target: 'es2020', entryPoints: [`${tmp}/entry.js`], diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index fd5a60c3e230..15197f2cf7b4 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -55,6 +55,7 @@ export default function () { await esbuild.build({ platform: 'browser', + conditions: ['worker', 'browser'], sourcemap: 'linked', target: 'es2020', entryPoints: [`${tmp}/_worker.js`],