From d8ee4e87a141c03ca5cff95c8181d499a081dbaa Mon Sep 17 00:00:00 2001 From: Spencer Ahrens Date: Tue, 17 Mar 2015 03:08:52 -0700 Subject: [PATCH] [ReactKit] Remove NativeModulesDeprecated --- Libraries/ActionSheetIOS/ActionSheetIOS.js | 3 ++- Libraries/AppState/AppState.js | 2 +- .../NativeModulesDeprecated.js | 14 -------------- .../BatchedBridgedModules/POPAnimation.js | 2 +- .../BatchedBridgedModules/RCTAlertManager.ios.js | 2 +- .../BatchingImplementation/BatchedBridgeFactory.js | 2 -- Libraries/Components/ScrollResponder.js | 4 ++-- Libraries/Components/ScrollView/ScrollView.js | 2 +- Libraries/Components/TextInput/TextInputState.js | 2 +- Libraries/Image/Image.ios.js | 4 ++-- .../InitializeJavaScriptAppEngine.js | 2 +- Libraries/Network/XMLHttpRequest.ios.js | 2 +- Libraries/RKBackendNode/queryLayoutByID.js | 2 +- Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js | 4 ++-- Libraries/ReactIOS/NativeMethodsMixin.js | 13 ++++++------- Libraries/ReactIOS/ReactIOSDOMIDOperations.js | 2 +- Libraries/ReactIOS/ReactIOSMount.js | 2 +- Libraries/ReactIOS/ReactIOSNativeComponent.js | 2 +- Libraries/ReactIOS/ReactIOSTextComponent.js | 2 +- Libraries/Utilities/AlertIOS.js | 4 +--- 20 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 Libraries/BatchedBridge/BatchedBridgedModules/NativeModulesDeprecated.js diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js index 085e8d86b..5a24f06b0 100644 --- a/Libraries/ActionSheetIOS/ActionSheetIOS.js +++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js @@ -5,8 +5,9 @@ */ 'use strict'; +var { RCTActionSheetManager } = require('NativeModules'); + var invariant = require('invariant'); -var RCTActionSheetManager = require('NativeModulesDeprecated').RCTActionSheetManager; var ActionSheetIOS = { showActionSheetWithOptions(options, callback) { diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js index 3b8b9350d..47834936a 100644 --- a/Libraries/AppState/AppState.js +++ b/Libraries/AppState/AppState.js @@ -5,7 +5,7 @@ */ 'use strict'; -var NativeModules = require('NativeModulesDeprecated'); +var NativeModules = require('NativeModules'); var RCTAppState = NativeModules.RCTAppState; var AppState = { diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/NativeModulesDeprecated.js b/Libraries/BatchedBridge/BatchedBridgedModules/NativeModulesDeprecated.js deleted file mode 100644 index d019872cd..000000000 --- a/Libraries/BatchedBridge/BatchedBridgedModules/NativeModulesDeprecated.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright 2004-present Facebook. All Rights Reserved. - * - * @providesModule NativeModulesDeprecated - */ -'use strict'; - -var NativeModulesDeprecated = require('BatchedBridge').RemoteModulesDeprecated; - -var nativeModulePrefixDuplicator = require('nativeModulePrefixDuplicator'); - -nativeModulePrefixDuplicator(NativeModulesDeprecated); - -module.exports = NativeModulesDeprecated; diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js b/Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js index 0ace433a3..3195e3ee1 100644 --- a/Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js +++ b/Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js @@ -5,7 +5,7 @@ */ 'use strict'; -var RCTPOPAnimationManager = require('NativeModulesDeprecated').RCTPOPAnimationManager; +var RCTPOPAnimationManager = require('NativeModules').RCTPOPAnimationManager; 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. diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js b/Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js index fca0aa8d8..3621795da 100644 --- a/Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js +++ b/Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js @@ -5,6 +5,6 @@ */ 'use strict'; -var RCTAlertManager = require('NativeModulesDeprecated').RCTAlertManager; +var { RCTAlertManager } = require('NativeModules'); module.exports = RCTAlertManager; diff --git a/Libraries/BatchedBridge/BatchingImplementation/BatchedBridgeFactory.js b/Libraries/BatchedBridge/BatchingImplementation/BatchedBridgeFactory.js index c130a9f28..a41a13226 100644 --- a/Libraries/BatchedBridge/BatchingImplementation/BatchedBridgeFactory.js +++ b/Libraries/BatchedBridge/BatchingImplementation/BatchedBridgeFactory.js @@ -65,8 +65,6 @@ var BatchedBridgeFactory = { invokeCallbackAndReturnFlushedQueue: messageQueue.invokeCallbackAndReturnFlushedQueue.bind(messageQueue), flushedQueue: messageQueue.flushedQueue.bind(messageQueue), - // These deprecated modules do not accept an error callback. - RemoteModulesDeprecated: mapObject(modulesConfig, this._createBridgedModule.bind(this, messageQueue)), RemoteModules: mapObject(modulesConfig, this._createBridgedModule.bind(this, messageQueue)), setLoggingEnabled: messageQueue.setLoggingEnabled.bind(messageQueue), getLoggedOutgoingItems: messageQueue.getLoggedOutgoingItems.bind(messageQueue), diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js index 3bec89bef..b8f4c96c6 100644 --- a/Libraries/Components/ScrollResponder.js +++ b/Libraries/Components/ScrollResponder.js @@ -6,13 +6,13 @@ 'use strict'; var NativeModules = require('NativeModules'); -var NativeModulesDeprecated = require('NativeModulesDeprecated'); +var NativeModules = require('NativeModules'); var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); var Subscribable = require('Subscribable'); var TextInputState = require('TextInputState'); var RCTUIManager = NativeModules.RCTUIManager; -var RCTUIManagerDeprecated = NativeModulesDeprecated.RCTUIManager; +var RCTUIManagerDeprecated = NativeModules.RCTUIManager; var RCTScrollViewConsts = RCTUIManager.RCTScrollView.Constants; var warning = require('warning'); diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index d0630b82d..804b6f578 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -13,7 +13,7 @@ var RCTScrollViewConsts = RCTScrollView.Constants; var React = require('React'); var ReactIOSTagHandles = require('ReactIOSTagHandles'); var ReactIOSViewAttributes = require('ReactIOSViewAttributes'); -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var ScrollResponder = require('ScrollResponder'); var StyleSheet = require('StyleSheet'); var StyleSheetPropType = require('StyleSheetPropType'); diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js index 969eb74a9..6d22e3e77 100644 --- a/Libraries/Components/TextInput/TextInputState.js +++ b/Libraries/Components/TextInput/TextInputState.js @@ -9,7 +9,7 @@ */ 'use strict'; -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var TextInputState = { /** diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js index 3c7dd0966..771a27543 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -7,7 +7,7 @@ var EdgeInsetsPropType = require('EdgeInsetsPropType'); var NativeMethodsMixin = require('NativeMethodsMixin'); -var NativeModulesDeprecated = require('NativeModulesDeprecated'); +var NativeModules = require('NativeModules'); var PropTypes = require('ReactPropTypes'); var ImageResizeMode = require('ImageResizeMode'); var ImageStylePropTypes = require('ImageStylePropTypes'); @@ -114,7 +114,7 @@ var Image = React.createClass({ warning(RawImage === RCTStaticImage, 'tintColor style only supported on static images.'); } - var contentModes = NativeModulesDeprecated.RCTUIManager.UIView.ContentMode; + var contentModes = NativeModules.RCTUIManager.UIView.ContentMode; var resizeMode; if (style.resizeMode === ImageResizeMode.stretch) { resizeMode = contentModes.ScaleToFill; diff --git a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js index e0527e7e4..6d4d762bd 100644 --- a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js +++ b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js @@ -115,7 +115,7 @@ function setupTimers() { } function setupAlert() { - var RCTAlertManager = require('RCTAlertManager'); + var { RCTAlertManager } = require('NativeModules'); if (!GLOBAL.alert) { GLOBAL.alert = function(text) { var alertOpts = { diff --git a/Libraries/Network/XMLHttpRequest.ios.js b/Libraries/Network/XMLHttpRequest.ios.js index 685bd1ff2..b747d0bed 100644 --- a/Libraries/Network/XMLHttpRequest.ios.js +++ b/Libraries/Network/XMLHttpRequest.ios.js @@ -6,7 +6,7 @@ */ 'use strict'; -var RCTDataManager = require('NativeModulesDeprecated').RCTDataManager; +var RCTDataManager = require('NativeModules').RCTDataManager; var crc32 = require('crc32'); diff --git a/Libraries/RKBackendNode/queryLayoutByID.js b/Libraries/RKBackendNode/queryLayoutByID.js index 494c6f28a..a93130e89 100644 --- a/Libraries/RKBackendNode/queryLayoutByID.js +++ b/Libraries/RKBackendNode/queryLayoutByID.js @@ -6,7 +6,7 @@ 'use strict'; var ReactIOSTagHandles = require('ReactIOSTagHandles'); -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; /** * Queries the layout of a view. The layout does not reflect the element as diff --git a/Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js b/Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js index 54a5e5e45..16446f85d 100644 --- a/Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js +++ b/Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js @@ -7,13 +7,13 @@ "use strict"; var EventPropagators = require('EventPropagators'); -var NativeModulesDeprecated = require('NativeModulesDeprecated'); +var NativeModules = require('NativeModules'); var SyntheticEvent = require('SyntheticEvent'); var merge = require('merge'); var warning = require('warning'); -var RCTUIManager = NativeModulesDeprecated.RCTUIManager; +var RCTUIManager = NativeModules.RCTUIManager; var customBubblingEventTypes = RCTUIManager.customBubblingEventTypes; var customDirectEventTypes = RCTUIManager.customDirectEventTypes; diff --git a/Libraries/ReactIOS/NativeMethodsMixin.js b/Libraries/ReactIOS/NativeMethodsMixin.js index a803dd6f2..767264fae 100644 --- a/Libraries/ReactIOS/NativeMethodsMixin.js +++ b/Libraries/ReactIOS/NativeMethodsMixin.js @@ -6,10 +6,9 @@ 'use strict'; var NativeModules = require('NativeModules'); -var NativeModulesDeprecated = require('NativeModulesDeprecated'); -var RCTPOPAnimationManagerDeprecated = NativeModulesDeprecated.RCTPOPAnimationManager; +var NativeModules = require('NativeModules'); +var RCTPOPAnimationManager = NativeModules.RCTPOPAnimationManager; var RCTUIManager = NativeModules.RCTUIManager; -var RCTUIManagerDeprecated = NativeModulesDeprecated.RCTUIManager; var TextInputState = require('TextInputState'); var flattenStyle = require('flattenStyle'); @@ -27,16 +26,16 @@ var animationIDInvariant = function(funcName, anim) { var NativeMethodsMixin = { addAnimation: function(anim, callback) { animationIDInvariant('addAnimation', anim); - RCTPOPAnimationManagerDeprecated.addAnimation(this.getNodeHandle(), anim, callback); + RCTPOPAnimationManager.addAnimation(this.getNodeHandle(), anim, callback); }, removeAnimation: function(anim) { animationIDInvariant('removeAnimation', anim); - RCTPOPAnimationManagerDeprecated.removeAnimation(this.getNodeHandle(), anim); + RCTPOPAnimationManager.removeAnimation(this.getNodeHandle(), anim); }, measure: function(callback) { - RCTUIManagerDeprecated.measure(this.getNodeHandle(), callback); + RCTUIManager.measure(this.getNodeHandle(), callback); }, measureLayout: function(relativeToNativeNode, onSuccess, onFail) { @@ -77,7 +76,7 @@ var NativeMethodsMixin = { props = mergeFast(nativeProps, style); } - RCTUIManagerDeprecated.updateView( + RCTUIManager.updateView( this.getNodeHandle(), this.viewConfig.uiViewClassName, props diff --git a/Libraries/ReactIOS/ReactIOSDOMIDOperations.js b/Libraries/ReactIOS/ReactIOSDOMIDOperations.js index fd07b42fd..771b58110 100644 --- a/Libraries/ReactIOS/ReactIOSDOMIDOperations.js +++ b/Libraries/ReactIOS/ReactIOSDOMIDOperations.js @@ -9,7 +9,7 @@ var ReactIOSTagHandles = require('ReactIOSTagHandles'); var ReactMultiChildUpdateTypes = require('ReactMultiChildUpdateTypes'); -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var ReactPerf = require('ReactPerf'); /** diff --git a/Libraries/ReactIOS/ReactIOSMount.js b/Libraries/ReactIOS/ReactIOSMount.js index 9823ae759..7226159cc 100644 --- a/Libraries/ReactIOS/ReactIOSMount.js +++ b/Libraries/ReactIOS/ReactIOSMount.js @@ -5,7 +5,7 @@ */ 'use strict'; -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var ReactIOSTagHandles = require('ReactIOSTagHandles'); var ReactPerf = require('ReactPerf'); diff --git a/Libraries/ReactIOS/ReactIOSNativeComponent.js b/Libraries/ReactIOS/ReactIOSNativeComponent.js index ee13b8471..39c2f294a 100644 --- a/Libraries/ReactIOS/ReactIOSNativeComponent.js +++ b/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('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var styleDiffer = require('styleDiffer'); var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); diff --git a/Libraries/ReactIOS/ReactIOSTextComponent.js b/Libraries/ReactIOS/ReactIOSTextComponent.js index a7753f30f..ca8417ddf 100644 --- a/Libraries/ReactIOS/ReactIOSTextComponent.js +++ b/Libraries/ReactIOS/ReactIOSTextComponent.js @@ -7,7 +7,7 @@ 'use strict'; var ReactIOSTagHandles = require('ReactIOSTagHandles'); -var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager; +var RCTUIManager = require('NativeModules').RCTUIManager; var assign = require('Object.assign'); diff --git a/Libraries/Utilities/AlertIOS.js b/Libraries/Utilities/AlertIOS.js index ee0bb2d0b..bbbdc8981 100644 --- a/Libraries/Utilities/AlertIOS.js +++ b/Libraries/Utilities/AlertIOS.js @@ -6,9 +6,7 @@ */ 'use strict'; -var NativeModules = require('NativeModulesDeprecated'); - -var RCTAlertManager = NativeModules.RCTAlertManager; +var { RCTAlertManager } = require('NativeModules'); var DEFAULT_BUTTON_TEXT = 'OK'; var DEFAULT_BUTTON = {