Merge pull request busyorg#879 from Ne3l/new-design

Use babel-preset-env instead es2015
robert9g · Oct 24, 2017 · 137b45c · 137b45c
2 parents 2117dcf + 4a769ba
commit 137b45c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 85 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,10 +1,9 @@
 {
   "presets": [
     [
-      "env", {
-        "es2015": {
-          "modules": false
-        }
+      "env",
+      {
+        "modules": false
       }
     ],
     "react",
@@ -13,6 +12,9 @@
   "env": {
     "development": {
       "plugins": "react-hot-loader/babel"
+    },
+    "test": {
+      "plugins": ["transform-es2015-modules-commonjs"]
     }
   },
   "plugins": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,9 +45,7 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-polyfill": "^6.16.0",
-    "babel-preset-env": "^1.5.1",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-latest": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-hmre": "^1.1.1",
     "babel-preset-stage-2": "^6.24.1",

diff --git a/webpack/webpack.server.config.js b/webpack/webpack.server.config.js
@@ -53,7 +53,7 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            presets: ['es2015', 'react', 'stage-2'],
+            presets: ['env', 'react', 'stage-2'],
             plugins: ['transform-decorators-legacy', 'transform-runtime'],
             cacheDirectory: true,
           },