1. Upgrade dependencies

2. Migrate code 3. Fix dependencies and support windowing 4. Updates tests
jupyterlab-contrib · Jul 26, 2023 · 6911d65 · 6911d65
1 parent 1046c85
commit 6911d65
Show file tree

Hide file tree

Showing 20 changed files with 21,291 additions and 15,580 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
     - name: Install dependencies
-      run: python -m pip install -U jupyterlab~=3.1
+      run: python -m pip install -U jupyterlab~=4.0
 
     - name: Lint the extension
       run: |
@@ -60,8 +60,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
     - name: Install Python
       uses: actions/setup-python@v4
       with:
@@ -77,14 +75,14 @@ jobs:
         sudo rm -rf $(which node)
         sudo rm -rf $(which node)
 
-        pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
+        pip install "jupyterlab~=4.0" jupyterlab_rise*.whl
 
         jupyter server extension list
         jupyter server extension list 2>&1 | grep -ie "jupyterlab_rise.*OK"
 
         jupyter labextension list
         jupyter labextension list 2>&1 | grep -ie "jupyterlab-rise.*OK"
-        python -m jupyterlab.browser_check --no-chrome-test
+        python -m jupyterlab.browser_check --no-browser-test
 
   integration-tests:
     name: Integration tests
@@ -109,7 +107,7 @@ jobs:
     - name: Install the extension
       run: |
         set -eux
-        python -m pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
+        python -m pip install "jupyterlab~=4.0" jupyterlab_rise*.whl
 
     - name: Install dependencies
       working-directory: ui-tests

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Dependencies
         run: |
           # Install dependencies for bump_version script
-          python -m pip install hatch "jupyterlab~=3.1"
+          python -m pip install hatch "jupyterlab~=4.0"
       - name: Check Release
         uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.bundle.*
+.yarn
 lib/
 node_modules/
 .eslintcache

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+enableImmutableInstalls: false
+
+nodeLinker: node-modules
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ RISE: "Live" Reveal.js JupyterLab Slideshow extension.
 
 ## Requirements
 
-- JupyterLab >= 3.0
+- JupyterLab >= 4.0
 
 ## Install
 

diff --git a/app/index.js b/app/index.js
@@ -104,14 +104,21 @@ async function main() {
     require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
       [
         '@jupyterlab/codemirror-extension:services',
-        '@jupyterlab/codemirror-extension:codemirror'
+        '@jupyterlab/codemirror-extension:codemirror',
+        '@jupyterlab/codemirror-extension:languages',
+        '@jupyterlab/codemirror-extension:extensions',
+        '@jupyterlab/codemirror-extension:themes'
       ].includes(id)
     ),
     require('@jupyterlab/docmanager-extension').default.filter(({ id }) =>
-      ['@jupyterlab/docmanager-extension:plugin'].includes(id)
+      [
+        '@jupyterlab/docmanager-extension:plugin',
+        '@jupyterlab/docmanager-extension:manager',
+        '@jupyterlab/docmanager-extension:opener'
+      ].includes(id)
     ),
-    require('@jupyterlab/docprovider-extension'),
-    require('@jupyterlab/mathjax2-extension'),
+    require('@jupyterlab/mathjax-extension'),
+    require('@jupyterlab/markedparser-extension'),
     require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
       [
         '@jupyterlab/notebook-extension:factory',

diff --git a/app/package.json b/app/package.json
@@ -12,55 +12,56 @@
     "watch": "webpack --config ./webpack.config.watch.js"
   },
   "resolutions": {
-    "@jupyterlab/application-extension": "^3.0.0",
-    "@jupyterlab/apputils-extension": "^3.0.0",
-    "@jupyterlab/codemirror-extension": "^3.0.0",
-    "@jupyterlab/coreutils": "^5.0.0",
-    "@jupyterlab/docmanager-extension": "^3.0.0",
-    "@jupyterlab/docprovider-extension": "^3.0.0",
-    "@jupyterlab/javascript-extension": "^3.0.0",
-    "@jupyterlab/json-extension": "^3.0.0",
-    "@jupyterlab/mathjax2-extension": "^3.0.0",
-    "@jupyterlab/notebook-extension": "^3.0.0",
-    "@jupyterlab/outputarea": "^3.0.0",
-    "@jupyterlab/pdf-extension": "^3.0.0",
-    "@jupyterlab/rendermime-extension": "^3.0.0",
-    "@jupyterlab/shortcuts-extension": "^3.0.0",
-    "@jupyterlab/translation-extension": "^3.0.0",
-    "@jupyterlab/vega5-extension": "^3.0.0",
-    "@lumino/application": "^1.25.0",
-    "@lumino/domutils": "^1.7.0",
-    "@lumino/dragdrop": "^1.12.0",
-    "@lumino/properties": "^1.7.0",
-    "@lumino/virtualdom": "^1.13.0",
+    "@jupyterlab/application-extension": "^4.0.2",
+    "@jupyterlab/apputils-extension": "^4.0.2",
+    "@jupyterlab/codemirror-extension": "^4.0.2",
+    "@jupyterlab/coreutils": "^6.0.2",
+    "@jupyterlab/docmanager-extension": "^4.0.2",
+    "@jupyterlab/fileeditor": "^4.0.2",
+    "@jupyterlab/javascript-extension": "^4.0.2",
+    "@jupyterlab/json-extension": "^4.0.2",
+    "@jupyterlab/mathjax-extension": "^4.0.2",
+    "@jupyterlab/markedparser-extension": "^4.0.2",
+    "@jupyterlab/notebook-extension": "^4.0.2",
+    "@jupyterlab/outputarea": "^4.0.2",
+    "@jupyterlab/pdf-extension": "^4.0.2",
+    "@jupyterlab/rendermime-extension": "^4.0.2",
+    "@jupyterlab/shortcuts-extension": "^4.0.2",
+    "@jupyterlab/translation-extension": "^4.0.2",
+    "@jupyterlab/vega5-extension": "^4.0.2",
+    "@lumino/application": "^2.0.1",
+    "@lumino/domutils": "^2.0.0",
+    "@lumino/dragdrop": "^2.0.0",
+    "@lumino/properties": "^2.0.0",
+    "@lumino/virtualdom": "^2.0.0",
     "jupyterlab-rise-application": "~0.1.0",
-    "react": "~17.0.2",
-    "react-dom": "~17.0.2",
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0",
     "yjs": "~13.5.10"
   },
   "dependencies": {
-    "@jupyterlab/application-extension": "^3.0.0",
-    "@jupyterlab/apputils-extension": "^3.0.0",
-    "@jupyterlab/codemirror-extension": "^3.0.0",
-    "@jupyterlab/coreutils": "^5.0.0",
-    "@jupyterlab/docmanager-extension": "^3.0.0",
-    "@jupyterlab/docprovider-extension": "^3.0.0",
-    "@jupyterlab/javascript-extension": "^3.0.0",
-    "@jupyterlab/json-extension": "^3.0.0",
-    "@jupyterlab/mathjax2-extension": "^3.0.0",
-    "@jupyterlab/notebook-extension": "^3.0.0",
-    "@jupyterlab/pdf-extension": "^3.0.0",
-    "@jupyterlab/rendermime-extension": "^3.0.0",
-    "@jupyterlab/shortcuts-extension": "^3.0.0",
-    "@jupyterlab/theme-dark-extension": "^3.0.0",
-    "@jupyterlab/theme-light-extension": "^3.0.0",
-    "@jupyterlab/translation-extension": "^3.0.0",
-    "@jupyterlab/vega5-extension": "^3.0.0",
+    "@jupyterlab/application-extension": "^4.0.2",
+    "@jupyterlab/apputils-extension": "^4.0.2",
+    "@jupyterlab/codemirror-extension": "^4.0.2",
+    "@jupyterlab/coreutils": "^6.0.2",
+    "@jupyterlab/docmanager-extension": "^4.0.2",
+    "@jupyterlab/javascript-extension": "^4.0.2",
+    "@jupyterlab/json-extension": "^4.0.2",
+    "@jupyterlab/markedparser-extension": "^4.0.2",
+    "@jupyterlab/mathjax-extension": "^4.0.2",
+    "@jupyterlab/notebook-extension": "^4.0.2",
+    "@jupyterlab/pdf-extension": "^4.0.2",
+    "@jupyterlab/rendermime-extension": "^4.0.2",
+    "@jupyterlab/shortcuts-extension": "^4.0.2",
+    "@jupyterlab/theme-dark-extension": "^4.0.2",
+    "@jupyterlab/theme-light-extension": "^4.0.2",
+    "@jupyterlab/translation-extension": "^4.0.2",
+    "@jupyterlab/vega5-extension": "^4.0.2",
     "jupyterlab-rise-application": "^0.2.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0",
-    "@jupyterlab/buildutils": "^3.0.0",
+    "@jupyterlab/builder": "^4.0.2",
+    "@jupyterlab/buildutils": "^4.0.2",
     "@types/rimraf": "^3.0.0",
     "css-loader": "~5.0.1",
     "file-loader": "~5.0.2",
@@ -71,6 +72,7 @@
     "playwright": "^1.12.3",
     "raw-loader": "~4.0.0",
     "rimraf": "~3.0.2",
+    "source-map-loader": "^4.0.1",
     "style-loader": "~1.0.1",
     "svg-url-loader": "~6.0.0",
     "url-loader": "~4.1.1",
@@ -89,10 +91,10 @@
       "@jupyterlab/codemirror-extension",
       "@jupyterlab/coreutils",
       "@jupyterlab/docmanager-extension",
-      "@jupyterlab/docprovider-extension",
       "@jupyterlab/javascript-extension",
       "@jupyterlab/json-extension",
-      "@jupyterlab/mathjax2-extension",
+      "@jupyterlab/mathjax-extension",
+      "@jupyterlab/markedparser-extension",
       "@jupyterlab/notebook-extension",
       "@jupyterlab/pdf-extension",
       "@jupyterlab/rendermime-extension",
@@ -111,7 +113,6 @@
       "@jupyterlab/codeeditor",
       "@jupyterlab/coreutils",
       "@jupyterlab/docmanager",
-      "@jupyterlab/docprovider",
       "@jupyterlab/filebrowser",
       "@jupyterlab/fileeditor",
       "@jupyterlab/mainmenu",

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -11,7 +11,7 @@ channels:
 
 dependencies:
   # runtime dependencies
-  - jupyterlab >=3,<4.0.0a0
+  - jupyterlab >=4,<5.0.0a0
   # labextension build dependencies
   - nodejs >=18,<19
   - pip

diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
   "workspaces": {
     "packages": [
       "app",
+      "ui-tests",
       "packages/*"
     ]
   },
@@ -41,7 +42,6 @@
     "build": "lerna run build",
     "build:prod": "lerna run build:prod",
     "clean": "lerna run clean",
-    "install": "lerna bootstrap",
     "eslint": "jlpm eslint:check --fix",
     "eslint:check": "eslint . --cache --ext .ts,.tsx",
     "lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
@@ -73,6 +73,6 @@
     "stylelint-config-recommended": "^13.0.0",
     "stylelint-config-standard": "~34.0.0",
     "ts-jest": "^26.0.0",
-    "typescript": "~4.3.0"
+    "typescript": "~5.0.4"
   }
-}
+}
diff --git a/packages/application/package.json b/packages/application/package.json
@@ -35,27 +35,27 @@
     "watch": "tsc -b --watch --preserveWatchOutput"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.0",
-    "@jupyterlab/apputils": "^3.0.0",
-    "@jupyterlab/cells": "^3.0.0",
-    "@jupyterlab/coreutils": "^5.0.0",
-    "@jupyterlab/docmanager": "^3.0.0",
-    "@jupyterlab/docregistry": "^3.0.0",
-    "@jupyterlab/mathjax2": "^3.0.0",
-    "@jupyterlab/notebook": "^3.0.0",
-    "@jupyterlab/rendermime-interfaces": "^3.0.0",
-    "@jupyterlab/services": "^6.0.0",
-    "@jupyterlab/settingregistry": "^3.0.0",
-    "@jupyterlab/theme-light-extension": "^3.0.0",
-    "@lumino/commands": "^1.17.0",
-    "@lumino/messaging": "^1.9.0",
-    "@lumino/signaling": "^1.9.0",
-    "@lumino/widgets": "^1.28.0",
+    "@jupyterlab/application": "^4.0.2",
+    "@jupyterlab/apputils": "^4.0.2",
+    "@jupyterlab/cells": "^4.0.2",
+    "@jupyterlab/coreutils": "^6.0.2",
+    "@jupyterlab/docmanager": "^4.0.2",
+    "@jupyterlab/docregistry": "^4.0.2",
+    "@jupyterlab/mathjax2": "^4.0.0-alpha.21",
+    "@jupyterlab/notebook": "^4.0.2",
+    "@jupyterlab/rendermime-interfaces": "^3.8.3",
+    "@jupyterlab/services": "^6.0.2",
+    "@jupyterlab/settingregistry": "^4.0.2",
+    "@jupyterlab/theme-light-extension": "^4.0.2",
+    "@lumino/commands": "^2.0.1",
+    "@lumino/messaging": "^2.0.0",
+    "@lumino/signaling": "^2.0.0",
+    "@lumino/widgets": "^2.0.1",
     "reveal.js": "^4.4.0",
     "reveal.js-plugins": "^4.1.5"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0",
+    "@jupyterlab/builder": "^4.0.2",
     "@types/codemirror": "^5.60.7",
     "@types/reveal.js": "^4.3.0",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
@@ -67,7 +67,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.0",
     "rimraf": "^3.0.2",
-    "typescript": "~4.3.0"
+    "typescript": "~5.0.4"
   },
   "sideEffects": [
     "style/*.css",

diff --git a/packages/application/src/app/index.ts b/packages/application/src/app/index.ts
@@ -6,7 +6,6 @@ import { createRendermimePlugins } from '@jupyterlab/application/lib/mimerendere
 import { PageConfig } from '@jupyterlab/coreutils';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
-import { IIterator, iter } from '@lumino/algorithm';
 import { Token } from '@lumino/coreutils';
 import { Message } from '@lumino/messaging';
 import { Signal, ISignal } from '@lumino/signaling';
@@ -84,8 +83,8 @@ export class RiseShell extends Widget implements JupyterFrontEnd.IShell {
    *
    * @param area - Optional regions in the shell whose widgets are iterated.
    */
-  widgets(area?: string): IIterator<Widget> {
-    return iter((this.layout as BoxLayout).widgets);
+  *widgets(area?: string): IterableIterator<Widget> {
+    yield* (this.layout as BoxLayout).widgets;
   }
 
   /**