From f65d89ff8bc2d8f25fc311697b0dc5d2cdebbb97 Mon Sep 17 00:00:00 2001
From: Alistair Smith <hi@alistair.sh>
Date: Wed, 24 Sep 2025 21:34:49 -0700
Subject: [PATCH] changes

---
 packages/bun-framework-react/bun.lock          |  6 +++---
 packages/bun-framework-react/src/client/app.ts |  6 ++++++
 src/bake.zig                                   | 12 +-----------
 src/bake/bake.private.d.ts                     |  4 ----
 test/bake/bake-harness.ts                      |  8 +++++++-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/packages/bun-framework-react/bun.lock b/packages/bun-framework-react/bun.lock
index 9b65dce60f..70db828667 100644
--- a/packages/bun-framework-react/bun.lock
+++ b/packages/bun-framework-react/bun.lock
@@ -3,9 +3,9 @@
   "workspaces": {
     "": {
       "dependencies": {
-        "react": "^0.0.0-experimental-e2332183-20250924",
-        "react-dom": "^0.0.0-experimental-e2332183-20250924",
-        "react-refresh": "^0.0.0-experimental-e2332183-20250924",
+        "react": "0.0.0-experimental-e2332183-20250924",
+        "react-dom": "0.0.0-experimental-e2332183-20250924",
+        "react-refresh": "0.0.0-experimental-e2332183-20250924",
       },
       "devDependencies": {
         "@types/react": "^19.1.13",
diff --git a/packages/bun-framework-react/src/client/app.ts b/packages/bun-framework-react/src/client/app.ts
index 0c3f4f03fa..e077926427 100644
--- a/packages/bun-framework-react/src/client/app.ts
+++ b/packages/bun-framework-react/src/client/app.ts
@@ -69,6 +69,12 @@ const initialRscPayload: Promise<NonNullishReactNode> =
         }),
       );
 
+declare global {
+  interface Window {
+    __bun_f: Array<string | Uint8Array<ArrayBuffer>>;
+  }
+}
+
 const appStore: Store<AppState> = store<AppState>({
   rsc: initialRscPayload,
 });
diff --git a/src/bake.zig b/src/bake.zig
index 886c70d834..84b0984b4f 100644
--- a/src/bake.zig
+++ b/src/bake.zig
@@ -294,7 +294,7 @@ pub const Framework = struct {
     ///   the above react configuration.
     /// The provided allocator is not stored.
     pub fn auto(
-        arena: std.mem.Allocator,
+        _: std.mem.Allocator,
         resolver: *bun.resolver.Resolver,
         file_system_router_types: []FileSystemRouterType,
     ) !Framework {
@@ -313,16 +313,6 @@ pub const Framework = struct {
 
         if (resolveOrNull(resolver, "react-refresh/runtime")) |rfr| {
             fw.react_fast_refresh = .{ .import_source = rfr };
-        } else if (resolveOrNull(resolver, "react")) |_| {
-            fw.react_fast_refresh = .{ .import_source = "react-refresh/runtime/index.js" };
-            try fw.built_in_modules.put(
-                arena,
-                "react-refresh/runtime/index.js",
-                if (Environment.codegen_embed)
-                    .{ .code = @embedFile("node-fallbacks/react-refresh.js") }
-                else
-                    .{ .code = bun.runtimeEmbedFile(.codegen, "node-fallbacks/react-refresh.js") },
-            );
         }
 
         return fw;
diff --git a/src/bake/bake.private.d.ts b/src/bake/bake.private.d.ts
index 35cf50386e..ba67f95836 100644
--- a/src/bake/bake.private.d.ts
+++ b/src/bake/bake.private.d.ts
@@ -80,10 +80,6 @@ declare var IS_BUN_DEVELOPMENT: unknown;
 /** If this is the fallback error page */
 declare const IS_ERROR_RUNTIME: boolean;
 
-interface Window {
-  __bun_f: Array<string | Uint8Array<ArrayBuffer>>;
-}
-
 declare module "react-dom/server.node" {
   export * from "react-dom/server";
 }
diff --git a/test/bake/bake-harness.ts b/test/bake/bake-harness.ts
index ef3f6aaddc..8f72f22ebf 100644
--- a/test/bake/bake-harness.ts
+++ b/test/bake/bake-harness.ts
@@ -18,7 +18,7 @@ import { Matchers } from "bun:test";
 import { EventEmitter } from "node:events";
 // @ts-ignore
 import { dedent } from "../bundler/expectBundled.ts";
-import { bunEnv, bunExe, isCI, isWindows, mergeWindowEnvs, tempDirWithFiles } from "harness";
+import { bunEnv, bunExe, isCI, isWindows, mergeWindowEnvs, tempDirWithFiles, runBunInstall } from "harness";
 import { expect } from "bun:test";
 import { exitCodeMapStrings } from "./exit-code-map.mjs";
 
@@ -1722,6 +1722,12 @@ function testImpl<T extends DevServerTest>(
       if (runInstall) {
         // await copyCachedReactDeps(root);
         await installReactWithCache(root);
+
+        // Also ensure bun-framework-react has its dependencies installed
+        const frameworkDir = path.join(__dirname, "../../packages/bun-framework-react");
+        if (!fs.existsSync(path.join(frameworkDir, "node_modules"))) {
+          await runBunInstall(bunEnv, frameworkDir);
+        }
       }
       if (options.files["bun.app.ts"] == undefined && htmlFiles.length === 0) {
         if (!options.framework) {