From efbaf92c1a80b41a2628b5cf75c391f53a6bf497 Mon Sep 17 00:00:00 2001
From: AirBorne04 <daniel@floatingpixels.com>
Date: Tue, 27 Sep 2022 16:50:49 +0200
Subject: [PATCH 1/2] adjusting cloudflare adapter (respecting user config)
 define better solid ssr config

---
 .changeset/cuddly-clouds-complain.md          |  7 +++++++
 packages/integrations/cloudflare/src/index.ts | 11 +++--------
 packages/integrations/solid/src/index.ts      |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/cuddly-clouds-complain.md

diff --git a/.changeset/cuddly-clouds-complain.md b/.changeset/cuddly-clouds-complain.md
new file mode 100644
index 000000000000..8a1c8889798d
--- /dev/null
+++ 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
index ef7dec2d4cd2..13c8578eeb8d 100644
--- a/packages/integrations/cloudflare/src/index.ts
+++ b/packages/integrations/cloudflare/src/index.ts
@@ -65,11 +65,8 @@ 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 () => {
@@ -77,9 +74,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 				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
index 071d05a17356..6ded20024275 100644
--- 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: true
 		},
 	};
 }

From 33bda4f7beaa98d89eed68492b54b5e3f9835acf Mon Sep 17 00:00:00 2001
From: Daniel <daniel.freese@gmail.com>
Date: Wed, 28 Sep 2022 14:52:59 +0200
Subject: [PATCH 2/2] 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.
---
 packages/integrations/solid/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts
index 6ded20024275..38e19ad9b596 100644
--- a/packages/integrations/solid/src/index.ts
+++ b/packages/integrations/solid/src/index.ts
@@ -45,7 +45,7 @@ function getViteConfiguration(isDev: boolean) {
 		ssr: {
 			external: ['babel-preset-solid'],
 			target: 'node',
-			noExternal: true
+			noExternal: ['solid-js']
 		},
 	};
 }