Skip to content

Commit

Permalink
Merge pull request #30 from Staffbase/babel-7
Browse files Browse the repository at this point in the history
chore(babel): updates to babel 7
  • Loading branch information
Ninerian authored Aug 30, 2018
2 parents 50fec7d + ea5fd8d commit a0a9967
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 31 deletions.
15 changes: 9 additions & 6 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"presets": [
["env", {
"targets": {
"node": "current"
"presets": [
[
"@babel/preset-env",
{
"targets": {
"browsers": ["last 2 versions", "IE >= 10"]
}
}
}]
]
]
]
}
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
}
],
"dependencies": {
"babel-runtime": "6.26.0",
"loglevel": "^1.6.1"
},
"devDependencies": {
"babel": "^6.23.0",
"@babel/core": "^7.0.0",
"@babel/plugin-external-helpers": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.0.0",
"@babel/runtime": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "23.4.2",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-es2015": "^6.24.1",
"babel-register": "^6.26.0",
"compare-versions": "^3.3.1",
"danger": "3.8.6",
"danger-plugin-istanbul-coverage": "1.6.0",
Expand All @@ -79,7 +79,8 @@
"prettier": "^1.14.2",
"prettier-eslint": "^8.8.2",
"rollup": "^0.64.1",
"rollup-plugin-babel": "^3.0.7",
"rollup-plugin-async": "1.2.0",
"rollup-plugin-babel": "4.0.2",
"rollup-plugin-commonjs": "^9.1.5",
"rollup-plugin-license": "0.7.0",
"rollup-plugin-node-resolve": "^3.3.0",
Expand Down
19 changes: 2 additions & 17 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,13 @@ const defaultBrowserPluginOptions = [
resolve(),
commonjs(),
babel({
babelrc: false, // stops babel from using .babelrc files
plugins: [
[
'transform-runtime',
'@babel/plugin-transform-runtime',
{
helpers: false,
polyfill: false,
runtimeHelpers: true,
regenerator: true,
moduleName: 'babel-runtime'
}
],
'external-helpers'
], // [1]
presets: [
[
'env',
{
modules: false, // stop module conversion
targets: {
browsers: ['last 2 versions', 'IE >= 10'] // whatever you want here
}
regenerator: true
}
]
],
Expand Down

0 comments on commit a0a9967

Please sign in to comment.