From d7403341910367baf286fca05fc0ecc9b371c5ea Mon Sep 17 00:00:00 2001 From: Joel Chen Date: Fri, 12 Jan 2018 12:37:31 -0800 Subject: [PATCH] use callback instead of regex for babel exclude --- .../config/webpack/partial/babel.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js b/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js index 3390f4720..83cf066d8 100644 --- a/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js +++ b/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js @@ -7,15 +7,17 @@ const _ = require("lodash"); const logger = require("electrode-archetype-react-app/lib/logger"); module.exports = function(options) { - // regex \b for word boundaries - const babelExcludeRegex = new RegExp( - `(node_modules|\\b${Path.join(AppMode.src.client, "vendor")}\\b)` - ); + const clientVendor = Path.join(AppMode.src.client, "vendor/"); + const babelExclude = x => { + if (x.indexOf("/node_modules") >= 0) return true; + if (x.indexOf(clientVendor) >= 0) return true; + return false; + }; const babelLoader = { _name: "babel", test: /\.jsx?$/, - exclude: babelExcludeRegex, + exclude: babelExclude, use: [ options.HotModuleReload && "react-hot-loader", {