From b6e6f8d04cd2ac9fa7db021d8d2140d3802c909e Mon Sep 17 00:00:00 2001 From: saqqdy Date: Thu, 11 Aug 2022 19:53:12 +0800 Subject: [PATCH 1/2] release 3.3.1 --- packages/docs/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/docs/changelog.md b/packages/docs/changelog.md index b9a621a0..c6841df4 100644 --- a/packages/docs/changelog.md +++ b/packages/docs/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 2022.08.11 v3.3.1 更新日志 + +1. 修复`admin`指令合并判断不准确的问题 + ## 2022.08.09 v3.3.0 更新日志 1. `combine` `update` `admin`指令增加合并判断，不需要合并时不再合并 From 7b12a5734d3d7d160bb7d87f895f621d24b80cad Mon Sep 17 00:00:00 2001 From: saqqdy Date: Fri, 12 Aug 2022 14:01:03 +0800 Subject: [PATCH 2/2] release 3.3.2 --- CHANGELOG.md | 4 ++++ build/gulpfile.ts | 18 ++++++++++++------ build/tasks/buildLib.ts | 4 ++-- 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 +- 9 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6841df4..9aecc2b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 更新日志 +## 2022.08.12 v3.3.2 更新日志 + +1. 修复构建流程导致 gitm-ui 无法运行的问题 + ## 2022.08.11 v3.3.1 更新日志 1. 修复`admin`指令合并判断不准确的问题 diff --git a/build/gulpfile.ts b/build/gulpfile.ts index 088e90dc..098941c4 100644 --- a/build/gulpfile.ts +++ b/build/gulpfile.ts @@ -2,9 +2,9 @@ import { join } from 'path' import { parallel, series } from 'gulp' import { wrapDisplayName } from './utils/gulp' import { runExecSync } from './utils/exec' -import { buildLib } from './tasks/buildLib' +import { buildLib, copyLibFile, madgeLib } from './tasks/buildLib' import { buildApp } from './tasks/buildApp' -import { buildDocs, copyMdFile, deployDocs } from './tasks/buildDocs' +import { buildDocs, copyMdFile } from './tasks/buildDocs' import { packages } from './packages' export async function clean() { @@ -23,8 +23,14 @@ export { default as app } from './tasks/buildApp' export { default as docs } from './tasks/buildDocs' export default series( wrapDisplayName('clean:dist,es,lib', clean), - parallel(copyMdFile), - parallel(buildLib), - parallel(buildApp, buildDocs) - // parallel(deployDocs) + parallel( + wrapDisplayName('copy:md', copyMdFile), + wrapDisplayName('copy-lib:json,sh', copyLibFile) + ), + parallel( + wrapDisplayName('build:lib', buildLib), + wrapDisplayName('build:app', buildApp), + wrapDisplayName('build:docs', buildDocs) + ), + parallel(wrapDisplayName('madge:lib', madgeLib)) ) diff --git a/build/tasks/buildLib.ts b/build/tasks/buildLib.ts index 34f4268d..1cf4d53e 100644 --- a/build/tasks/buildLib.ts +++ b/build/tasks/buildLib.ts @@ -222,7 +222,7 @@ export async function madgeLib() { } } -export async function copyFile() { +export async function copyLibFile() { for (const { name } of pkgs) { await runExec( `rsync -av --exclude="*.ts" ${resolve( @@ -249,5 +249,5 @@ export default series( // wrapDisplayName('gen:version', genVersion), parallel(wrapDisplayName('build:lib', buildLib)), parallel(wrapDisplayName('madge:lib', madgeLib)), - parallel(wrapDisplayName('copy:json,sh', copyFile)) + parallel(wrapDisplayName('copy:json,sh', copyLibFile)) ) diff --git a/package.json b/package.json index 9481b678..40d5c51a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "3.3.1", + "version": "3.3.2", "packageManager": "pnpm@7.7.0", "main": "index.js", "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index fa694860..a79dba0f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "3.3.1", + "version": "3.3.2", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", diff --git a/packages/docs/package.json b/packages/docs/package.json index ebbc463f..226bea8b 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "3.3.1", + "version": "3.3.2", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 2dba50b0..842f533c 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "3.3.1", + "version": "3.3.2", "private": false, "bin": { "gitm": "lib/gitm.js" diff --git a/packages/server/package.json b/packages/server/package.json index fca95110..54f5b0b0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "3.3.1", + "version": "3.3.2", "private": false, "bin": { "gitm-server": "./lib/www.js" diff --git a/packages/ui/package.json b/packages/ui/package.json index c50ed5cf..a46a42f8 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "3.3.1", + "version": "3.3.2", "private": false, "bin": { "gitm-ui": "./index.js"