From 9a5ab9e36625e6bf6ffa056ff1c2c0feaa0e2d83 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Thu, 27 Aug 2020 17:50:49 -0700 Subject: [PATCH] EventEmitter: Default Export `{Native,RCTDevice}EventEmitter` Summary: Refactors `NativeEventEmitter` and `RCTDeviceEventEmitter` to be default exports. Changelog: [Internal] Reviewed By: RSNara Differential Revision: D22203918 fbshipit-source-id: 575b2baf1604d1a8a1bffd6d108c12f3f8415e0a --- Libraries/Core/setUpBatchedBridge.js | 5 +++-- Libraries/EventEmitter/NativeEventEmitter.js | 4 +--- Libraries/EventEmitter/RCTDeviceEventEmitter.js | 2 +- Libraries/EventEmitter/__mocks__/NativeEventEmitter.js | 4 +--- index.js | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Libraries/Core/setUpBatchedBridge.js b/Libraries/Core/setUpBatchedBridge.js index d718f3c8355..49747fd7576 100644 --- a/Libraries/Core/setUpBatchedBridge.js +++ b/Libraries/Core/setUpBatchedBridge.js @@ -26,8 +26,9 @@ registerModule('SamplingProfiler', () => require('../Performance/SamplingProfiler'), ); registerModule('RCTLog', () => require('../Utilities/RCTLog')); -registerModule('RCTDeviceEventEmitter', () => - require('../EventEmitter/RCTDeviceEventEmitter'), +registerModule( + 'RCTDeviceEventEmitter', + () => require('../EventEmitter/RCTDeviceEventEmitter').default, ); registerModule('RCTNativeAppEventEmitter', () => require('../EventEmitter/RCTNativeAppEventEmitter'), diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js index 606821725eb..23557f71a4b 100644 --- a/Libraries/EventEmitter/NativeEventEmitter.js +++ b/Libraries/EventEmitter/NativeEventEmitter.js @@ -26,7 +26,7 @@ type NativeModule = { * Abstract base class for implementing event-emitting modules. This implements * a subset of the standard EventEmitter node module API. */ -class NativeEventEmitter extends EventEmitter { +export default class NativeEventEmitter extends EventEmitter { _nativeModule: ?NativeModule; constructor(nativeModule: ?NativeModule) { @@ -64,5 +64,3 @@ class NativeEventEmitter extends EventEmitter { super.removeSubscription(subscription); } } - -module.exports = NativeEventEmitter; diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js index 8c0f0232875..39e456b8096 100644 --- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js +++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js @@ -80,4 +80,4 @@ class RCTDeviceEventEmitter extends EventEmitter { } } -module.exports = (new RCTDeviceEventEmitter(): RCTDeviceEventEmitter); +export default (new RCTDeviceEventEmitter(): RCTDeviceEventEmitter); diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js index 35f46742abe..cf812706d02 100644 --- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js +++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js @@ -16,10 +16,8 @@ import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter'; /** * Mock the NativeEventEmitter as a normal JS EventEmitter. */ -class NativeEventEmitter extends EventEmitter { +export default class NativeEventEmitter extends EventEmitter { constructor() { super(RCTDeviceEventEmitter.sharedSubscriber); } } - -module.exports = NativeEventEmitter; diff --git a/index.js b/index.js index 43a866ff770..63c1d5f96fd 100644 --- a/index.js +++ b/index.js @@ -368,7 +368,7 @@ module.exports = { .default; }, get NativeEventEmitter(): NativeEventEmitter { - return require('./Libraries/EventEmitter/NativeEventEmitter'); + return require('./Libraries/EventEmitter/NativeEventEmitter').default; }, get Networking(): Networking { return require('./Libraries/Network/RCTNetworking'); @@ -448,7 +448,7 @@ module.exports = { // Plugins get DeviceEventEmitter(): RCTDeviceEventEmitter { - return require('./Libraries/EventEmitter/RCTDeviceEventEmitter'); + return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default; }, get NativeAppEventEmitter(): RCTNativeAppEventEmitter { return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter');