Skip to content

Commit

Permalink
Merge pull request #6579 from jtpio/update-lerna
Browse files Browse the repository at this point in the history
Update to lerna 6
  • Loading branch information
jtpio authored Oct 20, 2022
2 parents 0dc766e + 769f9a9 commit d5c9f54
Show file tree
Hide file tree
Showing 5 changed files with 480 additions and 518 deletions.
1 change: 0 additions & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
"fs-extra": "^8.1.0",
"glob": "~7.1.6",
"mini-css-extract-plugin": "~0.9.0",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"style-loader": "~1.0.1",
"svg-url-loader": "~6.0.0",
Expand Down
1 change: 1 addition & 0 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"npmClient": "yarn",
"useNx": false,
"version": "independent",
"useWorkspaces": true
}
21 changes: 2 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"build": "lerna run build",
"build:prod": "lerna run build:prod",
"build:test": "lerna run build:test",
"build:utils": "cd buildutils && npm run build",
"clean": "lerna run clean",
"develop": "jupyter labextension develop . --overwrite && node ./buildutils/lib/develop.js --overwrite",
"eslint": "eslint . --ext .ts,.tsx --fix",
Expand Down Expand Up @@ -55,27 +56,9 @@
"jest-junit": "^11.1.0",
"jest-raw-loader": "^1.0.1",
"jest-summary-reporter": "^0.0.2",
"lerna": "^5.5.0",
"npm-run-all": "^4.1.5",
"lerna": "^6.0.1",
"prettier": "^1.19.0",
"rimraf": "^3.0.2",
"typescript": "~4.7.3"
},
"jupyter-releaser": {
"hooks": {
"before-build-npm": [
"jlpm clean",
"jlpm build:prod"
],
"before-build-python": [
"jlpm clean"
],
"before-bump-version": "python -m pip install hatch"
},
"options": {
"version-cmd": [
"jlpm run release:bump --force --skip-commit"
]
}
}
}
17 changes: 17 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,20 @@ extend-ignore = [
# black adds spaces around ':'
"E203",
]

[tool.jupyter-releaser.options]
version-cmd = "jlpm run release:bump --force --skip-commit"

[tool.jupyter-releaser.hooks]
before-bump-version = [
"python -m pip install --pre -U jupyterlab",
"jlpm",
"jlpm run build:utils",
"python -m pip install hatch"
]
before-build-npm = [
"jlpm build:prod"
]
before-build-python = [
"jlpm clean"
]
Loading

0 comments on commit d5c9f54

Please sign in to comment.