[Re-land] Make prerendering always non-blocking: Add missing feature …

…flag checks (#31238) This is a partial re-land of #31056. We saw breakages surface after the original land and had to revert. Now that they've been fixed, let's try this again. This time we'll split up the commits to give us more control of testing and rollout internally. Original PR: #31056 Original Commit: 2a9fb44 Revert PR: #31080 Commit description: ``` Neglected to wrap some places in the enableSiblingPrerendering flag. ``` Co-authored-by: Andrew Clark <git@andrewclark.io> DiffTrain build for [13411e4](13411e4)
facebook · Oct 14, 2024 · d3a3f5f · d3a3f5f
1 parent c1210a1
commit d3a3f5f
Show file tree

Hide file tree

Showing 34 changed files with 390 additions and 366 deletions.
diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-75dd053b5e83e8ae20e9f771bca7b95dba4ff881
+13411e4589f3d999727c5322781e2dd7bef3b256
diff --git a/compiled/facebook-www/REVISION_TRANSFORMS b/compiled/facebook-www/REVISION_TRANSFORMS
@@ -1 +1 @@
-75dd053b5e83e8ae20e9f771bca7b95dba4ff881
+13411e4589f3d999727c5322781e2dd7bef3b256
diff --git a/compiled/facebook-www/React-dev.classic.js b/compiled/facebook-www/React-dev.classic.js
@@ -2017,7 +2017,7 @@ __DEV__ &&
  exports.useTransition = function () {
  return resolveDispatcher().useTransition();
  };
- exports.version = "19.0.0-www-classic-75dd053b-20241014";
+ exports.version = "19.0.0-www-classic-13411e45-20241014";
  "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
@@ -1997,7 +1997,7 @@ __DEV__ &&
  exports.useTransition = function () {
  return resolveDispatcher().useTransition();
  };
- exports.version = "19.0.0-www-modern-75dd053b-20241014";
+ exports.version = "19.0.0-www-modern-13411e45-20241014";
  "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
@@ -824,4 +824,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
  return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-classic-75dd053b-20241014";
+exports.version = "19.0.0-www-classic-13411e45-20241014";
diff --git a/compiled/facebook-www/React-prod.modern.js b/compiled/facebook-www/React-prod.modern.js
@@ -820,4 +820,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
  return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-modern-75dd053b-20241014";
+exports.version = "19.0.0-www-modern-13411e45-20241014";
diff --git a/compiled/facebook-www/React-profiling.classic.js b/compiled/facebook-www/React-profiling.classic.js
@@ -828,7 +828,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
  return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-classic-75dd053b-20241014";
+exports.version = "19.0.0-www-classic-13411e45-20241014";
 "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
@@ -824,7 +824,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
  return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-www-modern-75dd053b-20241014";
+exports.version = "19.0.0-www-modern-13411e45-20241014";
 "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
@@ -857,7 +857,8 @@ __DEV__ &&
  : ((pingedLanes &= nonIdlePendingLanes),
  0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = nonIdlePendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes)))))
@@ -866,7 +867,8 @@ __DEV__ &&
  ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
  : 0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = pendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes))));
@@ -988,7 +990,8 @@ __DEV__ &&
  remainingLanes &= ~lane;
  }
  0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
- 0 === suspendedRetryLanes ||
+ !enableSiblingPrerendering ||
+ 0 === suspendedRetryLanes ||
  0 !== updatedLanes ||
  (disableLegacyMode && 0 === root.tag) ||
  (root.suspendedLanes |=
@@ -8992,7 +8995,8 @@ __DEV__ &&
  ((retryQueue =
  22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
  (workInProgress.lanes |= retryQueue),
- (workInProgressSuspendedRetryLanes |= retryQueue));
+ enableSiblingPrerendering &&
+ (workInProgressSuspendedRetryLanes |= retryQueue));
  }
  function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
  switch (renderState.tailMode) {
@@ -12797,7 +12801,9 @@ __DEV__ &&
  suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
  root.suspendedLanes |= suspendedLanes;
  root.pingedLanes &= ~suspendedLanes;
- didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes);
+ enableSiblingPrerendering &&
+ !didSkipSuspendedSiblings &&
+ (root.warmLanes |= suspendedLanes);
  didSkipSuspendedSiblings = root.expirationTimes;
  for (var lanes = suspendedLanes; 0 < lanes; ) {
  var index = 31 - clz32(lanes),
@@ -17018,11 +17024,11 @@ __DEV__ &&
  (function () {
  var internals = {
  bundleType: 1,
- version: "19.0.0-www-classic-75dd053b-20241014",
+ version: "19.0.0-www-classic-13411e45-20241014",
  rendererPackageName: "react-art",
  currentDispatcherRef: ReactSharedInternals,
  findFiberByHostInstance: getInstanceFromNode,
- reconcilerVersion: "19.0.0-www-classic-75dd053b-20241014"
+ reconcilerVersion: "19.0.0-www-classic-13411e45-20241014"
  };
  internals.overrideHookState = overrideHookState;
  internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -17056,7 +17062,7 @@ __DEV__ &&
  exports.Shape = Shape;
  exports.Surface = Surface;
  exports.Text = Text;
- exports.version = "19.0.0-www-classic-75dd053b-20241014";
+ exports.version = "19.0.0-www-classic-13411e45-20241014";
  "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
  "function" ===
  typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactART-dev.modern.js b/compiled/facebook-www/ReactART-dev.modern.js
@@ -840,7 +840,8 @@ __DEV__ &&
  : ((pingedLanes &= nonIdlePendingLanes),
  0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = nonIdlePendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes)))))
@@ -849,7 +850,8 @@ __DEV__ &&
  ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
  : 0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = pendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes))));
@@ -971,7 +973,8 @@ __DEV__ &&
  remainingLanes &= ~lane;
  }
  0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
- 0 !== suspendedRetryLanes &&
+ enableSiblingPrerendering &&
+ 0 !== suspendedRetryLanes &&
  0 === updatedLanes &&
  0 !== root.tag &&
  (root.suspendedLanes |=
@@ -8647,7 +8650,8 @@ __DEV__ &&
  ((retryQueue =
  22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
  (workInProgress.lanes |= retryQueue),
- (workInProgressSuspendedRetryLanes |= retryQueue));
+ enableSiblingPrerendering &&
+ (workInProgressSuspendedRetryLanes |= retryQueue));
  }
  function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
  switch (renderState.tailMode) {
@@ -12342,7 +12346,9 @@ __DEV__ &&
  suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
  root.suspendedLanes |= suspendedLanes;
  root.pingedLanes &= ~suspendedLanes;
- didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes);
+ enableSiblingPrerendering &&
+ !didSkipSuspendedSiblings &&
+ (root.warmLanes |= suspendedLanes);
  didSkipSuspendedSiblings = root.expirationTimes;
  for (var lanes = suspendedLanes; 0 < lanes; ) {
  var index = 31 - clz32(lanes),
@@ -16461,11 +16467,11 @@ __DEV__ &&
  (function () {
  var internals = {
  bundleType: 1,
- version: "19.0.0-www-modern-75dd053b-20241014",
+ version: "19.0.0-www-modern-13411e45-20241014",
  rendererPackageName: "react-art",
  currentDispatcherRef: ReactSharedInternals,
  findFiberByHostInstance: getInstanceFromNode,
- reconcilerVersion: "19.0.0-www-modern-75dd053b-20241014"
+ reconcilerVersion: "19.0.0-www-modern-13411e45-20241014"
  };
  internals.overrideHookState = overrideHookState;
  internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -16499,7 +16505,7 @@ __DEV__ &&
  exports.Shape = Shape;
  exports.Surface = Surface;
  exports.Text = Text;
- exports.version = "19.0.0-www-modern-75dd053b-20241014";
+ exports.version = "19.0.0-www-modern-13411e45-20241014";
  "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
  "function" ===
  typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js
@@ -601,7 +601,8 @@ function getNextLanes(root, wipLanes) {
  : ((pingedLanes &= nonIdlePendingLanes),
  0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = nonIdlePendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes)))))
@@ -610,7 +611,8 @@ function getNextLanes(root, wipLanes) {
  ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
  : 0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = pendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes))));
@@ -727,7 +729,8 @@ function markRootFinished(
  remainingLanes &= ~lane;
  }
  0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
- 0 === suspendedRetryLanes ||
+ !enableSiblingPrerendering ||
+ 0 === suspendedRetryLanes ||
  0 !== updatedLanes ||
  (disableLegacyMode && 0 === root.tag) ||
  (root.suspendedLanes |=
@@ -6551,7 +6554,8 @@ function scheduleRetryEffect(workInProgress, retryQueue) {
  ((retryQueue =
  22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
  (workInProgress.lanes |= retryQueue),
- (workInProgressSuspendedRetryLanes |= retryQueue));
+ enableSiblingPrerendering &&
+ (workInProgressSuspendedRetryLanes |= retryQueue));
 }
 function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
  switch (renderState.tailMode) {
@@ -9477,7 +9481,9 @@ function markRootSuspended(
  suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
  root.suspendedLanes |= suspendedLanes;
  root.pingedLanes &= ~suspendedLanes;
- didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes);
+ enableSiblingPrerendering &&
+ !didSkipSuspendedSiblings &&
+ (root.warmLanes |= suspendedLanes);
  didSkipSuspendedSiblings = root.expirationTimes;
  for (var lanes = suspendedLanes; 0 < lanes; ) {
  var index$6 = 31 - clz32(lanes),
@@ -10829,13 +10835,13 @@ var slice = Array.prototype.slice,
  })(React.Component);
 var internals$jscomp$inline_1467 = {
  bundleType: 0,
- version: "19.0.0-www-classic-75dd053b-20241014",
+ version: "19.0.0-www-classic-13411e45-20241014",
  rendererPackageName: "react-art",
  currentDispatcherRef: ReactSharedInternals,
  findFiberByHostInstance: function () {
  return null;
  },
- reconcilerVersion: "19.0.0-www-classic-75dd053b-20241014"
+ reconcilerVersion: "19.0.0-www-classic-13411e45-20241014"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1468 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -10861,4 +10867,4 @@ exports.RadialGradient = RadialGradient;
 exports.Shape = TYPES.SHAPE;
 exports.Surface = Surface;
 exports.Text = Text;
-exports.version = "19.0.0-www-classic-75dd053b-20241014";
+exports.version = "19.0.0-www-classic-13411e45-20241014";
diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js
@@ -518,7 +518,8 @@ function getNextLanes(root, wipLanes) {
  : ((pingedLanes &= nonIdlePendingLanes),
  0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = nonIdlePendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes)))))
@@ -527,7 +528,8 @@ function getNextLanes(root, wipLanes) {
  ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
  : 0 !== pingedLanes
  ? (nextLanes = getHighestPriorityLanes(pingedLanes))
- : root ||
+ : enableSiblingPrerendering &&
+ !root &&
  ((warmLanes = pendingLanes & ~warmLanes),
  0 !== warmLanes &&
  (nextLanes = getHighestPriorityLanes(warmLanes))));
@@ -644,7 +646,8 @@ function markRootFinished(
  remainingLanes &= ~lane;
  }
  0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
- 0 !== suspendedRetryLanes &&
+ enableSiblingPrerendering &&
+ 0 !== suspendedRetryLanes &&
  0 === updatedLanes &&
  0 !== root.tag &&
  (root.suspendedLanes |=
@@ -6184,7 +6187,8 @@ function scheduleRetryEffect(workInProgress, retryQueue) {
  ((retryQueue =
  22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
  (workInProgress.lanes |= retryQueue),
- (workInProgressSuspendedRetryLanes |= retryQueue));
+ enableSiblingPrerendering &&
+ (workInProgressSuspendedRetryLanes |= retryQueue));
 }
 function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
  switch (renderState.tailMode) {
@@ -9040,7 +9044,9 @@ function markRootSuspended(
  suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
  root.suspendedLanes |= suspendedLanes;
  root.pingedLanes &= ~suspendedLanes;
- didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes);
+ enableSiblingPrerendering &&
+ !didSkipSuspendedSiblings &&
+ (root.warmLanes |= suspendedLanes);
  didSkipSuspendedSiblings = root.expirationTimes;
  for (var lanes = suspendedLanes; 0 < lanes; ) {
  var index$6 = 31 - clz32(lanes),
@@ -10340,13 +10346,13 @@ var slice = Array.prototype.slice,
  })(React.Component);
 var internals$jscomp$inline_1460 = {
  bundleType: 0,
- version: "19.0.0-www-modern-75dd053b-20241014",
+ version: "19.0.0-www-modern-13411e45-20241014",
  rendererPackageName: "react-art",
  currentDispatcherRef: ReactSharedInternals,
  findFiberByHostInstance: function () {
  return null;
  },
- reconcilerVersion: "19.0.0-www-modern-75dd053b-20241014"
+ reconcilerVersion: "19.0.0-www-modern-13411e45-20241014"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1461 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -10372,4 +10378,4 @@ exports.RadialGradient = RadialGradient;
 exports.Shape = TYPES.SHAPE;
 exports.Surface = Surface;
 exports.Text = Text;
-exports.version = "19.0.0-www-modern-75dd053b-20241014";
+exports.version = "19.0.0-www-modern-13411e45-20241014";