From 3b7a68b4e8f5326a20791553ff0a4ac4a115238e Mon Sep 17 00:00:00 2001 From: saqqdy Date: Sun, 7 Aug 2022 22:18:34 +0800 Subject: [PATCH 1/7] update packages & update combine --- package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/docs/package.json | 2 +- packages/gitmars/package.json | 4 ++-- packages/server/package.json | 2 +- packages/ui/auto-imports.d.ts | 4 +--- packages/ui/components.d.ts | 34 +++++++++++++++++----------------- packages/ui/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 9 files changed, 33 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 654959a2..def94e86 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "packageManager": "pnpm@7.7.0", "main": "index.js", "files": [ @@ -46,7 +46,7 @@ "typings": "typings" }, "dependencies": { - "chalk": "^5.0.1", + "chalk": "^4.1.2", "inquirer": "^9.1.0", "js-cool": "^2.3.2", "morgan": "^1.10.0" diff --git a/packages/core/package.json b/packages/core/package.json index 5421a40f..fd2447e9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", @@ -40,7 +40,7 @@ }, "dependencies": { "@jssj/request": "^1.0.0-alpha.8", - "chalk": "^5.0.1", + "chalk": "^4.1.2", "ci-info": "^3.3.2", "columnify": "^1.6.0", "commander": "^9.4.0", diff --git a/packages/docs/package.json b/packages/docs/package.json index 3b373560..4c659b6f 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index da7b390a..9b62d5c7 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "private": false, "bin": { "gitm": "lib/gitm.js" @@ -38,7 +38,7 @@ "dependencies": { "@gitmars/core": "workspace:*", "@jssj/request": "^1.0.0-alpha.8", - "chalk": "^5.0.1", + "chalk": "^4.1.2", "ci-info": "^3.3.2", "columnify": "^1.6.0", "commander": "^9.4.0", diff --git a/packages/server/package.json b/packages/server/package.json index 7cece032..83cf11d1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "private": false, "bin": { "gitm-server": "./lib/www.js" diff --git a/packages/ui/auto-imports.d.ts b/packages/ui/auto-imports.d.ts index 08908edd..afc379b3 100644 --- a/packages/ui/auto-imports.d.ts +++ b/packages/ui/auto-imports.d.ts @@ -1,5 +1,3 @@ // Generated by 'unplugin-auto-import' export {} -declare global { - -} +declare global {} diff --git a/packages/ui/components.d.ts b/packages/ui/components.d.ts index 4f059fee..abd32c98 100644 --- a/packages/ui/components.d.ts +++ b/packages/ui/components.d.ts @@ -6,21 +6,21 @@ import '@vue/runtime-core' export {} declare module '@vue/runtime-core' { - export interface GlobalComponents { - Box: typeof import('./src/components/box/index.vue')['default'] - Button: typeof import('./src/components/button/index.vue')['default'] - Collapse: typeof import('./src/components/collapse/index.vue')['default'] - CollapseItem: typeof import('./src/components/collapse-item/index.vue')['default'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - Group: typeof import('./src/components/group_bak/group.vue')['default'] - Nav: typeof import('./src/components/nav.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - Split: typeof import('./src/components/split/index.vue')['default'] - Xterm: typeof import('./src/components/xterm/index.vue')['default'] - } + export interface GlobalComponents { + Box: typeof import('./src/components/box/index.vue')['default'] + Button: typeof import('./src/components/button/index.vue')['default'] + Collapse: typeof import('./src/components/collapse/index.vue')['default'] + CollapseItem: typeof import('./src/components/collapse-item/index.vue')['default'] + ElButton: typeof import('element-plus/es')['ElButton'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElInput: typeof import('element-plus/es')['ElInput'] + ElOption: typeof import('element-plus/es')['ElOption'] + ElSelect: typeof import('element-plus/es')['ElSelect'] + Group: typeof import('./src/components/group_bak/group.vue')['default'] + Nav: typeof import('./src/components/nav.vue')['default'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] + Split: typeof import('./src/components/split/index.vue')['default'] + Xterm: typeof import('./src/components/xterm/index.vue')['default'] + } } diff --git a/packages/ui/package.json b/packages/ui/package.json index da72c3f9..cfcc8215 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "private": false, "bin": { "gitm-ui": "./index.js" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9974bc68..727b3e55 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ importers: '@types/rollup-plugin-css-only': ^3.1.0 '@vitejs/plugin-vue': ^3.0.1 '@vitejs/plugin-vue-jsx': ^2.0.0 - chalk: ^5.0.1 + chalk: ^4.1.2 consola: ^2.15.3 cron-parser: ^4.6.0 cross-env: ^7.0.3 @@ -54,7 +54,7 @@ importers: unplugin-vue-define-options: ^0.7.3 vitepress: 1.0.0-alpha.4 dependencies: - chalk: 5.0.1 + chalk: 4.1.2 inquirer: 9.1.0 js-cool: 2.3.2 morgan: 1.10.0 @@ -114,7 +114,7 @@ importers: '@types/inquirer': ^9.0.0 '@types/node': ^18.6.4 '@types/shelljs': ^0.8.11 - chalk: ^5.0.1 + chalk: ^4.1.2 ci-info: ^3.3.2 columnify: ^1.6.0 commander: ^9.4.0 @@ -137,7 +137,7 @@ importers: typescript: ^4.7.4 dependencies: '@jssj/request': 1.0.0-alpha.8 - chalk: 5.0.1 + chalk: 4.1.2 ci-info: 3.3.2 columnify: 1.6.0 commander: 9.4.0 @@ -205,7 +205,7 @@ importers: '@types/inquirer': ^9.0.0 '@types/node': ^18.6.4 '@types/shelljs': ^0.8.11 - chalk: ^5.0.1 + chalk: ^4.1.2 ci-info: ^3.3.2 columnify: ^1.6.0 commander: ^9.4.0 @@ -228,7 +228,7 @@ importers: dependencies: '@gitmars/core': link:../core '@jssj/request': 1.0.0-alpha.8 - chalk: 5.0.1 + chalk: 4.1.2 ci-info: 3.3.2 columnify: 1.6.0 commander: 9.4.0 From e7e4f109640d533c0c2400728acbebef0d9b4c9c Mon Sep 17 00:00:00 2001 From: saqqdy Date: Mon, 8 Aug 2022 13:23:16 +0800 Subject: [PATCH 2/7] workflow --- .github/workflows/publish.yml | 16 +++++++++++----- .vscode/settings.json | 2 ++ package.json | 2 +- packages/core/package.json | 2 +- packages/docs/package.json | 2 +- packages/gitmars/package.json | 2 +- packages/server/package.json | 2 +- packages/ui/package.json | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 379e1fe6..36eda1ff 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,10 @@ name: Npm publish on: - release: - types: [created] - # push: - # branches: [master, dev] + # release: + # types: [created] + push: + branches: [master, dev] jobs: publish-gpr: @@ -38,13 +38,19 @@ jobs: # - run: git config --global user.email "saqqdy@qq.com" # - run: git config --global user.name "saqqdy" - - run: pnpm build + - run: pnpm dist env: NODE_OPTIONS: --max-old-space-size=6144 - name: Gen .npmrc run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./.npmrc + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/server/.npmrc + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/ui/.npmrc + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc + - run: pnpm pub env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} diff --git a/.vscode/settings.json b/.vscode/settings.json index 0fa47790..cb66e644 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -69,6 +69,8 @@ "minify", "msg", "namespace", + "npmjs", + "npmrc", "num", "nvm", "onwarn", diff --git a/package.json b/package.json index def94e86..f9088a2c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "packageManager": "pnpm@7.7.0", "main": "index.js", "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index fd2447e9..4da670b7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", diff --git a/packages/docs/package.json b/packages/docs/package.json index 4c659b6f..a4377e3d 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 9b62d5c7..0f9d2b12 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "private": false, "bin": { "gitm": "lib/gitm.js" diff --git a/packages/server/package.json b/packages/server/package.json index 83cf11d1..29b1f79d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "private": false, "bin": { "gitm-server": "./lib/www.js" diff --git a/packages/ui/package.json b/packages/ui/package.json index cfcc8215..42295435 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "private": false, "bin": { "gitm-ui": "./index.js" From 08783a4f432c3172c1d3cbfcc860b3efdda36ff8 Mon Sep 17 00:00:00 2001 From: saqqdy Date: Tue, 9 Aug 2022 13:36:22 +0800 Subject: [PATCH 3/7] update combine command --- package.json | 2 +- packages/core/package.json | 2 +- packages/core/src/queue.ts | 48 +++++++-- packages/core/typings/index.d.ts | 33 ++----- packages/docs/package.json | 2 +- packages/gitmars/package.json | 2 +- packages/gitmars/src/gitm-combine.ts | 24 ++++- packages/gitmars/typings/index.d.ts | 139 ++------------------------- packages/server/package.json | 2 +- packages/ui/package.json | 2 +- 10 files changed, 82 insertions(+), 174 deletions(-) diff --git a/package.json b/package.json index f9088a2c..10ab695d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "packageManager": "pnpm@7.7.0", "main": "index.js", "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index 4da670b7..63b0b5f8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", diff --git a/packages/core/src/queue.ts b/packages/core/src/queue.ts index db09e0a4..95025df6 100644 --- a/packages/core/src/queue.ts +++ b/packages/core/src/queue.ts @@ -4,6 +4,7 @@ import chalk from 'chalk' import type { CommandMessageType, CommandType, + CommandTypeCmd, QueueReturnsType } from '../typings' import { setCommandCache } from './cache/commandCache' @@ -57,7 +58,7 @@ export function queue( // 处理脚本执行成功 function onSuccess( msg: CommandMessageType, - cfg: CommandType['config'], + cfg: CommandTypeCmd['config'], cb?: WaitCallback ) { const _message = cfg.success || msg.success || '处理完成' @@ -70,10 +71,10 @@ export function queue( // 处理脚本执行错误 function onError( list: Array, - cmd: CommandType['cmd'], + cmd: CommandTypeCmd['cmd'], err: any, msg: CommandMessageType, - cfg: CommandType['config'], + cfg: CommandTypeCmd['config'], cb?: WaitCallback ) { if (cfg.kill) { @@ -123,21 +124,50 @@ export function queue( wait( list, async (command?: CommandType | string, cb?: WaitCallback) => { - let cfg = { + let cfg: CommandTypeCmd['config'] = { stdio: 'ignore', postmsg: false, kill: true, again: false // 指令执行中断之后是否需要重新执行，类似冲突解决之后的指令，不再需要重复执行 - } as CommandType['config'], - cmd: CommandType['cmd'] + }, + cmd, + message // 传入对象形式：{ cmd: '', config: {} } if (command instanceof Object) { - cfg = Object.assign(cfg, command.config || {}) - cmd = command.cmd + if ('message' in command) { + // message优先，输出消息 + message = command.message + } else { + cfg = Object.assign(cfg, command.config || {}) + cmd = command.cmd + } } else { cmd = command! } - if (!cmd) { + /** + * 三种场景 + * + * 1. { message: '消息' } + * 2. { cmd: 'git status', config: {} } + * 3. { cmd: { module: '', entry: '', options: {} }, config: {} } + */ + if (message) { + spinner.start(chalk.green(message)) + returns.push({ + status: 0, + stdout: '', + stderr: '', + cfg, + cmd: '' + }) + onSuccess( + { + success: message + }, + cfg, + cb + ) + } else if (!cmd) { spinner.stop() // 只有一条指令，不需返回数组形式 resolve(returns) diff --git a/packages/core/typings/index.d.ts b/packages/core/typings/index.d.ts index 527d50de..e8619f37 100644 --- a/packages/core/typings/index.d.ts +++ b/packages/core/typings/index.d.ts @@ -17,14 +17,6 @@ export type GitmarsBranchType = 'feature' | 'bugfix' | 'support' // 127和128是git个别场景的执行结果值 export type ShellCode = 0 | 1 | 127 | 128 -export type PackageVersionTag = - | 'alpha' - | 'lite' - | 'beta' - | 'release' - | 'latest' - | 'next' - export type GitLogKeysType = | '%H' | '%h' @@ -215,11 +207,17 @@ export interface ModuleCommandType { options?: unknown } -export interface CommandType { +export interface CommandTypeCmd { cmd: string | ModuleCommandType config: QueueConfigType } +export interface CommandTypeMessage { + message: string +} + +export type CommandType = CommandTypeCmd | CommandTypeMessage + export interface FetchDataType { token: string // gitlab上生成的access_token level: 1 | 2 | 3 | 4 // 1=超级管理员 2=管理员 3=审核员 4=开发者 @@ -249,17 +247,6 @@ export interface QueueReturnsType cmd: string | ModuleCommandType } -export interface InitInquirerPromptType { - type: string - name: string - message: string - default?(): string - transformer?(val: any, answers: any, flags: any): any - validate?(val: any): string | boolean - when?(val: any): string | boolean - choices?: any -} - export interface GitmarsLogType extends Partial< Pick, 'stdout' | 'stderr' | 'status'> @@ -268,9 +255,9 @@ export interface GitmarsLogType } export interface CommandMessageType { - processing: string - success: string - fail: string + processing?: string + success?: string + fail?: string } export interface RevertCacheType { diff --git a/packages/docs/package.json b/packages/docs/package.json index a4377e3d..70f5ad68 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 0f9d2b12..31291e9d 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "private": false, "bin": { "gitm": "lib/gitm.js" diff --git a/packages/gitmars/src/gitm-combine.ts b/packages/gitmars/src/gitm-combine.ts index 75620603..a6c5d38c 100755 --- a/packages/gitmars/src/gitm-combine.ts +++ b/packages/gitmars/src/gitm-combine.ts @@ -190,7 +190,11 @@ program.action( }, `git checkout ${type}/${name}` ] - : [] + : [ + { + message: `${type}/${name}已经合并过${config.develop}` + } + ] ) if (opt.build) { cmd = cmd.concat([ @@ -259,7 +263,11 @@ program.action( }, `git checkout ${type}/${name}` ] - : [] + : [ + { + message: `${type}/${name}已经合并过${base}` + } + ] ) } else { if (!isDescriptionCorrect) { @@ -329,7 +337,11 @@ program.action( }, `git checkout ${type}/${name}` ] - : [] + : [ + { + message: `${type}/${name}已经合并过${config.release}` + } + ] ) } else { if (!isDescriptionCorrect) { @@ -399,7 +411,11 @@ program.action( }, `git checkout ${type}/${name}` ] - : [] + : [ + { + message: `${type}/${name}已经合并过${config.bugfix}` + } + ] ) } else { if (!isDescriptionCorrect) { diff --git a/packages/gitmars/typings/index.d.ts b/packages/gitmars/typings/index.d.ts index 527d50de..24ba8b21 100644 --- a/packages/gitmars/typings/index.d.ts +++ b/packages/gitmars/typings/index.d.ts @@ -25,67 +25,6 @@ export type PackageVersionTag = | 'latest' | 'next' -export type GitLogKeysType = - | '%H' - | '%h' - | '%T' - | '%t' - | '%P' - | '%p' - | '%an' - | '%aN' - | '%ae' - | '%aE' - | '%al' - | '%aL' - | '%ad' - | '%aD' - | '%ar' - | '%at' - | '%ai' - | '%aI' - | '%as' - | '%cn' - | '%cN' - | '%ce' - | '%cE' - | '%cl' - | '%cL' - | '%cd' - | '%cD' - | '%cr' - | '%ct' - | '%ci' - | '%cI' - | '%cs' - | '%d' - | '%D' - // %(describe[:options]), // human-readable name, like git-describe[1]; empty string for undescribable commits. The describe string may be followed by a colon and zero or more comma-separated options. Descriptions can be inconsistent when tags are added or removed at the same time. - | '%S' // ref name given on the command line by which the commit was reached (like git log --source), only works with git log - | '%e' // encoding - // ---------- - | '%s' // subject - | '%f' // sanitized subject line, suitable for a filename - | '%b' // body - | '%B' // raw body (unwrapped subject and body) - | '%N' // commit notes - | '%GG' // raw verification message from GPG for a signed commit - | '%G?' // show "G" for a good (valid) signature, "B" for a bad signature, "U" for a good signature with unknown validity, "X" for a good signature that has expired, "Y" for a good signature made by an expired key, "R" for a good signature made by a revoked key, "E" if the signature cannot be checked (e.g. missing key) and "N" for no signature - | '%GS' // show the name of the signer for a signed commit - | '%GK' // show the key used to sign a signed commit - | '%GF' // show the fingerprint of the key used to sign a signed commit - | '%GP' // show the fingerprint of the primary key whose subkey was used to sign a signed commit - | '%GT' // show the trust level for the key used to sign a signed commit - | '%gD' // reflog selector, e.g., refs/stash@{1} or refs/stash@{2 minutes ago}; the format follows the rules described for the -g option. The portion before the @ is the refname as given on the command line (so git log -g refs/heads/master would yield refs/heads/master@{0}). - | '%gd' // shortened reflog selector; same as %gD, but the refname portion is shortened for human readability (so refs/heads/master becomes just master). - | '%gn' // reflog identity name - | '%gN' // reflog identity name (respecting .mailmap, see git-shortlog[1] or git-blame[1]) - | '%ge' // reflog identity email - | '%gE' // reflog identity email (respecting .mailmap, see git-shortlog[1] or git-blame[1]) - | '%gs' // reflog subject - | '%(trailers:key=Signed-off-by)' - | '%(trailers:key=Reviewed-by)' // display the trailers of the body as interpreted by git-interpret-trailers[1]. The trailers string may be followed by a colon and zero or more comma-separated options. If any option is provided multiple times the last occurrence wins. - export type GitLogsType = { [key in GitLogKeysType]?: string } @@ -152,74 +91,23 @@ export interface GitmarsMultiOptionType { approve: GitmarsOptionType } -export interface GitmarsConfigApisBuildConfigType { - url: string - method?: 'post' | 'get' | 'put' | 'delete' - params?: Record -} - -export interface GitmarsConfigType { - master: string - develop: string - release: string - bugfix: string - support: string - user?: string - email?: string - skipCI: boolean - msgTemplate?: string - msgUrl?: string - apolloConfig?: { - configServerUrl: string - appId: string - clusterName: string - namespaceName: string[] - apolloEnv: string - token: string - } - apis?: Record - api?: string - gitHost?: string - gitID?: string - hooks?: Record - filepath: string -} - -export type ApolloBranchList = 'dev' | 'bug' | 'prod' - -export interface ApolloConfigProjectType { - name: string - project: string - apps?: string[] -} - -export interface ApolloConfigBranchType { - line: string - token: string - list: ApolloConfigProjectType[] -} - -export type ApolloConfigType = { - [props in ApolloBranchList]: ApolloConfigBranchType -} & { - username: string - password: string - template: string // 不带参数 - templateWithParam: string // 带参数 - gitNotificationGroupUrl?: string | string[] // 推送群消息的api -} - export interface ModuleCommandType { module: string entry?: string options?: unknown } -export interface CommandType { +export interface CommandTypeCmd { cmd: string | ModuleCommandType config: QueueConfigType } +export interface CommandTypeMessage { + message: string +} + +export type CommandType = CommandTypeCmd | CommandTypeMessage + export interface FetchDataType { token: string // gitlab上生成的access_token level: 1 | 2 | 3 | 4 // 1=超级管理员 2=管理员 3=审核员 4=开发者 @@ -260,19 +148,6 @@ export interface InitInquirerPromptType { choices?: any } -export interface GitmarsLogType - extends Partial< - Pick, 'stdout' | 'stderr' | 'status'> - > { - command: string -} - -export interface CommandMessageType { - processing: string - success: string - fail: string -} - export interface RevertCacheType { before: GitLogsType after: GitLogsType diff --git a/packages/server/package.json b/packages/server/package.json index 29b1f79d..4d45bedc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "private": false, "bin": { "gitm-server": "./lib/www.js" diff --git a/packages/ui/package.json b/packages/ui/package.json index 42295435..0e44787e 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "private": false, "bin": { "gitm-ui": "./index.js" From fad689e9534cd32e88e1223262df58796877ed9d Mon Sep 17 00:00:00 2001 From: saqqdy Date: Tue, 9 Aug 2022 19:56:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=20=20=E6=8C=87=E4=BB=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=A4=E6=96=AD=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=90=88=E5=B9=B6=E6=97=B6=E4=B8=8D=E5=86=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 +- package.json | 2 +- packages/core/package.json | 2 +- packages/docs/package.json | 2 +- packages/gitmars/package.json | 2 +- packages/gitmars/src/gitm-admin.ts | 795 ++++++++++++++++------------ packages/gitmars/src/gitm-update.ts | 60 ++- packages/server/package.json | 2 +- packages/ui/package.json | 2 +- 9 files changed, 514 insertions(+), 357 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ed45eb8..b9a621a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # 更新日志 -## 2022.08.07 v3.3.0 更新日志 +## 2022.08.09 v3.3.0 更新日志 -1. `combine`指令增加合并判断，不需要合并时不再合并 +1. `combine` `update` `admin`指令增加合并判断，不需要合并时不再合并 2. 升级依赖包版本 ## 2022.07.19 v3.2.0 更新日志 diff --git a/package.json b/package.json index 10ab695d..bf30bf3d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "packageManager": "pnpm@7.7.0", "main": "index.js", "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index 63b0b5f8..86b1ecf9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", diff --git a/packages/docs/package.json b/packages/docs/package.json index 70f5ad68..3910c4c3 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 31291e9d..0ae45f72 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "private": false, "bin": { "gitm": "lib/gitm.js" diff --git a/packages/gitmars/src/gitm-admin.ts b/packages/gitmars/src/gitm-admin.ts index 0e566b19..9a7f877a 100755 --- a/packages/gitmars/src/gitm-admin.ts +++ b/packages/gitmars/src/gitm-admin.ts @@ -13,6 +13,7 @@ const getIsBranchOrCommitExist = require('@gitmars/core/lib/git/getIsBranchOrCom const getIsGitProject = require('@gitmars/core/lib/git/getIsGitProject') const getCurrentBranch = require('@gitmars/core/lib/git/getCurrentBranch') const getGitConfig = require('@gitmars/core/lib/git/getGitConfig') +const getIsMergedTargetBranch = require('@gitmars/core/lib/git/getIsMergedTargetBranch') const checkGitStatus = require('@gitmars/core/lib/git/checkGitStatus') const { createArgs } = require('@gitmars/core/lib/utils/command') const { spawnSync } = require('@gitmars/core/lib/spawn') @@ -149,6 +150,26 @@ publishProgram.action( : new RegExp(config.descriptionValidator) isDescriptionCorrect = opt.description && reg.test(opt.description) } + const isNeedCombineBugfixToRelease = !getIsMergedTargetBranch( + config.bugfix, + config.release, + true + ) + const isNeedCombineSupportToRelease = !getIsMergedTargetBranch( + config.support, + config.release, + true + ) + const isNeedCombineSupportToBugfix = !getIsMergedTargetBranch( + config.support, + config.bugfix, + true + ) + const isNeedCombineReleaseToMaster = !getIsMergedTargetBranch( + config.release, + config.master, + true + ) if (opts.includes(type)) { /** * bugfix -> master/release @@ -161,94 +182,125 @@ publishProgram.action( } if (!level || level < 4) { cmd = { - bugfix: [ - 'git fetch', - `git checkout ${config.bugfix}`, - 'git pull', - `git checkout ${config.release}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.bugfix}`, - config: { - again: false, - postmsg: opt.postmsg, - success: `${config.bugfix}合并到${config.release}成功`, - fail: `${config.bugfix}合并到${config.release}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ], - support: [ - 'git fetch', - `git checkout ${config.support}`, - 'git pull', - `git checkout ${config.release}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.support}`, - config: { - again: false, - success: `${config.support}合并到${config.release}成功`, - fail: `${config.support}合并到${config.release}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - }, - `git checkout ${config.bugfix}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.support}`, - config: { - again: false, - success: `${config.support}合并到${config.bugfix}成功`, - fail: `${config.support}合并到${config.bugfix}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ], - release: [ - 'git fetch', - `git checkout ${config.release}`, - 'git pull', - `git checkout ${config.master}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.release}`, - config: { - again: false, - success: `${config.release}合并到${config.master}成功`, - fail: `${config.release}合并到${config.master}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ] + bugfix: isNeedCombineBugfixToRelease + ? [ + 'git fetch', + `git checkout ${config.bugfix}`, + 'git pull', + `git checkout ${config.release}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.bugfix}`, + config: { + again: false, + postmsg: opt.postmsg, + success: `${config.bugfix}合并到${config.release}成功`, + fail: `${config.bugfix}合并到${config.release}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.bugfix}已经合并过${config.release}` + } + ], + support: ([] as Array) + .concat( + isNeedCombineSupportToRelease + ? [ + 'git fetch', + `git checkout ${config.support}`, + 'git pull', + `git checkout ${config.release}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.support}`, + config: { + again: false, + success: `${config.support}合并到${config.release}成功`, + fail: `${config.support}合并到${config.release}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.support}已经合并过${config.release}` + } + ] + ) + .concat( + isNeedCombineSupportToBugfix + ? [ + `git checkout ${config.bugfix}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.support}`, + config: { + again: false, + success: `${config.support}合并到${config.bugfix}成功`, + fail: `${config.support}合并到${config.bugfix}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.support}已经合并过${config.bugfix}` + } + ] + ), + release: isNeedCombineReleaseToMaster + ? [ + 'git fetch', + `git checkout ${config.release}`, + 'git pull', + `git checkout ${config.master}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.release}`, + config: { + again: false, + success: `${config.release}合并到${config.master}成功`, + fail: `${config.release}合并到${config.master}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.release}已经合并过${config.master}` + } + ] } } else { if (!isDescriptionCorrect) { @@ -256,134 +308,187 @@ publishProgram.action( process.exit(1) } cmd = { - bugfix: [ - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: config.bugfix, - target_branch: config.release, - token, - description: opt.description - } - }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' - } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${config.bugfix}分支合并到${config.release}分支的merge请求"` - ], - support: [ - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: config.support, - target_branch: config.release, - token, - description: opt.description - } - }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' - } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${config.support}分支合并到${config.release}分支的merge请求"`, - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: config.support, - target_branch: config.bugfix, - token, - description: opt.description - } - }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' - } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${config.support}分支合并到${config.bugfix}分支的merge请求"` - ], - release: [ - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: config.release, - target_branch: config.master, - token, - description: opt.description - } - }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' - } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${config.release}分支合并到${config.master}分支的merge请求"` - ] + bugfix: isNeedCombineBugfixToRelease + ? [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: config.bugfix, + target_branch: config.release, + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${config.bugfix}分支合并到${config.release}分支的merge请求"` + ] + : [ + { + message: `${config.bugfix}已经合并过${config.release}` + } + ], + support: ([] as Array) + .concat( + isNeedCombineSupportToRelease + ? [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: config.support, + target_branch: config.release, + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${config.support}分支合并到${config.release}分支的merge请求"` + ] + : [ + { + message: `${config.support}已经合并过${config.release}` + } + ] + ) + .concat( + isNeedCombineSupportToBugfix + ? [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: config.support, + target_branch: config.bugfix, + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${config.support}分支合并到${config.bugfix}分支的merge请求"` + ] + : [ + { + message: `${config.support}已经合并过${config.bugfix}` + } + ] + ), + release: isNeedCombineReleaseToMaster + ? [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: config.release, + target_branch: config.master, + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${config.release}分支合并到${config.master}分支的merge请求"` + ] + : [ + { + message: `${config.release}已经合并过${config.master}` + } + ] } } // 发布bug分支且同步到master if (type === 'bugfix' && opt.prod) { + // 是否需要合并master + const isNeedCombine = !getIsMergedTargetBranch( + config.bugfix, + config.master, + true + ) if (!level || level < 4) { - cmd[type] = cmd[type].concat([ - `git checkout ${config.master}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.bugfix}`, - config: { - again: false, - success: `${config.bugfix}合并到${config.master}成功`, - fail: `${config.bugfix}合并到${config.master}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ]) + cmd[type] = cmd[type].concat( + isNeedCombine + ? [ + `git checkout ${config.master}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.bugfix}`, + config: { + again: false, + success: `${config.bugfix}合并到${config.master}成功`, + fail: `${config.bugfix}合并到${config.master}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.bugfix}已经合并过${config.master}` + } + ] + ) } else { if (!isDescriptionCorrect) { echo(red('提交的原因描述不符合规范')) process.exit(1) } - cmd[type] = cmd[type].concat([ - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: config.bugfix, - target_branch: config.master, - token, - description: opt.description - } - }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' - } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${config.bugfix}分支合并到${config.master}分支的merge请求"` - ]) + cmd[type] = cmd[type].concat( + isNeedCombine + ? [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: config.bugfix, + target_branch: config.master, + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${config.bugfix}分支合并到${config.master}分支的merge请求"` + ] + : [ + { + message: `${config.bugfix}已经合并过${config.master}` + } + ] + ) } if (opt.build && (!level || level < 4)) { cmd[type] = cmd[type].concat([ @@ -417,59 +522,81 @@ publishProgram.action( } // 发布release分支且同步release代码到bug线 if (type === 'release' && opt.combine) { + // 是否需要合并bug + const isNeedCombine = !getIsMergedTargetBranch( + config.release, + config.bugfix, + true + ) // 使用rebase if (opt.useRebase) { - cmd[type] = cmd[type].concat([ - `git checkout ${config.release}`, - 'git pull', - `git checkout ${config.bugfix}`, - { - cmd: `git pull origin ${config.bugfix} --rebase`, - config: { again: true } - }, - { - cmd: `git rebase ${config.release}`, - config: { - again: false, - postmsg: opt.postmsg, - success: `${config.release}同步到${config.bugfix}成功`, - fail: `${config.release}同步到${config.bugfix}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ]) + cmd[type] = cmd[type].concat( + isNeedCombine + ? [ + `git checkout ${config.release}`, + 'git pull', + `git checkout ${config.bugfix}`, + { + cmd: `git pull origin ${config.bugfix} --rebase`, + config: { again: true } + }, + { + cmd: `git rebase ${config.release}`, + config: { + again: false, + postmsg: opt.postmsg, + success: `${config.release}同步到${config.bugfix}成功`, + fail: `${config.release}同步到${config.bugfix}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.release}已经合并过${config.bugfix}` + } + ] + ) } else { if (!level || level < 4) { - cmd[type] = cmd[type].concat([ - `git checkout ${config.release}`, - 'git pull', - `git checkout ${config.bugfix}`, - 'git pull', - { - cmd: `git merge --no-ff ${config.release}`, - config: { - again: false, - postmsg: opt.postmsg, - success: `${config.release}合并到${config.bugfix}成功`, - fail: `${config.release}合并到${config.bugfix}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } - } - ]) + cmd[type] = cmd[type].concat( + isNeedCombine + ? [ + `git checkout ${config.release}`, + 'git pull', + `git checkout ${config.bugfix}`, + 'git pull', + { + cmd: `git merge --no-ff ${config.release}`, + config: { + again: false, + postmsg: opt.postmsg, + success: `${config.release}合并到${config.bugfix}成功`, + fail: `${config.release}合并到${config.bugfix}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } + } + ] + : [ + { + message: `${config.release}已经合并过${config.bugfix}` + } + ] + ) } else { if (!isDescriptionCorrect) { echo(red('提交的原因描述不符合规范')) @@ -554,87 +681,101 @@ updateProgram.action( mode = ' --strategy-option theirs' } if (opts.includes(type)) { + // 是否需要合并 + const isNeedCombine = !getIsMergedTargetBranch( + base, + config[type], + true + ) let cmd - if (!level || level < 4) { - cmd = [ - 'git fetch', - `git checkout ${base}`, - 'git pull', - `git checkout ${config[type]}`, - { - cmd: 'git pull', - config: { again: true } - }, - { - cmd: `git merge --no-ff ${base}${mode}`, - config: { - again: false, - postmsg: opt.postmsg, - success: `${base}同步到${config[type]}成功`, - fail: `${base}同步到${config[type]}出错了，请根据提示处理` - } - }, - { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' + if (isNeedCombine) { + if (!level || level < 4) { + cmd = [ + 'git fetch', + `git checkout ${base}`, + 'git pull', + `git checkout ${config[type]}`, + { + cmd: 'git pull', + config: { again: true } + }, + { + cmd: `git merge --no-ff ${base}${mode}`, + config: { + again: false, + postmsg: opt.postmsg, + success: `${base}同步到${config[type]}成功`, + fail: `${base}同步到${config[type]}出错了，请根据提示处理` + } + }, + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } } + ] + } else { + if (!isDescriptionCorrect) { + echo(red('提交的原因描述不符合规范')) + process.exit(1) } - ] - } else { - if (!isDescriptionCorrect) { - echo(red('提交的原因描述不符合规范')) - process.exit(1) + cmd = [ + { + cmd: { + module: mergeRequestModule, + entry: 'createMergeRequest', + options: { + source_branch: base, + target_branch: config[type], + token, + description: opt.description + } + }, + config: { + again: true, + success: '成功创建合并请求', + fail: '创建合并请求出错了，请根据提示处理' + } + }, + `gitm postmsg "${nickname}在${appName}项目提交了${base}分支合并到${config[type]}分支的merge请求"` + ] } - cmd = [ - { - cmd: { - module: mergeRequestModule, - entry: 'createMergeRequest', - options: { - source_branch: base, - target_branch: config[type], - token, - description: opt.description + if (opt.useRebase) { + cmd = [ + 'git fetch', + `git checkout ${base}`, + 'git pull', + `git checkout ${config[type]}`, + { + cmd: `git pull origin ${config[type]} --rebase`, + config: { again: true } + }, + { + cmd: `git rebase ${base}`, + config: { + again: false, + postmsg: opt.postmsg, + success: `${base}同步到${config[type]}成功`, + fail: `${base}同步到${config[type]}出错了，请根据提示处理` } }, - config: { - again: true, - success: '成功创建合并请求', - fail: '创建合并请求出错了，请根据提示处理' + { + cmd: 'git push', + config: { + again: true, + success: '推送成功', + fail: '推送失败，请根据提示处理' + } } - }, - `gitm postmsg "${nickname}在${appName}项目提交了${base}分支合并到${config[type]}分支的merge请求"` - ] - } - if (opt.useRebase) { + ] + } + } else { cmd = [ - 'git fetch', - `git checkout ${base}`, - 'git pull', - `git checkout ${config[type]}`, - { - cmd: `git pull origin ${config[type]} --rebase`, - config: { again: true } - }, - { - cmd: `git rebase ${base}`, - config: { - again: false, - postmsg: opt.postmsg, - success: `${base}同步到${config[type]}成功`, - fail: `${base}同步到${config[type]}出错了，请根据提示处理` - } - }, { - cmd: 'git push', - config: { - again: true, - success: '推送成功', - fail: '推送失败，请根据提示处理' - } + message: `${base}已经合并过${config[type]}` } ] } diff --git a/packages/gitmars/src/gitm-update.ts b/packages/gitmars/src/gitm-update.ts index 78f394f2..a4ac342e 100755 --- a/packages/gitmars/src/gitm-update.ts +++ b/packages/gitmars/src/gitm-update.ts @@ -6,6 +6,7 @@ const { red } = require('chalk') const { queue } = require('@gitmars/core/lib/queue') const getIsGitProject = require('@gitmars/core/lib/git/getIsGitProject') const getCurrentBranch = require('@gitmars/core/lib/git/getCurrentBranch') +const getIsMergedTargetBranch = require('@gitmars/core/lib/git/getIsMergedTargetBranch') const checkGitStatus = require('@gitmars/core/lib/git/checkGitStatus') const searchBranches = require('@gitmars/core/lib/git/searchBranches') const { @@ -101,31 +102,46 @@ program.action( : type === 'support' ? config.master : config.release - const cmd: Array = [ - 'git fetch', - `git checkout ${base}`, - 'git pull', - `git checkout ${type}/${name}` - ] - if (opt.useRebase) { - cmd.push({ - cmd: `git rebase ${base}`, - config: { - again: false, - success: `${base}更新到${type}/${name}成功`, - fail: `${base}更新到${type}/${name}出错了，请根据提示处理` - } - }) + const isNeedCombine = !getIsMergedTargetBranch( + base, + `${type}/${name}`, + true + ) + let cmd: Array = [] + if (isNeedCombine) { + cmd = cmd.concat([ + 'git fetch', + `git checkout ${base}`, + 'git pull', + `git checkout ${type}/${name}` + ]) + if (opt.useRebase) { + cmd.push({ + cmd: `git rebase ${base}`, + config: { + again: false, + success: `${base}更新到${type}/${name}成功`, + fail: `${base}更新到${type}/${name}出错了，请根据提示处理` + } + }) + } else { + cmd.push({ + cmd: `git merge --no-ff ${base}`, + config: { + again: false, + success: `${base}同步到${type}/${name}成功`, + fail: `${base}同步到${type}/${name}出错了，请根据提示处理` + } + }) + } } else { - cmd.push({ - cmd: `git merge --no-ff ${base}`, - config: { - again: false, - success: `${base}同步到${type}/${name}成功`, - fail: `${base}同步到${type}/${name}出错了，请根据提示处理` + cmd = [ + { + message: `${base}已经合并过${type}/${name}` } - }) + ] } + cmds = cmds.concat(cmd) }) queue(cmds) diff --git a/packages/server/package.json b/packages/server/package.json index 4d45bedc..a1a52ea9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "private": false, "bin": { "gitm-server": "./lib/www.js" diff --git a/packages/ui/package.json b/packages/ui/package.json index 0e44787e..50b72e1e 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "private": false, "bin": { "gitm-ui": "./index.js" From c5a3e874113205110e7ab128e75acb3ec6b1242f Mon Sep 17 00:00:00 2001 From: saqqdy Date: Tue, 9 Aug 2022 19:57:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=20=20=E6=8C=87=E4=BB=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=A4=E6=96=AD=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=90=88=E5=B9=B6=E6=97=B6=E4=B8=8D=E5=86=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 36eda1ff..289ec3a9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: # release: # types: [created] push: - branches: [master, dev] + branches: [dev] jobs: publish-gpr: From 14e990e3a26e5eb065e47b42921c1d72eee360cc Mon Sep 17 00:00:00 2001 From: saqqdy Date: Wed, 10 Aug 2022 10:53:05 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=20=20=E6=8C=87=E4=BB=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=A4=E6=96=AD=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=90=88=E5=B9=B6=E6=97=B6=E4=B8=8D=E5=86=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- packages/core/package.json | 4 +- packages/gitmars/package.json | 4 +- pnpm-lock.yaml | 312 ++++++++++++++++++---------------- 4 files changed, 175 insertions(+), 149 deletions(-) diff --git a/package.json b/package.json index bf30bf3d..c04271b2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "chalk": "^4.1.2", - "inquirer": "^9.1.0", + "inquirer": "^8.2.4", "js-cool": "^2.3.2", "morgan": "^1.10.0" }, @@ -62,7 +62,7 @@ "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", "@types/gulp": "^4.0.9", - "@types/inquirer": "^9.0.0", + "@types/inquirer": "^8.2.2", "@types/node": "^18.6.4", "@types/rollup-plugin-css-only": "^3.1.0", "@vitejs/plugin-vue": "^3.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 86b1ecf9..e373e29b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -48,7 +48,7 @@ "cross-spawn": "^7.0.3", "dayjs": "^1.11.4", "debug": "^4.3.4", - "inquirer": "^9.1.0", + "inquirer": "^8.2.4", "js-cool": "^2.3.2", "node-apollo": "^1.2.1", "ora": "^5.4.1", @@ -59,7 +59,7 @@ "@eslint-sets/eslint-config-simple-ts": "^3.0.4", "@saqqdy/prettier-config": "^1.1.2", "@types/cross-spawn": "^6.0.2", - "@types/inquirer": "^9.0.0", + "@types/inquirer": "^8.2.2", "@types/node": "^18.6.4", "@types/shelljs": "^0.8.11", "cron-parser": "^4.6.0", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 0ae45f72..776a12eb 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -46,7 +46,7 @@ "cross-spawn": "^7.0.3", "dayjs": "^1.11.4", "debug": "^4.3.4", - "inquirer": "^9.1.0", + "inquirer": "^8.2.4", "js-cool": "^2.3.2", "node-apollo": "^1.2.1", "ora": "^5.4.1", @@ -57,7 +57,7 @@ "@eslint-sets/eslint-config-simple-ts": "^3.0.4", "@saqqdy/prettier-config": "^1.1.2", "@types/cross-spawn": "^6.0.2", - "@types/inquirer": "^9.0.0", + "@types/inquirer": "^8.2.2", "@types/node": "^18.6.4", "@types/shelljs": "^0.8.11", "cron-parser": "^4.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 727b3e55..e0ac2891 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: '@rollup/plugin-json': ^4.1.0 '@rollup/plugin-node-resolve': ^13.3.0 '@types/gulp': ^4.0.9 - '@types/inquirer': ^9.0.0 + '@types/inquirer': ^8.2.2 '@types/node': ^18.6.4 '@types/rollup-plugin-css-only': ^3.1.0 '@vitejs/plugin-vue': ^3.0.1 @@ -29,7 +29,7 @@ importers: fast-glob: ^3.2.11 gulp: ^4.0.2 gulp-typescript: 6.0.0-alpha.1 - inquirer: ^9.1.0 + inquirer: ^8.2.4 js-cool: ^2.3.2 madge: ^5.0.1 morgan: ^1.10.0 @@ -55,7 +55,7 @@ importers: vitepress: 1.0.0-alpha.4 dependencies: chalk: 4.1.2 - inquirer: 9.1.0 + inquirer: 8.2.4 js-cool: 2.3.2 morgan: 1.10.0 devDependencies: @@ -69,7 +69,7 @@ importers: '@rollup/plugin-json': 4.1.0_rollup@2.77.2 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.77.2 '@types/gulp': 4.0.9 - '@types/inquirer': 9.0.0 + '@types/inquirer': 8.2.2 '@types/node': 18.6.4 '@types/rollup-plugin-css-only': 3.1.0 '@vitejs/plugin-vue': 3.0.1 @@ -111,7 +111,7 @@ importers: '@jssj/request': ^1.0.0-alpha.8 '@saqqdy/prettier-config': ^1.1.2 '@types/cross-spawn': ^6.0.2 - '@types/inquirer': ^9.0.0 + '@types/inquirer': ^8.2.2 '@types/node': ^18.6.4 '@types/shelljs': ^0.8.11 chalk: ^4.1.2 @@ -125,7 +125,7 @@ importers: dayjs: ^1.11.4 debug: ^4.3.4 eslint: ^8.21.0 - inquirer: ^9.1.0 + inquirer: ^8.2.4 js-cool: ^2.3.2 madge: ^5.0.1 node-apollo: ^1.2.1 @@ -145,7 +145,7 @@ importers: cross-spawn: 7.0.3 dayjs: 1.11.4 debug: 4.3.4 - inquirer: 9.1.0 + inquirer: 8.2.4 js-cool: 2.3.2 node-apollo: 1.2.1 ora: 5.4.1 @@ -155,7 +155,7 @@ importers: '@eslint-sets/eslint-config-simple-ts': 3.0.4_swk2g7ygmfleszo5c33j4vooni '@saqqdy/prettier-config': 1.1.2 '@types/cross-spawn': 6.0.2 - '@types/inquirer': 9.0.0 + '@types/inquirer': 8.2.2 '@types/node': 18.6.4 '@types/shelljs': 0.8.11 cron-parser: 4.6.0 @@ -188,7 +188,7 @@ importers: '@types/node': 18.6.4 eslint: 8.21.0 markdown-it: 13.0.1 - markdown-it-anchor: 8.6.4_markdown-it@13.0.1 + markdown-it-anchor: 8.6.4_ea7kj7wzjkld5jo2noyjqxi764 markdown-it-container: 3.0.0 prettier: 2.7.1 tsnd: 1.1.0 @@ -202,7 +202,7 @@ importers: '@jssj/request': ^1.0.0-alpha.8 '@saqqdy/prettier-config': ^1.1.2 '@types/cross-spawn': ^6.0.2 - '@types/inquirer': ^9.0.0 + '@types/inquirer': ^8.2.2 '@types/node': ^18.6.4 '@types/shelljs': ^0.8.11 chalk: ^4.1.2 @@ -216,7 +216,7 @@ importers: dayjs: ^1.11.4 debug: ^4.3.4 eslint: ^8.21.0 - inquirer: ^9.1.0 + inquirer: ^8.2.4 js-cool: ^2.3.2 node-apollo: ^1.2.1 ora: ^5.4.1 @@ -236,7 +236,7 @@ importers: cross-spawn: 7.0.3 dayjs: 1.11.4 debug: 4.3.4 - inquirer: 9.1.0 + inquirer: 8.2.4 js-cool: 2.3.2 node-apollo: 1.2.1 ora: 5.4.1 @@ -246,7 +246,7 @@ importers: '@eslint-sets/eslint-config-simple-ts': 3.0.4_swk2g7ygmfleszo5c33j4vooni '@saqqdy/prettier-config': 1.1.2 '@types/cross-spawn': 6.0.2 - '@types/inquirer': 9.0.0 + '@types/inquirer': 8.2.2 '@types/node': 18.6.4 '@types/shelljs': 0.8.11 cron-parser: 4.6.0 @@ -398,11 +398,11 @@ importers: xterm-addon-web-links: 0.6.0_xterm@4.19.0 xterm-style: 1.1.0 devDependencies: - '@eslint-sets/eslint-config-vue3-ts': 3.0.4_swk2g7ygmfleszo5c33j4vooni + '@eslint-sets/eslint-config-vue3-ts': 3.0.4_bzynruo77vejb75mdxk6oj2lfm '@originjs/vite-plugin-commonjs': 1.0.3 '@saqqdy/prettier-config': 1.1.2 '@types/qs': 6.9.7 - '@vitejs/plugin-legacy': 2.0.0_vite@3.0.4 + '@vitejs/plugin-legacy': 2.0.0_terser@5.14.2+vite@3.0.4 '@vitejs/plugin-vue': 3.0.1_vite@3.0.4+vue@3.2.37 '@vitejs/plugin-vue-jsx': 2.0.0_vite@3.0.4+vue@3.2.37 '@vue/compiler-sfc': 3.2.37 @@ -419,7 +419,7 @@ importers: unplugin-auto-import: 0.11.1_25lmdjqd6sh2wqsrigufd6bkkm unplugin-element-plus: 0.4.1_vite@3.0.4 unplugin-vue-components: 0.22.0_vite@3.0.4+vue@3.2.37 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 vite-tsconfig-paths: 3.5.0_vite@3.0.4 vue-tsc: 0.39.5_typescript@4.7.4 webpack-bundle-analyzer: 4.5.0 @@ -601,6 +601,23 @@ packages: semver: 6.3.0 dev: true + /@babel/eslint-parser/7.18.9_xqt7ek4fk233nrovqiamjvck4u: + resolution: {integrity: sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==} + engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} + peerDependencies: + '@babel/core': '>=7.11.0' + eslint: ^7.5.0 || ^8.0.0 || >= 8.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true + dependencies: + '@babel/core': 7.18.10 + eslint: 8.21.0 + eslint-scope: 5.1.1 + eslint-visitor-keys: 2.1.0 + semver: 6.3.0 + dev: true + /@babel/generator/7.18.12: resolution: {integrity: sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==} engines: {node: '>=6.9.0'} @@ -1003,6 +1020,37 @@ packages: - supports-color dev: true + /@eslint-sets/eslint-config-basic/3.0.4_uwbelubjc6ym76d7f22qhvlbtq: + resolution: {integrity: sha512-oTqD5XpUIqqUQxzlsWhe7FHAuiHaqNDwmaudq3cOdc1R/oHMgT0a9X/djnJVO4YmJcAZx/WSFM/881bB7thKdw==} + peerDependencies: + eslint: '>=8.0.0 || >= 8.0.0' + prettier: '>=2.4.0' + dependencies: + '@babel/eslint-parser': 7.18.9_xqt7ek4fk233nrovqiamjvck4u + eslint: 8.21.0 + eslint-config-prettier: 8.5.0_eslint@8.21.0 + eslint-plugin-eslint-comments: 3.2.0_eslint@8.21.0 + eslint-plugin-html: 7.1.0 + eslint-plugin-import: 2.26.0_wuikv5nqgdfyng42xxm7lklfmi + eslint-plugin-jsonc: 2.3.1_eslint@8.21.0 + eslint-plugin-markdown: 3.0.0_eslint@8.21.0 + eslint-plugin-n: 15.2.4_eslint@8.21.0 + eslint-plugin-prettier: 4.2.1_h62lvancfh4b7r6zn2dgodrh5e + eslint-plugin-promise: 5.2.0_eslint@8.21.0 + eslint-plugin-tsdoc: 0.2.16 + eslint-plugin-unicorn: 43.0.2_eslint@8.21.0 + eslint-plugin-yml: 1.1.0_eslint@8.21.0 + jsonc-eslint-parser: 2.1.0 + prettier: 2.7.1 + yaml-eslint-parser: 1.1.0 + transitivePeerDependencies: + - '@babel/core' + - '@typescript-eslint/parser' + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + /@eslint-sets/eslint-config-simple-ts/3.0.4_swk2g7ygmfleszo5c33j4vooni: resolution: {integrity: sha512-pYv6KqtWd7vBA9h/UKEC6+7SyilHhyWYUKK5WUFNO+DOI9yUXaKhiBjJZZqOhzNMSSP85hYqrsJ7ZSHbOIISKA==} peerDependencies: @@ -1025,6 +1073,29 @@ packages: - typescript dev: true + /@eslint-sets/eslint-config-ts/3.0.4_bzynruo77vejb75mdxk6oj2lfm: + resolution: {integrity: sha512-vyWu6UxP6HGnC4SntXnyVpgzBqBHBR+X/Dm6TVaMjvR7xI+Cl21EFxqVNQzvykRTqsTd9Wb6AplfBbieGp/Zqg==} + peerDependencies: + eslint: '>=8.0.0 || >= 8.0.0' + prettier: '>=2.4.0' + typescript: ^4.7.4 + dependencies: + '@eslint-sets/eslint-config-basic': 3.0.4_uwbelubjc6ym76d7f22qhvlbtq + '@typescript-eslint/eslint-plugin': 5.32.0_iosr3hrei2tubxveewluhu5lhy + '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + eslint: 8.21.0 + eslint-config-prettier: 8.5.0_eslint@8.21.0 + eslint-plugin-prettier: 4.2.1_h62lvancfh4b7r6zn2dgodrh5e + eslint-plugin-tsdoc: 0.2.16 + prettier: 2.7.1 + typescript: 4.7.4 + transitivePeerDependencies: + - '@babel/core' + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + /@eslint-sets/eslint-config-ts/3.0.4_swk2g7ygmfleszo5c33j4vooni: resolution: {integrity: sha512-vyWu6UxP6HGnC4SntXnyVpgzBqBHBR+X/Dm6TVaMjvR7xI+Cl21EFxqVNQzvykRTqsTd9Wb6AplfBbieGp/Zqg==} peerDependencies: @@ -1048,6 +1119,33 @@ packages: - supports-color dev: true + /@eslint-sets/eslint-config-vue3-ts/3.0.4_bzynruo77vejb75mdxk6oj2lfm: + resolution: {integrity: sha512-XKj3zeCPEi/pEqHOBY8g8g+LExr9g0qoVJ6bA5mp1WRmURqyHvKUySFoXdyJ5LPL+iJGP3ReP1alJ4MZaNvBig==} + peerDependencies: + eslint: '>=8.0.0 || >= 8.0.0' + prettier: '>=2.4.0' + typescript: ^4.7.4 + dependencies: + '@eslint-sets/eslint-config-ts': 3.0.4_bzynruo77vejb75mdxk6oj2lfm + '@typescript-eslint/eslint-plugin': 5.32.0_iosr3hrei2tubxveewluhu5lhy + '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + eslint: 8.21.0 + eslint-config-prettier: 8.5.0_eslint@8.21.0 + eslint-plugin-prettier: 4.2.1_h62lvancfh4b7r6zn2dgodrh5e + eslint-plugin-tsdoc: 0.2.16 + eslint-plugin-vitest-globals: 1.1.0 + eslint-plugin-vue: 8.7.1_eslint@8.21.0 + eslint-plugin-vue-scoped-css: 2.2.0_5fc34xvtpdmnlwo4jsxban7ul4 + prettier: 2.7.1 + typescript: 4.7.4 + vue-eslint-parser: 8.3.0_eslint@8.21.0 + transitivePeerDependencies: + - '@babel/core' + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + /@eslint-sets/eslint-config-vue3-ts/3.0.4_swk2g7ygmfleszo5c33j4vooni: resolution: {integrity: sha512-XKj3zeCPEi/pEqHOBY8g8g+LExr9g0qoVJ6bA5mp1WRmURqyHvKUySFoXdyJ5LPL+iJGP3ReP1alJ4MZaNvBig==} peerDependencies: @@ -1822,11 +1920,10 @@ packages: resolution: {integrity: sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==} dev: true - /@types/inquirer/9.0.0: - resolution: {integrity: sha512-4sncHTq3AWbLWZOs83DQlrKxhdehs2AW79Dp1amoGGc6B+oJal7fQJa/EO1Taa5CQLSywEMAgw2SFB1fZIX3PQ==} + /@types/inquirer/8.2.2: + resolution: {integrity: sha512-HXoFOl+KS4yvmUjisi83VpuSBOeeXIzdJfoT/v2pUruqybpHy0Dz1DyXy3E2jNH0cSVKJZV92VOnFBwJR6k83A==} dependencies: '@types/through': 0.0.30 - rxjs: 7.5.6 dev: true /@types/json-schema/7.0.11: @@ -1837,6 +1934,10 @@ packages: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: true + /@types/linkify-it/3.0.2: + resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} + dev: true + /@types/lodash-es/4.17.6: resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==} dependencies: @@ -1851,12 +1952,23 @@ packages: resolution: {integrity: sha512-fgpeaLsG6a6WkIDe1a0cPEfpJ+Z9LJOG5wukTtUY4kIqqJ8F76zIvUGmkQeIRmPbx5mIyIxFPUabWs1dh50B/A==} dev: true + /@types/markdown-it/12.2.3: + resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==} + dependencies: + '@types/linkify-it': 3.0.2 + '@types/mdurl': 1.0.2 + dev: true + /@types/mdast/3.0.10: resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==} dependencies: '@types/unist': 2.0.6 dev: true + /@types/mdurl/1.0.2: + resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==} + dev: true + /@types/mime/3.0.1: resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==} dev: true @@ -2128,7 +2240,7 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@vitejs/plugin-legacy/2.0.0_vite@3.0.4: + /@vitejs/plugin-legacy/2.0.0_terser@5.14.2+vite@3.0.4: resolution: {integrity: sha512-cuc45C4BQo2VlOsHZML4fc3MPfSjOEFeezHxr+WWlOOmi+muy1rz2snnFiePtyjVc1CYGTsnxk13cXpzQvMZaw==} engines: {node: '>=14.18.0'} peerDependencies: @@ -2143,7 +2255,8 @@ packages: magic-string: 0.26.2 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 3.0.4_less@4.1.3 + terser: 5.14.2 + vite: 3.0.4_less@4.1.3+terser@5.14.2 dev: true /@vitejs/plugin-vue-jsx/2.0.0: @@ -2182,7 +2295,7 @@ packages: '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.10 '@babel/plugin-transform-typescript': 7.18.12_@babel+core@7.18.10 '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.18.10 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 vue: 3.2.37 transitivePeerDependencies: - supports-color @@ -2229,7 +2342,7 @@ packages: vue: optional: true dependencies: - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 vue: 3.2.37 dev: true @@ -2559,14 +2672,6 @@ packages: engines: {node: '>=8'} dependencies: type-fest: 0.21.3 - dev: true - - /ansi-escapes/5.0.0: - resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==} - engines: {node: '>=12'} - dependencies: - type-fest: 1.4.0 - dev: false /ansi-gray/0.1.1: resolution: {integrity: sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==} @@ -2592,6 +2697,7 @@ packages: /ansi-regex/6.0.1: resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} engines: {node: '>=12'} + dev: true /ansi-split/1.0.1: resolution: {integrity: sha512-RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg==} @@ -2614,6 +2720,7 @@ packages: /ansi-styles/6.1.0: resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==} engines: {node: '>=12'} + dev: true /ansi-wrap/0.1.0: resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==} @@ -2974,14 +3081,6 @@ packages: inherits: 2.0.4 readable-stream: 3.6.0 - /bl/5.0.0: - resolution: {integrity: sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==} - dependencies: - buffer: 6.0.3 - inherits: 2.0.4 - readable-stream: 3.6.0 - dev: false - /body-parser/1.20.0: resolution: {integrity: sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -3100,13 +3199,6 @@ packages: base64-js: 1.5.1 ieee754: 1.2.1 - /buffer/6.0.3: - resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - dev: false - /builtin-modules/3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} @@ -3226,11 +3318,6 @@ packages: ansi-styles: 4.3.0 supports-color: 7.2.0 - /chalk/5.0.1: - resolution: {integrity: sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==} - engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - dev: false - /char-regex/1.0.2: resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} @@ -3337,13 +3424,6 @@ packages: dependencies: restore-cursor: 3.1.0 - /cli-cursor/4.0.0: - resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - restore-cursor: 4.0.0 - dev: false - /cli-spinners/2.7.0: resolution: {integrity: sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==} engines: {node: '>=6'} @@ -3364,9 +3444,9 @@ packages: string-width: 5.1.2 dev: true - /cli-width/4.0.0: - resolution: {integrity: sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==} - engines: {node: '>= 12'} + /cli-width/3.0.0: + resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==} + engines: {node: '>= 10'} dev: false /cliui/3.2.0: @@ -4125,6 +4205,7 @@ packages: /eastasianwidth/0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: true /ecc-jsbn/0.1.2: resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==} @@ -4171,10 +4252,10 @@ packages: /emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - dev: true /emoji-regex/9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: true /encodeurl/1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -4606,6 +4687,7 @@ packages: /escape-string-regexp/5.0.0: resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} engines: {node: '>=12'} + dev: true /escodegen/1.14.3: resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==} @@ -5245,12 +5327,11 @@ packages: web-streams-polyfill: 3.2.1 dev: true - /figures/4.0.1: - resolution: {integrity: sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==} - engines: {node: '>=12'} + /figures/3.2.0: + resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} + engines: {node: '>=8'} dependencies: - escape-string-regexp: 5.0.0 - is-unicode-supported: 1.2.0 + escape-string-regexp: 1.0.5 dev: false /file-entry-cache/6.0.1: @@ -6182,25 +6263,25 @@ packages: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} dev: true - /inquirer/9.1.0: - resolution: {integrity: sha512-eukdjrBljg9t55ZnvJjvGi1OyYEzVBFsO/8o5d2MV3mc28u3x4X2kS4eJ/+9U10KiREfPkEBSeCrU/S2G/uRtw==} + /inquirer/8.2.4: + resolution: {integrity: sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==} engines: {node: '>=12.0.0'} dependencies: - ansi-escapes: 5.0.0 - chalk: 5.0.1 - cli-cursor: 4.0.0 - cli-width: 4.0.0 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + cli-cursor: 3.1.0 + cli-width: 3.0.0 external-editor: 3.1.0 - figures: 4.0.1 + figures: 3.2.0 lodash: 4.17.21 mute-stream: 0.0.8 - ora: 6.1.2 + ora: 5.4.1 run-async: 2.4.1 rxjs: 7.5.6 - string-width: 5.1.2 - strip-ansi: 7.0.1 + string-width: 4.2.3 + strip-ansi: 6.0.1 through: 2.3.8 - wrap-ansi: 8.0.1 + wrap-ansi: 7.0.0 dev: false /internal-slot/1.0.3: @@ -6392,7 +6473,6 @@ packages: /is-fullwidth-code-point/3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - dev: true /is-fullwidth-code-point/4.0.0: resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} @@ -6420,11 +6500,6 @@ packages: resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} engines: {node: '>=8'} - /is-interactive/2.0.0: - resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==} - engines: {node: '>=12'} - dev: false - /is-lambda/1.0.1: resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} dev: true @@ -6579,11 +6654,6 @@ packages: resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} engines: {node: '>=10'} - /is-unicode-supported/1.2.0: - resolution: {integrity: sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==} - engines: {node: '>=12'} - dev: false - /is-url-superb/4.0.0: resolution: {integrity: sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==} engines: {node: '>=10'} @@ -7052,14 +7122,6 @@ packages: chalk: 4.1.2 is-unicode-supported: 0.1.0 - /log-symbols/5.1.0: - resolution: {integrity: sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==} - engines: {node: '>=12'} - dependencies: - chalk: 5.0.1 - is-unicode-supported: 1.2.0 - dev: false - /log-update/4.0.0: resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==} engines: {node: '>=10'} @@ -7229,12 +7291,13 @@ packages: object-visit: 1.0.1 dev: true - /markdown-it-anchor/8.6.4_markdown-it@13.0.1: + /markdown-it-anchor/8.6.4_ea7kj7wzjkld5jo2noyjqxi764: resolution: {integrity: sha512-Ul4YVYZNxMJYALpKtu+ZRdrryYt/GlQ5CK+4l1bp/gWXOG2QWElt6AqF3Mih/wfUKdZbNAZVXGR73/n6U/8img==} peerDependencies: '@types/markdown-it': '*' markdown-it: '*' dependencies: + '@types/markdown-it': 12.2.3 markdown-it: 13.0.1 dev: true @@ -8076,21 +8139,6 @@ packages: strip-ansi: 6.0.1 wcwidth: 1.0.1 - /ora/6.1.2: - resolution: {integrity: sha512-EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - bl: 5.0.0 - chalk: 5.0.1 - cli-cursor: 4.0.0 - cli-spinners: 2.7.0 - is-interactive: 2.0.0 - is-unicode-supported: 1.2.0 - log-symbols: 5.1.0 - strip-ansi: 7.0.1 - wcwidth: 1.0.1 - dev: false - /ordered-read-streams/1.0.1: resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==} dependencies: @@ -9120,14 +9168,6 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 - /restore-cursor/4.0.0: - resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - onetime: 5.1.2 - signal-exit: 3.0.7 - dev: false - /ret/0.1.15: resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==} engines: {node: '>=0.12'} @@ -9844,7 +9884,6 @@ packages: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - dev: true /string-width/5.1.2: resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} @@ -9853,6 +9892,7 @@ packages: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 strip-ansi: 7.0.1 + dev: true /string.prototype.padend/3.1.3: resolution: {integrity: sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==} @@ -9921,6 +9961,7 @@ packages: engines: {node: '>=12'} dependencies: ansi-regex: 6.0.1 + dev: true /strip-bom/2.0.0: resolution: {integrity: sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==} @@ -10338,7 +10379,6 @@ packages: /type-fest/0.21.3: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} - dev: true /type-fest/0.6.0: resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} @@ -10350,11 +10390,6 @@ packages: engines: {node: '>=8'} dev: true - /type-fest/1.4.0: - resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==} - engines: {node: '>=10'} - dev: false - /type-is/1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -10653,7 +10688,7 @@ packages: dependencies: acorn: 8.8.0 chokidar: 3.5.3 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 dev: true @@ -10702,7 +10737,7 @@ packages: dependencies: acorn: 8.8.0 chokidar: 3.5.3 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 dev: true @@ -10726,7 +10761,7 @@ packages: dependencies: acorn: 8.8.0 chokidar: 3.5.3 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 dev: true @@ -10943,7 +10978,7 @@ packages: globrex: 0.1.2 recrawl-sync: 2.2.2 tsconfig-paths: 4.1.0 - vite: 3.0.4_less@4.1.3 + vite: 3.0.4_less@4.1.3+terser@5.14.2 transitivePeerDependencies: - supports-color dev: true @@ -10972,7 +11007,7 @@ packages: fsevents: 2.3.2 dev: true - /vite/3.0.4_less@4.1.3: + /vite/3.0.4_less@4.1.3+terser@5.14.2: resolution: {integrity: sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -10996,6 +11031,7 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.2 + terser: 5.14.2 optionalDependencies: fsevents: 2.3.2 dev: true @@ -11253,16 +11289,6 @@ packages: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - dev: true - - /wrap-ansi/8.0.1: - resolution: {integrity: sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==} - engines: {node: '>=12'} - dependencies: - ansi-styles: 6.1.0 - string-width: 5.1.2 - strip-ansi: 7.0.1 - dev: false /wrappy/1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} From 068d796b0c652faae35ac87ae7d2a612c9aecb0f Mon Sep 17 00:00:00 2001 From: saqqdy Date: Wed, 10 Aug 2022 10:59:51 +0800 Subject: [PATCH 7/7] workflow --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 289ec3a9..f9d1f6a9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,10 @@ name: Npm publish on: - # release: - # types: [created] - push: - branches: [dev] + release: + types: [created] + # push: + # branches: [master] jobs: publish-gpr: