Fix worker module

jupytercad · Nov 13, 2023 · 83a92bf · 83a92bf
1 parent a3d80b4
commit 83a92bf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/jupytercad-extension/package.json b/packages/jupytercad-extension/package.json
@@ -73,7 +73,6 @@
     },
     "devDependencies": {
         "@apidevtools/json-schema-ref-parser": "^9.0.9",
-        "@jupyterlab/builder": "^4.0.0",
         "@types/node": "^18.15.11",
         "copy-webpack-plugin": "^10.0.0",
         "file-loader": "^6.2.0",

diff --git a/packages/jupytercad-worker/package.json b/packages/jupytercad-worker/package.json
@@ -24,8 +24,9 @@
         "url": "https://github.com/jupyter-cad/jupytercad.git"
     },
     "scripts": {
-        "build": "webpack --config worker.webpack.config.js --mode=development",
-        "build:prod": "webpack --config worker.webpack.config.js --mode=production",
+        "build:lib": "tsc -b",
+        "build": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=development",
+        "build:prod": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=production",
         "clean": "rimraf tsconfig.tsbuildinfo",
         "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
         "clean:all": "jlpm run clean:lib",

diff --git a/packages/jupytercad-worker/src/index.ts b/packages/jupytercad-worker/src/index.ts
@@ -1 +1,2 @@
 export * from './types';
+export * from './occparser';
diff --git a/python/jupytercad-core/package.json b/python/jupytercad-core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@jupytercad/jupytercad-core",
-    "version": "0.1.0",
+    "version": "0.3.3",
     "description": "JupyterCad core extension",
     "keywords": [
         "jupyter",

diff --git a/python/jupytercad-core/pyproject.toml b/python/jupytercad-core/pyproject.toml
@@ -40,8 +40,8 @@ artifacts = ["jupytercad_core/labextension"]
 exclude = [".github", "binder"]
 
 [tool.hatch.build.targets.wheel.shared-data]
-"jupytercad_core/labextension" = "share/jupyter/labextensions/jupytercad-core"
-"install.json" = "share/jupyter/labextensions/jupytercad-core/install.json"
+"jupytercad_core/labextension" = "share/jupyter/labextensions/@jupytercad/jupytercad-core"
+"install.json" = "share/jupyter/labextensions/@jupytercad/jupytercad-core/install.json"
 "jupyter-config/server-config" = "etc/jupyter/jupyter_server_config.d"
 
 [tool.hatch.build.hooks.version]

diff --git a/yarn.lock b/yarn.lock
@@ -945,7 +945,6 @@ __metadata:
     "@jupytercad/jupytercad-worker": ^0.3.3
     "@jupyterlab/application": ^4.0.0
     "@jupyterlab/apputils": ^4.0.0
-    "@jupyterlab/builder": ^4.0.0
     "@jupyterlab/coreutils": ^6.0.0
     "@jupyterlab/docregistry": ^4.0.0
     "@jupyterlab/filebrowser": ^4.0.0
@@ -11536,11 +11535,11 @@ __metadata:
 
 "typescript@patch:typescript@>=3 < 6#~builtin<compat/typescript>, typescript@patch:typescript@^5#~builtin<compat/typescript>":
   version: 5.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=85af82"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
+  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
   languageName: node
   linkType: hard