From 301c01260dd05327bd54a6232bae5238be497510 Mon Sep 17 00:00:00 2001 From: James Ide Date: Tue, 30 Jun 2015 13:45:28 -0700 Subject: [PATCH] [Flow] Update flowconfig's version req to 0.13.1, fix Movies example typechecking This should fix tests. Test Plan: Run Travis CI tests. Also run the movies app and verify that there are no invariant violations. --- .flowconfig | 2 +- Examples/Movies/SearchScreen.js | 7 ++++--- Examples/SampleApp/_flowconfig | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.flowconfig b/.flowconfig index 56d38f308..4082e5314 100644 --- a/.flowconfig +++ b/.flowconfig @@ -45,4 +45,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-2]\\|[0-9]\\).[0-9 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -0.12.0 +0.13.1 diff --git a/Examples/Movies/SearchScreen.js b/Examples/Movies/SearchScreen.js index 21819df46..c0877d978 100644 --- a/Examples/Movies/SearchScreen.js +++ b/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) => { diff --git a/Examples/SampleApp/_flowconfig b/Examples/SampleApp/_flowconfig index 334ef7461..c2feaa128 100644 --- a/Examples/SampleApp/_flowconfig +++ b/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