Attempt to fix diff syncing for Meta (#28801)

#28796 broke Meta's PR syncing tool, hoping this fixes it DiffTrain build for commit 64c8d2d.
facebook · Apr 9, 2024 · d0f9214 · d0f9214
1 parent dc45676
commit d0f9214
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 73 deletions.
diff --git a/...ok-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js b/...ok-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated SignedSource<<cf5a6e176e0f69c2bc9ded42a2ef0d63>>
+ * @generated SignedSource<<761db320e8f45126e2feb86ac8bca704>>
  */
 
 "use strict";
@@ -2852,26 +2852,24 @@ function updateMemo(nextCreate, deps) {
   hook.memoizedState = [prevState, deps];
   return prevState;
 }
-function mountDeferredValueImpl(hook, value, initialValue) {
-  if (void 0 === initialValue || 0 !== (renderLanes & 1073741824))
-    return (hook.memoizedState = value);
-  hook.memoizedState = initialValue;
-  hook = requestDeferredLane();
-  currentlyRenderingFiber$1.lanes |= hook;
-  workInProgressRootSkippedLanes |= hook;
-  return initialValue;
-}
-function updateDeferredValueImpl(hook, prevValue, value, initialValue) {
+function updateDeferredValueImpl(hook, prevValue, value) {
   if (objectIs(value, prevValue)) return value;
   if (null !== currentTreeHiddenStackCursor.current)
     return (
-      (hook = mountDeferredValueImpl(hook, value, initialValue)),
-      objectIs(hook, prevValue) || (didReceiveUpdate = !0),
-      hook
+      (hook.memoizedState = value),
+      objectIs(value, prevValue) || (didReceiveUpdate = !0),
+      value
     );
   if (0 === (renderLanes & 42))
     return (didReceiveUpdate = !0), (hook.memoizedState = value);
-  hook = requestDeferredLane();
+  0 === workInProgressDeferredLane &&
+    (workInProgressDeferredLane =
+      0 !== (workInProgressRootRenderLanes & 536870912)
+        ? 536870912
+        : claimNextTransitionLane());
+  hook = suspenseHandlerStackCursor.current;
+  null !== hook && (hook.flags |= 32);
+  hook = workInProgressDeferredLane;
   currentlyRenderingFiber$1.lanes |= hook;
   workInProgressRootSkippedLanes |= hook;
   return prevValue;
@@ -3134,9 +3132,9 @@ var HooksDispatcherOnMount = {
     return [initialState.memoizedState, dispatch];
   },
   useDebugValue: mountDebugValue,
-  useDeferredValue: function (value, initialValue) {
-    var hook = mountWorkInProgressHook();
-    return mountDeferredValueImpl(hook, value, initialValue);
+  useDeferredValue: function (value) {
+    mountWorkInProgressHook().memoizedState = value;
+    return value;
   },
   useTransition: function () {
     var stateHook = mountStateImpl(!1);
@@ -3231,14 +3229,9 @@ var HooksDispatcherOnUpdate = {
     return updateReducer(basicStateReducer);
   },
   useDebugValue: mountDebugValue,
-  useDeferredValue: function (value, initialValue) {
+  useDeferredValue: function (value) {
     var hook = updateWorkInProgressHook();
-    return updateDeferredValueImpl(
-      hook,
-      currentHook.memoizedState,
-      value,
-      initialValue
-    );
+    return updateDeferredValueImpl(hook, currentHook.memoizedState, value);
   },
   useTransition: function () {
     var booleanOrThenable = updateReducer(basicStateReducer)[0],
@@ -3278,16 +3271,11 @@ var HooksDispatcherOnRerender = {
     return rerenderReducer(basicStateReducer);
   },
   useDebugValue: mountDebugValue,
-  useDeferredValue: function (value, initialValue) {
+  useDeferredValue: function (value) {
     var hook = updateWorkInProgressHook();
     return null === currentHook
-      ? mountDeferredValueImpl(hook, value, initialValue)
-      : updateDeferredValueImpl(
-          hook,
-          currentHook.memoizedState,
-          value,
-          initialValue
-        );
+      ? ((hook.memoizedState = value), value)
+      : updateDeferredValueImpl(hook, currentHook.memoizedState, value);
   },
   useTransition: function () {
     var booleanOrThenable = rerenderReducer(basicStateReducer)[0],
@@ -7418,16 +7406,6 @@ function requestUpdateLane(fiber) {
   fiber = 0 !== currentUpdatePriority ? currentUpdatePriority : 32;
   return fiber;
 }
-function requestDeferredLane() {
-  0 === workInProgressDeferredLane &&
-    (workInProgressDeferredLane =
-      0 !== (workInProgressRootRenderLanes & 536870912)
-        ? 536870912
-        : claimNextTransitionLane());
-  var suspenseHandler = suspenseHandlerStackCursor.current;
-  null !== suspenseHandler && (suspenseHandler.flags |= 32);
-  return workInProgressDeferredLane;
-}
 function scheduleUpdateOnFiber(root, fiber, lane) {
   if (
     (root === workInProgressRoot && 2 === workInProgressSuspendedReason) ||
@@ -9136,19 +9114,19 @@ function wrapFiber(fiber) {
     fiberToWrapper.set(fiber, wrapper));
   return wrapper;
 }
-var devToolsConfig$jscomp$inline_1000 = {
+var devToolsConfig$jscomp$inline_1019 = {
   findFiberByHostInstance: function () {
     throw Error("TestRenderer does not support findFiberByHostInstance()");
   },
   bundleType: 0,
-  version: "19.0.0-canary-13c476bc",
+  version: "19.0.0-canary-3d34fdc4",
   rendererPackageName: "react-test-renderer"
 };
-var internals$jscomp$inline_1221 = {
-  bundleType: devToolsConfig$jscomp$inline_1000.bundleType,
-  version: devToolsConfig$jscomp$inline_1000.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_1000.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_1000.rendererConfig,
+var internals$jscomp$inline_1238 = {
+  bundleType: devToolsConfig$jscomp$inline_1019.bundleType,
+  version: devToolsConfig$jscomp$inline_1019.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_1019.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_1019.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -9165,26 +9143,26 @@ var internals$jscomp$inline_1221 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_1000.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_1019.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "19.0.0-canary-13c476bc"
+  reconcilerVersion: "19.0.0-canary-3d34fdc4"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1222 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1239 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1222.isDisabled &&
-    hook$jscomp$inline_1222.supportsFiber
+    !hook$jscomp$inline_1239.isDisabled &&
+    hook$jscomp$inline_1239.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1222.inject(
-        internals$jscomp$inline_1221
+      (rendererID = hook$jscomp$inline_1239.inject(
+        internals$jscomp$inline_1238
       )),
-        (injectedHook = hook$jscomp$inline_1222);
+        (injectedHook = hook$jscomp$inline_1239);
     } catch (err) {}
 }
 exports._Scheduler = Scheduler;

diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated SignedSource<<178370112fe2dafc2dbee6f0ef4ab3c2>>
+ * @generated SignedSource<<1fbc8fa493dfbca4298090a431bfb47d>>
  */
 
 "use strict";
@@ -26,7 +26,7 @@ if (__DEV__) {
     }
     var dynamicFlagsUntyped = require("ReactNativeInternalFeatureFlags");
 
-    var ReactVersion = "19.0.0-canary-70dcf491";
+    var ReactVersion = "19.0.0-canary-9ab97ea0";
 
     // ATTENTION
     // When adding new symbols to this file,
@@ -1960,6 +1960,8 @@ if (__DEV__) {
 
       if (config != null) {
         if (hasValidRef(config)) {
+          owner = ReactSharedInternals.owner;
+
           {
             // Silently steal the ref from the parent.
             ref = config.ref;
@@ -1968,8 +1970,6 @@ if (__DEV__) {
               ref = coerceStringRef(ref, owner, element.type);
             }
           }
-
-          owner = ReactSharedInternals.owner;
         }
 
         if (hasValidKey(config)) {

diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated SignedSource<<087f252fe5b0c9dfa8cf8dc95115b992>>
+ * @generated SignedSource<<a65e947a9aae75cec4e1da93fb16724f>>
  */
 
 "use strict";
@@ -447,9 +447,9 @@ exports.cloneElement = function (element, config, children) {
     owner = element._owner;
   if (null != config) {
     void 0 !== config.ref &&
-      ((ref = config.ref),
-      (ref = coerceStringRef(ref, owner, element.type)),
-      (owner = ReactSharedInternals.owner));
+      ((owner = ReactSharedInternals.owner),
+      (ref = config.ref),
+      (ref = coerceStringRef(ref, owner, element.type)));
     void 0 !== config.key && (key = "" + config.key);
     if (
       !disableDefaultPropsExceptForClasses &&
@@ -675,4 +675,4 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-canary-d8f6321d";
+exports.version = "19.0.0-canary-8fa94cdb";
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated SignedSource<<29cc74f6affd7f9736126f6a72ea5315>>
+ * @generated SignedSource<<655b49e74a06f6ff41f48c54dd6150c3>>
  */
 
 "use strict";
@@ -451,9 +451,9 @@ exports.cloneElement = function (element, config, children) {
     owner = element._owner;
   if (null != config) {
     void 0 !== config.ref &&
-      ((ref = config.ref),
-      (ref = coerceStringRef(ref, owner, element.type)),
-      (owner = ReactSharedInternals.owner));
+      ((owner = ReactSharedInternals.owner),
+      (ref = config.ref),
+      (ref = coerceStringRef(ref, owner, element.type)));
     void 0 !== config.key && (key = "" + config.key);
     if (
       !disableDefaultPropsExceptForClasses &&
@@ -679,7 +679,7 @@ exports.useSyncExternalStore = function (
 exports.useTransition = function () {
   return ReactSharedInternals.H.useTransition();
 };
-exports.version = "19.0.0-canary-c8b45fd3";
+exports.version = "19.0.0-canary-4e12541d";
 "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
   "function" ===
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
@@ -1 +1 @@
-f6131653570bbbf62d642ba9343b9cd0ab1ae97c
+64c8d2d45d49dbb2f59ea23e5e739eb79e124abc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f6131653570bbbf62d642ba9343b9cd0ab1ae97c
		64c8d2d45d49dbb2f59ea23e5e739eb79e124abc