Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit c3e48c5

Browse files
Merge pull request #411 from graingert/update-peerdeps
Update graphql peer dependency to 0.12.x
2 parents aa4bdd0 + 2628286 commit c3e48c5

File tree

3 files changed

+219
-125
lines changed

3 files changed

+219
-125
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
},
6565
"devDependencies": {
6666
"babel-cli": "^6.26.0",
67-
"babel-eslint": "7.2.3",
67+
"babel-eslint": "^8.2.1",
6868
"babel-plugin-transform-async-to-generator": "6.24.1",
6969
"babel-plugin-transform-class-properties": "6.24.1",
7070
"babel-plugin-transform-flow-strip-types": "6.22.0",
@@ -76,12 +76,12 @@
7676
"chai": "^4.1.2",
7777
"connect": "3.6.3",
7878
"coveralls": "2.13.1",
79-
"eslint": "^4.6.0",
80-
"eslint-plugin-flowtype": "^2.35.1",
79+
"eslint": "^4.15.0",
80+
"eslint-plugin-flowtype": "^2.41.0",
8181
"express": "^4.15.4",
8282
"express3": "*",
83-
"flow-bin": "0.52.0",
84-
"graphql": "0.11.2",
83+
"flow-bin": "^0.63.1",
84+
"graphql": "^0.12.3",
8585
"isparta": "4.0.0",
8686
"mocha": "3.5.0",
8787
"multer": "1.3.0",
@@ -92,6 +92,6 @@
9292
"supertest": "3.0.0"
9393
},
9494
"peerDependencies": {
95-
"graphql": "^0.10.0 || ^0.11.0"
95+
"graphql": "^0.10.0 || ^0.11.0 || ^0.12.0"
9696
}
9797
}

src/__tests__/http-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,9 +1255,7 @@ describe('test harness', () => {
12551255
expect(JSON.parse(response.text)).to.deep.equal({
12561256
errors: [
12571257
{
1258-
message:
1259-
'Syntax Error GraphQL request (1:1) ' +
1260-
'Unexpected Name "syntaxerror"\n\n1: syntaxerror\n ^\n',
1258+
message: 'Syntax Error: Unexpected Name "syntaxerror"',
12611259
locations: [{ line: 1, column: 1 }],
12621260
},
12631261
],

0 commit comments

Comments
 (0)