cloudcc-cli 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -19,7 +19,8 @@
     "cloudccBuildTag": "bin/buildtag.js"
   },
   "scripts": {
-    "publish-lib": "npm publish --registry https://registry.npmjs.org"
+    "cc-pull": "git fetch --tags -f && git pull",
+    "publish-lib": "npm publish --registry https://registry.npmjs.org && curl https://npmmirror.com/sync/cloudcc-cli"
   },
   "dependencies": {
     "axios": "^0.21.4",

package/src/builderPlugin.js

@@ -1,4 +1,4 @@
-const { execSync } = require('child_process');
+const { exec, execSync, spawn, spawnSync } = require('child_process');
 const { post } = require('../utils/http');
 const fs = require('fs');
 const path = require("path")
@@ -35,14 +35,12 @@ class Builder {
                     let item = dirs[i]
                     let obj = this.getVueValue(item);
                     this.initPluginFile(item, obj.compName);
-                    this.build(obj);
-                    await this.upload(obj, config)
+                    this.build(obj, config)
                 }
             } else {
                 let obj = this.getVueValue(answers.buildFileName);
                 this.initPluginFile(answers.buildFileName, obj.compName);
-                this.build(obj);
-                await this.upload(obj, config)
+                this.build(obj, config)
             }
         }
     }
@@ -127,15 +125,20 @@ class Builder {
      * 编译文件，将vue编译为js文件
      * @param {编译对象信息} obj 
      */
-    build(obj) {
+    build(obj, config) {
         console.log(chalk.green('编译中，请稍后...'));
-        let { stdout, stderr, error } = execSync('npx vue-cli-service build --target lib --name ' + obj.compName + '  --dest build plugin/plugin.js');
-        if (null == error) {
-            console.log(chalk.green('编译成功！'));
-        } else {
-            console.log(chalk.red('编译失败：', error));
-        }
-        fs.unlinkSync('plugin/plugin.js');
+        exec('npx vue-cli-service build --target lib --name ' + obj.compName + '  --dest build plugin/plugin.js', async (error, stdout, stderr) => {
+            if (error) {
+                console.log('编译失败：', error);
+                console.log(chalk.red('编译失败：' + stdout));
+                return;
+            } else {
+                console.log(chalk.green('编译成功！'));
+                console.log();
+                await this.upload(obj, config)
+                fs.unlinkSync('plugin/plugin.js');
+            }
+        })
     }
     /**
     * 将文件上传

package/src/publishProject.js

@@ -48,9 +48,7 @@ class Publish {
      */
     async init() {
         // 检查cli版本，提示用户更新：false：不更新，true：更新
-        // let update = false
-        let update = false;
-        // let update = await checkUpdate();
+        let update = await checkUpdate();
         if (!update) {
             // 1：版本发布信息，包含发布版本类型信息
             let condition = {};
@@ -97,13 +95,14 @@ class Publish {
 
             // 4：如果存在多语言配置，则更新多语言
             if (projectConfig.config && projectConfig.config["language-config"]) {
+                // 获得命令行多语言参数
                 let i18n = this.args.get("language")
-                // 如果不存在language那么需要询问是否需要发布版本
+                // 如果存在命令行参数，那么获取，否则询问
                 if (!i18n) {
-                    // 询问是否更新多语言
                     i18n = await askI18n()
                 }
-                if (i18n.checked === '1') {
+                // 如果选择为1，那么下载多语言
+                if ('1' === i18n || '1' === i18n.checked) {
                     let laguage = projectConfig.config["language-config"]
                     // 执行更新多语言文件
                     await updatei18n(laguage)

package/src/publishProjectH5.js

@@ -44,7 +44,6 @@ class Publish {
      */
     async init() {
         // 检查cli版本，提示用户更新：false：不更新，true：更新
-        // let update = false
         let update = await checkUpdate();
         if (!update) {
             // 1：版本发布信息，包含发布版本类型信息

package/template/indexvue

@@ -36,7 +36,6 @@ export default {
         bizType: "基础组件",
         compDesc: "常用的操作按钮。",
         /* 组件分类：
-         * public: 公开组件（其他组织可见）
          * private：私有组件（自己组织可见）
          * beta：组件测试版本
          */

package/utils/checkVersion.js

@@ -8,9 +8,20 @@ const chalk = require("chalk")
 */
 function checkNpmVersion() {
     let currentVersion = Number(config.version.replace(/\./g, ""));
-    let onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmjs.org`)
-    onlineVersion = onlineVersion.toString("utf8").trim();
-    let onlineVersionNum = Number(onlineVersion.replace(/\./g, ""))
+    let onlineVersionNum
+    let onlineVersion = '0.0.1'
+
+    // 从npm官网获取版本号
+    // onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmjs.org`)
+    // onlineVersion = onlineVersion.toString("utf8").trim();
+
+    // 从阿里源获取版本号
+    try {
+        onlineVersion = exec(`curl -s http://www.npmmirror.com/package/cloudcc-cli`)
+        onlineVersion = onlineVersion.toString("utf8").trim().split('img title="')[1].split('" src')[0];
+    } catch (e) {
+    }
+    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
     // 如果结果大于0，那么提示升级
     if (onlineVersionNum - currentVersion > 0) {
         console.log();
@@ -19,7 +30,7 @@ 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@${onlineVersion} --registry https://registry.npmjs.org`));
+        console.log(chalk.yellow(`如无法自动更新，请使用命令更新：npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
         return onlineVersion;
     }
     return null;

package/utils/test.js

@@ -1,4 +1,2 @@
-version = "Release-V12.3.2"
-version = version.split("\n")[0]
-version = version.split("-V")[1]
-console.log("Release-V12.3.2",version);
+const fs = require('fs')
+const exec = require('child_process').execSync;