Skip to content

Commit

Permalink
Fix ReactHooksInspectionIntegration-test (#28577)
Browse files Browse the repository at this point in the history
Resolve conflict between #28508 and #28546

DiffTrain build for commit 6a01aca.
  • Loading branch information
jackpope committed Mar 18, 2024
1 parent d85c6b7 commit bf40fbf
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25454,7 +25454,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-canary-c94110c5f-20240318";
var ReactVersion = "18.3.0-canary-6a01aca75-20240318";

// Might add PROFILE later.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9175,7 +9175,7 @@ var devToolsConfig$jscomp$inline_1016 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-canary-c94110c5f-20240318",
version: "18.3.0-canary-6a01aca75-20240318",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1194 = {
Expand Down Expand Up @@ -9206,7 +9206,7 @@ var internals$jscomp$inline_1194 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-canary-c94110c5f-20240318"
reconcilerVersion: "18.3.0-canary-6a01aca75-20240318"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1195 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9603,7 +9603,7 @@ var devToolsConfig$jscomp$inline_1058 = {
throw Error("TestRenderer does not support findFiberByHostInstance()");
},
bundleType: 0,
version: "18.3.0-canary-c94110c5f-20240318",
version: "18.3.0-canary-6a01aca75-20240318",
rendererPackageName: "react-test-renderer"
};
var internals$jscomp$inline_1235 = {
Expand Down Expand Up @@ -9634,7 +9634,7 @@ var internals$jscomp$inline_1235 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-canary-c94110c5f-20240318"
reconcilerVersion: "18.3.0-canary-6a01aca75-20240318"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1236 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (__DEV__) {
}
var dynamicFlags = require("ReactNativeInternalFeatureFlags");

var ReactVersion = "18.3.0-canary-c94110c5f-20240318";
var ReactVersion = "18.3.0-canary-6a01aca75-20240318";

// ATTENTION
// When adding new symbols to this file,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,4 +628,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-canary-c94110c5f-20240318";
exports.version = "18.3.0-canary-6a01aca75-20240318";
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactCurrentDispatcher.current.useTransition();
};
exports.version = "18.3.0-canary-c94110c5f-20240318";
exports.version = "18.3.0-canary-6a01aca75-20240318";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c94110c5f3d66838c22bb23e8abfbfd8e58a55b9
6a01aca75b77da01b0e6513fe61a4842637c7dfd

0 comments on commit bf40fbf

Please sign in to comment.