Resolve shell when a replay task errors

facebook · Oct 4, 2023 · 35f1d0f · 35f1d0f
1 parent 352f0b6
commit 35f1d0f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js
@@ -996,6 +996,11 @@ describe('ReactDOMFizzStaticBrowser', () => {
       return children;
     }
 
+    const lazySpan = React.lazy(async () => {
+      await 0;
+      return {default: <span />};
+    });
+
     function App() {
       const children = (
         <Suspense fallback="Loading...">
@@ -1013,7 +1018,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
                 </div>
               </Suspense>
             ) : (
-              <span />
+              lazySpan
             )}
           </div>
         </>

diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js
@@ -3464,6 +3464,12 @@ function retryReplayTask(request: Request, task: ReplayTask): void {
       task.replay.nodes,
       task.replay.slots,
     );
+    request.pendingRootTasks--;
+    if (request.pendingRootTasks === 0) {
+      request.onShellError = noop;
+      const onShellReady = request.onShellReady;
+      onShellReady();
+    }
     request.allPendingTasks--;
     if (request.allPendingTasks === 0) {
       const onAllReady = request.onAllReady;