transpile node_modules with babel

nextstrain · May 14, 2020 · a6a46c0 · a6a46c0
1 parent 1e5de96
commit a6a46c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -12,8 +12,9 @@ module.exports = function babelConfig(api) {
     [
       "@babel/preset-env",
       {
-        useBuiltIns: "usage",
+        useBuiltIns: "entry",
         targets: "cover 95%",
+        bugfixes: true,
         corejs: 3
       }
     ],

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,10 @@
 
 /* P O L Y F I L L S */
 import "whatwg-fetch"; // eslint-disable-line
+import "core-js";
+import "regenerator-runtime";
 /* L I B R A R I E S */
+import "react-hot-loader";
 import React from "react";
 import ReactDOM from "react-dom";
 import Select from "react-select/lib/Select"; 
@@ -34,9 +37,6 @@ if (!window.NEXTSTRAIN) {window.NEXTSTRAIN = {};}
 /* google analytics */
 initialiseGoogleAnalyticsIfRequired();
 
-/* Using React Hot Loader 4 https://github.com/gaearon/react-hot-loader */
-
-
 i18n
 .use(initReactI18next)
 .init({

diff --git a/webpack.config.js b/webpack.config.js
@@ -22,7 +22,9 @@ const generateConfig = ({extensionPath, devMode=false, customOutputPath, analyze
     // Pins all react stuff to auspice dir, and uses hot loader's dom (can be used safely in production)
     "react": path.join(__dirname, 'node_modules/react'), // eslint-disable-line quote-props
     "react-hot-loader": path.join(__dirname, 'node_modules/react-hot-loader'),
-    'react-dom': path.join(__dirname, 'node_modules/@hot-loader/react-dom')
+    'react-dom': path.join(__dirname, 'node_modules/@hot-loader/react-dom'),
+    'regenerator-runtime': path.join(__dirname, 'node_modules/regenerator-runtime'),
+    'core-js': path.join(__dirname, 'node_modules/core-js')
   };
 
   let extensionData;
@@ -68,7 +70,7 @@ const generateConfig = ({extensionPath, devMode=false, customOutputPath, analyze
   }
 
   const entry = devMode
-    ? ["react-hot-loader/patch", "webpack-hot-middleware/client", "./src/index"]
+    ? ["webpack-hot-middleware/client", "./src/index"]
     : ["./src/index"];
 
   /* Where do we want the output to be saved?
@@ -95,7 +97,6 @@ const generateConfig = ({extensionPath, devMode=false, customOutputPath, analyze
       publicPath: "/dist/"
     },
     resolve: {
-      mainFields: ['browser', 'main', 'module'],
       alias: aliasesToResolve
     },
     node: {
@@ -110,7 +111,9 @@ const generateConfig = ({extensionPath, devMode=false, customOutputPath, analyze
         {
           test: /\.js$/,
           loader: 'babel-loader',
-          include: directoriesToTransform,
+          exclude: [
+            /node_modules\/(core-js|regenerator-runtime)/
+          ],
           options: {
             cwd: path.resolve(__dirname)
           }