Skip to content

Commit a5a6ecd

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

24 files changed

+525
-903
lines changed

compiled-rn/VERSION_NATIVE_FB

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.2.0-native-fb-9b79292a-20250508
1+
19.2.0-native-fb-4ca97e48-20250508

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-dev.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<52ff017ed5093ae8c5981421a6e71f4b>>
10+
* @generated SignedSource<<6be1231f0a2cf5263e09a1bc1ecddf64>>
1111
*/
1212

1313
"use strict";
@@ -404,5 +404,5 @@ __DEV__ &&
404404
exports.useFormStatus = function () {
405405
return resolveDispatcher().useHostTransitionStatus();
406406
};
407-
exports.version = "19.2.0-native-fb-9b79292a-20250508";
407+
exports.version = "19.2.0-native-fb-4ca97e48-20250508";
408408
})();

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-prod.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<77db10b684b9429e6f14fc2fe20c105a>>
10+
* @generated SignedSource<<90bf4ce482387e50d0dc3389b4019c01>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.2.0-native-fb-9b79292a-20250508";
206+
exports.version = "19.2.0-native-fb-4ca97e48-20250508";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-profiling.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<77db10b684b9429e6f14fc2fe20c105a>>
10+
* @generated SignedSource<<90bf4ce482387e50d0dc3389b4019c01>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.2.0-native-fb-9b79292a-20250508";
206+
exports.version = "19.2.0-native-fb-4ca97e48-20250508";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.js

Lines changed: 32 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<fdc173e3e84cf7e0c28555b54d7382d6>>
10+
* @generated SignedSource<<43b19660149a48f857a91e01876b46dd>>
1111
*/
1212

1313
/*
@@ -1182,8 +1182,7 @@ __DEV__ &&
11821182
: ((pingedLanes &= nonIdlePendingLanes),
11831183
0 !== pingedLanes
11841184
? (nextLanes = getHighestPriorityLanes(pingedLanes))
1185-
: enableSiblingPrerendering &&
1186-
!rootHasPendingCommit &&
1185+
: rootHasPendingCommit ||
11871186
((rootHasPendingCommit = nonIdlePendingLanes & ~root),
11881187
0 !== rootHasPendingCommit &&
11891188
(nextLanes =
@@ -1193,8 +1192,7 @@ __DEV__ &&
11931192
? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
11941193
: 0 !== pingedLanes
11951194
? (nextLanes = getHighestPriorityLanes(pingedLanes))
1196-
: enableSiblingPrerendering &&
1197-
!rootHasPendingCommit &&
1195+
: rootHasPendingCommit ||
11981196
((rootHasPendingCommit = pendingLanes & ~root),
11991197
0 !== rootHasPendingCommit &&
12001198
(nextLanes = getHighestPriorityLanes(rootHasPendingCommit))));
@@ -1329,8 +1327,7 @@ __DEV__ &&
13291327
remainingLanes &= ~lane;
13301328
}
13311329
0 !== spawnedLane && markSpawnedDeferredLane(root, spawnedLane, 0);
1332-
enableSiblingPrerendering &&
1333-
0 !== suspendedRetryLanes &&
1330+
0 !== suspendedRetryLanes &&
13341331
0 === updatedLanes &&
13351332
(root.suspendedLanes |=
13361333
suspendedRetryLanes & ~(previouslyPendingLanes & ~finishedLanes));
@@ -11809,8 +11806,7 @@ __DEV__ &&
1180911806
((retryQueue =
1181011807
22 !== workInProgress.tag ? claimNextRetryLane() : 536870912),
1181111808
(workInProgress.lanes |= retryQueue),
11812-
enableSiblingPrerendering &&
11813-
(workInProgressSuspendedRetryLanes |= retryQueue));
11809+
(workInProgressSuspendedRetryLanes |= retryQueue));
1181411810
}
1181511811
function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
1181611812
if (!isHydrating)
@@ -15709,15 +15705,14 @@ __DEV__ &&
1570915705
(!forceSync &&
1571015706
0 === (lanes & 124) &&
1571115707
0 === (lanes & root.expiredLanes)) ||
15712-
(enableSiblingPrerendering && checkIfRootIsPrerendering(root, lanes)),
15708+
checkIfRootIsPrerendering(root, lanes),
1571315709
exitStatus = shouldTimeSlice
1571415710
? renderRootConcurrent(root, lanes)
1571515711
: renderRootSync(root, lanes, !0),
1571615712
renderWasConcurrent = shouldTimeSlice;
1571715713
do {
1571815714
if (exitStatus === RootInProgress) {
15719-
enableSiblingPrerendering &&
15720-
workInProgressRootIsPrerendering &&
15715+
workInProgressRootIsPrerendering &&
1572115716
!shouldTimeSlice &&
1572215717
markRootSuspended(root, lanes, 0, !1);
1572315718
break;
@@ -16003,9 +15998,7 @@ __DEV__ &&
1600315998
suspendedLanes &= ~workInProgressRootInterleavedUpdatedLanes;
1600415999
root.suspendedLanes |= suspendedLanes;
1600516000
root.pingedLanes &= ~suspendedLanes;
16006-
enableSiblingPrerendering &&
16007-
didAttemptEntireTree &&
16008-
(root.warmLanes |= suspendedLanes);
16001+
didAttemptEntireTree && (root.warmLanes |= suspendedLanes);
1600916002
didAttemptEntireTree = root.expirationTimes;
1601016003
for (var lanes = suspendedLanes; 0 < lanes; ) {
1601116004
var index = 31 - clz32(lanes),
@@ -16095,15 +16088,7 @@ __DEV__ &&
1609516088
thrownValue === SuspenseException ||
1609616089
thrownValue === SuspenseActionException
1609716090
? ((thrownValue = getSuspendedThenable()),
16098-
(workInProgressSuspendedReason =
16099-
!enableSiblingPrerendering &&
16100-
shouldRemainOnPreviousScreen() &&
16101-
0 === (workInProgressRootSkippedLanes & 134217727) &&
16102-
0 === (workInProgressRootInterleavedUpdatedLanes & 134217727)
16103-
? thrownValue === SuspenseActionException
16104-
? SuspendedOnAction
16105-
: SuspendedOnData
16106-
: SuspendedOnImmediate))
16091+
(workInProgressSuspendedReason = SuspendedOnImmediate))
1610716092
: thrownValue === SuspenseyCommitException
1610816093
? ((thrownValue = getSuspendedThenable()),
1610916094
(workInProgressSuspendedReason = SuspendedOnInstance))
@@ -16242,7 +16227,6 @@ __DEV__ &&
1624216227
workInProgressThrownValue = null;
1624316228
throwAndUnwindWorkLoop(root, unitOfWork, thrownValue, reason);
1624416229
if (
16245-
enableSiblingPrerendering &&
1624616230
shouldYieldForPrerendering &&
1624716231
workInProgressRootIsPrerendering
1624816232
) {
@@ -16566,27 +16550,23 @@ __DEV__ &&
1656616550
return;
1656716551
}
1656816552
if (unitOfWork.flags & 32768) {
16569-
if (enableSiblingPrerendering)
16570-
if (isHydrating || suspendedReason === SuspendedOnError) root = !0;
16571-
else if (
16572-
workInProgressRootIsPrerendering ||
16573-
0 !== (workInProgressRootRenderLanes & 536870912)
16574-
)
16575-
root = !1;
16576-
else {
16577-
if (
16578-
((workInProgressRootDidSkipSuspendedSiblings = root = !0),
16579-
suspendedReason === SuspendedOnData ||
16580-
suspendedReason === SuspendedOnAction ||
16581-
suspendedReason === SuspendedOnImmediate ||
16582-
suspendedReason === SuspendedOnDeprecatedThrowPromise)
16583-
)
16584-
(suspendedReason = suspenseHandlerStackCursor.current),
16585-
null !== suspendedReason &&
16586-
13 === suspendedReason.tag &&
16587-
(suspendedReason.flags |= 16384);
16588-
}
16589-
else root = !0;
16553+
if (isHydrating || suspendedReason === SuspendedOnError) root = !0;
16554+
else if (
16555+
workInProgressRootIsPrerendering ||
16556+
0 !== (workInProgressRootRenderLanes & 536870912)
16557+
)
16558+
root = !1;
16559+
else if (
16560+
((workInProgressRootDidSkipSuspendedSiblings = root = !0),
16561+
suspendedReason === SuspendedOnData ||
16562+
suspendedReason === SuspendedOnAction ||
16563+
suspendedReason === SuspendedOnImmediate ||
16564+
suspendedReason === SuspendedOnDeprecatedThrowPromise)
16565+
)
16566+
(suspendedReason = suspenseHandlerStackCursor.current),
16567+
null !== suspendedReason &&
16568+
13 === suspendedReason.tag &&
16569+
(suspendedReason.flags |= 16384);
1659016570
unwindUnitOfWork(unitOfWork, root);
1659116571
} else completeUnitOfWork(unitOfWork);
1659216572
}
@@ -17588,8 +17568,7 @@ __DEV__ &&
1758817568
);
1758917569
if (
1759017570
0 === (suspendedLanes & 3) ||
17591-
(enableSiblingPrerendering &&
17592-
checkIfRootIsPrerendering(root, suspendedLanes))
17571+
checkIfRootIsPrerendering(root, suspendedLanes)
1759317572
) {
1759417573
currentTime = suspendedLanes & -suspendedLanes;
1759517574
if (
@@ -23133,7 +23112,6 @@ __DEV__ &&
2313323112
enableObjectFiber = dynamicFlagsUntyped.enableObjectFiber,
2313423113
enablePersistedModeClonedFlag =
2313523114
dynamicFlagsUntyped.enablePersistedModeClonedFlag,
23136-
enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering,
2313723115
renameElementSymbol = dynamicFlagsUntyped.renameElementSymbol,
2313823116
enableFragmentRefs = dynamicFlagsUntyped.enableFragmentRefs,
2313923117
searchTarget = null,
@@ -26978,11 +26956,11 @@ __DEV__ &&
2697826956
};
2697926957
(function () {
2698026958
var isomorphicReactPackageVersion = React.version;
26981-
if ("19.2.0-native-fb-9b79292a-20250508" !== isomorphicReactPackageVersion)
26959+
if ("19.2.0-native-fb-4ca97e48-20250508" !== isomorphicReactPackageVersion)
2698226960
throw Error(
2698326961
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2698426962
(isomorphicReactPackageVersion +
26985-
"\n - react-dom: 19.2.0-native-fb-9b79292a-20250508\nLearn more: https://react.dev/warnings/version-mismatch")
26963+
"\n - react-dom: 19.2.0-native-fb-4ca97e48-20250508\nLearn more: https://react.dev/warnings/version-mismatch")
2698626964
);
2698726965
})();
2698826966
("function" === typeof Map &&
@@ -27019,10 +26997,10 @@ __DEV__ &&
2701926997
!(function () {
2702026998
var internals = {
2702126999
bundleType: 1,
27022-
version: "19.2.0-native-fb-9b79292a-20250508",
27000+
version: "19.2.0-native-fb-4ca97e48-20250508",
2702327001
rendererPackageName: "react-dom",
2702427002
currentDispatcherRef: ReactSharedInternals,
27025-
reconcilerVersion: "19.2.0-native-fb-9b79292a-20250508"
27003+
reconcilerVersion: "19.2.0-native-fb-4ca97e48-20250508"
2702627004
};
2702727005
internals.overrideHookState = overrideHookState;
2702827006
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -27160,5 +27138,5 @@ __DEV__ &&
2716027138
listenToAllSupportedEvents(container);
2716127139
return new ReactDOMHydrationRoot(initialChildren);
2716227140
};
27163-
exports.version = "19.2.0-native-fb-9b79292a-20250508";
27141+
exports.version = "19.2.0-native-fb-4ca97e48-20250508";
2716427142
})();

0 commit comments

Comments
 (0)