[ReactNative] Strip prefixes from NativeModules keys

IntegrationTests/IntegrationTestHarnessTest.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var RCTTestModule = require('NativeModules').RCTTestModule;
+var RCTTestModule = require('NativeModules').TestModule;
 var React = require('react-native');
 var {
   Text,

Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-var { RCTActionSheetManager } = require('NativeModules');
+var RCTActionSheetManager = require('NativeModules').ActionSheetManager;
 
 var invariant = require('invariant');
 

Libraries/AdSupport/AdSupportIOS.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-var AdSupport = require('NativeModules').RCTAdSupport;
+var AdSupport = require('NativeModules').AdSupport;
 
 module.exports = {
   getAdvertisingId: function(onSuccess, onFailure) {

Libraries/Animation/Animation.js

@@ -6,7 +6,7 @@
  */
 'use strict';
 
-var { RCTAnimationManager } = require('NativeModules');
+var RCTAnimationManager = require('NativeModules').AnimationManager;
 var AnimationUtils = require('AnimationUtils');
 
 type EasingFunction = (t: number) => number;

Libraries/Animation/AnimationMixin.js

@@ -7,7 +7,7 @@
 'use strict';
 
 var AnimationUtils = require('AnimationUtils');
-var { RCTAnimationManager } = require('NativeModules');
+var RCTAnimationManager = require('NativeModules').AnimationManager;
 
 var invariant = require('invariant');
 

Libraries/Animation/LayoutAnimation.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var PropTypes = require('ReactPropTypes');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
 var keyMirror = require('keyMirror');

Libraries/AppState/AppState.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var NativeModules = require('NativeModules');
-var RCTAppState = NativeModules.RCTAppState;
+var RCTAppState = NativeModules.AppState;
 
 var AppState = {
 

Libraries/AppStateIOS/AppStateIOS.ios.js

@@ -7,7 +7,7 @@
 
 var NativeModules = require('NativeModules');
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
-var RCTAppState = NativeModules.RCTAppState;
+var RCTAppState = NativeModules.AppState;
 
 var logError = require('logError');
 

Libraries/BatchedBridge/BatchedBridgedModules/NativeModules.js

@@ -7,8 +7,8 @@
 
 var NativeModules = require('BatchedBridge').RemoteModules;
 
-var nativeModulePrefixDuplicator = require('nativeModulePrefixDuplicator');
+var nativeModulePrefixNormalizer = require('nativeModulePrefixNormalizer');
 
-nativeModulePrefixDuplicator(NativeModules);
+nativeModulePrefixNormalizer(NativeModules);
 
 module.exports = NativeModules;

Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-var RCTPOPAnimationManager = require('NativeModules').RCTPOPAnimationManager;
+var RCTPOPAnimationManager = require('NativeModules').POPAnimationManager;
 if (!RCTPOPAnimationManager) {
   // POP animation isn't available in the OSS fork - this is a temporary
   // workaround to enable its availability to be determined at runtime.

Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js

@@ -5,6 +5,6 @@
  */
 'use strict';
 
-var { RCTAlertManager } = require('NativeModules');
+var RCTAlertManager = require('NativeModules').AlertManager;
 
 module.exports = RCTAlertManager;

Libraries/CameraRoll/CameraRoll.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var ReactPropTypes = require('ReactPropTypes');
-var RCTCameraRollManager = require('NativeModules').RCTCameraRollManager;
+var RCTCameraRollManager = require('NativeModules').CameraRollManager;
 
 var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
 var deepFreezeAndThrowOnMutationInDev =

Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js

@@ -56,7 +56,7 @@ var ActivityIndicatorIOS = React.createClass({
 
   render: function() {
     var style = styles.sizeSmall;
-    var NativeConstants = NativeModules.RCTUIManager.UIActivityIndicatorView.Constants;
+    var NativeConstants = NativeModules.UIManager.UIActivityIndicatorView.Constants;
     var activityIndicatorViewStyle = NativeConstants.StyleWhite;
     if (this.props.size === 'large') {
       style = styles.sizeLarge;

Libraries/Components/DatePicker/DatePickerIOS.ios.js

@@ -11,7 +11,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var PropTypes = require('ReactPropTypes');
 var React = require('React');
 var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
-var RCTDatePickerIOSConsts = require('NativeModules').RCTUIManager.RCTDatePicker.Constants;
+var RCTDatePickerIOSConsts = require('NativeModules').UIManager.RCTDatePicker.Constants;
 var StyleSheet = require('StyleSheet');
 var View = require('View');
 

Libraries/Components/ListView/ListView.js

@@ -7,7 +7,7 @@
 
 var ListViewDataSource = require('ListViewDataSource');
 var React = require('React');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 var ScrollView = require('ScrollView');
 var ScrollResponder = require('ScrollResponder');
 var StaticRenderer = require('StaticRenderer');

Libraries/Components/Navigation/NavigatorIOS.ios.js

@@ -8,7 +8,7 @@
 var EventEmitter = require('EventEmitter');
 var React = require('React');
 var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
-var { RCTNavigatorManager } = require('NativeModules');
+var RCTNavigatorManager = require('NativeModules').NavigatorManager;
 var StyleSheet = require('StyleSheet');
 var StaticContainer = require('StaticContainer.react');
 var View = require('View');

Libraries/Components/ScrollResponder.js

@@ -11,8 +11,8 @@ var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 var Subscribable = require('Subscribable');
 var TextInputState = require('TextInputState');
 
-var RCTUIManager = NativeModules.RCTUIManager;
+var RCTUIManager = NativeModules.UIManager;
-var RCTUIManagerDeprecated = NativeModules.RCTUIManager;
+var RCTUIManagerDeprecated = NativeModules.UIManager;
 var RCTScrollViewConsts = RCTUIManager.RCTScrollView.Constants;
 
 var warning = require('warning');

Libraries/Components/ScrollView/ScrollView.js

@@ -8,12 +8,12 @@
 var EdgeInsetsPropType = require('EdgeInsetsPropType');
 var Platform = require('Platform');
 var PointPropType = require('PointPropType');
-var RCTScrollView = require('NativeModules').RCTUIManager.RCTScrollView;
+var RCTScrollView = require('NativeModules').UIManager.RCTScrollView;
 var RCTScrollViewConsts = RCTScrollView.Constants;
 var React = require('React');
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
 var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 var ScrollResponder = require('ScrollResponder');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');

Libraries/Components/StatusBar/StatusBarIOS.ios.js

@@ -6,7 +6,7 @@
  */
 'use strict';
 
-var { RCTStatusBarManager } = require('NativeModules');
+var RCTStatusBarManager = require('NativeModules').StatusBarManager;
 
 var StatusBarIOS = {
 

Libraries/Components/TextInput/TextInput.ios.js

@@ -8,7 +8,7 @@
 var DocumentSelectionState = require('DocumentSelectionState');
 var EventEmitter = require('EventEmitter');
 var NativeMethodsMixin = require('NativeMethodsMixin');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 var PropTypes = require('ReactPropTypes');
 var React = require('React');
 var ReactChildren = require('ReactChildren');

Libraries/Components/TextInput/TextInputState.js

@@ -9,7 +9,7 @@
  */
 'use strict';
 
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var TextInputState = {
    /**

Libraries/Components/WebView/WebView.android.js

@@ -16,7 +16,7 @@ var keyMirror = require('keyMirror');
 var merge = require('merge');
 
 var PropTypes = React.PropTypes;
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var RCT_WEBVIEW_REF = 'webview';
 

Libraries/Components/WebView/WebView.ios.js

@@ -17,7 +17,7 @@ var insetsDiffer = require('insetsDiffer');
 var merge = require('merge');
 
 var PropTypes = React.PropTypes;
-var { RCTWebViewManager } = require('NativeModules');
+var RCTWebViewManager = require('NativeModules').WebViewManager;
 
 var RCT_WEBVIEW_REF = 'webview';
 

Libraries/Geolocation/Geolocation.ios.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
-var RCTLocationObserver = require('NativeModules').RCTLocationObserver;
+var RCTLocationObserver = require('NativeModules').LocationObserver;
 
 var invariant = require('invariant');
 var logError = require('logError');

Libraries/Image/Image.ios.js

@@ -114,7 +114,7 @@ var Image = React.createClass({
       warning(RawImage === RCTStaticImage, 'tintColor style only supported on static images.');
     }
 
-    var contentModes = NativeModules.RCTUIManager.UIView.ContentMode;
+    var contentModes = NativeModules.UIManager.UIView.ContentMode;
     var resizeMode;
     if (style.resizeMode === ImageResizeMode.stretch) {
       resizeMode = contentModes.ScaleToFill;

Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js

@@ -60,7 +60,7 @@ function setupDocumentShim() {
 var sourceMapPromise;
 
 function handleErrorWithRedBox(e) {
-  var RCTExceptionsManager = require('NativeModules').RCTExceptionsManager;
+  var RCTExceptionsManager = require('NativeModules').ExceptionsManager;
   var errorToString = require('errorToString');
   var loadSourceMap = require('loadSourceMap');
 
@@ -115,7 +115,7 @@ function setupTimers() {
 }
 
 function setupAlert() {
-  var { RCTAlertManager } = require('NativeModules');
+  var RCTAlertManager = require('NativeModules').AlertManager;
   if (!GLOBAL.alert) {
     GLOBAL.alert = function(text) {
       var alertOpts = {

Libraries/JavaScriptAppEngine/Initialization/loadSourceMap.js

@@ -8,7 +8,7 @@
 'use strict';
 
 var Promise = require('Promise');
-var RCTSourceCode = require('NativeModules').RCTSourceCode;
+var RCTSourceCode = require('NativeModules').SourceCode;
 var SourceMapConsumer = require('SourceMap').SourceMapConsumer;
 var SourceMapURL = require('./source-map-url');
 

Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js

@@ -7,7 +7,7 @@
 
 // Note that the module JSTimers is split into two in order to solve a cycle
 // in dependencies. NativeModules > BatchedBridge > MessageQueue > JSTimersExecution
-var RCTTiming = require('NativeModules').RCTTiming;
+var RCTTiming = require('NativeModules').Timing;
 var JSTimersExecution = require('JSTimersExecution');
 
 /**

Libraries/Network/NetInfo.js

@@ -8,7 +8,7 @@
 
 var NativeModules = require('NativeModules');
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
-var RCTReachability = NativeModules.RCTReachability;
+var RCTReachability = NativeModules.Reachability;
 
 var DEVICE_REACHABILITY_EVENT = 'reachabilityDidChange';
 

Libraries/Network/XMLHttpRequest.ios.js

@@ -6,7 +6,7 @@
  */
 'use strict';
 
-var RCTDataManager = require('NativeModules').RCTDataManager;
+var RCTDataManager = require('NativeModules').DataManager;
 
 var crc32 = require('crc32');
 

Libraries/Picker/PickerIOS.ios.js

@@ -11,7 +11,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var ReactChildren = require('ReactChildren');
 var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
-var RCTPickerIOSConsts = require('NativeModules').RCTUIManager.RCTPicker.Constants;
+var RCTPickerIOSConsts = require('NativeModules').UIManager.RCTPicker.Constants;
 var StyleSheet = require('StyleSheet');
 var View = require('View');
 

Libraries/RKBackendNode/queryLayoutByID.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 /**
  * Queries the layout of a view. The layout does not reflect the element as

Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js

@@ -13,7 +13,7 @@ var SyntheticEvent = require('SyntheticEvent');
 var merge = require('merge');
 var warning = require('warning');
 
-var RCTUIManager = NativeModules.RCTUIManager;
+var RCTUIManager = NativeModules.UIManager;
 
 var customBubblingEventTypes = RCTUIManager.customBubblingEventTypes;
 var customDirectEventTypes = RCTUIManager.customDirectEventTypes;

Libraries/ReactIOS/NativeMethodsMixin.js

@@ -7,8 +7,8 @@
 
 var NativeModules = require('NativeModules');
 var NativeModules = require('NativeModules');
-var RCTPOPAnimationManager = NativeModules.RCTPOPAnimationManager;
+var RCTPOPAnimationManager = NativeModules.POPAnimationManager;
-var RCTUIManager = NativeModules.RCTUIManager;
+var RCTUIManager = NativeModules.UIManager;
 var TextInputState = require('TextInputState');
 
 var flattenStyle = require('flattenStyle');

Libraries/ReactIOS/ReactIOSDOMIDOperations.js

@@ -9,7 +9,7 @@
 
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
 var ReactMultiChildUpdateTypes = require('ReactMultiChildUpdateTypes');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 var ReactPerf = require('ReactPerf');
 
 /**

Libraries/ReactIOS/ReactIOSGlobalResponderHandler.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
 
 var ReactIOSGlobalResponderHandler = {

Libraries/ReactIOS/ReactIOSMount.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
 var ReactPerf = require('ReactPerf');

Libraries/ReactIOS/ReactIOSNativeComponent.js

@@ -11,7 +11,7 @@ var ReactIOSEventEmitter = require('ReactIOSEventEmitter');
 var ReactIOSStyleAttributes = require('ReactIOSStyleAttributes');
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
 var ReactMultiChild = require('ReactMultiChild');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var styleDiffer = require('styleDiffer');
 var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');

Libraries/ReactIOS/ReactIOSTextComponent.js

@@ -7,7 +7,7 @@
 'use strict';
 
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
-var RCTUIManager = require('NativeModules').RCTUIManager;
+var RCTUIManager = require('NativeModules').UIManager;
 
 var assign = require('Object.assign');
 

Libraries/Storage/AsyncStorage.ios.js

@@ -7,8 +7,8 @@
 'use strict';
 
 var NativeModules = require('NativeModules');
-var RCTAsyncLocalStorage = NativeModules.RCTAsyncLocalStorage;
+var RCTAsyncLocalStorage = NativeModules.AsyncLocalStorage;
-var RCTAsyncRocksDBStorage = NativeModules.RCTAsyncRocksDBStorage;
+var RCTAsyncRocksDBStorage = NativeModules.AsyncRocksDBStorage;
 
 // We use RocksDB if available.
 var RCTAsyncStorage = RCTAsyncRocksDBStorage || RCTAsyncLocalStorage;

Libraries/Utilities/AlertIOS.js

@@ -6,7 +6,7 @@
  */
 'use strict';
 
-var { RCTAlertManager } = require('NativeModules');
+var RCTAlertManager = require('NativeModules').AlertManager;
 
 var DEFAULT_BUTTON_TEXT = 'OK';
 var DEFAULT_BUTTON = {

Libraries/Utilities/Dimensions.js

@@ -9,7 +9,7 @@ var NativeModules = require('NativeModules');
 
 var invariant = require('invariant');
 
-var dimensions = NativeModules.RCTUIManager.Dimensions;
+var dimensions = NativeModules.UIManager.Dimensions;
 
 class Dimensions {
   /**

Libraries/Utilities/PushNotificationIOS.js

@@ -8,7 +8,7 @@
 var NativeModules = require('NativeModules');
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
-var RCTPushNotificationManager = NativeModules.RCTPushNotificationManager;
+var RCTPushNotificationManager = NativeModules.PushNotificationManager;
 if (RCTPushNotificationManager) {
   var _initialNotification = RCTPushNotificationManager.initialNotification;
 }

Libraries/Utilities/nativeModulePrefixDuplicator.js

@@ -1,25 +0,0 @@
-/**
- * Copyright 2004-present Facebook. All Rights Reserved.
- *
- * @providesModule nativeModulePrefixDuplicator
- */
-'use strict';
-
-// Dirty hack to support old (RK) and new (RCT) native module name conventions
-function nativeModulePrefixDuplicator(modules) {
-  Object.keys(modules).forEach((moduleName) => {
-    var rkModuleName = moduleName.replace(/^RCT/, 'RK');
-    var rctModuleName = moduleName.replace(/^RK/, 'RCT');
-    if (rkModuleName !== rctModuleName) {
-      if (modules[rkModuleName] && modules[rctModuleName]) {
-        throw new Error(
-          'Module cannot be registered as both RCT and RK: ' + moduleName
-        );
-      }
-      modules[rkModuleName] = modules[moduleName];
-      modules[rctModuleName] = modules[moduleName];
-    }
-  });
-}
-
-module.exports = nativeModulePrefixDuplicator;

Libraries/Utilities/nativeModulePrefixNormalizer.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright 2004-present Facebook. All Rights Reserved.
+ *
+ * @providesModule nativeModulePrefixNormalizer
+ */
+'use strict';
+
+// Dirty hack to support old (RK) and new (RCT) native module name conventions
+function nativeModulePrefixNormalizer(modules) {
+  Object.keys(modules).forEach((moduleName) => {
+    var strippedName = moduleName.replace(/^(RCT|RK)/, '');
+    if (modules['RCT' + strippedName] && modules['RK' + strippedName]) {
+      throw new Error(
+        'Module cannot be registered as both RCT and RK: ' + moduleName
+      );
+    }
+    if (strippedName !== moduleName) {
+      modules[strippedName] = modules[moduleName];
+      delete modules[moduleName];
+    }
+  });
+}
+
+module.exports = nativeModulePrefixNormalizer;

Libraries/Vibration/VibrationIOS.ios.js

@@ -5,7 +5,8 @@
  */
 'use strict';
 
-var {RCTVibration} = require('NativeModules');
+var RCTVibration = require('NativeModules').Vibration;
+
 var invariant = require('invariant');
 
 /**