Merge pull request #1 from DenisaCG/blockly

Add `jupyterlab-blockly`

Author: DenisaCG

.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
 
     - name: Lint the extension
       run: |
@@ -72,7 +72,7 @@ jobs:
         sudo rm -rf $(which node)
         sudo rm -rf $(which node)
 
-        pip install "jupyterlab~=3.1" jupyterlab_blockly_ipylgbst*.whl
+        pip install jupyterlab jupyterlab_blockly_ipylgbst*.whl
 
 
         jupyter labextension list

package.json

@@ -51,13 +51,20 @@
     "stylelint:check": "stylelint --cache \"style/**/*.css\"",
     "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": "^3.1.0"
+    "@jupyter-widgets/base": "^6.0.4",
+    "@jupyter-widgets/jupyterlab-manager": "^5.0.7",
+    "@jupyterlab/application": "^3.4",
+    "blockly": "^9.2.1",
+    "jupyterlab-blockly": "^0.3.0-alpha.1",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.1.0",
+    "@jupyterlab/builder": "^3.4.0",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
     "eslint": "^7.14.0",
@@ -71,7 +78,7 @@
     "stylelint-config-recommended": "^6.0.0",
     "stylelint-config-standard": "~24.0.0",
     "stylelint-prettier": "^2.0.0",
-    "typescript": "~4.1.3"
+    "typescript": "~4.9.5"
   },
   "sideEffects": [
     "style/*.css",
@@ -83,7 +90,17 @@
   },
   "jupyterlab": {
     "extension": true,
-    "outputDir": "jupyterlab_blockly_ipylgbst/labextension"
+    "outputDir": "jupyterlab_blockly_ipylgbst/labextension",
+    "sharedPackages": {
+      "jupyterlab-blockly": {
+        "bundled": false,
+        "singleton": true
+      },
+      "blockly": {
+        "bundled": false,
+        "singleton": true
+      }
+    }
   },
   "eslintIgnore": [
     "node_modules",

patches/@jupyterlab+codeeditor+3.6.3.patch

@@ -0,0 +1,15 @@
+
+
+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 = ["hatchling>=1.4.0", "jupyterlab>=3.4.7,<4.0.0", "hatch-nodejs-version"]
+requires = ["hatchling>=1.4.0", "jupyterlab~=3.6", "hatch-nodejs-version"]
 build-backend = "hatchling.build"
 
 [project]
@@ -23,6 +23,9 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
+ "jupyterlab~=3.6",
+ "jupyterlab-blockly>=0.3.0-alpha.1,<0.4",
+ "ipywidgets==7.6.0"
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 
@@ -66,7 +69,7 @@ build_dir = "jupyterlab_blockly_ipylgbst/labextension"
 version_cmd = "hatch version"
 
 [tool.jupyter-releaser.hooks]
-before-build-npm = ["python -m pip install jupyterlab~=3.1", "jlpm", "jlpm build:prod"]
+before-build-npm = ["python -m pip install jupyterlab~=3.6", "jlpm", "jlpm build:prod"]
 before-build-python = ["jlpm clean:all"]
 
 [tool.check-wheel-contents]

src/index.ts

@@ -3,13 +3,16 @@ import {
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
 
+import { IBlocklyRegistry } from 'jupyterlab-blockly';
+
 /**
  * Initialization data for the jupyterlab-blockly-ipylgbst extension.
  */
 const plugin: JupyterFrontEndPlugin<void> = {
   id: 'jupyterlab-blockly-ipylgbst:plugin',
   autoStart: true,
-  activate: (app: JupyterFrontEnd) => {
+  requires: [IBlocklyRegistry],
+  activate: (app: JupyterFrontEnd, blockly: IBlocklyRegistry) => {
     console.log(
       'JupyterLab extension jupyterlab-blockly-ipylgbst is activated!'
     );

tsconfig.json

@@ -15,10 +15,9 @@
     "resolveJsonModule": true,
     "outDir": "lib",
     "rootDir": "src",
-    "strict": true,
-    "strictNullChecks": true,
     "target": "ES2018",
     "types": []
   },
-  "include": ["src/*"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"]
 }