Add new excludeCompileNodeModules option, add gl js to it by default

closes 108

Author: samanpwbb

lib/webpack-config/babel-loader-config.js

@@ -78,7 +78,7 @@ function getConfigForNodeModules(urc) {
 
   const loaderConfig = {
     test: /\.js$/,
-    exclude: getNodeModuleExclude({ urc }),
+    exclude: /@babel(?:\/|\\{1,2})runtime/,
     loader: require.resolve('babel-loader'),
     options: {
       presets: [
@@ -108,22 +108,38 @@ function getConfigForNodeModules(urc) {
   };
   // By default we compile all of the `node_modules`, but the user can also pass a
   // selective list of node_modules to compile.
-  if (Array.isArray(urc.compileNodeModules)) {
+  const selectiveCompile = Array.isArray(urc.compileNodeModules);
+  if (selectiveCompile) {
     loaderConfig.include = new RegExp(
       urc.compileNodeModules.map(m => `${m}(?!/node_modules).*`).join('|')
     );
   }
+
+  // If the app uses mapbox-gl 2.0+, do not transpile. mapbox-gl 2.0+ is
+  // incompatible with babel without additional configuration beacuse it uses
+  // an inlined webworker.
+  let excludeList = urc.excludeCompileNodeModules || [];
+  if (usesMapboxGl2({ urc }) && !selectiveCompile) {
+    excludeList = excludeList.concat('mapbox-gl');
+  }
+
+  // If excludeList is provided, compile all node modules except the provided
+  // list of modules.
+  if (excludeList.length) {
+    if (selectiveCompile) {
+      throw new Error(
+        "Cannot use 'excludeCompileNodeModules' if 'compileNodeModules' is an array. If you want to exclude a list of modules and include the rest, set 'compileNodeModules: true'."
+      );
+    }
+    loaderConfig.include = new RegExp(
+      `/node_modules/(${excludeList.map(m => `(!?${m})/)})`)})`
+    );
+  }
+
   return loaderConfig;
 }
 
-// getNodeModuleExclude does two things:
-// 1. Avoid sending babel/runtime back to babel.
-// 2. If the app uses mapbox-gl 2.0+, do not transpile. mapbox-gl 2.0+ is
-//    incompatible with babel without additional configuration beacuse it uses
-//    an inlined webworker.
-function getNodeModuleExclude({ urc }) {
-  const excludes = [/@babel(?:\/|\\{1,2})runtime/];
-
+function usesMapboxGl2({ urc }) {
   let usesMapboxGl2 = false;
   try {
     const pkg = JSON.parse(
@@ -133,11 +149,7 @@ function getNodeModuleExclude({ urc }) {
     usesMapboxGl2 = semver.gte(semver.coerce(glJsVer), '2.0.0');
   } catch (e) {} // eslint-disable-line
 
-  if (usesMapboxGl2) {
-    excludes.push(/[/\\\\]node_modules\/mapbox-gl\/dist.*\.js/);
-  }
-
-  return excludes;
+  return usesMapboxGl2;
 }
 
 // `babel-preset-mapbox` depends on the `browserslist` and

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/underreact",
-  "version": "0.6.0-dev.3",
+  "version": "0.6.0-dev.4",
   "description": "Minimal, extensible React app build system that you won't need to eject",
   "main": "index.js",
   "scripts": {