diff --git a/packages/react-native/Libraries/Core/setUpBatchedBridge.js b/packages/react-native/Libraries/Core/setUpBatchedBridge.js index 704a5feeb69..8f4d733714f 100644 --- a/packages/react-native/Libraries/Core/setUpBatchedBridge.js +++ b/packages/react-native/Libraries/Core/setUpBatchedBridge.js @@ -10,18 +10,7 @@ 'use strict'; -let registerModule; -if (global.RN$Bridgeless === true && global.RN$registerCallableModule) { - registerModule = global.RN$registerCallableModule; -} else { - const BatchedBridge = require('../BatchedBridge/BatchedBridge'); - registerModule = ( - moduleName: string, - /* $FlowFixMe[missing-local-annot] The type annotation(s) required by - * Flow's LTI update could not be added via codemod */ - factory, - ) => BatchedBridge.registerLazyCallableModule(moduleName, factory); -} +import registerModule from './registerCallableModule'; registerModule('Systrace', () => require('../Performance/Systrace')); if (!(global.RN$Bridgeless === true)) { diff --git a/packages/react-native/Libraries/EventEmitter/RCTEventEmitter.js b/packages/react-native/Libraries/EventEmitter/RCTEventEmitter.js index 27519d2d955..d191b20baaa 100644 --- a/packages/react-native/Libraries/EventEmitter/RCTEventEmitter.js +++ b/packages/react-native/Libraries/EventEmitter/RCTEventEmitter.js @@ -10,15 +10,11 @@ 'use strict'; -const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +import registerCallableModule from '../Core/registerCallableModule'; const RCTEventEmitter = { register(eventEmitter: any) { - if (global.RN$Bridgeless) { - global.RN$registerCallableModule('RCTEventEmitter', () => eventEmitter); - } else { - BatchedBridge.registerCallableModule('RCTEventEmitter', eventEmitter); - } + registerCallableModule('RCTEventEmitter', eventEmitter); }, };