Merge pull request #33 from hbcarlos/split-packages

Split blockly in two packages

Author: hbcarlos

.eslintignore

@@ -1,17 +1,18 @@
-**/node_modules
 **/lib
+**/node_modules
+**/style
 **/package.json
-**/patches
-dist
-coverage
+**/tsconfig.json
 **/*.d.ts
-tests
 
 .github
 binder
-jupyterlab_blockly/labextension
+jupyterlab_blockly
 docs
 examples
+node_modules
+patches
+scripts
 .eslintignore
 .eslintrc.js
 .gitignore
@@ -20,10 +21,14 @@ examples
 .prettierrc
 CHANGELOG.md
 install.json
+lerna.json
 LICENSE
 MANIFEST.in
+package.json
 pyproject.toml
 README.md
 RELEASE.md
+setup.py
+tsconfig.eslint.json
 tsconfig.json
 yarn.lock

.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+  root: true,
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/eslint-recommended',
@@ -8,7 +9,7 @@ module.exports = {
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    project: 'tsconfig.json',
+    project: 'tsconfig.eslint.json',
     sourceType: 'module'
   },
   plugins: ['@typescript-eslint'],
@@ -27,7 +28,9 @@ module.exports = {
     '@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
     '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/no-namespace': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/no-use-before-define': 'off',
+    '@typescript-eslint/no-empty-interface': 'off',
     '@typescript-eslint/quotes': [
       'error',
       'single',
@@ -36,5 +39,10 @@ module.exports = {
     curly: ['error', 'all'],
     eqeqeq: 'error',
     'prefer-arrow-callback': 'error'
+  },
+  settings: {
+    react: {
+      version: 'detect'
+    }
   }
 };

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
         python -m pip install .
 
         jupyter labextension list
-        jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly.*OK"
+        jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly-extension.*OK"
         python -m jupyterlab.browser_check
 
         check-manifest -v
@@ -66,5 +66,5 @@ jobs:
         sudo rm -rf $(which node)
         pip install myextension.tar.gz
         pip install jupyterlab
-        jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly.*OK"
+        jupyter labextension list 2>&1 | grep -ie "jupyterlab-blockly-extension.*OK"
         python -m jupyterlab.browser_check --no-browser-test

.prettierignore

@@ -1,5 +1,37 @@
-node_modules
-**/node_modules
 **/lib
+**/node_modules
+**/style
 **/package.json
+**/tsconfig.json
+**/patches
+**/scripts
+**/*.d.ts
+
+.github
+binder
 jupyterlab_blockly
+docs
+examples
+node_modules
+patches
+scripts
+.eslintignore
+.eslintrc.js
+.gitignore
+.pre-commit-config.yaml
+.prettierignore
+.prettierrc
+CHANGELOG.md
+install.json
+lerna.json
+LICENSE
+MANIFEST.in
+package.json
+pyproject.toml
+README.md
+RELEASE.md
+setup.py
+tsconfig.eslint.json
+tsconfig.json
+yarn.lock
+

MANIFEST.in

@@ -11,11 +11,11 @@ graft jupyterlab_blockly/labextension
 recursive-include patches *.patch
 
 # Javascript files
-graft src
-graft style
+graft packages/blockly-extension
 prune **/node_modules
 prune lib
 prune binder
+prune scripts
 
 # Patterns to exclude from any directory
 global-exclude *~

README.md

@@ -54,10 +54,10 @@ micromamba create -n blockly -c conda-forge python nodejs pre-commit yarn jupyte
 micromamba activate blockly
 # Clone the repo to your local environment
 # Change directory to the jupyterlab_blockly directory
-# Install package in development mode
-pip install -e .
 # Installing pre-commit to run command when adding commits
 pre-commit install
+# Install package in development mode
+pip install -e .
 # Link your development version of the extension with JupyterLab
 jupyter labextension develop . --overwrite
 # Rebuild extension Typescript source after making changes

binder/environment.yml

@@ -14,7 +14,7 @@ dependencies:
   - python >=3.8,<3.9.0a0
   - jupyterlab >=3,<4.0.0a0
   # labextension build dependencies
-  - nodejs >=14,<15
+  - nodejs >=16,<17
   - pip
   - wheel
   # additional packages for demos

jupyterlab_blockly/_version.py

@@ -6,7 +6,7 @@
 def _fetchVersion():
     HERE = Path(__file__).parent.resolve()
 
-    for settings in HERE.rglob("package.json"): 
+    for settings in HERE.rglob("packages/blockly-extension/package.json"): 
         try:
             with settings.open() as f:
                 version = json.load(f)["version"]

lerna.json

@@ -0,0 +1,6 @@
+{
+  "lerna": "5.1.0",
+  "version": "independent",
+  "npmClient": "yarn",
+  "useWorkspaces": true
+}

package.json

@@ -1,108 +1,43 @@
 {
-  "name": "jupyterlab-blockly",
-  "version": "0.1.0-alpha.2",
-  "description": "Blockly extension for JupyterLab.",
-  "keywords": [
-    "jupyter",
-    "jupyterlab",
-    "jupyterlab-extension"
-  ],
-  "homepage": "https://github.com/quantstack/jupyterlab-blockly",
-  "bugs": {
-    "url": "https://github.com/quantstack/jupyterlab-blockly/issues"
-  },
-  "license": "BSD-3-Clause",
-  "author": {
-    "name": "quantstack",
-    "email": ""
-  },
-  "files": [
-    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-    "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
-  ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "style": "style/index.css",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/quantstack/jupyterlab-blockly.git"
+  "name": "jupyterlab-blockly-root",
+  "version": "0.1.0",
+  "private": true,
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ]
   },
   "scripts": {
-    "build": "jlpm run build:lib && jlpm run build:labextension:dev",
-    "build:prod": "jlpm run clean && jlpm run build:lib && jlpm run build:labextension",
-    "build:labextension": "jupyter labextension build .",
-    "build:labextension:dev": "jupyter labextension build --development True .",
-    "build:lib": "tsc",
-    "clean": "jlpm run clean:lib",
-    "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
-    "clean:labextension": "rimraf jupyterlab_blockly/labextension",
-    "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
+    "build": "lerna run build",
+    "build:prod": "lerna run build:prod",
+    "clean": "lerna run clean",
+    "clean:all": "lerna run clean:all",
     "eslint": "jlpm eslint:check --fix",
     "eslint:check": "eslint . --ext .ts,.tsx",
-    "install:extension": "jlpm run build",
+    "install": "lerna bootstrap",
+    "install:extension": "lerna run install:extension",
     "lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
     "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
     "prettier": "jlpm prettier:base --write --list-different",
     "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css}\"",
     "prettier:check": "jlpm prettier:base --check",
-    "watch": "run-p watch:src watch:labextension",
-    "watch:src": "tsc -w",
-    "watch:labextension": "jupyter labextension watch .",
+    "watch": "lerna run watch",
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.4",
-    "@jupyterlab/apputils": "^3.4",
-    "@jupyterlab/cells": "^3.4",
-    "@jupyterlab/codeeditor": "^3.4",
-    "@jupyterlab/coreutils": "^5.4",
-    "@jupyterlab/docregistry": "^3.4",
-    "@jupyterlab/filebrowser": "^3.4",
-    "@jupyterlab/launcher": "^3.4",
-    "@jupyterlab/outputarea": "^3.4",
-    "@jupyterlab/rendermime": "^3.4",
-    "@jupyterlab/services": "^6.4",
-    "@jupyterlab/ui-components": "^3.4",
-    "@lumino/algorithm": "^1.9.0",
-    "@lumino/coreutils": "^1.11.0",
-    "@lumino/messaging": "^1.10.0",
-    "@lumino/signaling": "^1.10.0",
-    "@lumino/widgets": "^1.30.0",
-    "blockly": "^7.20211209.2",
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0"
-  },
-  "devDependencies": {
-    "@jupyterlab/builder": "^3.4",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
     "eslint": "^8.9.0",
     "eslint-config-prettier": "^8.4.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.30.0",
-    "npm-run-all": "^4.1.5",
+    "patch-package": "^6.4.7",
     "prettier": "^2.5.1",
-    "rimraf": "^3.0.2",
+    "postinstall-postinstall": "^2.1.0",
     "typescript": "~4.5.2"
   },
-  "sideEffects": [
-    "style/*.css",
-    "style/index.js"
-  ],
-  "styleModule": "style/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "jupyterlab": {
-    "extension": true,
-    "outputDir": "jupyterlab_blockly/labextension"
-  },
-  "jupyter-releaser": {
-    "hooks": {
-      "before-build-npm": [
-        "python -m pip install jupyterlab",
-        "jlpm"
-      ]
-    }
+  "devDependencies": {
+    "lerna": "5.1.0",
+    "yarn": "1.22.17"
   }
 }