Skip to content

Commit 1518347

Browse files
saqqdysaqqdy
committed
release 6.3.0
1 parent 4a09793 commit 1518347

File tree

12 files changed

+902
-854
lines changed

12 files changed

+902
-854
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# 更新日志
22

3+
## 2024.03.01 v6.3.0
4+
5+
1. `admin` `combine` 指令增加构建提示
6+
2. 升级依赖包
7+
38
## 2024.02.02 v6.2.0
49

510
1. `build`指令增加`--confirm`参数，为 true 时不显示确认框

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/monorepo",
33
"description": "这是一个git工作流工具",
4-
"version": "6.2.0",
4+
"version": "6.3.0",
55
"packageManager": "[email protected]",
66
"main": "index.js",
77
"files": [
@@ -47,55 +47,55 @@
4747
"chalk": "^4.1.2",
4848
"debug": "^4.3.4",
4949
"inquirer": "^8.2.5",
50-
"js-cool": "^5.15.2",
50+
"js-cool": "^5.17.1",
5151
"morgan": "^1.10.0",
5252
"os-lang": "^3.2.0"
5353
},
5454
"devDependencies": {
5555
"@esbuild-kit/cjs-loader": "^2.4.4",
5656
"@esbuild-kit/esm-loader": "^2.6.5",
57-
"@eslint-sets/eslint-config-ts": "^5.11.0",
58-
"@microsoft/api-extractor": "^7.39.1",
57+
"@eslint-sets/eslint-config-ts": "^5.12.0",
58+
"@microsoft/api-extractor": "^7.42.1",
5959
"@pnpm/logger": "^5.0.0",
6060
"@rollup/plugin-alias": "^5.1.0",
6161
"@rollup/plugin-commonjs": "^25.0.7",
6262
"@rollup/plugin-json": "^6.1.0",
6363
"@rollup/plugin-node-resolve": "^15.2.3",
6464
"@types/gulp": "^4.0.17",
6565
"@types/inquirer": "^8.2.6",
66-
"@types/node": "^20.10.7",
66+
"@types/node": "^20.11.24",
6767
"@types/rollup-plugin-css-only": "^3.1.3",
68-
"@vitejs/plugin-vue": "^5.0.2",
68+
"@vitejs/plugin-vue": "^5.0.4",
6969
"@vitejs/plugin-vue-jsx": "^3.1.0",
7070
"consola": "^3.2.3",
7171
"cross-env": "^7.0.3",
72-
"esbuild": "^0.19.11",
73-
"eslint": "^8.56.0",
72+
"esbuild": "^0.20.1",
73+
"eslint": "^8.57.0",
7474
"fast-glob": "^3.3.2",
7575
"gulp": "^4.0.2",
7676
"gulp-typescript": "6.0.0-alpha.1",
7777
"load-yml": "^1.4.0",
7878
"madge": "^6.1.0",
7979
"npm-run-all": "^4.1.5",
80-
"prettier": "^3.1.1",
80+
"prettier": "^3.2.5",
8181
"prettier-config-common": "^1.4.0",
8282
"reinstaller": "^3.0.2",
8383
"rimraf": "^5.0.5",
8484
"rm-all": "^1.1.1",
85-
"rollup": "^4.9.4",
85+
"rollup": "^4.12.0",
8686
"rollup-plugin-add-banner": "^1.1.0",
8787
"rollup-plugin-css-only": "^4.5.2",
8888
"rollup-plugin-dts": "^6.1.0",
89-
"rollup-plugin-esbuild": "^6.1.0",
89+
"rollup-plugin-esbuild": "^6.1.1",
9090
"rollup-plugin-filesize": "^10.0.0",
91-
"rollup-plugin-node-externals": "^6.1.2",
91+
"rollup-plugin-node-externals": "^7.0.1",
9292
"rollup-plugin-replace-shebang": "^1.2.0",
9393
"rollup-plugin-visualizer": "^5.12.0",
9494
"tsnd": "^1.1.0",
95-
"typedoc": "^0.25.6",
95+
"typedoc": "^0.25.9",
9696
"typedoc-plugin-markdown": "^3.17.1",
9797
"typescript": "^5.3.3",
98-
"unplugin-vue-define-options": "^1.4.1",
98+
"unplugin-vue-define-options": "^1.4.2",
9999
"zx": "^7.2.3"
100100
},
101101
"peerDependencies": {

‎packages/core/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/core",
33
"description": "gitmars核心程序",
4-
"version": "6.2.0",
4+
"version": "6.3.0",
55
"private": false,
66
"main": "./lib/index.js",
77
"module": "./lib/index.mjs",
@@ -59,7 +59,7 @@
5959
"dayjs": "^1.11.10",
6060
"debug": "^4.3.4",
6161
"inquirer": "^8.2.5",
62-
"js-cool": "^5.15.2",
62+
"js-cool": "^5.17.1",
6363
"lodash-es": "^4.17.21",
6464
"lodash-unified": "^1.0.3",
6565
"node-apollo": "^1.2.1",
@@ -70,17 +70,17 @@
7070
"slash": "^3.0.0"
7171
},
7272
"devDependencies": {
73-
"@eslint-sets/eslint-config-ts": "^5.11.0",
73+
"@eslint-sets/eslint-config-ts": "^5.12.0",
7474
"@types/cross-spawn": "^6.0.6",
7575
"@types/debug": "^4.1.12",
7676
"@types/inquirer": "^8.2.6",
7777
"@types/lodash-es": "^4.17.12",
78-
"@types/node": "^20.10.7",
78+
"@types/node": "^20.11.24",
7979
"@types/shelljs": "^0.8.15",
8080
"cross-env": "^7.0.3",
81-
"eslint": "^8.56.0",
81+
"eslint": "^8.57.0",
8282
"madge": "^6.1.0",
83-
"prettier": "^3.1.1",
83+
"prettier": "^3.2.5",
8484
"prettier-config-common": "^1.4.0",
8585
"tsnd": "^1.1.0",
8686
"typescript": "^5.3.3"

‎packages/docs/changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# 更新日志
22

3+
## 2024.03.01 v6.3.0
4+
5+
1. `admin` `combine` 指令增加构建提示
6+
2. 升级依赖包
7+
38
## 2024.02.02 v6.2.0
49

510
1. `build`指令增加`--confirm`参数，为 true 时不显示确认框

‎packages/docs/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/docs",
33
"description": "gitmars文档库",
4-
"version": "6.2.0",
4+
"version": "6.3.0",
55
"private": false,
66
"files": [
77
"dist",
@@ -24,21 +24,21 @@
2424
"typings": "typings"
2525
},
2626
"dependencies": {
27-
"js-cool": "^5.15.2"
27+
"js-cool": "^5.17.1"
2828
},
2929
"devDependencies": {
30-
"@eslint-sets/eslint-config-vue3": "^5.11.0",
30+
"@eslint-sets/eslint-config-vue3": "^5.12.0",
3131
"@types/markdown-it": "^13.0.7",
32-
"@types/node": "^20.10.7",
33-
"eslint": "^8.56.0",
32+
"@types/node": "^20.11.24",
33+
"eslint": "^8.57.0",
3434
"markdown-it": "^14.0.0",
3535
"markdown-it-anchor": "^8.6.7",
3636
"markdown-it-container": "^4.0.0",
37-
"prettier": "^3.1.1",
37+
"prettier": "^3.2.5",
3838
"prettier-config-common": "^1.4.0",
3939
"tsnd": "^1.1.0",
4040
"typescript": "^5.3.3",
41-
"vitepress": "1.0.0-rc.35"
41+
"vitepress": "1.0.0-rc.44"
4242
},
4343
"sideEffects": false,
4444
"keywords": [

‎packages/gitmars/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gitmars",
33
"description": "这是一个git工作流工具",
4-
"version": "6.2.0",
4+
"version": "6.3.0",
55
"private": false,
66
"bin": {
77
"gitm": "lib/gitm.mjs"
@@ -64,7 +64,7 @@
6464
"dayjs": "^1.11.10",
6565
"debug": "^4.3.4",
6666
"inquirer": "^8.2.5",
67-
"js-cool": "^5.15.2",
67+
"js-cool": "^5.17.1",
6868
"lodash-es": "^4.17.21",
6969
"lodash-unified": "^1.0.3",
7070
"node-apollo": "^1.2.1",
@@ -74,16 +74,16 @@
7474
"slash": "^3.0.0"
7575
},
7676
"devDependencies": {
77-
"@eslint-sets/eslint-config-ts": "^5.11.0",
77+
"@eslint-sets/eslint-config-ts": "^5.12.0",
7878
"@types/columnify": "^1.5.4",
7979
"@types/cross-spawn": "^6.0.6",
8080
"@types/inquirer": "^8.2.6",
8181
"@types/lodash-es": "^4.17.12",
82-
"@types/node": "^20.10.7",
82+
"@types/node": "^20.11.24",
8383
"@types/shelljs": "^0.8.15",
8484
"cross-env": "^7.0.3",
85-
"eslint": "^8.56.0",
86-
"prettier": "^3.1.1",
85+
"eslint": "^8.57.0",
86+
"prettier": "^3.2.5",
8787
"prettier-config-common": "^1.4.0",
8888
"tsnd": "^1.1.0",
8989
"typescript": "^5.3.3"

‎packages/gitmars/src/gitm-admin.ts‎

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import adminConfig from '#lib/conf/admin'
2727

2828
const { t } = lang
2929
const require = createRequire(import.meta.url)
30-
const { green, red } = chalk
30+
const { green, red, yellow } = chalk
3131

3232
if (!getIsGitProject()) {
3333
echo(red(t('The current directory is not a git project directory')))
@@ -676,10 +676,43 @@ publishProgram.action(
676676
]
677677
)
678678
}
679-
if (opt.build && (!level || level < 4)) {
679+
if (opt.build) {
680+
if (!level || level < 4) {
681+
cmd[type] = cmd[type].concat([
682+
{
683+
cmd: `gitm build ${appName} --confirm --env bug --app ${
684+
opt.build === true ? 'all' : opt.build
685+
} ${opt.data ? ' --data ' + opt.data : ''}`,
686+
config: {
687+
stdio: 'inherit',
688+
again: false,
689+
success: t('Pulling up the build was successful'),
690+
fail: t('Failed to pull up the build')
691+
}
692+
}
693+
])
694+
} else {
695+
echo(
696+
yellow(
697+
t(
698+
'This process will not automatically execute the build process, please wait for the administrator to review the code and execute it: gitm build {appName} -e prod -a {app} {data}',
699+
{
700+
appName,
701+
app: opt.build === true ? 'all' : opt.build,
702+
data: opt.data ? ' --data ' + opt.data : ''
703+
}
704+
)
705+
)
706+
)
707+
}
708+
}
709+
}
710+
// release release branch
711+
if (type === 'release' && opt.build) {
712+
if (!level || level < 4) {
680713
cmd[type] = cmd[type].concat([
681714
{
682-
cmd: `gitm build ${appName} --confirm --env bug --app ${
715+
cmd: `gitm build ${appName} --confirm --env prod --app ${
683716
opt.build === true ? 'all' : opt.build
684717
} ${opt.data ? ' --data ' + opt.data : ''}`,
685718
config: {
@@ -690,24 +723,21 @@ publishProgram.action(
690723
}
691724
}
692725
])
726+
} else {
727+
echo(
728+
yellow(
729+
t(
730+
'This process will not automatically execute the build process, please wait for the administrator to review the code and execute it: gitm build {appName} -e prod -a {app} {data}',
731+
{
732+
appName,
733+
app: opt.build === true ? 'all' : opt.build,
734+
data: opt.data ? ' --data ' + opt.data : ''
735+
}
736+
)
737+
)
738+
)
693739
}
694740
}
695-
// release release branch
696-
if (type === 'release' && opt.build && (!level || level < 4)) {
697-
cmd[type] = cmd[type].concat([
698-
{
699-
cmd: `gitm build ${appName} --confirm --env prod --app ${
700-
opt.build === true ? 'all' : opt.build
701-
} ${opt.data ? ' --data ' + opt.data : ''}`,
702-
config: {
703-
stdio: 'inherit',
704-
again: false,
705-
success: t('Pulling up the build was successful'),
706-
fail: t('Failed to pull up the build')
707-
}
708-
}
709-
])
710-
}
711741
// Release the release branch and sync the release code to the bug line
712742
if (type === 'release' && opt.combine) {
713743
// Is it necessary to merge to the bug

‎packages/gitmars/src/gitm-combine.ts‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ program.action(async (type: string, name: string, opt: GitmBuildOption): Promise
161161
sh.echo(
162162
yellow(
163163
t(
164-
'This branch has not been synced for more than 1 week, please sync it at least once a week, execute: gitm update'
164+
'This branch has not been synced for more than 1 week, please sync it at least once a week, execute: gitm update (-f)'
165165
)
166166
)
167167
)
@@ -587,37 +587,52 @@ program.action(async (type: string, name: string, opt: GitmBuildOption): Promise
587587
}
588588
}
589589
// 仅支持构建bug
590-
if (opt.build && (!level || level < 3)) {
591-
if (type === 'bugfix') {
592-
cmd = cmd.concat([
593-
{
594-
cmd: `gitm build ${appName} --confirm --env bug --app ${
595-
opt.build === true ? 'all' : opt.build
596-
} ${opt.data ? ' --data ' + opt.data : ''}`,
597-
config: {
598-
stdio: 'inherit',
599-
again: false,
600-
success: t('Pulling up the build was successful'),
601-
fail: t('Failed to pull up the build')
590+
if (opt.build) {
591+
if (!level || level < 3) {
592+
if (type === 'bugfix') {
593+
cmd = cmd.concat([
594+
{
595+
cmd: `gitm build ${appName} --confirm --env bug --app ${
596+
opt.build === true ? 'all' : opt.build
597+
} ${opt.data ? ' --data ' + opt.data : ''}`,
598+
config: {
599+
stdio: 'inherit',
600+
again: false,
601+
success: t('Pulling up the build was successful'),
602+
fail: t('Failed to pull up the build')
603+
}
602604
}
603-
}
604-
])
605-
}
606-
// support分支要构建bug和release
607-
if (type === 'support' && opt.noBugfix) {
608-
cmd = cmd.concat([
609-
{
610-
cmd: `gitm build ${appName} --confirm --env bug --app ${
611-
opt.build === true ? 'all' : opt.build
612-
} ${opt.data ? ' --data ' + opt.data : ''}`,
613-
config: {
614-
stdio: 'inherit',
615-
again: false,
616-
success: t('Pulling up the build was successful'),
617-
fail: t('Failed to pull up the build')
605+
])
606+
}
607+
// support分支要构建bug和release
608+
if (type === 'support' && opt.noBugfix) {
609+
cmd = cmd.concat([
610+
{
611+
cmd: `gitm build ${appName} --confirm --env bug --app ${
612+
opt.build === true ? 'all' : opt.build
613+
} ${opt.data ? ' --data ' + opt.data : ''}`,
614+
config: {
615+
stdio: 'inherit',
616+
again: false,
617+
success: t('Pulling up the build was successful'),
618+
fail: t('Failed to pull up the build')
619+
}
618620
}
619-
}
620-
])
621+
])
622+
}
623+
} else {
624+
sh.echo(
625+
yellow(
626+
t(
627+
'This process will not automatically execute the build process, please wait for the administrator to review the code and execute it: gitm build {appName} -e prod -a {app} {data}',
628+
{
629+
appName,
630+
app: opt.build === true ? 'all' : opt.build,
631+
data: opt.data ? ' --data ' + opt.data : ''
632+
}
633+
)
634+
)
635+
)
621636
}
622637
}
623638
}

0 commit comments

Comments
 (0)