Skip to content

Commit 2994bc5

Browse files
authored
Build edge/worker runtime with webworker ssr target (#7101)
1 parent 4516d7b commit 2994bc5

File tree

7 files changed

+21
-6
lines changed

7 files changed

+21
-6
lines changed

.changeset/quiet-gifts-pay.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/vercel': patch
3+
---
4+
5+
Add missing esbuild dependency

.changeset/silver-ties-vanish.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@astrojs/cloudflare': patch
3+
'@astrojs/vercel': patch
4+
'@astrojs/solid-js': patch
5+
---
6+
7+
Always build edge/worker runtime with Vite `webworker` SSR target

packages/integrations/cloudflare/src/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export default function createIntegration(args?: Options): AstroIntegration {
7272
},
7373
'astro:build:setup': ({ vite, target }) => {
7474
if (target === 'server') {
75-
vite.resolve = vite.resolve || {};
76-
vite.resolve.alias = vite.resolve.alias || {};
75+
vite.resolve ||= {};
76+
vite.resolve.alias ||= {};
7777

7878
const aliases = [{ find: 'react-dom/server', replacement: 'react-dom/server.browser' }];
7979

@@ -84,8 +84,8 @@ export default function createIntegration(args?: Options): AstroIntegration {
8484
(vite.resolve.alias as Record<string, string>)[alias.find] = alias.replacement;
8585
}
8686
}
87-
vite.ssr = vite.ssr || {};
88-
vite.ssr.target = vite.ssr.target || 'webworker';
87+
vite.ssr ||= {};
88+
vite.ssr.target = 'webworker';
8989
}
9090
},
9191
'astro:build:done': async ({ pages }) => {

packages/integrations/solid/src/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ async function getViteConfiguration(isDev: boolean, astroConfig: AstroConfig) {
4545
exclude: ['@astrojs/solid-js/server.js', ...solidPkgsConfig.optimizeDeps.exclude],
4646
},
4747
ssr: {
48-
target: 'node',
4948
external: ['babel-preset-solid', ...solidPkgsConfig.ssr.external],
5049
noExternal: [...solidPkgsConfig.ssr.noExternal],
5150
},

packages/integrations/vercel/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"@astrojs/webapi": "^2.1.1",
5151
"@vercel/analytics": "^0.1.8",
5252
"@vercel/nft": "^0.22.1",
53+
"esbuild": "^0.17.12",
5354
"fast-glob": "^3.2.11",
5455
"set-cookie-parser": "^2.5.1",
5556
"web-vitals": "^3.1.1"

packages/integrations/vercel/src/edge/adapter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default function vercelEdge({
101101
}
102102

103103
vite.ssr ||= {};
104-
vite.ssr.target ||= 'webworker';
104+
vite.ssr.target = 'webworker';
105105

106106
// Vercel edge runtime is a special webworker-ish environment that supports process.env,
107107
// but Vite would replace away `process.env` in webworkers, so we set a define here to prevent it

pnpm-lock.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)