Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 2022.08.12 v3.3.2 更新日志
+
+1. 修复构建流程导致 gitm-ui 无法运行的问题
+
 ## 2022.08.11 v3.3.1 更新日志
 
 1. 修复`admin`指令合并判断不准确的问题

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))
 )

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))
 )

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/monorepo",
     "description": "这是一个git工作流工具",
-    "version": "3.3.1",
+    "version": "3.3.2",
     "packageManager": "[email protected]",
     "main": "index.js",
     "files": [

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",

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`指令增加合并判断，不需要合并时不再合并

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",

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"

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"

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"