Skip to content

Commit

Permalink
Land enableClientRenderFallbackOnTextMismatch for www (#28538)
Browse files Browse the repository at this point in the history
This is landed, we can hardcode the flag

DiffTrain build for [56e2005](56e2005)
  • Loading branch information
rickhanlonii committed Mar 11, 2024
1 parent eaaebdd commit 7f3682c
Show file tree
Hide file tree
Showing 26 changed files with 77 additions and 147 deletions.
3 changes: 1 addition & 2 deletions compiled/facebook-www/JSXDEVRuntime-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ if (__DEV__) {
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, false is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.

function getWrappedName(outerType, innerType, wrapperName) {
var displayName = outerType.displayName;
Expand Down
3 changes: 1 addition & 2 deletions compiled/facebook-www/JSXDEVRuntime-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ if (__DEV__) {
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, true is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.

function getWrappedName(outerType, innerType, wrapperName) {
var displayName = outerType.displayName;
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0d1ae5d753044fae99bc37a7815aa947447de3f8
56e20051c3c1611f9495081d01f1946184332c6b
5 changes: 2 additions & 3 deletions compiled/facebook-www/React-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (__DEV__) {
) {
__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error());
}
var ReactVersion = "18.3.0-www-classic-14ddc39a";
var ReactVersion = "18.3.0-www-classic-7d5d3599";

// ATTENTION
// When adding new symbols to this file,
Expand Down Expand Up @@ -402,8 +402,7 @@ if (__DEV__) {
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, false is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.

/*
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol
Expand Down
5 changes: 2 additions & 3 deletions compiled/facebook-www/React-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (__DEV__) {
) {
__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error());
}
var ReactVersion = "18.3.0-www-modern-76412cae";
var ReactVersion = "18.3.0-www-modern-a40c73f1";

// ATTENTION
// When adding new symbols to this file,
Expand Down Expand Up @@ -402,8 +402,7 @@ if (__DEV__) {
var enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, true is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.

/*
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -633,4 +633,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-www-classic-0d16943c";
exports.version = "18.3.0-www-classic-32d29ecb";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -625,4 +625,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-www-modern-a7ff7332";
exports.version = "18.3.0-www-modern-076bcf85";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-www-classic-b219bf7d";
exports.version = "18.3.0-www-classic-e14b3ab5";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
5 changes: 2 additions & 3 deletions compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (__DEV__) {
return self;
}

var ReactVersion = "18.3.0-www-classic-db11990b";
var ReactVersion = "18.3.0-www-classic-c7591c48";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -189,8 +189,7 @@ if (__DEV__) {
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, false is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
var enableProfilerTimer = true;
var enableProfilerCommitHooks = true;
var enableProfilerNestedUpdatePhase = true;
Expand Down
5 changes: 2 additions & 3 deletions compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (__DEV__) {
return self;
}

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

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -189,8 +189,7 @@ if (__DEV__) {
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp;
// On WWW, true is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
var enableProfilerTimer = true;
var enableProfilerCommitHooks = true;
var enableProfilerNestedUpdatePhase = true;
Expand Down
7 changes: 3 additions & 4 deletions compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,11 @@ if (__DEV__) {
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
enableClientRenderFallbackOnTextMismatch =
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch; // On WWW, false is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, false is used for a new modern build.
var enableProfilerTimer = true;
var enableProfilerCommitHooks = true;
var enableProfilerNestedUpdatePhase = true;
var enableClientRenderFallbackOnTextMismatch = true;
var enableFormActions = true;
var enableAsyncActions = true; // Logs additional User Timing API marks for use with an experimental profiling tool.

Expand Down Expand Up @@ -35993,7 +35992,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-www-classic-26a9fc54";
var ReactVersion = "18.3.0-www-classic-8ac2daaf";

function createPortal$1(
children,
Expand Down
7 changes: 3 additions & 4 deletions compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,11 @@ if (__DEV__) {
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
useModernStrictMode = dynamicFeatureFlags.useModernStrictMode,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
enableClientRenderFallbackOnTextMismatch =
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch; // On WWW, true is used for a new modern build.
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp; // On WWW, true is used for a new modern build.
var enableProfilerTimer = true;
var enableProfilerCommitHooks = true;
var enableProfilerNestedUpdatePhase = true;
var enableClientRenderFallbackOnTextMismatch = true;
var enableFormActions = true;
var enableAsyncActions = true; // Logs additional User Timing API marks for use with an experimental profiling tool.

Expand Down Expand Up @@ -35840,7 +35839,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-www-modern-9c67d6cd";
var ReactVersion = "18.3.0-www-modern-5fbb2842";

function createPortal$1(
children,
Expand Down
23 changes: 7 additions & 16 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ var ReactSharedInternals =
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
enableClientRenderFallbackOnTextMismatch =
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
REACT_ELEMENT_TYPE = Symbol.for("react.element"),
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
Expand Down Expand Up @@ -7400,10 +7398,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
currentResource
);
if (
currentResource &&
enableClientRenderFallbackOnTextMismatch
) {
if (currentResource) {
current = !1;
break a;
}
Expand All @@ -7418,10 +7413,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
isConcurrentMode$24
);
if (
isConcurrentMode$24 &&
enableClientRenderFallbackOnTextMismatch
) {
if (isConcurrentMode$24) {
current = !1;
break a;
}
Expand Down Expand Up @@ -14365,8 +14357,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
clientText = normalizeMarkupForTextOrAttribute(clientText);
if (
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
isConcurrentMode &&
enableClientRenderFallbackOnTextMismatch
isConcurrentMode
)
throw Error(formatProdErrorMessage(425));
}
Expand Down Expand Up @@ -15636,7 +15627,7 @@ function hydrateInstance(
internalInstanceHandle,
hostContext
),
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
hostContext ||
"body" === type ||
(instance.textContent = internalInstanceHandle));
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
Expand Down Expand Up @@ -17237,7 +17228,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1822 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-caa15134",
version: "18.3.0-www-classic-6ed964aa",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2181 = {
Expand Down Expand Up @@ -17267,7 +17258,7 @@ var internals$jscomp$inline_2181 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-caa15134"
reconcilerVersion: "18.3.0-www-classic-6ed964aa"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2182 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -17598,4 +17589,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-classic-caa15134";
exports.version = "18.3.0-www-classic-6ed964aa";
23 changes: 7 additions & 16 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
enableClientRenderFallbackOnTextMismatch =
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
assign = Object.assign,
ReactSharedInternals =
React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
Expand Down Expand Up @@ -7237,10 +7235,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
currentResource
);
if (
currentResource &&
enableClientRenderFallbackOnTextMismatch
) {
if (currentResource) {
current = !1;
break a;
}
Expand All @@ -7255,10 +7250,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
isConcurrentMode$24
);
if (
isConcurrentMode$24 &&
enableClientRenderFallbackOnTextMismatch
) {
if (isConcurrentMode$24) {
current = !1;
break a;
}
Expand Down Expand Up @@ -14669,8 +14661,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
clientText = normalizeMarkupForTextOrAttribute(clientText);
if (
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
isConcurrentMode &&
enableClientRenderFallbackOnTextMismatch
isConcurrentMode
)
throw Error(formatProdErrorMessage(425));
}
Expand Down Expand Up @@ -15909,7 +15900,7 @@ function hydrateInstance(
internalInstanceHandle,
hostContext
),
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
hostContext ||
"body" === type ||
(instance.textContent = internalInstanceHandle));
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
Expand Down Expand Up @@ -16753,7 +16744,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1781 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-2a863e2d",
version: "18.3.0-www-modern-f0e76f9a",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2145 = {
Expand Down Expand Up @@ -16784,7 +16775,7 @@ var internals$jscomp$inline_2145 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-2a863e2d"
reconcilerVersion: "18.3.0-www-modern-f0e76f9a"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2146 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -17043,4 +17034,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-modern-2a863e2d";
exports.version = "18.3.0-www-modern-f0e76f9a";
23 changes: 7 additions & 16 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ var ReactSharedInternals =
dynamicFeatureFlags.enableInfiniteRenderLoopDetection,
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
enableRefAsProp = dynamicFeatureFlags.enableRefAsProp,
enableClientRenderFallbackOnTextMismatch =
dynamicFeatureFlags.enableClientRenderFallbackOnTextMismatch,
enableSchedulingProfiler = dynamicFeatureFlags.enableSchedulingProfiler,
REACT_ELEMENT_TYPE = Symbol.for("react.element"),
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
Expand Down Expand Up @@ -7678,10 +7676,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
currentResource
);
if (
currentResource &&
enableClientRenderFallbackOnTextMismatch
) {
if (currentResource) {
current = !1;
break a;
}
Expand All @@ -7696,10 +7691,7 @@ function completeWork(current, workInProgress, renderLanes) {
renderLanes,
isConcurrentMode$27
);
if (
isConcurrentMode$27 &&
enableClientRenderFallbackOnTextMismatch
) {
if (isConcurrentMode$27) {
current = !1;
break a;
}
Expand Down Expand Up @@ -15112,8 +15104,7 @@ function checkForUnmatchedText(serverText, clientText, isConcurrentMode) {
clientText = normalizeMarkupForTextOrAttribute(clientText);
if (
normalizeMarkupForTextOrAttribute(serverText) !== clientText &&
isConcurrentMode &&
enableClientRenderFallbackOnTextMismatch
isConcurrentMode
)
throw Error(formatProdErrorMessage(425));
}
Expand Down Expand Up @@ -16383,7 +16374,7 @@ function hydrateInstance(
internalInstanceHandle,
hostContext
),
(hostContext && enableClientRenderFallbackOnTextMismatch) ||
hostContext ||
"body" === type ||
(instance.textContent = internalInstanceHandle));
null != props.onScroll && listenToNonDelegatedEvent("scroll", instance);
Expand Down Expand Up @@ -17984,7 +17975,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1907 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-819e0a71",
version: "18.3.0-www-classic-ee3be4cf",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -18028,7 +18019,7 @@ var devToolsConfig$jscomp$inline_1907 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-819e0a71"
reconcilerVersion: "18.3.0-www-classic-ee3be4cf"
});
assign(Internals, {
ReactBrowserEventEmitter: {
Expand Down Expand Up @@ -18346,7 +18337,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-classic-819e0a71";
exports.version = "18.3.0-www-classic-ee3be4cf";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
Loading

0 comments on commit 7f3682c

Please sign in to comment.