Merge pull request #3 from hbcarlos/extend_blockly

Extend jupyterlab-blockly

Author: DenisaCG

.gitignore

@@ -6,6 +6,7 @@ node_modules/
 *.egg-info/
 .ipynb_checkpoints
 *.tsbuildinfo
+yarn-error.log
 jupyterlab_niryo_one/labextension
 
 # Integration tests

package.json

@@ -55,7 +55,10 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^3.4",
-    "jupyterlab-blockly": "^0.1.0-alpha.2"
+    "blockly": "^7.20211209.2",
+    "jupyterlab-blockly": "^0.1.0-alpha.4",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0"
   },
   "devDependencies": {
     "@jupyterlab/builder": "^3.3",

patches/@jupyterlab+codeeditor+3.4.patch renamed to patches/@jupyterlab+codeeditor+3.4.3.patch

@@ -54,8 +54,12 @@
     zip_safe=False,
     include_package_data=True,
     python_requires=">=3.7",
+    install_requires=['jupyterlab-blockly>=0.1.0a5,<0.2'],
+    extras_require={
+        'env': ['pyniryo']
+    },
     platforms="Linux, Mac OS X, Windows",
-    keywords=["Jupyter", "JupyterLab", "JupyterLab3"],
+    keywords=["Jupyter", "JupyterLab", "JupyterLab3", "ROS", "Niryo", "Niryo-One"],
     classifiers=[
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",

setup.py

@@ -1,18 +1,9 @@
 import {
   JupyterFrontEnd,
-  JupyterFrontEndPlugin,
-  ILayoutRestorer
+  JupyterFrontEndPlugin
 } from '@jupyterlab/application';
-import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { IEditorServices } from '@jupyterlab/codeeditor';
-import { ICommandPalette } from '@jupyterlab/apputils';
-import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
-import { ILauncher } from '@jupyterlab/launcher';
-import { ITranslator } from '@jupyterlab/translation';
-import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
-import { IBlocklyRegisty } from 'jupyterlab-blockly/lib/token';
-import Blocklyplugin from 'jupyterlab-blockly';
+import { IBlocklyRegisty } from 'jupyterlab-blockly';
 
 import BlocklyNiryo from './niryo_one_python_generators';
 
@@ -22,46 +13,12 @@ import BlocklyNiryo from './niryo_one_python_generators';
 const plugin: JupyterFrontEndPlugin<void> = {
   id: 'jupyterlab-niryo-one:plugin',
   autoStart: true,
-  requires: [
-    ILayoutRestorer,
-    IRenderMimeRegistry,
-    IEditorServices,
-    IFileBrowserFactory,
-    ISettingRegistry,
-    ITranslator
-  ],
-  optional: [ILauncher, ICommandPalette],
-  activate: (
-    app: JupyterFrontEnd,
-    restorer: ILayoutRestorer,
-    rendermime: IRenderMimeRegistry,
-    editorServices: IEditorServices,
-    browserFactory: IFileBrowserFactory,
-    settings: ISettingRegistry,
-    translator: ITranslator,
-    launcher: ILauncher | null,
-    palette: ICommandPalette | null
-  ) => {
+  requires: [IBlocklyRegisty],
+  activate: (app: JupyterFrontEnd, blockly: IBlocklyRegisty) => {
     console.log('JupyterLab extension jupyterlab-niryo-one is activated!');
 
-    // Activating the Blockly plugin.
-    const BlocklyReturn = Blocklyplugin.activate(
-      app,
-      restorer,
-      rendermime,
-      editorServices,
-      browserFactory,
-      settings,
-      translator,
-      launcher,
-      palette
-    );
-
     //Registering the new toolbox containing all Niryo One blocks.
-    (BlocklyReturn as IBlocklyRegisty).registerToolbox(
-      'niryo',
-      BlocklyNiryo.Toolbox
-    );
+    blockly.registerToolbox('niryo', BlocklyNiryo.Toolbox);
   }
 };