Merge pull request #296 from DxCx/original-lerna

Update internal depencies & update lerna back to upstream npm
This commit is contained in:
Hagai Cohen 2017-02-04 11:09:52 +02:00 committed by GitHub
commit f69c2eea84
9 changed files with 21 additions and 21 deletions

View file

@ -1,5 +1,5 @@
{
"lerna": "2.0.0-beta.32",
"lerna": "2.0.0-beta.35",
"version": "0.5.1",
"changelog": {
"repo": "apollostack/graphql-server",

View file

@ -29,7 +29,7 @@
"chai": "^3.5.0",
"graphql": "^0.9.0",
"istanbul": "1.0.0-alpha.2",
"lerna": "git://github.com/DxCx/lerna.git#bootstrap-dev-bin-pkg",
"lerna": "2.0.0-beta.35",
"mocha": "^3.2.0",
"npm-check-updates": "^2.8.9",
"remap-istanbul": "^0.8.4",

View file

@ -26,14 +26,14 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4"
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0"
},
"devDependencies": {
"@types/body-parser": "0.0.33",
"@types/connect": "^3.4.30",
"@types/express": "^4.0.35",
"@types/multer": "0.0.32",
"@types/multer": "0.0.33",
"body-parser": "^1.16.0",
"connect": "^3.5.0",
"connect-query": "^0.2.0",

View file

@ -25,13 +25,13 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4",
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0",
"boom": "^4.0.0"
},
"devDependencies": {
"@types/boom": "0.0.33",
"@types/hapi": "^13.0.35",
"@types/hapi": "^16.0.0",
"graphql-server-integration-testsuite": "^0.5.1",
"hapi": "^16.1.0",
"@types/graphql": "^0.8.5"
@ -40,7 +40,7 @@
"graphql": "^0.8.0 || ^0.9.0"
},
"optionalDependencies": {
"@types/hapi": "^13.0.35",
"@types/hapi": "^16.0.0",
"@types/graphql": "^0.8.5"
},
"typings": "dist/index.d.ts",

View file

@ -20,10 +20,10 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4",
"graphql-server-module-operation-store": "^0.5.0",
"supertest": "^2.0.0",
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0",
"graphql-server-module-operation-store": "^0.6.0",
"supertest": "^3.0.0",
"supertest-as-promised": "^4.0.0"
},
"devDependencies": {

View file

@ -639,7 +639,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
query: 'query test{ testError }',
});
return req.then((res) => {
return expect(res.res.body.errors[0].message).to.equal('Internal server error');
return expect(res.body.errors[0].message).to.equal('Internal server error');
});
});

View file

@ -25,8 +25,8 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4"
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0"
},
"devDependencies": {
"@types/koa": "^2.0.33",

View file

@ -25,11 +25,11 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4"
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0"
},
"devDependencies": {
"@types/aws-lambda": "0.0.5",
"@types/aws-lambda": "0.0.6",
"@types/graphql": "^0.8.6",
"graphql-server-integration-testsuite": "^0.5.1"
},

View file

@ -25,8 +25,8 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"dependencies": {
"graphql-server-core": "^0.5.1",
"graphql-server-module-graphiql": "^0.4.4"
"graphql-server-core": "^0.6.0",
"graphql-server-module-graphiql": "^0.6.0"
},
"devDependencies": {
"@types/restify": "^2.0.38",