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

Commit

Permalink
Merge pull request #591 from dat-land/refactor/babel-7
Browse files Browse the repository at this point in the history
Update Babel to @7
  • Loading branch information
AtuyL authored Nov 21, 2018
2 parents f74f29c + 5726d5c commit 2957ffc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
10 changes: 6 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"presets": ["react"],
"presets": [
"@babel/preset-react"
],
"env": {
"test": {
"plugins": [
"transform-es2015-modules-commonjs",
"transform-es2015-classes",
"transform-object-rest-spread"
"@babel/plugin-transform-modules-commonjs",
"@babel/plugin-transform-classes",
"@babel/plugin-proposal-object-rest-spread"
]
}
}
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
]
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-loader": "^7.1.4",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"babel-tape-runner": "^2.0.1",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.0",
"babel-tape-runner": "^3.0.0",
"chrome-ext-downloader": "^1.0.4",
"clipboardy": "^1.2.3",
"cross-env": "^5.1.6",
Expand Down Expand Up @@ -77,7 +77,7 @@
"mirror-folder": "^3.0.0",
"mkdirp-promise": "^5.0.1",
"ms": "^2.1.1",
"polished": "^1.9.2",
"polished": "^2.3.0",
"prettier-bytes": "^1.0.4",
"react": "^16.3.2",
"react-dom": "^16.3.2",
Expand All @@ -87,7 +87,7 @@
"redux": "^4.0.0",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
"styled-components": "^3.2.6",
"styled-components": "^4.1.1",
"tachyons": "^4.9.1",
"util-promisify": "^2.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ module.exports = (_, argv) => ({
include: path.normalize(`${__dirname}/app`),
loader: 'babel-loader',
query: {
presets: ['react'],
presets: ['@babel/preset-react'],
plugins: [
'transform-object-rest-spread'
'@babel/plugin-transform-modules-commonjs'
]
}
}
Expand Down

0 comments on commit 2957ffc

Please sign in to comment.