add patch for jupyterlab-codeeditor to be compatible with latest type…

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
     - name: Install dependencies
-      run: python -m pip install -U check-manifest jupyterlab --pre
+      run: python -m pip install -U check-manifest jupyterlab
 
     - name: Build the extension
       run: |
@@ -65,6 +65,6 @@ jobs:
         sudo rm -rf $(which node)
         sudo rm -rf $(which node)
         pip install myextension.tar.gz
-        pip install jupyterlab --pre
+        pip install jupyterlab
         jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly.*OK"
         python -m jupyterlab.browser_check --no-browser-test

MANIFEST.in

@@ -8,6 +8,7 @@ include ts*.json
 include yarn.lock
 
 graft jupyterlab_blockly/labextension
+recursive-include patches *.patch
 
 # Javascript files
 graft src

README.md

@@ -22,7 +22,6 @@ To install the extension, execute:
 ```bash
 micromamba create -n blockly -c conda-forge python
 micromamba activate blockly
-pip install jupyterlab --pre
 pip install jupyterlab_blockly
 ```
 
@@ -46,9 +45,8 @@ The `jlpm` command is JupyterLab's pinned version of
 `yarn` or `npm` in lieu of `jlpm` below.
 
 ```bash
-micromamba create -n blockly -c conda-forge python nodejs yarn
+micromamba create -n blockly -c conda-forge python nodejs yarn jupyterlab==3.3 jupyter-packaging
 micromamba activate blockly
-pip install jupyterlab --pre
 # Clone the repo to your local environment
 # Change directory to the jupyterlab_blockly directory
 # Install package in development mode

package.json

@@ -42,23 +42,26 @@
     "install:extension": "jlpm run build",
     "watch": "run-p watch:src watch:labextension",
     "watch:src": "tsc -w",
-    "watch:labextension": "jupyter labextension watch ."
+    "watch:labextension": "jupyter labextension watch .",
+    "postinstall": "patch-package"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.0.0-alpha.7",
-    "@jupyterlab/apputils": "^4.0.0-alpha.7",
-    "@jupyterlab/docregistry": "^4.0.0-alpha.7",
-    "@jupyterlab/outputarea": "^4.0.0-alpha.7",
-    "@jupyterlab/rendermime": "^4.0.0-alpha.7",
+    "@jupyterlab/application": "^3.3",
+    "@jupyterlab/apputils": "^3.3",
+    "@jupyterlab/docregistry": "^3.3",
+    "@jupyterlab/outputarea": "^3.3",
+    "@jupyterlab/rendermime": "^3.3",
     "@lumino/algorithm": "^1.9.1",
     "@lumino/coreutils": "^1.12.0",
     "@lumino/messaging": "^1.10.1",
     "@lumino/signaling": "^1.10.1",
     "@lumino/widgets": "^1.31.1",
-    "blockly": "^7.20211209.2"
+    "blockly": "^7.20211209.2",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0-alpha.7",
+    "@jupyterlab/builder": "^3.3",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
     "eslint": "^8.9.0",
@@ -84,7 +87,7 @@
   "jupyter-releaser": {
     "hooks": {
       "before-build-npm": [
-        "python -m pip install jupyterlab --pre",
+        "python -m pip install jupyterlab",
         "jlpm"
       ]
     }

patches/@jupyterlab+codeeditor+3.3.4.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts b/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts
+index ffe8d1f..d63b2f8 100644
+--- a/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts
++++ b/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts
+@@ -44,7 +44,7 @@ export declare namespace CodeEditor {
+     /**
+      * An interface describing editor state coordinates.
+      */
+-    interface ICoordinate extends JSONObject, ClientRect {
++    interface ICoordinate extends JSONObject {
+     }
+     /**
+      * A range.

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0.0a0"]
+requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.3"]
 build-backend = "jupyter_packaging.build_api"
 
 [tool.jupyter-packaging.options]