Skip to content

Commit a26db9b

Browse files
committed
Clean up enableSiblingPrerendering flag (#32319)
DiffTrain build for [4ca97e4](4ca97e4)
1 parent 3953289 commit a26db9b

34 files changed

+1020
-1480
lines changed

compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9b79292ae7c2980acb531f1dff3cf1ca2d2f40b7
1+
4ca97e4891b6a664b4c3a183f16b81139655ff57
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9b79292ae7c2980acb531f1dff3cf1ca2d2f40b7
1+
4ca97e4891b6a664b4c3a183f16b81139655ff57

compiled/facebook-www/React-dev.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ __DEV__ &&
15381538
exports.useTransition = function () {
15391539
return resolveDispatcher().useTransition();
15401540
};
1541-
exports.version = "19.2.0-www-classic-9b79292a-20250508";
1541+
exports.version = "19.2.0-www-classic-4ca97e48-20250508";
15421542
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
15431543
"function" ===
15441544
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-dev.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ __DEV__ &&
15381538
exports.useTransition = function () {
15391539
return resolveDispatcher().useTransition();
15401540
};
1541-
exports.version = "19.2.0-www-modern-9b79292a-20250508";
1541+
exports.version = "19.2.0-www-modern-4ca97e48-20250508";
15421542
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
15431543
"function" ===
15441544
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-prod.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,4 +636,4 @@ exports.useSyncExternalStore = function (
636636
exports.useTransition = function () {
637637
return ReactSharedInternals.H.useTransition();
638638
};
639-
exports.version = "19.2.0-www-classic-9b79292a-20250508";
639+
exports.version = "19.2.0-www-classic-4ca97e48-20250508";

compiled/facebook-www/React-prod.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,4 +636,4 @@ exports.useSyncExternalStore = function (
636636
exports.useTransition = function () {
637637
return ReactSharedInternals.H.useTransition();
638638
};
639-
exports.version = "19.2.0-www-modern-9b79292a-20250508";
639+
exports.version = "19.2.0-www-modern-4ca97e48-20250508";

compiled/facebook-www/React-profiling.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ exports.useSyncExternalStore = function (
640640
exports.useTransition = function () {
641641
return ReactSharedInternals.H.useTransition();
642642
};
643-
exports.version = "19.2.0-www-classic-9b79292a-20250508";
643+
exports.version = "19.2.0-www-classic-4ca97e48-20250508";
644644
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
645645
"function" ===
646646
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-profiling.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ exports.useSyncExternalStore = function (
640640
exports.useTransition = function () {
641641
return ReactSharedInternals.H.useTransition();
642642
};
643-
exports.version = "19.2.0-www-modern-9b79292a-20250508";
643+
exports.version = "19.2.0-www-modern-4ca97e48-20250508";
644644
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
645645
"function" ===
646646
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/ReactART-dev.classic.js

Lines changed: 76 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,7 @@ __DEV__ &&
492492
: ((pingedLanes &= nonIdlePendingLanes),
493493
0 !== pingedLanes
494494
? (nextLanes = getHighestPriorityLanes(pingedLanes))
495-
: enableSiblingPrerendering &&
496-
!rootHasPendingCommit &&
495+
: rootHasPendingCommit ||
497496
((rootHasPendingCommit = nonIdlePendingLanes & ~root),
498497
0 !== rootHasPendingCommit &&
499498
(nextLanes =
@@ -503,8 +502,7 @@ __DEV__ &&
503502
? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
504503
: 0 !== pingedLanes
505504
? (nextLanes = getHighestPriorityLanes(pingedLanes))
506-
: enableSiblingPrerendering &&
507-
!rootHasPendingCommit &&
505+
: rootHasPendingCommit ||
508506
((rootHasPendingCommit = pendingLanes & ~root),
509507
0 !== rootHasPendingCommit &&
510508
(nextLanes = getHighestPriorityLanes(rootHasPendingCommit))));
@@ -634,8 +632,7 @@ __DEV__ &&
634632
remainingLanes &= ~lane;
635633
}
636634
0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
637-
enableSiblingPrerendering &&
638-
0 !== suspendedRetryLanes &&
635+
0 !== suspendedRetryLanes &&
639636
0 === updatedLanes &&
640637
0 !== root.tag &&
641638
(root.suspendedLanes |=
@@ -2883,45 +2880,45 @@ __DEV__ &&
28832880
(root.callbackPriority = 0)
28842881
);
28852882
if (
2886-
0 === (suspendedLanes & 3) ||
2887-
(enableSiblingPrerendering &&
2888-
checkIfRootIsPrerendering(root, suspendedLanes))
2889-
) {
2890-
currentTime = suspendedLanes & -suspendedLanes;
2891-
if (
2892-
currentTime !== root.callbackPriority ||
2893-
(null !== ReactSharedInternals.actQueue &&
2894-
pingedLanes !== fakeActCallbackNode$1)
2895-
)
2896-
cancelCallback(pingedLanes);
2897-
else return currentTime;
2898-
switch (lanesToEventPriority(suspendedLanes)) {
2899-
case DiscreteEventPriority:
2900-
case ContinuousEventPriority:
2901-
suspendedLanes = UserBlockingPriority;
2902-
break;
2903-
case DefaultEventPriority:
2904-
suspendedLanes = NormalPriority$1;
2905-
break;
2906-
case IdleEventPriority:
2907-
suspendedLanes = IdlePriority;
2908-
break;
2909-
default:
2910-
suspendedLanes = NormalPriority$1;
2911-
}
2912-
pingedLanes = performWorkOnRootViaSchedulerTask.bind(null, root);
2913-
null !== ReactSharedInternals.actQueue
2914-
? (ReactSharedInternals.actQueue.push(pingedLanes),
2915-
(suspendedLanes = fakeActCallbackNode$1))
2916-
: (suspendedLanes = scheduleCallback$3(suspendedLanes, pingedLanes));
2917-
root.callbackPriority = currentTime;
2918-
root.callbackNode = suspendedLanes;
2919-
return currentTime;
2883+
0 !== (suspendedLanes & 3) &&
2884+
!checkIfRootIsPrerendering(root, suspendedLanes)
2885+
)
2886+
return (
2887+
null !== pingedLanes && cancelCallback(pingedLanes),
2888+
(root.callbackPriority = 2),
2889+
(root.callbackNode = null),
2890+
2
2891+
);
2892+
currentTime = suspendedLanes & -suspendedLanes;
2893+
if (
2894+
currentTime !== root.callbackPriority ||
2895+
(null !== ReactSharedInternals.actQueue &&
2896+
pingedLanes !== fakeActCallbackNode$1)
2897+
)
2898+
cancelCallback(pingedLanes);
2899+
else return currentTime;
2900+
switch (lanesToEventPriority(suspendedLanes)) {
2901+
case DiscreteEventPriority:
2902+
case ContinuousEventPriority:
2903+
suspendedLanes = UserBlockingPriority;
2904+
break;
2905+
case DefaultEventPriority:
2906+
suspendedLanes = NormalPriority$1;
2907+
break;
2908+
case IdleEventPriority:
2909+
suspendedLanes = IdlePriority;
2910+
break;
2911+
default:
2912+
suspendedLanes = NormalPriority$1;
29202913
}
2921-
null !== pingedLanes && cancelCallback(pingedLanes);
2922-
root.callbackPriority = 2;
2923-
root.callbackNode = null;
2924-
return 2;
2914+
pingedLanes = performWorkOnRootViaSchedulerTask.bind(null, root);
2915+
null !== ReactSharedInternals.actQueue
2916+
? (ReactSharedInternals.actQueue.push(pingedLanes),
2917+
(suspendedLanes = fakeActCallbackNode$1))
2918+
: (suspendedLanes = scheduleCallback$3(suspendedLanes, pingedLanes));
2919+
root.callbackPriority = currentTime;
2920+
root.callbackNode = suspendedLanes;
2921+
return currentTime;
29252922
}
29262923
function performWorkOnRootViaSchedulerTask(root, didTimeout) {
29272924
nestedUpdateScheduled = currentUpdateIsNested = !1;
@@ -9521,8 +9518,7 @@ __DEV__ &&
95219518
((retryQueue =
95229519
22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
95239520
(workInProgress.lanes |= retryQueue),
9524-
enableSiblingPrerendering &&
9525-
(workInProgressSuspendedRetryLanes |= retryQueue));
9521+
(workInProgressSuspendedRetryLanes |= retryQueue));
95269522
}
95279523
function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
95289524
switch (renderState.tailMode) {
@@ -14103,14 +14099,13 @@ __DEV__ &&
1410314099
(!forceSync &&
1410414100
0 === (lanes & 124) &&
1410514101
0 === (lanes & root.expiredLanes)) ||
14106-
(enableSiblingPrerendering && checkIfRootIsPrerendering(root, lanes)))
14102+
checkIfRootIsPrerendering(root, lanes))
1410714103
? renderRootConcurrent(root, lanes)
1410814104
: renderRootSync(root, lanes, !0);
1410914105
var renderWasConcurrent = yieldedFiber;
1411014106
do {
1411114107
if (startTime === RootInProgress) {
14112-
enableSiblingPrerendering &&
14113-
workInProgressRootIsPrerendering &&
14108+
workInProgressRootIsPrerendering &&
1411414109
!yieldedFiber &&
1411514110
markRootSuspended(root, lanes, 0, !1);
1411614111
enableComponentPerformanceTrack &&
@@ -14414,9 +14409,7 @@ __DEV__ &&
1441414409
suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
1441514410
root.suspendedLanes |= suspendedLanes;
1441614411
root.pingedLanes &= ~suspendedLanes;
14417-
enableSiblingPrerendering &&
14418-
didAttemptEntireTree &&
14419-
(root.warmLanes |= suspendedLanes);
14412+
didAttemptEntireTree && (root.warmLanes |= suspendedLanes);
1442014413
didAttemptEntireTree = root.expirationTimes;
1442114414
for (var lanes = suspendedLanes; 0 < lanes; ) {
1442214415
var index = 31 - clz32(lanes),
@@ -14784,37 +14777,11 @@ __DEV__ &&
1478414777
ReactSharedInternals.getCurrentStack = null;
1478514778
isRendering = !1;
1478614779
current = null;
14787-
if (
14788-
thrownValue === SuspenseException ||
14789-
thrownValue === SuspenseActionException
14790-
) {
14791-
thrownValue = getSuspendedThenable();
14792-
var JSCompiler_temp;
14793-
if ((JSCompiler_temp = !enableSiblingPrerendering))
14794-
(JSCompiler_temp = suspenseHandlerStackCursor.current),
14795-
(JSCompiler_temp =
14796-
null === JSCompiler_temp
14797-
? !0
14798-
: (workInProgressRootRenderLanes & 4194048) ===
14799-
workInProgressRootRenderLanes
14800-
? null === shellBoundary
14801-
? !0
14802-
: !1
14803-
: (workInProgressRootRenderLanes & 62914560) ===
14804-
workInProgressRootRenderLanes ||
14805-
0 !== (workInProgressRootRenderLanes & 536870912)
14806-
? JSCompiler_temp === shellBoundary
14807-
: !1);
14808-
workInProgressSuspendedReason =
14809-
JSCompiler_temp &&
14810-
0 === (workInProgressRootSkippedLanes & 134217727) &&
14811-
0 === (workInProgressRootInterleavedUpdatedLanes & 134217727)
14812-
? thrownValue === SuspenseActionException
14813-
? SuspendedOnAction
14814-
: SuspendedOnData
14815-
: SuspendedOnImmediate;
14816-
} else
14817-
thrownValue === SuspenseyCommitException
14780+
thrownValue === SuspenseException ||
14781+
thrownValue === SuspenseActionException
14782+
? ((thrownValue = getSuspendedThenable()),
14783+
(workInProgressSuspendedReason = SuspendedOnImmediate))
14784+
: thrownValue === SuspenseyCommitException
1481814785
? ((thrownValue = getSuspendedThenable()),
1481914786
(workInProgressSuspendedReason = SuspendedOnInstance))
1482014787
: (workInProgressSuspendedReason =
@@ -14826,16 +14793,16 @@ __DEV__ &&
1482614793
? SuspendedOnDeprecatedThrowPromise
1482714794
: SuspendedOnError);
1482814795
workInProgressThrownValue = thrownValue;
14829-
JSCompiler_temp = workInProgress;
14830-
if (null === JSCompiler_temp)
14796+
var erroredWork = workInProgress;
14797+
if (null === erroredWork)
1483114798
(workInProgressRootExitStatus = RootFatalErrored),
1483214799
logUncaughtError(
1483314800
root,
1483414801
createCapturedValueAtFiber(thrownValue, root.current)
1483514802
);
1483614803
else if (
14837-
(JSCompiler_temp.mode & 2 &&
14838-
stopProfilerTimerIfRunningAndRecordDuration(JSCompiler_temp),
14804+
(erroredWork.mode & 2 &&
14805+
stopProfilerTimerIfRunningAndRecordDuration(erroredWork),
1483914806
enableSchedulingProfiler)
1484014807
)
1484114808
switch ((markComponentRenderStopped(), workInProgressSuspendedReason)) {
@@ -14845,7 +14812,7 @@ __DEV__ &&
1484514812
"function" ===
1484614813
typeof injectedProfilingHooks.markComponentErrored &&
1484714814
injectedProfilingHooks.markComponentErrored(
14848-
JSCompiler_temp,
14815+
erroredWork,
1484914816
thrownValue,
1485014817
workInProgressRootRenderLanes
1485114818
);
@@ -14860,7 +14827,7 @@ __DEV__ &&
1486014827
"function" ===
1486114828
typeof injectedProfilingHooks.markComponentSuspended &&
1486214829
injectedProfilingHooks.markComponentSuspended(
14863-
JSCompiler_temp,
14830+
erroredWork,
1486414831
thrownValue,
1486514832
workInProgressRootRenderLanes
1486614833
);
@@ -14938,7 +14905,6 @@ __DEV__ &&
1493814905
workInProgressThrownValue = null;
1493914906
throwAndUnwindWorkLoop(root, unitOfWork, thrownValue, reason);
1494014907
if (
14941-
enableSiblingPrerendering &&
1494214908
shouldYieldForPrerendering &&
1494314909
workInProgressRootIsPrerendering
1494414910
) {
@@ -15278,27 +15244,23 @@ __DEV__ &&
1527815244
return;
1527915245
}
1528015246
if (unitOfWork.flags & 32768) {
15281-
if (enableSiblingPrerendering)
15282-
if (suspendedReason === SuspendedOnError) root = !0;
15283-
else if (
15284-
workInProgressRootIsPrerendering ||
15285-
0 !== (workInProgressRootRenderLanes & 536870912)
15286-
)
15287-
root = !1;
15288-
else {
15289-
if (
15290-
((workInProgressRootDidSkipSuspendedSiblings = root = !0),
15291-
suspendedReason === SuspendedOnData ||
15292-
suspendedReason === SuspendedOnAction ||
15293-
suspendedReason === SuspendedOnImmediate ||
15294-
suspendedReason === SuspendedOnDeprecatedThrowPromise)
15295-
)
15296-
(suspendedReason = suspenseHandlerStackCursor.current),
15297-
null !== suspendedReason &&
15298-
13 === suspendedReason.tag &&
15299-
(suspendedReason.flags |= 16384);
15300-
}
15301-
else root = !0;
15247+
if (suspendedReason === SuspendedOnError) root = !0;
15248+
else if (
15249+
workInProgressRootIsPrerendering ||
15250+
0 !== (workInProgressRootRenderLanes & 536870912)
15251+
)
15252+
root = !1;
15253+
else if (
15254+
((workInProgressRootDidSkipSuspendedSiblings = root = !0),
15255+
suspendedReason === SuspendedOnData ||
15256+
suspendedReason === SuspendedOnAction ||
15257+
suspendedReason === SuspendedOnImmediate ||
15258+
suspendedReason === SuspendedOnDeprecatedThrowPromise)
15259+
)
15260+
(suspendedReason = suspenseHandlerStackCursor.current),
15261+
null !== suspendedReason &&
15262+
13 === suspendedReason.tag &&
15263+
(suspendedReason.flags |= 16384);
1530215264
unwindUnitOfWork(unitOfWork, root);
1530315265
} else completeUnitOfWork(unitOfWork);
1530415266
}
@@ -16921,7 +16883,6 @@ __DEV__ &&
1692116883
enableObjectFiber = dynamicFeatureFlags.enableObjectFiber,
1692216884
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
1692316885
enableRetryLaneExpiration = dynamicFeatureFlags.enableRetryLaneExpiration,
16924-
enableSiblingPrerendering = dynamicFeatureFlags.enableSiblingPrerendering,
1692516886
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
1692616887
renameElementSymbol = dynamicFeatureFlags.renameElementSymbol,
1692716888
retryLaneExpirationMs = dynamicFeatureFlags.retryLaneExpirationMs,
@@ -19104,10 +19065,10 @@ __DEV__ &&
1910419065
(function () {
1910519066
var internals = {
1910619067
bundleType: 1,
19107-
version: "19.2.0-www-classic-9b79292a-20250508",
19068+
version: "19.2.0-www-classic-4ca97e48-20250508",
1910819069
rendererPackageName: "react-art",
1910919070
currentDispatcherRef: ReactSharedInternals,
19110-
reconcilerVersion: "19.2.0-www-classic-9b79292a-20250508"
19071+
reconcilerVersion: "19.2.0-www-classic-4ca97e48-20250508"
1911119072
};
1911219073
internals.overrideHookState = overrideHookState;
1911319074
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -19141,7 +19102,7 @@ __DEV__ &&
1914119102
exports.Shape = Shape;
1914219103
exports.Surface = Surface;
1914319104
exports.Text = Text;
19144-
exports.version = "19.2.0-www-classic-9b79292a-20250508";
19105+
exports.version = "19.2.0-www-classic-4ca97e48-20250508";
1914519106
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1914619107
"function" ===
1914719108
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)