Rerender through Lazy Components in dev if we were already aborting

Author: eps1lon

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

@@ -925,7 +925,11 @@ describe('ReactFlightDOMNode', () => {
 
     if (__DEV__) {
       expect(ignoreListStack(ownerStack)).toBe(
+        // eslint-disable-next-line react-internal/safe-string-coercion
         '' +
+          (gate(flags => flags.enableAsyncDebugInfo)
+            ? '\n    at SharedComponent (./ReactFlightDOMNode-test.js:791:7)'
+            : '') +
           '\n    at ServerComponent (file://./ReactFlightDOMNode-test.js:812:26)' +
           '\n    at App (file://./ReactFlightDOMNode-test.js:829:25)',
       );
@@ -1518,12 +1522,12 @@ describe('ReactFlightDOMNode', () => {
           '\n' +
             '    in Dynamic' +
             (gate(flags => flags.enableAsyncDebugInfo)
-              ? ' (file://ReactFlightDOMNode-test.js:1388:27)\n'
+              ? ' (file://ReactFlightDOMNode-test.js:1392:27)\n'
               : '\n') +
             '    in body\n' +
             '    in html\n' +
-            '    in App (file://ReactFlightDOMNode-test.js:1405:25)\n' +
-            '    in ClientRoot (ReactFlightDOMNode-test.js:1480:16)',
+            '    in App (file://ReactFlightDOMNode-test.js:1409:25)\n' +
+            '    in ClientRoot (ReactFlightDOMNode-test.js:1484:16)',
         );
       } else {
         expect(
@@ -1532,7 +1536,7 @@ describe('ReactFlightDOMNode', () => {
           '\n' +
             '    in body\n' +
             '    in html\n' +
-            '    in ClientRoot (ReactFlightDOMNode-test.js:1480:16)',
+            '    in ClientRoot (ReactFlightDOMNode-test.js:1484:16)',
         );
       }
 
@@ -1542,16 +1546,16 @@ describe('ReactFlightDOMNode', () => {
             normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
           ).toBe(
             '\n' +
-              '    in Dynamic (file://ReactFlightDOMNode-test.js:1388:27)\n' +
-              '    in App (file://ReactFlightDOMNode-test.js:1405:25)',
+              '    in Dynamic (file://ReactFlightDOMNode-test.js:1392:27)\n' +
+              '    in App (file://ReactFlightDOMNode-test.js:1409:25)',
           );
         } else {
           expect(
             normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
           ).toBe(
             '' +
               '\n' +
-              '    in App (file://ReactFlightDOMNode-test.js:1405:25)',
+              '    in App (file://ReactFlightDOMNode-test.js:1409:25)',
           );
         }
       } else {

packages/react-server/src/ReactFizzServer.js

@@ -2802,14 +2802,23 @@ function renderLazyComponent(
   ref: any,
 ): void {
   let Component;
+  let previouslyAbortingDEV;
   if (__DEV__) {
+    previouslyAbortingDEV = request.status === ABORTING;
     Component = callLazyInitInDEV(lazyComponent);
   } else {
     const payload = lazyComponent._payload;
     const init = lazyComponent._init;
     Component = init(payload);
   }
-  if (request.status === ABORTING) {
+  if (
+    request.status === ABORTING &&
+    // If we already started rendering the Lazy Componentn in an aborting state
+    // and reach this point, the lazy was already resolved.
+    // We don't bail here again since this is most likely a discarded rerender
+    // to get the stack where we suspended in dev.
+    (!__DEV__ || !previouslyAbortingDEV)
+  ) {
     // eslint-disable-next-line no-throw-literal
     throw null;
   }