From 4cf71480778f97599e041a54209ebff243e6cd50 Mon Sep 17 00:00:00 2001 From: sebmarkbage Date: Wed, 10 Jul 2024 16:22:12 +0000 Subject: [PATCH] Format DOM Nesting Warning as Diff View + An Additional Log for Stack Trace (#30302) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we're printing parent stacks at the end of DOM nesting even with owner stacks enabled. That's because the context of parent tree is relevant for determining why two things are nested. It might not be sufficient to see the owner stack alone. I'm trying to get rid of parent stacks and rely on more of the plain owner stacks or ideally console.createTask. These are generally better anyway since the exact line for creating the JSX is available. It also lets you find a parent stack frame that is most relevant e.g. if it's hidden inside internals. For DOM nesting there's really only two stacks that are relevant. The creation of the parent and the creation of the child. Sometimes they're close enough to be the same thing. Such as for parents that can't have text children or when the ancestor is the direct parent created at the same place (same owner). Sometimes they're far apart. In this case I add a second console.error within the context of the ancestor. That way the second stack trace can be used to read the stack trace for where it was created. To preserve some parent context I now print the parent stack in a diff view format using the logic from hydration diffs. This includes some siblings and props for context. Screenshot 2024-07-10 at 12 21 38 AM Text Nodes: Screenshot 2024-07-10 at 12 37 40 AM --------- Co-authored-by: tjallingt DiffTrain build for commit https://github.com/facebook/react/commit/2d3f81bb6a650386832d885d7b63a7d0d517ba15. --- compiled-rn/VERSION_NATIVE_FB | 2 +- .../cjs/ReactTestRenderer-dev.js | 34 +++++++++++------ .../cjs/ReactTestRenderer-prod.js | 6 +-- .../cjs/ReactTestRenderer-profiling.js | 6 +-- .../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 | 34 +++++++++++------ .../implementations/ReactFabric-prod.fb.js | 6 +-- .../ReactFabric-profiling.fb.js | 6 +-- .../ReactNativeRenderer-dev.fb.js | 38 ++++++++++++------- .../ReactNativeRenderer-prod.fb.js | 10 ++--- .../ReactNativeRenderer-profiling.fb.js | 10 ++--- 14 files changed, 101 insertions(+), 65 deletions(-) diff --git a/compiled-rn/VERSION_NATIVE_FB b/compiled-rn/VERSION_NATIVE_FB index 9c49ef35c1..07225e0082 100644 --- a/compiled-rn/VERSION_NATIVE_FB +++ b/compiled-rn/VERSION_NATIVE_FB @@ -1 +1 @@ -19.0.0-native-fb-378b305958-20240710 \ No newline at end of file +19.0.0-native-fb-2d3f81bb6a-20240710 \ 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 e1695c904c..1987ac0805 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<<098100e06496c6a001b2063ccdda6b78>> + * @generated SignedSource<<30d7c1f202b928ea3a6f7004c8e67204>> */ "use strict"; @@ -1642,7 +1642,10 @@ __DEV__ && "number" === typeof clientProps || "bigint" === typeof clientProps ) - content += describeTextDiff("" + clientProps, void 0, indent + 1); + content = + null == type + ? content + describeTextDiff("" + clientProps, null, indent + 1) + : content + describeTextDiff("" + clientProps, void 0, indent + 1); return content; } function describeSiblingFiber(fiber, indent) { @@ -1678,7 +1681,7 @@ __DEV__ && debugInfo = ""; i = node.fiber.pendingProps; if (6 === node.fiber.tag) - debugInfo = describeTextDiff(i, node.serverProps, indent); + (debugInfo = describeTextDiff(i, node.serverProps, indent)), indent++; else if ( ((serverComponentName = describeFiberType(node.fiber)), null !== serverComponentName) @@ -1706,11 +1709,12 @@ __DEV__ && indent++; } else null === node.serverProps - ? (debugInfo = describeExpandedElement( + ? ((debugInfo = describeExpandedElement( serverComponentName, i, added(indent) - )) + )), + indent++) : "string" === typeof node.serverProps ? error$jscomp$0( "Should not have matched a non HostText fiber to a Text node. This is a bug in React." @@ -1738,9 +1742,10 @@ __DEV__ && i && 0 < node.children.length && (propName += indentation(indent) + "...\n"); - node = node.serverTail; - for (i = 0; i < node.length; i++) - (serverComponentName = node[i]), + i = node.serverTail; + null === node.serverProps && indent--; + for (node = 0; node < i.length; node++) + (serverComponentName = i[node]), (propName = "string" === typeof serverComponentName ? propName + @@ -2610,6 +2615,7 @@ __DEV__ && lanes )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -2683,6 +2689,7 @@ __DEV__ && key )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -2704,6 +2711,7 @@ __DEV__ && lanes )), (newChild.return = returnFiber), + (newChild._debugOwner = returnFiber), (newChild._debugInfo = currentDebugInfo), newChild ); @@ -2750,6 +2758,7 @@ __DEV__ && null )), (lanes.return = returnFiber), + (lanes._debugOwner = returnFiber), (returnFiber = pushDebugInfo(newChild._debugInfo)), (lanes._debugInfo = currentDebugInfo), (currentDebugInfo = returnFiber), @@ -3282,6 +3291,7 @@ __DEV__ && newChild.key )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), (currentFirstChild._debugInfo = currentDebugInfo), validateFragmentProps( newChild, @@ -3453,6 +3463,8 @@ __DEV__ && lanes )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), + (currentFirstChild._debugInfo = currentDebugInfo), (returnFiber = currentFirstChild)), placeSingleChild(returnFiber) ); @@ -13308,7 +13320,7 @@ __DEV__ && _currentValue2: null, _threadCount: 0 }, - needsEscaping = /["'&<>\n\t]/, + needsEscaping = /["'&<>\n\t]|^\s|\s$/, hydrationDiffRootDEV = null, hydrationErrors = null, concurrentQueues = [], @@ -15147,14 +15159,14 @@ __DEV__ && scheduleRoot: scheduleRoot, setRefreshHandler: setRefreshHandler, getCurrentFiber: getCurrentFiberForDevTools, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); })({ findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 1, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-test-renderer" }); exports._Scheduler = Scheduler; 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 b8be90342d..37cdb05447 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<> + * @generated SignedSource<<3207c74e39b57fe3c09390b53dad7287>> */ "use strict"; @@ -9384,7 +9384,7 @@ var devToolsConfig$jscomp$inline_1053 = { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-test-renderer" }; var internals$jscomp$inline_1240 = { @@ -9415,7 +9415,7 @@ var internals$jscomp$inline_1240 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1241 = __REACT_DEVTOOLS_GLOBAL_HOOK__; 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 adacd39508..e506f9d693 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<<200270d4d125739816245b2b492fe1b4>> */ "use strict"; @@ -10004,7 +10004,7 @@ var devToolsConfig$jscomp$inline_1136 = { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-test-renderer" }; (function (internals) { @@ -10048,7 +10048,7 @@ var devToolsConfig$jscomp$inline_1136 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); exports._Scheduler = Scheduler; exports.act = act; 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 d9c7a5ffb6..f74c336259 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<<074cd26cf48245dd69b555b5b516fd86>> + * @generated SignedSource<<329141dbd0dfddcb74061b7f8aa44b7c>> */ "use strict"; @@ -1748,7 +1748,7 @@ __DEV__ && exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-native-fb-378b305958-20240710"; + exports.version = "19.0.0-native-fb-2d3f81bb6a-20240710"; "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 022a41e2ab..44802e0c98 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<> + * @generated SignedSource<> */ "use strict"; @@ -604,4 +604,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-native-fb-378b305958-20240710"; +exports.version = "19.0.0-native-fb-2d3f81bb6a-20240710"; 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 c25dfd3cee..ee831337df 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<> + * @generated SignedSource<<5e3efa3956fffc6d07a2ce8584c2d984>> */ "use strict"; @@ -608,7 +608,7 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-native-fb-378b305958-20240710"; +exports.version = "19.0.0-native-fb-2d3f81bb6a-20240710"; "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 c27a54b9b8..1a599a66f5 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 @@ -378b305958eb7259cacfce8ad0e66eec07e07074 +2d3f81bb6a650386832d885d7b63a7d0d517ba15 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 ff47eedb3b..1637163b81 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<<7cec15a8d3604a39796511c717c9dd39>> + * @generated SignedSource<> */ "use strict"; @@ -2557,7 +2557,10 @@ __DEV__ && "number" === typeof clientProps || "bigint" === typeof clientProps ) - content += describeTextDiff("" + clientProps, void 0, indent + 1); + content = + null == type + ? content + describeTextDiff("" + clientProps, null, indent + 1) + : content + describeTextDiff("" + clientProps, void 0, indent + 1); return content; } function describeSiblingFiber(fiber, indent) { @@ -2593,7 +2596,7 @@ __DEV__ && debugInfo = ""; i = node.fiber.pendingProps; if (6 === node.fiber.tag) - debugInfo = describeTextDiff(i, node.serverProps, indent); + (debugInfo = describeTextDiff(i, node.serverProps, indent)), indent++; else if ( ((serverComponentName = describeFiberType(node.fiber)), null !== serverComponentName) @@ -2621,11 +2624,12 @@ __DEV__ && indent++; } else null === node.serverProps - ? (debugInfo = describeExpandedElement( + ? ((debugInfo = describeExpandedElement( serverComponentName, i, added(indent) - )) + )), + indent++) : "string" === typeof node.serverProps ? error$jscomp$0( "Should not have matched a non HostText fiber to a Text node. This is a bug in React." @@ -2653,9 +2657,10 @@ __DEV__ && i && 0 < node.children.length && (propName += indentation(indent) + "...\n"); - node = node.serverTail; - for (i = 0; i < node.length; i++) - (serverComponentName = node[i]), + i = node.serverTail; + null === node.serverProps && indent--; + for (node = 0; node < i.length; node++) + (serverComponentName = i[node]), (propName = "string" === typeof serverComponentName ? propName + @@ -3548,6 +3553,7 @@ __DEV__ && lanes )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -3621,6 +3627,7 @@ __DEV__ && key )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -3642,6 +3649,7 @@ __DEV__ && lanes )), (newChild.return = returnFiber), + (newChild._debugOwner = returnFiber), (newChild._debugInfo = currentDebugInfo), newChild ); @@ -3688,6 +3696,7 @@ __DEV__ && null )), (lanes.return = returnFiber), + (lanes._debugOwner = returnFiber), (returnFiber = pushDebugInfo(newChild._debugInfo)), (lanes._debugInfo = currentDebugInfo), (currentDebugInfo = returnFiber), @@ -4220,6 +4229,7 @@ __DEV__ && newChild.key )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), (currentFirstChild._debugInfo = currentDebugInfo), validateFragmentProps( newChild, @@ -4391,6 +4401,8 @@ __DEV__ && lanes )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), + (currentFirstChild._debugInfo = currentDebugInfo), (returnFiber = currentFirstChild)), placeSingleChild(returnFiber) ); @@ -15018,7 +15030,7 @@ __DEV__ && _currentValue2: null, _threadCount: 0 }, - needsEscaping = /["'&<>\n\t]/, + needsEscaping = /["'&<>\n\t]|^\s|\s$/, hydrationDiffRootDEV = null, hydrationErrors = null, concurrentQueues = [], @@ -16754,12 +16766,12 @@ __DEV__ && scheduleRoot: scheduleRoot, setRefreshHandler: setRefreshHandler, getCurrentFiber: getCurrentFiberForDevTools, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); })({ findFiberByHostInstance: getInstanceFromNode, bundleType: 1, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, 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 4f6dbe42c1..90b5d52348 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<> */ "use strict"; @@ -10601,7 +10601,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1136 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10644,7 +10644,7 @@ var internals$jscomp$inline_1362 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1363 = __REACT_DEVTOOLS_GLOBAL_HOOK__; 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 aa1f75374d..b4e5f02fcb 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<> + * @generated SignedSource<<8dd9785ebdb4b719483fb3df15aeab3f>> */ "use strict"; @@ -11307,7 +11307,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1217 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -11363,7 +11363,7 @@ var roots = new Map(), scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); exports.createPortal = function (children, containerTag) { return createPortal$1( 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 c2c183aaa3..afa0bfc219 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<<23a806bbbd3b847c144cfb5f998a2598>> + * @generated SignedSource<<36e9e66cb18f9b6a812016a8f5f5bcdc>> */ "use strict"; @@ -2509,7 +2509,10 @@ __DEV__ && "number" === typeof clientProps || "bigint" === typeof clientProps ) - content += describeTextDiff("" + clientProps, void 0, indent + 1); + content = + null == type + ? content + describeTextDiff("" + clientProps, null, indent + 1) + : content + describeTextDiff("" + clientProps, void 0, indent + 1); return content; } function describeSiblingFiber(fiber, indent) { @@ -2545,7 +2548,7 @@ __DEV__ && debugInfo = ""; i = node.fiber.pendingProps; if (6 === node.fiber.tag) - debugInfo = describeTextDiff(i, node.serverProps, indent); + (debugInfo = describeTextDiff(i, node.serverProps, indent)), indent++; else if ( ((serverComponentName = describeFiberType(node.fiber)), null !== serverComponentName) @@ -2573,11 +2576,12 @@ __DEV__ && indent++; } else null === node.serverProps - ? (debugInfo = describeExpandedElement( + ? ((debugInfo = describeExpandedElement( serverComponentName, i, added(indent) - )) + )), + indent++) : "string" === typeof node.serverProps ? error$jscomp$0( "Should not have matched a non HostText fiber to a Text node. This is a bug in React." @@ -2605,9 +2609,10 @@ __DEV__ && i && 0 < node.children.length && (propName += indentation(indent) + "...\n"); - node = node.serverTail; - for (i = 0; i < node.length; i++) - (serverComponentName = node[i]), + i = node.serverTail; + null === node.serverProps && indent--; + for (node = 0; node < i.length; node++) + (serverComponentName = i[node]), (propName = "string" === typeof serverComponentName ? propName + @@ -3494,6 +3499,7 @@ __DEV__ && lanes )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -3567,6 +3573,7 @@ __DEV__ && key )), (current.return = returnFiber), + (current._debugOwner = returnFiber), (current._debugInfo = currentDebugInfo), current ); @@ -3588,6 +3595,7 @@ __DEV__ && lanes )), (newChild.return = returnFiber), + (newChild._debugOwner = returnFiber), (newChild._debugInfo = currentDebugInfo), newChild ); @@ -3634,6 +3642,7 @@ __DEV__ && null )), (lanes.return = returnFiber), + (lanes._debugOwner = returnFiber), (returnFiber = pushDebugInfo(newChild._debugInfo)), (lanes._debugInfo = currentDebugInfo), (currentDebugInfo = returnFiber), @@ -4166,6 +4175,7 @@ __DEV__ && newChild.key )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), (currentFirstChild._debugInfo = currentDebugInfo), validateFragmentProps( newChild, @@ -4337,6 +4347,8 @@ __DEV__ && lanes )), (currentFirstChild.return = returnFiber), + (currentFirstChild._debugOwner = returnFiber), + (currentFirstChild._debugInfo = currentDebugInfo), (returnFiber = currentFirstChild)), placeSingleChild(returnFiber) ); @@ -15250,7 +15262,7 @@ __DEV__ && _currentValue2: null, _threadCount: 0 }, - needsEscaping = /["'&<>\n\t]/, + needsEscaping = /["'&<>\n\t]|^\s|\s$/, hydrationDiffRootDEV = null, hydrationErrors = null, concurrentQueues = [], @@ -16942,11 +16954,11 @@ __DEV__ && var emptyObject = {}; Object.freeze(emptyObject); var isomorphicReactPackageVersion = React.version; - if ("19.0.0-native-fb-378b305958-20240710" !== isomorphicReactPackageVersion) + if ("19.0.0-native-fb-2d3f81bb6a-20240710" !== 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-378b305958-20240710\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-2d3f81bb6a-20240710\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -16994,12 +17006,12 @@ __DEV__ && scheduleRoot: scheduleRoot, setRefreshHandler: setRefreshHandler, getCurrentFiber: getCurrentFiberForDevTools, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); })({ findFiberByHostInstance: getInstanceFromTag, bundleType: 1, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, 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 7f71bf9db4..6ef4d800cf 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<> + * @generated SignedSource<<70ed2d5492d7e9d648eed96a9b16e297>> */ "use strict"; @@ -10755,11 +10755,11 @@ function traverseOwnerTreeUp(hierarchy, instance) { traverseOwnerTreeUp(hierarchy, instance); } var isomorphicReactPackageVersion = React.version; -if ("19.0.0-native-fb-378b305958-20240710" !== isomorphicReactPackageVersion) +if ("19.0.0-native-fb-2d3f81bb6a-20240710" !== 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-378b305958-20240710\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-2d3f81bb6a-20240710\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -10809,7 +10809,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1210 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10852,7 +10852,7 @@ var internals$jscomp$inline_1457 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1458 = __REACT_DEVTOOLS_GLOBAL_HOOK__; 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 f26f6366ee..3b50424df0 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<> + * @generated SignedSource<<410b588ff5af0de4e995694ee66cf6d6>> */ "use strict"; @@ -11462,11 +11462,11 @@ function traverseOwnerTreeUp(hierarchy, instance) { traverseOwnerTreeUp(hierarchy, instance); } var isomorphicReactPackageVersion = React.version; -if ("19.0.0-native-fb-378b305958-20240710" !== isomorphicReactPackageVersion) +if ("19.0.0-native-fb-2d3f81bb6a-20240710" !== 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-378b305958-20240710\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-native-renderer: 19.0.0-native-fb-2d3f81bb6a-20240710\nLearn more: https://react.dev/warnings/version-mismatch") ); if ( "function" !== @@ -11516,7 +11516,7 @@ var roots = new Map(), devToolsConfig$jscomp$inline_1291 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "19.0.0-native-fb-378b305958-20240710", + version: "19.0.0-native-fb-2d3f81bb6a-20240710", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -11572,7 +11572,7 @@ var roots = new Map(), scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-native-fb-378b305958-20240710" + reconcilerVersion: "19.0.0-native-fb-2d3f81bb6a-20240710" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {