diff --git a/.travis.yml b/.travis.yml index ff5661d6ea4..620126e4eeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,37 @@ language: node_js node_js: - - "6" - "4" -install: - - npm install -g npm@3 + - "6" + - "7" + +env: + - CXX=g++-4.8 + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + +cache: + directories: + - $HOME/.npm + - node_modules + +before_install: + - npm install -g npm@4 - npm install -g coveralls + +install: + - npm prune - npm install script: - - npm test - - npm run coverage + # Both test & coverage. + - npm run travis + +after_install: - coveralls < ./coverage/lcov.info || true # ignore coveralls error # Allow Travis tests to run in containers. diff --git a/lerna.json b/lerna.json index 4e5a460d439..eaf6bafd2c7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "lerna": "2.0.0-beta.30", + "lerna": "2.0.0-beta.32", "version": "0.5.1", "changelog": { "repo": "apollostack/graphql-server", @@ -11,5 +11,8 @@ "tag: documentation": "Documentation", "tag: internal": ":house: Internal" } - } + }, + "packages": [ + "packages/*" + ] } diff --git a/package.json b/package.json index a6cdaaab945..2a310839280 100644 --- a/package.json +++ b/package.json @@ -7,35 +7,40 @@ }, "scripts": { "compile": "lerna exec -- npm run compile", - "lint": "tslint ./packages/**/src/**/*.ts", + "lint": "tslint ./packages/**/src/**/*.ts --exclude \"./packages/**/node_modules/**/*.ts\"", "prebootstrap": "npm install", "postinstall": "lerna bootstrap", "pretest": "npm run compile", "test": "npm run testonly --", "posttest": "npm run lint", - "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./test/tests.js", - "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js", - "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info" + "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace --timeout 5000 ./test/tests.js", + "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js", + "pretravis": "npm run compile", + "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace ./test/tests.js", + "posttravis": "npm run lint", + "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info", + "check-updates": "lerna exec ./node_modules/.bin/npm-check-updates -- -u" }, "devDependencies": { "@types/chai": "^3.4.34", - "@types/mocha": "^2.2.32", - "@types/node": "^6.0.42", - "@types/sinon": "^1.16.31", - "babel-cli": "^6.11.4", - "babel-core": "^6.11.4", - "babel-polyfill": "^6.9.1", - "babel-preset-es2015": "^6.9.0", + "@types/mocha": "^2.2.38", + "@types/node": "^7.0.3", + "@types/sinon": "^1.16.34", + "babel-cli": "^6.22.2", + "babel-core": "^6.22.1", + "babel-polyfill": "^6.22.0", + "babel-preset-es2015": "^6.22.0", "chai": "^3.5.0", "graphql": "^0.8.2", "istanbul": "1.0.0-alpha.2", "lerna": "git://github.com/DxCx/lerna.git#bootstrap-dev-bin-pkg", - "mocha": "^3.1.1", - "remap-istanbul": "0.8.0", - "sinon": "^1.17.6", - "supertest": "^2.0.0", - "supertest-as-promised": "^4.0.0", + "mocha": "^3.2.0", + "npm-check-updates": "^2.8.9", + "remap-istanbul": "^0.8.4", + "sinon": "^1.17.7", + "supertest": "^2.0.1", + "supertest-as-promised": "^4.0.2", "tslint": "^4.3.1", - "typescript": "^2.0.3" + "typescript": "^2.1.5" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 6b9a082b551..adad174619d 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -28,7 +28,7 @@ "@types/fibers": "0.0.29", "@types/graphql": "^0.8.5", "fibers": "^1.0.15", - "meteor-promise": "^0.7.3" + "meteor-promise": "^0.8.0" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0" diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index b42d2499104..1638b87c107 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -32,21 +32,21 @@ "devDependencies": { "@types/body-parser": "0.0.33", "@types/connect": "^3.4.30", - "@types/express": "^4.0.33", + "@types/express": "^4.0.35", "@types/multer": "0.0.32", - "graphql-server-integration-testsuite": "^0.5.1", - "body-parser": "^1.15.2", - "connect": "^3.4.1", + "body-parser": "^1.16.0", + "connect": "^3.5.0", "connect-query": "^0.2.0", "express": "^4.14.0", - "multer": "^1.2.0" + "graphql-server-integration-testsuite": "^0.5.1", + "multer": "^1.2.1" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0" }, "optionalDependencies": { - "@types/express": "^4.0.33", - "@types/graphql": "^0.8.5" + "@types/express": "^4.0.35", + "@types/graphql": "^0.8.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/src/apolloServerHttp.test.ts b/packages/graphql-server-express/src/apolloServerHttp.test.ts index 50e3658a7ac..03528cac3bf 100644 --- a/packages/graphql-server-express/src/apolloServerHttp.test.ts +++ b/packages/graphql-server-express/src/apolloServerHttp.test.ts @@ -154,9 +154,7 @@ const version = 'modern'; describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => { describe('POST functionality', () => { - it('allows gzipped POST bodies', async function () { - // Increase timeout for slow node 4 - this.timeout(3000); + it('allows gzipped POST bodies', async () => { const app = express(); app.use(urlString(), bodyParser.json()); @@ -183,9 +181,7 @@ describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => { }); }); - it('allows deflated POST bodies', async function () { - // Increase timeout for slow node 4 - this.timeout(3000); + it('allows deflated POST bodies', async () => { const app = express(); app.use(urlString(), bodyParser.json()); diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index d164b52d75e..fecaa80d976 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,10 +30,10 @@ "boom": "^4.0.0" }, "devDependencies": { - "@types/boom": "0.0.32", + "@types/boom": "0.0.33", "@types/hapi": "^13.0.35", "graphql-server-integration-testsuite": "^0.5.1", - "hapi": "^15.0.3", + "hapi": "^16.1.0", "@types/graphql": "^0.8.5" }, "peerDependencies": { diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index 9d526045598..9bcd22355ec 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -42,7 +42,7 @@ }, "optionalDependencies": { "@types/koa": "^2.0.33", - "@types/graphql": "^0.8.5" + "@types/graphql": "^0.8.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json index 9a954f1ee23..2c4486fa2d3 100644 --- a/packages/graphql-server-module-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -28,7 +28,7 @@ "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0" }, "optionalDependencies": { - "@types/graphql": "^0.8.5" + "@types/graphql": "^0.8.6" }, "typings": "dist/index.d.ts", "typescript": {