From 7fbde0b84e111d151086cec792ef78f7ce08353b Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Thu, 28 Apr 2016 13:41:37 +0100 Subject: [PATCH 1/2] Move ReactIOS components to ReactNative --- .../NativeMethodsMixin.js | 0 .../ReactNativeBridgeEventPlugin.js} | 6 +++--- .../ReactNative/ReactNativeDefaultInjection.js | 14 +++++++------- .../ReactNativeEventPluginOrder.js} | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) rename src/renderers/native/{ReactIOS => ReactNative}/NativeMethodsMixin.js (100%) rename src/renderers/native/{ReactIOS/IOSNativeBridgeEventPlugin.js => ReactNative/ReactNativeBridgeEventPlugin.js} (93%) rename src/renderers/native/{ReactIOS/IOSDefaultEventPluginOrder.js => ReactNative/ReactNativeEventPluginOrder.js} (69%) diff --git a/src/renderers/native/ReactIOS/NativeMethodsMixin.js b/src/renderers/native/ReactNative/NativeMethodsMixin.js similarity index 100% rename from src/renderers/native/ReactIOS/NativeMethodsMixin.js rename to src/renderers/native/ReactNative/NativeMethodsMixin.js diff --git a/src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js b/src/renderers/native/ReactNative/ReactNativeBridgeEventPlugin.js similarity index 93% rename from src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js rename to src/renderers/native/ReactNative/ReactNativeBridgeEventPlugin.js index 7cc595d5d939..97c6496c6a25 100644 --- a/src/renderers/native/ReactIOS/IOSNativeBridgeEventPlugin.js +++ b/src/renderers/native/ReactNative/ReactNativeBridgeEventPlugin.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule IOSNativeBridgeEventPlugin + * @providesModule ReactNativeBridgeEventPlugin * @flow */ 'use strict'; @@ -35,7 +35,7 @@ for (var directTypeName in customDirectEventTypes) { allTypesByEventName[directTypeName] = customDirectEventTypes[directTypeName]; } -var IOSNativeBridgeEventPlugin = { +var ReactNativeBridgeEventPlugin = { eventTypes: { ...customBubblingEventTypes, ...customDirectEventTypes }, @@ -67,4 +67,4 @@ var IOSNativeBridgeEventPlugin = { }, }; -module.exports = IOSNativeBridgeEventPlugin; +module.exports = ReactNativeBridgeEventPlugin; diff --git a/src/renderers/native/ReactNative/ReactNativeDefaultInjection.js b/src/renderers/native/ReactNative/ReactNativeDefaultInjection.js index c0c5fd20734c..21fc07ba88cc 100644 --- a/src/renderers/native/ReactNative/ReactNativeDefaultInjection.js +++ b/src/renderers/native/ReactNative/ReactNativeDefaultInjection.js @@ -20,18 +20,18 @@ require('InitializeJavaScriptAppEngine'); var EventPluginHub = require('EventPluginHub'); var EventPluginUtils = require('EventPluginUtils'); -var IOSDefaultEventPluginOrder = require('IOSDefaultEventPluginOrder'); -var IOSNativeBridgeEventPlugin = require('IOSNativeBridgeEventPlugin'); -var ReactElement = require('ReactElement'); var ReactComponentEnvironment = require('ReactComponentEnvironment'); var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); +var ReactElement = require('ReactElement'); var ReactEmptyComponent = require('ReactEmptyComponent'); +var ReactNativeBridgeEventPlugin = require('ReactNativeBridgeEventPlugin'); +var ReactNativeComponent = require('ReactNativeComponent'); var ReactNativeComponentEnvironment = require('ReactNativeComponentEnvironment'); +var ReactNativeComponentTree = require('ReactNativeComponentTree'); +var ReactNativeEventPluginOrder = require('ReactNativeEventPluginOrder'); var ReactNativeGlobalResponderHandler = require('ReactNativeGlobalResponderHandler'); var ReactNativeTextComponent = require('ReactNativeTextComponent'); var ReactNativeTreeTraversal = require('ReactNativeTreeTraversal'); -var ReactNativeComponent = require('ReactNativeComponent'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent'); var ReactUpdates = require('ReactUpdates'); var ResponderEventPlugin = require('ResponderEventPlugin'); @@ -47,7 +47,7 @@ function inject() { /** * Inject module for resolving DOM hierarchy and plugin ordering. */ - EventPluginHub.injection.injectEventPluginOrder(IOSDefaultEventPluginOrder); + EventPluginHub.injection.injectEventPluginOrder(ReactNativeEventPluginOrder); EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree); EventPluginUtils.injection.injectTreeTraversal(ReactNativeTreeTraversal); @@ -61,7 +61,7 @@ function inject() { */ EventPluginHub.injection.injectEventPluginsByName({ 'ResponderEventPlugin': ResponderEventPlugin, - 'IOSNativeBridgeEventPlugin': IOSNativeBridgeEventPlugin, + 'ReactNativeBridgeEventPlugin': ReactNativeBridgeEventPlugin, }); ReactUpdates.injection.injectReconcileTransaction( diff --git a/src/renderers/native/ReactIOS/IOSDefaultEventPluginOrder.js b/src/renderers/native/ReactNative/ReactNativeEventPluginOrder.js similarity index 69% rename from src/renderers/native/ReactIOS/IOSDefaultEventPluginOrder.js rename to src/renderers/native/ReactNative/ReactNativeEventPluginOrder.js index eae211c40fce..b1b5f66d1108 100644 --- a/src/renderers/native/ReactIOS/IOSDefaultEventPluginOrder.js +++ b/src/renderers/native/ReactNative/ReactNativeEventPluginOrder.js @@ -6,14 +6,14 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule IOSDefaultEventPluginOrder + * @providesModule ReactNativeEventPluginOrder * @flow */ 'use strict'; -var IOSDefaultEventPluginOrder = [ +var ReactNativeEventPluginOrder = [ 'ResponderEventPlugin', - 'IOSNativeBridgeEventPlugin', + 'ReactNativeBridgeEventPlugin', ]; -module.exports = IOSDefaultEventPluginOrder; +module.exports = ReactNativeEventPluginOrder; From 115ecf7a275c2905009c0777ed869adb50accf2e Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 3 May 2016 13:57:11 +0100 Subject: [PATCH 2/2] Drop ReactNative subfolder --- src/renderers/native/{ReactNative => }/NativeMethodsMixin.js | 0 src/renderers/native/{ReactNative => }/ReactNative.js | 0 .../native/{ReactNative => }/ReactNativeAttributePayload.js | 0 .../native/{ReactNative => }/ReactNativeBaseComponent.js | 0 .../native/{ReactNative => }/ReactNativeBridgeEventPlugin.js | 0 .../native/{ReactNative => }/ReactNativeComponentEnvironment.js | 0 .../native/{ReactNative => }/ReactNativeComponentTree.js | 0 .../native/{ReactNative => }/ReactNativeContainerInfo.js | 0 .../native/{ReactNative => }/ReactNativeDOMIDOperations.js | 0 .../native/{ReactNative => }/ReactNativeDefaultInjection.js | 0 src/renderers/native/{ReactNative => }/ReactNativeEventEmitter.js | 0 .../native/{ReactNative => }/ReactNativeEventPluginOrder.js | 0 .../native/{ReactNative => }/ReactNativeGlobalResponderHandler.js | 0 src/renderers/native/{ReactNative => }/ReactNativeMount.js | 0 src/renderers/native/{ReactNative => }/ReactNativePropRegistry.js | 0 .../native/{ReactNative => }/ReactNativeReconcileTransaction.js | 0 src/renderers/native/{ReactNative => }/ReactNativeTagHandles.js | 0 .../native/{ReactNative => }/ReactNativeTextComponent.js | 0 .../native/{ReactNative => }/ReactNativeTreeTraversal.js | 0 .../{ReactNative => }/__mocks__/InitializeJavaScriptAppEngine.js | 0 .../native/{ReactNative => }/__mocks__/JSTimersExecution.js | 0 .../native/{ReactNative => }/__mocks__/RCTEventEmitter.js | 0 src/renderers/native/{ReactNative => }/__mocks__/RCTLog.js | 0 .../native/{ReactNative => }/__mocks__/TextInputState.js | 0 src/renderers/native/{ReactNative => }/__mocks__/UIManager.js | 0 src/renderers/native/{ReactNative => }/__mocks__/View.js | 0 src/renderers/native/{ReactNative => }/__mocks__/deepDiffer.js | 0 .../__mocks__/deepFreezeAndThrowOnMutationInDev.js | 0 src/renderers/native/{ReactNative => }/__mocks__/flattenStyle.js | 0 .../__tests__/ReactNativeAttributePayload-test.js | 0 .../native/{ReactNative => }/__tests__/ReactNativeMount-test.js | 0 .../native/{ReactNative => }/createReactNativeComponentClass.js | 0 src/renderers/native/{ReactNative => }/findNodeHandle.js | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename src/renderers/native/{ReactNative => }/NativeMethodsMixin.js (100%) rename src/renderers/native/{ReactNative => }/ReactNative.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeAttributePayload.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeBaseComponent.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeBridgeEventPlugin.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeComponentEnvironment.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeComponentTree.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeContainerInfo.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeDOMIDOperations.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeDefaultInjection.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeEventEmitter.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeEventPluginOrder.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeGlobalResponderHandler.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeMount.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativePropRegistry.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeReconcileTransaction.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeTagHandles.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeTextComponent.js (100%) rename src/renderers/native/{ReactNative => }/ReactNativeTreeTraversal.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/InitializeJavaScriptAppEngine.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/JSTimersExecution.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/RCTEventEmitter.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/RCTLog.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/TextInputState.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/UIManager.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/View.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/deepDiffer.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/deepFreezeAndThrowOnMutationInDev.js (100%) rename src/renderers/native/{ReactNative => }/__mocks__/flattenStyle.js (100%) rename src/renderers/native/{ReactNative => }/__tests__/ReactNativeAttributePayload-test.js (100%) rename src/renderers/native/{ReactNative => }/__tests__/ReactNativeMount-test.js (100%) rename src/renderers/native/{ReactNative => }/createReactNativeComponentClass.js (100%) rename src/renderers/native/{ReactNative => }/findNodeHandle.js (100%) diff --git a/src/renderers/native/ReactNative/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js similarity index 100% rename from src/renderers/native/ReactNative/NativeMethodsMixin.js rename to src/renderers/native/NativeMethodsMixin.js diff --git a/src/renderers/native/ReactNative/ReactNative.js b/src/renderers/native/ReactNative.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNative.js rename to src/renderers/native/ReactNative.js diff --git a/src/renderers/native/ReactNative/ReactNativeAttributePayload.js b/src/renderers/native/ReactNativeAttributePayload.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeAttributePayload.js rename to src/renderers/native/ReactNativeAttributePayload.js diff --git a/src/renderers/native/ReactNative/ReactNativeBaseComponent.js b/src/renderers/native/ReactNativeBaseComponent.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeBaseComponent.js rename to src/renderers/native/ReactNativeBaseComponent.js diff --git a/src/renderers/native/ReactNative/ReactNativeBridgeEventPlugin.js b/src/renderers/native/ReactNativeBridgeEventPlugin.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeBridgeEventPlugin.js rename to src/renderers/native/ReactNativeBridgeEventPlugin.js diff --git a/src/renderers/native/ReactNative/ReactNativeComponentEnvironment.js b/src/renderers/native/ReactNativeComponentEnvironment.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeComponentEnvironment.js rename to src/renderers/native/ReactNativeComponentEnvironment.js diff --git a/src/renderers/native/ReactNative/ReactNativeComponentTree.js b/src/renderers/native/ReactNativeComponentTree.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeComponentTree.js rename to src/renderers/native/ReactNativeComponentTree.js diff --git a/src/renderers/native/ReactNative/ReactNativeContainerInfo.js b/src/renderers/native/ReactNativeContainerInfo.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeContainerInfo.js rename to src/renderers/native/ReactNativeContainerInfo.js diff --git a/src/renderers/native/ReactNative/ReactNativeDOMIDOperations.js b/src/renderers/native/ReactNativeDOMIDOperations.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeDOMIDOperations.js rename to src/renderers/native/ReactNativeDOMIDOperations.js diff --git a/src/renderers/native/ReactNative/ReactNativeDefaultInjection.js b/src/renderers/native/ReactNativeDefaultInjection.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeDefaultInjection.js rename to src/renderers/native/ReactNativeDefaultInjection.js diff --git a/src/renderers/native/ReactNative/ReactNativeEventEmitter.js b/src/renderers/native/ReactNativeEventEmitter.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeEventEmitter.js rename to src/renderers/native/ReactNativeEventEmitter.js diff --git a/src/renderers/native/ReactNative/ReactNativeEventPluginOrder.js b/src/renderers/native/ReactNativeEventPluginOrder.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeEventPluginOrder.js rename to src/renderers/native/ReactNativeEventPluginOrder.js diff --git a/src/renderers/native/ReactNative/ReactNativeGlobalResponderHandler.js b/src/renderers/native/ReactNativeGlobalResponderHandler.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeGlobalResponderHandler.js rename to src/renderers/native/ReactNativeGlobalResponderHandler.js diff --git a/src/renderers/native/ReactNative/ReactNativeMount.js b/src/renderers/native/ReactNativeMount.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeMount.js rename to src/renderers/native/ReactNativeMount.js diff --git a/src/renderers/native/ReactNative/ReactNativePropRegistry.js b/src/renderers/native/ReactNativePropRegistry.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativePropRegistry.js rename to src/renderers/native/ReactNativePropRegistry.js diff --git a/src/renderers/native/ReactNative/ReactNativeReconcileTransaction.js b/src/renderers/native/ReactNativeReconcileTransaction.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeReconcileTransaction.js rename to src/renderers/native/ReactNativeReconcileTransaction.js diff --git a/src/renderers/native/ReactNative/ReactNativeTagHandles.js b/src/renderers/native/ReactNativeTagHandles.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeTagHandles.js rename to src/renderers/native/ReactNativeTagHandles.js diff --git a/src/renderers/native/ReactNative/ReactNativeTextComponent.js b/src/renderers/native/ReactNativeTextComponent.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeTextComponent.js rename to src/renderers/native/ReactNativeTextComponent.js diff --git a/src/renderers/native/ReactNative/ReactNativeTreeTraversal.js b/src/renderers/native/ReactNativeTreeTraversal.js similarity index 100% rename from src/renderers/native/ReactNative/ReactNativeTreeTraversal.js rename to src/renderers/native/ReactNativeTreeTraversal.js diff --git a/src/renderers/native/ReactNative/__mocks__/InitializeJavaScriptAppEngine.js b/src/renderers/native/__mocks__/InitializeJavaScriptAppEngine.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/InitializeJavaScriptAppEngine.js rename to src/renderers/native/__mocks__/InitializeJavaScriptAppEngine.js diff --git a/src/renderers/native/ReactNative/__mocks__/JSTimersExecution.js b/src/renderers/native/__mocks__/JSTimersExecution.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/JSTimersExecution.js rename to src/renderers/native/__mocks__/JSTimersExecution.js diff --git a/src/renderers/native/ReactNative/__mocks__/RCTEventEmitter.js b/src/renderers/native/__mocks__/RCTEventEmitter.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/RCTEventEmitter.js rename to src/renderers/native/__mocks__/RCTEventEmitter.js diff --git a/src/renderers/native/ReactNative/__mocks__/RCTLog.js b/src/renderers/native/__mocks__/RCTLog.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/RCTLog.js rename to src/renderers/native/__mocks__/RCTLog.js diff --git a/src/renderers/native/ReactNative/__mocks__/TextInputState.js b/src/renderers/native/__mocks__/TextInputState.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/TextInputState.js rename to src/renderers/native/__mocks__/TextInputState.js diff --git a/src/renderers/native/ReactNative/__mocks__/UIManager.js b/src/renderers/native/__mocks__/UIManager.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/UIManager.js rename to src/renderers/native/__mocks__/UIManager.js diff --git a/src/renderers/native/ReactNative/__mocks__/View.js b/src/renderers/native/__mocks__/View.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/View.js rename to src/renderers/native/__mocks__/View.js diff --git a/src/renderers/native/ReactNative/__mocks__/deepDiffer.js b/src/renderers/native/__mocks__/deepDiffer.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/deepDiffer.js rename to src/renderers/native/__mocks__/deepDiffer.js diff --git a/src/renderers/native/ReactNative/__mocks__/deepFreezeAndThrowOnMutationInDev.js b/src/renderers/native/__mocks__/deepFreezeAndThrowOnMutationInDev.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/deepFreezeAndThrowOnMutationInDev.js rename to src/renderers/native/__mocks__/deepFreezeAndThrowOnMutationInDev.js diff --git a/src/renderers/native/ReactNative/__mocks__/flattenStyle.js b/src/renderers/native/__mocks__/flattenStyle.js similarity index 100% rename from src/renderers/native/ReactNative/__mocks__/flattenStyle.js rename to src/renderers/native/__mocks__/flattenStyle.js diff --git a/src/renderers/native/ReactNative/__tests__/ReactNativeAttributePayload-test.js b/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js similarity index 100% rename from src/renderers/native/ReactNative/__tests__/ReactNativeAttributePayload-test.js rename to src/renderers/native/__tests__/ReactNativeAttributePayload-test.js diff --git a/src/renderers/native/ReactNative/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js similarity index 100% rename from src/renderers/native/ReactNative/__tests__/ReactNativeMount-test.js rename to src/renderers/native/__tests__/ReactNativeMount-test.js diff --git a/src/renderers/native/ReactNative/createReactNativeComponentClass.js b/src/renderers/native/createReactNativeComponentClass.js similarity index 100% rename from src/renderers/native/ReactNative/createReactNativeComponentClass.js rename to src/renderers/native/createReactNativeComponentClass.js diff --git a/src/renderers/native/ReactNative/findNodeHandle.js b/src/renderers/native/findNodeHandle.js similarity index 100% rename from src/renderers/native/ReactNative/findNodeHandle.js rename to src/renderers/native/findNodeHandle.js