From eb6b2969230349941e63e8d915d1ffad217dfb68 Mon Sep 17 00:00:00 2001 From: Duc Trung LE Date: Tue, 21 Nov 2023 19:00:20 +0100 Subject: [PATCH] Update bump script --- .github/workflows/build.yml | 15 +- .prettierignore | 1 - package.json | 146 +++++++------- packages/base/package.json | 164 +++++++-------- packages/occ-worker/package.json | 108 +++++----- packages/schema/package.json | 122 ++++++------ pyproject.toml | 10 +- python/jupytercad-app/package.json | 232 +++++++++++----------- python/jupytercad-core/package.json | 212 ++++++++++---------- python/jupytercad-lab/package.json | 226 ++++++++++----------- python/jupytercad/scripts/bump-version.py | 16 +- scripts/bump-version.py | 46 ----- ui-tests/package.json | 36 ++-- 13 files changed, 651 insertions(+), 683 deletions(-) delete mode 100644 scripts/bump-version.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d5234d6..19257963 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,14 +25,6 @@ jobs: python=3.9 jupyterlab=4 - - name: Lint the extension - shell: bash -l {0} - run: | - set -eux - jlpm - export NODE_OPTIONS="--max-old-space-size=4096" - jlpm run lint:check - - name: Setup pip cache uses: actions/cache@v2 with: @@ -116,8 +108,8 @@ jobs: # Remove NodeJS, twice to take care of system and locally installed node versions. sudo rm -rf $(which node) sudo rm -rf $(which node) - find . | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/" - cp jupyercad-core/dist/jupytercad*.whl jupyercad-lab/dist/jupytercad*.whl jupyercad-app/dist/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 @@ -159,7 +151,8 @@ jobs: shell: bash -l {0} run: | set -eux - python -m pip install "jupyercad-core/dist/jupytercad*.whl" "jupyercad-lab/dist/jupytercad*.whl" "jupyercad-app/dist/jupytercad*.whl" + 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 shell: bash -l {0} diff --git a/.prettierignore b/.prettierignore index 7a2a3260..83d70a32 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,6 @@ node_modules **/node_modules **/lib -**/package.json jupytercad **/*.d.ts **/*.js diff --git a/package.json b/package.json index 985d68f7..8ea08fed 100644 --- a/package.json +++ b/package.json @@ -1,75 +1,75 @@ { - "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.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" - } + "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.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" + } } diff --git a/packages/base/package.json b/packages/base/package.json index b2d2e04b..d7d4cc21 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -1,84 +1,84 @@ { - "name": "@jupytercad/base", - "version": "0.3.3", - "description": "A JupyterLab extension for 3D modelling.", - "keywords": [ - "jupyter", - "jupyterlab", - "jupyterlab-extension" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" - }, - "license": "BSD-3-Clause", - "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}" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build": "tsc -b", - "build:prod": "jlpm run clean && jlpm run build", - "clean": "rimraf tsconfig.tsbuildinfo", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:all": "jlpm run clean:lib", - "watch": "tsc -w" - }, - "dependencies": { - "@deathbeds/jupyterlab-rjsf": "^1.1.0", - "@jupyter/docprovider": "^1.0.0", - "@jupyter/ydoc": "^0.3.4 || ^1.0.2", - "@jupytercad/occ-worker": "^0.3.3", - "@jupytercad/schema": "^0.3.3", - "@jupyterlab/application": "^4.0.0", - "@jupyterlab/apputils": "^4.0.0", - "@jupyterlab/coreutils": "^6.0.0", - "@jupyterlab/docregistry": "^4.0.0", - "@jupyterlab/filebrowser": "^4.0.0", - "@jupyterlab/launcher": "^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/messaging": "^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", - "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": { - "@apidevtools/json-schema-ref-parser": "^9.0.9", - "@types/node": "^18.15.11", - "rimraf": "^3.0.2", - "typescript": "^5" - }, - "sideEffects": [ - "style/*.css", - "style/index.js" - ], - "styleModule": "style/index.js", - "publishConfig": { - "access": "public" - } + "name": "@jupytercad/base", + "version": "0.3.3", + "description": "A JupyterLab extension for 3D modelling.", + "keywords": [ + "jupyter", + "jupyterlab", + "jupyterlab-extension" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "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}" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "style": "style/index.css", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build": "tsc -b", + "build:prod": "jlpm run clean && jlpm run build", + "clean": "rimraf tsconfig.tsbuildinfo", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:all": "jlpm run clean:lib", + "watch": "tsc -w" + }, + "dependencies": { + "@deathbeds/jupyterlab-rjsf": "^1.1.0", + "@jupyter/docprovider": "^1.0.0", + "@jupyter/ydoc": "^0.3.4 || ^1.0.2", + "@jupytercad/occ-worker": "^0.3.3", + "@jupytercad/schema": "^0.3.3", + "@jupyterlab/application": "^4.0.0", + "@jupyterlab/apputils": "^4.0.0", + "@jupyterlab/coreutils": "^6.0.0", + "@jupyterlab/docregistry": "^4.0.0", + "@jupyterlab/filebrowser": "^4.0.0", + "@jupyterlab/launcher": "^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/messaging": "^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", + "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": { + "@apidevtools/json-schema-ref-parser": "^9.0.9", + "@types/node": "^18.15.11", + "rimraf": "^3.0.2", + "typescript": "^5" + }, + "sideEffects": [ + "style/*.css", + "style/index.js" + ], + "styleModule": "style/index.js", + "publishConfig": { + "access": "public" + } } diff --git a/packages/occ-worker/package.json b/packages/occ-worker/package.json index c10c96cf..2e19006c 100644 --- a/packages/occ-worker/package.json +++ b/packages/occ-worker/package.json @@ -1,56 +1,56 @@ { - "name": "@jupytercad/occ-worker", - "version": "0.3.3", - "description": "Jupytercad opencascade worker package.", - "keywords": [ - "jupytercad" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" - }, - "license": "BSD-3-Clause", - "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}" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build:lib": "tsc -b", - "build": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=development && jlpm run build:remove_full_occ_wasm", - "build:prod": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=production && jlpm run build:remove_full_occ_wasm", - "build:remove_full_occ_wasm": "rimraf lib/opencascade.full.wasm", - "clean": "rimraf tsconfig.tsbuildinfo", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:all": "jlpm run clean:lib", - "watch": "webpack --config worker.webpack.config.js --watch --mode=development" - }, - "dependencies": { - "@jupytercad/opencascade": "^0.3.3", - "@jupytercad/schema": "^0.3.3", - "@lumino/coreutils": "^2.0.0", - "uuid": "^8.3.2" - }, - "devDependencies": { - "@types/node": "^18.15.11", - "copy-webpack-plugin": "^10.0.0", - "file-loader": "^6.2.0", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "source-map-loader": "^3.0.0", - "ts-loader": "^9.2.6", - "typescript": "^5", - "webpack": "^5.76.3" - }, - "publishConfig": { - "access": "public" - } + "name": "@jupytercad/occ-worker", + "version": "0.3.3", + "description": "Jupytercad opencascade worker package.", + "keywords": [ + "jupytercad" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "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}" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build:lib": "tsc -b", + "build": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=development && jlpm run build:remove_full_occ_wasm", + "build:prod": "jlpm build:lib && webpack --config worker.webpack.config.js --mode=production && jlpm run build:remove_full_occ_wasm", + "build:remove_full_occ_wasm": "rimraf lib/opencascade.full.wasm", + "clean": "rimraf tsconfig.tsbuildinfo", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:all": "jlpm run clean:lib", + "watch": "webpack --config worker.webpack.config.js --watch --mode=development" + }, + "dependencies": { + "@jupytercad/opencascade": "^0.3.3", + "@jupytercad/schema": "^0.3.3", + "@lumino/coreutils": "^2.0.0", + "uuid": "^8.3.2" + }, + "devDependencies": { + "@types/node": "^18.15.11", + "copy-webpack-plugin": "^10.0.0", + "file-loader": "^6.2.0", + "npm-run-all": "^4.1.5", + "rimraf": "^3.0.2", + "source-map-loader": "^3.0.0", + "ts-loader": "^9.2.6", + "typescript": "^5", + "webpack": "^5.76.3" + }, + "publishConfig": { + "access": "public" + } } diff --git a/packages/schema/package.json b/packages/schema/package.json index 28a086b6..afc8a7a7 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -1,63 +1,63 @@ { - "name": "@jupytercad/schema", - "version": "0.3.3", - "description": "A Jupytercad schema package.", - "keywords": [ - "jupytercad" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" - }, - "license": "BSD-3-Clause", - "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}" - ], - "main": "lib/index.js", - "types": "lib/types.d.ts", - "style": "style/index.css", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build": "jlpm build:schema && jlpm run build:lib", - "build:schema": "jlpm build:schema:js && jlpm build:schema:py", - "build:schema:js": "json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && cd src/schema && node ../../schema.js", - "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytercad-lab/jupytercad_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema", - "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib", - "build:lib": "tsc", - "clean": "rimraf tsconfig.tsbuildinfo", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:all": "jlpm run clean:lib", - "watch": "tsc -w" - }, - "dependencies": { - "@apidevtools/json-schema-ref-parser": "^9.0.9", - "@jupyter/ydoc": "^0.3.4 || ^1.0.2", - "@jupyterlab/apputils": "^4.0.0", - "@jupyterlab/coreutils": "^6.0.0", - "@jupyterlab/docregistry": "^4.0.0", - "@jupyterlab/services": "^7.0.0", - "@jupyterlab/ui-components": "^4.0.0", - "@lumino/coreutils": "^2.0.0", - "@lumino/signaling": "^2.0.0", - "ajv": "^8.12.0", - "json-schema-to-typescript": "^10.1.5", - "yjs": "^13.5.40" - }, - "devDependencies": { - "@types/node": "^18.15.11", - "rimraf": "^3.0.2", - "source-map-loader": "^3.0.0", - "ts-loader": "^9.2.6", - "typescript": "^5" - }, - "publishConfig": { - "access": "public" - } + "name": "@jupytercad/schema", + "version": "0.3.3", + "description": "A Jupytercad schema package.", + "keywords": [ + "jupytercad" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "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}" + ], + "main": "lib/index.js", + "types": "lib/types.d.ts", + "style": "style/index.css", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build": "jlpm build:schema && jlpm run build:lib", + "build:schema": "jlpm build:schema:js && jlpm build:schema:py", + "build:schema:js": "json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && cd src/schema && node ../../schema.js", + "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytercad-lab/jupytercad_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema", + "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib", + "build:lib": "tsc", + "clean": "rimraf tsconfig.tsbuildinfo", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:all": "jlpm run clean:lib", + "watch": "tsc -w" + }, + "dependencies": { + "@apidevtools/json-schema-ref-parser": "^9.0.9", + "@jupyter/ydoc": "^0.3.4 || ^1.0.2", + "@jupyterlab/apputils": "^4.0.0", + "@jupyterlab/coreutils": "^6.0.0", + "@jupyterlab/docregistry": "^4.0.0", + "@jupyterlab/services": "^7.0.0", + "@jupyterlab/ui-components": "^4.0.0", + "@lumino/coreutils": "^2.0.0", + "@lumino/signaling": "^2.0.0", + "ajv": "^8.12.0", + "json-schema-to-typescript": "^10.1.5", + "yjs": "^13.5.40" + }, + "devDependencies": { + "@types/node": "^18.15.11", + "rimraf": "^3.0.2", + "source-map-loader": "^3.0.0", + "ts-loader": "^9.2.6", + "typescript": "^5" + }, + "publishConfig": { + "access": "public" + } } diff --git a/pyproject.toml b/pyproject.toml index 79182550..30022304 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,16 @@ +[build-system] +build-backend = "hatchling.build" +requires = ["hatchling>=1.5.0,<2"] + [project] name = "jupytercad-root" readme = "README.md" license = { file = "LICENSE" } -version = "0.3.3" +dynamic = ["version"] + + +[tool.hatch.version] +path = "python/jupytercad/jupytercad/__init__.py" [tool.jupyter-releaser.options] version-cmd = "python scripts/bump-version.py" diff --git a/python/jupytercad-app/package.json b/python/jupytercad-app/package.json index b2312e9f..356ee970 100644 --- a/python/jupytercad-app/package.json +++ b/python/jupytercad-app/package.json @@ -1,118 +1,118 @@ { - "name": "@jupytercad/jupytercad-app", - "version": "0.3.3", - "description": "A JupyterLab standalone app for 3D modelling.", - "keywords": [ - "jupyter", - "jupyterlab", - "jupyterlab-extension" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" - }, - "license": "BSD-3-Clause", - "author": "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}", - "schema/*.json" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build": "jlpm clean:all && jlpm build:lib && webpack", - "build:prod": "jlpm clean:all && jlpm build:lib:prod && webpack --mode=production", - "build:lib": "tsc --sourceMap", - "build:lib:prod": "tsc", - "clean": "jlpm clean:lib", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:lintcache": "rimraf .eslintcache .stylelintcache", - "clean:static": "rimraf jupytercad_app/static", - "clean:all": "jlpm clean:lib && jlpm clean:static", - "eslint": "jlpm eslint:check --fix", - "eslint:check": "eslint . --cache --ext .ts,.tsx", - "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,.json,.md}\"", - "prettier:check": "jlpm prettier:base --check", - "stylelint": "jlpm stylelint:check --fix", - "stylelint:check": "stylelint --cache \"style/**/*.css\"", - "watch": "tsc-watch --onSuccess \"webpack --mode=development\"", - "watch:webpack": "webpack --watch", - "watch:ts": "tsc -w --listEmittedFiles" - }, - "dependencies": { - "@codemirror/state": "^6.2.0", - "@codemirror/view": "^6.9.3", - "@jupyter/collaboration": "^1.0.0", - "@jupyter/docprovider": "^1.0.0", - "@jupyter/ydoc": "^0.3.4 || ^1.0.2", - "@jupytercad/base": "^0.3.3", - "@jupytercad/schema": "^0.3.3", - "@jupyterlab/application": "^4.0.0", - "@jupyterlab/application-extension": "^4.0.0", - "@jupyterlab/apputils": "^4.0.0", - "@jupyterlab/apputils-extension": "^4.0.0", - "@jupyterlab/codemirror": "^4.0.0", - "@jupyterlab/codemirror-extension": "^4.0.0", - "@jupyterlab/coreutils": "^6.0.0", - "@jupyterlab/docmanager": "^4.0.0", - "@jupyterlab/docmanager-extension": "^4.0.0", - "@jupyterlab/docregistry": "^4.0.0", - "@jupyterlab/filebrowser": "^4.0.0", - "@jupyterlab/filebrowser-extension": "^4.0.0", - "@jupyterlab/fileeditor": "^4.0.0", - "@jupyterlab/launcher": "^4.0.0", - "@jupyterlab/launcher-extension": "^4.0.0", - "@jupyterlab/logconsole": "^4.0.0", - "@jupyterlab/mainmenu": "^4.0.0", - "@jupyterlab/mainmenu-extension": "^4.0.0", - "@jupyterlab/notebook": "^4.0.0", - "@jupyterlab/observables": "^5.0.0", - "@jupyterlab/outputarea": "^4.0.0", - "@jupyterlab/rendermime": "^4.0.0", - "@jupyterlab/services": "^7.0.0", - "@jupyterlab/settingregistry": "^4.0.0", - "@jupyterlab/statedb": "^4.0.0", - "@jupyterlab/theme-dark-extension": "^4.0.0", - "@jupyterlab/theme-light-extension": "^4.0.0", - "@jupyterlab/translation": "~4.0.0", - "@jupyterlab/translation-extension": "^4.0.0", - "@jupyterlab/ui-components": "^4.0.0", - "@lumino/algorithm": "^2.0.0", - "@lumino/commands": "^2.0.0", - "@lumino/coreutils": "^2.0.0", - "@lumino/disposable": "^2.0.0", - "@lumino/messaging": "^2.0.0", - "@lumino/properties": "^2.0.0", - "@lumino/signaling": "^2.0.0", - "@lumino/virtualdom": "^2.0.0", - "@lumino/widgets": "^2.0.0", - "react": "^18.0.1", - "yjs": "^13.5.40", - "yjs-widgets": "^0.3.4" - }, - "devDependencies": { - "@jupyterlab/builder": "^4.0.0", - "@types/node": "^18.15.11", - "rimraf": "^3.0.2", - "tsc-watch": "^6.0.0", - "typescript": "^5", - "webpack": "^5.76.3" - }, - "sideEffects": [ - "style/*.css", - "style/index.js" - ], - "styleModule": "style/index.js", - "publishConfig": { - "access": "public" - } + "name": "@jupytercad/jupytercad-app", + "version": "0.3.3", + "description": "A JupyterLab standalone app for 3D modelling.", + "keywords": [ + "jupyter", + "jupyterlab", + "jupyterlab-extension" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "author": "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}", + "schema/*.json" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "style": "style/index.css", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build": "jlpm clean:all && jlpm build:lib && webpack", + "build:prod": "jlpm clean:all && jlpm build:lib:prod && webpack --mode=production", + "build:lib": "tsc --sourceMap", + "build:lib:prod": "tsc", + "clean": "jlpm clean:lib", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:lintcache": "rimraf .eslintcache .stylelintcache", + "clean:static": "rimraf jupytercad_app/static", + "clean:all": "jlpm clean:lib && jlpm clean:static", + "eslint": "jlpm eslint:check --fix", + "eslint:check": "eslint . --cache --ext .ts,.tsx", + "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,.json,.md}\"", + "prettier:check": "jlpm prettier:base --check", + "stylelint": "jlpm stylelint:check --fix", + "stylelint:check": "stylelint --cache \"style/**/*.css\"", + "watch": "tsc-watch --onSuccess \"webpack --mode=development\"", + "watch:webpack": "webpack --watch", + "watch:ts": "tsc -w --listEmittedFiles" + }, + "dependencies": { + "@codemirror/state": "^6.2.0", + "@codemirror/view": "^6.9.3", + "@jupyter/collaboration": "^1.0.0", + "@jupyter/docprovider": "^1.0.0", + "@jupyter/ydoc": "^0.3.4 || ^1.0.2", + "@jupytercad/base": "^0.3.3", + "@jupytercad/schema": "^0.3.3", + "@jupyterlab/application": "^4.0.0", + "@jupyterlab/application-extension": "^4.0.0", + "@jupyterlab/apputils": "^4.0.0", + "@jupyterlab/apputils-extension": "^4.0.0", + "@jupyterlab/codemirror": "^4.0.0", + "@jupyterlab/codemirror-extension": "^4.0.0", + "@jupyterlab/coreutils": "^6.0.0", + "@jupyterlab/docmanager": "^4.0.0", + "@jupyterlab/docmanager-extension": "^4.0.0", + "@jupyterlab/docregistry": "^4.0.0", + "@jupyterlab/filebrowser": "^4.0.0", + "@jupyterlab/filebrowser-extension": "^4.0.0", + "@jupyterlab/fileeditor": "^4.0.0", + "@jupyterlab/launcher": "^4.0.0", + "@jupyterlab/launcher-extension": "^4.0.0", + "@jupyterlab/logconsole": "^4.0.0", + "@jupyterlab/mainmenu": "^4.0.0", + "@jupyterlab/mainmenu-extension": "^4.0.0", + "@jupyterlab/notebook": "^4.0.0", + "@jupyterlab/observables": "^5.0.0", + "@jupyterlab/outputarea": "^4.0.0", + "@jupyterlab/rendermime": "^4.0.0", + "@jupyterlab/services": "^7.0.0", + "@jupyterlab/settingregistry": "^4.0.0", + "@jupyterlab/statedb": "^4.0.0", + "@jupyterlab/theme-dark-extension": "^4.0.0", + "@jupyterlab/theme-light-extension": "^4.0.0", + "@jupyterlab/translation": "~4.0.0", + "@jupyterlab/translation-extension": "^4.0.0", + "@jupyterlab/ui-components": "^4.0.0", + "@lumino/algorithm": "^2.0.0", + "@lumino/commands": "^2.0.0", + "@lumino/coreutils": "^2.0.0", + "@lumino/disposable": "^2.0.0", + "@lumino/messaging": "^2.0.0", + "@lumino/properties": "^2.0.0", + "@lumino/signaling": "^2.0.0", + "@lumino/virtualdom": "^2.0.0", + "@lumino/widgets": "^2.0.0", + "react": "^18.0.1", + "yjs": "^13.5.40", + "yjs-widgets": "^0.3.4" + }, + "devDependencies": { + "@jupyterlab/builder": "^4.0.0", + "@types/node": "^18.15.11", + "rimraf": "^3.0.2", + "tsc-watch": "^6.0.0", + "typescript": "^5", + "webpack": "^5.76.3" + }, + "sideEffects": [ + "style/*.css", + "style/index.js" + ], + "styleModule": "style/index.js", + "publishConfig": { + "access": "public" + } } diff --git a/python/jupytercad-core/package.json b/python/jupytercad-core/package.json index 5398ed45..8a9a7708 100644 --- a/python/jupytercad-core/package.json +++ b/python/jupytercad-core/package.json @@ -1,109 +1,109 @@ { - "name": "@jupytercad/jupytercad-core", - "version": "0.3.3", - "description": "JupyterCad core extension", - "keywords": [ - "jupyter", - "jupyterlab", - "jupyterlab-extension" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" + "name": "@jupytercad/jupytercad-core", + "version": "0.3.3", + "description": "JupyterCad core extension", + "keywords": [ + "jupyter", + "jupyterlab", + "jupyterlab-extension" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "author": "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}" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "style": "style/index.css", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build": "jlpm build:lib && jlpm build:labextension:dev", + "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", + "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", + "build:lib": "tsc --sourceMap", + "build:lib:prod": "tsc", + "clean": "jlpm clean:lib", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:lintcache": "rimraf .eslintcache .stylelintcache", + "clean:labextension": "rimraf jupytercad_core/labextension jupytercad_core/_version.py", + "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", + "eslint": "jlpm eslint:check --fix", + "eslint:check": "eslint . --cache --ext .ts,.tsx", + "install:extension": "jlpm build", + "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,.json,.md}\"", + "prettier:check": "jlpm prettier:base --check", + "stylelint": "jlpm stylelint:check --fix", + "stylelint:check": "stylelint --cache \"style/**/*.css\"", + "watch": "run-p watch:src watch:labextension", + "watch:src": "tsc -w --sourceMap", + "watch:labextension": "jupyter labextension watch .", + "build:worker": "webpack --config worker.webpack.config.js --mode=development", + "build:worker:prod": "webpack --config worker.webpack.config.js --mode=production" + }, + "dependencies": { + "@jupyter/docprovider": "^1.0.0", + "@jupytercad/base": "^0.3.3", + "@jupytercad/occ-worker": "^0.3.3", + "@jupytercad/schema": "^0.3.3", + "@jupyterlab/application": "^4.0.0", + "@jupyterlab/apputils": "^4.0.0", + "@jupyterlab/docregistry": "^4.0.0", + "@jupyterlab/filebrowser": "^4.0.0", + "@jupyterlab/launcher": "^4.0.0", + "@jupyterlab/mainmenu": "^4.0.0", + "@jupyterlab/services": "^7.0.0", + "@jupyterlab/translation": "^4.0.0", + "@jupyterlab/ui-components": "^4.0.0", + "@lumino/commands": "^2.0.0" + }, + "devDependencies": { + "@jupyterlab/builder": "^4.0.0", + "@types/json-schema": "^7.0.11", + "@types/react": "^18.0.26", + "@types/react-addons-linked-state-mixin": "^0.14.22", + "copy-webpack-plugin": "^10.0.0", + "css-loader": "^6.7.1", + "mkdirp": "^1.0.3", + "npm-run-all": "^4.1.5", + "rimraf": "^3.0.2", + "style-loader": "^3.3.1", + "typescript": "^5", + "webpack": "^5.76.3", + "yjs": "^13.5.0" + }, + "sideEffects": [ + "style/*.css", + "style/index.js" + ], + "styleModule": "style/index.js", + "publishConfig": { + "access": "public" + }, + "jupyterlab": { + "discovery": { + "server": { + "managers": [ + "pip" + ], + "base": { + "name": "jupytercad_core" + } + } }, - "license": "BSD-3-Clause", - "author": "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}" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build": "jlpm build:lib && jlpm build:labextension:dev", - "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", - "build:labextension": "jupyter labextension build .", - "build:labextension:dev": "jupyter labextension build --development True .", - "build:lib": "tsc --sourceMap", - "build:lib:prod": "tsc", - "clean": "jlpm clean:lib", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:lintcache": "rimraf .eslintcache .stylelintcache", - "clean:labextension": "rimraf jupytercad_core/labextension jupytercad_core/_version.py", - "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", - "eslint": "jlpm eslint:check --fix", - "eslint:check": "eslint . --cache --ext .ts,.tsx", - "install:extension": "jlpm build", - "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,.json,.md}\"", - "prettier:check": "jlpm prettier:base --check", - "stylelint": "jlpm stylelint:check --fix", - "stylelint:check": "stylelint --cache \"style/**/*.css\"", - "watch": "run-p watch:src watch:labextension", - "watch:src": "tsc -w --sourceMap", - "watch:labextension": "jupyter labextension watch .", - "build:worker": "webpack --config worker.webpack.config.js --mode=development", - "build:worker:prod": "webpack --config worker.webpack.config.js --mode=production" - }, - "dependencies": { - "@jupyter/docprovider": "^1.0.0", - "@jupytercad/base": "^0.3.3", - "@jupytercad/occ-worker": "^0.3.3", - "@jupytercad/schema": "^0.3.3", - "@jupyterlab/application": "^4.0.0", - "@jupyterlab/apputils": "^4.0.0", - "@jupyterlab/docregistry": "^4.0.0", - "@jupyterlab/filebrowser": "^4.0.0", - "@jupyterlab/launcher": "^4.0.0", - "@jupyterlab/mainmenu": "^4.0.0", - "@jupyterlab/services": "^7.0.0", - "@jupyterlab/translation": "^4.0.0", - "@jupyterlab/ui-components": "^4.0.0", - "@lumino/commands": "^2.0.0" - }, - "devDependencies": { - "@jupyterlab/builder": "^4.0.0", - "@types/json-schema": "^7.0.11", - "@types/react": "^18.0.26", - "@types/react-addons-linked-state-mixin": "^0.14.22", - "copy-webpack-plugin": "^10.0.0", - "css-loader": "^6.7.1", - "mkdirp": "^1.0.3", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "style-loader": "^3.3.1", - "typescript": "^5", - "webpack": "^5.76.3", - "yjs": "^13.5.0" - }, - "sideEffects": [ - "style/*.css", - "style/index.js" - ], - "styleModule": "style/index.js", - "publishConfig": { - "access": "public" - }, - "jupyterlab": { - "discovery": { - "server": { - "managers": [ - "pip" - ], - "base": { - "name": "jupytercad_core" - } - } - }, - "extension": true, - "outputDir": "jupytercad_core/labextension", - "webpackConfig": "./extension.webpack.config.js" - } + "extension": true, + "outputDir": "jupytercad_core/labextension", + "webpackConfig": "./extension.webpack.config.js" + } } diff --git a/python/jupytercad-lab/package.json b/python/jupytercad-lab/package.json index bd13170d..70f0e0b3 100644 --- a/python/jupytercad-lab/package.json +++ b/python/jupytercad-lab/package.json @@ -1,117 +1,117 @@ { - "name": "@jupytercad/jupytercad-lab", - "version": "0.3.3", - "description": "JupyterCad Lab extension.", - "keywords": [ - "jupyter", - "jupyterlab", - "jupyterlab-extension" - ], - "homepage": "https://github.com/jupytercad/jupytercad", - "bugs": { - "url": "https://github.com/jupytercad/jupytercad/issues" - }, - "license": "BSD-3-Clause", - "author": "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}" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "repository": { - "type": "git", - "url": "https://github.com/jupytercad/jupytercad.git" - }, - "scripts": { - "build": "jlpm build:lib && jlpm build:labextension:dev", - "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", - "build:labextension": "jupyter labextension build .", - "build:labextension:dev": "jupyter labextension build --development True .", - "build:lib": "tsc --sourceMap", - "build:lib:prod": "tsc", - "clean": "jlpm clean:lib", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:lintcache": "rimraf .eslintcache .stylelintcache", - "clean:labextension": "rimraf jupytercad_lab/labextension jupytercad_lab/_version.py", - "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", - "eslint": "jlpm eslint:check --fix", - "eslint:check": "eslint . --cache --ext .ts,.tsx", - "install:extension": "jlpm build", - "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,.json,.md}\"", - "prettier:check": "jlpm prettier:base --check", - "stylelint": "jlpm stylelint:check --fix", - "stylelint:check": "stylelint --cache \"style/**/*.css\"", - "watch": "run-p watch:src watch:labextension", - "watch:src": "tsc -w --sourceMap", - "watch:labextension": "jupyter labextension watch ." - }, - "dependencies": { - "@jupyter/docprovider": "^1.0.0", - "@jupytercad/base": "^0.3.3", - "@jupytercad/jupytercad-core": "^0.3.3", - "@jupytercad/schema": "^0.3.3", - "@jupyterlab/application": "^4.0.0", - "@jupyterlab/apputils": "^4.0.0", - "@jupyterlab/coreutils": "^6.0.0", - "@jupyterlab/docregistry": "^4.0.0", - "@jupyterlab/filebrowser": "^4.0.0", - "@jupyterlab/launcher": "^4.0.0", - "@jupyterlab/mainmenu": "^4.0.0", - "@jupyterlab/services": "^7.0.0", - "@jupyterlab/translation": "^4.0.0", - "@jupyterlab/ui-components": "^4.0.0", - "@lumino/messaging": "^2.0.0", - "@lumino/widgets": "^2.0.0", - "react": "^18.0.1", - "yjs-widgets": "^0.3.3" - }, - "devDependencies": { - "@jupyterlab/builder": "^4.0.0", - "css-loader": "^6.7.1", - "mkdirp": "^1.0.3", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "yjs": "^13.5.0" - }, - "sideEffects": [ - "style/*.css", - "style/index.js" - ], - "styleModule": "style/index.js", - "publishConfig": { - "access": "public" - }, - "jupyterlab": { - "discovery": { - "server": { - "managers": [ - "pip" - ], - "base": { - "name": "jupytercad_lab" - } - } - }, - "extension": true, - "outputDir": "jupytercad_lab/labextension", - "sharedPackages": { - "@jupytercad/base": { - "singleton": true, - "bundled": false - }, - "@jupytercad/schema": { - "singleton": true, - "bundled": false - }, - "@jupytercad/jupytercad-core": { - "singleton": true, - "bundled": false - } + "name": "@jupytercad/jupytercad-lab", + "version": "0.3.3", + "description": "JupyterCad Lab extension.", + "keywords": [ + "jupyter", + "jupyterlab", + "jupyterlab-extension" + ], + "homepage": "https://github.com/jupytercad/jupytercad", + "bugs": { + "url": "https://github.com/jupytercad/jupytercad/issues" + }, + "license": "BSD-3-Clause", + "author": "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}" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "style": "style/index.css", + "repository": { + "type": "git", + "url": "https://github.com/jupytercad/jupytercad.git" + }, + "scripts": { + "build": "jlpm build:lib && jlpm build:labextension:dev", + "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", + "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", + "build:lib": "tsc --sourceMap", + "build:lib:prod": "tsc", + "clean": "jlpm clean:lib", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:lintcache": "rimraf .eslintcache .stylelintcache", + "clean:labextension": "rimraf jupytercad_lab/labextension jupytercad_lab/_version.py", + "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", + "eslint": "jlpm eslint:check --fix", + "eslint:check": "eslint . --cache --ext .ts,.tsx", + "install:extension": "jlpm build", + "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,.json,.md}\"", + "prettier:check": "jlpm prettier:base --check", + "stylelint": "jlpm stylelint:check --fix", + "stylelint:check": "stylelint --cache \"style/**/*.css\"", + "watch": "run-p watch:src watch:labextension", + "watch:src": "tsc -w --sourceMap", + "watch:labextension": "jupyter labextension watch ." + }, + "dependencies": { + "@jupyter/docprovider": "^1.0.0", + "@jupytercad/base": "^0.3.3", + "@jupytercad/jupytercad-core": "^0.3.3", + "@jupytercad/schema": "^0.3.3", + "@jupyterlab/application": "^4.0.0", + "@jupyterlab/apputils": "^4.0.0", + "@jupyterlab/coreutils": "^6.0.0", + "@jupyterlab/docregistry": "^4.0.0", + "@jupyterlab/filebrowser": "^4.0.0", + "@jupyterlab/launcher": "^4.0.0", + "@jupyterlab/mainmenu": "^4.0.0", + "@jupyterlab/services": "^7.0.0", + "@jupyterlab/translation": "^4.0.0", + "@jupyterlab/ui-components": "^4.0.0", + "@lumino/messaging": "^2.0.0", + "@lumino/widgets": "^2.0.0", + "react": "^18.0.1", + "yjs-widgets": "^0.3.3" + }, + "devDependencies": { + "@jupyterlab/builder": "^4.0.0", + "css-loader": "^6.7.1", + "mkdirp": "^1.0.3", + "npm-run-all": "^4.1.5", + "rimraf": "^3.0.2", + "yjs": "^13.5.0" + }, + "sideEffects": [ + "style/*.css", + "style/index.js" + ], + "styleModule": "style/index.js", + "publishConfig": { + "access": "public" + }, + "jupyterlab": { + "discovery": { + "server": { + "managers": [ + "pip" + ], + "base": { + "name": "jupytercad_lab" } + } + }, + "extension": true, + "outputDir": "jupytercad_lab/labextension", + "sharedPackages": { + "@jupytercad/base": { + "singleton": true, + "bundled": false + }, + "@jupytercad/schema": { + "singleton": true, + "bundled": false + }, + "@jupytercad/jupytercad-core": { + "singleton": true, + "bundled": false + } } + } } diff --git a/python/jupytercad/scripts/bump-version.py b/python/jupytercad/scripts/bump-version.py index 2dfed8bf..6210b5d6 100644 --- a/python/jupytercad/scripts/bump-version.py +++ b/python/jupytercad/scripts/bump-version.py @@ -4,6 +4,7 @@ # Distributed under the terms of the Modified BSD License.import click import argparse +import json from packaging.version import parse as parse_version from pathlib import Path from subprocess import run @@ -34,7 +35,20 @@ def bump(): js_version = ( py_version.replace("a", "-alpha.").replace("b", "-beta.").replace("rc", "-rc.") ) - + package_json = ROOT.parent.parent / "package.json" + root_json = json.loads(package_json.read_text(encoding="utf-8")) + root_json["version"] = js_version + package_json.write_text(json.dumps(root_json), encoding="utf-8") + run(["yarn", "install"], check=True) + run( + [ + "node", + f"{ROOT.parent.parent / 'node_modules/prettier/bin/prettier.cjs'}", + "--write", + package_json, + ], + check=True, + ) # bump the Python version with hatch run(f"{HATCH_VERSION} {py_version}", shell=True, check=True, cwd=ROOT) # bump the JS version with lerna diff --git a/scripts/bump-version.py b/scripts/bump-version.py deleted file mode 100644 index 5e5463cd..00000000 --- a/scripts/bump-version.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) Jupyter Development Team. -# Copyright (c) Voici Contributors - -# Distributed under the terms of the Modified BSD License.import click - -import argparse -from packaging.version import parse as parse_version -from pathlib import Path -from subprocess import run - - -ENC = dict(encoding="utf-8") -HATCH_VERSION = "hatch version" -ROOT = Path(__file__).parent.parent - - -def get_version(): - cmd = run([HATCH_VERSION], capture_output=True, shell=True, check=True, cwd=ROOT) - return cmd.stdout.decode("utf-8").strip().split("\n")[-1] - - -def next_version(): - v = parse_version(get_version()) - if v.is_prerelease: - return f"{v.major}.{v.minor}.{v.micro}{v.pre[0]}{v.pre[1] + 1}" - return f"{v.major}.{v.minor}.{v.micro + 1}" - - -def bump(): - parser = argparse.ArgumentParser() - parser.add_argument("version") - args = parser.parse_args() - py_version = next_version() if args.version == "next" else args.version - js_version = ( - py_version.replace("a", "-alpha.").replace("b", "-beta.").replace("rc", "-rc.") - ) - - # bump the Python version with hatch - run(f"{HATCH_VERSION} {py_version}", shell=True, check=True, cwd=ROOT) - - # bump the JS version with lerna - run(f"yarn run bump:js:version {js_version}", shell=True, check=True) - - -if __name__ == "__main__": - bump() diff --git a/ui-tests/package.json b/ui-tests/package.json index 5d34879f..f6e8da63 100644 --- a/ui-tests/package.json +++ b/ui-tests/package.json @@ -1,20 +1,20 @@ { - "name": "jupytercad-ui-tests", - "version": "1.0.0", - "description": "JupyterCad Integration Tests", - "private": true, - "scripts": { - "start": "jupyter lab --config jupyter_server_test_config.py", - "test": "npx playwright test", - "test:update": "npx playwright test --update-snapshots", - "test:debug": "PWDEBUG=1 npx playwright test" - }, - "devDependencies": { - "@jupyterlab/galata": "^5.0.8", - "@playwright/test": "^1.32.0", - "@types/klaw-sync": "^6.0.1" - }, - "dependencies": { - "klaw-sync": "^6.0.0" - } + "name": "jupytercad-ui-tests", + "version": "1.0.0", + "description": "JupyterCad Integration Tests", + "private": true, + "scripts": { + "start": "jupyter lab --config jupyter_server_test_config.py", + "test": "npx playwright test", + "test:update": "npx playwright test --update-snapshots", + "test:debug": "PWDEBUG=1 npx playwright test" + }, + "devDependencies": { + "@jupyterlab/galata": "^5.0.8", + "@playwright/test": "^1.32.0", + "@types/klaw-sync": "^6.0.1" + }, + "dependencies": { + "klaw-sync": "^6.0.0" + } }