From 592782975aa510f560572b31680bd84bc73f7323 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Fri, 19 Jan 2024 10:17:36 -0800
Subject: [PATCH] fix: configure external conditions for cf template

---
 templates/unstable-vite-cloudflare/app/entry.server.tsx | 2 +-
 templates/unstable-vite-cloudflare/vite.config.ts       | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/templates/unstable-vite-cloudflare/app/entry.server.tsx b/templates/unstable-vite-cloudflare/app/entry.server.tsx
index 8bb9460dd53..2215a5bb8f9 100644
--- a/templates/unstable-vite-cloudflare/app/entry.server.tsx
+++ b/templates/unstable-vite-cloudflare/app/entry.server.tsx
@@ -5,7 +5,7 @@
 import type { AppLoadContext, EntryContext } from "@remix-run/cloudflare";
 import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
-import { renderToReadableStream } from "react-dom/server.browser";
+import { renderToReadableStream } from "react-dom/server";
 
 export default async function handleRequest(
   request: Request,
diff --git a/templates/unstable-vite-cloudflare/vite.config.ts b/templates/unstable-vite-cloudflare/vite.config.ts
index aadd2827304..b635a34117f 100644
--- a/templates/unstable-vite-cloudflare/vite.config.ts
+++ b/templates/unstable-vite-cloudflare/vite.config.ts
@@ -6,7 +6,12 @@ import tsconfigPaths from "vite-tsconfig-paths";
 // In the future, you'll be able to import the `cloudflare` adapter from `@remix-run/cloudflare`
 import { adapter as cloudflare } from "./.cloudflare";
 
-export default defineConfig({
+export default defineConfig(({ isSsrBuild }) => ({
+  ssr: {
+    resolve: {
+      externalConditions: ["workerd", "worker"],
+    },
+  },
   plugins: [
     remix({
       adapter: cloudflare({
@@ -22,4 +27,4 @@ export default defineConfig({
     }),
     tsconfigPaths(),
   ],
-});
+}));