Merge branch 'master' into wait-on-concurrently

This commit is contained in:
Ben Woodward 2019-04-15 15:21:06 +01:00 committed by GitHub
commit b5593466e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions

View File

@ -30,21 +30,21 @@
"rxjs": "6.4.0" "rxjs": "6.4.0"
}, },
"devDependencies": { "devDependencies": {
"@nestjs/testing": "6.0.5", "@nestjs/testing": "6.1.1",
"@types/express": "4.16.1", "@types/express": "4.16.1",
"@types/jest": "24.0.11", "@types/jest": "24.0.11",
"@types/node": "11.13.2", "@types/node": "11.13.4",
"@types/supertest": "2.0.7", "@types/supertest": "2.0.7",
"concurrently": "^4.1.0", "concurrently": "^4.1.0",
"jest": "24.7.1", "jest": "24.7.1",
"nodemon": "1.18.10", "nodemon": "1.18.11",
"prettier": "1.16.4", "prettier": "1.17.0",
"supertest": "4.0.2", "supertest": "4.0.2",
"ts-jest": "24.0.2", "ts-jest": "24.0.2",
"ts-node": "8.0.3", "ts-node": "8.1.0",
"tsconfig-paths": "3.8.0", "tsconfig-paths": "3.8.0",
"tslint": "5.15.0", "tslint": "5.15.0",
"typescript": "3.4.2", "typescript": "3.4.3",
"wait-on": "^3.2.0" "wait-on": "^3.2.0"
}, },
"jest": { "jest": {
@ -58,6 +58,9 @@
"transform": { "transform": {
"^.+\\.(t|j)s$": "ts-jest" "^.+\\.(t|j)s$": "ts-jest"
}, },
"collectCoverageFrom": [
"**/*.(t|j)s"
],
"coverageDirectory": "../coverage", "coverageDirectory": "../coverage",
"testEnvironment": "node" "testEnvironment": "node"
} }