Skip to content

Commit

Permalink
refactor[react-devtools]: remove browserTheme from ConsolePatchSettin…
Browse files Browse the repository at this point in the history
…gs (#30566)

Stacked on #30564.

We are no longer using browser theme in our console patching, this was
removed in unification of console patching for strict mode, we started
using ansi escape symbols and forking based on browser theme is no
longer required - #29869

The real browser theme initialization for frontend is happening at the
other place and is not affected:

https://github.com/facebook/react/blob/40be968257a7a10a267210670103f20dd0429ef3/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js#L117-L120

DiffTrain build for [b521ef8](b521ef8)
  • Loading branch information
hoxyq committed Sep 18, 2024
1 parent 6f75707 commit 8bc2b9c
Show file tree
Hide file tree
Showing 34 changed files with 184 additions and 186 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5e83d9ab3b3f88853591dff43cd70ee4e5c90c5d
b521ef8a2aaff61154e59f6d0d3791ee4dbe6395
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION_TRANSFORMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5e83d9ab3b3f88853591dff43cd70ee4e5c90c5d
b521ef8a2aaff61154e59f6d0d3791ee4dbe6395
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,7 @@ __DEV__ &&
exports.useTransition = function () {
return resolveDispatcher().useTransition();
};
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,7 @@ __DEV__ &&
exports.useTransition = function () {
return resolveDispatcher().useTransition();
};
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
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 @@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
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 @@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
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 @@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -17026,11 +17026,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-classic-5e83d9ab-20240918",
version: "19.0.0-www-classic-b521ef8a-20240918",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-classic-b521ef8a-20240918"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -17064,7 +17064,7 @@ __DEV__ &&
exports.Shape = Shape;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -16472,11 +16472,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-modern-5e83d9ab-20240918",
version: "19.0.0-www-modern-b521ef8a-20240918",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-modern-b521ef8a-20240918"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -16510,7 +16510,7 @@ __DEV__ &&
exports.Shape = Shape;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -10853,13 +10853,13 @@ var slice = Array.prototype.slice,
})(React.Component);
var internals$jscomp$inline_1439 = {
bundleType: 0,
version: "19.0.0-www-classic-5e83d9ab-20240918",
version: "19.0.0-www-classic-b521ef8a-20240918",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function () {
return null;
},
reconcilerVersion: "19.0.0-www-classic-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-classic-b521ef8a-20240918"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1440 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -10885,4 +10885,4 @@ exports.RadialGradient = RadialGradient;
exports.Shape = TYPES.SHAPE;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -10367,13 +10367,13 @@ var slice = Array.prototype.slice,
})(React.Component);
var internals$jscomp$inline_1431 = {
bundleType: 0,
version: "19.0.0-www-modern-5e83d9ab-20240918",
version: "19.0.0-www-modern-b521ef8a-20240918",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function () {
return null;
},
reconcilerVersion: "19.0.0-www-modern-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-modern-b521ef8a-20240918"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1432 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -10399,4 +10399,4 @@ exports.RadialGradient = RadialGradient;
exports.Shape = TYPES.SHAPE;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
28 changes: 14 additions & 14 deletions compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -18576,41 +18576,41 @@ __DEV__ &&
: !1;
}
function getActiveElementDeep(containerInfo) {
var $jscomp$optchain$tmp1765074778$1, $jscomp$nullish$tmp0;
var $jscomp$optchain$tmp88918400$1, $jscomp$nullish$tmp0;
containerInfo =
null !=
($jscomp$nullish$tmp0 =
null == containerInfo
? void 0
: null ==
($jscomp$optchain$tmp1765074778$1 = containerInfo.ownerDocument)
($jscomp$optchain$tmp88918400$1 = containerInfo.ownerDocument)
? void 0
: $jscomp$optchain$tmp1765074778$1.defaultView)
: $jscomp$optchain$tmp88918400$1.defaultView)
? $jscomp$nullish$tmp0
: window;
for (
$jscomp$optchain$tmp1765074778$1 = getActiveElement(
$jscomp$optchain$tmp88918400$1 = getActiveElement(
containerInfo.document
);
$jscomp$optchain$tmp1765074778$1 instanceof
$jscomp$optchain$tmp88918400$1 instanceof
containerInfo.HTMLIFrameElement;

) {
try {
var JSCompiler_inline_result =
"string" ===
typeof $jscomp$optchain$tmp1765074778$1.contentWindow.location.href;
typeof $jscomp$optchain$tmp88918400$1.contentWindow.location.href;
} catch (err) {
JSCompiler_inline_result = !1;
}
if (JSCompiler_inline_result)
containerInfo = $jscomp$optchain$tmp1765074778$1.contentWindow;
containerInfo = $jscomp$optchain$tmp88918400$1.contentWindow;
else break;
$jscomp$optchain$tmp1765074778$1 = getActiveElement(
$jscomp$optchain$tmp88918400$1 = getActiveElement(
containerInfo.document
);
}
return $jscomp$optchain$tmp1765074778$1;
return $jscomp$optchain$tmp88918400$1;
}
function hasSelectionCapabilities(elem) {
var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase();
Expand Down Expand Up @@ -27774,11 +27774,11 @@ __DEV__ &&
: flushSyncErrorInBuildsThatSupportLegacyMode;
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-www-classic-5e83d9ab-20240918" !== isomorphicReactPackageVersion)
if ("19.0.0-www-classic-b521ef8a-20240918" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-www-classic-5e83d9ab-20240918\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-www-classic-b521ef8a-20240918\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -27822,11 +27822,11 @@ __DEV__ &&
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-classic-5e83d9ab-20240918",
version: "19.0.0-www-classic-b521ef8a-20240918",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-classic-b521ef8a-20240918"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -28479,7 +28479,7 @@ __DEV__ &&
exports.useFormStatus = function () {
return resolveDispatcher().useHostTransitionStatus();
};
exports.version = "19.0.0-www-classic-5e83d9ab-20240918";
exports.version = "19.0.0-www-classic-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
30 changes: 16 additions & 14 deletions compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -17910,41 +17910,43 @@ __DEV__ &&
: !1;
}
function getActiveElementDeep(containerInfo) {
var $jscomp$optchain$tmp1980021184$1, $jscomp$nullish$tmp0;
var $jscomp$optchain$tmpm1778796256$1, $jscomp$nullish$tmp0;
containerInfo =
null !=
($jscomp$nullish$tmp0 =
null == containerInfo
? void 0
: null ==
($jscomp$optchain$tmp1980021184$1 = containerInfo.ownerDocument)
($jscomp$optchain$tmpm1778796256$1 =
containerInfo.ownerDocument)
? void 0
: $jscomp$optchain$tmp1980021184$1.defaultView)
: $jscomp$optchain$tmpm1778796256$1.defaultView)
? $jscomp$nullish$tmp0
: window;
for (
$jscomp$optchain$tmp1980021184$1 = getActiveElement(
$jscomp$optchain$tmpm1778796256$1 = getActiveElement(
containerInfo.document
);
$jscomp$optchain$tmp1980021184$1 instanceof
$jscomp$optchain$tmpm1778796256$1 instanceof
containerInfo.HTMLIFrameElement;

) {
try {
var JSCompiler_inline_result =
"string" ===
typeof $jscomp$optchain$tmp1980021184$1.contentWindow.location.href;
typeof $jscomp$optchain$tmpm1778796256$1.contentWindow.location
.href;
} catch (err) {
JSCompiler_inline_result = !1;
}
if (JSCompiler_inline_result)
containerInfo = $jscomp$optchain$tmp1980021184$1.contentWindow;
containerInfo = $jscomp$optchain$tmpm1778796256$1.contentWindow;
else break;
$jscomp$optchain$tmp1980021184$1 = getActiveElement(
$jscomp$optchain$tmpm1778796256$1 = getActiveElement(
containerInfo.document
);
}
return $jscomp$optchain$tmp1980021184$1;
return $jscomp$optchain$tmpm1778796256$1;
}
function hasSelectionCapabilities(elem) {
var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase();
Expand Down Expand Up @@ -26891,11 +26893,11 @@ __DEV__ &&
return_targetInst = null;
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-www-modern-5e83d9ab-20240918" !== isomorphicReactPackageVersion)
if ("19.0.0-www-modern-b521ef8a-20240918" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-www-modern-5e83d9ab-20240918\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-www-modern-b521ef8a-20240918\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -26938,11 +26940,11 @@ __DEV__ &&
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-modern-5e83d9ab-20240918",
version: "19.0.0-www-modern-b521ef8a-20240918",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-5e83d9ab-20240918"
reconcilerVersion: "19.0.0-www-modern-b521ef8a-20240918"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -27547,7 +27549,7 @@ __DEV__ &&
exports.useFormStatus = function () {
return resolveDispatcher().useHostTransitionStatus();
};
exports.version = "19.0.0-www-modern-5e83d9ab-20240918";
exports.version = "19.0.0-www-modern-b521ef8a-20240918";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
Loading

0 comments on commit 8bc2b9c

Please sign in to comment.