refactor[react-devtools]: move console patching to global hook

facebook · Sep 12, 2024 · d66e91a · d66e91a
1 parent 1fcf116
commit d66e91a
Show file tree

Hide file tree

Showing 10 changed files with 265 additions and 588 deletions.
diff --git a/packages/react-devtools-core/src/backend.js b/packages/react-devtools-core/src/backend.js
@@ -11,7 +11,6 @@ import Agent from 'react-devtools-shared/src/backend/agent';
 import Bridge from 'react-devtools-shared/src/bridge';
 import {installHook} from 'react-devtools-shared/src/hook';
 import {initBackend} from 'react-devtools-shared/src/backend';
-import {installConsoleFunctionsToWindow} from 'react-devtools-shared/src/backend/console';
 import {__DEBUG__} from 'react-devtools-shared/src/constants';
 import setupNativeStyleEditor from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor';
 import {getDefaultComponentFilters} from 'react-devtools-shared/src/utils';
@@ -41,9 +40,6 @@ type ConnectOptions = {
   devToolsSettingsManager: ?DevToolsSettingsManager,
 };
 
-// Install a global variable to allow patching console early (during injection).
-// This provides React Native developers with components stacks even if they don't run DevTools.
-installConsoleFunctionsToWindow();
 installHook(window);
 
 const hook: ?DevToolsHook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;

diff --git a/packages/react-devtools-inline/src/backend.js b/packages/react-devtools-inline/src/backend.js
@@ -3,7 +3,6 @@
 import Agent from 'react-devtools-shared/src/backend/agent';
 import Bridge from 'react-devtools-shared/src/bridge';
 import {initBackend} from 'react-devtools-shared/src/backend';
-import {installConsoleFunctionsToWindow} from 'react-devtools-shared/src/backend/console';
 import {installHook} from 'react-devtools-shared/src/hook';
 import setupNativeStyleEditor from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor';
 
@@ -120,8 +119,5 @@ export function createBridge(contentWindow: any, wall?: Wall): BackendBridge {
 }
 
 export function initialize(contentWindow: any): void {
-  // Install a global variable to allow patching console early (during injection).
-  // This provides React Native developers with components stacks even if they don't run DevTools.
-  installConsoleFunctionsToWindow();
   installHook(contentWindow);
 }
diff --git a/packages/react-devtools-shared/src/backend/agent.js b/packages/react-devtools-shared/src/backend/agent.js
@@ -24,7 +24,6 @@ import {
   initialize as setupTraceUpdates,
   toggleEnabled as setTraceUpdatesEnabled,
 } from './views/TraceUpdates';
-import {patch as patchConsole} from './console';
 import {currentBridgeProtocol} from 'react-devtools-shared/src/bridge';
 
 import type {BackendBridge} from 'react-devtools-shared/src/bridge';
@@ -36,7 +35,6 @@ import type {
   PathMatch,
   RendererID,
   RendererInterface,
-  ConsolePatchSettings,
   DevToolsHookSettings,
 } from './types';
 import type {ComponentFilter} from 'react-devtools-shared/src/frontend/types';
@@ -805,7 +803,7 @@ export default class Agent extends EventEmitter<{
   };
 
   updateConsolePatchSettings: (
-    settings: $ReadOnly<ConsolePatchSettings>,
+    settings: $ReadOnly<DevToolsHookSettings>,
   ) => void = settings => {
     // Propagate the settings, so Backend can subscribe to it and modify hook
     this.emit('updateHookSettings', {
@@ -814,12 +812,6 @@ export default class Agent extends EventEmitter<{
       showInlineWarningsAndErrors: settings.showInlineWarningsAndErrors,
       hideConsoleLogsInStrictMode: settings.hideConsoleLogsInStrictMode,
     });
-
-    // If the frontend preferences have changed,
-    // or in the case of React Native- if the backend is just finding out the preferences-
-    // then reinstall the console overrides.
-    // It's safe to call `patchConsole` multiple times.
-    patchConsole(settings);
   };
 
   updateComponentFilters: (componentFilters: Array<ComponentFilter>) => void =