Skip to content

Commit

Permalink
Merge pull request graphql#263 from acao/upgrade-eslint
Browse files Browse the repository at this point in the history
upgrade eslint
  • Loading branch information
acao committed May 28, 2019
2 parents 7f1460c + fcb1998 commit f62040b
Show file tree
Hide file tree
Showing 4 changed files with 370 additions and 419 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@
"@babel/plugin-proposal-class-properties": "7.4.4",
"@babel/preset-env": "7.4.4",
"@babel/preset-flow": "7.0.0",
"babel-eslint": "7.2.3",
"babel-eslint": "10.0.1",
"chai": "4.1.1",
"chai-subset": "1.5.0",
"codemirror": "^5.28.0",
"eslint": "^4.5.0",
"eslint-plugin-babel": "4.1.2",
"eslint-plugin-flowtype": "2.35.0",
"eslint": "^5.16.0",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-flowtype": "3.9.1",
"flow-bin": "^0.56.0",
"graphql": "^14.0.2",
"jsdom": "^11.2.0",
"mocha": "3.5.0",
"prettier": "^1.4.4",
"prettier": "^1.17.1",
"sane": "2.0.0"
}
}
10 changes: 5 additions & 5 deletions src/utils/getTypeInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ export default function getTypeInfo(schema, tokenState) {
state.prevState.kind === 'Field'
? info.fieldDef
: state.prevState.kind === 'Directive'
? info.directiveDef
: state.prevState.kind === 'AliasedField'
? state.prevState.name &&
getFieldDef(schema, info.parentType, state.prevState.name)
: null;
? info.directiveDef
: state.prevState.kind === 'AliasedField'
? state.prevState.name &&
getFieldDef(schema, info.parentType, state.prevState.name)
: null;
info.argDefs = parentDef && parentDef.args;
break;
case 'Argument':
Expand Down
4 changes: 3 additions & 1 deletion src/utils/info-addon.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ function createState(options) {
options:
options instanceof Function
? {render: options}
: options === true ? {} : options,
: options === true
? {}
: options,
};
}

Expand Down
Loading

0 comments on commit f62040b

Please sign in to comment.