Skip to content

Commit bea1002

Browse files
rickhanloniirickhanlonii
committed
s/HTML/text for text hydration mismatches (#32763)
DiffTrain build for [3e88e97](3e88e97)
1 parent a28916b commit bea1002

23 files changed

+146
-106
lines changed

‎compiled-rn/VERSION_NATIVE_FB

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.1.0-native-fb-a5297ece-20250326
1+
19.1.0-native-fb-3e88e97c-20250326

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<2f71c1d9e2da2cc0eb3498cd15d64a1a>>
10+
* @generated SignedSource<<db9c75765616673e9845ff291260b3ae>>
1111
*/
1212

1313
"use strict";
@@ -404,5 +404,5 @@ __DEV__ &&
404404
exports.useFormStatus = function () {
405405
return resolveDispatcher().useHostTransitionStatus();
406406
};
407-
exports.version = "19.1.0-native-fb-a5297ece-20250326";
407+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";
408408
})();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<23a11b053da80e4d031b301c2555e701>>
10+
* @generated SignedSource<<e48b1009e6908094eecaf6de6a2a9edc>>
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.1.0-native-fb-a5297ece-20250326";
206+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<23a11b053da80e4d031b301c2555e701>>
10+
* @generated SignedSource<<e48b1009e6908094eecaf6de6a2a9edc>>
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.1.0-native-fb-a5297ece-20250326";
206+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";

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

+14-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<f9e8c8f2c331a2ae85f3a12ee7ecf32c>>
10+
* @generated SignedSource<<ebce9e19e842d772bf0a05c85178a4fd>>
1111
*/
1212

1313
/*
@@ -4577,14 +4577,18 @@ __DEV__ &&
45774577
fiber.serverTail.push(rejectedCandidate)));
45784578
}
45794579
function throwOnHydrationMismatch(fiber) {
4580-
var diff = "",
4580+
var fromText =
4581+
1 < arguments.length && void 0 !== arguments[1] ? arguments[1] : !1,
4582+
diff = "",
45814583
diffRoot = hydrationDiffRootDEV;
45824584
null !== diffRoot &&
45834585
((hydrationDiffRootDEV = null), (diff = describeDiff(diffRoot)));
45844586
queueHydrationError(
45854587
createCapturedValueAtFiber(
45864588
Error(
4587-
"Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:\n\n- A server/client branch `if (typeof window !== 'undefined')`.\n- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.\n- Date formatting in a user's locale which doesn't match the server.\n- External changing data without sending a snapshot of it along with the HTML.\n- Invalid HTML tag nesting.\n\nIt can also happen if the client has a browser extension installed which messes with the HTML before React loaded.\n\nhttps://react.dev/link/hydration-mismatch" +
4589+
"Hydration failed because the server rendered " +
4590+
(fromText ? "text" : "HTML") +
4591+
" didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:\n\n- A server/client branch `if (typeof window !== 'undefined')`.\n- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.\n- Date formatting in a user's locale which doesn't match the server.\n- External changing data without sending a snapshot of it along with the HTML.\n- Invalid HTML tag nesting.\n\nIt can also happen if the client has a browser extension installed which messes with the HTML before React loaded.\n\nhttps://react.dev/link/hydration-mismatch" +
45884592
diff
45894593
),
45904594
fiber
@@ -4680,7 +4684,7 @@ __DEV__ &&
46804684
null != props.onClick && (didHydrate.onclick = noop$1),
46814685
(didHydrate = !0))
46824686
: (didHydrate = !1);
4683-
didHydrate || throwOnHydrationMismatch(fiber);
4687+
didHydrate || throwOnHydrationMismatch(fiber, !0);
46844688
}
46854689
function popToNextHostParent(fiber) {
46864690
for (hydrationParentFiber = fiber.return; hydrationParentFiber; )
@@ -11895,7 +11899,7 @@ __DEV__ &&
1189511899
checkForUnmatchedText(current.nodeValue, renderLanes)
1189611900
? !0
1189711901
: !1;
11898-
current || throwOnHydrationMismatch(workInProgress);
11902+
current || throwOnHydrationMismatch(workInProgress, !0);
1189911903
} else
1190011904
(_type = renderLanes.ancestorInfo.current),
1190111905
null != _type &&
@@ -25658,11 +25662,11 @@ __DEV__ &&
2565825662
};
2565925663
(function () {
2566025664
var isomorphicReactPackageVersion = React.version;
25661-
if ("19.1.0-native-fb-a5297ece-20250326" !== isomorphicReactPackageVersion)
25665+
if ("19.1.0-native-fb-3e88e97c-20250326" !== isomorphicReactPackageVersion)
2566225666
throw Error(
2566325667
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2566425668
(isomorphicReactPackageVersion +
25665-
"\n - react-dom: 19.1.0-native-fb-a5297ece-20250326\nLearn more: https://react.dev/warnings/version-mismatch")
25669+
"\n - react-dom: 19.1.0-native-fb-3e88e97c-20250326\nLearn more: https://react.dev/warnings/version-mismatch")
2566625670
);
2566725671
})();
2566825672
("function" === typeof Map &&
@@ -25699,10 +25703,10 @@ __DEV__ &&
2569925703
!(function () {
2570025704
var internals = {
2570125705
bundleType: 1,
25702-
version: "19.1.0-native-fb-a5297ece-20250326",
25706+
version: "19.1.0-native-fb-3e88e97c-20250326",
2570325707
rendererPackageName: "react-dom",
2570425708
currentDispatcherRef: ReactSharedInternals,
25705-
reconcilerVersion: "19.1.0-native-fb-a5297ece-20250326"
25709+
reconcilerVersion: "19.1.0-native-fb-3e88e97c-20250326"
2570625710
};
2570725711
internals.overrideHookState = overrideHookState;
2570825712
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -25846,5 +25850,5 @@ __DEV__ &&
2584625850
listenToAllSupportedEvents(container);
2584725851
return new ReactDOMHydrationRoot(initialChildren);
2584825852
};
25849-
exports.version = "19.1.0-native-fb-a5297ece-20250326";
25853+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";
2585025854
})();

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

+17-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<40470992724521cc69353bb35c5a7918>>
10+
* @generated SignedSource<<70e7277a028acd3119e3b04998ef6ae8>>
1111
*/
1212

1313
/*
@@ -2860,7 +2860,15 @@ var hydrationParentFiber = null,
28602860
rootOrSingletonContext = !1,
28612861
HydrationMismatchException = Error(formatProdErrorMessage(519));
28622862
function throwOnHydrationMismatch(fiber) {
2863-
var error = Error(formatProdErrorMessage(418, ""));
2863+
var error = Error(
2864+
formatProdErrorMessage(
2865+
418,
2866+
1 < arguments.length && void 0 !== arguments[1] && arguments[1]
2867+
? "text"
2868+
: "HTML",
2869+
""
2870+
)
2871+
);
28642872
queueHydrationError(createCapturedValueAtFiber(error, fiber));
28652873
throw HydrationMismatchException;
28662874
}
@@ -2936,7 +2944,7 @@ function prepareToHydrateHostInstance(fiber) {
29362944
null != props.onClick && (instance.onclick = noop$1),
29372945
(instance = !0))
29382946
: (instance = !1);
2939-
instance || throwOnHydrationMismatch(fiber);
2947+
instance || throwOnHydrationMismatch(fiber, !0);
29402948
}
29412949
function popToNextHostParent(fiber) {
29422950
for (hydrationParentFiber = fiber.return; hydrationParentFiber; )
@@ -8395,7 +8403,7 @@ function completeWork(current, workInProgress, renderLanes) {
83958403
checkForUnmatchedText(current.nodeValue, renderLanes)
83968404
? !0
83978405
: !1;
8398-
current || throwOnHydrationMismatch(workInProgress);
8406+
current || throwOnHydrationMismatch(workInProgress, !0);
83998407
} else
84008408
(current =
84018409
getOwnerDocumentFromRootContainer(current).createTextNode(
@@ -15969,14 +15977,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1596915977
};
1597015978
var isomorphicReactPackageVersion$jscomp$inline_1796 = React.version;
1597115979
if (
15972-
"19.1.0-native-fb-a5297ece-20250326" !==
15980+
"19.1.0-native-fb-3e88e97c-20250326" !==
1597315981
isomorphicReactPackageVersion$jscomp$inline_1796
1597415982
)
1597515983
throw Error(
1597615984
formatProdErrorMessage(
1597715985
527,
1597815986
isomorphicReactPackageVersion$jscomp$inline_1796,
15979-
"19.1.0-native-fb-a5297ece-20250326"
15987+
"19.1.0-native-fb-3e88e97c-20250326"
1598015988
)
1598115989
);
1598215990
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15998,10 +16006,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1599816006
};
1599916007
var internals$jscomp$inline_2246 = {
1600016008
bundleType: 0,
16001-
version: "19.1.0-native-fb-a5297ece-20250326",
16009+
version: "19.1.0-native-fb-3e88e97c-20250326",
1600216010
rendererPackageName: "react-dom",
1600316011
currentDispatcherRef: ReactSharedInternals,
16004-
reconcilerVersion: "19.1.0-native-fb-a5297ece-20250326"
16012+
reconcilerVersion: "19.1.0-native-fb-3e88e97c-20250326"
1600516013
};
1600616014
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1600716015
var hook$jscomp$inline_2247 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16105,4 +16113,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1610516113
listenToAllSupportedEvents(container);
1610616114
return new ReactDOMHydrationRoot(initialChildren);
1610716115
};
16108-
exports.version = "19.1.0-native-fb-a5297ece-20250326";
16116+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";

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

+17-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<ed768351e2a7a4ec898f4b41c1d02c80>>
10+
* @generated SignedSource<<f04c7d6f8a7267af7ea4146094f71f96>>
1111
*/
1212

1313
/*
@@ -2954,7 +2954,15 @@ var hydrationParentFiber = null,
29542954
rootOrSingletonContext = !1,
29552955
HydrationMismatchException = Error(formatProdErrorMessage(519));
29562956
function throwOnHydrationMismatch(fiber) {
2957-
var error = Error(formatProdErrorMessage(418, ""));
2957+
var error = Error(
2958+
formatProdErrorMessage(
2959+
418,
2960+
1 < arguments.length && void 0 !== arguments[1] && arguments[1]
2961+
? "text"
2962+
: "HTML",
2963+
""
2964+
)
2965+
);
29582966
queueHydrationError(createCapturedValueAtFiber(error, fiber));
29592967
throw HydrationMismatchException;
29602968
}
@@ -3030,7 +3038,7 @@ function prepareToHydrateHostInstance(fiber) {
30303038
null != props.onClick && (instance.onclick = noop$1),
30313039
(instance = !0))
30323040
: (instance = !1);
3033-
instance || throwOnHydrationMismatch(fiber);
3041+
instance || throwOnHydrationMismatch(fiber, !0);
30343042
}
30353043
function popToNextHostParent(fiber) {
30363044
for (hydrationParentFiber = fiber.return; hydrationParentFiber; )
@@ -8629,7 +8637,7 @@ function completeWork(current, workInProgress, renderLanes) {
86298637
checkForUnmatchedText(current.nodeValue, renderLanes)
86308638
? !0
86318639
: !1;
8632-
current || throwOnHydrationMismatch(workInProgress);
8640+
current || throwOnHydrationMismatch(workInProgress, !0);
86338641
} else
86348642
(current =
86358643
getOwnerDocumentFromRootContainer(current).createTextNode(
@@ -16617,14 +16625,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1661716625
};
1661816626
var isomorphicReactPackageVersion$jscomp$inline_1891 = React.version;
1661916627
if (
16620-
"19.1.0-native-fb-a5297ece-20250326" !==
16628+
"19.1.0-native-fb-3e88e97c-20250326" !==
1662116629
isomorphicReactPackageVersion$jscomp$inline_1891
1662216630
)
1662316631
throw Error(
1662416632
formatProdErrorMessage(
1662516633
527,
1662616634
isomorphicReactPackageVersion$jscomp$inline_1891,
16627-
"19.1.0-native-fb-a5297ece-20250326"
16635+
"19.1.0-native-fb-3e88e97c-20250326"
1662816636
)
1662916637
);
1663016638
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16646,10 +16654,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1664616654
};
1664716655
var internals$jscomp$inline_1898 = {
1664816656
bundleType: 0,
16649-
version: "19.1.0-native-fb-a5297ece-20250326",
16657+
version: "19.1.0-native-fb-3e88e97c-20250326",
1665016658
rendererPackageName: "react-dom",
1665116659
currentDispatcherRef: ReactSharedInternals,
16652-
reconcilerVersion: "19.1.0-native-fb-a5297ece-20250326",
16660+
reconcilerVersion: "19.1.0-native-fb-3e88e97c-20250326",
1665316661
getLaneLabelMap: function () {
1665416662
for (
1665516663
var map = new Map(), lane = 1, index$293 = 0;
@@ -16768,4 +16776,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1676816776
listenToAllSupportedEvents(container);
1676916777
return new ReactDOMHydrationRoot(initialChildren);
1677016778
};
16771-
exports.version = "19.1.0-native-fb-a5297ece-20250326";
16779+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";

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

+14-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<6f30b0fe89206a9cb9b24e5b1524c625>>
10+
* @generated SignedSource<<ccb30e12e6d23178ffb1becb0148d16e>>
1111
*/
1212

1313
/*
@@ -4585,14 +4585,18 @@ __DEV__ &&
45854585
fiber.serverTail.push(rejectedCandidate)));
45864586
}
45874587
function throwOnHydrationMismatch(fiber) {
4588-
var diff = "",
4588+
var fromText =
4589+
1 < arguments.length && void 0 !== arguments[1] ? arguments[1] : !1,
4590+
diff = "",
45894591
diffRoot = hydrationDiffRootDEV;
45904592
null !== diffRoot &&
45914593
((hydrationDiffRootDEV = null), (diff = describeDiff(diffRoot)));
45924594
queueHydrationError(
45934595
createCapturedValueAtFiber(
45944596
Error(
4595-
"Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:\n\n- A server/client branch `if (typeof window !== 'undefined')`.\n- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.\n- Date formatting in a user's locale which doesn't match the server.\n- External changing data without sending a snapshot of it along with the HTML.\n- Invalid HTML tag nesting.\n\nIt can also happen if the client has a browser extension installed which messes with the HTML before React loaded.\n\nhttps://react.dev/link/hydration-mismatch" +
4597+
"Hydration failed because the server rendered " +
4598+
(fromText ? "text" : "HTML") +
4599+
" didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:\n\n- A server/client branch `if (typeof window !== 'undefined')`.\n- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.\n- Date formatting in a user's locale which doesn't match the server.\n- External changing data without sending a snapshot of it along with the HTML.\n- Invalid HTML tag nesting.\n\nIt can also happen if the client has a browser extension installed which messes with the HTML before React loaded.\n\nhttps://react.dev/link/hydration-mismatch" +
45964600
diff
45974601
),
45984602
fiber
@@ -4688,7 +4692,7 @@ __DEV__ &&
46884692
null != props.onClick && (didHydrate.onclick = noop$2),
46894693
(didHydrate = !0))
46904694
: (didHydrate = !1);
4691-
didHydrate || throwOnHydrationMismatch(fiber);
4695+
didHydrate || throwOnHydrationMismatch(fiber, !0);
46924696
}
46934697
function popToNextHostParent(fiber) {
46944698
for (hydrationParentFiber = fiber.return; hydrationParentFiber; )
@@ -11903,7 +11907,7 @@ __DEV__ &&
1190311907
checkForUnmatchedText(current.nodeValue, renderLanes)
1190411908
? !0
1190511909
: !1;
11906-
current || throwOnHydrationMismatch(workInProgress);
11910+
current || throwOnHydrationMismatch(workInProgress, !0);
1190711911
} else
1190811912
(_type = renderLanes.ancestorInfo.current),
1190911913
null != _type &&
@@ -25719,11 +25723,11 @@ __DEV__ &&
2571925723
};
2572025724
(function () {
2572125725
var isomorphicReactPackageVersion = React.version;
25722-
if ("19.1.0-native-fb-a5297ece-20250326" !== isomorphicReactPackageVersion)
25726+
if ("19.1.0-native-fb-3e88e97c-20250326" !== isomorphicReactPackageVersion)
2572325727
throw Error(
2572425728
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2572525729
(isomorphicReactPackageVersion +
25726-
"\n - react-dom: 19.1.0-native-fb-a5297ece-20250326\nLearn more: https://react.dev/warnings/version-mismatch")
25730+
"\n - react-dom: 19.1.0-native-fb-3e88e97c-20250326\nLearn more: https://react.dev/warnings/version-mismatch")
2572725731
);
2572825732
})();
2572925733
("function" === typeof Map &&
@@ -25760,10 +25764,10 @@ __DEV__ &&
2576025764
!(function () {
2576125765
var internals = {
2576225766
bundleType: 1,
25763-
version: "19.1.0-native-fb-a5297ece-20250326",
25767+
version: "19.1.0-native-fb-3e88e97c-20250326",
2576425768
rendererPackageName: "react-dom",
2576525769
currentDispatcherRef: ReactSharedInternals,
25766-
reconcilerVersion: "19.1.0-native-fb-a5297ece-20250326"
25770+
reconcilerVersion: "19.1.0-native-fb-3e88e97c-20250326"
2576725771
};
2576825772
internals.overrideHookState = overrideHookState;
2576925773
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26223,7 +26227,7 @@ __DEV__ &&
2622326227
exports.useFormStatus = function () {
2622426228
return resolveDispatcher().useHostTransitionStatus();
2622526229
};
26226-
exports.version = "19.1.0-native-fb-a5297ece-20250326";
26230+
exports.version = "19.1.0-native-fb-3e88e97c-20250326";
2622726231
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2622826232
"function" ===
2622926233
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)