Skip to content

Commit

Permalink
Update bump script
Browse files Browse the repository at this point in the history
  • Loading branch information
trungleduc committed Nov 21, 2023
1 parent 9d2b44d commit 34979fb
Show file tree
Hide file tree
Showing 13 changed files with 647 additions and 683 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
node_modules
**/node_modules
**/lib
**/package.json
jupytercad
**/*.d.ts
**/*.js
Expand Down
146 changes: 73 additions & 73 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
164 changes: 82 additions & 82 deletions packages/base/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading

0 comments on commit 34979fb

Please sign in to comment.