adjusting cloudflare adapter and solid ssr to work together (#4888)

* adjusting cloudflare adapter (respecting user config) define better solid ssr config * only inline the framework this needs to happen for worker build in order to have the correct build mode for the framework, which needs the nodejs no matter if it is for node or the browser. Co-authored-by: AirBorne04 <[email protected]>
withastro · Oct 6, 2022 · 2dc582a · 2dc582a
1 parent e5b526c
commit 2dc582a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.changeset/cuddly-clouds-complain.md b/.changeset/cuddly-clouds-complain.md
@@ -0,0 +1,7 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/solid-js': patch
+---
+
+adjusting the build settings for cloudflare (reverting back to platform browser over neutral)
+adjusting the ssr settings for solidjs (to build for node)
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
@@ -65,21 +65,16 @@ export default function createIntegration(args?: Options): AstroIntegration {
 							(vite.resolve.alias as Record<string, string>)[alias.find] = alias.replacement;
 						}
 					}
-
-					vite.ssr = {
-						...vite.ssr,
-						target: 'webworker',
-					};
+					vite.ssr = vite.ssr || {};
+					vite.ssr.target = vite.ssr.target || 'webworker';
 				}
 			},
 			'astro:build:done': async () => {
 				const entryUrl = new URL(_buildConfig.serverEntry, _buildConfig.server);
 				const pkg = fileURLToPath(entryUrl);
 				await esbuild.build({
 					target: 'es2020',
-					platform: 'neutral',
-					mainFields: ['main', 'module'],
-					conditions: ['worker', 'node'],
+					platform: 'browser',
 					entryPoints: [pkg],
 					outfile: pkg,
 					allowOverwrite: true,

diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts
@@ -44,6 +44,8 @@ function getViteConfiguration(isDev: boolean) {
 		},
 		ssr: {
 			external: ['babel-preset-solid'],
+			target: 'node',
+			noExternal: ['solid-js']
 		},
 	};
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,8 @@ function getViteConfiguration(isDev: boolean) { @@
     		},
     		ssr: {
     			external: ['babel-preset-solid'],
+    			target: 'node',
+    			noExternal: ['solid-js']
     		},
     	};
     }
@@ Expand Down @@