Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to flow(0.70), prettier(1.12) and other dependencies #1319

Merged
merged 1 commit into from
Apr 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)?)\\)?:? #[0-9]+

[version]
^0.69.0
^0.70.0
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"gitpublish": ". ./resources/gitpublish.sh"
},
"dependencies": {
"iterall": "^1.2.1"
"iterall": "^1.2.2"
},
"devDependencies": {
"babel-cli": "6.26.0",
"babel-eslint": "8.2.2",
"babel-eslint": "8.2.3",
"babel-plugin-syntax-async-functions": "6.13.0",
"babel-plugin-syntax-async-generators": "6.13.0",
"babel-plugin-transform-class-properties": "6.24.1",
Expand All @@ -60,13 +60,13 @@
"chai-subset": "1.6.0",
"coveralls": "3.0.0",
"eslint": "4.19.1",
"eslint-plugin-babel": "4.1.2",
"eslint-plugin-flowtype": "2.46.1",
"eslint-plugin-babel": "5.1.0",
"eslint-plugin-flowtype": "2.46.3",
"eslint-plugin-prettier": "2.6.0",
"flow-bin": "0.69.0",
"flow-bin": "0.70.0",
"isparta": "4.0.0",
"mocha": "5.0.0",
"prettier": "1.11.1",
"sane": "2.4.1"
"mocha": "5.1.1",
"prettier": "1.12.1",
"sane": "2.5.0"
}
}
8 changes: 6 additions & 2 deletions src/error/GraphQLError.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ export function GraphQLError( // eslint-disable-line no-redeclare
) {
// Compute list of blame nodes.
const _nodes = Array.isArray(nodes)
? nodes.length !== 0 ? nodes : undefined
: nodes ? [nodes] : undefined;
? nodes.length !== 0
? nodes
: undefined
: nodes
? [nodes]
: undefined;

// Compute locations in the source for the given nodes/positions.
let _source = source;
Expand Down
8 changes: 6 additions & 2 deletions src/execution/__tests__/abstract-promise-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ describe('Execute: Handles execution of abstract types with promises', () => {
? DogType
: obj instanceof Cat
? CatType
: obj instanceof Human ? HumanType : null,
: obj instanceof Human
? HumanType
: null,
);
},
fields: {
Expand Down Expand Up @@ -389,7 +391,9 @@ describe('Execute: Handles execution of abstract types with promises', () => {
? DogType
: obj instanceof Cat
? CatType
: obj instanceof Human ? HumanType : null,
: obj instanceof Human
? HumanType
: null,
);
},
types: [DogType, CatType],
Expand Down
8 changes: 6 additions & 2 deletions src/execution/__tests__/abstract-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,9 @@ describe('Execute: Handles execution of abstract types', () => {
? DogType
: obj instanceof Cat
? CatType
: obj instanceof Human ? HumanType : null;
: obj instanceof Human
? HumanType
: null;
},
fields: {
name: { type: GraphQLString },
Expand Down Expand Up @@ -310,7 +312,9 @@ describe('Execute: Handles execution of abstract types', () => {
? DogType
: obj instanceof Cat
? CatType
: obj instanceof Human ? HumanType : null;
: obj instanceof Human
? HumanType
: null;
},
types: [DogType, CatType],
});
Expand Down
4 changes: 3 additions & 1 deletion src/type/__tests__/enumType-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ const QueryType = new GraphQLObjectType({
resolve(value, { fromEnum, fromInt, fromString }) {
return fromInt !== undefined
? fromInt
: fromString !== undefined ? fromString : fromEnum;
: fromString !== undefined
? fromString
: fromEnum;
},
},
colorInt: {
Expand Down
Loading