sparrow-ci 1.1.6 → 1.1.7

package/README.md

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:36:41
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-13 10:50:34
+ * @LastEditTime: 2024-01-05 10:39:08
  * @FilePath: /sparrow-ci/README.md
  * @Description: README
 -->
@@ -47,7 +47,6 @@ module.exports = {
   "version": "版本号",
   "description": "描述文本",
   "projectRoot": "电脑里面项目的路径",
-  "needCheckNpmPackages": ["需要检查的包的名字"],
   "robotNum": 2,
 };
 ```

package/bin/ci.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangqi
  * @Date: 2022-08-12 15:56:29
- * @LastEditors: makunkun
- * @LastEditTime: 2024-01-03 17:26:52
+ * @LastEditors: wangqi
+ * @LastEditTime: 2024-01-05 10:38:30
  * @FilePath: /sparrow-ci/bin/ci.js
  * @Description: ci
 */
@@ -12,7 +12,7 @@ const fs = require('fs');
 const inquirer = require('inquirer');
 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 { isDependentExisted, writeToFile, installPackages, handleExecFile, handleFolder } = require('./utils/node_utils.js');
 const { environment, helpDescription, robotList } = require('../ci.config');
 const { uploadCi, packNpmCi, packNpmListCi, previewCi } = require('./command');
 
@@ -32,7 +32,6 @@ class Ci {
     mainCliFilePath cli.js 文件的路径
     packageJSONPath 项目中package.json文件的位置
     cliFileExisted cli.js文件是否已经创建了，默认为false
-    needCheckNpmPackages 需要检查更新的包
     appid 小程序id
     robotNum 上传机器人
   */
@@ -44,7 +43,6 @@ class Ci {
   mainCliFilePath = '';
   packageJSONPath = '';
   cliFileExisted = false;
-  needCheckNpmPackages = [];
   appid = '';
   environment = environment.DEV;
   robotNum = robotList['default'];
@@ -94,7 +92,6 @@ class Ci {
       version: this.version,
       description: this.description,
       projectRoot: this.projectRoot,
-      needCheckNpmPackages: this.needCheckNpmPackages || [],
       robotNum: this.robotNum,
     };
   }
@@ -106,7 +103,6 @@ class Ci {
       version,
       description,
       projectRoot,
-      needCheckNpmPackages,
       robotNum,
     } = data;
     // 给相应属性赋值
@@ -114,7 +110,6 @@ class Ci {
     this.version = version;
     this.description = description;
     this.projectRoot = projectRoot;
-    this.needCheckNpmPackages = needCheckNpmPackages || [];
     this.robotNum = robotNum;
   }
 
@@ -168,7 +163,6 @@ class Ci {
         version = this.version,
         description = this.description,
         projectRoot = this.projectRoot,
-        needCheckNpmPackages = this.needCheckNpmPackages.join(','),
         robotNum = this.robotNum,
       } = data;
 
@@ -178,7 +172,6 @@ class Ci {
         version,
         description,
         projectRoot,
-        needCheckNpmPackages,
         robotNum,
       };
 
@@ -233,18 +226,11 @@ class Ci {
   // 组合文件要写的内容
   formatData(filePath, isTrue = true, configParams) {
     if (isTrue) this.readCliFile(filePath);
-    let needCheckNpmPackages = isTrue ? this.needCheckNpmPackages.join(',') : configParams.needCheckNpmPackages;
-    
-    let needCheckNpmPackagesArr = [];
-    if (needCheckNpmPackages.length) {
-      needCheckNpmPackagesArr = needCheckNpmPackages.split(',');
-    }
-    const needCheckNpmPackagesString = JSON.stringify(needCheckNpmPackagesArr);
     if (!isTrue) {
       const { environment, version, description, projectRoot, robotNum } = configParams;
-      return configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString, robotNum)
+      return configOutPut(environment, version, description, projectRoot, robotNum)
     };
-    return configOutPut(this.environment, this.version, this.description, this.projectRoot, needCheckNpmPackagesString, this.robotNum);
+    return configOutPut(this.environment, this.version, this.description, this.projectRoot, this.robotNum);
   }
 
   async online() {
@@ -279,8 +265,6 @@ class Ci {
   // 上传代码
   // @isPublish 是否自动上传
   async upload(type = 'upload') {
-    const installAndBuildSuccess = await installAndBuild(this.needCheckNpmPackages, this.packageJSONPath, this.miniprogramRoot); // 检查安装的版本和package.json文件中的版本是否一致，不一致的话要重新安装和构建
-    if (!installAndBuildSuccess) return;
     // 获取用户填写的版本和描述，写入cli
     if (type !== 'online') {
       const answers = await this.showSimpleCliConfig(type);
@@ -317,17 +301,14 @@ class Ci {
 
   // 构建
   async buildNpm() {
-    if(this.packNpmRelationList.length>0){
-      const data = await packNpmListCi(this.packNpmRelationList);
-      return data;
-    }else{
-      const data = await packNpmCi({
+    if(this.packNpmRelationList.length > 0){
+      return await packNpmListCi(this.packNpmRelationList);
+    } else {
+      return await packNpmCi({
         packageJSONPath: this.packageJSONPath,
         miniprogramRoot: this.miniprogramRoot,
       });
-      return data;
     }
-    
   }
 
   // 预览

package/bin/utils/index.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 17:10:25
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-13 14:02:17
+ * @LastEditTime: 2024-01-05 10:40:10
  * @FilePath: /sparrow-ci/bin/utils/index.js
  * @Description: 公用方法
  */
@@ -55,14 +55,13 @@ function commonFilePath(pathUrl, file) {
 }
 
 // 输出需要的配置
-function configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString, robotNum) {
+function configOutPut(environment, version, description, projectRoot, robotNum) {
   const configDataString =
     `module.exports = {
   "environment": "${environment}",
   "version": "${version}",
   "description": "${description}",
   "projectRoot": "${projectRoot}",
-  "needCheckNpmPackages": ${needCheckNpmPackagesString},
   "robotNum": ${robotNum},
 };
 `;
@@ -130,12 +129,6 @@ function handleList(listName, configObj, independentSubPackages) {
       default: projectRoot,
       message: '项目根路径：'
     },
-    {
-      name: 'needCheckNpmPackages',
-      type: 'input',
-      default: '',
-      message: '需要检查更新的组件（以,分隔）：',
-    },
     {
       name: 'name',
       type: 'input',

package/bin/utils/node_utils.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangqi
  * @Date: 2022-08-26 10:39:50
- * @LastEditors: makunkun
- * @LastEditTime: 2024-01-03 17:38:02
+ * @LastEditors: wangqi
+ * @LastEditTime: 2024-01-05 10:39:57
  * @FilePath: /sparrow-ci/bin/utils/node_utils.js
  * @Description: 工具方法
  */
@@ -47,8 +47,8 @@ function writeToFile(filePath, configDataString, isLog = true) {
 
 // 提问用户初始化相关的问题
 async function askUsersInitQuestions(params) {
-  const { environment, version, description, projectRoot, needCheckNpmPackages } = params;
-  const promptArr = handleList(['environment', 'version', 'description', 'projectRoot', 'needCheckNpmPackages'], { environment, version, description, projectRoot, needCheckNpmPackages });
+  const { environment, version, description, projectRoot } = params;
+  const promptArr = handleList(['environment', 'version', 'description', 'projectRoot'], { environment, version, description, projectRoot });
   return new Promise((resolve) => {
     inquirer
       .prompt(promptArr)
@@ -71,66 +71,6 @@ async function askUsersInitQuestions(params) {
   });
 }
 
-// 检查npm包的版本是否一直
-function checkNpmVersionConsistent(needCheckNpmPackages, packageJSONPath) {
-  return new Promise((resolve) => {
-    const checkedPackagesCount = needCheckNpmPackages.length;
-
-    const packageJSON = require(packageJSONPath);
-
-    let inconsistentPackages = []; // 版本不一致的包
-    let count = 0;
-
-    if (checkedPackagesCount < 1) {
-      resolve(inconsistentPackages);
-      return;
-    }
-
-    for (let i = 0; i < checkedPackagesCount; i++) {
-      const packageName = needCheckNpmPackages[i];
-      if (packageName) {
-        let installedPackageVersion = spawnSync('npm', ['ls', packageName]); // 检查这个包本地安装的版本
-        installedPackageVersion = installedPackageVersion.stdout.toString().trim();
-        const packageNameIndex = installedPackageVersion.indexOf(packageName);
-        installedPackageVersion = packageNameIndex === -1 ? '' : installedPackageVersion.slice(packageNameIndex + packageName.length + 1);
-
-        const packageVersionInPackageJSON = packageJSON.dependencies[packageName]; // 本地package.json文件中包的版本
-        let packageLocalVersion = packageVersionInPackageJSON;
-        if (packageVersionInPackageJSON.indexOf('^') > -1) { // 如果版本号包含^，需要把^去掉
-          packageLocalVersion = packageVersionInPackageJSON.slice(1);
-        }
-
-        if (installedPackageVersion !== packageLocalVersion) {
-          inconsistentPackages.push(packageName + `@${packageLocalVersion}`);
-        }
-      }
-      count++;
-      if (count === checkedPackagesCount) {
-        resolve(inconsistentPackages);
-      }
-    }
-  });
-}
-
-// 安装和进行npm构建
-async function installAndBuild(needCheckNpmPackages, packageJSONPath, miniprogramRoot) {
-  const checkedPackagesCount = needCheckNpmPackages.length;
-  if (checkedPackagesCount === 0) return true; // 没有设置要检查的包
-  const checkConsistentSpinner = ora('检查package.json文件中包的版本与实际安装的版本是否一致...').start();
-  const inconsistentPackages = await checkNpmVersionConsistent(); // 检查npm包的版本是否一致
-  checkConsistentSpinner.stop();
-  if (inconsistentPackages.length < 1) {
-    console.log('package.json文件中包的版本与实际安装的版本一致', chalk.magenta('不必重新构建'));
-    return true;
-  }
-  const inconsistentPackagesStr = inconsistentPackages.join(',');
-  // package.json中包的版本和实际安装的版本不一致时，重新进行npm install 和 npm 构建
-  console.log(`package.json文件中`, chalk.magenta(`${inconsistentPackagesStr}`), `包的版本与实际安装的版本不同，`, chalk.magenta(`重新进行npm安装和npm构建中，请稍候...`));
-  const installSuccess = await installPackages(packageJSONPath, inconsistentPackages);
-  if (!installSuccess) return; // 依赖没有安装成功直接返回
-  return await packNpmCi({packageJSONPath, miniprogramRoot});
-}
-
 // 安装依赖
 async function installPackages(packageJSONPath, packageNames = []) {
   return new Promise((resolve) => {
@@ -231,7 +171,6 @@ module.exports = {
   isDependentExisted,
   writeToFile,
   askUsersInitQuestions,
-  installAndBuild,
   installPackages,
   handleExecFile,
   handleFolder,

package/package.json

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