Fixed perspective-jupyterlab asset leaks

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

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/packages/perspective-jupyterlab/package.json b/packages/perspective-jupyterlab/package.json
@@ -3,17 +3,17 @@
     "version": "0.2.12",
     "description": "Perspective.js",
     "files": [
-        "dist/*.d.ts",
-        "dist/*.js.map",
-        "dist/*.js",
-        "dist/*.wasm",
+        "build/*.d.ts",
+        "build/*.js.map",
+        "build/*.js",
+        "build/*.wasm",
         "src/css/*.css",
         "babel.config.js"
     ],
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
+    "main": "build/index.js",
+    "types": "build/index.d.ts",
     "directories": {
-        "dist": "dist/"
+        "build": "build/"
     },
     "license": "Apache-2.0",
     "publishConfig": {
@@ -53,6 +53,6 @@
         "webpack": "^2.2.1"
     },
     "jupyterlab": {
-        "extension": "dist/index.js"
+        "extension": "build/index.js"
     }
 }
diff --git a/packages/perspective-jupyterlab/src/config/jest.config.js b/packages/perspective-jupyterlab/src/config/jest.config.js
@@ -12,7 +12,7 @@ module.exports = {
     transform: {"^.+\\.(ts|tsx)$": "ts-jest", ".+\\.(css|styl|less|sass|scss)$": "jest-transform-css"},
     cache: false,
     testMatch: ["<rootDir>/test/ts/*.test.ts"],
-    testPathIgnorePatterns: ["<rootDir>/dist", "<rootDir>/test/js"],
+    testPathIgnorePatterns: ["<rootDir>/build", "<rootDir>/test/js"],
     transformIgnorePatterns: ["node_modules"],
     moduleNameMapper: {
         "\\.(css|less)$": "<rootDir>/test/js/styleMock.js",

diff --git a/packages/perspective-jupyterlab/src/config/plugin.config.js b/packages/perspective-jupyterlab/src/config/plugin.config.js
@@ -35,6 +35,6 @@ module.exports = {
     output: {
         filename: "index.js",
         libraryTarget: "umd",
-        path: path.resolve(__dirname, "../../dist")
+        path: path.resolve(__dirname, "../../build")
     }
 };
diff --git a/packages/perspective-jupyterlab/test/ts/view.test.ts b/packages/perspective-jupyterlab/test/ts/view.test.ts
@@ -18,7 +18,7 @@ Object.defineProperty(window, 'MutationObserver', { value: class {
     observe(element: any, initObject: any) {}
 }});
 
-import {PerspectiveView} from '../../dist/index';
+import {PerspectiveView} from '../../build/index';
 
 describe('Checks view interface', () => {
     test("Check dom", () => {

diff --git a/packages/perspective-jupyterlab/tsconfig.json b/packages/perspective-jupyterlab/tsconfig.json
@@ -8,7 +8,7 @@
     "resolveJsonModule": true,
     "allowJs": true,
     "target": "es2016",
-    "outDir": "./dist",
+    "outDir": "./build",
     "lib": ["es2016", "ES2015.Promise", "DOM"],
     "types": ["jest"]
   },

diff --git a/packages/perspective/src/loader/file_worker_loader.js b/packages/perspective/src/loader/file_worker_loader.js
@@ -55,7 +55,7 @@ exports.default = function loader(content) {
                 .replace(/(cjs\/js)/, "build");
         }
         content = fs.readFileSync(inputPath).toString();
-        if (!options.compiled) {
+        if (!options.inline) {
             this.emitFile(outputPath, "" + content);
             const map_file = `${inputPath}.map`;
             if (fs.existsSync(map_file)) {