cloudcc-cli 0.6.4 → 0.6.8

package/README.md

@@ -1,3 +1,32 @@
+# ReleaseV0.6.8
+#### 发布日期：2021-11-5
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 优化npm触发更新逻辑
+
+# ReleaseV0.6.7
+#### 发布日期：2021-11-4
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 优化更新逻辑判断
+
+# ReleaseV0.6.6
+#### 发布日期：2021-11-4
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 优化检查更新逻辑
+
+# ReleaseV0.6.5
+#### 发布日期：2021-11-4
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 优化提示信息
+    * 将version放入dist文件夹
+
 # ReleaseV0.6.4
 #### 发布日期：2021-11-3
 #### 发布范围：全量

package/package.json

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

package/src/builderBaseSDK.js

@@ -14,6 +14,8 @@ const { askType } = require("../utils/askTool")
 const { pushCodeAndTags } = require("../utils/pushCode")
 // 通知飞书
 const { notifyFeishu } = require("../utils/NotifyIM")
+// 网络请求
+const { postParams } = require("../utils/http")
 /**
  * 打包基础SDK，并发布到NPM
  */
@@ -21,18 +23,20 @@ class Builder {
     constructor() {
     }
     async init() {
-        checkUpdate();
-        let condition = await askType();
-        if (condition && condition.type) {
-            if (this.buildpush2npm()) {
-                pushCodeAndTags([condition.type])
-                notifyFeishu(condition.type, condition.version, projectConfig);
-                console.log(chalk.green('发布完成'));
+        let res = await checkUpdate();
+        if (!res) {
+            let condition = await askType();
+            if (condition && condition.type) {
+                if (this.buildpush2npm()) {
+                    pushCodeAndTags([condition.type])
+                    notifyFeishu(condition.type, condition.version, projectConfig);
+                    console.log(chalk.green('发布完成'));
+                }
+            } else {
+                console.log();
+                console.log(chalk.red("请至少设置一个有效的Tag"));
+                console.log();
             }
-        } else {
-            console.log();
-            console.log(chalk.red("请至少设置一个有效的Tag"));
-            console.log();
         }
     }
     /**
@@ -54,7 +58,12 @@ class Builder {
         try {
             console.log()
             console.log(chalk.green("NPM开始发布，请稍后"));
-            exec(`npm publish --registry https://registry.npmjs.org && curl https://npm.taobao.org/sync/${projectConfig.name}`)
+            exec(`npm publish --registry https://registry.npmjs.org`)
+            try {
+                postParams(`https://npm.taobao.org/sync/${projectConfig.name}`)
+            } catch (error) {
+
+            }
             console.log()
             console.log(chalk.green("NPM发布完成"));
             return true

package/src/builderPlugin.js

@@ -18,30 +18,32 @@ class Builder {
         }
     }
     async init() {
-        checkUpdate();
-        this.options.devConsoleConfig = this.getPackageJson();
-        let config = this.options.devConsoleConfig
-        // 如果不是私有化部署，那么需要获取token
-        if ("private" != this.options.devConsoleConfig.version) { // private私有化
-            config = { "accessToken": await this.getToken(config) };
-        }
-        // 获得用户输入
-        let answers = await this.ask();
-        // 如果输入的是*.vue，那么表示编译全部文件
-        if ("*.vue" == answers.buildFileName) {
-            let dirs = fs.readdirSync("plugin")
-            for (let i = 0; i < dirs.length; i++) {
-                let item = dirs[i]
-                let obj = this.getVueValue(item);
-                this.initPluginFile(item, obj.compName);
+        let res = await checkUpdate();
+        if (!res) {
+            this.options.devConsoleConfig = this.getPackageJson();
+            let config = this.options.devConsoleConfig
+            // 如果不是私有化部署，那么需要获取token
+            if ("private" != this.options.devConsoleConfig.version) { // private私有化
+                config = { "accessToken": await this.getToken(config) };
+            }
+            // 获得用户输入
+            let answers = await this.ask();
+            // 如果输入的是*.vue，那么表示编译全部文件
+            if ("*.vue" == answers.buildFileName) {
+                let dirs = fs.readdirSync("plugin")
+                for (let i = 0; i < dirs.length; i++) {
+                    let item = dirs[i]
+                    let obj = this.getVueValue(item);
+                    this.initPluginFile(item, obj.compName);
+                    this.build(obj);
+                    await this.upload(obj, config)
+                }
+            } else {
+                let obj = this.getVueValue(answers.buildFileName);
+                this.initPluginFile(answers.buildFileName, obj.compName);
                 this.build(obj);
                 await this.upload(obj, config)
             }
-        } else {
-            let obj = this.getVueValue(answers.buildFileName);
-            this.initPluginFile(answers.buildFileName, obj.compName);
-            this.build(obj);
-            await this.upload(obj, config)
         }
     }
     /**

package/src/builderSDK.js

@@ -17,21 +17,23 @@ class Builder {
         }
     }
     async init() {
-        checkUpdate();
-        this.options.devConsoleConfig = this.getPackageJson();
-        // 获得用户输入
-        let answers = await this.ask();
-        if (answers.types.length == 0) {
-            console.log();
-            console.error(chalk.red(`请选择一个有效的发布版本！`));
-            console.log();
-            return;
+        let res = await checkUpdate();
+        if (!res) {
+            this.options.devConsoleConfig = this.getPackageJson();
+            // 获得用户输入
+            let answers = await this.ask();
+            if (answers.types.length == 0) {
+                console.log();
+                console.error(chalk.red(`请选择一个有效的发布版本！`));
+                console.log();
+                return;
+            }
+            // 获得vue内容
+            let obj = this.getSDKName(answers.buildDirName);
+            obj.types = answers.types;
+            this.build(obj);
+            await this.upload(obj)
         }
-        // 获得vue内容
-        let obj = this.getSDKName(answers.buildDirName);
-        obj.types = answers.types;
-        this.build(obj);
-        await this.upload(obj)
     }
     /**
      *  命令行交互

package/src/creatorTemProject.js

@@ -21,14 +21,17 @@ class Creator {
         this.tplDirPath = path.join(this.rootPath, "template");
     }
     // 初始化
-    init() {
-        checkUpdate();
-        console.log(chalk.green('欢迎使用Cloudcc-CLI'));
-        this.ask().then(answers => {
-            this.options = Object.assign({}, this.options, answers);
-            console.log(this.options);
-            this.write();
-        })
+    async init() {
+        let res = await checkUpdate();
+        if (!res) {
+            console.log()
+            console.log(chalk.green('欢迎使用Cloudcc-CLI'));
+            this.ask().then(answers => {
+                this.options = Object.assign({}, this.options, answers);
+                console.log(this.options);
+                this.write();
+            })
+        }
     }
     // 命令行交互
     ask() {

package/src/publishProject.js

@@ -26,23 +26,28 @@ class Publish {
      * 初始化
      */
     async init() {
-        // 检查更新
-        checkUpdate();
-        // 询问发布类型
-        let condition = await askType();
-        // 将version写入vue文件，触发编译
-        let version = getNewVersionName([condition.type])
-        this.writeVersion(version);
-        if (this.build()) {
-            // 将readme生成为html，并复制到dist中
-            let outPath = "dist"
-            if (projectConfig.config) {
-                outPath = projectConfig.config["doc-path"] ? projectConfig.config["doc-path"] : "dist";
+        let res = await checkUpdate();
+        if (!res) {
+            // 询问发布类型
+            let condition = await askType();
+            // 获得version
+            let version = getNewVersionName([condition.type])
+            if (this.build()) {
+                // 将readme生成为html，并复制到dist中
+                let outPath = "dist"
+                if (projectConfig.config) {
+                    outPath = projectConfig.config["doc-path"] ? projectConfig.config["doc-path"] : "dist";
+                }
+                // 设置readme文件位置
+                change("README", outPath);
+                // 写入版本信息
+                this.writeVersion(version);
+                // 发布代码并设置tags,触发发布,飞书提醒
+                pushCodeAndTags([condition.type]) && jenkins(projectConfig.config["jenkins-" + condition.type]) && notifyFeishu(condition.type, version, projectConfig);
+                console.log();
+                console.log(chalk.green('发布完成'));
+                console.log();
             }
-            change("README", outPath);
-
-            // 发布代码并设置tags,触发发布,飞书提醒
-            pushCodeAndTags([condition.type]) && jenkins(projectConfig.config["jenkins-" + condition.type]) && notifyFeishu(condition.type, version, projectConfig);
         }
     }
     /**
@@ -52,8 +57,8 @@ class Publish {
      * @returns 
      */
     async build() {
-        console.log();
         console.log(chalk.green('开始编译，请稍后...'));
+        console.log();
         // 打包命令
         try {
             exec('npm run build');
@@ -78,8 +83,6 @@ class Publish {
      */
     writeVersion(version) {
         try {
-
-
             // 获得分支信息
             let branch = exec('git rev-parse --abbrev-ref HEAD');
             branch = branch.toString("utf8").trim();
@@ -91,14 +94,14 @@ class Publish {
             var gitCommitVersion = '"' + develop + ': ' + gitVersion + '"'
 
             let versionInfo =
-                `<template>
+                `
   <div style="font-size: 20px">
     <div>分支：${branch}</div>
     <div>版本号：${version}</div>
     <div>Commit：${gitCommitVersion}</div>
   </div>
-</template>`
-            fs.writeFileSync("src/views/version.vue", versionInfo);
+  `
+            fs.writeFileSync("dist/version.html", versionInfo);
             return true
         } catch (error) {
             return false

package/utils/checkVersion.js

@@ -18,7 +18,6 @@ function checkNpmVersion() {
         console.log();
         console.log(chalk.green("当前版本：v" + config.version));
         console.log(chalk.green("最新版本：v" + onlineVersion));
-        console.log();
         return true;
     }
     return false;
@@ -29,6 +28,7 @@ function checkNpmVersion() {
 * @returns 对象
 */
 function askUpdate() {
+    console.log();
     const prompt = [{
         type: 'list',
         message: '是否进行自动升级？',
@@ -44,8 +44,10 @@ function askUpdate() {
  * 升级cli
  */
 function update() {
+    console.log()
     console.log(chalk.green("升级中，请稍后..."));
     exec(`npm install -g cloudcc-cli --registry https://registry.npmjs.org`)
+    console.log()
     console.log(chalk.green("升级完成！请重新运行"));
 }
 
@@ -54,12 +56,15 @@ function update() {
  */
 async function checkUpdate() {
     if (checkNpmVersion()) {
-        let update = await askUpdate()
-        if ("Yes" == update.update) {
+        let res = await askUpdate()
+        if ("Yes" == res.update) {
             update()
-            return;
+            return true;
+        } else {
+            return false
         }
     }
+    return false
 }
 
 

package/utils/notifyIM.js

@@ -49,8 +49,8 @@ module.exports = {
                 triggers.map((trigger) => {
                     postParams(trigger, body);
                 })
+                console.log(chalk.green('已通知飞书群，请查看。'));
             }
-            console.log(chalk.green('已通知飞书群，请查看。'));
         }
     }
 }

package/utils/trigger.js

@@ -5,7 +5,11 @@
 const { get } = require('../utils/http');
 
 async function jenkins(url) {
-    await get(url)
+    try {
+        await get(url)
+    } catch (error) {
+    }
+    return true
 }
 
 module.exports = { jenkins }