cloudcc-cli 1.2.5 → 1.2.7

package/README.md

@@ -1,3 +1,19 @@
+# ReleaseV1.2.7
+#### 发布日期：2022-12-5
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 打包项目增加详细日志输出
+* 优化
+
+# ReleaseV1.2.6
+#### 发布日期：2022-11-21
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 替换组件开发模板
+* 优化
+
 # ReleaseV1.2.5
 #### 发布日期：2022-11-17
 #### 发布范围：全量

package/package.json

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

package/src/publishProject.js

@@ -1,4 +1,4 @@
-const exec = require('child_process').execSync;
+const { execSync, exec } = require('child_process');
 const chalk = require("chalk")
 // 文件编辑对象
 const fs = require("fs")
@@ -41,7 +41,7 @@ class Publish {
             let arr = item.split("=");
             this.args.set(arr[0], arr[1]);
         });
-        this.user = this.args.get("user") || exec("git config user.name").toString("utf8").trim();
+        this.user = this.args.get("user") || execSync("git config user.name").toString("utf8").trim();
     }
     /**
      * 初始化
@@ -77,7 +77,7 @@ class Publish {
             }
             // 2：如果命令行包含了分支信息，那么git切换到命令行的分支
             if (this.args.get("branch")) {
-                exec(`git checkout ${this.args.get("branch")}`);
+                execSync(`git checkout ${this.args.get("branch")}`);
                 console.log(chalk.green("切换分支：" + this.args.get("branch")))
                 console.log()
             }
@@ -112,40 +112,43 @@ class Publish {
             }
 
             // 5：开始打包
-            if (await this.build()) {
-                // 6：将readme生成为html，并复制到dist中
-                let outPath = "dist"
-                // 读取配置，是否改变了输出路径
-                if (projectConfig.config && projectConfig.config["doc-path"]) {
-                    outPath = projectConfig.config["doc-path"];
-                }
-                try {
-                    // 设置readme文件位置
-                    change("README", outPath);
-                } catch (error) {
-                    console.log(chalk.red("README写入异常：" + error))
-                }
+            this.build(condition, version)
+        }
+    }
+    /**
+     * 编译成功回调
+     */
+    buildSucess(condition, version) {
+        // 6：将readme生成为html，并复制到dist中
+        let outPath = "dist"
+        // 读取配置，是否改变了输出路径
+        if (projectConfig.config && projectConfig.config["doc-path"]) {
+            outPath = projectConfig.config["doc-path"];
+        }
+        try {
+            // 设置readme文件位置
+            change("README", outPath);
+        } catch (error) {
+            console.log(chalk.red("README写入异常：" + error))
+        }
 
-                try {
-                    // 7：写入版本信息
-                    this.writeVersion(version);
-                } catch (error) {
-                    console.log(chalk.red("版本信息写入异常：" + error))
-                }
+        try {
+            // 7：写入版本信息
+            this.writeVersion(version);
+        } catch (error) {
+            console.log(chalk.red("版本信息写入异常：" + error))
+        }
 
-                // 8：发布代码并设置tags,触发发布,飞书提醒
-                if (pushCodeAndTags([condition.type], this.args.get("update"))) {
-                    if (projectConfig && projectConfig.config) {
-                        jenkins(projectConfig.config["jenkins-" + condition.type])
-                    }
-                    notifyFeishu(condition.type, version, projectConfig, this.user)
-                    notifyDingDing(condition.type, version, projectConfig, this.user)
-                    console.log();
-                    console.log(chalk.green('发布完成'));
-                    console.log();
-                }
+        // 8：发布代码并设置tags,触发发布,飞书提醒
+        if (pushCodeAndTags([condition.type], this.args.get("update"))) {
+            if (projectConfig && projectConfig.config) {
+                jenkins(projectConfig.config["jenkins-" + condition.type])
             }
-
+            notifyFeishu(condition.type, version, projectConfig, this.user)
+            notifyDingDing(condition.type, version, projectConfig, this.user)
+            console.log();
+            console.log(chalk.green('发布完成'));
+            console.log();
         }
     }
     /**
@@ -154,26 +157,29 @@ class Publish {
      * @param {发布版本} versions：V12.0.0
      * @returns 
      */
-    async build() {
+    build(condition, version) {
         console.log(chalk.green('开始编译，请稍后...'));
         console.log();
+        let that = this;
         // 打包命令
-        try {
-            exec('npm run build');
-            console.log(chalk.green('编译成功！'));
-            console.log();
-            return true;
-        } catch (error) {
-            try {
-                exec('npx vue-cli-service build');
+        exec('npm run build', (error, stdout, stderr) => {
+            if (error) {
+                exec('npx vue-cli-service build', (error, stdout, stderr) => {
+                    if (error) {
+                        console.log('编译失败：', error);
+                        console.log(chalk.red('编译失败：' + stdout));
+                    } else {
+                        console.log(chalk.green('编译成功！'));
+                        console.log();
+                        that.buildSucess(condition, version);
+                    }
+                })
+            } else {
                 console.log(chalk.green('编译成功！'));
                 console.log();
-                return true;
-            } catch (error) {
-                console.log(chalk.red('编译失败！' + error));
-                return false
+                that.buildSucess(condition, version);
             }
-        }
+        })
 
     }
     /**
@@ -183,7 +189,7 @@ class Publish {
     writeVersion(version) {
         try {
             // 获得分支信息
-            let branch = exec('git rev-parse --abbrev-ref HEAD');
+            let branch = execSync('git rev-parse --abbrev-ref HEAD');
             branch = branch.toString("utf8").trim();
             // 获得提交版本信息
             var gitHEAD = fs.readFileSync('.git/HEAD', 'utf-8').trim()

package/src/publishProjectH5.js

@@ -1,4 +1,4 @@
-const exec = require('child_process').execSync;
+const { execSync, exec } = require('child_process');
 const chalk = require("chalk")
 // 文件编辑对象
 const fs = require("fs")
@@ -37,7 +37,7 @@ class Publish {
             let arr = item.split("=");
             this.args.set(arr[0], arr[1]);
         });
-        this.user = this.args.get("user") || exec("git config user.name").toString("utf8").trim();
+        this.user = this.args.get("user") || execSync("git config user.name").toString("utf8").trim();
     }
     /**
      * 初始化
@@ -64,39 +64,42 @@ class Publish {
             console.log(chalk.green('待发布版本：' + version));
             console.log();
             // 4：开始打包
-            if (await this.build()) {
-                // 5：将readme生成为html，并复制到dist中
-                let outPath = "dist"
-                // 读取配置，是否改变了输出路径
-                if (projectConfig.config && projectConfig.config["doc-path"]) {
-                    outPath = projectConfig.config["doc-path"];
-                }
-                try {
-                    // 设置readme文件位置
-                    change("README", outPath);
-                } catch (error) {
-                    console.log(chalk.red("README写入异常：" + error))
-                }
+            this.build(condition, version)
+        }
+    }
+    /**
+     * 编译成功
+     */
+    buildSucess(condition, version) {
+        // 5：将readme生成为html，并复制到dist中
+        let outPath = "dist"
+        // 读取配置，是否改变了输出路径
+        if (projectConfig.config && projectConfig.config["doc-path"]) {
+            outPath = projectConfig.config["doc-path"];
+        }
+        try {
+            // 设置readme文件位置
+            change("README", outPath);
+        } catch (error) {
+            console.log(chalk.red("README写入异常：" + error))
+        }
 
-                try {
-                    // 6：写入版本信息
-                    this.writeVersion(version, outPath);
-                } catch (error) {
-                    console.log(chalk.red("版本信息写入异常：" + error))
-                }
+        try {
+            // 6：写入版本信息
+            this.writeVersion(version, outPath);
+        } catch (error) {
+            console.log(chalk.red("版本信息写入异常：" + error))
+        }
 
-                // 7：发布代码并设置tags,触发发布,飞书提醒
-                if (pushCodeAndTags([condition.type], this.args.get("update"))) {
-                    if (projectConfig && projectConfig.config) {
-                        jenkins(projectConfig.config["jenkins-" + condition.type])
-                    }
-                    notifyDingDing(condition.type, version, projectConfig, this.user)
-                    console.log();
-                    console.log(chalk.green('发布完成'));
-                    console.log();
-                }
+        // 7：发布代码并设置tags,触发发布,飞书提醒
+        if (pushCodeAndTags([condition.type], this.args.get("update"))) {
+            if (projectConfig && projectConfig.config) {
+                jenkins(projectConfig.config["jenkins-" + condition.type])
             }
-
+            notifyDingDing(condition.type, version, projectConfig, this.user)
+            console.log();
+            console.log(chalk.green('发布完成'));
+            console.log();
         }
     }
     /**
@@ -105,21 +108,20 @@ class Publish {
      * @param {发布版本} versions：V12.0.0
      * @returns 
      */
-    async build() {
+    build(condition, version) {
         console.log(chalk.green('开始编译，请稍后...'));
         console.log();
-        // 打包命令
-        try {
-            // /Applications/HBuilderX.app/Contents/MacOS/cli macos路径
-            exec('cli.exe publish --platform h5 --project ' + projectConfig.name);
-            console.log(chalk.green('编译成功！'));
-            console.log();
-            return true;
-        } catch (error) {
-            console.log(chalk.red('编译失败！' + error.toString()));
-            return false
-        }
-
+        let that = this;
+        exec('cli.exe publish --platform h5 --project ' + projectConfig.name, (error, stdout, stderr) => {
+            if (error) {
+                console.log('编译失败：', error);
+                console.log(chalk.red('编译失败：' + stdout));
+            } else {
+                console.log(chalk.green('编译成功！'));
+                console.log();
+                that.buildSucess(condition, version);
+            }
+        })
     }
     /**
      * 将版本信息写入文件
@@ -129,7 +131,7 @@ class Publish {
     writeVersion(version, outPath = "dist") {
         try {
             // 获得分支信息
-            let branch = exec('git rev-parse --abbrev-ref HEAD');
+            let branch = execSync('git rev-parse --abbrev-ref HEAD');
             branch = branch.toString("utf8").trim();
             // 获得提交版本信息
             var gitHEAD = fs.readFileSync('.git/HEAD', 'utf-8').trim()

package/template/Appvue

@@ -1,26 +1,36 @@
 <template>
-  <div id="app">
-    <cloudcc-input />
+  <div class="app">
+    <div @click="hello">hello CloudCC</div>
+    <Plugin />
   </div>
 </template>
 
 <script>
-import CloudccInput from "../plugin/index.vue";
-export default {
-  name: "App",
-  components: {
-    CloudccInput,
-  },
-};
+  import Plugin from "../plugin/index.vue";
+  export default {
+    name: "App",
+    components: {
+      Plugin,
+    },
+    methods: {
+      hello() {
+        this.$CCDK.CCMessage.showMessage("Hello CloudCC");
+      },
+    },
+  };
 </script>
 
-<style>
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-}
-</style>
+<style lang="scss">
+  html body {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+    width: 100%;
+  }
+
+  .app {
+    margin: auto;
+    height: 100px;
+    width: 200px;
+  }
+</style>

package/template/httpjs

@@ -1,6 +1,5 @@
 import axios from 'axios'
 import packageJson from '../package.json'
-import * as CCDK from "cloudcc-ccdk/lib/ccdk.min.js";
 const service = axios.create({
   timeout: 60000, // request timeout
   headers: {
@@ -11,7 +10,7 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
-    config.headers.accessToken = CCDK.CCToken.getToken()
+    config.headers.accessToken = window.$CCDK.CCToken.getToken()
     return config
   },
   error => {
@@ -39,7 +38,7 @@ const formateData = data => {
     head: {
       appType: packageJson.name,
       appVersion: packageJson.version,
-      accessToken: CCDK.CCToken.getToken()
+      accessToken: window.$CCDK.CCToken.getToken()
     },
     body: {
       ...data

package/template/index.js

@@ -44,6 +44,7 @@ module.exports = function (creator, options, callback) {
 
     creator.copyTpl('indexhtml', path.join(public, "index.html"))
 
+
     creator.fs.commit(() => {
         console.log();
         console.log(`${chalk.grey(`创建项目: ${name}`)} ${chalk.green('✔ ')}`);