ESM LogBox

Summary: Changelog: [General][Changed] - ESM Logbox Reviewed By: yungsters Differential Revision: D42202344 fbshipit-source-id: 8b09fb261c61bd3fb3ab8df66e5732046187cdd8
facebook · Jan 4, 2023 · 9af5c33 · 9af5c33
1 parent b606449
commit 9af5c33
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
@@ -103,7 +103,7 @@ function reportException(
   }
 
   if (__DEV__) {
-    const LogBox = require('../LogBox/LogBox');
+    const LogBox = require('../LogBox/LogBox').default;
     LogBox.addException({
       ...data,
       isComponentError: !!e.isComponentError,

diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
@@ -40,7 +40,7 @@ require('./setUpSegmentFetcher');
 if (__DEV__) {
   require('./checkNativeVersion');
   require('./setUpDeveloperTools');
-  require('../LogBox/LogBox').install();
+  require('../LogBox/LogBox').default.install();
 }
 
 require('../ReactNative/AppRegistry');

diff --git a/Libraries/Core/__tests__/ExceptionsManager-test.js b/Libraries/Core/__tests__/ExceptionsManager-test.js
@@ -10,7 +10,8 @@
 
 'use strict';
 
-const LogBox = require('../../LogBox/LogBox');
+import LogBox from '../../LogBox/LogBox';
+
 const ExceptionsManager = require('../ExceptionsManager');
 const NativeExceptionsManager = require('../NativeExceptionsManager').default;
 const ReactFiberErrorDialog = require('../ReactFiberErrorDialog').default;
@@ -57,9 +58,12 @@ function runExceptionsManagerTests() {
     let logBoxAddException;
 
     beforeEach(() => {
+      logBoxAddException = jest.fn();
       jest.resetModules();
       jest.mock('../../LogBox/LogBox', () => ({
-        addException: jest.fn(),
+        default: {
+          addException: logBoxAddException,
+        },
       }));
       jest.mock('../NativeExceptionsManager', () => {
         return {
@@ -80,7 +84,6 @@ function runExceptionsManagerTests() {
       );
       jest.spyOn(console, 'error').mockReturnValue(undefined);
       nativeReportException = NativeExceptionsManager.reportException;
-      logBoxAddException = LogBox.addException;
     });
 
     afterEach(() => {

diff --git a/Libraries/LogBox/LogBox.js b/Libraries/LogBox/LogBox.js
@@ -258,4 +258,4 @@ if (__DEV__) {
   };
 }
 
-module.exports = (LogBox: ILogBox);
+export default (LogBox: ILogBox);
diff --git a/Libraries/LogBox/__tests__/LogBox-test.js b/Libraries/LogBox/__tests__/LogBox-test.js
@@ -12,7 +12,7 @@
 'use strict';
 
 const LogBoxData = require('../Data/LogBoxData');
-const LogBox = require('../LogBox');
+const LogBox = require('../LogBox').default;
 
 declare var console: any;
 

diff --git a/Libraries/YellowBox/YellowBoxDeprecated.js b/Libraries/YellowBox/YellowBoxDeprecated.js
@@ -12,7 +12,8 @@
 
 import type {IgnorePattern} from '../LogBox/Data/LogBoxData';
 
-const LogBox = require('../LogBox/LogBox');
+import LogBox from '../LogBox/LogBox';
+
 const React = require('react');
 
 type Props = $ReadOnly<{||}>;

diff --git a/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js b/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-const LogBox = require('../../LogBox/LogBox');
+import LogBox from '../../LogBox/LogBox';
+
 const YellowBox = require('../YellowBoxDeprecated');
 
 describe('YellowBox', () => {

diff --git a/index.js b/index.js
@@ -282,7 +282,7 @@ module.exports = {
     return require('./Libraries/Linking/Linking');
   },
   get LogBox(): LogBox {
-    return require('./Libraries/LogBox/LogBox');
+    return require('./Libraries/LogBox/LogBox').default;
   },
   get NativeDialogManagerAndroid(): NativeDialogManagerAndroid {
     return require('./Libraries/NativeModules/specs/NativeDialogManagerAndroid')