Skip to content

Commit a80dd9a

Browse files
sebmarkbageFacebook Github Bot 0
authored andcommitted
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
1 parent 58db9f3 commit a80dd9a

138 files changed

Lines changed: 414 additions & 283 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Examples/2048/Game2048.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
AppRegistry,
2223
StyleSheet,
2324
Text,
2425
View,
25-
} = React;
26+
} = ReactNative;
2627

2728
var Animated = require('Animated');
2829
var GameBoard = require('GameBoard');

Examples/Movies/MovieCell.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616
'use strict';
1717

18-
var React = require('react-native');
18+
var React = require('react');
19+
var ReactNative = require('react-native');
1920
var {
2021
Image,
2122
Platform,
@@ -24,7 +25,7 @@ var {
2425
TouchableHighlight,
2526
TouchableNativeFeedback,
2627
View
27-
} = React;
28+
} = ReactNative;
2829

2930
var getStyleFromScore = require('./getStyleFromScore');
3031
var getImageSource = require('./getImageSource');

Examples/Movies/MovieScreen.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
*/
1616
'use strict';
1717

18-
var React = require('react-native');
18+
var React = require('react');
19+
var ReactNative = require('react-native');
1920
var {
2021
Image,
2122
ScrollView,
2223
StyleSheet,
2324
Text,
2425
View,
25-
} = React;
26+
} = ReactNative;
2627

2728
var getImageSource = require('./getImageSource');
2829
var getStyleFromScore = require('./getStyleFromScore');

Examples/Movies/MoviesApp.android.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
AppRegistry,
2223
BackAndroid,
2324
Navigator,
2425
StyleSheet,
2526
ToolbarAndroid,
2627
View,
27-
} = React;
28+
} = ReactNative;
2829

2930
var MovieScreen = require('./MovieScreen');
3031
var SearchScreen = require('./SearchScreen');

Examples/Movies/MoviesApp.ios.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
AppRegistry,
2223
NavigatorIOS,
2324
StyleSheet,
24-
} = React;
25+
} = ReactNative;
2526

2627
var SearchScreen = require('./SearchScreen');
2728

Examples/Movies/SearchBar.android.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
Image,
2223
Platform,
@@ -25,7 +26,7 @@ var {
2526
StyleSheet,
2627
TouchableNativeFeedback,
2728
View,
28-
} = React;
29+
} = ReactNative;
2930

3031
var IS_RIPPLE_EFFECT_SUPPORTED = Platform.Version >= 21;
3132

Examples/Movies/SearchBar.ios.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
ActivityIndicatorIOS,
2223
TextInput,
2324
StyleSheet,
2425
View,
25-
} = React;
26+
} = ReactNative;
2627

2728
var SearchBar = React.createClass({
2829
render: function() {

Examples/Movies/SearchScreen.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616
'use strict';
1717

18-
var React = require('react-native');
18+
var React = require('react');
19+
var ReactNative = require('react-native');
1920
var {
2021
ActivityIndicatorIOS,
2122
ListView,
@@ -24,7 +25,7 @@ var {
2425
StyleSheet,
2526
Text,
2627
View,
27-
} = React;
28+
} = ReactNative;
2829
var TimerMixin = require('react-timer-mixin');
2930

3031
var invariant = require('fbjs/lib/invariant');

Examples/Movies/getStyleFromScore.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
'use strict';
1717

18-
var React = require('react-native');
18+
var ReactNative = require('react-native');
1919
var {
2020
StyleSheet,
21-
} = React;
21+
} = ReactNative;
2222

2323
var MAX_VALUE = 200;
2424

Examples/TicTacToe/TicTacToeApp.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
*/
1717
'use strict';
1818

19-
var React = require('react-native');
19+
var React = require('react');
20+
var ReactNative = require('react-native');
2021
var {
2122
AppRegistry,
2223
StyleSheet,
2324
Text,
2425
TouchableHighlight,
2526
View,
26-
} = React;
27+
} = ReactNative;
2728

2829
class Board {
2930
grid: Array<Array<number>>;

0 commit comments

Comments
 (0)