Use spread instead of deprecated merge utility (#6634)

(cherry picked from commit 72ba597)
facebook · May 3, 2016 · 64acaca · 64acaca
1 parent 0008beb
commit 64acaca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js b/src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js
@@ -15,7 +15,6 @@ var EventPropagators = require('EventPropagators');
 var SyntheticEvent = require('SyntheticEvent');
 var UIManager = require('UIManager');
 
-var merge = require('merge');
 var warning = require('warning');
 
 var customBubblingEventTypes = UIManager.customBubblingEventTypes;
@@ -38,7 +37,7 @@ for (var directTypeName in customDirectEventTypes) {
 
 var IOSNativeBridgeEventPlugin = {
 
-  eventTypes: merge(customBubblingEventTypes, customDirectEventTypes),
+  eventTypes: { ...customBubblingEventTypes, ...customDirectEventTypes },
 
   /**
    * @see {EventPluginHub.extractEvents}

diff --git a/src/renderers/native/ReactNative/ReactNativeEventEmitter.js b/src/renderers/native/ReactNative/ReactNativeEventEmitter.js
@@ -19,7 +19,6 @@ var ReactNativeTagHandles = require('ReactNativeTagHandles');
 var ReactUpdates = require('ReactUpdates');
 var EventConstants = require('EventConstants');
 
-var merge = require('merge');
 var warning = require('warning');
 
 var topLevelTypes = EventConstants.topLevelTypes;
@@ -91,7 +90,9 @@ var removeTouchesAtIndices = function(
  *
  * @internal
  */
-var ReactNativeEventEmitter = merge(ReactEventEmitterMixin, {
+var ReactNativeEventEmitter = {
+
+  ...ReactEventEmitterMixin,
 
   registrationNames: EventPluginRegistry.registrationNameModules,
 
@@ -218,6 +219,6 @@ var ReactNativeEventEmitter = merge(ReactEventEmitterMixin, {
       );
     }
   },
-});
+};
 
 module.exports = ReactNativeEventEmitter;
diff --git a/src/renderers/native/ReactNative/__mocks__/merge.js b/src/renderers/native/ReactNative/__mocks__/merge.js