rename worker filenames for clarity

finos · Feb 1, 2019 · 84d8536 · 84d8536
1 parent 42dec1d
commit 84d8536
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/packages/perspective-jupyterlab/src/config/plugin.config.js b/packages/perspective-jupyterlab/src/config/plugin.config.js
@@ -15,7 +15,7 @@ module.exports = {
     entry: "./src/ts/index.ts",
     resolveLoader: {
         alias: {
-            "file-worker-loader": "@jpmorganchase/perspective-webpack-plugin/src/js/file_worker_loader.js"
+            "file-worker-loader": "@jpmorganchase/perspective-webpack-plugin/src/js/psp-worker-loader.js"
         }
     },
     resolve: {

diff --git a/packages/perspective-webpack-plugin/index.js b/packages/perspective-webpack-plugin/index.js
@@ -7,9 +7,9 @@
  *
  */
 
-const WORKER_LOADER_PATH = require.resolve("./src/js/file_worker_loader");
-const WASM_LOADER_PATH = require.resolve("./src/js/cross_origin_file_loader.js");
-const BLOB_LOADER_PATH = require.resolve("./src/js/blob_worker_loader.js");
+const PSP_WORKER_LOADER = require.resolve("./src/js/psp-worker-loader");
+const WASM_LOADER = require.resolve("./src/js/wasm-loader.js");
+const PSP_WORKER_COMPILER_LOADER = require.resolve("./src/js/psp-worker-compiler-loader.js");
 
 const BABEL_CONFIG = require("./babel.config.js");
 
@@ -51,11 +51,11 @@ class PerspectiveWebpackPlugin {
                 include: load_path,
                 use: [
                     {
-                        loader: WORKER_LOADER_PATH,
-                        options: {name: "[name].js", compiled: true}
+                        loader: PSP_WORKER_LOADER,
+                        options: {name: "[name].worker.js", compiled: true}
                     },
                     {
-                        loader: BLOB_LOADER_PATH,
+                        loader: PSP_WORKER_COMPILER_LOADER,
                         options: {name: "[name].worker.js"}
                     }
                 ]
@@ -65,8 +65,8 @@ class PerspectiveWebpackPlugin {
                 test: /perspective\.(wasm|asmjs)\.js$/,
                 include: load_path,
                 use: {
-                    loader: WORKER_LOADER_PATH,
-                    options: {name: "[name].js"}
+                    loader: PSP_WORKER_LOADER,
+                    options: {name: "[name].worker.js"}
                 }
             });
         }
@@ -84,7 +84,7 @@ class PerspectiveWebpackPlugin {
         rules.push({
             test: /psp\.(sync|async)\.wasm\.js$/,
             include: load_path,
-            use: {loader: WASM_LOADER_PATH, options: {name: "[name]"}}
+            use: {loader: WASM_LOADER, options: {name: "[name]"}}
         });
 
         const compilerOptions = compiler.options;

diff --git a/...bpack-plugin/src/js/blob_worker_loader.js → ...ugin/src/js/psp-worker-compiler-loader.js b/...bpack-plugin/src/js/blob_worker_loader.js → ...ugin/src/js/psp-worker-compiler-loader.js
diff --git a/...bpack-plugin/src/js/file_worker_loader.js → ...ebpack-plugin/src/js/psp-worker-loader.js b/...bpack-plugin/src/js/file_worker_loader.js → ...ebpack-plugin/src/js/psp-worker-loader.js
diff --git a/...plugin/src/js/cross_origin_file_loader.js → ...tive-webpack-plugin/src/js/wasm-loader.js b/...plugin/src/js/cross_origin_file_loader.js → ...tive-webpack-plugin/src/js/wasm-loader.js