bump drawio 15.7.3 (#71)

.binder/environment.yml

@@ -55,10 +55,8 @@ dependencies:
   - sphinx
   - sphinx-jsonschema
   - sphinxext-rediraffe
-  # TODO: resolve upstream
-  - sqlalchemy <1.4
   - pip:
-      - jupyterlite ==0.1.0a6
+      - jupyterlite ==0.1.0a16
 
   ### ipydrawio-docs-deps ###
 
@@ -95,7 +93,7 @@ dependencies:
   - pytest-cov
   - pytest-tornasync
   # acceptance testing
-  - firefox =78
+  - firefox =91
   - geckodriver >=0.28.0
   - robotframework >=4
   - robotframework-pabot

.github/environment-conda-build-win.yml

@@ -0,0 +1,31 @@
+# a sufficient environment for building conda packages
+
+# Copyright 2021 ipydrawio contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: ipydrawio-conda-build-win
+
+channels:
+  - conda-forge
+  - nodefaults
+
+dependencies:
+  - pywin32 !=302
+  ### ipydrawio-conda-build-deps ###
+
+  - boa
+  - conda-build
+  - doit
+
+  ### ipydrawio-conda-build-deps ###

.github/environment-conda-build.yml

@@ -1,4 +1,4 @@
-# a sufficient environment for acceptance testing
+# a sufficient environment for building conda packages
 
 # Copyright 2021 ipydrawio contributors
 #
@@ -21,6 +21,8 @@ channels:
   - nodefaults
 
 dependencies:
+  ### ipydrawio-conda-build-deps ###
   - boa
   - conda-build
   - doit
+  ### ipydrawio-conda-build-deps ###

.github/environment.yml

@@ -51,7 +51,7 @@ dependencies:
   - pytest-cov
   - pytest-tornasync
   # acceptance testing
-  - firefox =78
+  - firefox =91
   - geckodriver >=0.28.0
   - robotframework >=4
   - robotframework-pabot

.github/workflows/ci.yml

@@ -26,8 +26,8 @@ env:
   PYTHONUNBUFFERED: '1'
   PYTHONIOENCODING: 'utf-8'
   PIP_DISABLE_PIP_VERSION_CHECK: '1'
-  CONDARC: .github/.condarc
   CI: '1'
+  CONDARC: ${{ github.workspace }}/.github/.condarc
 
   # our stuff
   ATEST_RETRIES: '3'
@@ -158,7 +158,6 @@ jobs:
       - name: install (conda)
         uses: conda-incubator/setup-miniconda@v2
         with:
-          condarc-file: .github/.condarc
           environment-file: .github/environment-conda-build.yml
           miniforge-variant: Mambaforge
           use-mamba: true
@@ -200,14 +199,22 @@ jobs:
         with:
           path: ~/conda_pkgs_dir
           key: |
-            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-build-${{ hashFiles('.github/environment-conda-build.yml') }}
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-build-${{ hashFiles('.github/environment-conda-build.yml', '.github/environment-conda-build-win.yml') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-build-
 
       - name: install (conda)
         uses: conda-incubator/setup-miniconda@v2
+        if: matrix.os == 'windows'
+        with:
+          environment-file: .github/environment-conda-build-win.yml
+          miniforge-variant: Mambaforge
+          use-mamba: true
+
+      - name: install (conda)
+        uses: conda-incubator/setup-miniconda@v2
+        if: matrix.os != 'windows'
         with:
-          condarc-file: .github/.condarc
           environment-file: .github/environment-conda-build.yml
           miniforge-variant: Mambaforge
           use-mamba: true
@@ -260,7 +267,6 @@ jobs:
       - name: install (conda)
         uses: conda-incubator/setup-miniconda@v2
         with:
-          condarc-file: .github/.condarc
           miniforge-variant: Mambaforge
           python-version: ${{ matrix.python-version }}
           environment-file: .github/environment.yml
@@ -273,20 +279,14 @@ jobs:
           name: ipydrawio ${{ github.run_number }} dist
           path: ./dist
 
-      - name: test (linux)
-        if: ${{ contains(matrix.os, 'ubuntu') }}
-        shell: bash -l {0}
-        run: |
-          doit $DOIT_N_TEST test || doit test
-
-      - name: test (macos)
-        if: ${{ contains(matrix.os, 'macos') }}
+      - name: test (unix)
+        if: matrix.os != 'windows'
         shell: bash -l {0}
         run: |
           doit $DOIT_N_TEST test || doit test
 
       - name: test (windows)
-        if: ${{ contains(matrix.os, 'windows') }}
+        if: matrix.os == 'windows'
         shell: cmd /C CALL {0}
         env:
           DOIT_N_TEST: '-n1'
@@ -302,14 +302,8 @@ jobs:
           cd ../ipydrawio-export
           codecov --root ../..
 
-      # - name: clean (windows)
-      #   if: ${{ contains(matrix.os, 'windows') }}
-      #   run: |
-      #     taskkill /F /IM python.exe || echo "no python"
-      #     taskkill /F /IM node.exe || echo "no node"
-
       - name: upload (atest)
-        if: ${{ always() }}
+        if: always()
         uses: actions/upload-artifact@v2
         with:
           name:
@@ -354,10 +348,9 @@ jobs:
       - name: install (conda)
         uses: conda-incubator/setup-miniconda@v2
         with:
-          condarc-file: .github/.condarc
           miniforge-variant: Mambaforge
           python-version: ${{ matrix.python-version }}
-          environment-file: ./docs/environment.yml
+          environment-file: docs/environment.yml
           use-only-tar-bz2: true
           use-mamba: true
 
@@ -377,7 +370,7 @@ jobs:
           doit $DOIT_N_TEST test
 
       - name: upload (atest lite)
-        if: ${{ always() }}
+        if: always()
         uses: actions/upload-artifact@v2
         with:
           name:
@@ -386,7 +379,7 @@ jobs:
           path: ./build/atest
 
       - name: upload (docs)
-        if: ${{ always() }}
+        if: always()
         uses: actions/upload-artifact@v2
         with:
           name:

CHANGELOG.md

@@ -8,9 +8,9 @@
 
 #### @deathbeds/ipydrawio-notebook 1.1.2
 
-#### @deathbeds/ipydrawio-webpack 15.0.300
+#### @deathbeds/ipydrawio-webpack 15.7.300
 
-- upgrade to drawio v15.0.3 for enhancements and bug fixes
+- upgrade to drawio v15.7.3 for enhancements and bug fixes
 
 #### @deathbeds/ipydrawio-jupyter-templates 1.1.2
 

atest/_Variables.robot

@@ -56,7 +56,7 @@ ${CSS DIO READY}    css:.jp-Diagram-ready
 ${CSS DIO IFRAME}    ${CSS DIO READY} iframe
 # drawio
 ${CSS DIO BG}     css:.geDiagramContainer svg
-${CSS DIO SHAPE POPUP}    css:.geToolbarContainer.geSidebarContainer.geSidebar
+${CSS DIO SHAPE POPUP}    css:.geToolbarContainer.geSidebarContainer
 ${CSS DIO SHAPE POPUP SHAPE}    ${CSS DIO SHAPE POPUP} .geItem
 ${CSS DIO EDITABLE}    css:.mxCellEditor.geContentEditable
 # advanced

demo/jupyter_lite_config.json

@@ -4,9 +4,9 @@
     "contents": ["."],
     "federated_extensions": [
       "../py_packages/ipydrawio/dist/ipydrawio-1.1.2-py3-none-any.whl",
-      "https://github.com/conda-forge/releases/releases/download/noarch/bqplot-0.12.30-pyhd8ed1ab_0.tar.bz2/bqplot-0.12.30-pyhd8ed1ab_0.tar.bz2",
-      "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab-tour-3.1.2-pyhd8ed1ab_0.tar.bz2/jupyterlab-tour-3.1.2-pyhd8ed1ab_0.tar.bz2",
-      "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab_widgets-1.0.0-pyhd8ed1ab_1.tar.bz2/jupyterlab_widgets-1.0.0-pyhd8ed1ab_1.tar.bz2",
+      "https://github.com/conda-forge/releases/releases/download/noarch/bqplot-0.12.31-pyhd8ed1ab_0.tar.bz2/bqplot-0.12.31-pyhd8ed1ab_0.tar.bz2",
+      "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab-tour-3.1.4-pyhd8ed1ab_0.tar.bz2/jupyterlab-tour-3.1.4-pyhd8ed1ab_0.tar.bz2",
+      "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/wxyz_datagrid-0.5.1-pyhd8ed1ab_0.tar.bz2/wxyz_datagrid-0.5.1-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/wxyz_json_schema_form-0.5.1-pyhd8ed1ab_0.tar.bz2/wxyz_json_schema_form-0.5.1-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/wxyz_lab-0.5.1-pyhd8ed1ab_0.tar.bz2/wxyz_lab-0.5.1-pyhd8ed1ab_0.tar.bz2",

docs/environment.yml

@@ -29,10 +29,8 @@ dependencies:
   - sphinx
   - sphinx-jsonschema
   - sphinxext-rediraffe
-  # TODO: resolve upstream
-  - sqlalchemy <1.4
   - pip:
-      - jupyterlite ==0.1.0a6
+      - jupyterlite ==0.1.0a16
 
   ### ipydrawio-docs-deps ###
 
@@ -68,7 +66,7 @@ dependencies:
   - pytest-cov
   - pytest-tornasync
   # acceptance testing
-  - firefox =78
+  - firefox =91
   - geckodriver >=0.28.0
   - robotframework >=4
   - robotframework-pabot

dodo.py

@@ -91,7 +91,7 @@ def task_env():
 
     for env, inherits in P.ENV_INHERITS.items():
         yield dict(
-            name=f"""{env.parent.name}:{':'.join([inh.parent.name for inh in inherits])}""",
+            name=f"""{env.relative_to(P.ROOT)}:{':'.join([str(inh.relative_to(P.ROOT)) for inh in inherits])}""",
             file_dep=[*inherits, P.YARN_INTEGRITY],
             actions=[(P.patch_one_env, [inh, env]) for inh in inherits]
             + [["jlpm", "prettier", "--list-different", "--write", env]],
@@ -122,7 +122,8 @@ def task_setup():
     if not P.TESTING_IN_CI:
         yield dict(
             name="js",
-            file_dep=[P.YARN_LOCK, P.PACKAGE, P.OK_SUBMODULES],
+            file_dep=[P.PACKAGE, P.OK_SUBMODULES]
+            + ([P.YARN_LOCK] if P.YARN_LOCK.exists() else []),
             actions=[
                 [*P.JLPM, "--ignore-optional", "--prefer-offline"],
                 [*P.LERNA, "bootstrap"],

packages/ipydrawio-webpack/lib/_static.js

@@ -5,6 +5,7 @@
     This file generated from https://github.com/jgraph/drawio
 */
 
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/CITATION.cff';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/clear.html';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/disableUpdate.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/export-fonts.css';
@@ -167,6 +168,7 @@ import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-fl
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-gcp.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-gcp19.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-gcp2.png';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-gcp3.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-general.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-gmdl.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/images/sidebar-ibm.png';
@@ -1770,6 +1772,7 @@ import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/grapheditor/Me
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/grapheditor/Shapes.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/grapheditor/Sidebar.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/grapheditor/Toolbar.js';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/jquery/jquery-3.3.1.min.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/jscolor/jscolor.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/jszip/jszip.min.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/js/math-print.js';
@@ -2500,6 +2503,7 @@ import '!!file-loader?name=[path][name].[ext]&context=.!../dio/styles/sprites.pn
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/styles/thumb_horz.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/styles/thumb_vertical.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/styles/up.gif';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/teams.html';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/LICENSE';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/basic/classes.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/basic/classes.xml';
@@ -2806,5 +2810,7 @@ import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/wirefra
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/vsdxImporter.html';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-9fe249eb.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-9fe249eb.js.map';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-bed83ea8.js';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-bed83ea8.js.map';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-f163abaa.js';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/workbox-f163abaa.js.map';

packages/ipydrawio-webpack/package.json

@@ -43,5 +43,5 @@
     "build:pre": "python scripts/patch.py && python scripts/static.py"
   },
   "types": "lib/index.d.ts",
-  "version": "15.0.300"
+  "version": "15.7.300"
 }

packages/ipydrawio/package.json

@@ -8,7 +8,7 @@
     "@jupyterlab/application": "^3.1.0",
     "@jupyterlab/launcher": "^3.1.0",
     "@jupyterlab/mainmenu": "^3.1.0",
-    "@deathbeds/ipydrawio-webpack": "^15.0.300"
+    "@deathbeds/ipydrawio-webpack": "^15.7.300"
   },
   "description": "A JupyterLab extension for embedding interactive drawio / mxgraph diagrams.",
   "devDependencies": {

packages/ipydrawio/schema/plugin.json

@@ -310,6 +310,10 @@
           "description": "url/name: Creates a new file from a template URL. If the value is not a URL and is not empty, the script will try to use `window.opener_url]`. In [embed mode_, `window.opener[name]` will be used to get the initial XML. Note that this requires the same origin policy in the opener/parent for reading the variable.",
           "type": "string"
         },
+        "dark": {
+          "$ref": "#/definitions/on-off-switch",
+          "description": "[0|1]: Disables/enables dark mode in Sketch and Minimal editor themes."
+        },
         "data": {
           "description": "data: Gets the XML data for the diagram (used in client mode to bypass message passing and cross frame access). **TBD `14.6.10`**",
           "type": "string"
@@ -537,6 +541,10 @@
           "description": "id: Selects a specific revision of a Google Drive or Dropbox file.",
           "type": "string"
         },
+        "rough": {
+          "$ref": "#/definitions/on-off-switch",
+          "description": "[0|1]: Disables/enables the rough sketch style (default is 1 for sketch theme and 0 for all other themes)."
+        },
         "rt": {
           "$ref": "#/definitions/on-switch",
           "description": "1: Uses chromeless mode with Google Drive realtime enabled."

packages/ipydrawio/src/_schema.d.ts

@@ -386,6 +386,10 @@ export interface DrawioURLParams {
    * url/name: Creates a new file from a template URL. If the value is not a URL and is not empty, the script will try to use `window.opener_url]`. In [embed mode_, `window.opener[name]` will be used to get the initial XML. Note that this requires the same origin policy in the opener/parent for reading the variable.
    */
   create?: string;
+  /**
+   * [0|1]: Disables/enables dark mode in Sketch and Minimal editor themes.
+   */
+  dark?: number;
   /**
    * data: Gets the XML data for the diagram (used in client mode to bypass message passing and cross frame access). **TBD `14.6.10`**
    */
@@ -586,6 +590,10 @@ export interface DrawioURLParams {
    * id: Selects a specific revision of a Google Drive or Dropbox file.
    */
   rev?: string;
+  /**
+   * [0|1]: Disables/enables the rough sketch style (default is 1 for sketch theme and 0 for all other themes).
+   */
+  rough?: number;
   /**
    * 1: Uses chromeless mode with Google Drive realtime enabled.
    */