Run in owner task context

facebook · May 29, 2024 · 592ad3f · 592ad3f
1 parent e68e81e
commit 592ad3f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/react-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js
@@ -1731,18 +1731,24 @@ function initializeFakeTask(
   if (cachedEntry !== undefined) {
     return cachedEntry;
   }
-  const owner: ?ReactComponentInfo = componentInfo.owner;
-  if (owner != null) {
-    initializeFakeTask(owner);
-  }
+
+  const ownerTask =
+    componentInfo.owner == null
+      ? null
+      : initializeFakeTask(componentInfo.owner);
 
   // eslint-disable-next-line react-internal/no-production-logging
   const createTaskFn = (console: any).createTask.bind(
     console,
     getServerComponentTaskName(componentInfo),
   );
   const callStack = buildFakeCallStack(stack, createTaskFn);
-  return callStack();
+
+  if (ownerTask === null) {
+    return callStack();
+  } else {
+    return ownerTask.run(callStack);
+  }
 }
 
 function resolveDebugInfo(