Fix CI

.eslintrc.js

@@ -2,9 +2,7 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-    'prettier'
+    'plugin:@typescript-eslint/recommended'
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {

.github/workflows/build.yml

@@ -24,15 +24,7 @@ jobs:
           extra-specs: |
             python=3.9
             jupyterlab=4
-            freecad
-
-      - name: Lint the extension
-        shell: bash -l {0}
-        run: |
-          set -eux
-          jlpm
-          export NODE_OPTIONS="--max-old-space-size=4096"
-          jlpm run lint:check
+            yarn=3
 
       - name: Setup pip cache
         uses: actions/cache@v2
@@ -70,6 +62,7 @@ jobs:
         shell: bash -l {0}
         run: |
           set -eux
+          yarn install
           yarn dev
           jupyter labextension list 2>&1 | grep -ie "jupytercad-core.*OK"
           jupyter labextension list 2>&1 | grep -ie "jupytercad-lab.*OK"
@@ -100,9 +93,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
       - name: Install Python
         uses: actions/setup-python@v4
         with:
@@ -120,10 +110,13 @@ jobs:
           # Remove NodeJS, twice to take care of system and locally installed node versions.
           sudo rm -rf $(which node)
           sudo rm -rf $(which node)
-          pip install "jupyterlab>=4.0.0" jupytercad*.whl
+
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
+          python -m pip install "jupyterlab>=4.0.0" jupytercad*.whl
 
           jupyter labextension list
           jupyter labextension list 2>&1 | grep -ie "jupytercad.*OK"
+          jupyter cad --version
           # jupyterlab.browser_check will fail due to the core extension jupyterlab_pygments.
           # It does not support lab v4.0.0
           #python -m jupyterlab.browser_check --no-chrome-test
@@ -149,8 +142,7 @@ jobs:
           extra-specs: |
             python=3.9
             jupyterlab=4
-            freecad
-            pythonocc-core
+            pythonocc-core=7.7.0
 
       - name: Download extension package
         uses: actions/download-artifact@v3
@@ -161,6 +153,7 @@ jobs:
         shell: bash -l {0}
         run: |
           set -eux
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
           python -m pip install jupytercad*.whl
 
       - name: Install dependencies

.github/workflows/check-release.yml

@@ -11,12 +11,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Base Setup
-        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
-      - name: Install Dependencies
-        run: |
-          pip install "jupyterlab>=4.0.0,<5"
-          yarn dev
+
+      - name: Install Conda environment with Micromamba
+        uses: mamba-org/provision-with-micromamba@main
+        with:
+          environment-name: cad
+          environment-file: false
+          channels: conda-forge/label/jupyterlab_beta,conda-forge
+          extra-specs: |
+            python=3.9
+            jupyterlab=4
+            yarn=3
+
       - name: Check Release
         uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:

.github/workflows/update_galata_references.yaml

@@ -48,14 +48,14 @@ jobs:
 
       - name: Create the conda environment
         shell: bash -l {0}
-        run: mamba install -q python=3.9 pip freecad jupyterlab=4.0.0 pythonocc-core
+        run: mamba install -q python=3.9 pip freecad jupyterlab=4 pythonocc-core=7.7.0
 
       - name: Install the extension
         shell: bash -l {0}
         run: |
           whereis python
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
           python -m pip install jupytercad*.whl
-          python -m pip install jupyter_collaboration==1.0.0a9
 
       - name: Install dependencies
         shell: bash -l {0}

.pre-commit-config.yaml

@@ -51,5 +51,3 @@ repos:
           - '[email protected]'
           - '@typescript-eslint/[email protected]'
           - '@typescript-eslint/[email protected]'
-          - '[email protected]'
-          - '[email protected]'

.prettierignore

@@ -1,7 +1,6 @@
 node_modules
 **/node_modules
 **/lib
-**/package.json
 jupytercad
 **/*.d.ts
 **/*.js

.readthedocs.yaml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: 'ubuntu-20.04'
   tools:
-    python: "mambaforge-4.10"
+    python: 'mambaforge-4.10'
 
 conda:
   environment: docs/environment.yml

docs/environment.yml

@@ -7,4 +7,4 @@ dependencies:
   - pydata-sphinx-theme
   - sphinx-autodoc-typehints
   - pip:
-    - jupytercad
+      - jupytercad

package.json

@@ -1,70 +1,79 @@
 {
-    "name": "@jupytercad/jupytercad-root",
-    "version": "0.3.3",
-    "private": true,
-    "homepage": "https://github.com/jupytercad/jupytercad",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/jupytercad/jupytercad.git"
-    },
-    "license": "BSD-3-Clause",
-    "description": "A JupyterLab extension for 3D modelling.",
-    "keywords": [
-        "jupyter",
-        "jupyterlab",
-        "jupyterlab-extension"
-    ],
-    "bugs": {
-        "url": "https://github.com/jupytercad/jupytercad/issues"
-    },
-    "author": {
-        "name": "JupyterCad contributors"
-    },
-    "workspaces": [
-        "packages/*",
-        "python/jupytercad-core",
-        "python/jupytercad-lab",
-        "python/jupytercad-app"
-    ],
-    "scripts": {
-        "build": "lerna run build",
-        "build:prod": "lerna run build:prod",
-        "build:test": "lerna run build:test",
-        "bump:js:version": "lerna version --no-push --force-publish --no-git-tag-version --yes",
-        "clean": "lerna run clean",
-        "clean:all": "lerna run clean:all",
-        "eslint": "eslint . --ext .ts,.tsx --cache --fix",
-        "eslint:check": "eslint . --ext .ts,.tsx",
-        "prettier": "prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-        "prettier:check": "prettier --list-different \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-        "lint:check": "jlpm run prettier:check && jlpm run eslint:check",
-        "lint": "jlpm run prettier && jlpm run eslint",
-        "test": "lerna run test",
-        "dev": "python scripts/dev-install.py",
-        "build:packages": "python scripts/build_packages.py",
-        "watch:lib": "lerna run --stream watch",
-        "watch": "lerna watch -- lerna run build --scope=\\$LERNA_PACKAGE_NAME --include-dependents",
-        "build:lab": "lerna run --ignore @jupytercad/jupytercad-app build",
-        "build:app": "lerna run --ignore @jupytercad/jupytercad-lab build"
-    },
-    "resolutions": {
-        "@jupyterlab/apputils": "~4.0.0",
-        "@lumino/coreutils": "^2.0.0",
-        "@jupyterlab/notebook": "~4.0.0",
-        "@jupyterlab/services": " ^7.0.0"
-    },
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "~5.55.0",
-        "@typescript-eslint/parser": "~5.55.0",
-        "copy-webpack-plugin": "^10.0.0",
-        "eslint": "~8.36.0",
-        "eslint-config-prettier": "~8.7.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "lerna": "^7.0.0",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^3.0.0",
-        "rimraf": "^3.0.2",
-        "typescript": "^5",
-        "webpack": "^5.76.3"
-    }
+  "name": "@jupytercad/jupytercad-root",
+  "version": "0.3.3",
+  "private": true,
+  "homepage": "https://github.com/jupytercad/jupytercad",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jupytercad/jupytercad.git"
+  },
+  "license": "BSD-3-Clause",
+  "description": "A JupyterLab extension for 3D modelling.",
+  "keywords": [
+    "jupyter",
+    "jupyterlab",
+    "jupyterlab-extension"
+  ],
+  "bugs": {
+    "url": "https://github.com/jupytercad/jupytercad/issues"
+  },
+  "author": {
+    "name": "JupyterCad contributors"
+  },
+  "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}"
+  ],
+  "workspaces": [
+    "packages/*",
+    "python/jupytercad-core",
+    "python/jupytercad-lab",
+    "python/jupytercad-app"
+  ],
+  "scripts": {
+    "build": "lerna run build",
+    "build:prod": "lerna run build:prod",
+    "build:test": "lerna run build:test",
+    "bump:js:version": "lerna version --no-push --force-publish --no-git-tag-version --yes",
+    "clean": "lerna run clean",
+    "clean:all": "lerna run clean:all",
+    "eslint": "eslint . --ext .ts,.tsx --cache --fix",
+    "eslint:check": "eslint . --ext .ts,.tsx",
+    "prettier": "prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
+    "prettier:check": "prettier --list-different \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
+    "lint:check": "jlpm run prettier:check && jlpm run eslint:check",
+    "lint": "jlpm run prettier && jlpm run eslint",
+    "test": "lerna run test",
+    "dev": "python scripts/dev-install.py",
+    "build:packages": "python scripts/build_packages.py",
+    "watch:lib": "lerna run --stream watch",
+    "watch": "lerna watch -- lerna run build --scope=\\$LERNA_PACKAGE_NAME --include-dependents",
+    "build:lab": "lerna run --ignore @jupytercad/jupytercad-app build",
+    "build:app": "lerna run --ignore @jupytercad/jupytercad-lab build"
+  },
+  "resolutions": {
+    "@jupyterlab/apputils": "~4.0.0",
+    "@lumino/coreutils": "^2.0.0",
+    "@jupyterlab/notebook": "~4.0.0",
+    "@jupyterlab/services": " ^7.0.0"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "5.55.0",
+    "@typescript-eslint/parser": "5.55.0",
+    "copy-webpack-plugin": "^10.0.0",
+    "eslint": "8.36.0",
+    "eslint-config-prettier": "8.7.0",
+    "eslint-plugin-prettier": "5.0.1",
+    "lerna": "^7.0.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^3.0.0",
+    "rimraf": "^3.0.2",
+    "stylelint": "^15.10.1",
+    "stylelint-config-recommended": "^13.0.0",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-csstree-validator": "^3.0.0",
+    "stylelint-prettier": "^4.0.0",
+    "typescript": "^5",
+    "webpack": "^5.76.3"
+  }
 }