From 9625df2bf887f4c95daeee22512e511c39249beb Mon Sep 17 00:00:00 2001 From: acdlite Date: Wed, 4 Sep 2024 09:47:08 -0700 Subject: [PATCH] Temporarily disable suspending during work loop (#30762) ### Based on - #30761 - #30759 --- `use` has an optimization where in some cases it can suspend the work loop during the render phase until the data has resolved, rather than unwind the stack and lose context. However, the current implementation is not compatible with sibling prerendering. So I've temporarily disabled it until the sibling prerendering has been refactored. We will add it back in a later step. DiffTrain build for commit https://github.com/facebook/react/commit/8b4c54c00f5c047a72a4cecc2689196786c3e5ff. --- compiled-rn/VERSION_NATIVE_FB | 2 +- .../cjs/ReactTestRenderer-dev.js | 8 +-- .../cjs/ReactTestRenderer-prod.js | 8 +-- .../cjs/ReactTestRenderer-profiling.js | 8 +-- .../vendor/react/react/cjs/React-dev.js | 4 +- .../vendor/react/react/cjs/React-prod.js | 4 +- .../vendor/react/react/cjs/React-profiling.js | 4 +- .../Libraries/Renderer/REVISION | 2 +- .../implementations/ReactFabric-dev.fb.js | 53 ++++++++++------- .../implementations/ReactFabric-prod.fb.js | 41 +++++++------ .../ReactFabric-profiling.fb.js | 53 ++++++++++------- .../ReactNativeRenderer-dev.fb.js | 57 +++++++++++-------- .../ReactNativeRenderer-prod.fb.js | 45 +++++++++------ .../ReactNativeRenderer-profiling.fb.js | 57 +++++++++++-------- 14 files changed, 200 insertions(+), 146 deletions(-) diff --git a/compiled-rn/VERSION_NATIVE_FB b/compiled-rn/VERSION_NATIVE_FB index de8ca43781..2055d2468d 100644 --- a/compiled-rn/VERSION_NATIVE_FB +++ b/compiled-rn/VERSION_NATIVE_FB @@ -1 +1 @@ -19.0.0-native-fb-8d68da3f-20240903 \ No newline at end of file +19.0.0-native-fb-8b4c54c0-20240904 \ No newline at end of file diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js index 04904ca17a..45cfc5bc97 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-dev.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<> */ "use strict"; @@ -14952,11 +14952,11 @@ __DEV__ && (function () { var internals = { bundleType: 1, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-test-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromNode, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -15101,5 +15101,5 @@ __DEV__ && flushSyncWorkAcrossRoots_impl(0, !0)); } }; - exports.version = "19.0.0-native-fb-8d68da3f-20240903"; + exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; })(); diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js index e9b8454676..208f7fa679 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<8ab9ee6b60c4927fc87658452c1ef8e1>> + * @generated SignedSource<<5a26af5c141fa622359ef85bc2c68b89>> */ "use strict"; @@ -9331,14 +9331,14 @@ function wrapFiber(fiber) { } var internals$jscomp$inline_1216 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-test-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: function (mockNode) { mockNode = nodeToInstanceMap.get(mockNode); return void 0 !== mockNode ? mockNode.internalInstanceHandle : null; }, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1217 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -9474,4 +9474,4 @@ exports.unstable_batchedUpdates = function (fn, a) { flushSyncWorkAcrossRoots_impl(0, !0)); } }; -exports.version = "19.0.0-native-fb-8d68da3f-20240903"; +exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js index 25f35ffa6f..42e594d0d3 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<> */ "use strict"; @@ -9944,14 +9944,14 @@ function wrapFiber(fiber) { } var internals$jscomp$inline_1117 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-test-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: function (mockNode) { mockNode = nodeToInstanceMap.get(mockNode); return void 0 !== mockNode ? mockNode.internalInstanceHandle : null; }, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903", + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904", getLaneLabelMap: function () { for ( var map = new Map(), lane = 1, index$149 = 0; @@ -10102,4 +10102,4 @@ exports.unstable_batchedUpdates = function (fn, a) { flushSyncWorkAcrossRoots_impl(0, !0)); } }; -exports.version = "19.0.0-native-fb-8d68da3f-20240903"; +exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js index 9e58ad40b7..74d0911956 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-dev.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<3086926418188819cb264b2b4ce337d7>> + * @generated SignedSource<<4bc17d91159f88d36be6292ac9f41c27>> */ "use strict"; @@ -1705,7 +1705,7 @@ __DEV__ && exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-native-fb-8d68da3f-20240903"; + exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-prod.js index e34589e5e9..dbe9cc8137 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-prod.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-prod.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<67e2739cc6ec149e186940fa71fedf5a>> + * @generated SignedSource<> */ "use strict"; @@ -580,4 +580,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-native-fb-8d68da3f-20240903"; +exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js index 49d594a3cb..027bcc858b 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-profiling.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<00f72c0d892fa33507b893f4a9760683>> + * @generated SignedSource<<9bfd88b7f82babb5be244621de600336>> */ "use strict"; @@ -584,7 +584,7 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-native-fb-8d68da3f-20240903"; +exports.version = "19.0.0-native-fb-8b4c54c0-20240904"; "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 index 7476ac6277..839d4ae96b 100644 --- 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 @@ -8d68da3f7396064614f34b84881fe8833b6039ac +8b4c54c00f5c047a72a4cecc2689196786c3e5ff diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js index a762d3ad61..b62d222d44 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<9ef28de841583eb0dc8a86a45dee3b60>> + * @generated SignedSource<> */ "use strict"; @@ -12135,20 +12135,28 @@ __DEV__ && current = null; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? SuspendedOnImmediate - : SuspendedOnData; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? SuspendedOnData + : SuspendedOnImmediate; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -12162,8 +12170,8 @@ __DEV__ && ? SuspendedOnDeprecatedThrowPromise : SuspendedOnError); workInProgressThrownValue = thrownValue; - handler = workInProgress; - if (null === handler) + JSCompiler_temp = workInProgress; + if (null === JSCompiler_temp) (workInProgressRootExitStatus = RootFatalErrored), logUncaughtError( root, @@ -12171,8 +12179,8 @@ __DEV__ && ); else switch ( - (handler.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(handler, !0), + (JSCompiler_temp.mode & 2 && + stopProfilerTimerIfRunningAndRecordDelta(JSCompiler_temp, !0), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -12181,7 +12189,7 @@ __DEV__ && "function" === typeof injectedProfilingHooks.markComponentErrored && injectedProfilingHooks.markComponentErrored( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -12194,7 +12202,7 @@ __DEV__ && "function" === typeof injectedProfilingHooks.markComponentSuspended && injectedProfilingHooks.markComponentSuspended( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -14239,6 +14247,7 @@ __DEV__ && dynamicFlagsUntyped.passChildrenWhenCloningPersistedNodes, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), REACT_ELEMENT_TYPE = REACT_LEGACY_ELEMENT_TYPE, REACT_PORTAL_TYPE = Symbol.for("react.portal"), @@ -16966,11 +16975,11 @@ __DEV__ && (function () { var internals = { bundleType: 1, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromNode, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals.rendererConfig = extraDevToolsConfig); diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js index aebf687202..e5912d60fe 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<<701a1703314df38ee706d756e6e3248d>> */ "use strict"; @@ -29,6 +29,7 @@ var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/R dynamicFlagsUntyped.passChildrenWhenCloningPersistedNodes, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), @@ -9494,20 +9495,28 @@ function handleThrow(root, thrownValue) { ReactSharedInternals.H = ContextOnlyDispatcher; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? 3 - : 2; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? 2 + : 3; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -10852,11 +10861,11 @@ batchedUpdatesImpl = function (fn, a) { var roots = new Map(), internals$jscomp$inline_1151 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromNode, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals$jscomp$inline_1151.rendererConfig = extraDevToolsConfig); diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js index dd4f098fe6..d3f4b0d114 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<014d80b875dc73d152ab691019204f09>> + * @generated SignedSource<> */ "use strict"; @@ -33,6 +33,7 @@ var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/R dynamicFlagsUntyped.passChildrenWhenCloningPersistedNodes, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), @@ -10019,20 +10020,28 @@ function handleThrow(root, thrownValue) { ReactSharedInternals.H = ContextOnlyDispatcher; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? 3 - : 2; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? 2 + : 3; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -10046,8 +10055,8 @@ function handleThrow(root, thrownValue) { ? 6 : 1); workInProgressThrownValue = thrownValue; - handler = workInProgress; - if (null === handler) + JSCompiler_temp = workInProgress; + if (null === JSCompiler_temp) (workInProgressRootExitStatus = 1), logUncaughtError( root, @@ -10055,8 +10064,8 @@ function handleThrow(root, thrownValue) { ); else switch ( - (handler.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(handler, !0), + (JSCompiler_temp.mode & 2 && + stopProfilerTimerIfRunningAndRecordDelta(JSCompiler_temp, !0), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -10064,7 +10073,7 @@ function handleThrow(root, thrownValue) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markComponentErrored && injectedProfilingHooks.markComponentErrored( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -10076,7 +10085,7 @@ function handleThrow(root, thrownValue) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markComponentSuspended && injectedProfilingHooks.markComponentSuspended( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -11555,11 +11564,11 @@ batchedUpdatesImpl = function (fn, a) { var roots = new Map(), internals$jscomp$inline_1233 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromNode, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals$jscomp$inline_1233.rendererConfig = extraDevToolsConfig); diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js index 16b9d477d8..eef36345f0 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<67fff70d51086fec2f6116c66943f006>> + * @generated SignedSource<<57ada813b17cf24201168b65647993f6>> */ "use strict"; @@ -12426,20 +12426,28 @@ __DEV__ && current = null; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? SuspendedOnImmediate - : SuspendedOnData; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? SuspendedOnData + : SuspendedOnImmediate; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -12453,8 +12461,8 @@ __DEV__ && ? SuspendedOnDeprecatedThrowPromise : SuspendedOnError); workInProgressThrownValue = thrownValue; - handler = workInProgress; - if (null === handler) + JSCompiler_temp = workInProgress; + if (null === JSCompiler_temp) (workInProgressRootExitStatus = RootFatalErrored), logUncaughtError( root, @@ -12462,8 +12470,8 @@ __DEV__ && ); else switch ( - (handler.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(handler, !0), + (JSCompiler_temp.mode & 2 && + stopProfilerTimerIfRunningAndRecordDelta(JSCompiler_temp, !0), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -12472,7 +12480,7 @@ __DEV__ && "function" === typeof injectedProfilingHooks.markComponentErrored && injectedProfilingHooks.markComponentErrored( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -12485,7 +12493,7 @@ __DEV__ && "function" === typeof injectedProfilingHooks.markComponentSuspended && injectedProfilingHooks.markComponentSuspended( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -14315,6 +14323,7 @@ __DEV__ && dynamicFlagsUntyped.enablePersistedModeClonedFlag, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), REACT_ELEMENT_TYPE = REACT_LEGACY_ELEMENT_TYPE, REACT_PORTAL_TYPE = Symbol.for("react.portal"), @@ -17119,11 +17128,11 @@ __DEV__ && shouldSuspendImpl = newShouldSuspendImpl; }; var isomorphicReactPackageVersion = React.version; - if ("19.0.0-native-fb-8d68da3f-20240903" !== isomorphicReactPackageVersion) + if ("19.0.0-native-fb-8b4c54c0-20240904" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-native-renderer: 19.0.0-native-fb-8d68da3f-20240903\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-8b4c54c0-20240904\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -17149,11 +17158,11 @@ __DEV__ && (function () { var internals = { bundleType: 1, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromTag, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals.rendererConfig = extraDevToolsConfig); diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js index 08608f3254..70f79f5583 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<66f469fe8d1e9d3359bff291d6b8e511>> + * @generated SignedSource<<6ffe18738e0ea1f4805fa47e84a02551>> */ "use strict"; @@ -23,6 +23,7 @@ var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/R dynamicFlagsUntyped.enablePersistedModeClonedFlag, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), @@ -9909,20 +9910,28 @@ function handleThrow(root, thrownValue) { ReactSharedInternals.H = ContextOnlyDispatcher; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? 3 - : 2; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? 2 + : 3; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -10965,11 +10974,11 @@ function updateContainer(element, container, parentComponent, callback) { return lane; } var isomorphicReactPackageVersion = React.version; -if ("19.0.0-native-fb-8d68da3f-20240903" !== isomorphicReactPackageVersion) +if ("19.0.0-native-fb-8b4c54c0-20240904" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-native-renderer: 19.0.0-native-fb-8d68da3f-20240903\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-8b4c54c0-20240904\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -11018,11 +11027,11 @@ batchedUpdatesImpl = function (fn, a) { var roots = new Map(), internals$jscomp$inline_1222 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromTag, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals$jscomp$inline_1222.rendererConfig = extraDevToolsConfig); diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js index 15386d88c1..90311a31f3 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<86a4e56dd2bd3ea8d863aabc68a98633>> + * @generated SignedSource<> */ "use strict"; @@ -27,6 +27,7 @@ var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/R dynamicFlagsUntyped.enablePersistedModeClonedFlag, enableLazyContextPropagation = dynamicFlagsUntyped.enableLazyContextPropagation, + enableSiblingPrerendering = dynamicFlagsUntyped.enableSiblingPrerendering, ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"), @@ -10435,20 +10436,28 @@ function handleThrow(root, thrownValue) { ReactSharedInternals.H = ContextOnlyDispatcher; if (thrownValue === SuspenseException) { thrownValue = getSuspendedThenable(); - var handler = suspenseHandlerStackCursor.current; + var JSCompiler_temp; + if ((JSCompiler_temp = !enableSiblingPrerendering)) + (JSCompiler_temp = suspenseHandlerStackCursor.current), + (JSCompiler_temp = + null === JSCompiler_temp + ? !0 + : (workInProgressRootRenderLanes & 4194176) === + workInProgressRootRenderLanes + ? null === shellBoundary + ? !0 + : !1 + : (workInProgressRootRenderLanes & 62914560) === + workInProgressRootRenderLanes || + 0 !== (workInProgressRootRenderLanes & 536870912) + ? JSCompiler_temp === shellBoundary + : !1); workInProgressSuspendedReason = - (null !== handler && - ((workInProgressRootRenderLanes & 4194176) === - workInProgressRootRenderLanes - ? null !== shellBoundary - : ((workInProgressRootRenderLanes & 62914560) !== - workInProgressRootRenderLanes && - 0 === (workInProgressRootRenderLanes & 536870912)) || - handler !== shellBoundary)) || - 0 !== (workInProgressRootSkippedLanes & 134217727) || - 0 !== (workInProgressRootInterleavedUpdatedLanes & 134217727) - ? 3 - : 2; + JSCompiler_temp && + 0 === (workInProgressRootSkippedLanes & 134217727) && + 0 === (workInProgressRootInterleavedUpdatedLanes & 134217727) + ? 2 + : 3; } else thrownValue === SuspenseyCommitException ? ((thrownValue = getSuspendedThenable()), @@ -10462,8 +10471,8 @@ function handleThrow(root, thrownValue) { ? 6 : 1); workInProgressThrownValue = thrownValue; - handler = workInProgress; - if (null === handler) + JSCompiler_temp = workInProgress; + if (null === JSCompiler_temp) (workInProgressRootExitStatus = 1), logUncaughtError( root, @@ -10471,8 +10480,8 @@ function handleThrow(root, thrownValue) { ); else switch ( - (handler.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(handler, !0), + (JSCompiler_temp.mode & 2 && + stopProfilerTimerIfRunningAndRecordDelta(JSCompiler_temp, !0), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -10480,7 +10489,7 @@ function handleThrow(root, thrownValue) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markComponentErrored && injectedProfilingHooks.markComponentErrored( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -10492,7 +10501,7 @@ function handleThrow(root, thrownValue) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markComponentSuspended && injectedProfilingHooks.markComponentSuspended( - handler, + JSCompiler_temp, thrownValue, workInProgressRootRenderLanes ); @@ -11669,11 +11678,11 @@ function updateContainer(element, container, parentComponent, callback) { return lane; } var isomorphicReactPackageVersion = React.version; -if ("19.0.0-native-fb-8d68da3f-20240903" !== isomorphicReactPackageVersion) +if ("19.0.0-native-fb-8b4c54c0-20240904" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-native-renderer" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-native-renderer: 19.0.0-native-fb-8d68da3f-20240903\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-8b4c54c0-20240904\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -11722,11 +11731,11 @@ batchedUpdatesImpl = function (fn, a) { var roots = new Map(), internals$jscomp$inline_1304 = { bundleType: 0, - version: "19.0.0-native-fb-8d68da3f-20240903", + version: "19.0.0-native-fb-8b4c54c0-20240904", rendererPackageName: "react-native-renderer", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getInstanceFromTag, - reconcilerVersion: "19.0.0-native-fb-8d68da3f-20240903" + reconcilerVersion: "19.0.0-native-fb-8b4c54c0-20240904" }; null !== extraDevToolsConfig && (internals$jscomp$inline_1304.rendererConfig = extraDevToolsConfig);