cloudcc-cli 0.9.3 → 0.9.4

package/README.md

@@ -1,3 +1,17 @@
+# ReleaseV0.9.5
+#### 发布日期：2022-2-10
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * 飞书通知增加分支标识
+
+# ReleaseV0.9.4
+#### 发布日期：2021-12-10
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * 自动更新版本指定版本号
+
 # ReleaseV0.9.3
 #### 发布日期：2021-12-10
 #### 发布范围：全量

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/builderPlugin.js

@@ -88,26 +88,21 @@ class Builder {
     getVueValue(buildFileName) {
         let vueContent = fs.readFileSync(this.getVueContent(buildFileName), 'utf8');
 
-        let vueData = vueContent + ""
+        // 获取componentInfo
+        let reg = /componentInfo([\s\S]*?)\}/;
+        let componentInfo = vueContent.match(reg)[1].split("{")[1];
+        componentInfo = eval(`(${"function getInfo() { return {" + componentInfo + " } }"})`)()
+        // 组件名字
+        let compName = componentInfo.component
+        // 组件类型
+        let bizType = componentInfo.bizType
+        // 组件描述
+        let compDesc = componentInfo.compDesc
+        // 组件状态
+        let category = componentInfo.category
 
-        // 去除空格
-        // vueData = vueData.replace(/\ +/g, "")
-        // 去除换行
-        // vueData =vueData.replace(/[\r\n]/g, "");
-
-        vueData = vueData.split("data()")[1].split("isLock:")[0] + "isLock:false,};}";
-
-        vueData = "function data()" + vueData;
-
-        const data = eval(`(${vueData})`)()
-
-        let compName = data.componentInfo.component // 组件名字
-
-        vueData = JSON.stringify(data);
-
-        let bizType = data.componentInfo.bizType // 组件类型
-        let compDesc = data.componentInfo.compDesc // 组件描述
-        let category = data.componentInfo.category // 组件状态
+        // 获取vueDate内容
+        let vueData = vueContent.split("data()")[1].split("return")[1].split("isLock:")[0] + "isLock:false,}";
 
         return { compName, vueContent, vueData, bizType, compDesc, category }
     };

package/utils/checkVersion.js

@@ -19,10 +19,10 @@ function checkNpmVersion() {
         console.log(chalk.green("当前版本：v" + config.version));
         console.log(chalk.green("最新版本：v" + onlineVersion));
         console.log();
-        console.log(chalk.yellow("如无法自动更新，请使用命令更新：npm install -g cloudcc-cli --registry https://registry.npmjs.org"));
-        return true;
+        console.log(chalk.yellow(`如无法自动更新，请使用命令更新：npm install -g cloudcc-cli@${onlineVersion} --registry https://registry.npmjs.org`));
+        return onlineVersion;
     }
-    return false;
+    return null;
 }
 
 /**
@@ -45,10 +45,10 @@ function askUpdate() {
 /**
  * 升级cli
  */
-function update() {
+function update(onlineVersion) {
     console.log()
     console.log(chalk.green("升级中，请稍后..."));
-    exec(`npm install -g cloudcc-cli --registry https://registry.npmjs.org`)
+    exec(`npm install -g cloudcc-cli@${onlineVersion} --registry https://registry.npmjs.org`)
     console.log()
     console.log(chalk.green("升级完成！请重新运行"));
 }
@@ -57,10 +57,11 @@ function update() {
  * 检查更新
  */
 async function checkUpdate() {
-    if (checkNpmVersion()) {
+    let onlineVersion = checkNpmVersion();
+    if (onlineVersion) {
         let res = await askUpdate()
         if ("Yes" == res.update) {
-            update()
+            update(onlineVersion)
             return true;
         } else {
             return false

package/utils/notifyIM.js

@@ -21,7 +21,7 @@ module.exports = {
                     },
                     "elements": [{
                         "tag": "markdown",
-                        "content": "项目名称：" + projectConfig.name + "\nTag：" + type + "\n版本号：" + version + "\n发布者：" + exec("git config user.name").toString("utf8").trim()
+                        "content": "项目名称：" + projectConfig.name + "\n分支：" + exec("git rev-parse --abbrev-ref HEAD").toString("utf8").trim() + "\nTag：" + type + "\n版本号：" + version + "\n发布者：" + exec("git config user.name").toString("utf8").trim()
                     }, {
                         "actions": [{
                             "tag": "button",

package/utils/pushCode.js

@@ -22,14 +22,18 @@ function getNewVersionName(types) {
                 return item.includes("-V");
             })
             console.log("version 1", version);
-            // 取版本号
-            version = version.split("-V")[1]
-            console.log("version 2", version);
-            // 改变版本号
-            version = changeVersion.change(version, item)
-            console.log("version 3", version);
-            // 生成最后的版本号
-            item = item + "-V" + version
+            if (version) {
+                // 取版本号
+                version = version.split("-V")[1]
+                console.log("version 2", version);
+                // 改变版本号
+                version = changeVersion.change(version, item)
+                console.log("version 3", version);
+                // 生成最后的版本号
+                item = item + "-V" + version
+            } else {
+                item = item + "-V0.0.1"
+            }
         } else {
             item = item + "-V0.0.1"
         }