Skip to content

Commit

Permalink
Merge branch 'next' into feat/add-cnpm-sync
Browse files Browse the repository at this point in the history
# Conflicts:
#	pnpm-lock.yaml
  • Loading branch information
mmdapl committed Aug 2, 2024
2 parents ffff2a1 + 5bc2bb4 commit d99ae06
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
shamefully-hoist=true
registry=https://registry.npmmirror.com
# publish 前检查分支
git-checks=true
# publish 允许的分支
publish-branch=next
2 changes: 1 addition & 1 deletion packages/changelog/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@142vip/changelog",
"version": "0.0.1-alpha.1",
"version": "0.0.1-alpha.2",
"private": false,
"type": "module",
"description": "公众号搜:储凡",
Expand Down
6 changes: 3 additions & 3 deletions packages/release-version/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@142vip/release-version",
"version": "0.0.1-alpha.3",
"version": "0.0.1-alpha.4",
"description": "版本迭代更新,Git提交信息、打标记并推送到远程",
"keywords": [
"@142vip/release-version",
Expand Down Expand Up @@ -38,8 +38,8 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@142vip/common": "latest",
"@142vip/changelog": "latest",
"@142vip/common": "^0.0.1-alpha.5",
"@142vip/changelog": "workspace:*",
"c12": "^1.10.0",
"cac": "^6.7.14",
"escalade": "^3.1.2",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d99ae06

Please sign in to comment.