Skip to content

Commit

Permalink
Remove enableClientRenderFallbackOnTextMismatch flag (#28458)
Browse files Browse the repository at this point in the history
Build on top of #28440.

This lets us remove the path where updates are tracked on differences in
text.

DiffTrain build for commit 84c84d7.
  • Loading branch information
sebmarkbage committed Mar 26, 2024
1 parent db5930d commit dd1d24b
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 166 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<3512f830a7f7738685a3f378f1fc8206>>
* @generated SignedSource<<270144e142689aae36510575078767a1>>
*/

"use strict";
Expand Down Expand Up @@ -17085,9 +17085,7 @@ if (__DEV__) {
var _wasHydrated3 = popHydrationState();

if (_wasHydrated3) {
if (prepareToHydrateHostTextInstance()) {
markUpdate(workInProgress);
}
prepareToHydrateHostTextInstance();
} else {
workInProgress.stateNode = createTextInstance(newText);
}
Expand Down Expand Up @@ -25510,7 +25508,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "19.0.0-canary-ce2d02ca";
var ReactVersion = "19.0.0-canary-a9ccb423";

// Might add PROFILE later.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<3f3b0c631049128f2d0d89145a25e654>>
* @generated SignedSource<<a75b0d81ed7e65574a940500686411f9>>
*/

"use strict";
Expand Down Expand Up @@ -9154,19 +9154,19 @@ function wrapFiber(fiber) {
fiberToWrapper.set(fiber, wrapper));
return wrapper;
}
var devToolsConfig$jscomp$inline_1024 = {
var devToolsConfig$jscomp$inline_1023 = {
findFiberByHostInstance: function () {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "19.0.0-canary-f980cc33",
version: "19.0.0-canary-1b271a1b",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1214 = {
bundleType: devToolsConfig$jscomp$inline_1024.bundleType,
version: devToolsConfig$jscomp$inline_1024.version,
rendererPackageName: devToolsConfig$jscomp$inline_1024.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1024.rendererConfig,
var internals$jscomp$inline_1213 = {
bundleType: devToolsConfig$jscomp$inline_1023.bundleType,
version: devToolsConfig$jscomp$inline_1023.version,
rendererPackageName: devToolsConfig$jscomp$inline_1023.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1023.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
Expand All @@ -9183,26 +9183,26 @@ var internals$jscomp$inline_1214 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1024.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1023.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-canary-f980cc33"
reconcilerVersion: "19.0.0-canary-1b271a1b"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1215 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1214 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1215.isDisabled &&
hook$jscomp$inline_1215.supportsFiber
!hook$jscomp$inline_1214.isDisabled &&
hook$jscomp$inline_1214.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1215.inject(
internals$jscomp$inline_1214
(rendererID = hook$jscomp$inline_1214.inject(
internals$jscomp$inline_1213
)),
(injectedHook = hook$jscomp$inline_1215);
(injectedHook = hook$jscomp$inline_1214);
} catch (err) {}
}
exports._Scheduler = Scheduler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<3b33716ce484e4bc4eb2c83e48bea56e>>
* @generated SignedSource<<e79f3ae88518b14f6808a7938d5b3e84>>
*/

"use strict";
Expand Down Expand Up @@ -9580,19 +9580,19 @@ function wrapFiber(fiber) {
fiberToWrapper.set(fiber, wrapper));
return wrapper;
}
var devToolsConfig$jscomp$inline_1066 = {
var devToolsConfig$jscomp$inline_1065 = {
findFiberByHostInstance: function () {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "19.0.0-canary-ee4675ac",
version: "19.0.0-canary-a6321e7c",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1255 = {
bundleType: devToolsConfig$jscomp$inline_1066.bundleType,
version: devToolsConfig$jscomp$inline_1066.version,
rendererPackageName: devToolsConfig$jscomp$inline_1066.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1066.rendererConfig,
var internals$jscomp$inline_1254 = {
bundleType: devToolsConfig$jscomp$inline_1065.bundleType,
version: devToolsConfig$jscomp$inline_1065.version,
rendererPackageName: devToolsConfig$jscomp$inline_1065.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1065.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
Expand All @@ -9609,26 +9609,26 @@ var internals$jscomp$inline_1255 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1066.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1065.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-canary-ee4675ac"
reconcilerVersion: "19.0.0-canary-a6321e7c"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1256 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1255 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1256.isDisabled &&
hook$jscomp$inline_1256.supportsFiber
!hook$jscomp$inline_1255.isDisabled &&
hook$jscomp$inline_1255.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1256.inject(
internals$jscomp$inline_1255
(rendererID = hook$jscomp$inline_1255.inject(
internals$jscomp$inline_1254
)),
(injectedHook = hook$jscomp$inline_1256);
(injectedHook = hook$jscomp$inline_1255);
} catch (err) {}
}
exports._Scheduler = Scheduler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
670d61bea23470e980ba13c1c8441e375779b0b8
84c84d72f11ff1961a103b3cd59919876e48f759
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<3d8580891aa508376928393223024e49>>
* @generated SignedSource<<59c12b288a18fed81de38ef7de7f9286>>
*/

"use strict";
Expand Down Expand Up @@ -21445,9 +21445,7 @@ to return true:wantsResponderID| |
var _wasHydrated3 = popHydrationState();

if (_wasHydrated3) {
if (prepareToHydrateHostTextInstance()) {
markUpdate(workInProgress);
}
prepareToHydrateHostTextInstance();
} else {
workInProgress.stateNode = createTextInstance(
newText,
Expand Down Expand Up @@ -29858,7 +29856,7 @@ to return true:wantsResponderID| |
return root;
}

var ReactVersion = "19.0.0-canary-42ba9c63";
var ReactVersion = "19.0.0-canary-6e1959ee";

function createPortal$1(
children,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @noflow
* @nolint
* @preventMunge
* @generated SignedSource<<171f2e06e0a151d06445de01ff246eec>>
* @generated SignedSource<<b2ca41cfd15a1200e09339feee5d9fb4>>
*/

"use strict";
Expand Down Expand Up @@ -893,7 +893,7 @@ eventPluginOrder = Array.prototype.slice.call([
"ReactNativeBridgeEventPlugin"
]);
recomputePluginOrdering();
var injectedNamesToPlugins$jscomp$inline_250 = {
var injectedNamesToPlugins$jscomp$inline_249 = {
ResponderEventPlugin: ResponderEventPlugin,
ReactNativeBridgeEventPlugin: {
eventTypes: {},
Expand Down Expand Up @@ -939,32 +939,32 @@ var injectedNamesToPlugins$jscomp$inline_250 = {
}
}
},
isOrderingDirty$jscomp$inline_251 = !1,
pluginName$jscomp$inline_252;
for (pluginName$jscomp$inline_252 in injectedNamesToPlugins$jscomp$inline_250)
isOrderingDirty$jscomp$inline_250 = !1,
pluginName$jscomp$inline_251;
for (pluginName$jscomp$inline_251 in injectedNamesToPlugins$jscomp$inline_249)
if (
injectedNamesToPlugins$jscomp$inline_250.hasOwnProperty(
pluginName$jscomp$inline_252
injectedNamesToPlugins$jscomp$inline_249.hasOwnProperty(
pluginName$jscomp$inline_251
)
) {
var pluginModule$jscomp$inline_253 =
injectedNamesToPlugins$jscomp$inline_250[pluginName$jscomp$inline_252];
var pluginModule$jscomp$inline_252 =
injectedNamesToPlugins$jscomp$inline_249[pluginName$jscomp$inline_251];
if (
!namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_252) ||
namesToPlugins[pluginName$jscomp$inline_252] !==
pluginModule$jscomp$inline_253
!namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_251) ||
namesToPlugins[pluginName$jscomp$inline_251] !==
pluginModule$jscomp$inline_252
) {
if (namesToPlugins[pluginName$jscomp$inline_252])
if (namesToPlugins[pluginName$jscomp$inline_251])
throw Error(
"EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
(pluginName$jscomp$inline_252 + "`.")
(pluginName$jscomp$inline_251 + "`.")
);
namesToPlugins[pluginName$jscomp$inline_252] =
pluginModule$jscomp$inline_253;
isOrderingDirty$jscomp$inline_251 = !0;
namesToPlugins[pluginName$jscomp$inline_251] =
pluginModule$jscomp$inline_252;
isOrderingDirty$jscomp$inline_250 = !0;
}
}
isOrderingDirty$jscomp$inline_251 && recomputePluginOrdering();
isOrderingDirty$jscomp$inline_250 && recomputePluginOrdering();
var emptyObject$1 = {},
removedKeys = null,
removedKeyCount = 0,
Expand Down Expand Up @@ -10607,10 +10607,10 @@ batchedUpdatesImpl = function (fn, a) {
}
};
var roots = new Map(),
devToolsConfig$jscomp$inline_1111 = {
devToolsConfig$jscomp$inline_1110 = {
findFiberByHostInstance: getInstanceFromNode,
bundleType: 0,
version: "19.0.0-canary-125aec61",
version: "19.0.0-canary-7cb209c6",
rendererPackageName: "react-native-renderer",
rendererConfig: {
getInspectorDataForInstance: getInspectorDataForInstance,
Expand All @@ -10626,11 +10626,11 @@ var roots = new Map(),
}.bind(null, findNodeHandle)
}
};
var internals$jscomp$inline_1350 = {
bundleType: devToolsConfig$jscomp$inline_1111.bundleType,
version: devToolsConfig$jscomp$inline_1111.version,
rendererPackageName: devToolsConfig$jscomp$inline_1111.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1111.rendererConfig,
var internals$jscomp$inline_1349 = {
bundleType: devToolsConfig$jscomp$inline_1110.bundleType,
version: devToolsConfig$jscomp$inline_1110.version,
rendererPackageName: devToolsConfig$jscomp$inline_1110.rendererPackageName,
rendererConfig: devToolsConfig$jscomp$inline_1110.rendererConfig,
overrideHookState: null,
overrideHookStateDeletePath: null,
overrideHookStateRenamePath: null,
Expand All @@ -10646,26 +10646,26 @@ var internals$jscomp$inline_1350 = {
return null === fiber ? null : fiber.stateNode;
},
findFiberByHostInstance:
devToolsConfig$jscomp$inline_1111.findFiberByHostInstance ||
devToolsConfig$jscomp$inline_1110.findFiberByHostInstance ||
emptyFindFiberByHostInstance,
findHostInstancesForRefresh: null,
scheduleRefresh: null,
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-canary-125aec61"
reconcilerVersion: "19.0.0-canary-7cb209c6"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1351 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_1350 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_1351.isDisabled &&
hook$jscomp$inline_1351.supportsFiber
!hook$jscomp$inline_1350.isDisabled &&
hook$jscomp$inline_1350.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_1351.inject(
internals$jscomp$inline_1350
(rendererID = hook$jscomp$inline_1350.inject(
internals$jscomp$inline_1349
)),
(injectedHook = hook$jscomp$inline_1351);
(injectedHook = hook$jscomp$inline_1350);
} catch (err) {}
}
exports.createPortal = function (children, containerTag) {
Expand Down
Loading

0 comments on commit dd1d24b

Please sign in to comment.