Skip to content

Commit

Permalink
Upgrade to babel 7 (#83)
Browse files Browse the repository at this point in the history
  • Loading branch information
TrySound authored and mridgway committed Jul 8, 2019
1 parent 2b0cb4c commit 8604c23
Show file tree
Hide file tree
Showing 6 changed files with 1,126 additions and 1,224 deletions.
9 changes: 1 addition & 8 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"presets": [
[
"env",
{
"modules": false
}
]
]
"presets": ["@babel/env"]
}
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
sudo: false
language: node_js
node_js:
- "12"
- "10"
- "8"
- "6"
- "4"
after_success:
- "npm run cover"
- "cat artifacts/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
24 changes: 10 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"index.d.ts"
],
"scripts": {
"cover": "node node_modules/istanbul/lib/cli.js cover --dir artifacts -- ./node_modules/mocha/bin/_mocha tests/unit/ --recursive --require babel/register --reporter spec",
"cover": "node node_modules/istanbul/lib/cli.js cover --dir artifacts -- ./node_modules/mocha/bin/_mocha tests/unit/ --recursive --require @babel/register --reporter spec",
"lint": "eslint src",
"prebuild": "rimraf dist",
"build": "rollup -c",
"pretest": "npm run build",
"test": "mocha tests/unit/ --recursive --compilers js:babel-register --reporter spec",
"test": "mocha tests/unit/ --recursive --compilers js:@babel/register --reporter spec",
"prepublish": "npm test"
},
"author": "Michael Ridgway <[email protected]>",
Expand All @@ -27,15 +27,11 @@
"react-is": "^16.7.0"
},
"devDependencies": {
"babel": "^6.23.0",
"babel-cli": "^6.24.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-jsx-source": "^6.22.0",
"babel-preset-env": "^1.7.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.24.1",
"@babel/core": "^7.5.0",
"@babel/plugin-proposal-class-properties": "^7.5.0",
"@babel/preset-env": "^7.5.0",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.4.4",
"chai": "^4.0.1",
"coveralls": "^2.11.1",
"create-react-class": "^15.5.3",
Expand All @@ -46,9 +42,9 @@
"prop-types": "^15.6.2",
"react": "^16.7.0",
"rimraf": "^2.6.2",
"rollup": "^0.52.3",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-uglify": "^2.0.1"
"rollup": "^1.16.6",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-uglify": "^6.0.2"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/"
Expand Down
3 changes: 1 addition & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uglify from 'rollup-plugin-uglify'
import { uglify } from 'rollup-plugin-uglify'
import babel from 'rollup-plugin-babel'
import pkg from './package.json'

Expand Down Expand Up @@ -38,7 +38,6 @@ const prodUmdConfig = mergeAll([
pure_getters: true,
unsafe: true,
unsafe_comps: true,
warnings: false,
},
})
],
Expand Down
5 changes: 2 additions & 3 deletions tests/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"presets": ["env", "react"],
"presets": ["@babel/env", "@babel/react"],
"plugins": [
"transform-class-properties",
"transform-object-rest-spread"
"@babel/proposal-class-properties",
]
}
Loading

0 comments on commit 8604c23

Please sign in to comment.