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

Commit

Permalink
Update Infra #969 - Replace isparta with istanbul
Browse files Browse the repository at this point in the history
  • Loading branch information
blainekasten committed Dec 5, 2018
1 parent c88b0f1 commit ed531e7
Show file tree
Hide file tree
Showing 4 changed files with 293 additions and 77 deletions.
11 changes: 11 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
"plugins": [
"transform-decorators-legacy"
]
},
"test": {
"presets": [
"env",
"stage-1",
"react"
],
"plugins": [
"transform-decorators-legacy",
"istanbul"
]
}
}
}
14 changes: 1 addition & 13 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
const path = require('path');

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

module.exports = function(config) {
config.set({
Expand Down Expand Up @@ -34,13 +29,6 @@ module.exports = function(config) {
include: path.resolve('src/__tests__/'),
loader: 'babel-loader'
},
{
test: /\.js$/,
include: path.resolve('src/'),
enforce: 'pre',
exclude: /(__tests__|__mocks__)/,
loader: 'isparta-loader?babel-loader'
},
{
test: /\.js$/,
exclude: [/node_modules/],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
},
"devDependencies": {
"babel-eslint": "^7.1.1",
"babel-plugin-istanbul": "^5.1.0",
"caniuse-api": "^2.0.0",
"chai": "^3.5.0",
"color": "^1.0.3",
Expand All @@ -89,7 +90,6 @@
"express-http-proxy": "^0.11.0",
"flow-bin": "^0.53.1",
"inject-loader": "^3.0.1",
"isparta-loader": "^2.0.0",
"jsdom": "^12.0.0",
"jsdom-global": "^3.0.2",
"karma": "^3.0.0",
Expand Down
Loading

0 comments on commit ed531e7

Please sign in to comment.