fix(cloudflare): using solid with client directive breaks build (#212)

Co-authored-by: Emanuele Stoppa <602478+ematipico@users.noreply.github.com>

1 files changed, 16 insertions, 8 deletions

diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
index 7b57b9621..8d7fccdfa 100644
--- a/packages/integrations/cloudflare/src/index.ts
+++ b/packages/integrations/cloudflare/src/index.ts
@@ -152,14 +152,6 @@ export default function createIntegration(args?: Options): AstroIntegration {
 							find: 'react-dom/server',
 							replacement: 'react-dom/server.browser',
 						},
-						{
-							find: 'solid-js/web',
-							replacement: 'solid-js/web/dist/server',
-						},
-						{
-							find: 'solid-js',
-							replacement: 'solid-js/dist/server',
-						},
 					];
 
 					if (Array.isArray(vite.resolve.alias)) {
@@ -170,6 +162,11 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						}
 					}
 
+					vite.resolve.conditions ||= [];
+					// We need those conditions, previous these conditions where applied at the esbuild step which we removed
+					// https://github.com/withastro/astro/pull/7092
+					vite.resolve.conditions.push('workerd', 'worker');
+
 					vite.ssr ||= {};
 					vite.ssr.target = 'webworker';
 					vite.ssr.noExternal = true;
@@ -202,6 +199,17 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						...vite.define,
 					};
 				}
+				// we thought that vite config inside `if (target === 'server')` would not apply for client
+				// but it seems like the same `vite` reference is used for both
+				// so we need to reset the previous conflicting setting
+				// in the future we should look into a more robust solution
+				if (target === 'client') {
+					vite.resolve ||= {};
+					vite.resolve.conditions ||= [];
+					vite.resolve.conditions = vite.resolve.conditions.filter(
+						(c) => c !== 'workerd' && c !== 'worker'
+					);
+				}
 			},
 			'astro:build:done': async ({ pages, routes, dir, logger }) => {
 				const PLATFORM_FILES = ['_headers', '_redirects', '_routes.json'];