Skip to content
This repository has been archived by the owner on Sep 11, 2019. It is now read-only.

Commit

Permalink
chore: upgrade graphql and graphql-tools
Browse files Browse the repository at this point in the history
close #50
  • Loading branch information
jlengstorf committed Dec 20, 2017
1 parent 7f2211e commit ef578cb
Show file tree
Hide file tree
Showing 3 changed files with 579 additions and 411 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"lodash.merge": "^4.6.0"
},
"peerDependencies": {
"graphql": "^0.9.0 || ^0.10.0 || ^0.11.0"
"graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0"
},
"devDependencies": {
"apollo-server-express": "^1.1.2",
Expand All @@ -50,7 +50,7 @@
"eslint-config-prettier": "^2.3.0",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-prettier": "^2.1.2",
"graphql": "^0.11.7",
"graphql": "^0.12.3",
"husky": "^0.14.3",
"jest": "^22.0.0",
"nodemon": "^1.11.0",
Expand Down
3 changes: 2 additions & 1 deletion test/gramps.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ describe('GrAMPS', () => {
{
namespace: 'Baz',
schema: 'type User { name: String } type Query { me: User }',
model: req => ({ baz: 'test' }),
context: req => ({ getUser: () => ({ name: 'Test user' }) }),
resolvers: { Query: { me: (_, __, context) => context.getUser() } },
stitching: {
linkTypeDefs: 'extend type User { age: Int }',
resolvers: mergeInfo => ({
Expand Down
Loading

0 comments on commit ef578cb

Please sign in to comment.