From 60586596294cdcc89a6fe97dc48249a2df141ec3 Mon Sep 17 00:00:00 2001 From: Rahim Alwer Date: Tue, 2 Apr 2024 13:36:58 +1100 Subject: [PATCH 1/4] fix: add `workerd` condition to cloudflare worker build --- .changeset/popular-chairs-pull.md | 6 ++++++ packages/adapter-cloudflare-workers/index.js | 2 +- packages/adapter-cloudflare/index.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .changeset/popular-chairs-pull.md diff --git a/.changeset/popular-chairs-pull.md b/.changeset/popular-chairs-pull.md new file mode 100644 index 000000000000..c9e2bd699626 --- /dev/null +++ b/.changeset/popular-chairs-pull.md @@ -0,0 +1,6 @@ +--- +"@sveltejs/adapter-cloudflare-workers": patch +"@sveltejs/adapter-cloudflare": patch +--- + +add `workerd` condition to cloudflare worker file build diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index f9237e44dbb7..d759e6d1b72d 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -86,7 +86,7 @@ export default function ({ config = 'wrangler.toml' } = {}) { try { const result = await esbuild.build({ platform: 'browser', - conditions: ['worker', 'browser'], + conditions: ['workerd', 'worker', 'browser'], sourcemap: 'linked', target: 'es2022', entryPoints: [`${tmp}/entry.js`], diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index 16adc5f88e72..e4fb77470b37 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -74,7 +74,7 @@ export default function (options = {}) { try { const result = await esbuild.build({ platform: 'browser', - conditions: ['worker', 'browser'], + conditions: ['workerd', 'worker', 'browser'], sourcemap: 'linked', target: 'es2022', entryPoints: [`${tmp}/_worker.js`], From 491cc23d98a678967489f75403f5ff9350650c87 Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Wed, 3 Apr 2024 21:03:05 +0800 Subject: [PATCH 2/4] Update packages/adapter-cloudflare/index.js Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/adapter-cloudflare/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index e4fb77470b37..30603c50030e 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -74,6 +74,7 @@ export default function (options = {}) { try { const result = await esbuild.build({ platform: 'browser', + // https://github.com/cloudflare/workers-sdk/blob/a12b2786ce745f24475174bcec994ad691e65b0f/packages/wrangler/src/deployment-bundle/bundle.ts#L35-L36 conditions: ['workerd', 'worker', 'browser'], sourcemap: 'linked', target: 'es2022', From 36184d92c769bc27281cd0a6c37e8a2d420bfb9c Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Wed, 3 Apr 2024 21:03:11 +0800 Subject: [PATCH 3/4] Update packages/adapter-cloudflare-workers/index.js Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/adapter-cloudflare-workers/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index d759e6d1b72d..40962940bea3 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -86,6 +86,7 @@ export default function ({ config = 'wrangler.toml' } = {}) { try { const result = await esbuild.build({ platform: 'browser', + // https://github.com/cloudflare/workers-sdk/blob/a12b2786ce745f24475174bcec994ad691e65b0f/packages/wrangler/src/deployment-bundle/bundle.ts#L35-L36 conditions: ['workerd', 'worker', 'browser'], sourcemap: 'linked', target: 'es2022', From 26b4628c8ba5875fc7633a8467c318fa528b45a7 Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Wed, 3 Apr 2024 21:06:46 +0800 Subject: [PATCH 4/4] Update .changeset/popular-chairs-pull.md --- .changeset/popular-chairs-pull.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/popular-chairs-pull.md b/.changeset/popular-chairs-pull.md index c9e2bd699626..570883ee0184 100644 --- a/.changeset/popular-chairs-pull.md +++ b/.changeset/popular-chairs-pull.md @@ -3,4 +3,4 @@ "@sveltejs/adapter-cloudflare": patch --- -add `workerd` condition to cloudflare worker file build +fix: add `workerd` to esbuild conditions