Merge branch 'main' into feat/runtime-plugin

web-infra-dev · Jul 31, 2024 · 10c20fa · 10c20fa
2 parents 334aa99 + db43d8e
commit 10c20fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changeset/tasty-ads-rest.md b/.changeset/tasty-ads-rest.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/runtime': patch
+---
+
+fix: react 17 ssr context error
+
+fix: 修复 react 17 ssr 找不到 runtimeReactContext 报错
diff --git a/packages/runtime/plugin-runtime/src/core/browser/hydrate.tsx b/packages/runtime/plugin-runtime/src/core/browser/hydrate.tsx
@@ -96,7 +96,10 @@ export function hydrateRoot(
           });
         } else {
           loadableReady(() => {
-            ModernHydrate(App, callback).then(root => {
+            ModernHydrate(
+              React.cloneElement(App, { _internal_context: hydrateContext }),
+              callback,
+            ).then(root => {
               resolve(root);
             });
           });