Skip to content

Commit 7f3682c

Browse files
rickhanloniirickhanlonii
committed
Land enableClientRenderFallbackOnTextMismatch for www (#28538)
This is landed, we can hardcode the flag DiffTrain build for [56e2005](56e2005)
1 parent eaaebdd commit 7f3682c

26 files changed

+77
-147
lines changed

‎compiled/facebook-www/JSXDEVRuntime-dev.classic.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ if (__DEV__) {
110110
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
111111
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
112112
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
113-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
114-
// On WWW, false is used for a new modern build.
113+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
115114

116115
function getWrappedName(outerType, innerType, wrapperName) {
117116
var displayName = outerType.displayName;

‎compiled/facebook-www/JSXDEVRuntime-dev.modern.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ if (__DEV__) {
110110
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
111111
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
112112
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
113-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
114-
// On WWW, true is used for a new modern build.
113+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
115114

116115
function getWrappedName(outerType, innerType, wrapperName) {
117116
var displayName = outerType.displayName;

‎compiled/facebook-www/REVISION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0d1ae5d753044fae99bc37a7815aa947447de3f8
1+
56e20051c3c1611f9495081d01f1946184332c6b

‎compiled/facebook-www/React-dev.classic.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (__DEV__) {
2424
) {
2525
__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error());
2626
}
27-
var ReactVersion = "18.3.0-www-classic-14ddc39a";
27+
var ReactVersion = "18.3.0-www-classic-7d5d3599";
2828

2929
// ATTENTION
3030
// When adding new symbols to this file,
@@ -402,8 +402,7 @@ if (__DEV__) {
402402
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
403403
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
404404
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
405-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
406-
// On WWW, false is used for a new modern build.
405+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
407406

408407
/*
409408
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

‎compiled/facebook-www/React-dev.modern.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (__DEV__) {
2424
) {
2525
__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error());
2626
}
27-
var ReactVersion = "18.3.0-www-modern-76412cae";
27+
var ReactVersion = "18.3.0-www-modern-a40c73f1";
2828

2929
// ATTENTION
3030
// When adding new symbols to this file,
@@ -402,8 +402,7 @@ if (__DEV__) {
402402
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
403403
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
404404
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
405-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
406-
// On WWW, true is used for a new modern build.
405+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
407406

408407
/*
409408
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

‎compiled/facebook-www/React-prod.classic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -633,4 +633,4 @@ exports.useSyncExternalStore = function (
633633
exports.useTransition = function () {
634634
return ReactCurrentDispatcher.current.useTransition();
635635
};
636-
exports.version = "18.3.0-www-classic-0d16943c";
636+
exports.version = "18.3.0-www-classic-32d29ecb";

‎compiled/facebook-www/React-prod.modern.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,4 +625,4 @@ exports.useSyncExternalStore = function (
625625
exports.useTransition = function () {
626626
return ReactCurrentDispatcher.current.useTransition();
627627
};
628-
exports.version = "18.3.0-www-modern-a7ff7332";
628+
exports.version = "18.3.0-www-modern-076bcf85";

‎compiled/facebook-www/React-profiling.classic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ exports.useSyncExternalStore = function (
637637
exports.useTransition = function () {
638638
return ReactCurrentDispatcher.current.useTransition();
639639
};
640-
exports.version = "18.3.0-www-classic-b219bf7d";
640+
exports.version = "18.3.0-www-classic-e14b3ab5";
641641
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
642642
"function" ===
643643
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

‎compiled/facebook-www/ReactART-dev.classic.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

69-
var ReactVersion = "18.3.0-www-classic-db11990b";
69+
var ReactVersion = "18.3.0-www-classic-c7591c48";
7070

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -189,8 +189,7 @@ if (__DEV__) {
189189
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
190190
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
191191
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
192-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
193-
// On WWW, false is used for a new modern build.
192+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
194193
var enableProfilerTimer = true;
195194
var enableProfilerCommitHooks = true;
196195
var enableProfilerNestedUpdatePhase = true;

‎compiled/facebook-www/ReactART-dev.modern.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

69-
var ReactVersion = "18.3.0-www-modern-d1dd2d63";
69+
var ReactVersion = "18.3.0-www-modern-0ed317cd";
7070

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -189,8 +189,7 @@ if (__DEV__) {
189189
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
190190
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
191191
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
192-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
193-
// On WWW, true is used for a new modern build.
192+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
194193
var enableProfilerTimer = true;
195194
var enableProfilerCommitHooks = true;
196195
var enableProfilerNestedUpdatePhase = true;

‎compiled/facebook-www/ReactDOM-dev.classic.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@ if (__DEV__) {
154154
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
155155
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
156156
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
157-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
158-
enableClientRenderFallbackOnTextMismatch =
159-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch; // On WWW, false is used for a new modern build.
157+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
160158
var enableProfilerTimer = true;
161159
var enableProfilerCommitHooks = true;
162160
var enableProfilerNestedUpdatePhase = true;
161+
var enableClientRenderFallbackOnTextMismatch = true;
163162
var enableFormActions = true;
164163
var enableAsyncActions = true; // Logs additional User Timing API marks for use with an experimental profiling tool.
165164

@@ -35993,7 +35992,7 @@ if (__DEV__) {
3599335992
return root;
3599435993
}
3599535994

35996-
var ReactVersion = "18.3.0-www-classic-26a9fc54";
35995+
var ReactVersion = "18.3.0-www-classic-8ac2daaf";
3599735996

3599835997
function createPortal$1(
3599935998
children,

‎compiled/facebook-www/ReactDOM-dev.modern.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,11 @@ if (__DEV__) {
149149
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
150150
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
151151
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
152-
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
153-
enableClientRenderFallbackOnTextMismatch =
154-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch; // On WWW, true is used for a new modern build.
152+
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
155153
var enableProfilerTimer = true;
156154
var enableProfilerCommitHooks = true;
157155
var enableProfilerNestedUpdatePhase = true;
156+
var enableClientRenderFallbackOnTextMismatch = true;
158157
var enableFormActions = true;
159158
var enableAsyncActions = true; // Logs additional User Timing API marks for use with an experimental profiling tool.
160159

@@ -35840,7 +35839,7 @@ if (__DEV__) {
3584035839
return root;
3584135840
}
3584235841

35843-
var ReactVersion = "18.3.0-www-modern-9c67d6cd";
35842+
var ReactVersion = "18.3.0-www-modern-5fbb2842";
3584435843

3584535844
function createPortal$1(
3584635845
children,

‎compiled/facebook-www/ReactDOM-prod.classic.js

+7-16
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ var ReactSharedInternals =
6464
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
6565
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
6666
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
67-
enableClientRenderFallbackOnTextMismatch =
68-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
6967
REACT_ELEMENT_TYPE = Symbol.for("react.element"),
7068
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
7169
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
@@ -7400,10 +7398,7 @@ function completeWork(current, workInProgress, renderLanes) {
74007398
renderLanes,
74017399
currentResource
74027400
);
7403-
if (
7404-
currentResource &&
7405-
enableClientRenderFallbackOnTextMismatch
7406-
) {
7401+
if (currentResource) {
74077402
current = !1;
74087403
break a;
74097404
}
@@ -7418,10 +7413,7 @@ function completeWork(current, workInProgress, renderLanes) {
74187413
renderLanes,
74197414
isConcurrentMode$24
74207415
);
7421-
if (
7422-
isConcurrentMode$24 &&
7423-
enableClientRenderFallbackOnTextMismatch
7424-
) {
7416+
if (isConcurrentMode$24) {
74257417
current = !1;
74267418
break a;
74277419
}
@@ -14365,8 +14357,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
1436514357
clientText = normalizeMarkupForTextOrAttribute(clientText);
1436614358
if (
1436714359
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
14368-
isConcurrentMode &&
14369-
enableClientRenderFallbackOnTextMismatch
14360+
isConcurrentMode
1437014361
)
1437114362
throw Error(formatProdErrorMessage(425));
1437214363
}
@@ -15636,7 +15627,7 @@ function hydrateInstance(
1563615627
internalInstanceHandle,
1563715628
hostContext
1563815629
),
15639-
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
15630+
hostContext ||
1564015631
"body" === type ||
1564115632
(instance.textContent = internalInstanceHandle));
1564215633
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
@@ -17237,7 +17228,7 @@ Internals.Events = [
1723717228
var devToolsConfig$jscomp$inline_1822 = {
1723817229
findFiberByHostInstance: getClosestInstanceFromNode,
1723917230
bundleType: 0,
17240-
version: "18.3.0-www-classic-caa15134",
17231+
version: "18.3.0-www-classic-6ed964aa",
1724117232
rendererPackageName: "react-dom"
1724217233
};
1724317234
var internals$jscomp$inline_2181 = {
@@ -17267,7 +17258,7 @@ var internals$jscomp$inline_2181 = {
1726717258
scheduleRoot: null,
1726817259
setRefreshHandler: null,
1726917260
getCurrentFiber: null,
17270-
reconcilerVersion: "18.3.0-www-classic-caa15134"
17261+
reconcilerVersion: "18.3.0-www-classic-6ed964aa"
1727117262
};
1727217263
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1727317264
var hook$jscomp$inline_2182 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17598,4 +17589,4 @@ exports.useFormState = function (action, initialState, permalink) {
1759817589
exports.useFormStatus = function () {
1759917590
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1760017591
};
17601-
exports.version = "18.3.0-www-classic-caa15134";
17592+
exports.version = "18.3.0-www-classic-6ed964aa";

‎compiled/facebook-www/ReactDOM-prod.modern.js

+7-16
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
7777
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
7878
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
7979
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
80-
enableClientRenderFallbackOnTextMismatch =
81-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
8280
assign = Object.assign,
8381
ReactSharedInternals =
8482
React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
@@ -7237,10 +7235,7 @@ function completeWork(current, workInProgress, renderLanes) {
72377235
renderLanes,
72387236
currentResource
72397237
);
7240-
if (
7241-
currentResource &&
7242-
enableClientRenderFallbackOnTextMismatch
7243-
) {
7238+
if (currentResource) {
72447239
current = !1;
72457240
break a;
72467241
}
@@ -7255,10 +7250,7 @@ function completeWork(current, workInProgress, renderLanes) {
72557250
renderLanes,
72567251
isConcurrentMode$24
72577252
);
7258-
if (
7259-
isConcurrentMode$24 &&
7260-
enableClientRenderFallbackOnTextMismatch
7261-
) {
7253+
if (isConcurrentMode$24) {
72627254
current = !1;
72637255
break a;
72647256
}
@@ -14669,8 +14661,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
1466914661
clientText = normalizeMarkupForTextOrAttribute(clientText);
1467014662
if (
1467114663
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
14672-
isConcurrentMode &&
14673-
enableClientRenderFallbackOnTextMismatch
14664+
isConcurrentMode
1467414665
)
1467514666
throw Error(formatProdErrorMessage(425));
1467614667
}
@@ -15909,7 +15900,7 @@ function hydrateInstance(
1590915900
internalInstanceHandle,
1591015901
hostContext
1591115902
),
15912-
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
15903+
hostContext ||
1591315904
"body" === type ||
1591415905
(instance.textContent = internalInstanceHandle));
1591515906
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
@@ -16753,7 +16744,7 @@ Internals.Events = [
1675316744
var devToolsConfig$jscomp$inline_1781 = {
1675416745
findFiberByHostInstance: getClosestInstanceFromNode,
1675516746
bundleType: 0,
16756-
version: "18.3.0-www-modern-2a863e2d",
16747+
version: "18.3.0-www-modern-f0e76f9a",
1675716748
rendererPackageName: "react-dom"
1675816749
};
1675916750
var internals$jscomp$inline_2145 = {
@@ -16784,7 +16775,7 @@ var internals$jscomp$inline_2145 = {
1678416775
scheduleRoot: null,
1678516776
setRefreshHandler: null,
1678616777
getCurrentFiber: null,
16787-
reconcilerVersion: "18.3.0-www-modern-2a863e2d"
16778+
reconcilerVersion: "18.3.0-www-modern-f0e76f9a"
1678816779
};
1678916780
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1679016781
var hook$jscomp$inline_2146 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17043,4 +17034,4 @@ exports.useFormState = function (action, initialState, permalink) {
1704317034
exports.useFormStatus = function () {
1704417035
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1704517036
};
17046-
exports.version = "18.3.0-www-modern-2a863e2d";
17037+
exports.version = "18.3.0-www-modern-f0e76f9a";

‎compiled/facebook-www/ReactDOM-profiling.classic.js

+7-16
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ var ReactSharedInternals =
6868
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
6969
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
7070
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
71-
enableClientRenderFallbackOnTextMismatch =
72-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
7371
enableSchedulingProfiler = dynamicFeatureFlags.enableSchedulingProfiler,
7472
REACT_ELEMENT_TYPE = Symbol.for("react.element"),
7573
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
@@ -7678,10 +7676,7 @@ function completeWork(current, workInProgress, renderLanes) {
76787676
renderLanes,
76797677
currentResource
76807678
);
7681-
if (
7682-
currentResource &&
7683-
enableClientRenderFallbackOnTextMismatch
7684-
) {
7679+
if (currentResource) {
76857680
current = !1;
76867681
break a;
76877682
}
@@ -7696,10 +7691,7 @@ function completeWork(current, workInProgress, renderLanes) {
76967691
renderLanes,
76977692
isConcurrentMode$27
76987693
);
7699-
if (
7700-
isConcurrentMode$27 &&
7701-
enableClientRenderFallbackOnTextMismatch
7702-
) {
7694+
if (isConcurrentMode$27) {
77037695
current = !1;
77047696
break a;
77057697
}
@@ -15112,8 +15104,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
1511215104
clientText = normalizeMarkupForTextOrAttribute(clientText);
1511315105
if (
1511415106
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
15115-
isConcurrentMode &&
15116-
enableClientRenderFallbackOnTextMismatch
15107+
isConcurrentMode
1511715108
)
1511815109
throw Error(formatProdErrorMessage(425));
1511915110
}
@@ -16383,7 +16374,7 @@ function hydrateInstance(
1638316374
internalInstanceHandle,
1638416375
hostContext
1638516376
),
16386-
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
16377+
hostContext ||
1638716378
"body" === type ||
1638816379
(instance.textContent = internalInstanceHandle));
1638916380
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
@@ -17984,7 +17975,7 @@ Internals.Events = [
1798417975
var devToolsConfig$jscomp$inline_1907 = {
1798517976
findFiberByHostInstance: getClosestInstanceFromNode,
1798617977
bundleType: 0,
17987-
version: "18.3.0-www-classic-819e0a71",
17978+
version: "18.3.0-www-classic-ee3be4cf",
1798817979
rendererPackageName: "react-dom"
1798917980
};
1799017981
(function (internals) {
@@ -18028,7 +18019,7 @@ var devToolsConfig$jscomp$inline_1907 = {
1802818019
scheduleRoot: null,
1802918020
setRefreshHandler: null,
1803018021
getCurrentFiber: null,
18031-
reconcilerVersion: "18.3.0-www-classic-819e0a71"
18022+
reconcilerVersion: "18.3.0-www-classic-ee3be4cf"
1803218023
});
1803318024
assign(Internals, {
1803418025
ReactBrowserEventEmitter: {
@@ -18346,7 +18337,7 @@ exports.useFormState = function (action, initialState, permalink) {
1834618337
exports.useFormStatus = function () {
1834718338
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1834818339
};
18349-
exports.version = "18.3.0-www-classic-819e0a71";
18340+
exports.version = "18.3.0-www-classic-ee3be4cf";
1835018341
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1835118342
"function" ===
1835218343
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)