Skip to content

Commit

Permalink
Merge pull request #1290 from samwgoldman/master
Browse files Browse the repository at this point in the history
Update to Flow v0.68
  • Loading branch information
kassens authored Mar 16, 2018
2 parents 70f008e + 207a2fd commit 3fe5dee
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
[libs]

[options]
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)?)\\)?:? #[0-9]+

[version]
^0.66.0
^0.68.0
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"eslint-plugin-babel": "4.1.2",
"eslint-plugin-flowtype": "2.42.0",
"eslint-plugin-prettier": "2.6.0",
"flow-bin": "0.66.0",
"flow-bin": "0.68.0",
"isparta": "4.0.0",
"mocha": "5.0.0",
"prettier": "1.10.2",
Expand Down
1 change: 1 addition & 0 deletions src/error/locatedError.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function locatedError(
): GraphQLError {
// Note: this uses a brand-check to support GraphQL errors originating from
// other contexts.
// $FlowFixMe(>=0.68.0)
if (originalError && Array.isArray(originalError.path)) {
return (originalError: any);
}
Expand Down
2 changes: 2 additions & 0 deletions src/subscription/mapAsyncIterator.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default function mapAsyncIterator<T, U>(
const iterator = getAsyncIterator(iterable);
let $return;
let abruptClose;
// $FlowFixMe(>=0.68.0)
if (typeof iterator.return === 'function') {
$return = iterator.return;
abruptClose = error => {
Expand Down Expand Up @@ -56,6 +57,7 @@ export default function mapAsyncIterator<T, U>(
: Promise.resolve({ value: undefined, done: true });
},
throw(error) {
// $FlowFixMe(>=0.68.0)
if (typeof iterator.throw === 'function') {
return iterator.throw(error).then(mapResult, mapReject);
}
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1390,9 +1390,9 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"

flow-bin@0.66.0:
version "0.66.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.66.0.tgz#a96dde7015dc3343fd552a7b4963c02be705ca26"
flow-bin@0.68.0:
version "0.68.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.68.0.tgz#86c2d14857d306eb2e85e274f2eebf543564f623"

for-in@^1.0.1:
version "1.0.2"
Expand Down

0 comments on commit 3fe5dee

Please sign in to comment.