Rename jupytercad-extension to base

jupytercad · Nov 13, 2023 · 188324d · 188324d
1 parent 530663f
commit 188324d
Show file tree

Hide file tree

Showing 70 changed files with 132 additions and 176 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,6 +36,11 @@ repos:
       - id: ruff
         args: ['--fix']
 
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v8.53.0
     hooks:

diff --git a/jupytercad/__init__.py b/jupytercad/__init__.py
@@ -4,9 +4,5 @@
 from .notebook import *  # noqa
 
 
-def _jupyter_labextension_paths():
-    return [{"src": "labextension", "dest": "@jupytercad/jupytercad-extension"}]
-
-
 def _jupyter_server_extension_points():
     return [{"module": __name__, "app": CadApp}]
diff --git a/jupytercad/cadapp/utils.py b/jupytercad/cadapp/utils.py
@@ -25,7 +25,7 @@ def get_page_config(base_url, app_name):
         gpc(labextensions_path),
     )
     required_extensions = [
-        "@jupytercad/jupytercad-extension",
+        "@jupytercad/jupytercad-lab",
         "@jupyter/collaboration-extension",
     ]
     federated_extensions = page_config["federated_extensions"]

diff --git a/packages/jupytercad-extension/package.json → packages/base/package.json b/packages/jupytercad-extension/package.json → packages/base/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@jupytercad/jupytercad-extension",
+    "name": "@jupytercad/base",
     "version": "0.3.3",
     "description": "A JupyterLab extension for 3D modelling.",
     "keywords": [

diff --git a/...ytercad-extension/src/annotation/index.ts → packages/base/src/annotation/index.ts b/...ytercad-extension/src/annotation/index.ts → packages/base/src/annotation/index.ts
diff --git a/...rcad-extension/src/annotation/message.tsx → packages/base/src/annotation/message.tsx b/...rcad-extension/src/annotation/message.tsx → packages/base/src/annotation/message.tsx
diff --git a/...ytercad-extension/src/annotation/model.ts → packages/base/src/annotation/model.ts b/...ytercad-extension/src/annotation/model.ts → packages/base/src/annotation/model.ts
diff --git a/...ytercad-extension/src/annotation/view.tsx → packages/base/src/annotation/view.tsx b/...ytercad-extension/src/annotation/view.tsx → packages/base/src/annotation/view.tsx
diff --git a/...ages/jupytercad-extension/src/commands.ts → packages/base/src/commands.ts b/...ages/jupytercad-extension/src/commands.ts → packages/base/src/commands.ts
diff --git a/packages/jupytercad-extension/src/factory.ts → packages/base/src/factory.ts b/packages/jupytercad-extension/src/factory.ts → packages/base/src/factory.ts
diff --git a/...ad-extension/src/fcplugin/modelfactory.ts → packages/base/src/fcplugin/modelfactory.ts b/...ad-extension/src/fcplugin/modelfactory.ts → packages/base/src/fcplugin/modelfactory.ts
diff --git a/...ytercad-extension/src/fcplugin/plugins.ts → packages/base/src/fcplugin/plugins.ts b/...ytercad-extension/src/fcplugin/plugins.ts → packages/base/src/fcplugin/plugins.ts
diff --git a/...s/jupytercad-extension/src/formdialog.tsx → packages/base/src/formdialog.tsx b/...s/jupytercad-extension/src/formdialog.tsx → packages/base/src/formdialog.tsx
diff --git a/packages/jupytercad-extension/src/index.ts → packages/base/src/index.ts b/packages/jupytercad-extension/src/index.ts → packages/base/src/index.ts
diff --git a/...-extension/src/jcadplugin/modelfactory.ts → packages/base/src/jcadplugin/modelfactory.ts b/...-extension/src/jcadplugin/modelfactory.ts → packages/base/src/jcadplugin/modelfactory.ts
diff --git a/...ercad-extension/src/jcadplugin/plugins.ts → packages/base/src/jcadplugin/plugins.ts b/...ercad-extension/src/jcadplugin/plugins.ts → packages/base/src/jcadplugin/plugins.ts
diff --git a/...ges/jupytercad-extension/src/mainview.tsx → packages/base/src/mainview.tsx b/...ges/jupytercad-extension/src/mainview.tsx → packages/base/src/mainview.tsx
diff --git a/packages/jupytercad-extension/src/model.ts → packages/base/src/model.ts b/packages/jupytercad-extension/src/model.ts → packages/base/src/model.ts
diff --git a/...d-extension/src/notebookrenderer/index.ts → packages/base/src/notebookrenderer/index.ts b/...d-extension/src/notebookrenderer/index.ts → packages/base/src/notebookrenderer/index.ts
diff --git a/...d-extension/src/panelview/annotations.tsx → packages/base/src/panelview/annotations.tsx b/...d-extension/src/panelview/annotations.tsx → packages/base/src/panelview/annotations.tsx
diff --git a/...d-extension/src/panelview/formbuilder.tsx → packages/base/src/panelview/formbuilder.tsx b/...d-extension/src/panelview/formbuilder.tsx → packages/base/src/panelview/formbuilder.tsx
diff --git a/...tercad-extension/src/panelview/header.tsx → packages/base/src/panelview/header.tsx b/...tercad-extension/src/panelview/header.tsx → packages/base/src/panelview/header.tsx
diff --git a/...cad-extension/src/panelview/leftpanel.tsx → packages/base/src/panelview/leftpanel.tsx b/...cad-extension/src/panelview/leftpanel.tsx → packages/base/src/panelview/leftpanel.tsx
diff --git a/...pytercad-extension/src/panelview/model.ts → packages/base/src/panelview/model.ts b/...pytercad-extension/src/panelview/model.ts → packages/base/src/panelview/model.ts
diff --git a/...ension/src/panelview/objectproperties.tsx → ...s/base/src/panelview/objectproperties.tsx b/...ension/src/panelview/objectproperties.tsx → ...s/base/src/panelview/objectproperties.tsx
diff --git a/...ad-extension/src/panelview/objecttree.tsx → packages/base/src/panelview/objecttree.tsx b/...ad-extension/src/panelview/objecttree.tsx → packages/base/src/panelview/objecttree.tsx
diff --git a/...ad-extension/src/panelview/rightpanel.tsx → packages/base/src/panelview/rightpanel.tsx b/...ad-extension/src/panelview/rightpanel.tsx → packages/base/src/panelview/rightpanel.tsx
diff --git a/...extension/src/sketcher/elements/circle.ts → ...ages/base/src/sketcher/elements/circle.ts b/...extension/src/sketcher/elements/circle.ts → ...ages/base/src/sketcher/elements/circle.ts
diff --git a/...d-extension/src/sketcher/elements/line.ts → packages/base/src/sketcher/elements/line.ts b/...d-extension/src/sketcher/elements/line.ts → packages/base/src/sketcher/elements/line.ts
diff --git a/...-extension/src/sketcher/elements/point.ts → packages/base/src/sketcher/elements/point.ts b/...-extension/src/sketcher/elements/point.ts → packages/base/src/sketcher/elements/point.ts
diff --git a/...ytercad-extension/src/sketcher/helper.tsx → packages/base/src/sketcher/helper.tsx b/...ytercad-extension/src/sketcher/helper.tsx → packages/base/src/sketcher/helper.tsx
diff --git a/...ytercad-extension/src/sketcher/panzoom.ts → packages/base/src/sketcher/panzoom.ts b/...ytercad-extension/src/sketcher/panzoom.ts → packages/base/src/sketcher/panzoom.ts
diff --git a/...extension/src/sketcher/sketcherdialog.tsx → ...ages/base/src/sketcher/sketcherdialog.tsx b/...extension/src/sketcher/sketcherdialog.tsx → ...ages/base/src/sketcher/sketcherdialog.tsx
diff --git a/...d-extension/src/sketcher/sketchermodel.ts → packages/base/src/sketcher/sketchermodel.ts b/...d-extension/src/sketcher/sketchermodel.ts → packages/base/src/sketcher/sketchermodel.ts
diff --git a/...extension/src/sketcher/sketcherwidget.tsx → ...ages/base/src/sketcher/sketcherwidget.tsx b/...extension/src/sketcher/sketcherwidget.tsx → ...ages/base/src/sketcher/sketcherwidget.tsx
@@ -221,8 +221,8 @@ export class SketcherReactWidget extends React.Component<IProps, IState> {
       e.type === 'mousedown' && e.button === 2
         ? true
         : e.type === 'mouseup'
-        ? false
-        : this._mouse.button;
+          ? false
+          : this._mouse.button;
     if (e.type === 'wheel') {
       this._mouse.wheel += -(e as WheelEvent).deltaY;
       e.preventDefault();

diff --git a/...upytercad-extension/src/sketcher/types.ts → packages/base/src/sketcher/types.ts b/...upytercad-extension/src/sketcher/types.ts → packages/base/src/sketcher/types.ts
diff --git a/packages/jupytercad-extension/src/svg.d.ts → packages/base/src/svg.d.ts b/packages/jupytercad-extension/src/svg.d.ts → packages/base/src/svg.d.ts
diff --git a/packages/jupytercad-extension/src/token.ts → packages/base/src/token.ts b/packages/jupytercad-extension/src/token.ts → packages/base/src/token.ts
diff --git a/...extension/src/toolbar/usertoolbaritem.tsx → ...ages/base/src/toolbar/usertoolbaritem.tsx b/...extension/src/toolbar/usertoolbaritem.tsx → ...ages/base/src/toolbar/usertoolbaritem.tsx
diff --git a/...pytercad-extension/src/toolbar/widget.tsx → packages/base/src/toolbar/widget.tsx b/...pytercad-extension/src/toolbar/widget.tsx → packages/base/src/toolbar/widget.tsx
diff --git a/packages/jupytercad-extension/src/tools.ts → packages/base/src/tools.ts b/packages/jupytercad-extension/src/tools.ts → packages/base/src/tools.ts
diff --git a/packages/jupytercad-extension/src/types.ts → packages/base/src/types.ts b/packages/jupytercad-extension/src/types.ts → packages/base/src/types.ts
diff --git a/packages/jupytercad-extension/src/widget.tsx → packages/base/src/widget.tsx b/packages/jupytercad-extension/src/widget.tsx → packages/base/src/widget.tsx
diff --git a/packages/jupytercad-extension/style/base.css → packages/base/style/base.css b/packages/jupytercad-extension/style/base.css → packages/base/style/base.css
diff --git a/.../jupytercad-extension/style/icon/axes.svg → packages/base/style/icon/axes.svg b/.../jupytercad-extension/style/icon/axes.svg → packages/base/style/icon/axes.svg
diff --git a/...s/jupytercad-extension/style/icon/box.svg → packages/base/style/icon/box.svg b/...s/jupytercad-extension/style/icon/box.svg → packages/base/style/icon/box.svg
diff --git a/.../jupytercad-extension/style/icon/cone.svg → packages/base/style/icon/cone.svg b/.../jupytercad-extension/style/icon/cone.svg → packages/base/style/icon/cone.svg
diff --git a/...s/jupytercad-extension/style/icon/cut.svg → packages/base/style/icon/cut.svg b/...s/jupytercad-extension/style/icon/cut.svg → packages/base/style/icon/cut.svg
diff --git a/...ytercad-extension/style/icon/cylinder.svg → packages/base/style/icon/cylinder.svg b/...ytercad-extension/style/icon/cylinder.svg → packages/base/style/icon/cylinder.svg
diff --git a/...tercad-extension/style/icon/extrusion.svg → packages/base/style/icon/extrusion.svg b/...tercad-extension/style/icon/extrusion.svg → packages/base/style/icon/extrusion.svg
diff --git a/...cad-extension/style/icon/intersection.svg → packages/base/style/icon/intersection.svg b/...cad-extension/style/icon/intersection.svg → packages/base/style/icon/intersection.svg
diff --git a/...tercad-extension/style/icon/jvcontrol.svg → packages/base/style/icon/jvcontrol.svg b/...tercad-extension/style/icon/jvcontrol.svg → packages/base/style/icon/jvcontrol.svg
diff --git a/...ytercad-extension/style/icon/minimize.svg → packages/base/style/icon/minimize.svg b/...ytercad-extension/style/icon/minimize.svg → packages/base/style/icon/minimize.svg
diff --git a/...upytercad-extension/style/icon/sphere.svg → packages/base/style/icon/sphere.svg b/...upytercad-extension/style/icon/sphere.svg → packages/base/style/icon/sphere.svg
diff --git a/...jupytercad-extension/style/icon/torus.svg → packages/base/style/icon/torus.svg b/...jupytercad-extension/style/icon/torus.svg → packages/base/style/icon/torus.svg
diff --git a/...jupytercad-extension/style/icon/union.svg → packages/base/style/icon/union.svg b/...jupytercad-extension/style/icon/union.svg → packages/base/style/icon/union.svg
diff --git a/...ercad-extension/style/icon/visibility.svg → packages/base/style/icon/visibility.svg b/...ercad-extension/style/icon/visibility.svg → packages/base/style/icon/visibility.svg
diff --git a/...ad-extension/style/icon/visibilityOff.svg → packages/base/style/icon/visibilityOff.svg b/...ad-extension/style/icon/visibilityOff.svg → packages/base/style/icon/visibilityOff.svg
diff --git a/...ages/jupytercad-extension/style/index.css → packages/base/style/index.css b/...ages/jupytercad-extension/style/index.css → packages/base/style/index.css
diff --git a/packages/jupytercad-extension/style/index.js → packages/base/style/index.js b/packages/jupytercad-extension/style/index.js → packages/base/style/index.js
diff --git a/packages/jupytercad-extension/tsconfig.json → packages/base/tsconfig.json b/packages/jupytercad-extension/tsconfig.json → packages/base/tsconfig.json
diff --git a/...jupytercad-extension/tsconfig.worker.json → packages/base/tsconfig.worker.json b/...jupytercad-extension/tsconfig.worker.json → packages/base/tsconfig.worker.json
diff --git a/packages/jupytercad-app/package.json b/packages/jupytercad-app/package.json
@@ -39,7 +39,7 @@
     "@jupyter/collaboration": "^1.0.0",
     "@jupyter/docprovider": "^1.0.0",
     "@jupyter/ydoc": "^0.3.4 || ^1.0.2",
-    "@jupytercad/jupytercad-extension": "^0.3.3",
+    "@jupytercad/base": "^0.3.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/application-extension": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",

diff --git a/packages/jupytercad-app/src/app/plugins/mainmenu/menuWidget.ts b/packages/jupytercad-app/src/app/plugins/mainmenu/menuWidget.ts
@@ -1,7 +1,7 @@
 import { RankedMenu, MenuSvg, homeIcon } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
 import { MenuBar } from '@lumino/widgets';
-import { CommandIDs } from '@jupytercad/jupytercad-extension/lib/commands';
+import { CommandIDs } from '@jupytercad/base/lib/commands';
 import { IThemeManager } from '@jupyterlab/apputils';
 export class MainMenu extends MenuBar {
   constructor(options: {

diff --git a/pyproject.toml b/pyproject.toml
@@ -42,54 +42,6 @@ dynamic = ["version", "description", "authors", "urls", "keywords"]
 jcad = "jupytercad.jcad_ydoc:YJCad"
 FCStd = "jupytercad.fcstd_ydoc:YFCStd"
 
-[tool.hatch.version]
-source = "nodejs"
-
-[tool.hatch.metadata.hooks.nodejs]
-fields = ["description", "authors", "urls"]
-
-[tool.hatch.build.targets.sdist]
-artifacts = [
-    "/jupytercad/labextension",
-    "/jupytercad/notebook/objects/_schema/*.py",
-    "/jupytercad/cadapp/",
-]
-exclude = ["/.github", "/binder", "node_modules", "examples", "ui-tests"]
-
-[tool.hatch.build.targets.wheel]
-artifacts = ["/jupytercad/notebook/objects/_schema/*.py", "/jupytercad/cadapp/"]
-
-[tool.hatch.build.targets.sdist.force-include]
-"./packages" = "packages"
-
-[tool.hatch.build.targets.wheel.shared-data]
-"install.json" = "share/jupyter/labextensions/@jupytercad/jupytercad-extension/install.json"
-"jupytercad/labextension" = "share/jupyter/labextensions/@jupytercad/jupytercad-extension"
-"etc/jupyter" = "etc/jupyter"
-
-[tool.hatch.build.hooks.version]
-path = "jupytercad/_version.py"
-
-[tool.hatch.build.hooks.jupyter-builder]
-dependencies = ["hatch-jupyter-builder>=0.5"]
-build-function = "hatch_jupyter_builder.npm_builder"
-ensured-targets = [
-    "jupytercad/labextension/static/style.js",
-    "jupytercad/labextension/package.json",
-    "jupytercad/notebook/objects/_schema/box.py",
-]
-skip-if-exists = ["jupytercad/labextension/static/style.js"]
-
-[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
-build_cmd = "build:prod"
-npm = ["jlpm"]
-
-[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
-build_cmd = "install:extension"
-npm = ["jlpm"]
-source_dir = "src"
-build_dir = "jupytercad/labextension"
-
 [tool.jupyter-releaser.options]
 version-cmd = "python scripts/bump-version.py"
 python_packages = [

diff --git a/python/jupytercad-core/package.json b/python/jupytercad-core/package.json
@@ -53,7 +53,7 @@
         "build:worker:prod": "webpack --config worker.webpack.config.js --mode=production"
     },
     "dependencies": {
-        "@jupytercad/jupytercad-extension": "^0.3.3",
+        "@jupytercad/base": "^0.3.3",
         "@jupytercad/jupytercad-opencascade": "^0.3.3",
         "@jupytercad/jupytercad-worker": "^0.3.3",
         "@jupyterlab/application": "^4.0.0",

diff --git a/python/jupytercad-core/src/index.ts b/python/jupytercad-core/src/index.ts
@@ -10,7 +10,7 @@ import {
   JupyterCadModel,
   AnnotationModel,
   JupyterCadWidget
-} from '@jupytercad/jupytercad-extension';
+} from '@jupytercad/base';
 import { ITranslator } from '@jupyterlab/translation';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { WidgetTracker } from '@jupyterlab/apputils';

diff --git a/python/jupytercad-lab/package.json b/python/jupytercad-lab/package.json
@@ -51,12 +51,41 @@
         "watch:labextension": "jupyter labextension watch ."
     },
     "dependencies": {
-        "@jupytercad/jupytercad-extension": "^0.3.3",
+        "@deathbeds/jupyterlab-rjsf": "^1.1.0",
+        "@jupyter/collaboration": "^1.0.0",
+        "@jupyter/docprovider": "^1.0.0",
+        "@jupyter/ydoc": "^0.3.4 || ^1.0.2",
         "@jupytercad/jupytercad-opencascade": "^0.3.3",
+        "@jupytercad/jupytercad-schema": "^0.3.3",
         "@jupytercad/jupytercad-worker": "^0.3.3",
         "@jupyterlab/application": "^4.0.0",
+        "@jupyterlab/apputils": "^4.0.0",
         "@jupyterlab/coreutils": "^6.0.0",
-        "@jupyterlab/services": "^7.0.0"
+        "@jupyterlab/docregistry": "^4.0.0",
+        "@jupyterlab/filebrowser": "^4.0.0",
+        "@jupyterlab/launcher": "^4.0.0",
+        "@jupyterlab/mainmenu": "^4.0.0",
+        "@jupyterlab/notebook": "^4.0.0",
+        "@jupyterlab/observables": "^5.0.0",
+        "@jupyterlab/services": "^7.0.0",
+        "@jupyterlab/translation": "^4.0.0",
+        "@jupyterlab/ui-components": "^4.0.0",
+        "@lumino/commands": "^2.0.0",
+        "@lumino/coreutils": "^2.0.0",
+        "@lumino/signaling": "^2.0.0",
+        "@lumino/widgets": "^2.0.0",
+        "@naisutech/react-tree": "^3.0.1",
+        "@rjsf/core": "^4.2.0",
+        "@types/d3-color": "^3.1.0",
+        "@types/three": "^0.134.0",
+        "d3-color": "^3.1.0",
+        "lib0": "^0.2.62",
+        "react": "^18.0.1",
+        "styled-components": "^5.3.6",
+        "three": "^0.135.0",
+        "three-mesh-bvh": "^0.5.17",
+        "uuid": "^8.3.2",
+        "yjs-widgets": "^0.3.3"
     },
     "devDependencies": {
         "@jupyterlab/builder": "^4.0.0",

diff --git a/python/jupytercad-lab/src/handler.ts b/python/jupytercad-lab/src/handler.ts