Skip to content

Commit

Permalink
Merge pull request #491 from GrimoireGL/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
moajo authored Jun 12, 2017
2 parents 78d4651 + 3556332 commit ec38df3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"remap-istanbul": "^0.9.5",
"semantic-release": "^6.3.2",
"sinon": "^2.1.0",
"trash-cli": "^1.4.0",
"ts-loader": "^2.0.3",
"tslint": "^5.0.0",
"typedoc": "^0.7.0",
Expand All @@ -50,8 +51,8 @@
},
"repository": "http://github.com/GrimoireGL/GrimoireJS",
"scripts": {
"coverage": "nyc --reporter=lcov --reporter=text --reporter=json --reporter html npm run test",
"test": "tsc -p tsconfig.test.json && cpx test/_TestResource/**/* test-lib/_TestResource && ava ./test-lib/**/*Test.js --verbose --serial",
"coverage": "trash coverage && nyc --reporter=lcov --reporter=text --reporter=json --reporter=html npm run test",
"test": "trash test-lib && tsc -p tsconfig.test.json && cpx test/_TestResource/**/* test-lib/_TestResource && ava ./test-lib/**/*Test.js --verbose --serial",
"lint": "tslint -c tslint.json ./src/**/*.ts",
"prepublish": "webpack --progress --env.prod && npm test",
"start": "webpack --progress --watch",
Expand Down Expand Up @@ -80,7 +81,6 @@
"babel": "inherit"
},
"nyc": {
"sourceMap": true,
"include": [
"**/src/**/*"
]
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.test.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"module": "es6",
"outDir":"./test-lib",
"moduleResolution": "node",
"allowJs":true,
"sourceMap": true
"inlineSourceMap": true
},
"include": [
"src/**/*.ts",
Expand Down

0 comments on commit ec38df3

Please sign in to comment.