automatically set ssr resolve conditions for workerd

remix-run · pcattori · Feb 15, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
commit afcf009718cbe438dd8c626257e5075839f61650
diff --git a/integration/vite-cloudflare-test.ts b/integration/vite-cloudflare-test.ts
@@ -55,11 +55,6 @@ const files: Files = async ({ port }) => ({
 
     export default {
       ${await viteConfig.server({ port })}
-      ssr: {
-        resolve: {
-          externalConditions: ["workerd", "worker"],
-        },
-      },
       plugins: [
         remixCloudflareProxy({ getLoadContext }),
         remix(),

diff --git a/packages/remix-dev/vite/cloudflare-proxy-plugin.ts b/packages/remix-dev/vite/cloudflare-proxy-plugin.ts
@@ -37,6 +37,13 @@ export const cloudflareProxyVitePlugin = <
 ): Plugin => {
   return {
     name: "vite-plugin-remix-cloudflare-proxy",
+    config: () => ({
+      ssr: {
+        resolve: {
+          externalConditions: ["workerd", "worker"],
+        },
+      },
+    }),
     async configureServer(viteDevServer) {
       let cloudflare = await getPlatformProxy<E, Cf>();
       let context = { cloudflare };