@taole/deploy-helper 0.7.4-beta.4 → 0.7.4-beta.6

package/lib/tagRelease.mjs

@@ -12,16 +12,34 @@ async function getTag(workDir, mode) {
   );
   const prefix = getTagNamePrefix(packageJson, mode);
   const git = simpleGit(workDir);
-  const tags = await git.tags();
+  let tags = await git.tags(["-n", "--sort=-creatordate"]); // 按照创建时间排序，最新的在前
   // console.log(`tags: ${JSON.stringify(tags)}`);
-  let tagList = tags.all.filter((tag) => tag.startsWith(prefix)).slice(0, 15);
+  tags = tags.all
+    .filter((tag) => tag.startsWith(prefix))
+    .slice(0, 15) // 最多显示15个tag
+    .map((tag) => {
+      // tag是一个字符串， 从左到右找到第一个空格， 这个空格以前的内容就是tag的名称， 以后的如有， 取出来当作commit信息，并考虑tag无空格的情况
+      const spaceIndex = tag.indexOf(" ");
+      let commitInfo = "";
+      let tagName = tag;
+      if (spaceIndex !== -1) {
+        commitInfo = (tag.slice(spaceIndex + 1) || "").trim();
+        tagName = tag.slice(0, spaceIndex);
+      }
+      return {
+        name: tagName,
+        commitInfo: commitInfo,
+        rawTag: tag,
+      };
+    });
+  // console.log(`formated tags: ${JSON.stringify(tags)}`);
   let tag = null;
-  if (tagList.length > 0) {
+  if (tags.length > 0) {
     const propmtConfig = {
       message: "请选择要回滚的tag版本: ",
-      choices: tagList.map((item) => ({
-        name: item,
-        value: item,
+      choices: tags.map((item) => ({
+        name: item.rawTag,
+        value: item.name,
       })),
     };
     try {
@@ -44,19 +62,25 @@ function getTagNamePrefix(packageJson, mode) {
 
 function getTagName(packageJson, commitId, mode) {
   const prefix = getTagNamePrefix(packageJson, mode);
+  let tagName = prefix;
   const date = new Date();
   const timeStr =
+    date.getFullYear() +
+    "-" +
     date.getMonth() +
     1 +
-    "_" +
+    "-" +
     date.getDate() +
-    "_" +
+    "-" +
     date.getHours() +
-    "_" +
+    "-" +
     date.getMinutes() +
-    "_" +
+    "-" +
     date.getSeconds();
-  return `${prefix}@${packageJson.version}_${commitId.slice(0, 8)}_${timeStr}`;
+  // tagName += `@${packageJson.version}`;
+  tagName += `_${commitId.slice(0, 8)}`;
+  tagName += `_${timeStr}`;
+  return tagName;
 }
 
 /**
@@ -164,6 +188,10 @@ async function createRelease(workDir, config, mode) {
 
   const git = simpleGit(workDir);
   const commitId = await git.revparse("HEAD");
+  const commitMessage = (
+    await git.raw(["log", "-1", "--format=%s", commitId])
+  ).trim();
+
   log(`commitId: ${commitId}`);
 
   const cleanfunc = async () => {
@@ -183,7 +211,7 @@ async function createRelease(workDir, config, mode) {
     Object.keys(entryFiles).forEach((key) => {
       const file = key;
       const htmlFilePath = path.join(workDir, file);
-      log(`htmlFilePath: ${htmlFilePath}`);
+      // log(`htmlFilePath: ${htmlFilePath}`);
       if (fs.existsSync(htmlFilePath)) {
         const destFile = `_${file}`;
         fs.cpSync(htmlFilePath, path.join(releaseDir, destFile), {
@@ -198,7 +226,8 @@ async function createRelease(workDir, config, mode) {
     );
 
     await git.add(releaseDir);
-    await git.commit("-#DH-2 整理构建产物");
+    // await git.commit("-#DH-2 --> ${commitMessage}");
+    await git.commit(commitMessage || `-#DH-2 ${commitId.slice(0, 8)}`);
     // log(`commitResult: ${JSON.stringify(commitResult)}`);
 
     const packageJson = JSON.parse(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.7.4-beta.4",
+  "version": "0.7.4-beta.6",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",