Skip to content

Commit

Permalink
Merge 515eb9d into c3a796d
Browse files Browse the repository at this point in the history
  • Loading branch information
mohammad-naji7 committed Feb 1, 2018
2 parents c3a796d + 515eb9d commit f4bafae
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 44 deletions.
52 changes: 24 additions & 28 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
{
"presets": [
[
"env",
{
"presets": [
["@babel/preset-env", {
"targets": {
"node": "current"
}
}
"browsers": [
">1%",
"last 4 versions",
"Firefox ESR",
"not ie < 9",
"Explorer 11",
]
},
"debug": true,
"useBuiltIns": "usage"
}],
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-proposal-class-properties"
],
"stage-0"
],
"env": {
"production": {
"plugins": [
"transform-runtime",
"babel-plugin-inject"
],
"presets": [
"modern-browsers",
"stage-0"
]
},
"env": {
"test": {
"plugins": [
"istanbul",
"rewire"
],
"presets": [
"stage-0"
]
"plugins": [
"istanbul"
]
}
}
}
}
2 changes: 1 addition & 1 deletion .nycrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": [
"babel-register"
"@babel/register"
],
"include": [
"src"
Expand Down
23 changes: 10 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,16 @@
},
"license": "MIT",
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
"babel-plugin-inject": "^0.0.4",
"babel-plugin-istanbul": "^4.1.1",
"babel-plugin-rewire": "^1.1.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.4.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-modern-browsers": "^9.0.2",
"babel-preset-node5": "^11.1.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.24.1",
"@babel/cli": "^7.0.0-beta.39",
"@babel/core": "^7.0.0-beta.39",
"@babel/node": "^7.0.0-beta.39",
"@babel/plugin-proposal-class-properties": "^7.0.0-beta.39",
"@babel/plugin-proposal-export-default-from": "^7.0.0-beta.39",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.39",
"@babel/preset-env": "^7.0.0-beta.39",
"@babel/preset-react": "^7.0.0-beta.39",
"@babel/register": "^7.0.0-beta.39",
"babel-plugin-istanbul": "^4.1.5",
"chai": "^3.5.0",
"chai-spies": "^0.7.1",
"coveralls": "^2.13.1",
Expand Down
2 changes: 1 addition & 1 deletion test/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
--compilers js:babel-register
--compilers js:@babel/register
--require ./test/setup
test/**/*.test.js
2 changes: 1 addition & 1 deletion test/setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('babel-register')();
require('@babel/register')();
process.env.NODE_ENV = 'test';

var jsdom = require('jsdom').jsdom;
Expand Down

0 comments on commit f4bafae

Please sign in to comment.