Skip to content
This repository was archived by the owner on Aug 19, 2022. It is now read-only.

Commit 6396459

Browse files
committed
Update Infra #969 - Replace isparta with istanbul
1 parent c88b0f1 commit 6396459

File tree

5 files changed

+302
-86
lines changed

5 files changed

+302
-86
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
dist
22
lib
33
es
4+
coverage
5+
node_modules

karma.conf.coverage.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
module.exports = function(config) {
22
require('./karma.conf.js')(config);
33
config.set({
4+
webpack: {
5+
module: {
6+
rules: config.webpack.module.rules.concat([
7+
{
8+
test: /\.js$/,
9+
exclude: [/node_modules/],
10+
use: {
11+
loader: 'babel-loader',
12+
options: {
13+
plugins: ['istanbul']
14+
}
15+
}
16+
}
17+
])
18+
}
19+
},
20+
reporters: config.reporters.concat(['coverage']),
21+
plugins: config.plugins.concat(['karma-coverage']),
422
coverageReporter: {
523
reporters: [
624
{

karma.conf.js

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
const path = require('path');
22

3-
// Note: If we switch to ESM version of babelified files, we'll likely need to
4-
// update from the ancient isparta-loader. Likely we'll switch to:
5-
// https://github.com/istanbuljs/babel-plugin-istanbul with a `test` BABEL_ENV
6-
//
7-
// https://github.com/FormidableLabs/radium/issues/969
83
process.env.BABEL_ENV = 'commonjs';
94

105
module.exports = function(config) {
@@ -31,19 +26,7 @@ module.exports = function(config) {
3126
{
3227
test: /\.js$/,
3328
enforce: 'pre',
34-
include: path.resolve('src/__tests__/'),
35-
loader: 'babel-loader'
36-
},
37-
{
38-
test: /\.js$/,
3929
include: path.resolve('src/'),
40-
enforce: 'pre',
41-
exclude: /(__tests__|__mocks__)/,
42-
loader: 'isparta-loader?babel-loader'
43-
},
44-
{
45-
test: /\.js$/,
46-
exclude: [/node_modules/],
4730
loader: 'babel-loader'
4831
},
4932
{
@@ -87,19 +70,15 @@ module.exports = function(config) {
8770
flags: ['--no-sandbox']
8871
}
8972
},
90-
reporters: ['mocha', 'coverage'],
73+
reporters: ['mocha'],
9174
browserNoActivityTimeout: 60000,
9275
plugins: [
9376
'karma-chrome-launcher',
94-
'karma-coverage',
9577
'karma-mocha',
9678
'karma-mocha-reporter',
9779
'karma-sinon-chai',
9880
'karma-webpack'
9981
],
100-
coverageReporter: {
101-
type: 'text'
102-
},
10382
browserConsoleLogOptions: {
10483
level: 'log',
10584
format: '%b %T: %m',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
},
7575
"devDependencies": {
7676
"babel-eslint": "^7.1.1",
77+
"babel-plugin-istanbul": "^5.1.0",
7778
"caniuse-api": "^2.0.0",
7879
"chai": "^3.5.0",
7980
"color": "^1.0.3",
@@ -89,7 +90,6 @@
8990
"express-http-proxy": "^0.11.0",
9091
"flow-bin": "^0.53.1",
9192
"inject-loader": "^3.0.1",
92-
"isparta-loader": "^2.0.0",
9393
"jsdom": "^12.0.0",
9494
"jsdom-global": "^3.0.2",
9595
"karma": "^3.0.0",

0 commit comments

Comments
 (0)