Skip to content

Commit d5c9f54

Browse files
authored
Merge pull request #6579 from jtpio/update-lerna
Update to lerna 6
2 parents 0dc766e + 769f9a9 commit d5c9f54

File tree

5 files changed

+480
-518
lines changed

5 files changed

+480
-518
lines changed

app/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
"fs-extra": "^8.1.0",
167167
"glob": "~7.1.6",
168168
"mini-css-extract-plugin": "~0.9.0",
169-
"npm-run-all": "^4.1.5",
170169
"rimraf": "^3.0.2",
171170
"style-loader": "~1.0.1",
172171
"svg-url-loader": "~6.0.0",

lerna.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"npmClient": "yarn",
3+
"useNx": false,
34
"version": "independent",
45
"useWorkspaces": true
56
}

package.json

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"build": "lerna run build",
2424
"build:prod": "lerna run build:prod",
2525
"build:test": "lerna run build:test",
26+
"build:utils": "cd buildutils && npm run build",
2627
"clean": "lerna run clean",
2728
"develop": "jupyter labextension develop . --overwrite && node ./buildutils/lib/develop.js --overwrite",
2829
"eslint": "eslint . --ext .ts,.tsx --fix",
@@ -55,27 +56,9 @@
5556
"jest-junit": "^11.1.0",
5657
"jest-raw-loader": "^1.0.1",
5758
"jest-summary-reporter": "^0.0.2",
58-
"lerna": "^5.5.0",
59-
"npm-run-all": "^4.1.5",
59+
"lerna": "^6.0.1",
6060
"prettier": "^1.19.0",
6161
"rimraf": "^3.0.2",
6262
"typescript": "~4.7.3"
63-
},
64-
"jupyter-releaser": {
65-
"hooks": {
66-
"before-build-npm": [
67-
"jlpm clean",
68-
"jlpm build:prod"
69-
],
70-
"before-build-python": [
71-
"jlpm clean"
72-
],
73-
"before-bump-version": "python -m pip install hatch"
74-
},
75-
"options": {
76-
"version-cmd": [
77-
"jlpm run release:bump --force --skip-commit"
78-
]
79-
}
8063
}
8164
}

pyproject.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,20 @@ extend-ignore = [
141141
# black adds spaces around ':'
142142
"E203",
143143
]
144+
145+
[tool.jupyter-releaser.options]
146+
version-cmd = "jlpm run release:bump --force --skip-commit"
147+
148+
[tool.jupyter-releaser.hooks]
149+
before-bump-version = [
150+
"python -m pip install --pre -U jupyterlab",
151+
"jlpm",
152+
"jlpm run build:utils",
153+
"python -m pip install hatch"
154+
]
155+
before-build-npm = [
156+
"jlpm build:prod"
157+
]
158+
before-build-python = [
159+
"jlpm clean"
160+
]

0 commit comments

Comments
 (0)