fix(notify): bug

Airkro · Dec 15, 2023 · 463cf7a · 463cf7a
1 parent ae76298
commit 463cf7a
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Common command line interface of 'bring-it'",
   "license": "MIT",
   "author": {

diff --git a/packages/notify/lib/action.mjs b/packages/notify/lib/action.mjs
@@ -27,11 +27,11 @@ export async function action({ mode }) {
 
     dingtalk({
       markdown: createContent(all),
-      title: all.project || 'bring-it',
+      title: all.project || '版本发布通知',
       token: DingTalkRobotToken,
     })
       .then((resp) => {
-        logger.okay(resp.status);
+        logger.okay(resp);
       })
       .catch((error) => {
         console.error(error);

diff --git a/packages/notify/lib/utils.mjs b/packages/notify/lib/utils.mjs
@@ -1,9 +1,8 @@
 import { toMarkdown } from 'mdast-util-to-markdown';
+import semverPrerelease from 'semver/functions/prerelease.js';
 
 import { http } from '@bring-it/utils/index.mjs';
 
-const unknown = '未知';
-
 const {
   BRANCH_NAME,
   CCI_JOB_NAME,
@@ -13,7 +12,7 @@ const {
   GIT_COMMIT,
   GIT_HTTP_URL,
   JOB_ID,
-  npm_package_version,
+  npm_package_version = '未知',
   PROJECT_NAME,
   PROJECT_WEB_URL,
 } = process.env;
@@ -38,22 +37,41 @@ export function dingtalk({ markdown, title, token }) {
   });
 }
 
-export function createContent({ project = '未命名项目', type, manual = true }) {
+function isTest() {
+  return BRANCH_NAME !== 'master' || semverPrerelease(npm_package_version);
+}
+
+export function createContent({
+  project = '未命名项目',
+  type,
+  manual = true,
+  banner,
+  isLatest = false,
+}) {
   return toMarkdown({
     type: 'root',
     children: [
-      CCI_JOB_NAME
+      banner
         ? {
-            type: 'heading',
-            depth: 3,
+            type: 'paragraph',
             children: [
               {
-                type: 'text',
-                value: CCI_JOB_NAME,
+                type: 'image',
+                url: banner,
               },
             ],
           }
         : undefined,
+      {
+        type: 'heading',
+        depth: 3,
+        children: [
+          {
+            type: 'text',
+            value: CCI_JOB_NAME || '自动化任务',
+          },
+        ],
+      },
       {
         type: 'paragraph',
         children: [
@@ -115,7 +133,11 @@ export function createContent({ project = '未命名项目', type, manual = true
                 children: [
                   {
                     type: 'text',
-                    value: `版本编号：${npm_package_version || unknown}`,
+                    value: `版本编号：${
+                      isLatest
+                        ? ['latest', npm_package_version].join(' / ')
+                        : npm_package_version
+                    }`,
                   },
                 ],
               },
@@ -135,7 +157,7 @@ export function createContent({ project = '未命名项目', type, manual = true
             children: [
               {
                 type: 'text',
-                value: BRANCH_NAME === 'master' ? '外部正式' : '内部测试',
+                value: isTest() ? '内部测试' : '外部正式',
               },
             ],
           },

diff --git a/packages/notify/package.json b/packages/notify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/notify",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Send releases notifications",
   "license": "MIT",
   "author": {
@@ -36,7 +36,8 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "mdast-util-to-markdown": "^2.1.0"
+    "mdast-util-to-markdown": "^2.1.0",
+    "semver": "^7.5.4"
   },
   "peerDependencies": {
     "@bring-it/cli": "^0.8.0"

diff --git a/packages/npm/package.json b/packages/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/npm",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Publish npm packages when needed",
   "license": "MIT",
   "author": {

diff --git a/packages/sample/package.json b/packages/sample/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sample",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Generate code sample files",
   "license": "MIT",
   "author": {

diff --git a/packages/sentry/package.json b/packages/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sentry",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Update sentry artifacts",
   "license": "MIT",
   "author": {

diff --git a/packages/sftp/package.json b/packages/sftp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sftp",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "SFTP deployment tool for frontend",
   "license": "MIT",
   "author": {

diff --git a/packages/utils/index.mjs b/packages/utils/index.mjs
@@ -87,5 +87,5 @@ export function http({ url, query, json, method = 'GET' }) {
       'Content-Type': 'application/json',
     },
     body: JSON.stringify(json),
-  });
+  }).then((response) => response.json());
 }