Merge pull request facebook#1839 from a2/Update_Wed_1_Jul

Updates from Wed 1 Jul

Author: a2

.flowconfig

@@ -40,9 +40,9 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-2]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-2]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-0.12.0
+0.13.1

.travis.yml

@@ -15,13 +15,13 @@ install:
   - cp $(brew --prefix nvm)/nvm-exec .nvm/
   - export NVM_DIR=.nvm
   - source $(brew --prefix nvm)/nvm.sh
-  - nvm install v0.10
+  - nvm install iojs-v2
   - npm config set spin=false
   - npm install
 
 script:
 - |
-  nvm use v0.10
+  nvm use iojs-v2
 
   if [ "$TEST_TYPE" = objc ]
   then

Examples/Movies/SearchScreen.js

@@ -26,6 +26,8 @@ var {
 } = React;
 var TimerMixin = require('react-timer-mixin');
 
+var invariant = require('invariant');
+
 var MovieCell = require('./MovieCell');
 var MovieScreen = require('./MovieScreen');
 
@@ -73,18 +75,16 @@ var SearchScreen = React.createClass({
     this.searchMovies('');
   },
 
-  _urlForQueryAndPage: function(query: string, pageNumber: ?number): string {
+  _urlForQueryAndPage: function(query: string, pageNumber: number): string {
     var apiKey = API_KEYS[this.state.queryNumber % API_KEYS.length];
     if (query) {
       return (
-        // $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
         API_URL + 'movies.json?apikey=' + apiKey + '&q=' +
         encodeURIComponent(query) + '&page_limit=20&page=' + pageNumber
       );
     } else {
       // With no query, load latest movies
       return (
-        // $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
         API_URL + 'lists/movies/in_theaters.json?apikey=' + apiKey +
         '&page_limit=20&page=' + pageNumber
       );
@@ -176,6 +176,7 @@ var SearchScreen = React.createClass({
     });
 
     var page = resultsCache.nextPageNumberForQuery[query];
+    invariant(page != null, 'Next page number for "%s" is missing', query);
     fetch(this._urlForQueryAndPage(query, page))
       .then((response) => response.json())
       .catch((error) => {

Examples/SampleApp/_flowconfig

@@ -33,4 +33,4 @@ node_modules/react-native/Libraries/react-native/react-native-interface.js
 module.system=haste
 
 [version]
-0.12.0
+0.13.1

Examples/UIExplorer/ActionSheetIOSExample.js

@@ -17,11 +17,12 @@
 
 var React = require('react-native');
 var {
+  ActionSheetIOS,
   StyleSheet,
   Text,
   View,
 } = React;
-var ActionSheetIOS = require('ActionSheetIOS');
+
 var BUTTONS = [
   'Button Index: 0',
   'Button Index: 1',

Examples/UIExplorer/AdSupportIOSExample.js

@@ -15,10 +15,9 @@
  */
 'use strict';
 
-var AdSupportIOS = require('AdSupportIOS');
-
 var React = require('react-native');
 var {
+  AdSupportIOS,
   StyleSheet,
   Text,
   View,

Examples/UIExplorer/MapViewExample.js

@@ -16,9 +16,9 @@
 'use strict';
 
 var React = require('react-native');
-var StyleSheet = require('StyleSheet');
 var {
   MapView,
+  StyleSheet,
   Text,
   TextInput,
   View,

Examples/UIExplorer/TransformExample.js

@@ -6,12 +6,14 @@
 'use strict';
 
 var React = require('React');
+var {
+  StyleSheet,
+  View,
+} = React;
 
-var StyleSheet = require('StyleSheet');
 var TimerMixin = require('react-timer-mixin');
-var UIExplorerBlock = require('UIExplorerBlock');
-var UIExplorerPage = require('UIExplorerPage');
-var View = require('View');
+var UIExplorerBlock = require('./UIExplorerBlock');
+var UIExplorerPage = require('./UIExplorerPage');
 
 var TransformExample = React.createClass({
 

Examples/UIExplorer/UIExplorerApp.android.js

@@ -17,14 +17,16 @@
 'use strict';
 
 var React = require('react-native');
-var Dimensions = require('Dimensions');
-var DrawerLayoutAndroid = require('DrawerLayoutAndroid');
-var ToolbarAndroid = require('ToolbarAndroid');
-var UIExplorerList = require('./UIExplorerList');
 var {
+  Dimensions,
   StyleSheet,
   View,
 } = React;
+var UIExplorerList = require('./UIExplorerList');
+
+// TODO: these should be exposed by the 'react-native' module.
+var DrawerLayoutAndroid = require('DrawerLayoutAndroid');
+var ToolbarAndroid = require('ToolbarAndroid');
 
 var DRAWER_WIDTH_LEFT = 56;
 

Examples/UIExplorer/UIExplorerList.js

@@ -21,6 +21,7 @@ var {
   ListView,
   PixelRatio,
   Platform,
+  Settings,
   StyleSheet,
   Text,
   TextInput,
@@ -29,13 +30,20 @@ var {
 } = React;
 
 var { TestModule } = React.addons;
-var Settings = require('Settings');
 
 import type { ExampleModule } from 'ExampleTypes';
 
 var createExamplePage = require('./createExamplePage');
 
 var COMMON_COMPONENTS = [
+  require('./ImageExample'),
+  require('./ListViewExample'),
+  require('./ListViewPagingExample'),
+  require('./MapViewExample'),
+  require('./Navigator/NavigatorExample'),
+  require('./ScrollViewExample'),
+  require('./TextInputExample'),
+  require('./TouchableExample'),
   require('./ViewExample'),
   require('./WebViewExample'),
 ];
@@ -51,23 +59,15 @@ if (Platform.OS === 'ios') {
   var COMPONENTS = COMMON_COMPONENTS.concat([
     require('./ActivityIndicatorIOSExample'),
     require('./DatePickerIOSExample'),
-    require('./ImageExample'),
-    require('./ListViewExample'),
-    require('./ListViewPagingExample'),
-    require('./MapViewExample'),
-    require('./Navigator/NavigatorExample'),
     require('./NavigatorIOSColorsExample'),
     require('./NavigatorIOSExample'),
     require('./PickerIOSExample'),
     require('./ProgressViewIOSExample'),
-    require('./ScrollViewExample'),
     require('./SegmentedControlIOSExample'),
     require('./SliderIOSExample'),
     require('./SwitchIOSExample'),
     require('./TabBarIOSExample'),
     require('./TextExample.ios'),
-    require('./TextInputExample'),
-    require('./TouchableExample'),
   ]);
 
   var APIS = COMMON_APIS.concat([