Skip to content

Commit 71cc6ab

Browse files
sebmarkbagesebmarkbage
committed
Remove enableClientRenderFallbackOnTextMismatch flag (#28458)
Build on top of #28440. This lets us remove the path where updates are tracked on differences in text. DiffTrain build for [84c84d7](84c84d7)
1 parent 8ee89e3 commit 71cc6ab

20 files changed

+462
-743
lines changed

‎compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
670d61bea23470e980ba13c1c8441e375779b0b8
1+
84c84d72f11ff1961a103b3cd59919876e48f759

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

69-
var ReactVersion = "19.0.0-www-classic-841735f0";
69+
var ReactVersion = "19.0.0-www-classic-ae7c23fd";
7070

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -20031,9 +20031,7 @@ if (__DEV__) {
2003120031
var _wasHydrated3 = popHydrationState();
2003220032

2003320033
if (_wasHydrated3) {
20034-
if (prepareToHydrateHostTextInstance()) {
20035-
markUpdate(workInProgress);
20036-
}
20034+
prepareToHydrateHostTextInstance();
2003720035
} else {
2003820036
workInProgress.stateNode = createTextInstance(newText);
2003920037
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

69-
var ReactVersion = "19.0.0-www-modern-37e2c118";
69+
var ReactVersion = "19.0.0-www-modern-c5863941";
7070

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -19712,9 +19712,7 @@ if (__DEV__) {
1971219712
var _wasHydrated3 = popHydrationState();
1971319713

1971419714
if (_wasHydrated3) {
19715-
if (prepareToHydrateHostTextInstance()) {
19716-
markUpdate(workInProgress);
19717-
}
19715+
prepareToHydrateHostTextInstance();
1971819716
} else {
1971919717
workInProgress.stateNode = createTextInstance(newText);
1972019718
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10609,19 +10609,19 @@ var slice = Array.prototype.slice,
1060910609
};
1061010610
return Text;
1061110611
})(React.Component),
10612-
devToolsConfig$jscomp$inline_1133 = {
10612+
devToolsConfig$jscomp$inline_1132 = {
1061310613
findFiberByHostInstance: function () {
1061410614
return null;
1061510615
},
1061610616
bundleType: 0,
10617-
version: "19.0.0-www-classic-a714d6cd",
10617+
version: "19.0.0-www-classic-3c2c0375",
1061810618
rendererPackageName: "react-art"
1061910619
};
10620-
var internals$jscomp$inline_1338 = {
10621-
bundleType: devToolsConfig$jscomp$inline_1133.bundleType,
10622-
version: devToolsConfig$jscomp$inline_1133.version,
10623-
rendererPackageName: devToolsConfig$jscomp$inline_1133.rendererPackageName,
10624-
rendererConfig: devToolsConfig$jscomp$inline_1133.rendererConfig,
10620+
var internals$jscomp$inline_1337 = {
10621+
bundleType: devToolsConfig$jscomp$inline_1132.bundleType,
10622+
version: devToolsConfig$jscomp$inline_1132.version,
10623+
rendererPackageName: devToolsConfig$jscomp$inline_1132.rendererPackageName,
10624+
rendererConfig: devToolsConfig$jscomp$inline_1132.rendererConfig,
1062510625
overrideHookState: null,
1062610626
overrideHookStateDeletePath: null,
1062710627
overrideHookStateRenamePath: null,
@@ -10638,26 +10638,26 @@ var internals$jscomp$inline_1338 = {
1063810638
return null === fiber ? null : fiber.stateNode;
1063910639
},
1064010640
findFiberByHostInstance:
10641-
devToolsConfig$jscomp$inline_1133.findFiberByHostInstance ||
10641+
devToolsConfig$jscomp$inline_1132.findFiberByHostInstance ||
1064210642
emptyFindFiberByHostInstance,
1064310643
findHostInstancesForRefresh: null,
1064410644
scheduleRefresh: null,
1064510645
scheduleRoot: null,
1064610646
setRefreshHandler: null,
1064710647
getCurrentFiber: null,
10648-
reconcilerVersion: "19.0.0-www-classic-a714d6cd"
10648+
reconcilerVersion: "19.0.0-www-classic-3c2c0375"
1064910649
};
1065010650
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
10651-
var hook$jscomp$inline_1339 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
10651+
var hook$jscomp$inline_1338 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1065210652
if (
10653-
!hook$jscomp$inline_1339.isDisabled &&
10654-
hook$jscomp$inline_1339.supportsFiber
10653+
!hook$jscomp$inline_1338.isDisabled &&
10654+
hook$jscomp$inline_1338.supportsFiber
1065510655
)
1065610656
try {
10657-
(rendererID = hook$jscomp$inline_1339.inject(
10658-
internals$jscomp$inline_1338
10657+
(rendererID = hook$jscomp$inline_1338.inject(
10658+
internals$jscomp$inline_1337
1065910659
)),
10660-
(injectedHook = hook$jscomp$inline_1339);
10660+
(injectedHook = hook$jscomp$inline_1338);
1066110661
} catch (err) {}
1066210662
}
1066310663
var Path = Mode$1.Path;

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10264,19 +10264,19 @@ var slice = Array.prototype.slice,
1026410264
};
1026510265
return Text;
1026610266
})(React.Component),
10267-
devToolsConfig$jscomp$inline_1113 = {
10267+
devToolsConfig$jscomp$inline_1112 = {
1026810268
findFiberByHostInstance: function () {
1026910269
return null;
1027010270
},
1027110271
bundleType: 0,
10272-
version: "19.0.0-www-modern-3c09b75a",
10272+
version: "19.0.0-www-modern-f6a224b8",
1027310273
rendererPackageName: "react-art"
1027410274
};
10275-
var internals$jscomp$inline_1318 = {
10276-
bundleType: devToolsConfig$jscomp$inline_1113.bundleType,
10277-
version: devToolsConfig$jscomp$inline_1113.version,
10278-
rendererPackageName: devToolsConfig$jscomp$inline_1113.rendererPackageName,
10279-
rendererConfig: devToolsConfig$jscomp$inline_1113.rendererConfig,
10275+
var internals$jscomp$inline_1317 = {
10276+
bundleType: devToolsConfig$jscomp$inline_1112.bundleType,
10277+
version: devToolsConfig$jscomp$inline_1112.version,
10278+
rendererPackageName: devToolsConfig$jscomp$inline_1112.rendererPackageName,
10279+
rendererConfig: devToolsConfig$jscomp$inline_1112.rendererConfig,
1028010280
overrideHookState: null,
1028110281
overrideHookStateDeletePath: null,
1028210282
overrideHookStateRenamePath: null,
@@ -10293,26 +10293,26 @@ var internals$jscomp$inline_1318 = {
1029310293
return null === fiber ? null : fiber.stateNode;
1029410294
},
1029510295
findFiberByHostInstance:
10296-
devToolsConfig$jscomp$inline_1113.findFiberByHostInstance ||
10296+
devToolsConfig$jscomp$inline_1112.findFiberByHostInstance ||
1029710297
emptyFindFiberByHostInstance,
1029810298
findHostInstancesForRefresh: null,
1029910299
scheduleRefresh: null,
1030010300
scheduleRoot: null,
1030110301
setRefreshHandler: null,
1030210302
getCurrentFiber: null,
10303-
reconcilerVersion: "19.0.0-www-modern-3c09b75a"
10303+
reconcilerVersion: "19.0.0-www-modern-f6a224b8"
1030410304
};
1030510305
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
10306-
var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
10306+
var hook$jscomp$inline_1318 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1030710307
if (
10308-
!hook$jscomp$inline_1319.isDisabled &&
10309-
hook$jscomp$inline_1319.supportsFiber
10308+
!hook$jscomp$inline_1318.isDisabled &&
10309+
hook$jscomp$inline_1318.supportsFiber
1031010310
)
1031110311
try {
10312-
(rendererID = hook$jscomp$inline_1319.inject(
10313-
internals$jscomp$inline_1318
10312+
(rendererID = hook$jscomp$inline_1318.inject(
10313+
internals$jscomp$inline_1317
1031410314
)),
10315-
(injectedHook = hook$jscomp$inline_1319);
10315+
(injectedHook = hook$jscomp$inline_1318);
1031610316
} catch (err) {}
1031710317
}
1031810318
var Path = Mode$1.Path;

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

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,7 @@ if (__DEV__) {
154154
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
155155
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
156156
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
157-
enableNewBooleanProps = dynamicFeatureFlags.enableNewBooleanProps,
158-
enableClientRenderFallbackOnTextMismatch =
159-
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch; // On WWW, false is used for a new modern build.
157+
enableNewBooleanProps = dynamicFeatureFlags.enableNewBooleanProps; // On WWW, false is used for a new modern build.
160158
var enableProfilerTimer = true;
161159
var enableProfilerCommitHooks = true;
162160
var enableProfilerNestedUpdatePhase = true;
@@ -8548,9 +8546,13 @@ if (__DEV__) {
85488546
var textInstance = fiber.stateNode;
85498547
var textContent = fiber.memoizedProps;
85508548
var shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;
8551-
var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
8549+
var textIsDifferent = hydrateTextInstance(
8550+
textInstance,
8551+
textContent,
8552+
fiber
8553+
);
85528554

8553-
if (shouldUpdate) {
8555+
if (textIsDifferent) {
85548556
// We assume that prepareToHydrateHostTextInstance is called in a context where the
85558557
// hydration parent is the parent host component of this host text.
85568558
var returnFiber = hydrationParentFiber;
@@ -8565,13 +8567,6 @@ if (__DEV__) {
85658567
textContent,
85668568
shouldWarnIfMismatchDev
85678569
);
8568-
8569-
if (enableClientRenderFallbackOnTextMismatch) {
8570-
// In concurrent mode we never update the mismatched text,
8571-
// even if the error was ignored.
8572-
return false;
8573-
}
8574-
85758570
break;
85768571
}
85778572

@@ -8588,20 +8583,11 @@ if (__DEV__) {
85888583
textContent,
85898584
shouldWarnIfMismatchDev
85908585
);
8591-
8592-
if (enableClientRenderFallbackOnTextMismatch) {
8593-
// In concurrent mode we never update the mismatched text,
8594-
// even if the error was ignored.
8595-
return false;
8596-
}
8597-
85988586
break;
85998587
}
86008588
}
86018589
}
86028590
}
8603-
8604-
return shouldUpdate;
86058591
}
86068592

86078593
function prepareToHydrateHostSuspenseInstance(fiber) {
@@ -25212,9 +25198,7 @@ if (__DEV__) {
2521225198
var _wasHydrated3 = popHydrationState(workInProgress);
2521325199

2521425200
if (_wasHydrated3) {
25215-
if (prepareToHydrateHostTextInstance(workInProgress)) {
25216-
markUpdate(workInProgress);
25217-
}
25201+
prepareToHydrateHostTextInstance(workInProgress);
2521825202
} else {
2521925203
workInProgress.stateNode = createTextInstance(
2522025204
newText,
@@ -35582,7 +35566,7 @@ if (__DEV__) {
3558235566
return root;
3558335567
}
3558435568

35585-
var ReactVersion = "19.0.0-www-classic-08e73f78";
35569+
var ReactVersion = "19.0.0-www-classic-57b2070e";
3558635570

3558735571
function createPortal$1(
3558835572
children,
@@ -40357,13 +40341,10 @@ if (__DEV__) {
4035740341
);
4035840342
}
4035940343
}
40360-
}
40344+
} // In concurrent roots, we throw when there's a text mismatch and revert to
40345+
// client rendering, up to the nearest Suspense boundary.
4036140346

40362-
if (enableClientRenderFallbackOnTextMismatch) {
40363-
// In concurrent roots, we throw when there's a text mismatch and revert to
40364-
// client rendering, up to the nearest Suspense boundary.
40365-
throw new Error("Text content does not match server-rendered HTML.");
40366-
}
40347+
throw new Error("Text content does not match server-rendered HTML.");
4036740348
}
4036840349

4036940350
function noop$2() {}
@@ -43251,17 +43232,6 @@ if (__DEV__) {
4325143232
shouldWarnDev
4325243233
);
4325343234
}
43254-
43255-
if (!enableClientRenderFallbackOnTextMismatch) {
43256-
// We really should be patching this in the commit phase but since
43257-
// this only affects legacy mode hydration which is deprecated anyway
43258-
// we can get away with it.
43259-
// Host singletons get their children appended and don't use the text
43260-
// content mechanism.
43261-
if (tag !== "body") {
43262-
domElement.textContent = children;
43263-
}
43264-
}
4326543235
}
4326643236
}
4326743237

0 commit comments

Comments
 (0)