Skip to content

Commit 43f94e6

Browse files
authored
Revert "[fix] set platform to neutral when calling esbuild" (#8122)
This reverts commit ee7cd45. Reverts #8083. Turns out this was a mistake, since it breaks packages like cross-fetch which assume that if you're not resolving browser modules, you want the Node version instead. Since we bundle esm-env, the original reason for #8083 no longer applies.
1 parent df6feab commit 43f94e6

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

.changeset/smooth-pianos-kiss.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@sveltejs/adapter-cloudflare': patch
3+
'@sveltejs/adapter-cloudflare-workers': patch
4+
'@sveltejs/adapter-netlify': patch
5+
'@sveltejs/adapter-vercel': patch
6+
---
7+
8+
[fix] revert platform change from browser to neutral

packages/adapter-cloudflare-workers/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ export default function ({ config = 'wrangler.toml' } = {}) {
6262
);
6363

6464
await esbuild.build({
65-
platform: 'neutral',
66-
mainFields: ['module', 'main'],
67-
conditions: ['worker'],
65+
platform: 'browser',
66+
conditions: ['worker', 'browser'],
6867
sourcemap: 'linked',
6968
target: 'es2020',
7069
entryPoints: [`${tmp}/entry.js`],
7170
outfile: main,
7271
bundle: true,
73-
external: ['__STATIC_CONTENT_MANIFEST']
72+
external: ['__STATIC_CONTENT_MANIFEST'],
73+
format: 'esm'
7474
});
7575

7676
builder.log.minor('Copying assets...');

packages/adapter-cloudflare/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export default function () {
5454
});
5555

5656
await esbuild.build({
57-
platform: 'neutral',
58-
mainFields: ['module', 'main'],
59-
conditions: ['worker'],
57+
platform: 'browser',
58+
conditions: ['worker', 'browser'],
6059
sourcemap: 'linked',
6160
target: 'es2020',
6261
entryPoints: [`${tmp}/_worker.js`],
6362
outfile: `${dest}/_worker.js`,
6463
allowOverwrite: true,
64+
format: 'esm',
6565
bundle: true
6666
});
6767
}

packages/adapter-netlify/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ async function generate_edge_functions({ builder }) {
129129
);
130130

131131
await esbuild.build({
132-
platform: 'neutral',
133-
mainFields: ['module', 'main'],
134132
entryPoints: [`${tmp}/entry.js`],
135133
outfile: '.netlify/edge-functions/render.js',
136134
bundle: true,
135+
format: 'esm',
136+
platform: 'browser',
137137
sourcemap: 'linked',
138138
target: 'es2020'
139139
});

packages/adapter-vercel/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ const plugin = function ({ external = [], edge, split } = {}) {
122122
);
123123

124124
await esbuild.build({
125-
platform: 'neutral',
126-
mainFields: ['module', 'main'],
127125
entryPoints: [`${tmp}/edge.js`],
128126
outfile: `${dirs.functions}/${name}.func/index.js`,
129127
target: 'es2020', // TODO verify what the edge runtime supports
130128
bundle: true,
129+
platform: 'browser',
130+
format: 'esm',
131131
external,
132132
sourcemap: 'linked',
133133
banner: { js: 'globalThis.global = globalThis;' }

0 commit comments

Comments
 (0)