Skip to content

Commit afeb10a

Browse files
Merge pull request #78 from RobotlegsJS/greenkeeper/karma-3.0.0
Update karma to the latest version 🚀
2 parents 67dcde3 + 0ebc353 commit afeb10a

File tree

5 files changed

+155
-680
lines changed

5 files changed

+155
-680
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818

1919
## Signals 0.2.0
2020

21+
### v0.2.1
22+
23+
- Update `karma` setup to generate code coverage report only for `src` folder (see #78).
24+
25+
- Update dev dependencies to latest version.
26+
2127
### [v0.2.0](https://github.com/RobotlegsJS/SignalsJS/releases/tag/0.2.0) - 2018-08-02
2228

2329
- Adds copyright notice (see #74).

karma.conf.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ module.exports = config => {
1616
"es6-shim"
1717
],
1818
files: [
19-
"./test/**/**/**.test.ts",
20-
{
21-
pattern: "**/*.map",
22-
served: true,
23-
included: false,
24-
watched: true
25-
}
19+
{ pattern: "./test/**/**/**.test.ts", include: true },
20+
{ pattern: '**/*.map', served: true, included: false, watched: true }
2621
],
2722
preprocessors: {
2823
"./**/**/**/**.ts": ["sourcemap"],
@@ -63,7 +58,8 @@ module.exports = config => {
6358
colors: true,
6459
logLevel: config.LOG_INFO,
6560
autoWatch: true,
66-
browsers: []
61+
browsers: [],
62+
browserNoActivityTimeout: 50000
6763
};
6864

6965
if (process.env.TRAVIS) {

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"typings": "lib/index.d.ts",
77
"scripts": {
88
"test": "nyc mocha",
9-
"karma": "karma start --single-run",
9+
"karma": "node --max-old-space-size=2048 node_modules/.bin/karma start --single-run",
1010
"tslint-check:src": "tslint-config-prettier-check ./tslint.json",
1111
"tslint-check:test": "tslint-config-prettier-check ./tslint.test.json",
1212
"tslint:src": "tslint --project tsconfig.json",
@@ -80,7 +80,7 @@
8080
"imports-loader": "^0.8.0",
8181
"istanbul": "^0.4.5",
8282
"istanbul-instrumenter-loader": "^3.0.1",
83-
"karma": "^2.0.5",
83+
"karma": "^3.0.0",
8484
"karma-chai": "^0.1.0",
8585
"karma-chai-sinon": "^0.1.5",
8686
"karma-chrome-launcher": "^2.2.0",
@@ -96,21 +96,21 @@
9696
"karma-webpack": "^3.0.0",
9797
"mocha": "^5.2.0",
9898
"nyc": "^12.0.2",
99-
"prettier": "^1.14.0",
99+
"prettier": "^1.14.2",
100100
"publish-please": "^3.2.0",
101101
"reflect-metadata": "^0.1.12",
102102
"remap-istanbul": "^0.11.1",
103103
"rimraf": "^2.6.2",
104-
"sinon": "^6.1.4",
104+
"sinon": "^6.1.5",
105105
"sinon-chai": "^3.2.0",
106-
"source-map-support": "^0.5.6",
106+
"source-map-support": "^0.5.8",
107107
"ts-loader": "^4.4.2",
108108
"ts-node": "^7.0.0",
109109
"tslint": "^5.11.0",
110110
"tslint-config-prettier": "^1.14.0",
111111
"typescript": "^3.0.1",
112112
"uglifyjs-webpack-plugin": "^1.2.7",
113-
"webpack": "^4.16.3",
113+
"webpack": "^4.16.5",
114114
"webpack-cli": "^3.1.0",
115115
"webpack-dev-server": "^3.1.5"
116116
}

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = env => {
3737
{
3838
test: ((env.production) /* disable this loader for production builds */
3939
? /^$/
40-
: /^(.(?!\.test))*\.ts$/),
40+
: /^.*(src).*\.ts$/),
4141
loader: "istanbul-instrumenter-loader",
4242
query: {
4343
embedSource: true

0 commit comments

Comments
 (0)