@tmsfe/tmskit 0.0.5 → 0.0.6

package/src/scripts/run/index.js

@@ -2,58 +2,63 @@ const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
 const install = require('./install/index');
-const { createTask, resolve  } = require('../../utils/widgets');
+const { createTask } = require('../../utils/widgets');
 const { MODE } = require('../../config/constant');
-const { readTmsConfig, checkModules } = require('../../utils/tkitUtils');
+const { readTmsConfig, readTmsPrivateCf, checkModules } = require('../../utils/tkitUtils');
+const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../utils/tkitUtils');
 
-const handleModulesArg = (cmd) => {
-  // 主模块开发
-  if (cmd.module === MODE.main) {
-    return MODE.main;
-  }
-  // 单模块 或 多模块开发
+const handleModulesArg = (cmd, tmsPrivateCg) => {
+  // 单模块或多模块开发-用户通过脚手架参数指定的模块
   if (cmd.module) {
+    const { argv } = process;
+    const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
     return [
       cmd.module,
-      ...cmd.args,
+      ...reset,
     ];
   }
+  // 单模块或多模块开发-用户在tms.private.js指定的模块
+  if (tmsPrivateCg?.modules && tmsPrivateCg?.modules.length > 0) {
+    return tmsPrivateCg?.modules;
+  }
   // 全量模块
   return MODE.all;
 };
 
 async function run(commandName, cmd) {
-  if (commandName === 'install') {
-    install(resolve('./'));
-    return;
-  }
-
-  const moduleArg = handleModulesArg(cmd);
-  const { env } = cmd;
-
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCg = readTmsPrivateCf();
+  // 处理module参数
+  const moduleArg = handleModulesArg(cmd, tmsPrivateCg);
+  const { env = tmsPrivateCg?.env } = cmd;
   const tmsConfig = await createTask(readTmsConfig, '开始读取脚手架的配置项', '读取脚手架的配置项完成')(env);
 
   let modules;
-  // 主模块
-  if (moduleArg === MODE.main) {
-    modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages])]);;
-  } else if (moduleArg === MODE.all) {
+  if (moduleArg === MODE.all) {
     // 全量模块
     modules = tmsConfig.modules;
   } else {
     // 检查用户输入modules的有效性
-    modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...moduleArg])]);;
+    modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...moduleArg])]);
   }
 
+  // tms.config.js的modules 合并 module.config.json的配置项
+  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
+  // A分包依赖了B分包的代码， merge B分包进行编译；
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
+
   switch (commandName) {
     case 'init':
-      init(tmsConfig, modules, env);
+      init(tmsConfig, newModules, env);
       return;
     case 'dev':
-      dev(tmsConfig, modules, env);
+      dev(tmsConfig, newModules, env);
+      return;
+    case 'install':
+      install(tmsConfig, newModules, env);
       return;
     case 'build':
-      build(tmsConfig, modules, env);
+      build(tmsConfig, newModules, env);
       return;
     default:
       return;

package/src/scripts/run/init/index.js

@@ -3,58 +3,53 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../utils/buildAppJson');
-const { npmInstallAll } = require('../../../utils/npmUtils');
-const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const {  MODULE_CODE_DIR, CACHE_DIR, DEFAULT_COPY_CONFIG, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const {  MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../utils/cloneModules');
-const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
+const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../utils/tkitUtils');
 const { fail } = require('../../../utils/log');
+const install = require('../install');
 
 /**
- * 拷贝package.json\模块的代码到编译输出目录
+ * 拷贝相关配置文件到编译输出目录
  * @param { object } tmsConfig
  * @param { array } modules
  * @param { array } defaultFiles 默认需要拷贝的配置项
  * @returns
  */
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve(tmsConfig.webpack.outputDir);
+  const outputDir = resolve(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach((item) => {
     if (fs.existsSync(resolve(item))) {
-      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.webpack.outputDir, item));
+      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
     }
   });
 
-  // 拷贝模块的代码到编译输出目录
+  // 拷贝模块的package.json到编译输出目录
   targetModules.forEach((item) => {
-    const outputModuleDir = resolve(`${tmsConfig.webpack.outputDir}/${item.root}`);
+    const outputModuleDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
     if (!fs.existsSync(resolve(item.path))) {
       fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
-    if (!fs.existsSync(outputModuleDir)) {
-      shelljs.mkdir('-p', outputModuleDir);
-    } else {
-      // 删除除了node_modules、miniprogram_npm 的其他文件
-      // eslint-disable-next-line
-      shelljs.exec('find . -not \( -name node_modules -or -name miniprogram_npm \)  -delete', { silent: true });
-    }
-    shelljs.cp('-Rf', `${resolve(item.path)}/*`, outputModuleDir);
+    io.ensureDirExist(outputModuleDir);
+    const modulePackagePath = resolve(item.path, 'package.json');
+    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
-async function task(tmsConfig, targetModules) {
+async function task(tmsConfig, targetModules, isDev) {
   // 下载和移动代码
   await createTask(
     cloneModules,
     '开始下载模块代码完成',
     '下载模块代码码完成',
-  )(MODULE_CODE_DIR, resolve('./'), targetModules);
+  )(MODULE_CODE_DIR, resolve('./'), targetModules, isDev);
 
   // tms.config.js的modules 合并 module.config.json的配置项
-  const newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR);
-  console.log('当前init的有效模块', newModules.map(item => item.name));
+  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
+  // A分包依赖了B分包的代码， merge B分包进行编译；
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
   // 拷贝相关配置文件到输出目录
   await createTask(
@@ -63,35 +58,30 @@ async function task(tmsConfig, targetModules) {
     '拷贝文件到编译输出目录完成',
   )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
 
-  // npm install
-  await createTask(
-    npmInstallAll,
-    '开始npm install',
-    'npm install 完成',
-  )(newModules, resolve(tmsConfig.webpack.outputDir), `${CACHE_DIR}/node_modules`);
-
-  // 构建miniprograme_npm
-  await createTask(
-    buildMpNpm,
-    '开始构建miniprograme_npm',
-    '构建miniprograme_npm 完成',
-  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+  // install
+  await install(tmsConfig, newModules, false);
 
   // 动态生成编译后的app.json;
   await createTask(
     buildOutputAppJson,
     '开始生成编译后的app.json',
     '生成编译后的app.json完成',
-  )(tmsConfig, newModules);
+  )(tmsConfig, newModules, isDev);
 
   return newModules;
 }
-async function bootstrap(tmsConfig, targetModules) {
-  const newModules = await task(tmsConfig, targetModules);
+async function init(tmsConfig, targetModules, isDev) {
+  try {
+    const newModules = await task(tmsConfig, targetModules, isDev);
 
-  return {
-    targetModules: newModules,
-  };
+    return {
+      targetModules: newModules,
+    };
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`init流程出现错误${errMsg}`);
+    process.exit(1);
+  }
 }
 
-module.exports = bootstrap;
+module.exports = init;

package/src/scripts/run/install/index.js

@@ -1,39 +1,29 @@
-const shelljs = require('shelljs');
-const { createTask } = require('../../../utils/widgets');
+const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const glob = require('glob-ignore');
-const path = require('path');
+const { CACHE_DIR } = require('../../../config/constant');
+const { cloudNpmInstall, mpNpmInstallAll } = require('../../../utils/npmUtils');
 
-function npmInstall(contextDir) {
-  return new Promise((resolve, reject) => {
-    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      if (err) {
-        reject(err);
-      }
-      files.forEach((file) => {
-        const dir = path.dirname(file);
-        shelljs.cd(dir);
-        shelljs.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', { silent: false });
-      });
-      resolve();
-    });
-  });
-}
-
-async function install(contextDir) {
-  // npm install
+async function install(tmsConfig, modules, isCloud = false) {
+  // 小程序npm install
   await createTask(
-    npmInstall,
-    '开始npm install',
-    'npm install完成',
-  )(contextDir);
+    mpNpmInstallAll,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
 
   // 构建miniprograme_npm
   await createTask(
     buildMpNpm,
-    '开始构建miniprogram_npm',
-    '构建miniprogram_npm 完成',
-  )({ appId: 'null', projectPath: contextDir, privateKey: 'null' });
+    '开始构建miniprograme_npm',
+    '构建miniprograme_npm 完成',
+  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+
+  // 安装云函数的
+  isCloud && createTask(
+    cloudNpmInstall,
+    '云函数npm install',
+    '云函数npm install安装完毕',
+  )(resolve(tmsConfig.cloudDir));
 }
 
 module.exports = install;

package/src/utils/buildAppJson.js

@@ -1,25 +1,23 @@
 const fs = require('fs');
-const { DEFAULT_MODULE_DIR, MODULE_CONFIG_FILENAME } = require('../config/constant');
+const { MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
 const { fail } = require('./log');
 const { resolve, isObject, isArray } = require('./widgets');
+const { handleError } = require('./handleError');
 
 /**
  * 获取每个模块下面的信息，并且收集，后续更新到appJson里面
  * @param { object } file 操作目录下面所有的文件
  * @param { string } appName 小程序的名称
  */
-function setModuleConfig(file, appName, moduleDir) {
+
+function setModuleConfig(file, appName) {
   const content = file.contents ? JSON.parse(file.contents.toString()) : JSON.parse(file);
 
-  if (isObject(content)) {
-    content.root = content.root.indexOf(moduleDir) > -1 ? content.root : `${moduleDir}/${content.root}`;
-  }
 
   if (isArray(content)) {
     let i = content.length - 1;
     while (i >= 0) {
       let current = content[i];
-      current.root = current.root.indexOf(moduleDir) > -1 ? current.root : `${moduleDir}/${current.root}`;
 
       if (appName && current.mpConfig && current.mpConfig[appName]) {
         current = { ...current, ...current.mpConfig[appName] };
@@ -38,16 +36,17 @@ function setModuleConfig(file, appName, moduleDir) {
 /**
  * 递归获取本地所有模块的配置信息
  */
-function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFilename) {
+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, moduleDir);
+      modulesConfig[moduleConfigPath] = setModuleConfig(content, appName);
     }
   });
+
   return modulesConfig;
 }
 
@@ -98,7 +97,7 @@ const getAppJsonContent = (sourceAppJsonPath) => {
   // 加入默认值
   appJson.subpackages = [];
   appJson.pages = [];
-  appJson.plugins = {};
+  // appJson.plugins = {};
   delete appJson.entranceDeclare;
   return appJson;
 };
@@ -111,9 +110,80 @@ const updateSubpackages = (appJson, modulesConfig) => {
   // eslint-disable-next-line
   for (const name in modulesConfig) {
     const moduleInfo = isObject(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name];
+    // 过滤 pages 为空的情况
+    const validModules = getValidModules(moduleInfo);
+    // eslint-disable-next-line
+    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 { subpackages } = appJson;
+  const pluginsMap = {};
+  Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
+  const subps = subpackages.map((subp) => {
+    const invalidKeys = [];
+    Object.keys(subp).forEach((key) => {
+      if (key === 'dependencies') {
+        // eslint-disable-next-line
+        delete subp.dependencies;
+        return;
+      }
+      if (key === 'plugins') {
+        Object.keys(subp.plugins).forEach((pk) => {
+          pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
+        });
+        return;
+      }
+      if (MODULE_CONFIG_INVALID_KEY.indexOf(key) > -1) {
+        // 如果分包配置中有不支持的key，则错误提醒
+        invalidKeys.push(key);
+        return;
+      }
+      if (['requiredBackgroundModes', 'embeddedAppIdList'].indexOf(key) > -1) {
+        // 提到appjson最上层处理
+        const preVal = appJson[key];
+        // eslint-disable-next-line
+        preVal ? appJson[key] = Array.from(new Set(preVal
+          // eslint-disable-next-line
+          .slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
+        return;
+      }
+    });
+    if (invalidKeys.length) {
+      fail(`不支持分包${subp?.name}配置${invalidKeys.join(',')}\n`);
+    }
     // eslint-disable-next-line
-    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
+    invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
+    return subp;
+  });
+  // 如果plugins重复，则错误提示
+  const pluginsErrMsg = Object.keys(pluginsMap).map((pk) => {
+    if (pluginsMap[pk].length > 1) {
+      return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
+    }
+    return '';
+  })
+    .reduce((pre, cur) => pre + cur, '');
+  if (pluginsErrMsg) {
+    fail(`plugins配置出现错误:${pluginsErrMsg}`);
   }
+  // eslint-disable-next-line
+  appJson.subpackages = subps;
 };
 
 
@@ -123,22 +193,29 @@ const updateSubpackages = (appJson, modulesConfig) => {
  * @param {array} modules
  * @returns
  */
-function buildOutputAppJson(tmsConfig, modules) {
-  // 获取当前 modules 下的所有子模块的配置内容
-  const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, DEFAULT_MODULE_DIR, MODULE_CONFIG_FILENAME);
-  // 获取app.json的配置
-  const appJson = getAppJsonContent(resolve('./app.json'));
-  // 更新app.json中的subpackages
-  updateSubpackages(appJson, modulesConfig);
-  // 更新主包，需在subpackages处理完成后执行， pages/
-  updateMainPackages(appJson, tmsConfig.mainPackages, DEFAULT_MODULE_DIR);
-
-  fs.writeFileSync(resolve(`${tmsConfig.webpack.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
-
-  return appJson;
+function buildOutputAppJson(tmsConfig, modules, isDev) {
+  try {
+    // 获取当前 modules 下的所有子模块的配置内容
+    const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
+    // 获取app.json的配置
+    const appJson = getAppJsonContent(resolve('./app.json'));
+    // 更新app.json中的subpackages
+    updateSubpackages(appJson, modulesConfig);
+    // 处理appJson中重复||冲突的地方
+    processAppJson(appJson);
+    // 更新主包，需在subpackages处理完成后执行， pages/
+    updateMainPackages(appJson, tmsConfig.mainPackages);
+
+    fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+
+    return appJson;
+  } catch (e) {
+    handleError(`生成app.json出现错误: ${e}`, isDev);
+  }
 }
 
 module.exports = {
   setModuleConfig,
+  getValidModules,
   buildOutputAppJson,
 };

package/src/utils/checkDependencies.js

@@ -2,8 +2,8 @@ const fs = require('fs');
 const semver = require('semver');
 const { resolve } = require('./widgets');
 const path = require('path');
-const { fail } = require('./log');
 const shelljs = require('shelljs');
+const { handleError } = require('./handleError');
 
 const getLatestVersion = (npmName) => {
   const data = shelljs.exec(`npm view ${npmName} version`);
@@ -17,7 +17,7 @@ const getLatestVersion = (npmName) => {
  * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
  * @returns
  */
-const checkDependencies = (modules, cwd, outputDir) => {
+const checkDependencies = (modules, cwd, outputDir, isDev) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json';  // 查找文件名
   // 1.1根目录的package.json
@@ -41,12 +41,12 @@ const checkDependencies = (modules, cwd, outputDir) => {
   // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
   for (const item of packageArr) {
     const packageJson = fs.readFileSync(item.srcPackageDir, 'utf-8');
-    let dependencies;
+    let dependencies = {};
     try {
-      dependencies = JSON.parse(packageJson).dependencies;
+      const json = JSON.parse(packageJson);
+      dependencies = json?.dependencies ? json?.dependencies : {};
     } catch (e) {
-      fail(`解析${packageJson}报错，请检查是否是正确的json配置项`);
-      process.exit(1);
+      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项`, isDev);
     }
     const dependenciesKeys = Object.keys(dependencies);
     for (const key of dependenciesKeys) {

package/src/utils/cloneModules.js

@@ -1,9 +1,29 @@
 const MetalSmith = require('metalsmith');
 const { getGlobalInstance } = require('./global.js');
 const { downloadRepoForGit, resolve } = require('./widgets');
+const { readTmsPrivateCf } = require('../utils/tkitUtils');
 const { fail } = require('./log');
 const fs = require('fs');
 const shelljs = require('shelljs');
+const { handleError } = require('./handleError.js');
+
+/**
+ * 处理用户没有clone git仓库权限问题——拼接账号信息
+ * @param {*} httpRepoUrl
+ * @param {*} moduleName
+ * @returns
+ */
+function replaceGitUrlAccount(httpRepoUrl, moduleName, privateCf) {
+  let gitUrl = httpRepoUrl;
+  const { username = '', pass = '' } = privateCf?.gitAccout?.[moduleName] || {};
+
+  const urlPrefixReg = /http(s)?:\/\//;
+  if (username && pass && urlPrefixReg.test(gitUrl)) {
+    gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
+  }
+
+  return gitUrl;
+}
 
 /**
  * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
@@ -14,15 +34,15 @@ const shelljs = require('shelljs');
  */
 function moveFile(sourceDir, targetDir, ignore = []) {
   // 删除不是文件夹的文件
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     MetalSmith(__dirname)
       .ignore(ignore)
       .source(sourceDir)
       .destination(targetDir)
       .build((e) => {
         if (e) {
-          fail(e); // eslint-disable-line
-          console.log('MetalSmith 详细的错误信息:', e);
+          fail(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+          reject(e);
         }
         resolve();
       });
@@ -33,13 +53,17 @@ function moveFile(sourceDir, targetDir, ignore = []) {
  * 下载目标模块
  * @param { string } sourceDir 缓存文件夹
  * @param { string } targetDir 目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } modules 描述模块的列表
  */
-async function cloneModules(sourceDir, targetDir, modules) {
+async function cloneModules(sourceDir, targetDir, modules, isDev) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const privateCf = readTmsPrivateCf();
+
   // 根据小程序的配置文件下载模块， 并且处理信息
-  for (const moduleInfo of modules) { // eslint-disable-line
+  for (const moduleInfo of modules) {
     if (moduleInfo.repoInfo) {
-      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo);
+      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev);
     }
   }
 }
@@ -48,13 +72,14 @@ async function cloneModules(sourceDir, targetDir, modules) {
  * 下载模块信息并且将它移动到对应的位置
  * @param { string } sourceDir 代码缓存文件夹
  * @param { string } targetDir 代码要放到的目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } moduleInfo 描述模块的信息
  */
-async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo) {
-  const { repoInfo: { buildGitTag, httpRepoUrl }, path } = moduleInfo;
+async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo, privateCf, isDev) {
+  const { repoInfo: { buildGitTag, httpRepoUrl }, path, name } = moduleInfo;
 
   // 源码临时存在的源目录
-  let sourcePath = resolve(sourceDir, path);
+  let sourcePath = resolve(sourceDir, name);
   // 源码要放到目标目录
   const targetPath = resolve(targetDir, path);
   // 设置模块的构建分支
@@ -66,22 +91,23 @@ async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo) {
 
   try {
     if (!moduleInCache) {
-      await downloadRepoForGit(httpRepoUrl, sourcePath, cloneBranch);
+      // 处理仓库权限问题
+      const gitUrl = replaceGitUrlAccount(httpRepoUrl, name, privateCf);
+      await downloadRepoForGit(gitUrl, sourcePath, cloneBranch);
       globalInstance.setModuleCache(httpRepoUrl, cloneBranch, sourcePath);
     } else {
       sourcePath = globalInstance.getModuleCache(httpRepoUrl, cloneBranch).dest;
     }
 
     if (fs.existsSync(targetPath)) {
-      shelljs.rm('-rf', targetPath);
+      shelljs.rm('-rf', `${targetPath}/*`);
     }
     await moveFile(sourcePath, targetPath, [
       'node_modules',
       '.git',
     ]);
   } catch (e) {
-    fail(`downLoadAndMoveModule ${e}`);  // eslint-disable-line
-    process.exit(-1);
+    handleError(e, isDev);
   }
 }
 

package/src/utils/findCssImport.js

@@ -0,0 +1,30 @@
+/* eslint-disable no-param-reassign */
+const strip = require('strip-comments');
+// 匹配规则
+const MATCH_RULE = new RegExp(/@import *(?:url\(['"]?([^'")]+)['"]?\)|['"]([^'"]+)['"]);?/g);
+
+/**
+ * 获取样式文件中的@import语句
+ * @param code 代码片段
+ * @returns 结果数组
+ */
+const findCssImports = (code) => {
+  // 将buffer转成字符串
+  code = code.toString();
+  // 去除注释
+  code = strip.block(code);
+  // 定义最后返回的结果
+  const result = [];
+  let matchList;
+  // 循环遍历代码段，直至匹配结果为空
+  while ((matchList = MATCH_RULE.exec(code))) {
+    // 存入结果数组
+    result.push(matchList?.[1] || matchList?.[2]);
+  }
+  // 返回结果
+  return result;
+};
+
+module.exports = {
+  findCssImports,
+};

package/src/utils/handleError.js

@@ -0,0 +1,16 @@
+const { fail } = require('./log');
+
+function handleError(error, isDev = false) {
+  const errMsg = typeof error === 'object' ? error.message : error;
+  if (isDev) {
+    fail(errMsg);
+  } else {
+    fail(errMsg);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  handleError,
+};
+