@tmsfe/tmskit 0.0.6 → 0.0.9-beta.0

package/main.js

@@ -1,3 +1 @@
-#!/usr/bin/env node
-
-require('./dist/index.cjs'); // eslint-disable-line
+require('dist/index.cjs.js');

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.6",
+  "version": "0.0.9-beta.0",
   "description": "tmskit",
-  "main": "main.js",
+  "main": "dist/index.cjs",
   "bin": {
     "tmskit": "main.js"
   },
@@ -39,13 +39,11 @@
     "chalk": "^4.1.0",
     "commander": "^8.3.0",
     "copy-webpack-plugin": "^9.1.0",
-    "download-git-repo": "^3.0.2",
     "ejs": "^3.1.5",
     "fs-extra": "^10.0.1",
     "glob-ignore": "^1.0.2",
     "gulp": "^4.0.2",
     "gulp-cache": "^1.1.3",
-    "gulp-image": "^5.1.0",
     "gulp-postcss": "^9.0.1",
     "gulp-px-to-rpx": "^1.0.7",
     "gulp-watch": "^5.0.1",

package/src/{gulp → compile}/compile.js

@@ -1,14 +1,14 @@
 const { src, dest, lastRun } = require('gulp');
 const px2rpx = require('gulp-px-to-rpx');
-const postcss = require('gulp-postcss');
 const watch = require('gulp-watch');
 // const cache = require('gulp-cache');
 // const image = require('gulp-image');
-const replaceEnv = require('./plugins/replaceEnv');
+// const replaceEnv = require('./plugins/replaceEnv');
 const { mpCommonDep } = require('./plugins/mpCommonDep');
 const { mpJsonDep } = require('./plugins/mpJsonDep');
 const { mpWxmlDep } = require('./plugins/mpWxmlDep');
-const base64 = require('./plugins/postcss-font-base64');
+// const postcss = require('gulp-postcss');
+// const base64 = require('./plugins/postcss-font-base64');
 const { fail } = require('../utils/log');
 
 const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
@@ -35,7 +35,7 @@ module.exports = function (
     switch (globKey) {
       case 'js':
         srcPipe
-          .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
+          // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
           .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch))
           .pipe(dest(destPath))
           .on('error', (err) => {
@@ -45,10 +45,13 @@ module.exports = function (
       case 'wxss':
         srcPipe
           .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
-          .pipe(postcss([base64()]))
           .on('error', (err) => {
-            fail(`postcss编译报错${err}`);
+            fail(`mpCommonDep编译报错${err}`);
           })
+          // .pipe(postcss([base64()]))
+          // .on('error', (err) => {
+          //   fail(`postcss编译报错${err}`);
+          // })
           .pipe(px2rpx({
             designWidth: 375, // 设计稿宽度，默认为750
             precision: 2, // 小数最大精度，默认为6
@@ -59,7 +62,7 @@ module.exports = function (
         srcPipe
           .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
           .on('error', (err) => {
-            fail(`json编译报错${err}`);
+            fail(`mpJsonDep编译报错${err}`);
           })
           .pipe(dest(destPath));
         break;

package/src/{gulp → compile}/dev.js

@@ -1,6 +1,8 @@
+const path = require('path');
+const fs = require('fs');
 const watch = require('gulp-watch');
 const { resolve } = require('../utils/widgets');
-const { buildOutputAppJson } = require('../utils/buildAppJson');
+const { buildOutputAppJson } = require('../core/buildAppJson');
 const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
 
@@ -23,6 +25,13 @@ function excludeGlob(glob) {
   return Array.from(otherArr);
 }
 
+function adaptPath(pathDir) {
+  let newPath = pathDir;
+  newPath = newPath.startsWith('/') ? newPath : resolve(newPath);
+  newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
+  return newPath;
+}
+
 module.exports = async (tmsConfig, newModules, isWatch = true) => {
   // 监听app.json
   if (isWatch) {
@@ -37,8 +46,8 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   compile(tmsConfig, {
     glob: {
       json: DEFAULT_COPY_CONFIG.map(item => resolve(item)),
-      wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
-      js: ['app.js', 'app.ts'].map(item => resolve(item)),
+      // wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
+      // js: ['app.js', 'app.ts'].map(item => resolve(item)),
     },
     module: { from: '', to: '' },
     destPath: resolve(tmsConfig.outputDir),
@@ -62,18 +71,19 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
     }
 
     const excludes = module.exclude.map(key => `!${resolve(key)}`);
+    const modulePath = adaptPath(module.path);
     const glob = {
-      js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
-      json: [`${resolve(module.path)}/**/*.json`, ...excludes],
-      wxss: [`${resolve(module.path)}/**/*.{less,wxss}`, ...excludes],
-      wxml: [`${resolve(module.path)}/**/*.wxml`, ...excludes],
-      image: [`${resolve(module.path)}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
+      js: [`${modulePath}/**/*.{js,ts,wxs}`, ...excludes],
+      json: [`${modulePath}/**/*.json`, ...excludes],
+      wxss: [`${modulePath}/**/*.{less,wxss}`, ...excludes],
+      wxml: [`${modulePath}/**/*.wxml`, ...excludes],
+      image: [`${modulePath}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
     };
 
     compile(tmsConfig, {
       glob: {
         ...glob,
-        other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)],
+        other: [`${modulePath}/**/*`, ...excludeGlob(glob)],
       },
       destPath: resolve(tmsConfig.outputDir, module.root),
       module: { from: module.path, to: module.root },
@@ -85,15 +95,32 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   // 静态资源目录-拷贝
   if (tmsConfig?.static && tmsConfig?.static.length > 0) {
     for (const item of tmsConfig.static) {
-      const from = item?.from.startsWith('/') ? item.from : resolve(item.from);
-      const to = item?.to.startsWith('/') ? item.to : resolve(item.to);
+      item.from = adaptPath(item.from);
+      item.to = adaptPath(item.to);
+
+      let glob = {};
+      const ext = path.extname(item.from).slice(1);
+      if (ext)  {
+        glob[ext] = [item.from];
+      } else {
+        glob = {
+          js: [`${item.from}/**/*.{js,ts,wxs}`],
+          json: [`${item.from}/**/*.json`],
+          wxss: [`${item.from}/**/*.{less,wxss}`],
+          wxml: [`${item.from}/**/*.wxml`],
+          image: [`${item.from}/**/*.{png,jpg,jpeg,gif,svg}`],
+        };
+        glob.other = [`${item.from}/**/*`, ...excludeGlob(glob)];
+      }
 
+      const from = fs.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
       compile(tmsConfig, {
-        glob: {
-          other: [from],
+        glob,
+        destPath: item.to,
+        module: {
+          from,
+          to: item.to,
         },
-        destPath: to,
-        module: item,
         srcOption: { allowEmpty: true },
         isWatch,
       });

package/src/{gulp → compile}/plugins/mpCommonDep.js

@@ -85,7 +85,7 @@ function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
             }
 
             // eslint-disable-next-line
-            const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+            const reg = new RegExp(`^(\./|\.\.\/)+.*\/${includeName}\/(.*)`);
             const regRes = depItem.match(reg) || [];
             if (regRes[2]) {
               const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);

package/src/{gulp → compile}/plugins/mpJsonDep.js

@@ -21,10 +21,14 @@ function mpJsonDep(
     const anaFileDestFile = resolve(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
-      const copyModules = new Map();
       let contents = String(file.contents);
+      const copyModules = new Map();
       try {
-        contents = JSON.parse(contents);
+        try {
+          contents = contents ? JSON.parse(contents) : {};
+        } catch (e) {
+          throw new Error(`解析${file.path}出现错误，请检查配置信息: ${e}`);
+        }
         if (contents.usingComponents) {
           Object.keys(tmsConfig.dependencies).forEach((includeName) => {
             const includePath = tmsConfig.dependencies[includeName];
@@ -45,7 +49,7 @@ function mpJsonDep(
                 }
 
                 // eslint-disable-next-line
-                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = componentPath.match(reg) || [];
                 if (regRes[2]) {
                   const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);

package/src/{gulp → compile}/plugins/mpWxmlDep.js

@@ -133,7 +133,7 @@ function mpWxmlDep(tmsConfig, module, isWatch) {
                 }
 
                 // eslint-disable-next-line
-                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = attributes.src.match(reg) || [];
                 if (regRes[2]) {
                   const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);

package/src/config/constant.js

@@ -1,7 +1,8 @@
 const path = require('path');
+const os = require('os');
 
 // 用户目录
-const HOME_DIR =  process.env.HOME;
+const HOME_DIR = os.homedir();
 
 // 所有文件的缓存目录
 const CACHE_DIR = path.resolve(HOME_DIR, '.tmskit');
@@ -26,6 +27,9 @@ const TMS_PRIVATE_FILENAME = 'tms.private.config.js';
 // 模块代码的默认在modules子目录
 const DEFAULT_MODULE_DIR = 'modules';
 
+// 模块代码的默认在modules子目录
+const DEFAULT_CLOUD_MODULE_DIR = './cloud';
+
 // 模块的配置文件的名称
 const MODULE_CONFIG_FILENAME = 'module.config.json';
 
@@ -37,12 +41,6 @@ const DEFAULT_WEBPACK_ENTRY = {
 // 默认从源码拷贝到编译后的配置
 const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json'];
 
-// 开发模式
-const MODE = {
-  all: 'all',
-  multi: 'multi',
-};
-
 const ENV = {
   dev: 'development',
   prod: 'production',
@@ -64,8 +62,8 @@ export {
   DEFAULT_WEBPACK_ENTRY,
   DEFAULT_COPY_CONFIG,
   MODULE_CODE_DIR,
-  MODE,
   ENV,
   TEMPLATE_TKIT_DIR,
   MODULE_CONFIG_INVALID_KEY,
+  DEFAULT_CLOUD_MODULE_DIR,
 };

package/src/{utils → core}/buildAppJson.js

@@ -1,57 +1,15 @@
+/**
+ * 生成编译后的app.json
+ */
 const fs = require('fs');
 const { MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
-const { fail } = require('./log');
-const { resolve, isObject, isArray } = require('./widgets');
+const { getModuleConfig, getValidModules } = require('./tmsMpconfig');
+const { fail } = require('../utils/log');
+const { resolve, isObject } = require('../utils/widgets');
 const { handleError } = require('./handleError');
 
 /**
- * 获取每个模块下面的信息，并且收集，后续更新到appJson里面
- * @param { object } file 操作目录下面所有的文件
- * @param { string } appName 小程序的名称
- */
-
-function setModuleConfig(file, appName) {
-  const content = file.contents ? JSON.parse(file.contents.toString()) : JSON.parse(file);
-
-
-  if (isArray(content)) {
-    let i = content.length - 1;
-    while (i >= 0) {
-      let current = content[i];
-
-      if (appName && current.mpConfig && current.mpConfig[appName]) {
-        current = { ...current, ...current.mpConfig[appName] };
-      }
-
-      delete current.mpConfig;
-      delete current.isSubpackages;
-
-      content[i] = current;
-      i--; // eslint-disable-line
-    }
-  }
-  return content;
-}
-
-/**
- * 递归获取本地所有模块的配置信息
- */
-function getLocalModuleConfig(modules = [], appName, moduleConfigFilename) {
-  const modulesConfig = {};
-
-  modules.forEach(({ path }) => {
-    const moduleConfigPath = resolve(path, moduleConfigFilename);
-    if (fs.existsSync(moduleConfigPath)) {
-      const content = fs.readFileSync(moduleConfigPath, 'utf-8');
-      modulesConfig[moduleConfigPath] = setModuleConfig(content, appName);
-    }
-  });
-
-  return modulesConfig;
-}
-
-/**
- * 更新appJson里面的首页配置
+ * 更新appJson里面的主包配置
  * @param { object } appJson appJson信息
  * @param { array } mainPackages 小程序主包信息
  * @returns { object } appJson小程序主页配置信息
@@ -85,7 +43,7 @@ function updateMainPackages(appJson, mainPackages = []) {
 }
 /**
  * 获取app.json内容
- * @param {string} sourceAppJsonPath
+ * @param {string} sourceAppJsonPath app.json存在的源码路径
  * @returns
  */
 const getAppJsonContent = (sourceAppJsonPath) => {
@@ -116,22 +74,12 @@ const updateSubpackages = (appJson, modulesConfig) => {
     appJson.subpackages = appJson.subpackages.concat(validModules);
   }
 };
-/**
- * 过滤页面为空的分包
- * @param {Array} moduleCfg 模块配置内容
- * @returns pages不为空的分包
- */
-const getValidModules = (moduleCfg) => {
-  // 过滤 pages 为空的情况
-  const validModules = moduleCfg.filter(item => item.pages.length > 0);
-  return validModules;
-};
 
 /**
  * 处理合并subpackages后的appjson, 整理重复不合法的地方
  * @param {Object} appJson appjson
  */
-const processAppJson = (appJson) => {
+const fixAppJson = (appJson) => {
   const { subpackages } = appJson;
   const pluginsMap = {};
   Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
@@ -186,23 +134,22 @@ const processAppJson = (appJson) => {
   appJson.subpackages = subps;
 };
 
-
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
- * @param {array} modules
+ * @param {array} modules 用户要编译的模块列表
  * @returns
  */
-function buildOutputAppJson(tmsConfig, modules, isDev) {
+function buildOutputAppJson(tmsConfig, modules) {
   try {
     // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
+    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
     // 获取app.json的配置
     const appJson = getAppJsonContent(resolve('./app.json'));
     // 更新app.json中的subpackages
     updateSubpackages(appJson, modulesConfig);
     // 处理appJson中重复||冲突的地方
-    processAppJson(appJson);
+    fixAppJson(appJson);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
@@ -210,12 +157,10 @@ function buildOutputAppJson(tmsConfig, modules, isDev) {
 
     return appJson;
   } catch (e) {
-    handleError(`生成app.json出现错误: ${e}`, isDev);
+    handleError(`生成app.json出现错误: ${e}`);
   }
 }
 
 module.exports = {
-  setModuleConfig,
-  getValidModules,
   buildOutputAppJson,
 };

package/src/{utils → core}/checkDependencies.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const semver = require('semver');
-const { resolve } = require('./widgets');
+const { resolve } = require('../utils/widgets');
 const path = require('path');
 const shelljs = require('shelljs');
 const { handleError } = require('./handleError');
@@ -17,7 +17,7 @@ const getLatestVersion = (npmName) => {
  * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
  * @returns
  */
-const checkDependencies = (modules, cwd, outputDir, isDev) => {
+const checkDependencies = (modules, cwd, outputDir) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json';  // 查找文件名
   // 1.1根目录的package.json
@@ -46,7 +46,7 @@ const checkDependencies = (modules, cwd, outputDir, isDev) => {
       const json = JSON.parse(packageJson);
       dependencies = json?.dependencies ? json?.dependencies : {};
     } catch (e) {
-      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项`, isDev);
+      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项 ${e}`);
     }
     const dependenciesKeys = Object.keys(dependencies);
     for (const key of dependenciesKeys) {

package/src/core/cloneModules.js

@@ -0,0 +1,203 @@
+/**
+ * 下载第三方代码
+ */
+const MetalSmith = require('metalsmith');
+const crypto = require('crypto');
+const { downloadRepoForGit, pullRepoForGit, resolve } = require('../utils/widgets');
+const { fail, info } = require('../utils/log');
+const fs = require('fs');
+const shelljs = require('shelljs');
+const { handleError } = require('./handleError');
+const { global } = require('../utils/global');
+
+/**
+ * 处理用户没有clone git仓库权限问题,拼接tms.private.config.js的账号信息
+ * @param {*} httpRepoUrl
+ * @param {*} moduleName
+ * @returns
+ */
+function replaceGitUrlAccount(httpRepoUrl, moduleName) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCf = global.getData('tmsPrivateCf');
+
+  let gitUrl = httpRepoUrl;
+  const { username = '', pass = '' } = tmsPrivateCf?.gitAccout?.[moduleName] || {};
+
+  const urlPrefixReg = /http(s)?:\/\//;
+  if (username && pass && urlPrefixReg.test(gitUrl)) {
+    gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
+  }
+
+  return gitUrl;
+}
+
+/**
+ * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
+ * @param { string } sourceDir 缓存文件夹
+ * @param { string } targetDir 目标文件夹
+ * @param { arrary } ignore
+ * @returns { undefined } no return
+ */
+function moveFile(sourceDir, targetDir, ignore = []) {
+  // 删除不是文件夹的文件
+  return new Promise((resolve, reject) => {
+    MetalSmith(__dirname)
+      .ignore(ignore)
+      .source(sourceDir)
+      .destination(targetDir)
+      .build((e) => {
+        if (e) {
+          fail(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+          reject(e);
+        }
+        resolve();
+      });
+  });
+}
+
+/**
+ * 根据gitUrl 和 branch取md5值
+ * @param {*} gitUrl
+ * @param {*} branch
+ * @returns
+ */
+function md5ByGitUrlBranch(gitUrl, branch) {
+  const newBranch =  branch && typeof branch === 'string' ? branch : 'master';
+  return crypto.createHash('md5').update(JSON.stringify({ gitUrl, branch: newBranch }))
+    .digest('hex');
+}
+
+/**
+ * 下载目标模块
+ * @param { string } sourceDir 缓存文件夹
+ * @param { string } targetDir 目标文件夹
+ * @returns { array } modules 描述模块的列表
+ */
+async function cloneModules(sourceDir, targetDir, modules) {
+  // 收集下载模块代码的任务
+  const downloadTasksMap = collectDownLoadTasksMap(sourceDir, targetDir, modules);
+
+  // 开始执行下载和移动代码的任务
+  const arrPromises = [];
+  downloadTasksMap.forEach(({ promiseTask, params, callbacks }) => {
+    arrPromises.push(promiseTask(...Object.keys(params).map(key => params[key]))
+      .then(async () => {
+        const callArr = callbacks.map(async ({
+          params: cParams,
+          fn,
+        }) => fn(...Object.keys(cParams).map(key => cParams[key])));
+        return Promise.all(callArr);
+      })
+      .catch((e) => {
+        handleError(`下载代码${params.httpRepoUrl}出现错误：${e}`);
+      }));
+  });
+
+  await Promise.all(arrPromises);
+}
+
+/**
+ * 收集下载模块代码的任务
+ * @param { string } sourceDir 代码缓存文件夹
+ * @param { string } targetDir 代码要放到的目标文件夹
+ * @returns { array } modules 描述模块的列表
+ */
+function collectDownLoadTasksMap(sourceDir, targetDir,  modules) {
+  // 下载代码任务 Map (key解释 缓存代码路径/md5(gitUrl,branch)
+  // {
+  // '/Users/odile/.tmskit/modules_code/026cb72509c2369dbd75779181f820bc': {
+  //   promiseTask, 下载代码的任务
+  //   params: { 下载代码时的参数
+  //       gitUrl,
+  //       sourcePath,
+  //       branch,
+  //   },
+  //   callbacks: [callback],// 下载完代码后的回调
+  //  }
+  // }
+  const downloadTasksMap = new Map();
+  for (const moduleInfo of modules) {
+    if (moduleInfo.repoInfo) {
+      const { repoInfo: { buildGitTag: branch, httpRepoUrl, path: gitPath = '' }, path, name } = moduleInfo;
+
+      // 处理仓库权限问题
+      const gitUrl = replaceGitUrlAccount(httpRepoUrl, name);
+      // 根据gitUrl与branch计算md5
+      const md5Key = md5ByGitUrlBranch(gitUrl, branch);
+      // git源码临时存在的源目录
+      const sourcePath = resolve(sourceDir, md5Key);
+      // 模块源码要放到目标目录
+      const targetPath = resolve(targetDir, path);
+      // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
+      const sourceModulePath = gitPath ? `${sourcePath}/${gitPath}` : sourcePath;
+
+      // 下载完代码后，添加回调函数（主要将模块代码从临时目录移动代码到目标目录）
+      const callback = {
+        params: { sourceModulePath, targetPath },
+        fn: async (sourceModulePath, targetPath) => {
+          if (fs.existsSync(targetPath)) {
+            shelljs.rm('-rf', `${targetPath}/*`);
+          }
+
+          await moveFile(`${sourceModulePath}`, targetPath, [
+            'node_modules',
+            '.git',
+          ]);
+        },
+      };
+
+      if (downloadTasksMap.has(sourcePath)) {
+        const task = downloadTasksMap.get(sourcePath);
+        task.callbacks.push(callback);
+        downloadTasksMap.set(sourcePath, task);
+      } else {
+        let promiseTask;
+        if (fs.existsSync(sourcePath) && fs.existsSync(`${sourcePath}/.git`)) {
+          promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
+            info(`git pull仓库:${httpRepoUrl}`);
+            return pullRepoForGit(sourcePath, branch);
+          };
+        } else {
+          promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
+            info(`git clone仓库: ${httpRepoUrl}`);
+            return downloadRepoForGit(gitUrl, sourcePath, branch);
+          };
+        }
+        downloadTasksMap.set(sourcePath, {
+          promiseTask,
+          params: {
+            gitUrl,
+            sourcePath,
+            branch,
+            httpRepoUrl,
+          },
+          callbacks: [callback],
+        });
+      }
+    }
+  }
+  return downloadTasksMap;
+}
+
+/**
+ * 检查远程模块的gitUrl与 branch是否有更新
+ * @param {string} sourceDir 模块源码在缓存区的目录
+ * @param {object} moduleInfo 模块的配置信息
+ * @returns
+ */
+function checkRemoteModGitUrlBranch(sourceDir, moduleInfo) {
+  if (moduleInfo.repoInfo) {
+    const { repoInfo: { buildGitTag, httpRepoUrl }, name } = moduleInfo;
+    const gitUrl = replaceGitUrlAccount(httpRepoUrl, name);
+    const md5Key = md5ByGitUrlBranch(gitUrl, buildGitTag);
+    if (!fs.existsSync(`${sourceDir}/${md5Key}`)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+module.exports = {
+  cloneModules,
+  checkRemoteModGitUrlBranch,
+};

package/src/{utils → core}/handleError.js

@@ -1,7 +1,9 @@
-const { fail } = require('./log');
+const { fail } = require('../utils/log');
+const { global } = require('../utils/global');
 
-function handleError(error, isDev = false) {
+function handleError(error) {
   const errMsg = typeof error === 'object' ? error.message : error;
+  const isDev = global.getData('isDev');
   if (isDev) {
     fail(errMsg);
   } else {