Merge pull request #6539 from afshin/lumino-2

Update to Lumino 2 and JupyterLab 4.0.0a29
jupyter · Oct 3, 2022 · acbec17 · acbec17
2 parents 7c123a8 + c1cd7b7
commit acbec17
Show file tree

Hide file tree

Showing 62 changed files with 5,595 additions and 6,526 deletions.
diff --git a/.github/actions/build-dist/action.yml b/.github/actions/build-dist/action.yml
@@ -9,7 +9,7 @@ runs:
     - name: Install dependencies
       shell: bash
       run: |
-        python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a25,<5" ypy-websocket==0.2 build
+        python -m pip install --upgrade jupyter_packaging~=0.10 "jupyterlab>=4.0.0a29,<5" build
 
     - name: Build pypi distributions
       shell: bash

diff --git a/.github/workflows/buildutils.yml b/.github/workflows/buildutils.yml
@@ -26,7 +26,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install -U "jupyterlab>=4.0.0a25,<5" ypy-websocket==0.2 hatch
+        python -m pip install -U "jupyterlab>=4.0.0a29,<5" hatch
         jlpm
         jlpm run build
 
@@ -76,6 +76,6 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install -U "jupyterlab>=4.0.0a25,<5" ypy-websocket==0.2 pip
+        python -m pip install -U "jupyterlab>=4.0.0a29,<5" pip
         jlpm
         jlpm run build
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -24,7 +24,7 @@ jobs:
   ui-tests:
     needs: [build]
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:

diff --git a/app/index.js b/app/index.js
@@ -127,6 +127,7 @@ async function main() {
     require('@jupyterlab/fileeditor-extension').default.filter(({ id }) =>
       ['@jupyterlab/fileeditor-extension:plugin'].includes(id)
     ),
+    require('@jupyterlab/lsp-extension'),
     require('@jupyterlab/mainmenu-extension'),
     require('@jupyterlab/markedparser-extension'),
     require('@jupyterlab/mathjax2-extension'),
@@ -147,7 +148,7 @@ async function main() {
     require('@jupyterlab/theme-dark-extension'),
     require('@jupyterlab/translation-extension'),
     // Add the "Hub Control Panel" menu option when running in JupyterHub
-    require('@jupyterlab/user-extension'),
+    require('@jupyterlab/collaboration-extension'),
     require('@jupyterlab/hub-extension')
   ];
 

diff --git a/app/package.json b/app/package.json
@@ -22,79 +22,81 @@
     "@jupyter-notebook/tree": "~7.0.0-alpha.5",
     "@jupyter-notebook/tree-extension": "~7.0.0-alpha.5",
     "@jupyter-notebook/ui-components": "~7.0.0-alpha.5",
-    "@jupyterlab/application": "~4.0.0-alpha.10",
-    "@jupyterlab/application-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/apputils": "~4.0.0-alpha.10",
-    "@jupyterlab/apputils-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/cell-toolbar": "~4.0.0-alpha.10",
-    "@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/celltags": "~4.0.0-alpha.10",
-    "@jupyterlab/codeeditor": "~4.0.0-alpha.10",
-    "@jupyterlab/codemirror-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/completer": "~4.0.0-alpha.10",
-    "@jupyterlab/completer-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/console": "~4.0.0-alpha.10",
-    "@jupyterlab/console-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/coreutils": "~6.0.0-alpha.10",
-    "@jupyterlab/docmanager": "~4.0.0-alpha.10",
-    "@jupyterlab/docmanager-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/docprovider": "~4.0.0-alpha.10",
-    "@jupyterlab/docprovider-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/documentsearch": "~4.0.0-alpha.10",
-    "@jupyterlab/documentsearch-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/filebrowser": "~4.0.0-alpha.10",
-    "@jupyterlab/filebrowser-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/fileeditor": "~4.0.0-alpha.10",
-    "@jupyterlab/fileeditor-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/hub-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/javascript-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/json-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/mainmenu": "~4.0.0-alpha.10",
-    "@jupyterlab/mainmenu-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/markedparser-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/mathjax2-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/notebook": "~4.0.0-alpha.10",
-    "@jupyterlab/notebook-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/observables": "~5.0.0-alpha.10",
-    "@jupyterlab/outputarea": "~4.0.0-alpha.10",
-    "@jupyterlab/pdf-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/rendermime": "~4.0.0-alpha.10",
-    "@jupyterlab/rendermime-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.10",
-    "@jupyterlab/running-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/services": "~7.0.0-alpha.10",
-    "@jupyterlab/settingregistry": "~4.0.0-alpha.10",
-    "@jupyterlab/shared-models": "~4.0.0-alpha.10",
-    "@jupyterlab/shortcuts-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/statedb": "~4.0.0-alpha.10",
-    "@jupyterlab/statusbar": "~4.0.0-alpha.10",
-    "@jupyterlab/terminal": "~4.0.0-alpha.10",
-    "@jupyterlab/terminal-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/theme-dark-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/theme-light-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/tooltip": "~4.0.0-alpha.10",
-    "@jupyterlab/tooltip-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/translation": "~4.0.0-alpha.10",
-    "@jupyterlab/translation-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/ui-components": "~4.0.0-alpha.25",
-    "@jupyterlab/user": "~4.0.0-alpha.10",
-    "@jupyterlab/user-extension": "~4.0.0-alpha.10",
-    "@jupyterlab/vega5-extension": "~4.0.0-alpha.10",
-    "@lumino/algorithm": "~1.9.1",
-    "@lumino/application": "~1.29.0",
-    "@lumino/commands": "~1.20.0",
-    "@lumino/coreutils": "~1.12.0",
-    "@lumino/disposable": "~1.10.1",
-    "@lumino/domutils": "~1.8.1",
-    "@lumino/dragdrop": "~1.14.0",
-    "@lumino/messaging": "~1.10.1",
-    "@lumino/properties": "~1.8.1",
-    "@lumino/signaling": "~1.10.1",
-    "@lumino/virtualdom": "~1.14.1",
-    "@lumino/widgets": "~1.32.0",
+    "@jupyterlab/application": "~4.0.0-alpha.14",
+    "@jupyterlab/application-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/apputils": "~4.0.0-alpha.14",
+    "@jupyterlab/apputils-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/cell-toolbar": "~4.0.0-alpha.14",
+    "@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/celltags": "~4.0.0-alpha.14",
+    "@jupyterlab/codeeditor": "~4.0.0-alpha.14",
+    "@jupyterlab/codemirror-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/collaboration": "~4.0.0-alpha.14",
+    "@jupyterlab/collaboration-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/completer": "~4.0.0-alpha.14",
+    "@jupyterlab/completer-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/console": "~4.0.0-alpha.14",
+    "@jupyterlab/console-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/coreutils": "~6.0.0-alpha.14",
+    "@jupyterlab/docmanager": "~4.0.0-alpha.14",
+    "@jupyterlab/docmanager-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/docprovider": "~4.0.0-alpha.14",
+    "@jupyterlab/docprovider-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/documentsearch": "~4.0.0-alpha.14",
+    "@jupyterlab/documentsearch-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/filebrowser": "~4.0.0-alpha.14",
+    "@jupyterlab/filebrowser-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/fileeditor": "~4.0.0-alpha.14",
+    "@jupyterlab/fileeditor-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/hub-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/javascript-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/json-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/lsp": "~4.0.0-alpha.14",
+    "@jupyterlab/lsp-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/mainmenu": "~4.0.0-alpha.14",
+    "@jupyterlab/mainmenu-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/markedparser-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/mathjax2-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/notebook": "~4.0.0-alpha.14",
+    "@jupyterlab/notebook-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/observables": "~5.0.0-alpha.14",
+    "@jupyterlab/outputarea": "~4.0.0-alpha.14",
+    "@jupyterlab/pdf-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/rendermime": "~4.0.0-alpha.14",
+    "@jupyterlab/rendermime-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/rendermime-interfaces": "~3.8.0-alpha.14",
+    "@jupyterlab/running-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/services": "~7.0.0-alpha.14",
+    "@jupyterlab/settingregistry": "~4.0.0-alpha.14",
+    "@jupyterlab/shared-models": "~4.0.0-alpha.14",
+    "@jupyterlab/shortcuts-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/statedb": "~4.0.0-alpha.14",
+    "@jupyterlab/statusbar": "~4.0.0-alpha.14",
+    "@jupyterlab/terminal": "~4.0.0-alpha.14",
+    "@jupyterlab/terminal-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/theme-dark-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/theme-light-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/tooltip": "~4.0.0-alpha.14",
+    "@jupyterlab/tooltip-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/translation": "~4.0.0-alpha.14",
+    "@jupyterlab/translation-extension": "~4.0.0-alpha.14",
+    "@jupyterlab/ui-components": "~4.0.0-alpha.29",
+    "@jupyterlab/vega5-extension": "~4.0.0-alpha.14",
+    "@lumino/algorithm": "~2.0.0-alpha.6",
+    "@lumino/application": "~2.0.0-alpha.6",
+    "@lumino/commands": "~2.0.0-alpha.6",
+    "@lumino/coreutils": "~2.0.0-alpha.6",
+    "@lumino/disposable": "~2.0.0-alpha.6",
+    "@lumino/domutils": "~2.0.0-alpha.6",
+    "@lumino/dragdrop": "~2.0.0-alpha.6",
+    "@lumino/messaging": "~2.0.0-alpha.6",
+    "@lumino/properties": "~2.0.0-alpha.6",
+    "@lumino/signaling": "~2.0.0-alpha.6",
+    "@lumino/virtualdom": "~2.0.0-alpha.6",
+    "@lumino/widgets": "~2.0.0-alpha.6",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "yjs": "~13.5.38"
+    "yjs": "~13.5.41"
   },
   "dependencies": {
     "@jupyter-notebook/application": "^7.0.0-alpha.5",
@@ -108,48 +110,50 @@
     "@jupyter-notebook/tree": "^7.0.0-alpha.5",
     "@jupyter-notebook/tree-extension": "^7.0.0-alpha.5",
     "@jupyter-notebook/ui-components": "^7.0.0-alpha.5",
-    "@jupyterlab/application-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/apputils-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/celltags": "^4.0.0-alpha.10",
-    "@jupyterlab/codemirror-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/completer-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/console-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/coreutils": "~6.0.0-alpha.10",
-    "@jupyterlab/docmanager-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/docprovider-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/documentsearch-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/filebrowser-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/fileeditor-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/hub-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/javascript-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/json-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/mainmenu-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/markedparser-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/mathjax2-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/notebook-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/pdf-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/rendermime-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/running-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/shortcuts-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/terminal-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/theme-dark-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/theme-light-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/tooltip-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/translation-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/user-extension": "^4.0.0-alpha.10",
-    "@jupyterlab/vega5-extension": "^4.0.0-alpha.10"
+    "@jupyterlab/application-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/apputils-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/celltags": "^4.0.0-alpha.14",
+    "@jupyterlab/codemirror-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/collaboration-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/completer-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/console-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/coreutils": "^6.0.0-alpha.14",
+    "@jupyterlab/docmanager-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/docprovider-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/documentsearch-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/filebrowser-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/fileeditor-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/hub-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/javascript-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/json-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/lsp": "^4.0.0-alpha.14",
+    "@jupyterlab/lsp-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/mainmenu-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/markedparser-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/mathjax2-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/notebook-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/pdf-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/rendermime-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/running-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/shortcuts-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/terminal-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/theme-dark-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/theme-light-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/tooltip-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/translation-extension": "^4.0.0-alpha.14",
+    "@jupyterlab/vega5-extension": "^4.0.0-alpha.14"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0-alpha.10",
-    "@jupyterlab/buildutils": "^4.0.0-alpha.10",
-    "@types/rimraf": "^3.0.0",
+    "@jupyterlab/builder": "^4.0.0-alpha.14",
+    "@jupyterlab/buildutils": "^4.0.0-alpha.14",
+    "@types/rimraf": "^3.0.2",
     "css-loader": "~5.0.1",
     "fs-extra": "^8.1.0",
     "glob": "~7.1.6",
     "mini-css-extract-plugin": "~0.9.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "~3.0.2",
+    "rimraf": "^3.0.2",
     "style-loader": "~1.0.1",
     "svg-url-loader": "~6.0.0",
     "watch": "~1.0.2",
@@ -163,6 +167,7 @@
     "name": "Jupyter Notebook",
     "extensions": [
       "@jupyter-notebook/application-extension",
+      "@jupyterlab/collaboration-extension",
       "@jupyter-notebook/console-extension",
       "@jupyter-notebook/docmanager-extension",
       "@jupyter-notebook/documentsearch-extension",
@@ -181,6 +186,7 @@
       "@jupyterlab/filebrowser-extension",
       "@jupyterlab/fileeditor-extension",
       "@jupyterlab/hub-extension",
+      "@jupyterlab/lsp-extension",
       "@jupyterlab/mainmenu-extension",
       "@jupyterlab/mathjax2-extension",
       "@jupyterlab/markedparser-extension",
@@ -192,8 +198,7 @@
       "@jupyterlab/theme-dark-extension",
       "@jupyterlab/theme-light-extension",
       "@jupyterlab/tooltip-extension",
-      "@jupyterlab/translation-extension",
-      "@jupyterlab/user-extension"
+      "@jupyterlab/translation-extension"
     ],
     "singletonPackages": [
       "@jupyter-notebook/tree",
@@ -202,6 +207,7 @@
       "@jupyterlab/cell-toolbar",
       "@jupyterlab/celltags",
       "@jupyterlab/codeeditor",
+      "@jupyterlab/collaboration",
       "@jupyterlab/completer",
       "@jupyterlab/console",
       "@jupyterlab/coreutils",
@@ -210,6 +216,7 @@
       "@jupyterlab/documentsearch",
       "@jupyterlab/filebrowser",
       "@jupyterlab/fileeditor",
+      "@jupyterlab/lsp",
       "@jupyterlab/mainmenu",
       "@jupyterlab/notebook",
       "@jupyterlab/observables",
@@ -224,7 +231,6 @@
       "@jupyterlab/terminal",
       "@jupyterlab/tooltip",
       "@jupyterlab/translation",
-      "@jupyterlab/user",
       "@jupyterlab/ui-components",
       "@lumino/algorithm",
       "@lumino/application",

diff --git a/buildutils/package.json b/buildutils/package.json
@@ -30,14 +30,14 @@
     "watch": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
-    "@jupyterlab/buildutils": "^4.0.0-alpha.10",
+    "@jupyterlab/buildutils": "^4.0.0-alpha.14",
     "commander": "^6.2.0",
     "fs-extra": "^9.1.0",
-    "typescript": "~4.6.3"
+    "typescript": "~4.7.3"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.10",
     "@types/node": "^14.6.1",
-    "rimraf": "~3.0.0"
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "watch:lib": "lerna exec --stream --scope @jupyter-notebook/metapackage jlpm watch"
   },
   "devDependencies": {
-    "@jupyterlab/buildutils": "^4.0.0-alpha.10",
+    "@jupyterlab/buildutils": "^4.0.0-alpha.14",
     "@typescript-eslint/eslint-plugin": "^4.2.0",
     "@typescript-eslint/parser": "^4.2.0",
     "eslint": "^7.10.0",
@@ -59,7 +59,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.0",
     "rimraf": "^3.0.2",
-    "typescript": "~4.6.3"
+    "typescript": "~4.7.3"
   },
   "jupyter-releaser": {
     "hooks": {

diff --git a/packages/_metapackage/package.json b/packages/_metapackage/package.json
@@ -34,6 +34,6 @@
     "@jupyter-notebook/ui-components": "file:../ui-components"
   },
   "devDependencies": {
-    "typescript": "~4.6.3"
+    "typescript": "~4.7.3"
   }
 }