[Fizz] Refactor Component Stack Nodes (#30298)

Component stacks have a similar problem to the problem with keyPath where we had to move it down and set it late right before recursing. Currently we work around that by popping exactly one off when something suspends. That doesn't work with the new server stacks being added which are more than one. It also meant that we kept having add a single frame that could be popped when there shouldn't need to be one. Unlike keyPath component stacks has this weird property that once something throws we might need the stack that was attempted for errors or the previous stack if we're going to retry and just recreate it. I've tried a few different approaches and I didn't like either but this is the one that seems least problematic. I first split out renderNodeDestructive into a retryNode helper. During retries only retryNode is called. When we first discover a node, we pass through renderNodeDestructive. Instead of add a component stack frame deep inside renderNodeDestructive after we've already refined a node, we now add it before in renderNodeDestructive. That way it's only added once before being attempted. This is similar to how Fiber works where in ChildFiber we match the node once to create the instance and then later do we attempt to actually render it and it's only the second part that's ever retried. This unfortunately means that we now have to refine the node down to element/lazy/thenables twice. To avoid refining the type too I move that to be done lazily. DiffTrain build for [b73dcdc](b73dcdc)
facebook · Jul 9, 2024 · 5f6d91c · 5f6d91c
1 parent 5c54f84
commit 5f6d91c
Show file tree

Hide file tree

Showing 36 changed files with 2,807 additions and 3,592 deletions.
diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-ba95cf4b8f39acfd7c0ccf2795a19430d35ea6b3
+b73dcdc04ffa2dd9f2197d796388657d64ad53be
diff --git a/compiled/facebook-www/REVISION_TRANSFORMS b/compiled/facebook-www/REVISION_TRANSFORMS
@@ -1 +1 @@
-ba95cf4b8f39acfd7c0ccf2795a19430d35ea6b3
+b73dcdc04ffa2dd9f2197d796388657d64ad53be
diff --git a/compiled/facebook-www/React-dev.classic.js b/compiled/facebook-www/React-dev.classic.js
@@ -1998,7 +1998,7 @@ __DEV__ &&
     exports.useTransition = function () {
       return resolveDispatcher().useTransition();
     };
-    exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+    exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
       "function" ===
         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/React-dev.modern.js b/compiled/facebook-www/React-dev.modern.js
@@ -1978,7 +1978,7 @@ __DEV__ &&
     exports.useTransition = function () {
       return resolveDispatcher().useTransition();
     };
-    exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+    exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
       "function" ===
         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/React-prod.classic.js b/compiled/facebook-www/React-prod.classic.js
@@ -669,4 +669,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
diff --git a/compiled/facebook-www/React-prod.modern.js b/compiled/facebook-www/React-prod.modern.js
@@ -669,4 +669,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
diff --git a/compiled/facebook-www/React-profiling.classic.js b/compiled/facebook-www/React-profiling.classic.js
@@ -673,7 +673,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
 "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
   "function" ===
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/React-profiling.modern.js b/compiled/facebook-www/React-profiling.modern.js
@@ -673,7 +673,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
 "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
   "function" ===
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactART-dev.classic.js b/compiled/facebook-www/ReactART-dev.classic.js
@@ -16937,14 +16937,14 @@ __DEV__ &&
         scheduleRoot: scheduleRoot,
         setRefreshHandler: setRefreshHandler,
         getCurrentFiber: getCurrentFiberForDevTools,
-        reconcilerVersion: "19.0.0-www-classic-ba95cf4b8f-20240709"
+        reconcilerVersion: "19.0.0-www-classic-b73dcdc04f-20240709"
       });
     })({
       findFiberByHostInstance: function () {
         return null;
       },
       bundleType: 1,
-      version: "19.0.0-www-classic-ba95cf4b8f-20240709",
+      version: "19.0.0-www-classic-b73dcdc04f-20240709",
       rendererPackageName: "react-art"
     });
     var ClippingRectangle = TYPES.CLIPPING_RECTANGLE,

diff --git a/compiled/facebook-www/ReactART-dev.modern.js b/compiled/facebook-www/ReactART-dev.modern.js
@@ -16367,14 +16367,14 @@ __DEV__ &&
         scheduleRoot: scheduleRoot,
         setRefreshHandler: setRefreshHandler,
         getCurrentFiber: getCurrentFiberForDevTools,
-        reconcilerVersion: "19.0.0-www-modern-ba95cf4b8f-20240709"
+        reconcilerVersion: "19.0.0-www-modern-b73dcdc04f-20240709"
       });
     })({
       findFiberByHostInstance: function () {
         return null;
       },
       bundleType: 1,
-      version: "19.0.0-www-modern-ba95cf4b8f-20240709",
+      version: "19.0.0-www-modern-b73dcdc04f-20240709",
       rendererPackageName: "react-art"
     });
     var ClippingRectangle = TYPES.CLIPPING_RECTANGLE,

diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js
@@ -10718,7 +10718,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "19.0.0-www-classic-ba95cf4b8f-20240709",
+    version: "19.0.0-www-classic-b73dcdc04f-20240709",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1386 = {
@@ -10749,7 +10749,7 @@ var internals$jscomp$inline_1386 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-classic-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-classic-b73dcdc04f-20240709"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1387 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js
@@ -10171,7 +10171,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "19.0.0-www-modern-ba95cf4b8f-20240709",
+    version: "19.0.0-www-modern-b73dcdc04f-20240709",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1372 = {
@@ -10202,7 +10202,7 @@ var internals$jscomp$inline_1372 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-modern-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-modern-b73dcdc04f-20240709"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1373 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

diff --git a/compiled/facebook-www/ReactDOM-dev.classic.js b/compiled/facebook-www/ReactDOM-dev.classic.js
@@ -27373,11 +27373,11 @@ __DEV__ &&
         : flushSyncErrorInBuildsThatSupportLegacyMode;
     (function () {
       var isomorphicReactPackageVersion = React.version;
-      if ("19.0.0-www-classic-ba95cf4b8f-20240709" !== isomorphicReactPackageVersion)
+      if ("19.0.0-www-classic-b73dcdc04f-20240709" !== isomorphicReactPackageVersion)
         throw Error(
           'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n  - react:      ' +
             (isomorphicReactPackageVersion +
-              "\n  - react-dom:  19.0.0-www-classic-ba95cf4b8f-20240709\nLearn more: https://react.dev/warnings/version-mismatch")
+              "\n  - react-dom:  19.0.0-www-classic-b73dcdc04f-20240709\nLearn more: https://react.dev/warnings/version-mismatch")
         );
     })();
     ("function" === typeof Map &&
@@ -27443,12 +27443,12 @@ __DEV__ &&
           scheduleRoot: scheduleRoot,
           setRefreshHandler: setRefreshHandler,
           getCurrentFiber: getCurrentFiberForDevTools,
-          reconcilerVersion: "19.0.0-www-classic-ba95cf4b8f-20240709"
+          reconcilerVersion: "19.0.0-www-classic-b73dcdc04f-20240709"
         });
       })({
         findFiberByHostInstance: getClosestInstanceFromNode,
         bundleType: 1,
-        version: "19.0.0-www-classic-ba95cf4b8f-20240709",
+        version: "19.0.0-www-classic-b73dcdc04f-20240709",
         rendererPackageName: "react-dom"
       }) &&
       canUseDOM &&
@@ -28091,7 +28091,7 @@ __DEV__ &&
     exports.useFormStatus = function () {
       return resolveDispatcher().useHostTransitionStatus();
     };
-    exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+    exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
       "function" ===
         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactDOM-dev.modern.js b/compiled/facebook-www/ReactDOM-dev.modern.js
@@ -26520,11 +26520,11 @@ __DEV__ &&
       return_targetInst = null;
     (function () {
       var isomorphicReactPackageVersion = React.version;
-      if ("19.0.0-www-modern-ba95cf4b8f-20240709" !== isomorphicReactPackageVersion)
+      if ("19.0.0-www-modern-b73dcdc04f-20240709" !== isomorphicReactPackageVersion)
         throw Error(
           'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n  - react:      ' +
             (isomorphicReactPackageVersion +
-              "\n  - react-dom:  19.0.0-www-modern-ba95cf4b8f-20240709\nLearn more: https://react.dev/warnings/version-mismatch")
+              "\n  - react-dom:  19.0.0-www-modern-b73dcdc04f-20240709\nLearn more: https://react.dev/warnings/version-mismatch")
         );
     })();
     ("function" === typeof Map &&
@@ -26589,12 +26589,12 @@ __DEV__ &&
           scheduleRoot: scheduleRoot,
           setRefreshHandler: setRefreshHandler,
           getCurrentFiber: getCurrentFiberForDevTools,
-          reconcilerVersion: "19.0.0-www-modern-ba95cf4b8f-20240709"
+          reconcilerVersion: "19.0.0-www-modern-b73dcdc04f-20240709"
         });
       })({
         findFiberByHostInstance: getClosestInstanceFromNode,
         bundleType: 1,
-        version: "19.0.0-www-modern-ba95cf4b8f-20240709",
+        version: "19.0.0-www-modern-b73dcdc04f-20240709",
         rendererPackageName: "react-dom"
       }) &&
       canUseDOM &&
@@ -27190,7 +27190,7 @@ __DEV__ &&
     exports.useFormStatus = function () {
       return resolveDispatcher().useHostTransitionStatus();
     };
-    exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+    exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
       "function" ===
         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactDOM-prod.classic.js b/compiled/facebook-www/ReactDOM-prod.classic.js
@@ -17163,14 +17163,14 @@ function getCrossOriginStringAs(as, input) {
 }
 var isomorphicReactPackageVersion$jscomp$inline_1769 = React.version;
 if (
-  "19.0.0-www-classic-ba95cf4b8f-20240709" !==
+  "19.0.0-www-classic-b73dcdc04f-20240709" !==
   isomorphicReactPackageVersion$jscomp$inline_1769
 )
   throw Error(
     formatProdErrorMessage(
       527,
       isomorphicReactPackageVersion$jscomp$inline_1769,
-      "19.0.0-www-classic-ba95cf4b8f-20240709"
+      "19.0.0-www-classic-b73dcdc04f-20240709"
     )
   );
 function flushSyncFromReconciler(fn) {
@@ -17216,7 +17216,7 @@ Internals.Events = [
 var devToolsConfig$jscomp$inline_1776 = {
   findFiberByHostInstance: getClosestInstanceFromNode,
   bundleType: 0,
-  version: "19.0.0-www-classic-ba95cf4b8f-20240709",
+  version: "19.0.0-www-classic-b73dcdc04f-20240709",
   rendererPackageName: "react-dom"
 };
 var internals$jscomp$inline_2220 = {
@@ -17246,7 +17246,7 @@ var internals$jscomp$inline_2220 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-classic-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-classic-b73dcdc04f-20240709"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_2221 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17710,4 +17710,4 @@ exports.useFormState = function (action, initialState, permalink) {
 exports.useFormStatus = function () {
   return ReactSharedInternals.H.useHostTransitionStatus();
 };
-exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
diff --git a/compiled/facebook-www/ReactDOM-prod.modern.js b/compiled/facebook-www/ReactDOM-prod.modern.js
@@ -16478,14 +16478,14 @@ function getCrossOriginStringAs(as, input) {
 }
 var isomorphicReactPackageVersion$jscomp$inline_1740 = React.version;
 if (
-  "19.0.0-www-modern-ba95cf4b8f-20240709" !==
+  "19.0.0-www-modern-b73dcdc04f-20240709" !==
   isomorphicReactPackageVersion$jscomp$inline_1740
 )
   throw Error(
     formatProdErrorMessage(
       527,
       isomorphicReactPackageVersion$jscomp$inline_1740,
-      "19.0.0-www-modern-ba95cf4b8f-20240709"
+      "19.0.0-www-modern-b73dcdc04f-20240709"
     )
   );
 Internals.findDOMNode = function (componentOrElement) {
@@ -16504,7 +16504,7 @@ Internals.Events = [
 var devToolsConfig$jscomp$inline_1742 = {
   findFiberByHostInstance: getClosestInstanceFromNode,
   bundleType: 0,
-  version: "19.0.0-www-modern-ba95cf4b8f-20240709",
+  version: "19.0.0-www-modern-b73dcdc04f-20240709",
   rendererPackageName: "react-dom"
 };
 var internals$jscomp$inline_2211 = {
@@ -16534,7 +16534,7 @@ var internals$jscomp$inline_2211 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-modern-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-modern-b73dcdc04f-20240709"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_2212 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16905,4 +16905,4 @@ exports.useFormState = function (action, initialState, permalink) {
 exports.useFormStatus = function () {
   return ReactSharedInternals.H.useHostTransitionStatus();
 };
-exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
diff --git a/compiled/facebook-www/ReactDOM-profiling.classic.js b/compiled/facebook-www/ReactDOM-profiling.classic.js
@@ -17930,14 +17930,14 @@ function getCrossOriginStringAs(as, input) {
 }
 var isomorphicReactPackageVersion$jscomp$inline_1856 = React.version;
 if (
-  "19.0.0-www-classic-ba95cf4b8f-20240709" !==
+  "19.0.0-www-classic-b73dcdc04f-20240709" !==
   isomorphicReactPackageVersion$jscomp$inline_1856
 )
   throw Error(
     formatProdErrorMessage(
       527,
       isomorphicReactPackageVersion$jscomp$inline_1856,
-      "19.0.0-www-classic-ba95cf4b8f-20240709"
+      "19.0.0-www-classic-b73dcdc04f-20240709"
     )
   );
 function flushSyncFromReconciler(fn) {
@@ -17983,7 +17983,7 @@ Internals.Events = [
 var devToolsConfig$jscomp$inline_1863 = {
   findFiberByHostInstance: getClosestInstanceFromNode,
   bundleType: 0,
-  version: "19.0.0-www-classic-ba95cf4b8f-20240709",
+  version: "19.0.0-www-classic-b73dcdc04f-20240709",
   rendererPackageName: "react-dom"
 };
 (function (internals) {
@@ -18027,7 +18027,7 @@ var devToolsConfig$jscomp$inline_1863 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-classic-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-classic-b73dcdc04f-20240709"
 });
 function ReactDOMRoot(internalRoot) {
   this._internalRoot = internalRoot;
@@ -18478,7 +18478,7 @@ exports.useFormState = function (action, initialState, permalink) {
 exports.useFormStatus = function () {
   return ReactSharedInternals.H.useHostTransitionStatus();
 };
-exports.version = "19.0.0-www-classic-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-classic-b73dcdc04f-20240709";
 "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
   "function" ===
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactDOM-profiling.modern.js b/compiled/facebook-www/ReactDOM-profiling.modern.js
@@ -17228,14 +17228,14 @@ function getCrossOriginStringAs(as, input) {
 }
 var isomorphicReactPackageVersion$jscomp$inline_1827 = React.version;
 if (
-  "19.0.0-www-modern-ba95cf4b8f-20240709" !==
+  "19.0.0-www-modern-b73dcdc04f-20240709" !==
   isomorphicReactPackageVersion$jscomp$inline_1827
 )
   throw Error(
     formatProdErrorMessage(
       527,
       isomorphicReactPackageVersion$jscomp$inline_1827,
-      "19.0.0-www-modern-ba95cf4b8f-20240709"
+      "19.0.0-www-modern-b73dcdc04f-20240709"
     )
   );
 Internals.findDOMNode = function (componentOrElement) {
@@ -17254,7 +17254,7 @@ Internals.Events = [
 var devToolsConfig$jscomp$inline_1829 = {
   findFiberByHostInstance: getClosestInstanceFromNode,
   bundleType: 0,
-  version: "19.0.0-www-modern-ba95cf4b8f-20240709",
+  version: "19.0.0-www-modern-b73dcdc04f-20240709",
   rendererPackageName: "react-dom"
 };
 (function (internals) {
@@ -17298,7 +17298,7 @@ var devToolsConfig$jscomp$inline_1829 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-www-modern-ba95cf4b8f-20240709"
+  reconcilerVersion: "19.0.0-www-modern-b73dcdc04f-20240709"
 });
 function ReactDOMRoot(internalRoot) {
   this._internalRoot = internalRoot;
@@ -17656,7 +17656,7 @@ exports.useFormState = function (action, initialState, permalink) {
 exports.useFormStatus = function () {
   return ReactSharedInternals.H.useHostTransitionStatus();
 };
-exports.version = "19.0.0-www-modern-ba95cf4b8f-20240709";
+exports.version = "19.0.0-www-modern-b73dcdc04f-20240709";
 "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
   "function" ===
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ba95cf4b8f39acfd7c0ccf2795a19430d35ea6b3
		b73dcdc04ffa2dd9f2197d796388657d64ad53be