Skip to content

Commit

Permalink
🔨 babel build optimization
Browse files Browse the repository at this point in the history
Change babel-preset-es2015 to babel-preset-env
Fix babel-loader contains `/node_modules/` problems
  • Loading branch information
shianqi committed Sep 22, 2017
1 parent 77d8ec5 commit ffa57be
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 31 deletions.
17 changes: 14 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
{
"presets": [
["es2015"],
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"ie >= 9"
],
"node": "current"
},
}
],
"react",
"stage-0"
"stage-3"
],
"plugins": [
"react-hot-loader/babel",
"transform-object-assign"
"transform-runtime"
]
}
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@
"devDependencies": {
"assets-webpack-plugin": "^3.5.1",
"autoprefixer": "^7.1.3",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.2",
"babel-plugin-transform-object-assign": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.26.0",
"babel-preset-stage-3": "^6.24.1",
"coveralls": "^2.13.1",
"css-loader": "^0.28.5",
"enzyme": "^2.9.1",
Expand Down Expand Up @@ -80,6 +77,7 @@
"webpack-md5-hash": "0.0.5"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"classnames": "^2.2.5",
"es6-promise": "^4.1.1",
"history": "^4.7.2",
Expand Down
19 changes: 16 additions & 3 deletions src/.babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
{
"presets": [
["es2015", {"modules": false}],
"react"
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"ie >= 9"
],
"node": "current"
},
"modules": false
}
],
"react",
"stage-3"
],
"plugins": [
"react-hot-loader/babel",
"transform-object-assign"
"transform-runtime"
]
}
2 changes: 1 addition & 1 deletion src/reducers/discoverMusic.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
RECEIVE_DAILY_RECOMMENDED_PLAYLIST
} from '../actions/songList'
} from '../actions/DiscoverMusic'

const _discoverMusic = {
personalityRecommendation: {
Expand Down
11 changes: 2 additions & 9 deletions webpack.config.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,11 @@ module.exports = {
test: /\.jsx?$/,
use: [
{
loader: 'babel-loader',
options:{
presets: [
['es2015', {modules: false}],
'react',
'stage-0'
]
}
loader: 'babel-loader'
}
],
exclude: [
resolve(__dirname, '/node_modules/')
resolve(__dirname, './node_modules/')
]
},
{
Expand Down
11 changes: 2 additions & 9 deletions webpack.config.production.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,11 @@ export default {
test: /\.jsx?$/,
use: [
{
loader: 'babel-loader',
options:{
presets: [
['es2015', {modules: false}],
'react',
'stage-0'
]
}
loader: 'babel-loader'
}
],
exclude: [
resolve(__dirname, '/node_modules/')
resolve(__dirname, './node_modules/')
]
},
{
Expand Down

0 comments on commit ffa57be

Please sign in to comment.