aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-11-21 16:58:50 -0800
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-11-21 16:58:50 -0800
commit5c5b246cc332206290a3c6b2a4d6e619bcfd2350 (patch)
tree51330b976e30440ff89c97989143105eacab175f
parent469a36e3b6c7cffaceeddad6b57e51c55bf2493d (diff)
downloadbun-5c5b246cc332206290a3c6b2a4d6e619bcfd2350.tar.gz
bun-5c5b246cc332206290a3c6b2a4d6e619bcfd2350.tar.zst
bun-5c5b246cc332206290a3c6b2a4d6e619bcfd2350.zip
[bun-framework-next] Fix React 18 in fallback mode
-rw-r--r--packages/bun-framework-next/client.development.tsx11
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/bun-framework-next/client.development.tsx b/packages/bun-framework-next/client.development.tsx
index 63e31bff8..f3d8d39e5 100644
--- a/packages/bun-framework-next/client.development.tsx
+++ b/packages/bun-framework-next/client.development.tsx
@@ -342,13 +342,14 @@ export async function _boot(EntryPointNamespace, isError) {
);
if (USE_REACT_18) {
- if (!reactRoot) {
+ if (!isError && !reactRoot) {
// Unlike with createRoot, you don't need a separate root.render() call here
- reactRoot = (isError ? ReactDOM.createRoot : ReactDOM.hydrateRoot)(
- domEl,
- reactEl
- );
+ reactRoot = ReactDOM.hydrateRoot(domEl, reactEl);
} else {
+ if (!reactRoot) {
+ reactRoot = ReactDOM.createRoot(domEl);
+ }
+
reactRoot.render(reactEl);
}
} else {