Update babel and fix es2015-preset

geowarin · Aug 5, 2016 · 0c80f15 · 0c80f15
1 parent 073b9b2
commit 0c80f15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/babel/createBabelConfig.js b/lib/babel/createBabelConfig.js
@@ -29,7 +29,7 @@ module.exports = function createBabelConfig (context, isWebpack) {
   const babelConfig = {
     presets: [
       require.resolve('babel-preset-react'),
-      isWebpack ? require.resolve('babel-preset-es2015-webpack') : require.resolve('babel-preset-es2015'),
+      [require.resolve('babel-preset-es2015'), {modules: !isWebpack}],
       require.resolve('babel-preset-stage-0')
     ],
     plugins,

diff --git a/package.json b/package.json
@@ -32,14 +32,13 @@
   "license": "MIT",
   "dependencies": {
     "add-asset-html-webpack-plugin": "1.0.0",
-    "babel-core": "6.11.4",
+    "babel-core": "6.13.2",
     "babel-loader": "6.2.4",
     "babel-plugin-module-alias": "1.6.0",
     "babel-plugin-react-transform": "2.0.2",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
     "babel-plugin-transform-runtime": "6.12.0",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-preset-es2015-webpack": "6.4.2",
+    "babel-preset-es2015": "6.13.2",
     "babel-preset-react": "6.11.1",
     "babel-preset-stage-0": "6.5.0",
     "babel-runtime": "6.11.6",