sparrow-ci 1.1.4 → 1.1.6

package/bin/ci.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangqi
  * @Date: 2022-08-12 15:56:29
- * @LastEditors: wangqi
- * @LastEditTime: 2023-02-14 11:06:15
+ * @LastEditors: makunkun
+ * @LastEditTime: 2024-01-03 17:26:52
  * @FilePath: /sparrow-ci/bin/ci.js
  * @Description: ci
 */
@@ -14,7 +14,7 @@ const chalk = require('chalk');
 const { getProInfo, commonFilePath, configOutPut, handleList, printSuccess, printFail, printWarnning } = require('./utils/index');
 const { isDependentExisted, writeToFile, installAndBuild, installPackages, handleExecFile, handleFolder } = require('./utils/node_utils.js');
 const { environment, helpDescription, robotList } = require('../ci.config');
-const { uploadCi, packNpmCi, previewCi } = require('./command');
+const { uploadCi, packNpmCi, packNpmListCi, previewCi } = require('./command');
 
 const currentWorkingDirectory = process.cwd(); // 命令执行位置的路径
 
@@ -59,6 +59,7 @@ class Ci {
     // 代码根路径，比如src目录
     const configJson = commonFilePath(this.projectRoot, 'project.config.json');
     this.appid = configJson.appid;
+    this.packNpmRelationList = configJson.setting.packNpmRelationList || [];
     this.miniprogramRoot = configJson.miniprogramRoot ? path.join(this.projectRoot, configJson.miniprogramRoot) : this.projectRoot;
     this.appJson = commonFilePath(this.miniprogramRoot, 'app.json');
     this.subPackages = this.appJson.subPackages;
@@ -285,7 +286,6 @@ class Ci {
       const answers = await this.showSimpleCliConfig(type);
       if (!answers) return;
     }
-
     if (type === 'online') {
       this.robotNum = robotList['online']; // 如果是online, 上传着变为1
       const { version, description } = await this.changeVerConfig(); // online 走这块改变config
@@ -317,11 +317,17 @@ class Ci {
 
   // 构建
   async buildNpm() {
-    const data = await packNpmCi({
-      packageJSONPath: this.packageJSONPath,
-      miniprogramRoot: this.miniprogramRoot,
-    });
-    return data;
+    if(this.packNpmRelationList.length>0){
+      const data = await packNpmListCi(this.packNpmRelationList);
+      return data;
+    }else{
+      const data = await packNpmCi({
+        packageJSONPath: this.packageJSONPath,
+        miniprogramRoot: this.miniprogramRoot,
+      });
+      return data;
+    }
+    
   }
 
   // 预览

package/bin/command/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangqi
  * @Date: 2022-08-12 10:20:19
- * @LastEditors: wangqi
- * @LastEditTime: 2022-09-24 11:57:03
+ * @LastEditors: makunkun
+ * @LastEditTime: 2024-01-03 17:53:17
  * @FilePath: /sparrow-ci/bin/command/index.js
  * @Description: 上传代码
  */
@@ -12,6 +12,7 @@ const path = require('path');
 const ora = require("ora");
 const chalk = require('chalk');
 const { handleCodeSize, getKeyName } = require('../utils/index');
+const { robotList } = require('../../ci.config');
 
 function project(params) {
   const { projectPath, keyPath, appid } = params;
@@ -28,7 +29,7 @@ function project(params) {
 async function uploadCi(params) {
   const spinner = ora(`${chalk.blue('准备上传')}\n`).start();
   spinner.color = 'blue';
-  const { version, description, robotNum } = params;
+  const { version, description, robotNum = robotList['default'] } = params;
   try {
     const { subPackageInfo } = await ci.upload({
       project: project(params),
@@ -58,7 +59,7 @@ async function uploadCi(params) {
     });
     console.table(handleCodeSize(subPackageInfo));
   } catch(err) {
-    spinner.text = `${chalk.red('上传失败')}\n${chalk.yellow(err)}`;
+    spinner.text = `${chalk.red('上传失败')}\n${chalk.yellow(JSON.stringify(err))}`;
     spinner.fail();
   }
 }
@@ -90,6 +91,43 @@ function packNpmCi(params) {
   });
 }
 
+// 注意当前构建存在问题--list
+function packNpmListCi(packNpmRelationList) {
+  return new Promise(async (resolve) => {
+    const spinner = ora(`${chalk.blue('构建中')}\n`).start();
+    spinner.color = 'blue';
+    // const { packageJSONPath, miniprogramRoot } = params;
+    // const { miniProgramPackNum, otherNpmPackNum, warnList} = await ci.packNpmManually({
+    //   packageJsonPath: packageJSONPath,
+    //   miniprogramNpmDistDir: miniprogramRoot,
+    // })
+    let promiseList = [];
+    packNpmRelationList.forEach(item=>{
+      promiseList.push(ci.packNpmManually({
+        packageJsonPath: item.packageJsonPath,
+        miniprogramNpmDistDir: item.miniprogramNpmDistDir,
+      }))
+    })
+    const res = await Promise.all(promiseList);
+    res.forEach(item=>{
+      const { miniProgramPackNum, otherNpmPackNum, warnList} = item;
+      if ((miniProgramPackNum > 0 || otherNpmPackNum > 0) && warnList.length === 0) {
+        spinner.text = `${chalk.green('构建成功')}\n${chalk.green(`miniProgramPackNum: ${miniProgramPackNum}个，otherNpmPackNum:${otherNpmPackNum}个`)}`;
+        spinner.color = 'green';
+        spinner.succeed();
+      }
+  
+      if (warnList.length > 0) {
+        warnList.forEach(item => {
+          spinner.text = `${chalk.yellow('提示')}\n${chalk.yellow(`${item.jsPath}，${item.msg}`)}`;
+          spinner.warn();
+        })
+      }
+    })
+    resolve(true);
+  });
+}
+
 async function previewCi(params) {
   const spinner = ora(`${chalk.blue('准备中...')}\n`).start();
   spinner.color = 'blue';
@@ -126,7 +164,7 @@ async function previewCi(params) {
       scene, // 场景值 1011
     })
   } catch(err) {
-    spinner.text = `${chalk.red('生成预览失败')}\n${chalk.yellow(err)}`;
+    spinner.text = `${chalk.red('生成预览失败')}\n${chalk.yellow(JSON.stringify(err))}`;
     spinner.fail();
   }
 }
@@ -134,5 +172,6 @@ async function previewCi(params) {
 module.exports = {
   uploadCi,
   packNpmCi,
+  packNpmListCi,
   previewCi
 }

package/bin/utils/node_utils.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangqi
  * @Date: 2022-08-26 10:39:50
- * @LastEditors: wangqi
- * @LastEditTime: 2023-02-13 10:44:24
+ * @LastEditors: makunkun
+ * @LastEditTime: 2024-01-03 17:38:02
  * @FilePath: /sparrow-ci/bin/utils/node_utils.js
  * @Description: 工具方法
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparrow-ci",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "基于miniprogram-ci开发的小程序命令行工具",
   "main": "",
   "bin": {