Removed babel step from perspective package webpack

finos · Jan 28, 2019 · e49df04 · e49df04
1 parent 627ac48
commit e49df04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,9 @@
         "test": "node scripts/test.js",
         "test_cpp": "node scripts/test_cpp.js",
         "test_python": "node scripts/test_python.js",
-        "clean": "find obj -mindepth 1 -delete && find cppbuild -mindepth 1 -delete && lerna run clean ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream",
+        "clean": "npm-run-all clean:*",
+        "clean:cpp": "find obj -mindepth 1 -delete && find cppbuild -mindepth 1 -delete",
+        "clean:js": "lerna run clean ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream",
         "preclean:screenshots": "lerna exec -- mkdir -p screenshots",
         "clean:screenshots": "lerna run clean:screenshots ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}}",
         "start": "lerna run start --stream --scope",

diff --git a/packages/perspective/webpack-plugin.js b/packages/perspective/webpack-plugin.js
@@ -71,13 +71,15 @@ class PerspectiveWebpackPlugin {
             });
         }
 
-        rules.push({
-            test: /\.js$/,
-            include: load_path,
-            exclude: /node_modules[/\\](?!\@jpmorganchase)|psp\.(asmjs|async|sync)\.js|perspective\.(asmjs|wasm)\.worker\.js/,
-            loader: "babel-loader",
-            options: BABEL_CONFIG
-        });
+        if (!this.options.build_worker) {
+            rules.push({
+                test: /\.js$/,
+                include: load_path,
+                exclude: /node_modules[/\\](?!\@jpmorganchase)|psp\.(asmjs|async|sync)\.js|perspective\.(asmjs|wasm)\.worker\.js/,
+                loader: "babel-loader",
+                options: BABEL_CONFIG
+            });
+        }
 
         rules.push({
             test: /psp\.(sync|async)\.wasm\.js$/,