From 56ad15d8b0828987e2b1eb63fbdb1b59ca796724 Mon Sep 17 00:00:00 2001
From: daniel-j <daniel.j.hede@gmail.com>
Date: Wed, 14 Mar 2018 21:00:55 +0100
Subject: [PATCH] better babel

---
 .babelrc                |  9 +++++----
 package.json            |  3 +--
 webpack.config.babel.js | 24 ++++++++----------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.babelrc b/.babelrc
index 158cd7c..a0f53ac 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,6 +1,7 @@
 {
-  "presets": [
-    "node6"
-  ]
+  "presets": [['env', {
+    "targets": {
+      "node": "current"
+    }
+  }]]
 }
-
diff --git a/package.json b/package.json
index 70eb1aa..899dfe3 100644
--- a/package.json
+++ b/package.json
@@ -48,8 +48,6 @@
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
-    "babel-preset-es2015": "^6.14.0",
-    "babel-preset-node6": "^11.0.0",
     "babel-register": "^6.26.0",
     "binary-loader": "0.0.1",
     "del": "^3.0.0",
@@ -69,6 +67,7 @@
     "gulp-zip": "^4.0.0",
     "lazypipe": "^1.0.1",
     "raw-loader": "^0.5.1",
+    "regenerator-runtime": "^0.11.1",
     "run-sequence": "^2.2.0",
     "standard": "^11.0.0",
     "stylus": "^0.54.5",
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
index fdacdfc..fa5db0c 100644
--- a/webpack.config.babel.js
+++ b/webpack.config.babel.js
@@ -7,7 +7,7 @@ let inProduction = process.env.NODE_ENV === 'production' || process.argv.indexOf
 const bundleExtensionConfig = {
   entry: {
     eventPage: ['./src/eventPage'],
-    fimfic2epub: ['./src/main']
+    fimfic2epub: ['regenerator-runtime/runtime', './src/main']
   },
 
   output: {
@@ -22,8 +22,13 @@ const bundleExtensionConfig = {
         loader: 'babel-loader',
         exclude: /node_modules/,
         query: {
-          sourceMaps: true,
-          presets: ['es2015']
+          presets: [['env', {
+            targets: {
+              browsers: ['chrome 50', 'firefox 47']
+            },
+            modules: false,
+            useBuiltIns: true
+          }]]
         }
       },
       {
@@ -197,19 +202,6 @@ const bundleStaticNpmModuleConfig = {
 
   module: {
     rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        query: {
-          sourceMaps: !inProduction,
-          presets: [['env', {
-            targets: {
-              node: '9.0.0'
-            }
-          }]]
-        }
-      },
       {
         test: /\.styl$/,
         use: ['raw-loader', 'stylus-loader']