Revert to phosphor until perspective-jupyterlab is ported

finos · texodus · Jan 28, 2020 · Dec 13, 2019 · Dec 13, 2019 · Jan 3, 2020
commit 48972a5ee86a9234ec58564030487ff049d3049b
diff --git a/packages/perspective-workspace/package.json b/packages/perspective-workspace/package.json
@@ -37,12 +37,12 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@finos/perspective-viewer": "^0.4.0",
-        "@lumino/algorithm": "^1.2.3",
-        "@lumino/commands": "^1.9.2",
-        "@lumino/domutils": "^1.1.7",
-        "@lumino/messaging": "^1.3.3",
-        "@lumino/virtualdom": "^1.4.0",
-        "@lumino/widgets": "^1.9.3",
+        "@phosphor/algorithm": "^1.2.0",
+        "@phosphor/commands": "^1.7.2",
+        "@phosphor/domutils": "^1.1.4",
+        "@phosphor/messaging": "^1.3.0",
+        "@phosphor/virtualdom": "^1.2.0",
+        "@phosphor/widgets": "^1.9.3",
         "core-js": "^2.6.9",
         "lodash": "^4.17.4"
     },

diff --git a/packages/perspective-workspace/src/js/index.js b/packages/perspective-workspace/src/js/index.js
@@ -11,8 +11,8 @@ import style from "../less/workspace.less";
 import template from "../html/workspace.html";
 import {bindTemplate} from "@finos/perspective-viewer/dist/esm/utils";
 import {PerspectiveWorkspace, SIDE} from "./workspace";
-import {MessageLoop} from "@lumino/messaging";
-import {Widget} from "@lumino/widgets";
+import {MessageLoop} from "@phosphor/messaging";
+import {Widget} from "@phosphor/widgets";
 
 import injectedStyles from "../less/injected.less";
 

diff --git a/packages/perspective-workspace/src/js/workspace/commands.js b/packages/perspective-workspace/src/js/workspace/commands.js
@@ -7,7 +7,7 @@
  *
  */
 
-import {CommandRegistry} from "@lumino/commands";
+import {CommandRegistry} from "@phosphor/commands";
 
 export const createCommands = workspace => {
     const commands = new CommandRegistry();

diff --git a/packages/perspective-workspace/src/js/workspace/discrete.js b/packages/perspective-workspace/src/js/workspace/discrete.js
@@ -7,8 +7,8 @@
  *
  */
 
-import {DockPanel, SplitPanel} from "@lumino/widgets";
-import {toArray} from "@lumino/algorithm";
+import {DockPanel, SplitPanel} from "@phosphor/widgets";
+import {toArray} from "@phosphor/algorithm";
 
 const DISCRETE_STEP_SIZE = 1;
 

diff --git a/packages/perspective-workspace/src/js/workspace/dockpanel.js b/packages/perspective-workspace/src/js/workspace/dockpanel.js
@@ -7,7 +7,7 @@
  *
  */
 
-import {DockPanel} from "@lumino/widgets";
+import {DockPanel} from "@phosphor/widgets";
 import {DiscreteDockPanel} from "./discrete";
 import {PerspectiveTabBar} from "./tabbar";
 import {PerspectiveTabBarRenderer} from "./tabbarrenderer";

diff --git a/packages/perspective-workspace/src/js/workspace/menu.js b/packages/perspective-workspace/src/js/workspace/menu.js
@@ -7,8 +7,8 @@
  *
  */
 
-import {h} from "@lumino/virtualdom";
-import {Menu} from "@lumino/widgets";
+import {h} from "@phosphor/virtualdom";
+import {Menu} from "@phosphor/widgets";
 
 export class MenuRenderer extends Menu.Renderer {
     constructor(element) {

diff --git a/packages/perspective-workspace/src/js/workspace/tabbar.js b/packages/perspective-workspace/src/js/workspace/tabbar.js
@@ -7,9 +7,9 @@
  *
  */
 
-import {ArrayExt} from "@lumino/algorithm";
-import {ElementExt} from "@lumino/domutils";
-import {TabBar} from "@lumino/widgets";
+import {ArrayExt} from "@phosphor/algorithm";
+import {ElementExt} from "@phosphor/domutils";
+import {TabBar} from "@phosphor/widgets";
 import {TabBarActions} from "./tabbarrenderer";
 
 export class PerspectiveTabBar extends TabBar {

diff --git a/packages/perspective-workspace/src/js/workspace/tabbarrenderer.js b/packages/perspective-workspace/src/js/workspace/tabbarrenderer.js
@@ -7,8 +7,8 @@
  *
  */
 
-import {h} from "@lumino/virtualdom";
-import {TabBar} from "@lumino/widgets";
+import {h} from "@phosphor/virtualdom";
+import {TabBar} from "@phosphor/widgets";
 
 export const TabBarActions = {
     Config: "config"

diff --git a/packages/perspective-workspace/src/js/workspace/widget.js b/packages/perspective-workspace/src/js/workspace/widget.js
@@ -8,7 +8,7 @@
  */
 
 import "@finos/perspective-viewer";
-import {Widget} from "@lumino/widgets";
+import {Widget} from "@phosphor/widgets";
 
 let ID_COUNTER = 0;
 

diff --git a/packages/perspective-workspace/src/js/workspace/workspace.js b/packages/perspective-workspace/src/js/workspace/workspace.js
@@ -7,10 +7,10 @@
  *
  */
 
-import {find, toArray} from "@lumino/algorithm";
-import {Panel} from "@lumino/widgets";
+import {find, toArray} from "@phosphor/algorithm";
+import {Panel} from "@phosphor/widgets";
 import {PerspectiveDockPanel} from "./dockpanel";
-import {Menu} from "@lumino/widgets";
+import {Menu} from "@phosphor/widgets";
 import {MenuRenderer} from "./menu";
 import {createCommands} from "./commands";
 

diff --git a/packages/perspective-workspace/src/less/menu.less b/packages/perspective-workspace/src/less/menu.less
@@ -7,7 +7,7 @@
  *
  */
 
-@import (inline) "~@lumino/widgets/style/menu.css";
+@import (inline) "~@phosphor/widgets/style/menu.css";
 
 .p-Menu {
     padding: 12px;

diff --git a/packages/perspective-workspace/src/less/workspace.less b/packages/perspective-workspace/src/less/workspace.less
@@ -8,7 +8,7 @@
  */
 
 :host {
-    @import "~@lumino/widgets/style/index.css";
+    @import "~@phosphor/widgets/style/index.css";
     @import "./tabbar.less";
     @import "./dockpanel.less";
     @import "./widget.less";

diff --git a/packages/perspective-workspace/test/js/unit/workspace.spec.js b/packages/perspective-workspace/test/js/unit/workspace.spec.js
@@ -8,7 +8,7 @@
  */
 
 import {PerspectiveWorkspace} from "../../../src/js/workspace/workspace";
-import {toArray} from "@lumino/algorithm";
+import {toArray} from "@phosphor/algorithm";
 
 describe("workspace", () => {
     test("restores detail to dockpanel", () => {

diff --git a/yarn.lock b/yarn.lock
@@ -1367,105 +1367,6 @@
     react "~16.8.4"
     typestyle "^2.0.1"
 
-"@lumino/algorithm@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/@lumino/algorithm/-/algorithm-1.2.3.tgz#4ab9883d7e9a5b1845372a752dcaee2a35a770c6"
-  integrity sha512-XBJ/homcm7o8Y9G6MzYvf0FF7SVqUCzvkIO01G2mZhCOnkZZhZ9c4uNOcE2VjSHNxHv2WU0l7d8rdhyKhmet+A==
-
-"@lumino/collections@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/@lumino/collections/-/collections-1.2.3.tgz#8cd9578dac3a5ecba68972991fdfd2b94d3339bc"
-  integrity sha512-lrSTb7kru/w8xww8qWqHHhHO3GkoQeXST2oNkOEbWNEO4wuBIHoKPSOmXpUwu58UykBUfd5hL5wbkeTzyNMONg==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-
-"@lumino/commands@^1.9.2":
-  version "1.9.2"
-  resolved "https://registry.npmjs.org/@lumino/commands/-/commands-1.9.2.tgz#91470db29b93f7b27906bd708f97b4ad6cb5d611"
-  integrity sha512-VpvKeGtZHKz+VHUIF29kntk0/Nf2TvFzHW4qD+vS8v6S4OQO73l1dQciEr4wLs5zv6T7vQn2O+d0B+trDJVwcQ==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-    "@lumino/coreutils" "^1.4.2"
-    "@lumino/disposable" "^1.3.4"
-    "@lumino/domutils" "^1.1.7"
-    "@lumino/keyboard" "^1.1.6"
-    "@lumino/signaling" "^1.3.4"
-
-"@lumino/coreutils@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/@lumino/coreutils/-/coreutils-1.4.2.tgz#44cd3d55bb692e876c792f1ecc0df3daa1de63e9"
-  integrity sha512-SmQ4YDANe25rZd0bLoW7LVAHmgySjkrJmyNPnPW0GrpBt2u4/6D+EQJ8PCCMNWuJvrljBCdlmgOFsT38qYhfcw==
-
-"@lumino/disposable@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/@lumino/disposable/-/disposable-1.3.4.tgz#fc10f61aca1925b99b08810165d46c91de84ac04"
-  integrity sha512-SzePyYNfR9khvjjHrieGnL2b3W7l0X7Bn2Il5VJ3R017aY5DTLr9qOBrgmCXkjmKiYPR65oLkUqPCqSTbAXb0w==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-    "@lumino/signaling" "^1.3.4"
-
-"@lumino/domutils@^1.1.7":
-  version "1.1.7"
-  resolved "https://registry.npmjs.org/@lumino/domutils/-/domutils-1.1.7.tgz#9cc16cba0c1e8f31fcb734879dec050505925b16"
-  integrity sha512-NPysY8XfpCvLNvDe+z1caIUPxOLXWRPQMUAjOj/EhggRyXadan6Lm/5uO6M9S5gW/v9QUXT4+1Sxe3WXz0nRCA==
-
-"@lumino/dragdrop@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/@lumino/dragdrop/-/dragdrop-1.5.0.tgz#426f0efc284455289e97d592249bfee0d87ae093"
-  integrity sha512-jyLhRwGguM12LNjNJ+Cb78/WGqwAiNFrQuPr/RyxInbetJsTrhj27K9+OYVLLu3vU7CdnsLHlY1h3b4py63mUQ==
-  dependencies:
-    "@lumino/coreutils" "^1.4.2"
-    "@lumino/disposable" "^1.3.4"
-
-"@lumino/keyboard@^1.1.6":
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/@lumino/keyboard/-/keyboard-1.1.6.tgz#bf222369bbeacf2c7d2dfe5003d52736c5a2fc3d"
-  integrity sha512-W6pqe0TXRfGOoz1ZK1PRmuGZUWpmdoJArrzwmduUf0t2r06yl56S7w76gxrB7ExTidNPPaOWydGIosPgdgZf5A==
-
-"@lumino/messaging@^1.3.3":
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/@lumino/messaging/-/messaging-1.3.3.tgz#75d3c880b11087da130554eeefa9a19572b24d22"
-  integrity sha512-J+0m1aywl64I9/dr9fzE9IwC+eq90T5gUi1hCXP1MFnZh4aLUymmRV5zFw1CNh/vYlNnEu72xxEuhfCfuhiy8g==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-    "@lumino/collections" "^1.2.3"
-
-"@lumino/properties@^1.1.6":
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/@lumino/properties/-/properties-1.1.6.tgz#367538d63453e99e8c94e5559748a0713d9874ac"
-  integrity sha512-QnZa1IB7sr4Tawf0OKvwgZAptxDRK7DUAMJ71zijXNXH4FlxyThzOWXef51HHFsISKYa8Rn3rysOwtc62XkmXw==
-
-"@lumino/signaling@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/@lumino/signaling/-/signaling-1.3.4.tgz#878d2525531f865ecbbc71e225e5c2dac09f7d0a"
-  integrity sha512-SESCQIsvmC8zSGzU+shFm9f7HgFWeQPQP/b6Mp7/VM6utjjt6FLAnju9cIAWKxVqNafc9lMbjHh5YPpSvOI/fg==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-
-"@lumino/virtualdom@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/@lumino/virtualdom/-/virtualdom-1.4.0.tgz#6083a72279d6d02ab2c3589593513f055815c18e"
-  integrity sha512-BItNqb/XGTHEWg7DSktyJqnFXYPs2rNYxvOCr5We5MDVHtc7OdM3Q5nnYfCzE704By5aSGgBEkyFvguun3u1Ug==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-
-"@lumino/widgets@^1.9.3":
-  version "1.10.0"
-  resolved "https://registry.npmjs.org/@lumino/widgets/-/widgets-1.10.0.tgz#2907d64c4c55acb0059bf32efefb80b181c80cde"
-  integrity sha512-MQzqF5qkLZ3a334yA2j9g5/PYoIqY3z8XqxlxLPIwxNEqWIE5mZMOcZLANruMk4UinYQP5ZQVTRcuU/TuwnOvw==
-  dependencies:
-    "@lumino/algorithm" "^1.2.3"
-    "@lumino/commands" "^1.9.2"
-    "@lumino/coreutils" "^1.4.2"
-    "@lumino/disposable" "^1.3.4"
-    "@lumino/domutils" "^1.1.7"
-    "@lumino/dragdrop" "^1.5.0"
-    "@lumino/keyboard" "^1.1.6"
-    "@lumino/messaging" "^1.3.3"
-    "@lumino/properties" "^1.1.6"
-    "@lumino/signaling" "^1.3.4"
-    "@lumino/virtualdom" "^1.4.0"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"