Skip to content

Commit 981fe2b

Browse files
potetopoteto
committed
[RN] Set enableOwnerStacks and enableUseDeferredValueInitialArg to false
In www, the experimental versions get a .modern.js or .classic.js prefix and get copied into the same folder. In RN, they don't seem to have .modern.js and .classic.js versions so they end up getting the same name. sebmarkbage's theory is that what happens is that they then override the file that was already there. So depending on if experimental or stable build finishes first you get a different version at the end. It doesn't make sense to use `__EXPERIMENTAL__` for flags in native-fb since there's no modern/classic split there. So that flag should just be hardcoded to true or false and then it doesn't matter which one finishes first. We don't support experimental builds in OSS RN neither so the same thing could happen with [`enableOwnerStacks`](https://github.com/facebook/react/blob/5dcf3ca8d45a276a8b4cee0cedd234967661ca35/packages/shared/forks/ReactFeatureFlags.native-oss.js#L60). You can see that the build errors in the previous PR but passes after these flag changes. ghstack-source-id: d10f37b Pull Request resolved: #30322 DiffTrain build for commit ff3f1fa.
1 parent 1c54b5d commit 981fe2b

File tree

14 files changed

+202
-136
lines changed

14 files changed

+202
-136
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.0.0-native-fb-433068ee-20240711
1+
19.0.0-native-fb-ff3f1fac-20240712

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js‎

Lines changed: 61 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<333ee47fc63e94412bc1786f307125aa>>
10+
* @generated SignedSource<<a55b3ae9fc483a5ea92aaa34fe44b5df>>
1111
*/
1212

1313
"use strict";
1414
__DEV__ &&
1515
(function () {
16-
function JSCompiler_object_inline_createNodeMock_1106() {
16+
function JSCompiler_object_inline_createNodeMock_1089() {
1717
return null;
1818
}
1919
function findHook(fiber, id) {
@@ -4693,38 +4693,50 @@ __DEV__ &&
46934693
hook.memoizedState = [prevState, deps];
46944694
return prevState;
46954695
}
4696-
function mountDeferredValue(value) {
4697-
mountWorkInProgressHook().memoizedState = value;
4698-
return value;
4696+
function mountDeferredValue(value, initialValue) {
4697+
var hook = mountWorkInProgressHook();
4698+
return mountDeferredValueImpl(hook, value, initialValue);
46994699
}
4700-
function updateDeferredValue(value) {
4700+
function updateDeferredValue(value, initialValue) {
47014701
var hook = updateWorkInProgressHook();
4702-
return updateDeferredValueImpl(hook, currentHook.memoizedState, value);
4702+
return updateDeferredValueImpl(
4703+
hook,
4704+
currentHook.memoizedState,
4705+
value,
4706+
initialValue
4707+
);
47034708
}
4704-
function rerenderDeferredValue(value) {
4709+
function rerenderDeferredValue(value, initialValue) {
47054710
var hook = updateWorkInProgressHook();
47064711
return null === currentHook
4707-
? ((hook.memoizedState = value), value)
4708-
: updateDeferredValueImpl(hook, currentHook.memoizedState, value);
4712+
? mountDeferredValueImpl(hook, value, initialValue)
4713+
: updateDeferredValueImpl(
4714+
hook,
4715+
currentHook.memoizedState,
4716+
value,
4717+
initialValue
4718+
);
47094719
}
4710-
function updateDeferredValueImpl(hook, prevValue, value) {
4720+
function mountDeferredValueImpl(hook, value, initialValue) {
4721+
if (void 0 === initialValue || 0 !== (renderLanes & DeferredLane))
4722+
return (hook.memoizedState = value);
4723+
hook.memoizedState = initialValue;
4724+
hook = requestDeferredLane();
4725+
currentlyRenderingFiber$1.lanes |= hook;
4726+
workInProgressRootSkippedLanes |= hook;
4727+
return initialValue;
4728+
}
4729+
function updateDeferredValueImpl(hook, prevValue, value, initialValue) {
47114730
if (objectIs(value, prevValue)) return value;
47124731
if (null !== currentTreeHiddenStackCursor.current)
47134732
return (
4714-
(hook.memoizedState = value),
4715-
objectIs(value, prevValue) || (didReceiveUpdate = !0),
4716-
value
4733+
(hook = mountDeferredValueImpl(hook, value, initialValue)),
4734+
objectIs(hook, prevValue) || (didReceiveUpdate = !0),
4735+
hook
47174736
);
47184737
if (0 === (renderLanes & (SyncLane | InputContinuousLane | DefaultLane)))
47194738
return (didReceiveUpdate = !0), (hook.memoizedState = value);
4720-
0 === workInProgressDeferredLane &&
4721-
(workInProgressDeferredLane =
4722-
0 !== (workInProgressRootRenderLanes & OffscreenLane)
4723-
? OffscreenLane
4724-
: claimNextTransitionLane());
4725-
hook = suspenseHandlerStackCursor.current;
4726-
null !== hook && (hook.flags |= 32);
4727-
hook = workInProgressDeferredLane;
4739+
hook = requestDeferredLane();
47284740
currentlyRenderingFiber$1.lanes |= hook;
47294741
workInProgressRootSkippedLanes |= hook;
47304742
return prevValue;
@@ -10680,6 +10692,16 @@ __DEV__ &&
1068010692
: DefaultEventPriority;
1068110693
return fiber;
1068210694
}
10695+
function requestDeferredLane() {
10696+
0 === workInProgressDeferredLane &&
10697+
(workInProgressDeferredLane =
10698+
0 !== (workInProgressRootRenderLanes & OffscreenLane)
10699+
? OffscreenLane
10700+
: claimNextTransitionLane());
10701+
var suspenseHandler = suspenseHandlerStackCursor.current;
10702+
null !== suspenseHandler && (suspenseHandler.flags |= 32);
10703+
return workInProgressDeferredLane;
10704+
}
1068310705
function scheduleUpdateOnFiber(root, fiber, lane) {
1068410706
isRunningInsertionEffect &&
1068510707
error$jscomp$0("useInsertionEffect must not schedule updates.");
@@ -13776,10 +13798,10 @@ __DEV__ &&
1377613798
currentHookNameInDev = "useDebugValue";
1377713799
mountHookTypesDev();
1377813800
},
13779-
useDeferredValue: function (value) {
13801+
useDeferredValue: function (value, initialValue) {
1378013802
currentHookNameInDev = "useDeferredValue";
1378113803
mountHookTypesDev();
13782-
return mountDeferredValue(value);
13804+
return mountDeferredValue(value, initialValue);
1378313805
},
1378413806
useTransition: function () {
1378513807
currentHookNameInDev = "useTransition";
@@ -13901,10 +13923,10 @@ __DEV__ &&
1390113923
currentHookNameInDev = "useDebugValue";
1390213924
updateHookTypesDev();
1390313925
},
13904-
useDeferredValue: function (value) {
13926+
useDeferredValue: function (value, initialValue) {
1390513927
currentHookNameInDev = "useDeferredValue";
1390613928
updateHookTypesDev();
13907-
return mountDeferredValue(value);
13929+
return mountDeferredValue(value, initialValue);
1390813930
},
1390913931
useTransition: function () {
1391013932
currentHookNameInDev = "useTransition";
@@ -14031,10 +14053,10 @@ __DEV__ &&
1403114053
currentHookNameInDev = "useDebugValue";
1403214054
updateHookTypesDev();
1403314055
},
14034-
useDeferredValue: function (value) {
14056+
useDeferredValue: function (value, initialValue) {
1403514057
currentHookNameInDev = "useDeferredValue";
1403614058
updateHookTypesDev();
14037-
return updateDeferredValue(value);
14059+
return updateDeferredValue(value, initialValue);
1403814060
},
1403914061
useTransition: function () {
1404014062
currentHookNameInDev = "useTransition";
@@ -14156,10 +14178,10 @@ __DEV__ &&
1415614178
currentHookNameInDev = "useDebugValue";
1415714179
updateHookTypesDev();
1415814180
},
14159-
useDeferredValue: function (value) {
14181+
useDeferredValue: function (value, initialValue) {
1416014182
currentHookNameInDev = "useDeferredValue";
1416114183
updateHookTypesDev();
14162-
return rerenderDeferredValue(value);
14184+
return rerenderDeferredValue(value, initialValue);
1416314185
},
1416414186
useTransition: function () {
1416514187
currentHookNameInDev = "useTransition";
@@ -14296,11 +14318,11 @@ __DEV__ &&
1429614318
warnInvalidHookAccess();
1429714319
mountHookTypesDev();
1429814320
},
14299-
useDeferredValue: function (value) {
14321+
useDeferredValue: function (value, initialValue) {
1430014322
currentHookNameInDev = "useDeferredValue";
1430114323
warnInvalidHookAccess();
1430214324
mountHookTypesDev();
14303-
return mountDeferredValue(value);
14325+
return mountDeferredValue(value, initialValue);
1430414326
},
1430514327
useTransition: function () {
1430614328
currentHookNameInDev = "useTransition";
@@ -14450,11 +14472,11 @@ __DEV__ &&
1445014472
warnInvalidHookAccess();
1445114473
updateHookTypesDev();
1445214474
},
14453-
useDeferredValue: function (value) {
14475+
useDeferredValue: function (value, initialValue) {
1445414476
currentHookNameInDev = "useDeferredValue";
1445514477
warnInvalidHookAccess();
1445614478
updateHookTypesDev();
14457-
return updateDeferredValue(value);
14479+
return updateDeferredValue(value, initialValue);
1445814480
},
1445914481
useTransition: function () {
1446014482
currentHookNameInDev = "useTransition";
@@ -14601,11 +14623,11 @@ __DEV__ &&
1460114623
warnInvalidHookAccess();
1460214624
updateHookTypesDev();
1460314625
},
14604-
useDeferredValue: function (value) {
14626+
useDeferredValue: function (value, initialValue) {
1460514627
currentHookNameInDev = "useDeferredValue";
1460614628
warnInvalidHookAccess();
1460714629
updateHookTypesDev();
14608-
return rerenderDeferredValue(value);
14630+
return rerenderDeferredValue(value, initialValue);
1460914631
},
1461014632
useTransition: function () {
1461114633
currentHookNameInDev = "useTransition";
@@ -15169,20 +15191,20 @@ __DEV__ &&
1516915191
scheduleRoot: scheduleRoot,
1517015192
setRefreshHandler: setRefreshHandler,
1517115193
getCurrentFiber: getCurrentFiberForDevTools,
15172-
reconcilerVersion: "19.0.0-native-fb-433068ee-20240711"
15194+
reconcilerVersion: "19.0.0-native-fb-ff3f1fac-20240712"
1517315195
});
1517415196
})({
1517515197
findFiberByHostInstance: function () {
1517615198
throw Error("TestRenderer does not support findFiberByHostInstance()");
1517715199
},
1517815200
bundleType: 1,
15179-
version: "19.0.0-native-fb-433068ee-20240711",
15201+
version: "19.0.0-native-fb-ff3f1fac-20240712",
1518015202
rendererPackageName: "react-test-renderer"
1518115203
});
1518215204
exports._Scheduler = Scheduler;
1518315205
exports.act = act;
1518415206
exports.create = function (element, options) {
15185-
var createNodeMock = JSCompiler_object_inline_createNodeMock_1106,
15207+
var createNodeMock = JSCompiler_object_inline_createNodeMock_1089,
1518615208
isConcurrent = !1,
1518715209
isStrictMode = !1,
1518815210
concurrentUpdatesByDefault = null;

0 commit comments

Comments
 (0)