Update to jupyterlab 3.1.0 (#61)

.binder/environment.yml

@@ -18,7 +18,6 @@ name: ipydrawio-demo
 
 channels:
   - conda-forge
-  - conda-forge/label/jupyterlab_rc
 
 dependencies:
   - python >=3.9
@@ -26,9 +25,7 @@ dependencies:
   - bqplot
   - graphviz2drawio
   - jupyter-lsp-python-lsp-server
-  - retrolab
   - jupyterlab-link-share
-  - jupyter-videochat
   - jupyterlab-lsp
   - matplotlib-base
   - nbgitpuller
@@ -74,7 +71,7 @@ dependencies:
   - python # this gets patched in ci
   # run
   - ipywidgets >=7.6
-  - jupyterlab >=3.1.0rc2,<4.0.0a0
+  - jupyterlab >=3.1.0,<4.0.0a0
   - jupyterlab_widgets >=1
   - lxml
   - pillow

.binder/overrides.json

@@ -4,8 +4,5 @@
   },
   "@jupyterlab/extensionmanager-extension:plugin": {
     "enabled": false
-  },
-  "jupyterlab-videochat": {
-    "area": "main"
   }
 }

.github/environment.yml

@@ -18,7 +18,6 @@ name: ipydrawio-dev
 
 channels:
   - conda-forge
-  - conda-forge/label/jupyterlab_rc
   - nodefaults
 
 dependencies:
@@ -30,7 +29,7 @@ dependencies:
   - python # this gets patched in ci
   # run
   - ipywidgets >=7.6
-  - jupyterlab >=3.1.0rc2,<4.0.0a0
+  - jupyterlab >=3.1.0,<4.0.0a0
   - jupyterlab_widgets >=1
   - lxml
   - pillow

.gitignore

@@ -1,7 +1,7 @@
 __pycache__
 _output
 .coverage*
-*doit.db
+.eslintcache
 .ipynb_checkpoints
 .pabotsuitenames
 .virtual_documents/
@@ -14,6 +14,7 @@ _output
 *.tgz
 *.tsbuildinfo
 **/*DRAWIO_DEBUG*
+*doit.db
 atest/output/
 build/
 dist/

README.md

@@ -34,6 +34,11 @@ pip install ipydrawio[all]
       - plus some Jupyter ones
   - Jupyter [rich display][] output
   - Jupyter [Widgets][]
+  - Basic collaborative editing
+    - requires the `--collaborative` flag, added in JupyterLab 3.1+
+    - token sharing, _a la_ [jupyterlab-link-share], or a custom connector (no
+      known yet)
+    - no presence indicators for other editors
 - `ipydrawio-export`
   - Export print-quality PDF from diagrams
     - optionally include editable Drawio XML as a PDF attachment
@@ -227,3 +232,5 @@ limitations under the License.
 [launcher]:
   https://jupyterlab.readthedocs.io/en/stable/user/files.html?highlight=Launcher#creating-files-and-activities
 [file manager]: https://jupyterlab.readthedocs.io/en/stable/user/files.html
+[jupyterlab-link-share]:
+  https://github.com/jupyterlab-contrib/jupyterlab-link-share

conda.recipe/meta.yaml

@@ -80,7 +80,12 @@ outputs:
       home: https://github.com/deathbeds/ipydrawio
       summary: Draw.io Diagrams as Jupyter Widgets
       license: Apache-2.0
-      license_file: ipydrawio/LICENSE.txt
+      license_file:
+        - ipydrawio/LICENSE.txt
+        - ipydrawio/src/ipydrawio/ext/ipd/static/third-party-licenses.json
+        - ipydrawio/src/ipydrawio/ext/ipdnb/static/third-party-licenses.json
+        - ipydrawio/src/ipydrawio/ext/ipdwp/static/third-party-licenses.json
+        - ipydrawio/src/ipydrawio/ext/ipjt/static/third-party-licenses.json
 
   - name: ipydrawio-export
     version: {{ version }}
@@ -126,7 +131,9 @@ outputs:
       home: https://github.com/deathbeds/ipydrawio
       summary: PDF export for IPyDrawio
       license: Apache-2.0
-      license_file: ipydrawio-export/LICENSE.txt
+      license_file:
+      - ipydrawio-export/LICENSE.txt
+      - ipydrawio-export/src/ipydrawio_export/ext/ipdpdf/static/third-party-licenses.json
 
 about:
   home: https://github.com/deathbeds/ipydrawio

docs/environment.yml

@@ -18,7 +18,6 @@ name: ipydrawio-docs
 
 channels:
   - conda-forge
-  - conda-forge/label/jupyterlab_rc
   - nodefaults
 
 dependencies:
@@ -49,7 +48,7 @@ dependencies:
   - python # this gets patched in ci
   # run
   - ipywidgets >=7.6
-  - jupyterlab >=3.1.0rc2,<4.0.0a0
+  - jupyterlab >=3.1.0,<4.0.0a0
   - jupyterlab_widgets >=1
   - lxml
   - pillow

dodo.py

@@ -352,6 +352,7 @@ def task_lint():
             actions=[P._echo_ok("all ok")],
             file_dep=[
                 P.OK_BLACK,
+                P.OK_ESLINT,
                 P.OK_FLAKE8,
                 P.OK_ISORT,
                 P.OK_PRETTIER,

package.json

@@ -13,7 +13,7 @@
     "prettier": "^2.1.1",
     "prettier-plugin-sort-json": "^0.0.2",
     "typedoc": "^0.20.36",
-    "typedoc-plugin-markdown": "^3.7.2"
+    "typedoc-plugin-markdown": "~3.9.0"
   },
   "prettier": {
     "singleQuote": true,
@@ -22,8 +22,8 @@
   },
   "scripts": {
     "bootstrap": "jlpm --prefer-offline && lerna bootstrap",
-    "eslint": "cd packages && eslint --ext .js,.ts,.tsx --fix .",
-    "eslint:check": "cd packages && eslint --ext .js,.ts,.tsx ."
+    "eslint": "cd packages && eslint --cache --fix --ext .js,.ts,.tsx .",
+    "eslint:check": "cd packages && eslint --cache --ext .js,.ts,.tsx ."
   },
   "workspaces": [
     "packages/*"

packages/_meta/package.json

@@ -10,7 +10,7 @@
     "@deathbeds/ipydrawio": "file:../ipydrawio"
   },
   "devDependencies": {
-    "typescript": "~4.2.4"
+    "typescript": "~4.2.3"
   },
   "scripts": {
     "build": "tsc --build src",

packages/ipydrawio-jupyter-templates/package.json

@@ -5,13 +5,13 @@
   },
   "homepage": "https://ipydrawio.rtfd.io",
   "dependencies": {
-    "@jupyterlab/application": "3",
+    "@jupyterlab/application": "^3.1.0",
     "@deathbeds/ipydrawio": "^1.1.1"
   },
   "description": "Jupyter Templates for IPyDrawio",
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.2",
-    "typescript": "~4.2.4"
+    "@jupyterlab/builder": "^3.1.0",
+    "typescript": "~4.2.3"
   },
   "peerDependencies": {},
   "files": [

packages/ipydrawio-notebook/package.json

@@ -6,12 +6,12 @@
   },
   "homepage": "https://ipydrawio.rtfd.io",
   "dependencies": {
-    "@jupyterlab/application": "3",
-    "@jupyterlab/notebook": "3"
+    "@jupyterlab/application": "^3.1.0",
+    "@jupyterlab/notebook": "^3.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.2",
-    "typescript": "~4.2.4"
+    "@jupyterlab/builder": "^3.1.0",
+    "typescript": "~4.2.3"
   },
   "peerDependencies": {
     "@deathbeds/ipydrawio": "^1.1.1"

packages/ipydrawio-pdf/package.json

@@ -6,11 +6,11 @@
   "homepage": "https://ipydrawio.rtfd.io",
   "version": "1.1.1",
   "dependencies": {
-    "@jupyterlab/application": "3"
+    "@jupyterlab/application": "^3.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.2",
-    "typescript": "~4.2.4"
+    "@jupyterlab/builder": "^3.1.0",
+    "typescript": "~4.2.3"
   },
   "peerDependencies": {
     "@deathbeds/ipydrawio": "^1.1.1"

packages/ipydrawio-webpack/package.json

@@ -4,11 +4,11 @@
     "url": "https://github.com/deathbeds/ipydrawio/issues"
   },
   "dependencies": {
-    "@jupyterlab/application": "3"
+    "@jupyterlab/application": "^3.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.2",
-    "typescript": "~4.2.4"
+    "@jupyterlab/builder": "^3.1.0",
+    "typescript": "~4.2.3"
   },
   "description": "A webpack-ready repackaging of drawio",
   "homepage": "https://ipydrawio.rtfd.io",

packages/ipydrawio/package.json

@@ -5,24 +5,24 @@
   },
   "homepage": "https://ipydrawio.rtfd.io",
   "dependencies": {
-    "@jupyterlab/application": "3",
-    "@jupyterlab/launcher": "3",
-    "@jupyterlab/mainmenu": "3"
+    "@jupyterlab/application": "^3.1.0",
+    "@jupyterlab/launcher": "^3.1.0",
+    "@jupyterlab/mainmenu": "^3.1.0"
   },
   "description": "A JupyterLab extension for embedding interactive drawio / mxgraph diagrams.",
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.2",
-    "typescript": "~4.2.4",
-    "@jupyter-widgets/base": "4",
-    "@jupyter-widgets/controls": "3",
-    "@jupyter-widgets/jupyterlab-manager": "3",
+    "@jupyterlab/builder": "^3.1.0",
+    "typescript": "~4.2.3",
+    "@jupyter-widgets/base": "^4.0.0",
+    "@jupyter-widgets/controls": "^3.0.0",
+    "@jupyter-widgets/jupyterlab-manager": "^3.0.0",
     "json-schema-to-typescript": "^10.1.4"
   },
   "peerDependencies": {
     "@deathbeds/ipydrawio-webpack": "^14.9.200",
     "@jupyter-widgets/base": "4",
-    "@jupyter-widgets/controls": "3",
-    "@jupyter-widgets/jupyterlab-manager": "3"
+    "@jupyter-widgets/controls": "^3.0.0",
+    "@jupyter-widgets/jupyterlab-manager": "^3.0.0"
   },
   "files": [
     "{lib,schema,style,src}/**/*.{ts,tsx,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,css}",

packages/ipydrawio/src/document.ts

@@ -53,8 +53,8 @@ export class DiagramDocument extends DocumentWidget<Diagram> {
     this._manager = options.manager;
     this.getSettings = options.getSettings;
 
-    this._onTitleChanged();
-    this.context.pathChanged.connect(this._onTitleChanged, this);
+    this._onDiagramTitleChanged();
+    this.context.pathChanged.connect(this._onDiagramTitleChanged, this);
     this.context.ready
       .then(async () => {
         DEBUG && console.warn('format', this.format);
@@ -75,7 +75,7 @@ export class DiagramDocument extends DocumentWidget<Diagram> {
   /**
    * Handle a change to the title.
    */
-  private _onTitleChanged(): void {
+  private _onDiagramTitleChanged(): void {
     DEBUG && console.warn('contentsModel', this.context.contentsModel);
 
     this.title.label = PathExt.basename(this.context.localPath);

py_packages/ipydrawio/README.md

@@ -34,6 +34,11 @@ pip install ipydrawio[all]
       - plus some Jupyter ones
   - Jupyter [rich display][] output
   - Jupyter [Widgets][]
+  - Basic collaborative editing
+    - requires the `--collaborative` flag, added in JupyterLab 3.1+
+    - token sharing, _a la_ [jupyterlab-link-share], or a custom connector (no
+      known yet)
+    - no presence indicators for other editors
 - `ipydrawio-export`
   - Export print-quality PDF from diagrams
     - optionally include editable Drawio XML as a PDF attachment
@@ -227,3 +232,5 @@ limitations under the License.
 [launcher]:
   https://jupyterlab.readthedocs.io/en/stable/user/files.html?highlight=Launcher#creating-files-and-activities
 [file manager]: https://jupyterlab.readthedocs.io/en/stable/user/files.html
+[jupyterlab-link-share]:
+  https://github.com/jupyterlab-contrib/jupyterlab-link-share