Skip to content

Commit 9a0a92a

Browse files
committed
Merge branch 'develop' into devpublish
2 parents 39324d3 + 92e3ec8 commit 9a0a92a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lerna.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
],
3333
"conventionalCommits": true,
3434
"createRelease": "github",
35-
"gitTagVersion": false,
3635
"message": "chore: release package(s)"
3736
}
3837
},

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@
3636
"lerna": "lerna bootstrap --hoist",
3737
"predevpublish": "git checkout devpublish && git merge -s recursive -X theirs develop",
3838
"devpublish": "lerna publish --ignore-scripts --cd-version=prerelease",
39-
"postdevpublish": "git add . && git commit -m 'update chagne log' && git checkout develop",
39+
"devpublish:force": "npm run devpublish -- --force-publish=*",
40+
"postdevpublish": "git add . && git commit -m 'update change log' && git checkout develop",
4041
"prepublish": "git checkout publish && git merge -s recursive -X theirs master",
42+
"publish": "npm run lerna:prepublish && lerna publish --ignore-scripts --cd-version=patch",
43+
"publish:force": "npm run publish -- --force-publish=*",
44+
"postpublish": "git checkout master",
4145
"lint": "tslint ./packages/**/src/**/*.ts --exclude \"./packages/**/node_modules/**/*.ts\"",
4246
"postbootstrap": "npm run build",
4347
"prebootstrap": "lerna run prepare",

0 commit comments

Comments
 (0)