From ffa57be3623812abd9b46a54bb308bb2d9a2553d Mon Sep 17 00:00:00 2001
From: shianqi <shianqi@imudges.com>
Date: Fri, 22 Sep 2017 17:23:17 +0800
Subject: [PATCH] :hammer: babel build optimization

Change babel-preset-es2015 to babel-preset-env
Fix babel-loader contains `/node_modules/` problems
---
 .babelrc                           | 17 ++++++++++++++---
 package.json                       | 10 ++++------
 src/.babelrc                       | 19 ++++++++++++++++---
 src/reducers/discoverMusic.jsx     |  2 +-
 webpack.config.common.js           | 11 ++---------
 webpack.config.production.babel.js | 11 ++---------
 6 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/.babelrc b/.babelrc
index add2bb6..a8a04f7 100644
--- a/.babelrc
+++ b/.babelrc
@@ -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"
     ]
 }
diff --git a/package.json b/package.json
index b61e52f..e497f2d 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -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",
diff --git a/src/.babelrc b/src/.babelrc
index cb4ca3f..817eafa 100644
--- a/src/.babelrc
+++ b/src/.babelrc
@@ -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"
     ]
 }
diff --git a/src/reducers/discoverMusic.jsx b/src/reducers/discoverMusic.jsx
index 8e5e339..d104ff9 100644
--- a/src/reducers/discoverMusic.jsx
+++ b/src/reducers/discoverMusic.jsx
@@ -1,6 +1,6 @@
 import {
     RECEIVE_DAILY_RECOMMENDED_PLAYLIST
-} from '../actions/songList'
+} from '../actions/DiscoverMusic'
 
 const _discoverMusic = {
     personalityRecommendation: {
diff --git a/webpack.config.common.js b/webpack.config.common.js
index cca5a5c..cf8cf0c 100644
--- a/webpack.config.common.js
+++ b/webpack.config.common.js
@@ -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/')
                 ]
             },
             {
diff --git a/webpack.config.production.babel.js b/webpack.config.production.babel.js
index 9bd4f7f..9ead123 100644
--- a/webpack.config.production.babel.js
+++ b/webpack.config.production.babel.js
@@ -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/')
                 ]
             },
             {