Skip to content

Commit 4b734a4

Browse files
IvanGoncharovleebyron
authored andcommitted
Update flow(0.70), prettier(1.12) and other dependencies (#1319)
1 parent 5dc773e commit 4b734a4

File tree

7 files changed

+627
-108
lines changed

7 files changed

+627
-108
lines changed

.flowconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)?)\\)
1313
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)?)\\)?:? #[0-9]+
1414

1515
[version]
16-
^0.69.0
16+
^0.70.0

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"gitpublish": ". ./resources/gitpublish.sh"
4343
},
4444
"dependencies": {
45-
"iterall": "^1.2.1"
45+
"iterall": "^1.2.2"
4646
},
4747
"devDependencies": {
4848
"babel-cli": "6.26.0",
49-
"babel-eslint": "8.2.2",
49+
"babel-eslint": "8.2.3",
5050
"babel-plugin-syntax-async-functions": "6.13.0",
5151
"babel-plugin-syntax-async-generators": "6.13.0",
5252
"babel-plugin-transform-class-properties": "6.24.1",
@@ -60,13 +60,13 @@
6060
"chai-subset": "1.6.0",
6161
"coveralls": "3.0.0",
6262
"eslint": "4.19.1",
63-
"eslint-plugin-babel": "4.1.2",
64-
"eslint-plugin-flowtype": "2.46.1",
63+
"eslint-plugin-babel": "5.1.0",
64+
"eslint-plugin-flowtype": "2.46.3",
6565
"eslint-plugin-prettier": "2.6.0",
66-
"flow-bin": "0.69.0",
66+
"flow-bin": "0.70.0",
6767
"isparta": "4.0.0",
68-
"mocha": "5.0.0",
69-
"prettier": "1.11.1",
70-
"sane": "2.4.1"
68+
"mocha": "5.1.1",
69+
"prettier": "1.12.1",
70+
"sane": "2.5.0"
7171
}
7272
}

src/error/GraphQLError.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,12 @@ export function GraphQLError( // eslint-disable-line no-redeclare
100100
) {
101101
// Compute list of blame nodes.
102102
const _nodes = Array.isArray(nodes)
103-
? nodes.length !== 0 ? nodes : undefined
104-
: nodes ? [nodes] : undefined;
103+
? nodes.length !== 0
104+
? nodes
105+
: undefined
106+
: nodes
107+
? [nodes]
108+
: undefined;
105109

106110
// Compute locations in the source for the given nodes/positions.
107111
let _source = source;

src/execution/__tests__/abstract-promise-test.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ describe('Execute: Handles execution of abstract types with promises', () => {
266266
? DogType
267267
: obj instanceof Cat
268268
? CatType
269-
: obj instanceof Human ? HumanType : null,
269+
: obj instanceof Human
270+
? HumanType
271+
: null,
270272
);
271273
},
272274
fields: {
@@ -389,7 +391,9 @@ describe('Execute: Handles execution of abstract types with promises', () => {
389391
? DogType
390392
: obj instanceof Cat
391393
? CatType
392-
: obj instanceof Human ? HumanType : null,
394+
: obj instanceof Human
395+
? HumanType
396+
: null,
393397
);
394398
},
395399
types: [DogType, CatType],

src/execution/__tests__/abstract-test.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ describe('Execute: Handles execution of abstract types', () => {
189189
? DogType
190190
: obj instanceof Cat
191191
? CatType
192-
: obj instanceof Human ? HumanType : null;
192+
: obj instanceof Human
193+
? HumanType
194+
: null;
193195
},
194196
fields: {
195197
name: { type: GraphQLString },
@@ -310,7 +312,9 @@ describe('Execute: Handles execution of abstract types', () => {
310312
? DogType
311313
: obj instanceof Cat
312314
? CatType
313-
: obj instanceof Human ? HumanType : null;
315+
: obj instanceof Human
316+
? HumanType
317+
: null;
314318
},
315319
types: [DogType, CatType],
316320
});

src/type/__tests__/enumType-test.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ const QueryType = new GraphQLObjectType({
5151
resolve(value, { fromEnum, fromInt, fromString }) {
5252
return fromInt !== undefined
5353
? fromInt
54-
: fromString !== undefined ? fromString : fromEnum;
54+
: fromString !== undefined
55+
? fromString
56+
: fromEnum;
5557
},
5658
},
5759
colorInt: {

0 commit comments

Comments
 (0)