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

Author: hoxyq

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__;

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);
 }

packages/react-devtools-shared/src/__tests__/componentStacks-test.js

@@ -7,27 +7,17 @@
  * @flow
  */
 
-import {getVersionedRenderImplementation, normalizeCodeLocInfo} from './utils';
+import {
+  getVersionedRenderImplementation,
+  normalizeCodeLocInfo,
+} from 'react-devtools-shared/src/__tests__/utils';
 
 describe('component stack', () => {
   let React;
   let act;
-  let mockError;
-  let mockWarn;
   let supportsOwnerStacks;
 
   beforeEach(() => {
-    // Intercept native console methods before DevTools bootstraps.
-    // Normalize component stack locations.
-    mockError = jest.fn();
-    mockWarn = jest.fn();
-    console.error = (...args) => {
-      mockError(...args.map(normalizeCodeLocInfo));
-    };
-    console.warn = (...args) => {
-      mockWarn(...args.map(normalizeCodeLocInfo));
-    };
-
     const utils = require('./utils');
     act = utils.act;
 
@@ -54,18 +44,22 @@ describe('component stack', () => {
 
     act(() => render(<Grandparent />));
 
-    expect(mockError).toHaveBeenCalledWith(
+    expect(
+      global.consoleErrorMock.mock.calls[0].map(normalizeCodeLocInfo),
+    ).toEqual([
       'Test error.',
       '\n    in Child (at **)' +
         '\n    in Parent (at **)' +
         '\n    in Grandparent (at **)',
-    );
-    expect(mockWarn).toHaveBeenCalledWith(
+    ]);
+    expect(
+      global.consoleWarnMock.mock.calls[0].map(normalizeCodeLocInfo),
+    ).toEqual([
       'Test warning.',
       '\n    in Child (at **)' +
         '\n    in Parent (at **)' +
         '\n    in Grandparent (at **)',
-    );
+    ]);
   });
 
   // This test should have caught #19911
@@ -89,13 +83,15 @@ describe('component stack', () => {
 
     expect(useEffectCount).toBe(1);
 
-    expect(mockWarn).toHaveBeenCalledWith(
+    expect(
+      global.consoleWarnMock.mock.calls[0].map(normalizeCodeLocInfo),
+    ).toEqual([
       'Warning to trigger appended component stacks.',
       '\n    in Example (at **)',
-    );
+    ]);
   });
 
-  // @reactVersion >=18.3
+  // @reactVersion >= 18.3
   it('should log the current component stack with debug info from promises', () => {
     const Child = () => {
       console.error('Test error.');
@@ -117,23 +113,27 @@ describe('component stack', () => {
 
     act(() => render(<Grandparent />));
 
-    expect(mockError).toHaveBeenCalledWith(
+    expect(
+      global.consoleErrorMock.mock.calls[0].map(normalizeCodeLocInfo),
+    ).toEqual([
       'Test error.',
       supportsOwnerStacks
         ? '\n    in Child (at **)'
         : '\n    in Child (at **)' +
-            '\n    in ServerComponent (at **)' +
-            '\n    in Parent (at **)' +
-            '\n    in Grandparent (at **)',
-    );
-    expect(mockWarn).toHaveBeenCalledWith(
+          '\n    in ServerComponent (at **)' +
+          '\n    in Parent (at **)' +
+          '\n    in Grandparent (at **)',
+    ]);
+    expect(
+      global.consoleWarnMock.mock.calls[0].map(normalizeCodeLocInfo),
+    ).toEqual([
       'Test warning.',
       supportsOwnerStacks
         ? '\n    in Child (at **)'
         : '\n    in Child (at **)' +
-            '\n    in ServerComponent (at **)' +
-            '\n    in Parent (at **)' +
-            '\n    in Grandparent (at **)',
-    );
+          '\n    in ServerComponent (at **)' +
+          '\n    in Parent (at **)' +
+          '\n    in Grandparent (at **)',
+    ]);
   });
 });