From a80dd9a92a8d7c201972d1a8b2392e9f893147c8 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Fri, 8 Apr 2016 20:36:40 -0700 Subject: [PATCH] Fix up this pattern var React = require('react-native'); Summary:First I searched for special cases that destructor PropTypes: ``` (?s)React\s*=\s*require\('react\-native'\).*(Children|PropTypes)[^\{\}]*\}\s*=\s*React; ``` I split them up manually. Then I replaced the React = require('react-native') + destructuring pattern... ``` (?s)(const|var)\s+React\s*=\s*require\('react\-native'\)(.*[^\{\}]*\}\s*=\s*)React; ``` ...with... ``` $1 React = require('react'); $1 ReactNative = require('react-native')$2ReactNative; ``` I used lint to figure out if I left some unnecessary imports. Finally I grepped for just ``` React\s*=\s*require\('react\-native'\) ``` to catch any remaining patterns. Also, `} = React.NativeModules` -> `} = ReactNative.NativeModules`. Reviewed By: spicyj Differential Revision: D3158991 fb-gh-sync-id: f97e8e921e193d6ea1a49d8d1bf3f09be7bed5c3 fbshipit-source-id: f97e8e921e193d6ea1a49d8d1bf3f09be7bed5c3 --- Examples/2048/Game2048.js | 5 +++-- Examples/Movies/MovieCell.js | 5 +++-- Examples/Movies/MovieScreen.js | 5 +++-- Examples/Movies/MoviesApp.android.js | 5 +++-- Examples/Movies/MoviesApp.ios.js | 5 +++-- Examples/Movies/SearchBar.android.js | 5 +++-- Examples/Movies/SearchBar.ios.js | 5 +++-- Examples/Movies/SearchScreen.js | 5 +++-- Examples/Movies/getStyleFromScore.js | 4 ++-- Examples/TicTacToe/TicTacToeApp.js | 5 +++-- .../UIExplorer/AccessibilityAndroidExample.android.js | 5 +++-- Examples/UIExplorer/AccessibilityIOSExample.js | 5 +++-- Examples/UIExplorer/ActionSheetIOSExample.js | 5 +++-- Examples/UIExplorer/ActivityIndicatorIOSExample.js | 5 +++-- Examples/UIExplorer/AdSupportIOSExample.js | 5 +++-- Examples/UIExplorer/AlertExample.js | 5 +++-- Examples/UIExplorer/AlertIOSExample.js | 5 +++-- Examples/UIExplorer/AnimatedExample.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExApp.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExBobble.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExChained.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExScroll.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExSet.js | 5 +++-- Examples/UIExplorer/AnimatedGratuitousApp/AnExTilt.js | 5 +++-- Examples/UIExplorer/AppStateExample.js | 5 +++-- Examples/UIExplorer/AppStateIOSExample.js | 5 +++-- Examples/UIExplorer/AssetScaledImageExample.js | 5 +++-- Examples/UIExplorer/AsyncStorageExample.js | 5 +++-- Examples/UIExplorer/BorderExample.js | 4 ++-- Examples/UIExplorer/BoxShadowExample.js | 4 ++-- Examples/UIExplorer/CameraRollExample.js | 5 +++-- Examples/UIExplorer/CameraRollView.js | 5 +++-- Examples/UIExplorer/ClipboardExample.js | 5 +++-- Examples/UIExplorer/DatePickerAndroidExample.js | 5 +++-- Examples/UIExplorer/DatePickerIOSExample.js | 5 +++-- Examples/UIExplorer/GeolocationExample.js | 5 +++-- Examples/UIExplorer/ImageCapInsetsExample.js | 5 +++-- Examples/UIExplorer/ImageEditingExample.js | 5 +++-- Examples/UIExplorer/ImageExample.js | 5 +++-- Examples/UIExplorer/LayoutEventsExample.js | 5 +++-- Examples/UIExplorer/LayoutExample.js | 5 +++-- Examples/UIExplorer/LinkingExample.js | 5 +++-- Examples/UIExplorer/ListViewExample.js | 5 +++-- Examples/UIExplorer/ListViewGridLayoutExample.js | 5 +++-- Examples/UIExplorer/ListViewPagingExample.js | 5 +++-- Examples/UIExplorer/MapViewExample.js | 7 ++++--- Examples/UIExplorer/ModalExample.js | 5 +++-- .../LegacyNavigator/BreadcrumbNavSample.js | 5 +++-- .../LegacyNavigator/JumpingNavSample.js | 5 +++-- .../LegacyNavigator/LegacyNavigatorExample.js | 5 +++-- .../LegacyNavigator/NavigationBarSample.js | 5 +++-- .../NavigationExperimental/NavigationAnimatedExample.js | 5 +++-- .../NavigationExperimental/NavigationBasicExample.js | 5 +++-- .../NavigationExperimental/NavigationCardStackExample.js | 5 +++-- .../NavigationCompositionExample.js | 5 +++-- .../NavigationExperimental/NavigationExampleRow.js | 5 +++-- .../NavigationExperimental/NavigationExampleTabBar.js | 5 +++-- .../NavigationExperimentalExample.js | 5 +++-- .../NavigationExperimental/NavigationTabsExample.js | 5 +++-- .../NavigationExperimental/NavigationTicTacToeExample.js | 5 +++-- Examples/UIExplorer/Navigator/BreadcrumbNavSample.js | 5 +++-- Examples/UIExplorer/Navigator/JumpingNavSample.js | 5 +++-- Examples/UIExplorer/Navigator/NavigationBarSample.js | 5 +++-- Examples/UIExplorer/Navigator/NavigatorExample.js | 5 +++-- Examples/UIExplorer/NavigatorIOSColorsExample.js | 5 +++-- Examples/UIExplorer/NavigatorIOSExample.js | 5 +++-- Examples/UIExplorer/NetInfoExample.js | 5 +++-- Examples/UIExplorer/PanResponderExample.js | 5 +++-- Examples/UIExplorer/PickerAndroidExample.js | 5 +++-- Examples/UIExplorer/PickerIOSExample.js | 5 +++-- Examples/UIExplorer/PointerEventsExample.js | 5 +++-- Examples/UIExplorer/ProgressViewIOSExample.js | 5 +++-- Examples/UIExplorer/PushNotificationIOSExample.js | 5 +++-- Examples/UIExplorer/RCTRootViewIOSExample.js | 5 +++-- Examples/UIExplorer/RefreshControlExample.js | 5 +++-- Examples/UIExplorer/RootViewSizeFlexibilityExampleApp.js | 5 +++-- Examples/UIExplorer/ScrollViewExample.js | 5 +++-- Examples/UIExplorer/ScrollViewSimpleExample.js | 5 +++-- Examples/UIExplorer/SegmentedControlIOSExample.js | 5 +++-- Examples/UIExplorer/SetPropertiesExampleApp.js | 5 +++-- Examples/UIExplorer/SliderExample.js | 5 +++-- Examples/UIExplorer/SliderIOSExample.js | 5 +++-- Examples/UIExplorer/SnapshotExample.js | 5 +++-- Examples/UIExplorer/StatusBarExample.js | 5 +++-- Examples/UIExplorer/StatusBarIOSExample.js | 5 +++-- Examples/UIExplorer/SwitchExample.js | 8 +++++--- Examples/UIExplorer/TabBarIOSExample.js | 5 +++-- Examples/UIExplorer/TextExample.android.js | 5 +++-- Examples/UIExplorer/TextExample.ios.js | 5 +++-- Examples/UIExplorer/TextInputExample.android.js | 5 +++-- Examples/UIExplorer/TextInputExample.ios.js | 5 +++-- Examples/UIExplorer/TimePickerAndroidExample.js | 5 +++-- Examples/UIExplorer/TimerExample.js | 5 +++-- Examples/UIExplorer/ToastAndroidExample.android.js | 5 +++-- Examples/UIExplorer/ToolbarAndroidExample.android.js | 5 +++-- Examples/UIExplorer/TouchableExample.js | 5 +++-- Examples/UIExplorer/TransformExample.js | 5 +++-- Examples/UIExplorer/TransparentHitTestExample.js | 5 +++-- Examples/UIExplorer/UIExplorerApp.android.js | 5 +++-- Examples/UIExplorer/UIExplorerApp.ios.js | 5 +++-- Examples/UIExplorer/UIExplorerButton.js | 5 +++-- Examples/UIExplorer/UIExplorerExampleList.js | 5 +++-- Examples/UIExplorer/UIExplorerList.android.js | 2 +- Examples/UIExplorer/UIExplorerNavigationReducer.js | 5 +++-- Examples/UIExplorer/URIActionMap.js | 5 +++-- Examples/UIExplorer/VibrationExample.js | 5 +++-- Examples/UIExplorer/VibrationIOSExample.js | 5 +++-- Examples/UIExplorer/ViewExample.js | 5 +++-- Examples/UIExplorer/ViewPagerAndroidExample.android.js | 5 +++-- Examples/UIExplorer/WebViewExample.js | 5 +++-- Examples/UIExplorer/XHRExample.android.js | 5 +++-- Examples/UIExplorer/XHRExample.ios.js | 5 +++-- Examples/UIExplorer/XHRExampleCookies.js | 5 +++-- Examples/UIExplorer/XHRExampleFetch.js | 5 +++-- Examples/UIExplorer/XHRExampleHeaders.js | 5 +++-- IntegrationTests/AppEventsTest.js | 7 ++++--- IntegrationTests/AsyncStorageTest.js | 7 ++++--- IntegrationTests/ImageSnapshotTest.js | 7 ++++--- IntegrationTests/IntegrationTestHarnessTest.js | 7 ++++--- IntegrationTests/IntegrationTestsApp.js | 5 +++-- IntegrationTests/LayoutEventsTest.js | 7 ++++--- IntegrationTests/PromiseTest.js | 8 +++++--- IntegrationTests/PropertiesUpdateTest.js | 7 ++++--- IntegrationTests/RCTRootViewIntegrationTestApp.js | 5 +++-- IntegrationTests/ReactContentSizeUpdateTest.js | 7 ++++--- IntegrationTests/SimpleSnapshotTest.js | 7 ++++--- IntegrationTests/SizeFlexibilityUpdateTest.js | 7 ++++--- IntegrationTests/TimersTest.js | 7 ++++--- .../NavigationExperimental/NavigationCard.js | 2 +- .../NavigationExperimental/NavigationHeader.js | 5 +++-- .../NavigationExperimental/NavigationHeaderBackButton.js | 5 +++-- .../NavigationExperimental/NavigationHeaderTitle.js | 5 +++-- .../NavigationExperimental/NavigationLegacyNavigator.js | 2 +- Libraries/Experimental/IncrementalExample.js | 5 +++-- .../NavigationExperimental/NavigationAnimatedView.js | 2 +- Libraries/NavigationExperimental/NavigationPropTypes.js | 2 +- Libraries/NavigationExperimental/NavigationView.js | 2 +- Libraries/Text/TextUpdateTest.js | 5 +++-- 138 files changed, 414 insertions(+), 283 deletions(-) diff --git a/Examples/2048/Game2048.js b/Examples/2048/Game2048.js index a6c97a3e3edaa5..c19e7cf2deb227 100644 --- a/Examples/2048/Game2048.js +++ b/Examples/2048/Game2048.js @@ -16,13 +16,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, StyleSheet, Text, View, -} = React; +} = ReactNative; var Animated = require('Animated'); var GameBoard = require('GameBoard'); diff --git a/Examples/Movies/MovieCell.js b/Examples/Movies/MovieCell.js index c90931c08768ee..64cfcfedb5569c 100644 --- a/Examples/Movies/MovieCell.js +++ b/Examples/Movies/MovieCell.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, Platform, @@ -24,7 +25,7 @@ var { TouchableHighlight, TouchableNativeFeedback, View -} = React; +} = ReactNative; var getStyleFromScore = require('./getStyleFromScore'); var getImageSource = require('./getImageSource'); diff --git a/Examples/Movies/MovieScreen.js b/Examples/Movies/MovieScreen.js index ff228a8a3e7c57..b83d00d0186a17 100644 --- a/Examples/Movies/MovieScreen.js +++ b/Examples/Movies/MovieScreen.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, ScrollView, StyleSheet, Text, View, -} = React; +} = ReactNative; var getImageSource = require('./getImageSource'); var getStyleFromScore = require('./getStyleFromScore'); diff --git a/Examples/Movies/MoviesApp.android.js b/Examples/Movies/MoviesApp.android.js index 5dfb57fd2fd2ba..2b40ea491f097c 100644 --- a/Examples/Movies/MoviesApp.android.js +++ b/Examples/Movies/MoviesApp.android.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, BackAndroid, @@ -24,7 +25,7 @@ var { StyleSheet, ToolbarAndroid, View, -} = React; +} = ReactNative; var MovieScreen = require('./MovieScreen'); var SearchScreen = require('./SearchScreen'); diff --git a/Examples/Movies/MoviesApp.ios.js b/Examples/Movies/MoviesApp.ios.js index 1c6fc4b4fb451b..cce3216b18bf68 100644 --- a/Examples/Movies/MoviesApp.ios.js +++ b/Examples/Movies/MoviesApp.ios.js @@ -16,12 +16,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, NavigatorIOS, StyleSheet, -} = React; +} = ReactNative; var SearchScreen = require('./SearchScreen'); diff --git a/Examples/Movies/SearchBar.android.js b/Examples/Movies/SearchBar.android.js index 2e12ff48800779..d4110ef9de132b 100644 --- a/Examples/Movies/SearchBar.android.js +++ b/Examples/Movies/SearchBar.android.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, Platform, @@ -25,7 +26,7 @@ var { StyleSheet, TouchableNativeFeedback, View, -} = React; +} = ReactNative; var IS_RIPPLE_EFFECT_SUPPORTED = Platform.Version >= 21; diff --git a/Examples/Movies/SearchBar.ios.js b/Examples/Movies/SearchBar.ios.js index f4a2354ef939c3..754a10b0ab60bc 100644 --- a/Examples/Movies/SearchBar.ios.js +++ b/Examples/Movies/SearchBar.ios.js @@ -16,13 +16,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ActivityIndicatorIOS, TextInput, StyleSheet, View, -} = React; +} = ReactNative; var SearchBar = React.createClass({ render: function() { diff --git a/Examples/Movies/SearchScreen.js b/Examples/Movies/SearchScreen.js index 2e681ed34f50b5..88eabcdee339eb 100644 --- a/Examples/Movies/SearchScreen.js +++ b/Examples/Movies/SearchScreen.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ActivityIndicatorIOS, ListView, @@ -24,7 +25,7 @@ var { StyleSheet, Text, View, -} = React; +} = ReactNative; var TimerMixin = require('react-timer-mixin'); var invariant = require('fbjs/lib/invariant'); diff --git a/Examples/Movies/getStyleFromScore.js b/Examples/Movies/getStyleFromScore.js index 1d5b599b62bc1c..a432be9bd5e6e9 100644 --- a/Examples/Movies/getStyleFromScore.js +++ b/Examples/Movies/getStyleFromScore.js @@ -15,10 +15,10 @@ */ 'use strict'; -var React = require('react-native'); +var ReactNative = require('react-native'); var { StyleSheet, -} = React; +} = ReactNative; var MAX_VALUE = 200; diff --git a/Examples/TicTacToe/TicTacToeApp.js b/Examples/TicTacToe/TicTacToeApp.js index 3b562194a04427..860d5c53d8cabe 100755 --- a/Examples/TicTacToe/TicTacToeApp.js +++ b/Examples/TicTacToe/TicTacToeApp.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; class Board { grid: Array>; diff --git a/Examples/UIExplorer/AccessibilityAndroidExample.android.js b/Examples/UIExplorer/AccessibilityAndroidExample.android.js index 3df94c603173b3..ff1f215dab70cb 100644 --- a/Examples/UIExplorer/AccessibilityAndroidExample.android.js +++ b/Examples/UIExplorer/AccessibilityAndroidExample.android.js @@ -14,14 +14,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, ToastAndroid, TouchableWithoutFeedback, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/AccessibilityIOSExample.js b/Examples/UIExplorer/AccessibilityIOSExample.js index d543d7253b0246..8f8329f5ef83aa 100644 --- a/Examples/UIExplorer/AccessibilityIOSExample.js +++ b/Examples/UIExplorer/AccessibilityIOSExample.js @@ -15,11 +15,12 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, View, -} = React; +} = ReactNative; var AccessibilityIOSExample = React.createClass({ render() { diff --git a/Examples/UIExplorer/ActionSheetIOSExample.js b/Examples/UIExplorer/ActionSheetIOSExample.js index b749400c037ab2..0442682142ab30 100644 --- a/Examples/UIExplorer/ActionSheetIOSExample.js +++ b/Examples/UIExplorer/ActionSheetIOSExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ActionSheetIOS, StyleSheet, Text, UIManager, View, -} = React; +} = ReactNative; var BUTTONS = [ 'Option 0', diff --git a/Examples/UIExplorer/ActivityIndicatorIOSExample.js b/Examples/UIExplorer/ActivityIndicatorIOSExample.js index 9655d680c71b63..6923936d4528a7 100644 --- a/Examples/UIExplorer/ActivityIndicatorIOSExample.js +++ b/Examples/UIExplorer/ActivityIndicatorIOSExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ActivityIndicatorIOS, StyleSheet, View, -} = React; +} = ReactNative; var TimerMixin = require('react-timer-mixin'); var ToggleAnimatingActivityIndicator = React.createClass({ diff --git a/Examples/UIExplorer/AdSupportIOSExample.js b/Examples/UIExplorer/AdSupportIOSExample.js index 1626249e704699..dab5e88fb072ca 100644 --- a/Examples/UIExplorer/AdSupportIOSExample.js +++ b/Examples/UIExplorer/AdSupportIOSExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AdSupportIOS, StyleSheet, Text, View, -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = 'Advertising ID'; diff --git a/Examples/UIExplorer/AlertExample.js b/Examples/UIExplorer/AlertExample.js index 37f47dd9b01ddd..85416e0696832b 100644 --- a/Examples/UIExplorer/AlertExample.js +++ b/Examples/UIExplorer/AlertExample.js @@ -15,14 +15,15 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Alert, StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); diff --git a/Examples/UIExplorer/AlertIOSExample.js b/Examples/UIExplorer/AlertIOSExample.js index d7f0bcf0d464fa..112149e165733d 100644 --- a/Examples/UIExplorer/AlertIOSExample.js +++ b/Examples/UIExplorer/AlertIOSExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, View, Text, TouchableHighlight, AlertIOS, -} = React; +} = ReactNative; var { SimpleAlertExampleBlock } = require('./AlertExample'); diff --git a/Examples/UIExplorer/AnimatedExample.js b/Examples/UIExplorer/AnimatedExample.js index 1068ac00026809..d11abbf9024442 100644 --- a/Examples/UIExplorer/AnimatedExample.js +++ b/Examples/UIExplorer/AnimatedExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, Easing, StyleSheet, Text, View, -} = React; +} = ReactNative; var UIExplorerButton = require('./UIExplorerButton'); exports.framework = 'React'; diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExApp.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExApp.js index c87bc29823bce4..a6c161d9744108 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExApp.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExApp.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, LayoutAnimation, PanResponder, StyleSheet, View, -} = React; +} = ReactNative; var AnExSet = require('AnExSet'); diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExBobble.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExBobble.js index 39f15a8ec8ea9b..574e1a2b7d0d22 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExBobble.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExBobble.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, Image, PanResponder, StyleSheet, View, -} = React; +} = ReactNative; var NUM_BOBBLES = 5; var RAD_EACH = Math.PI / 2 / (NUM_BOBBLES - 2); diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExChained.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExChained.js index 596617f1780ec1..aad9c5839c19a2 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExChained.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExChained.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, Image, PanResponder, StyleSheet, View, -} = React; +} = ReactNative; class AnExChained extends React.Component { state: any; diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExScroll.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExScroll.js index e7712cfc52e86e..40ad63e3e34894 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExScroll.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExScroll.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, Image, @@ -24,7 +25,7 @@ var { StyleSheet, Text, View, -} = React; +} = ReactNative; class AnExScroll extends React.Component { state: any = { scrollX: new Animated.Value(0) }; diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExSet.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExSet.js index 769a0f79a2d25f..d67931387ad27a 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExSet.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExSet.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, PanResponder, StyleSheet, Text, View, -} = React; +} = ReactNative; var AnExBobble = require('./AnExBobble'); var AnExChained = require('./AnExChained'); diff --git a/Examples/UIExplorer/AnimatedGratuitousApp/AnExTilt.js b/Examples/UIExplorer/AnimatedGratuitousApp/AnExTilt.js index 42b5523c011c75..8eb97844bb797b 100644 --- a/Examples/UIExplorer/AnimatedGratuitousApp/AnExTilt.js +++ b/Examples/UIExplorer/AnimatedGratuitousApp/AnExTilt.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, Image, PanResponder, StyleSheet, View, -} = React; +} = ReactNative; class AnExTilt extends React.Component { state: any; diff --git a/Examples/UIExplorer/AppStateExample.js b/Examples/UIExplorer/AppStateExample.js index 07d70be82de7c1..8140394142024d 100644 --- a/Examples/UIExplorer/AppStateExample.js +++ b/Examples/UIExplorer/AppStateExample.js @@ -16,12 +16,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppState, Text, View -} = React; +} = ReactNative; var AppStateSubscription = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/AppStateIOSExample.js b/Examples/UIExplorer/AppStateIOSExample.js index 9cf15fad1c691a..10aaed8aadd0ff 100644 --- a/Examples/UIExplorer/AppStateIOSExample.js +++ b/Examples/UIExplorer/AppStateIOSExample.js @@ -16,12 +16,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppStateIOS, Text, View -} = React; +} = ReactNative; var AppStateSubscription = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/AssetScaledImageExample.js b/Examples/UIExplorer/AssetScaledImageExample.js index dbfe7afb7b65ee..6b68e2aabb04d0 100644 --- a/Examples/UIExplorer/AssetScaledImageExample.js +++ b/Examples/UIExplorer/AssetScaledImageExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, View, ScrollView -} = React; +} = ReactNative; var AssetScaledImageExample = React.createClass({ diff --git a/Examples/UIExplorer/AsyncStorageExample.js b/Examples/UIExplorer/AsyncStorageExample.js index a3ca7643747416..f2ee7da47381c6 100644 --- a/Examples/UIExplorer/AsyncStorageExample.js +++ b/Examples/UIExplorer/AsyncStorageExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AsyncStorage, PickerIOS, Text, View -} = React; +} = ReactNative; var PickerItemIOS = PickerIOS.Item; var STORAGE_KEY = '@AsyncStorageExample:key'; diff --git a/Examples/UIExplorer/BorderExample.js b/Examples/UIExplorer/BorderExample.js index 2dedfdd8e6ae1d..e1164844628640 100644 --- a/Examples/UIExplorer/BorderExample.js +++ b/Examples/UIExplorer/BorderExample.js @@ -13,11 +13,11 @@ */ 'use strict'; -var React = require('react-native'); +var ReactNative = require('react-native'); var { StyleSheet, View -} = React; +} = ReactNative; var styles = StyleSheet.create({ box: { diff --git a/Examples/UIExplorer/BoxShadowExample.js b/Examples/UIExplorer/BoxShadowExample.js index 12568c1b67bc3e..0858d36bb18a63 100644 --- a/Examples/UIExplorer/BoxShadowExample.js +++ b/Examples/UIExplorer/BoxShadowExample.js @@ -13,12 +13,12 @@ */ 'use strict'; -var React = require('react-native'); +var ReactNative = require('react-native'); var { Image, StyleSheet, View -} = React; +} = ReactNative; var styles = StyleSheet.create({ box: { diff --git a/Examples/UIExplorer/CameraRollExample.js b/Examples/UIExplorer/CameraRollExample.js index d431560722f26e..9716e6b8030408 100644 --- a/Examples/UIExplorer/CameraRollExample.js +++ b/Examples/UIExplorer/CameraRollExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { CameraRoll, Image, @@ -25,7 +26,7 @@ const { Text, View, TouchableOpacity -} = React; +} = ReactNative; const CameraRollView = require('./CameraRollView'); diff --git a/Examples/UIExplorer/CameraRollView.js b/Examples/UIExplorer/CameraRollView.js index 73491d2a5693e2..3dca7867f711b5 100644 --- a/Examples/UIExplorer/CameraRollView.js +++ b/Examples/UIExplorer/CameraRollView.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ActivityIndicatorIOS, CameraRoll, @@ -25,7 +26,7 @@ var { Platform, StyleSheet, View, -} = React; +} = ReactNative; var groupByEveryN = require('groupByEveryN'); var logError = require('logError'); diff --git a/Examples/UIExplorer/ClipboardExample.js b/Examples/UIExplorer/ClipboardExample.js index fa2814a2a7d8ea..59373f9fd198d7 100644 --- a/Examples/UIExplorer/ClipboardExample.js +++ b/Examples/UIExplorer/ClipboardExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Clipboard, View, Text, -} = React; +} = ReactNative; var ClipboardExample = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/DatePickerAndroidExample.js b/Examples/UIExplorer/DatePickerAndroidExample.js index 355d8cbd232c07..42740cf90229c3 100644 --- a/Examples/UIExplorer/DatePickerAndroidExample.js +++ b/Examples/UIExplorer/DatePickerAndroidExample.js @@ -13,13 +13,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { DatePickerAndroid, StyleSheet, Text, TouchableWithoutFeedback, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/DatePickerIOSExample.js b/Examples/UIExplorer/DatePickerIOSExample.js index fc7686880adff5..412f2af33e5201 100644 --- a/Examples/UIExplorer/DatePickerIOSExample.js +++ b/Examples/UIExplorer/DatePickerIOSExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { DatePickerIOS, StyleSheet, Text, TextInput, View, -} = React; +} = ReactNative; var DatePickerExample = React.createClass({ getDefaultProps: function () { diff --git a/Examples/UIExplorer/GeolocationExample.js b/Examples/UIExplorer/GeolocationExample.js index 61d7d3778bda63..98177f437650d2 100644 --- a/Examples/UIExplorer/GeolocationExample.js +++ b/Examples/UIExplorer/GeolocationExample.js @@ -17,12 +17,13 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = 'Geolocation'; diff --git a/Examples/UIExplorer/ImageCapInsetsExample.js b/Examples/UIExplorer/ImageCapInsetsExample.js index f75f7da98d30eb..48a9a986298f05 100644 --- a/Examples/UIExplorer/ImageCapInsetsExample.js +++ b/Examples/UIExplorer/ImageCapInsetsExample.js @@ -16,13 +16,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, Text, View, -} = React; +} = ReactNative; var ImageCapInsetsExample = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/ImageEditingExample.js b/Examples/UIExplorer/ImageEditingExample.js index 8cd966f62c2f2a..20e710f9215c9b 100644 --- a/Examples/UIExplorer/ImageEditingExample.js +++ b/Examples/UIExplorer/ImageEditingExample.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { CameraRoll, Image, @@ -29,7 +30,7 @@ var { TouchableHighlight, UIManager, View, -} = React; +} = ReactNative; var PAGE_SIZE = 20; diff --git a/Examples/UIExplorer/ImageExample.js b/Examples/UIExplorer/ImageExample.js index 4fb0722d854b98..3b640859dd5155 100644 --- a/Examples/UIExplorer/ImageExample.js +++ b/Examples/UIExplorer/ImageExample.js @@ -22,7 +22,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, Platform, @@ -30,7 +31,7 @@ var { Text, View, ActivityIndicatorIOS -} = React; +} = ReactNative; var base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg=='; diff --git a/Examples/UIExplorer/LayoutEventsExample.js b/Examples/UIExplorer/LayoutEventsExample.js index a6b0cea89c0f93..ab663c0cb1f668 100644 --- a/Examples/UIExplorer/LayoutEventsExample.js +++ b/Examples/UIExplorer/LayoutEventsExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, LayoutAnimation, StyleSheet, Text, View, -} = React; +} = ReactNative; type Layout = { x: number; diff --git a/Examples/UIExplorer/LayoutExample.js b/Examples/UIExplorer/LayoutExample.js index ef9b1c66c81b82..e60ff89c7765a6 100644 --- a/Examples/UIExplorer/LayoutExample.js +++ b/Examples/UIExplorer/LayoutExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/LinkingExample.js b/Examples/UIExplorer/LinkingExample.js index fbf36bfc071dc8..2c1a1cbd188e72 100644 --- a/Examples/UIExplorer/LinkingExample.js +++ b/Examples/UIExplorer/LinkingExample.js @@ -13,14 +13,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Linking, StyleSheet, Text, TouchableNativeFeedback, View, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var OpenURLButton = React.createClass({ diff --git a/Examples/UIExplorer/ListViewExample.js b/Examples/UIExplorer/ListViewExample.js index ef16151ed22147..5bd80b2cdde5d2 100644 --- a/Examples/UIExplorer/ListViewExample.js +++ b/Examples/UIExplorer/ListViewExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, ListView, @@ -24,7 +25,7 @@ var { RecyclerViewBackedScrollView, Text, View, -} = React; +} = ReactNative; var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/ListViewGridLayoutExample.js b/Examples/UIExplorer/ListViewGridLayoutExample.js index 4d8017335d5642..f23db0fa2d16eb 100644 --- a/Examples/UIExplorer/ListViewGridLayoutExample.js +++ b/Examples/UIExplorer/ListViewGridLayoutExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, ListView, @@ -23,7 +24,7 @@ var { StyleSheet, Text, View, -} = React; +} = ReactNative; var THUMB_URLS = [ require('./Thumbnails/like.png'), diff --git a/Examples/UIExplorer/ListViewPagingExample.js b/Examples/UIExplorer/ListViewPagingExample.js index a1406c52ff95ab..103ad958994444 100644 --- a/Examples/UIExplorer/ListViewPagingExample.js +++ b/Examples/UIExplorer/ListViewPagingExample.js @@ -16,7 +16,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, LayoutAnimation, @@ -25,7 +26,7 @@ var { Text, TouchableOpacity, View, -} = React; +} = ReactNative; var NativeModules = require('NativeModules'); var { diff --git a/Examples/UIExplorer/MapViewExample.js b/Examples/UIExplorer/MapViewExample.js index d11d3006ac470b..c236a7781b8d30 100644 --- a/Examples/UIExplorer/MapViewExample.js +++ b/Examples/UIExplorer/MapViewExample.js @@ -15,17 +15,18 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); +var { PropTypes } = React; var { Image, MapView, - PropTypes, StyleSheet, Text, TextInput, TouchableOpacity, View, -} = React; +} = ReactNative; var regionText = { latitude: '0', diff --git a/Examples/UIExplorer/ModalExample.js b/Examples/UIExplorer/ModalExample.js index a3238c76feee44..5d495206ea41fb 100644 --- a/Examples/UIExplorer/ModalExample.js +++ b/Examples/UIExplorer/ModalExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Modal, StyleSheet, @@ -23,7 +24,7 @@ var { Text, TouchableHighlight, View, -} = React; +} = ReactNative; exports.displayName = (undefined: ?string); exports.framework = 'React'; diff --git a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/BreadcrumbNavSample.js b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/BreadcrumbNavSample.js index 15251a4cf2f7e7..0b347ecb5e3536 100644 --- a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/BreadcrumbNavSample.js +++ b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/BreadcrumbNavSample.js @@ -13,7 +13,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, StyleSheet, @@ -21,7 +22,7 @@ var { Text, TouchableHighlight, TouchableOpacity -} = React; +} = ReactNative; var _getRandomRoute = function() { return { diff --git a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/JumpingNavSample.js b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/JumpingNavSample.js index aa2b9fd7df6cc6..977543aceb89ff 100644 --- a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/JumpingNavSample.js +++ b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/JumpingNavSample.js @@ -13,7 +13,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, StyleSheet, @@ -22,7 +23,7 @@ var { Text, TouchableHighlight, View, -} = React; +} = ReactNative; var _getRandomRoute = function() { return { diff --git a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/LegacyNavigatorExample.js b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/LegacyNavigatorExample.js index e728b7f4658dca..080a8b60ac630c 100644 --- a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/LegacyNavigatorExample.js +++ b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/LegacyNavigatorExample.js @@ -20,14 +20,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, ScrollView, StyleSheet, Text, TouchableHighlight, -} = React; +} = ReactNative; var BreadcrumbNavSample = require('./BreadcrumbNavSample'); var NavigationBarSample = require('./NavigationBarSample'); diff --git a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/NavigationBarSample.js b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/NavigationBarSample.js index f479b2a83e7ee5..1c7881f6865d34 100644 --- a/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/NavigationBarSample.js +++ b/Examples/UIExplorer/NavigationExperimental/LegacyNavigator/NavigationBarSample.js @@ -14,7 +14,8 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, ScrollView, @@ -22,7 +23,7 @@ var { Text, TouchableHighlight, TouchableOpacity, -} = React; +} = ReactNative; var Navigator = NavigationExperimental.LegacyNavigator; diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js index 3d97380702c222..49087e6c36e6f8 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js @@ -20,14 +20,15 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { Animated, NavigationExperimental, StyleSheet, ScrollView, -} = React; +} = ReactNative; const NavigationExampleRow = require('./NavigationExampleRow'); diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js index 447ab2051fba08..e75e7731dc244b 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js @@ -13,12 +13,13 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { NavigationExperimental, ScrollView, StyleSheet, -} = React; +} = ReactNative; const NavigationExampleRow = require('./NavigationExampleRow'); const { RootContainer: NavigationRootContainer, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationCardStackExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationCardStackExample.js index 2ac20280a70f8e..bfb84589f54e4d 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationCardStackExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationCardStackExample.js @@ -21,13 +21,14 @@ 'use strict'; const NavigationExampleRow = require('./NavigationExampleRow'); -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { NavigationExperimental, StyleSheet, ScrollView, -} = React; +} = ReactNative; const { CardStack: NavigationCardStack, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js index cdf78b17a23d40..b0bd41fb9cc450 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js @@ -22,7 +22,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const NavigationExampleRow = require('./NavigationExampleRow'); const NavigationExampleTabBar = require('./NavigationExampleTabBar'); @@ -31,7 +32,7 @@ const { ScrollView, StyleSheet, View, -} = React; +} = ReactNative; const { CardStack: NavigationCardStack, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js b/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js index 4e431e30a722b2..94a874a9a0bf8b 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js @@ -13,14 +13,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, PixelRatio, StyleSheet, View, TouchableHighlight, -} = React; +} = ReactNative; var NavigationExampleRow = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationExampleTabBar.js b/Examples/UIExplorer/NavigationExperimental/NavigationExampleTabBar.js index 6dbaab095b9bd6..445a8274b7aa9d 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationExampleTabBar.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationExampleTabBar.js @@ -13,14 +13,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, StyleSheet, Text, TouchableOpacity, View, -} = React; +} = ReactNative; const { Container: NavigationContainer, Reducer: NavigationReducer, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationExperimentalExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationExperimentalExample.js index 0781570da28df0..3d2d54e5d40fdf 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationExperimentalExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationExperimentalExample.js @@ -13,13 +13,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AsyncStorage, ScrollView, StyleSheet, View, -} = React; +} = ReactNative; var NavigationExampleRow = require('./NavigationExampleRow'); /* diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationTabsExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationTabsExample.js index ae4de59a6da8fa..9ce21f991e81ca 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationTabsExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationTabsExample.js @@ -13,13 +13,14 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { NavigationExperimental, ScrollView, StyleSheet, View, -} = React; +} = ReactNative; const { Container: NavigationContainer, RootContainer: NavigationRootContainer, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationTicTacToeExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationTicTacToeExample.js index 9831c1871f014e..24e81b85e6eee4 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationTicTacToeExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationTicTacToeExample.js @@ -16,14 +16,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigationExperimental, StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; const { Container: NavigationContainer, RootContainer: NavigationRootContainer, diff --git a/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js b/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js index e05a8c39e8397a..368944125b83f2 100644 --- a/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js +++ b/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js @@ -13,7 +13,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Navigator, StyleSheet, @@ -21,7 +22,7 @@ var { Text, TouchableHighlight, TouchableOpacity -} = React; +} = ReactNative; var _getRandomRoute = function() { return { diff --git a/Examples/UIExplorer/Navigator/JumpingNavSample.js b/Examples/UIExplorer/Navigator/JumpingNavSample.js index 54fe312c22021e..4f63f2d477ea77 100644 --- a/Examples/UIExplorer/Navigator/JumpingNavSample.js +++ b/Examples/UIExplorer/Navigator/JumpingNavSample.js @@ -13,7 +13,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Navigator, StyleSheet, @@ -22,7 +23,7 @@ var { Text, TouchableHighlight, View, -} = React; +} = ReactNative; var _getRandomRoute = function() { return { diff --git a/Examples/UIExplorer/Navigator/NavigationBarSample.js b/Examples/UIExplorer/Navigator/NavigationBarSample.js index ff44f35220fdcb..a0b4461aa75664 100644 --- a/Examples/UIExplorer/Navigator/NavigationBarSample.js +++ b/Examples/UIExplorer/Navigator/NavigationBarSample.js @@ -14,7 +14,8 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Navigator, ScrollView, @@ -22,7 +23,7 @@ var { Text, TouchableHighlight, TouchableOpacity, -} = React; +} = ReactNative; class NavButton extends React.Component { render() { diff --git a/Examples/UIExplorer/Navigator/NavigatorExample.js b/Examples/UIExplorer/Navigator/NavigatorExample.js index 7346af4542d495..1da8434b7595f3 100644 --- a/Examples/UIExplorer/Navigator/NavigatorExample.js +++ b/Examples/UIExplorer/Navigator/NavigatorExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Navigator, ScrollView, StyleSheet, Text, TouchableHighlight, -} = React; +} = ReactNative; var BreadcrumbNavSample = require('./BreadcrumbNavSample'); var NavigationBarSample = require('./NavigationBarSample'); var JumpingNavSample = require('./JumpingNavSample'); diff --git a/Examples/UIExplorer/NavigatorIOSColorsExample.js b/Examples/UIExplorer/NavigatorIOSColorsExample.js index 1735633c9d3497..2f527c1c639695 100644 --- a/Examples/UIExplorer/NavigatorIOSColorsExample.js +++ b/Examples/UIExplorer/NavigatorIOSColorsExample.js @@ -13,14 +13,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NavigatorIOS, StatusBar, StyleSheet, Text, View -} = React; +} = ReactNative; var EmptyPage = React.createClass({ diff --git a/Examples/UIExplorer/NavigatorIOSExample.js b/Examples/UIExplorer/NavigatorIOSExample.js index 3c6f19f94dfcc1..c5e9895238ee55 100644 --- a/Examples/UIExplorer/NavigatorIOSExample.js +++ b/Examples/UIExplorer/NavigatorIOSExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const ViewExample = require('./ViewExample'); const createExamplePage = require('./createExamplePage'); const { @@ -26,7 +27,7 @@ const { Text, TouchableHighlight, View, -} = React; +} = ReactNative; const EmptyPage = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/NetInfoExample.js b/Examples/UIExplorer/NetInfoExample.js index 97af9e1e00bed4..b07f086bf592c0 100644 --- a/Examples/UIExplorer/NetInfoExample.js +++ b/Examples/UIExplorer/NetInfoExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { NetInfo, Text, View, TouchableWithoutFeedback, -} = React; +} = ReactNative; const ConnectionInfoSubscription = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/PanResponderExample.js b/Examples/UIExplorer/PanResponderExample.js index 88ff10fe2d0e9e..00c5ac3192f0ad 100644 --- a/Examples/UIExplorer/PanResponderExample.js +++ b/Examples/UIExplorer/PanResponderExample.js @@ -22,13 +22,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { PanResponder, StyleSheet, View, processColor, -} = React; +} = ReactNative; var CIRCLE_SIZE = 80; diff --git a/Examples/UIExplorer/PickerAndroidExample.js b/Examples/UIExplorer/PickerAndroidExample.js index cdbc649626b4de..df29e3178da3aa 100644 --- a/Examples/UIExplorer/PickerAndroidExample.js +++ b/Examples/UIExplorer/PickerAndroidExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const StyleSheet = require('StyleSheet'); const UIExplorerBlock = require('UIExplorerBlock'); const UIExplorerPage = require('UIExplorerPage'); @@ -24,7 +25,7 @@ const { Picker, Text, TouchableWithoutFeedback, -} = React; +} = ReactNative; const Item = Picker.Item; const PickerExample = React.createClass({ diff --git a/Examples/UIExplorer/PickerIOSExample.js b/Examples/UIExplorer/PickerIOSExample.js index 51b8f9f30e762e..4550759d099649 100644 --- a/Examples/UIExplorer/PickerIOSExample.js +++ b/Examples/UIExplorer/PickerIOSExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { PickerIOS, Text, View, -} = React; +} = ReactNative; var PickerItemIOS = PickerIOS.Item; diff --git a/Examples/UIExplorer/PointerEventsExample.js b/Examples/UIExplorer/PointerEventsExample.js index 4ca8e9a164dcc7..9e40ed2fac950e 100644 --- a/Examples/UIExplorer/PointerEventsExample.js +++ b/Examples/UIExplorer/PointerEventsExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, -} = React; +} = ReactNative; var ExampleBox = React.createClass({ getInitialState: function() { diff --git a/Examples/UIExplorer/ProgressViewIOSExample.js b/Examples/UIExplorer/ProgressViewIOSExample.js index e294a33708122a..2cc816015487e7 100644 --- a/Examples/UIExplorer/ProgressViewIOSExample.js +++ b/Examples/UIExplorer/ProgressViewIOSExample.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ProgressViewIOS, StyleSheet, View, -} = React; +} = ReactNative; var TimerMixin = require('react-timer-mixin'); var ProgressViewExample = React.createClass({ diff --git a/Examples/UIExplorer/PushNotificationIOSExample.js b/Examples/UIExplorer/PushNotificationIOSExample.js index 9fcf8cd1c343ed..9dd4de4e15b967 100644 --- a/Examples/UIExplorer/PushNotificationIOSExample.js +++ b/Examples/UIExplorer/PushNotificationIOSExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AlertIOS, PushNotificationIOS, @@ -23,7 +24,7 @@ var { Text, TouchableHighlight, View, -} = React; +} = ReactNative; var Button = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/RCTRootViewIOSExample.js b/Examples/UIExplorer/RCTRootViewIOSExample.js index 5aa56cf881e44d..e7942d2f97f4cc 100644 --- a/Examples/UIExplorer/RCTRootViewIOSExample.js +++ b/Examples/UIExplorer/RCTRootViewIOSExample.js @@ -16,12 +16,13 @@ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { StyleSheet, Text, View, -} = React; +} = ReactNative; const requireNativeComponent = require('requireNativeComponent'); diff --git a/Examples/UIExplorer/RefreshControlExample.js b/Examples/UIExplorer/RefreshControlExample.js index f56c9fed51884b..b6bca3013169f5 100644 --- a/Examples/UIExplorer/RefreshControlExample.js +++ b/Examples/UIExplorer/RefreshControlExample.js @@ -14,7 +14,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { ScrollView, StyleSheet, @@ -22,7 +23,7 @@ const { Text, TouchableWithoutFeedback, View, -} = React; +} = ReactNative; const styles = StyleSheet.create({ row: { diff --git a/Examples/UIExplorer/RootViewSizeFlexibilityExampleApp.js b/Examples/UIExplorer/RootViewSizeFlexibilityExampleApp.js index 9c48357033fb99..285404a3854c4e 100644 --- a/Examples/UIExplorer/RootViewSizeFlexibilityExampleApp.js +++ b/Examples/UIExplorer/RootViewSizeFlexibilityExampleApp.js @@ -15,13 +15,14 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; class RootViewSizeFlexibilityExampleApp extends React.Component { state: any; diff --git a/Examples/UIExplorer/ScrollViewExample.js b/Examples/UIExplorer/ScrollViewExample.js index 469c9a63c11377..358c8f66a4e722 100644 --- a/Examples/UIExplorer/ScrollViewExample.js +++ b/Examples/UIExplorer/ScrollViewExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ScrollView, StyleSheet, @@ -23,7 +24,7 @@ var { TouchableOpacity, View, Image -} = React; +} = ReactNative; exports.displayName = (undefined: ?string); exports.title = ''; diff --git a/Examples/UIExplorer/ScrollViewSimpleExample.js b/Examples/UIExplorer/ScrollViewSimpleExample.js index c9bbe74072153d..a2bd4462171220 100644 --- a/Examples/UIExplorer/ScrollViewSimpleExample.js +++ b/Examples/UIExplorer/ScrollViewSimpleExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ScrollView, StyleSheet, Text, TouchableOpacity -} = React; +} = ReactNative; var NUM_ITEMS = 20; diff --git a/Examples/UIExplorer/SegmentedControlIOSExample.js b/Examples/UIExplorer/SegmentedControlIOSExample.js index a0794d1b7d9b8c..b76fcb4a808575 100644 --- a/Examples/UIExplorer/SegmentedControlIOSExample.js +++ b/Examples/UIExplorer/SegmentedControlIOSExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { SegmentedControlIOS, Text, View, StyleSheet -} = React; +} = ReactNative; var BasicSegmentedControlExample = React.createClass({ render() { diff --git a/Examples/UIExplorer/SetPropertiesExampleApp.js b/Examples/UIExplorer/SetPropertiesExampleApp.js index f5dc9c8eab39b0..6d0be80347d33f 100644 --- a/Examples/UIExplorer/SetPropertiesExampleApp.js +++ b/Examples/UIExplorer/SetPropertiesExampleApp.js @@ -15,11 +15,12 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { Text, View, -} = React; +} = ReactNative; class SetPropertiesExampleApp extends React.Component { diff --git a/Examples/UIExplorer/SliderExample.js b/Examples/UIExplorer/SliderExample.js index edf44d98021a94..15fa624647a67e 100644 --- a/Examples/UIExplorer/SliderExample.js +++ b/Examples/UIExplorer/SliderExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Slider, Text, StyleSheet, View, -} = React; +} = ReactNative; var SliderExample = React.createClass({ getDefaultProps() { diff --git a/Examples/UIExplorer/SliderIOSExample.js b/Examples/UIExplorer/SliderIOSExample.js index baee69ae8f021f..963b0e75386bc6 100644 --- a/Examples/UIExplorer/SliderIOSExample.js +++ b/Examples/UIExplorer/SliderIOSExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { SliderIOS, Text, StyleSheet, View, -} = React; +} = ReactNative; var SliderExample = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/SnapshotExample.js b/Examples/UIExplorer/SnapshotExample.js index d843acee80d3fb..72f58ee7e1f458 100644 --- a/Examples/UIExplorer/SnapshotExample.js +++ b/Examples/UIExplorer/SnapshotExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, Text, UIManager, View, -} = React; +} = ReactNative; var ScreenshotExample = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/StatusBarExample.js b/Examples/UIExplorer/StatusBarExample.js index 27acf7e26baf93..7026a8f29aee53 100644 --- a/Examples/UIExplorer/StatusBarExample.js +++ b/Examples/UIExplorer/StatusBarExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { StatusBar, StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = ''; diff --git a/Examples/UIExplorer/StatusBarIOSExample.js b/Examples/UIExplorer/StatusBarIOSExample.js index a7765d8563ac47..27a00de4993084 100644 --- a/Examples/UIExplorer/StatusBarIOSExample.js +++ b/Examples/UIExplorer/StatusBarIOSExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, View, Text, TouchableHighlight, StatusBarIOS, -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = 'StatusBarIOS'; diff --git a/Examples/UIExplorer/SwitchExample.js b/Examples/UIExplorer/SwitchExample.js index 5ab41fe15a2f0e..02851057370818 100644 --- a/Examples/UIExplorer/SwitchExample.js +++ b/Examples/UIExplorer/SwitchExample.js @@ -15,12 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { + Platform, Switch, Text, View -} = React; +} = ReactNative; var BasicSwitchExample = React.createClass({ getInitialState() { @@ -144,7 +146,7 @@ var examples = [ } ]; -if (React.Platform.OS === 'ios') { +if (Platform.OS === 'ios') { examples.push({ title: 'Custom colors can be provided', render(): ReactElement { return ; } diff --git a/Examples/UIExplorer/TabBarIOSExample.js b/Examples/UIExplorer/TabBarIOSExample.js index eccc84cbed4de1..0c5d95de15a6cc 100644 --- a/Examples/UIExplorer/TabBarIOSExample.js +++ b/Examples/UIExplorer/TabBarIOSExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, TabBarIOS, Text, View, -} = React; +} = ReactNative; var base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg=='; diff --git a/Examples/UIExplorer/TextExample.android.js b/Examples/UIExplorer/TextExample.android.js index 7c0c7868f4c435..0d7efa1d5fd72b 100644 --- a/Examples/UIExplorer/TextExample.android.js +++ b/Examples/UIExplorer/TextExample.android.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, Text, View, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/TextExample.ios.js b/Examples/UIExplorer/TextExample.ios.js index 3de37c42349d37..4e0d8dba0b3a6b 100644 --- a/Examples/UIExplorer/TextExample.ios.js +++ b/Examples/UIExplorer/TextExample.ios.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, Text, View, -} = React; +} = ReactNative; var Entity = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/TextInputExample.android.js b/Examples/UIExplorer/TextInputExample.android.js index 2c8b48d645faa8..22b1a054db18b5 100644 --- a/Examples/UIExplorer/TextInputExample.android.js +++ b/Examples/UIExplorer/TextInputExample.android.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, TextInput, View, StyleSheet, -} = React; +} = ReactNative; var TextEventsExample = React.createClass({ getInitialState: function() { diff --git a/Examples/UIExplorer/TextInputExample.ios.js b/Examples/UIExplorer/TextInputExample.ios.js index 239197dbacbb9e..8d6627a9048018 100644 --- a/Examples/UIExplorer/TextInputExample.ios.js +++ b/Examples/UIExplorer/TextInputExample.ios.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, TextInput, View, StyleSheet, -} = React; +} = ReactNative; var WithLabel = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/TimePickerAndroidExample.js b/Examples/UIExplorer/TimePickerAndroidExample.js index 06733fc35c881e..60ef949ddf4d75 100644 --- a/Examples/UIExplorer/TimePickerAndroidExample.js +++ b/Examples/UIExplorer/TimePickerAndroidExample.js @@ -13,13 +13,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { TimePickerAndroid, StyleSheet, Text, TouchableWithoutFeedback, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/TimerExample.js b/Examples/UIExplorer/TimerExample.js index 51a8f1af557ce6..b2a39b74988ec0 100644 --- a/Examples/UIExplorer/TimerExample.js +++ b/Examples/UIExplorer/TimerExample.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AlertIOS, Platform, ToastAndroid, View, -} = React; +} = ReactNative; var TimerMixin = require('react-timer-mixin'); var UIExplorerButton = require('./UIExplorerButton'); diff --git a/Examples/UIExplorer/ToastAndroidExample.android.js b/Examples/UIExplorer/ToastAndroidExample.android.js index 7f9cedf079ab90..9bb8aaa0b7aac1 100644 --- a/Examples/UIExplorer/ToastAndroidExample.android.js +++ b/Examples/UIExplorer/ToastAndroidExample.android.js @@ -16,13 +16,14 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, ToastAndroid, TouchableWithoutFeedback, -} = React; +} = ReactNative; var UIExplorerBlock = require('UIExplorerBlock'); var UIExplorerPage = require('UIExplorerPage'); diff --git a/Examples/UIExplorer/ToolbarAndroidExample.android.js b/Examples/UIExplorer/ToolbarAndroidExample.android.js index 769737a33e9fba..95decb766816dc 100644 --- a/Examples/UIExplorer/ToolbarAndroidExample.android.js +++ b/Examples/UIExplorer/ToolbarAndroidExample.android.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, -} = React; +} = ReactNative; var UIExplorerBlock = require('./UIExplorerBlock'); var UIExplorerPage = require('./UIExplorerPage'); diff --git a/Examples/UIExplorer/TouchableExample.js b/Examples/UIExplorer/TouchableExample.js index 5b28f2e134d40c..5e7243c8dee6a8 100644 --- a/Examples/UIExplorer/TouchableExample.js +++ b/Examples/UIExplorer/TouchableExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { PixelRatio, Image, @@ -27,7 +28,7 @@ var { Platform, TouchableNativeFeedback, View, -} = React; +} = ReactNative; exports.displayName = (undefined: ?string); exports.description = 'Touchable and onPress examples.'; diff --git a/Examples/UIExplorer/TransformExample.js b/Examples/UIExplorer/TransformExample.js index 01a2813d41c592..3ce782b1c62436 100644 --- a/Examples/UIExplorer/TransformExample.js +++ b/Examples/UIExplorer/TransformExample.js @@ -14,13 +14,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Animated, StyleSheet, Text, View, -} = React; +} = ReactNative; var Flip = React.createClass({ getInitialState() { diff --git a/Examples/UIExplorer/TransparentHitTestExample.js b/Examples/UIExplorer/TransparentHitTestExample.js index 755582da3295a7..ac9431944223f0 100644 --- a/Examples/UIExplorer/TransparentHitTestExample.js +++ b/Examples/UIExplorer/TransparentHitTestExample.js @@ -11,12 +11,13 @@ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, View, TouchableOpacity, -} = React; +} = ReactNative; var TransparentHitTestExample = React.createClass({ render: function() { diff --git a/Examples/UIExplorer/UIExplorerApp.android.js b/Examples/UIExplorer/UIExplorerApp.android.js index c8e451e9cc59be..e3f6c349cc4185 100644 --- a/Examples/UIExplorer/UIExplorerApp.android.js +++ b/Examples/UIExplorer/UIExplorerApp.android.js @@ -16,7 +16,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { AppRegistry, BackAndroid, @@ -27,7 +28,7 @@ const { ToolbarAndroid, View, StatusBar, -} = React; +} = ReactNative; const { RootContainer: NavigationRootContainer, } = NavigationExperimental; diff --git a/Examples/UIExplorer/UIExplorerApp.ios.js b/Examples/UIExplorer/UIExplorerApp.ios.js index 92c6a1ccf0c25e..be8366c09a1db1 100644 --- a/Examples/UIExplorer/UIExplorerApp.ios.js +++ b/Examples/UIExplorer/UIExplorerApp.ios.js @@ -23,7 +23,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const UIExplorerList = require('./UIExplorerList.ios'); const UIExplorerExampleList = require('./UIExplorerExampleList'); const UIExplorerNavigationReducer = require('./UIExplorerNavigationReducer'); @@ -36,7 +37,7 @@ const { SnapshotViewIOS, StyleSheet, View, -} = React; +} = ReactNative; const { CardStack: NavigationCardStack, diff --git a/Examples/UIExplorer/UIExplorerButton.js b/Examples/UIExplorer/UIExplorerButton.js index 21f8efc8cf0451..ba6c213244f5bd 100644 --- a/Examples/UIExplorer/UIExplorerButton.js +++ b/Examples/UIExplorer/UIExplorerButton.js @@ -15,12 +15,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, TouchableHighlight, -} = React; +} = ReactNative; var UIExplorerButton = React.createClass({ propTypes: { diff --git a/Examples/UIExplorer/UIExplorerExampleList.js b/Examples/UIExplorer/UIExplorerExampleList.js index 4a81314c293c3c..29cef392201195 100644 --- a/Examples/UIExplorer/UIExplorerExampleList.js +++ b/Examples/UIExplorer/UIExplorerExampleList.js @@ -15,7 +15,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const UIExplorerActions = require('./UIExplorerActions'); const { ListView, @@ -25,7 +26,7 @@ const { TextInput, TouchableHighlight, View, -} = React; +} = ReactNative; const createExamplePage = require('./createExamplePage'); const { Container: NavigationContainer, diff --git a/Examples/UIExplorer/UIExplorerList.android.js b/Examples/UIExplorer/UIExplorerList.android.js index 97f45033898cee..6e6df6e77f714b 100644 --- a/Examples/UIExplorer/UIExplorerList.android.js +++ b/Examples/UIExplorer/UIExplorerList.android.js @@ -15,7 +15,7 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('React'); export type UIExplorerExample = { key: string; diff --git a/Examples/UIExplorer/UIExplorerNavigationReducer.js b/Examples/UIExplorer/UIExplorerNavigationReducer.js index 854e5b36eed75a..64a4f5f3481467 100644 --- a/Examples/UIExplorer/UIExplorerNavigationReducer.js +++ b/Examples/UIExplorer/UIExplorerNavigationReducer.js @@ -15,12 +15,13 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); // $FlowFixMe : This is a platform-forked component, and flow seems to only run on iOS? const UIExplorerList = require('./UIExplorerList'); const { NavigationExperimental, -} = React; +} = ReactNative; const { Reducer: NavigationReducer, } = NavigationExperimental; diff --git a/Examples/UIExplorer/URIActionMap.js b/Examples/UIExplorer/URIActionMap.js index fa2d026ca544ac..2940e0736001b8 100644 --- a/Examples/UIExplorer/URIActionMap.js +++ b/Examples/UIExplorer/URIActionMap.js @@ -15,14 +15,15 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const UIExplorerActions = require('./UIExplorerActions'); // $FlowFixMe : This is a platform-forked component, and flow seems to only run on iOS? const UIExplorerList = require('./UIExplorerList'); const { Alert, -} = React; +} = ReactNative; function PathActionMap(path: string): ?Object { // Warning! Hacky parsing for example code. Use a library for this! diff --git a/Examples/UIExplorer/VibrationExample.js b/Examples/UIExplorer/VibrationExample.js index 4e2a9f51cff4b6..e4948e54cb5811 100644 --- a/Examples/UIExplorer/VibrationExample.js +++ b/Examples/UIExplorer/VibrationExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, View, Text, TouchableHighlight, Vibration, -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = 'Vibration'; diff --git a/Examples/UIExplorer/VibrationIOSExample.js b/Examples/UIExplorer/VibrationIOSExample.js index 3596b084df504f..cce819f994ef52 100644 --- a/Examples/UIExplorer/VibrationIOSExample.js +++ b/Examples/UIExplorer/VibrationIOSExample.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, View, Text, TouchableHighlight, VibrationIOS -} = React; +} = ReactNative; exports.framework = 'React'; exports.title = 'VibrationIOS'; diff --git a/Examples/UIExplorer/ViewExample.js b/Examples/UIExplorer/ViewExample.js index deed55067e2058..4be867b27bc5ce 100644 --- a/Examples/UIExplorer/ViewExample.js +++ b/Examples/UIExplorer/ViewExample.js @@ -16,12 +16,13 @@ 'use strict'; var Platform = require('Platform'); -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, View, -} = React; +} = ReactNative; var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); var styles = StyleSheet.create({ diff --git a/Examples/UIExplorer/ViewPagerAndroidExample.android.js b/Examples/UIExplorer/ViewPagerAndroidExample.android.js index d2b1464ee9b1b3..e9fc78f4598c77 100644 --- a/Examples/UIExplorer/ViewPagerAndroidExample.android.js +++ b/Examples/UIExplorer/ViewPagerAndroidExample.android.js @@ -21,7 +21,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, StyleSheet, @@ -30,7 +31,7 @@ var { TouchableOpacity, View, ViewPagerAndroid, -} = React; +} = ReactNative; import type { ViewPagerScrollState } from 'ViewPagerAndroid'; diff --git a/Examples/UIExplorer/WebViewExample.js b/Examples/UIExplorer/WebViewExample.js index 1b5f836df601ef..9c3020ef44e846 100644 --- a/Examples/UIExplorer/WebViewExample.js +++ b/Examples/UIExplorer/WebViewExample.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, @@ -24,7 +25,7 @@ var { TouchableOpacity, View, WebView -} = React; +} = ReactNative; var HEADER = '#3b5998'; var BGWASH = 'rgba(255,255,255,0.8)'; diff --git a/Examples/UIExplorer/XHRExample.android.js b/Examples/UIExplorer/XHRExample.android.js index 55b1a51787c841..ad2693d910ed88 100644 --- a/Examples/UIExplorer/XHRExample.android.js +++ b/Examples/UIExplorer/XHRExample.android.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { ProgressBarAndroid, StyleSheet, @@ -23,7 +24,7 @@ var { TextInput, TouchableHighlight, View, -} = React; +} = ReactNative; var XHRExampleHeaders = require('./XHRExampleHeaders'); var XHRExampleCookies = require('./XHRExampleCookies'); diff --git a/Examples/UIExplorer/XHRExample.ios.js b/Examples/UIExplorer/XHRExample.ios.js index 3045e2f033286c..d28244367b4c6e 100644 --- a/Examples/UIExplorer/XHRExample.ios.js +++ b/Examples/UIExplorer/XHRExample.ios.js @@ -15,7 +15,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AlertIOS, CameraRoll, @@ -27,7 +28,7 @@ var { TextInput, TouchableHighlight, View, -} = React; +} = ReactNative; var XHRExampleHeaders = require('./XHRExampleHeaders'); var XHRExampleFetch = require('./XHRExampleFetch'); diff --git a/Examples/UIExplorer/XHRExampleCookies.js b/Examples/UIExplorer/XHRExampleCookies.js index d4cfad0e5f1489..c4e7100842d925 100644 --- a/Examples/UIExplorer/XHRExampleCookies.js +++ b/Examples/UIExplorer/XHRExampleCookies.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; var RCTNetworking = require('RCTNetworking'); diff --git a/Examples/UIExplorer/XHRExampleFetch.js b/Examples/UIExplorer/XHRExampleFetch.js index 87e8e1bb6465b9..c2d7c0076e214b 100644 --- a/Examples/UIExplorer/XHRExampleFetch.js +++ b/Examples/UIExplorer/XHRExampleFetch.js @@ -15,14 +15,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, TextInput, View, Platform, -} = React; +} = ReactNative; class XHRExampleFetch extends React.Component { diff --git a/Examples/UIExplorer/XHRExampleHeaders.js b/Examples/UIExplorer/XHRExampleHeaders.js index e83c1b071d951f..ed75ad0ad2cf3c 100644 --- a/Examples/UIExplorer/XHRExampleHeaders.js +++ b/Examples/UIExplorer/XHRExampleHeaders.js @@ -15,13 +15,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { StyleSheet, Text, TouchableHighlight, View, -} = React; +} = ReactNative; class XHRExampleHeaders extends React.Component { diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js index c003b014d1eab8..0811788f4cff86 100644 --- a/IntegrationTests/AppEventsTest.js +++ b/IntegrationTests/AppEventsTest.js @@ -11,14 +11,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { NativeAppEventEmitter, StyleSheet, Text, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var deepDiffer = require('deepDiffer'); diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js index 06ea818e4511a4..880476629f3cd8 100644 --- a/IntegrationTests/AsyncStorageTest.js +++ b/IntegrationTests/AsyncStorageTest.js @@ -10,13 +10,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AsyncStorage, Text, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var deepDiffer = require('deepDiffer'); diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js index 7724ab5d3535e2..838bd69c3e056c 100644 --- a/IntegrationTests/ImageSnapshotTest.js +++ b/IntegrationTests/ImageSnapshotTest.js @@ -10,12 +10,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var ImageSnapshotTest = React.createClass({ componentDidMount() { diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/IntegrationTests/IntegrationTestHarnessTest.js index bfc9c5d88bae08..6edefbc324e9f1 100644 --- a/IntegrationTests/IntegrationTestHarnessTest.js +++ b/IntegrationTests/IntegrationTestHarnessTest.js @@ -11,12 +11,13 @@ 'use strict'; var requestAnimationFrame = require('fbjs/lib/requestAnimationFrame'); -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Text, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var IntegrationTestHarnessTest = React.createClass({ propTypes: { diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js index 54fca9a4bd4908..0812dc0b4c02a3 100644 --- a/IntegrationTests/IntegrationTestsApp.js +++ b/IntegrationTests/IntegrationTestsApp.js @@ -10,7 +10,8 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, ScrollView, @@ -18,7 +19,7 @@ var { Text, TouchableOpacity, View, -} = React; +} = ReactNative; // Keep this list in sync with UIExplorerIntegrationTests.m var TESTS = [ diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js index 2cfe13f9b9dd78..a7c73ea7add592 100644 --- a/IntegrationTests/LayoutEventsTest.js +++ b/IntegrationTests/LayoutEventsTest.js @@ -11,15 +11,16 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { Image, LayoutAnimation, StyleSheet, Text, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var deepDiffer = require('deepDiffer'); diff --git a/IntegrationTests/PromiseTest.js b/IntegrationTests/PromiseTest.js index 563655c3d7112a..a99880fd92cec5 100644 --- a/IntegrationTests/PromiseTest.js +++ b/IntegrationTests/PromiseTest.js @@ -10,8 +10,10 @@ */ 'use strict'; -var React = require('react-native'); -var { TestModule } = React.NativeModules; +var React = require('react'); +var ReactNative = require('react-native'); +var { View } = ReactNative; +var { TestModule } = ReactNative.NativeModules; var PromiseTest = React.createClass({ shouldResolve: false, @@ -64,7 +66,7 @@ var PromiseTest = React.createClass({ }, render() : ReactElement { - return ; + return ; } }); diff --git a/IntegrationTests/PropertiesUpdateTest.js b/IntegrationTests/PropertiesUpdateTest.js index da563ec94a553a..aac7289e1a6471 100644 --- a/IntegrationTests/PropertiesUpdateTest.js +++ b/IntegrationTests/PropertiesUpdateTest.js @@ -8,12 +8,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { View, -} = React; +} = ReactNative; -var { TestModule } = React.addons; +var { TestModule } = ReactNative.NativeModules; var PropertiesUpdateTest = React.createClass({ diff --git a/IntegrationTests/RCTRootViewIntegrationTestApp.js b/IntegrationTests/RCTRootViewIntegrationTestApp.js index 5a126a60192098..a81317d5045b27 100644 --- a/IntegrationTests/RCTRootViewIntegrationTestApp.js +++ b/IntegrationTests/RCTRootViewIntegrationTestApp.js @@ -12,7 +12,8 @@ require('regenerator/runtime'); -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var { AppRegistry, @@ -21,7 +22,7 @@ var { Text, TouchableOpacity, View, -} = React; +} = ReactNative; /* Keep this list in sync with RCTRootViewIntegrationTests.m */ var TESTS = [ diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js index 73e1c5f5d3d391..94b31e2f3df9b1 100644 --- a/IntegrationTests/ReactContentSizeUpdateTest.js +++ b/IntegrationTests/ReactContentSizeUpdateTest.js @@ -8,14 +8,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter'); var Subscribable = require('Subscribable'); var TimerMixin = require('react-timer-mixin'); -var { View } = React; +var { View } = ReactNative; -var { TestModule } = React.addons; +var { TestModule } = ReactNative.NativeModules; var reactViewWidth = 101; var reactViewHeight = 102; diff --git a/IntegrationTests/SimpleSnapshotTest.js b/IntegrationTests/SimpleSnapshotTest.js index 181077acd17585..94ce08494162cf 100644 --- a/IntegrationTests/SimpleSnapshotTest.js +++ b/IntegrationTests/SimpleSnapshotTest.js @@ -10,14 +10,15 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var requestAnimationFrame = require('fbjs/lib/requestAnimationFrame'); var { StyleSheet, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var SimpleSnapshotTest = React.createClass({ componentDidMount() { diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js index ddc016b70ac67e..4404bb16ba5daf 100644 --- a/IntegrationTests/SizeFlexibilityUpdateTest.js +++ b/IntegrationTests/SizeFlexibilityUpdateTest.js @@ -8,12 +8,13 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter'); var Subscribable = require('Subscribable'); -var { View } = React; +var { View } = ReactNative; -var { TestModule } = React.addons; +var { TestModule } = ReactNative.NativeModules; var reactViewWidth = 111; var reactViewHeight = 222; diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js index 56fa9235ccb87e..c3be70be30dee5 100644 --- a/IntegrationTests/TimersTest.js +++ b/IntegrationTests/TimersTest.js @@ -10,15 +10,16 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var TimerMixin = require('react-timer-mixin'); var { StyleSheet, Text, View, -} = React; -var { TestModule } = React.NativeModules; +} = ReactNative; +var { TestModule } = ReactNative.NativeModules; var TimersTest = React.createClass({ mixins: [TimerMixin], diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js index b01c3f03462340..a1a618a3a27b77 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js @@ -39,7 +39,7 @@ const NavigationContainer = require('NavigationContainer'); const NavigationPagerPanResponder = require('NavigationPagerPanResponder'); const NavigationPagerStyleInterpolator = require('NavigationPagerStyleInterpolator'); const NavigationPropTypes = require('NavigationPropTypes'); -const React = require('react-native'); +const React = require('React'); const ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin'); const StyleSheet = require('StyleSheet'); const View = require('View'); diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js index 114008d3701d60..064986f9189d97 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js @@ -32,7 +32,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('React'); +const ReactNative = require('react-native'); const NavigationContainer = require('NavigationContainer'); const NavigationHeaderTitle = require('NavigationHeaderTitle'); const NavigationHeaderBackButton = require('NavigationHeaderBackButton'); @@ -45,7 +46,7 @@ const { Platform, StyleSheet, View, -} = React; +} = ReactNative; import type { NavigationSceneRenderer, diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js index 4cd4a867676c9b..f72ecda84b27af 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js @@ -16,7 +16,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const NavigationContainer = require('NavigationContainer'); const NavigationRootContainer = require('NavigationRootContainer'); @@ -25,7 +26,7 @@ const { Platform, StyleSheet, TouchableOpacity, -} = React; +} = ReactNative; type Props = { onNavigate: Function diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js index 94fd4c00a8d409..282f1df9c8ea56 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js @@ -27,14 +27,15 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { Platform, StyleSheet, View, Text, -} = React; +} = ReactNative; type Props = { children: ReactElement; diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationLegacyNavigator.js b/Libraries/CustomComponents/NavigationExperimental/NavigationLegacyNavigator.js index 1642f526d805b0..ae347dc4b98d8d 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationLegacyNavigator.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationLegacyNavigator.js @@ -45,7 +45,7 @@ const NavigationPagerStyleInterpolator = require('NavigationPagerStyleInterpolat const NavigatorBreadcrumbNavigationBar = require('NavigatorBreadcrumbNavigationBar'); const NavigatorNavigationBar = require('NavigatorNavigationBar'); const NavigatorSceneConfigs = require('NavigatorSceneConfigs'); -const React = require('react-native'); +const React = require('React'); const ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin'); import type { diff --git a/Libraries/Experimental/IncrementalExample.js b/Libraries/Experimental/IncrementalExample.js index 1c1e107cc5b07f..1fb3cebc2dcccf 100644 --- a/Libraries/Experimental/IncrementalExample.js +++ b/Libraries/Experimental/IncrementalExample.js @@ -16,7 +16,8 @@ */ 'use strict'; -const React = require('react-native'); +const React = require('react'); +const ReactNative = require('react-native'); const { InteractionManager, ScrollView, @@ -24,7 +25,7 @@ const { Text, TouchableOpacity, View, -} = React; +} = ReactNative; const Incremental = require('Incremental'); const IncrementalGroup = require('IncrementalGroup'); diff --git a/Libraries/NavigationExperimental/NavigationAnimatedView.js b/Libraries/NavigationExperimental/NavigationAnimatedView.js index e2635e26712c7e..0ef8fb8471b052 100644 --- a/Libraries/NavigationExperimental/NavigationAnimatedView.js +++ b/Libraries/NavigationExperimental/NavigationAnimatedView.js @@ -15,7 +15,7 @@ const Animated = require('Animated'); const NavigationContainer = require('NavigationContainer'); const NavigationPropTypes = require('NavigationPropTypes'); const NavigationScenesReducer = require('NavigationScenesReducer'); -const React = require('react-native'); +const React = require('React'); const StyleSheet = require('StyleSheet'); const View = require('View'); diff --git a/Libraries/NavigationExperimental/NavigationPropTypes.js b/Libraries/NavigationExperimental/NavigationPropTypes.js index ef163d8a17fae6..3355bec1f3f994 100644 --- a/Libraries/NavigationExperimental/NavigationPropTypes.js +++ b/Libraries/NavigationExperimental/NavigationPropTypes.js @@ -23,7 +23,7 @@ import type { */ const Animated = require('Animated'); -const React = require('react-native'); +const React = require('React'); const {PropTypes} = React; diff --git a/Libraries/NavigationExperimental/NavigationView.js b/Libraries/NavigationExperimental/NavigationView.js index c79466d7a8ff16..91fea56cf09bea 100644 --- a/Libraries/NavigationExperimental/NavigationView.js +++ b/Libraries/NavigationExperimental/NavigationView.js @@ -13,7 +13,7 @@ const Animated = require('Animated'); const NavigationContainer = require('NavigationContainer'); -const React = require('react-native'); +const React = require('React'); const StyleSheet = require('StyleSheet'); const View = require('View'); const NavigationScenesReducer = require('NavigationScenesReducer'); diff --git a/Libraries/Text/TextUpdateTest.js b/Libraries/Text/TextUpdateTest.js index c4218f73d5a40a..5a4e7e01cb6ba9 100644 --- a/Libraries/Text/TextUpdateTest.js +++ b/Libraries/Text/TextUpdateTest.js @@ -16,13 +16,14 @@ */ 'use strict'; -var React = require('react-native'); +var React = require('react'); +var ReactNative = require('react-native'); var TimerMixin = require('react-timer-mixin'); var { NativeModules, StyleSheet, Text, -} = React; +} = ReactNative; var TestManager = NativeModules.TestManager || NativeModules.SnapshotTestManager;