@tmsfe/tmskit 0.0.10 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -43,9 +43,6 @@
     "fs-extra": "^10.0.1",
     "glob-ignore": "^1.0.2",
     "gulp": "^4.0.2",
-    "gulp-cache": "^1.1.3",
-    "gulp-postcss": "^9.0.1",
-    "gulp-px-to-rpx": "^1.0.7",
     "gulp-watch": "^5.0.1",
     "htmlparser2": "^7.2.0",
     "inquirer": "^7.3.3",
@@ -53,6 +50,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "miniprogram-ci": "1.4.13",
+    "moment": "^2.29.1",
     "object-assign": "^4.0.1",
     "ora": "^5.1.0",
     "plugin-error": "^1.0.0",

package/src/compile/compile.js

@@ -1,6 +1,5 @@
-const { src, dest, lastRun } = require('gulp');
-const px2rpx = require('gulp-px-to-rpx');
-const watch = require('gulp-watch');
+const { src, dest } = require('gulp');
+// const px2rpx = require('gulp-px-to-rpx');
 // const cache = require('gulp-cache');
 // const image = require('gulp-image');
 // const replaceEnv = require('./plugins/replaceEnv');
@@ -11,7 +10,7 @@ const { mpWxmlDep } = require('./plugins/mpWxmlDep');
 // const base64 = require('./plugins/postcss-font-base64');
 const { fail } = require('../utils/log');
 
-const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
+// const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
 module.exports = function (
   tmsConfig,
   {
@@ -19,72 +18,133 @@ module.exports = function (
     destPath,
     srcOption,
     module,
-    watchOption = { events: ['change', 'add', 'unlink'] },
     isWatch,
   },
 ) {
+  const compileTasksMap = new Map();
   Object.keys(glob).forEach((globKey) => {
     const globValue = glob[globKey];
-    const task = () => src(globValue, { ...srcOption, since: since(task) });
-    let srcPipe = task();
-
-    if (isWatch) {
-      srcPipe = srcPipe.pipe(watch(globValue, watchOption));
-    }
 
     switch (globKey) {
       case 'js':
-        srcPipe
-          // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
-          .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch))
-          .pipe(dest(destPath))
-          .on('error', (err) => {
-            fail(`js编译报错${err}`);
-          });
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+                // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
+                .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch))
+                .pipe(dest(destPath))
+                .on('error', (err) => {
+                  fail(`js编译报错${err}`);
+                });
+            },
+          },
+        );
         break;
       case 'wxss':
-        srcPipe
-          .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
-          .on('error', (err) => {
-            fail(`mpCommonDep编译报错${err}`);
-          })
-          // .pipe(postcss([base64()]))
-          // .on('error', (err) => {
-          //   fail(`postcss编译报错${err}`);
-          // })
-          .pipe(px2rpx({
-            designWidth: 375, // 设计稿宽度，默认为750
-            precision: 2, // 小数最大精度，默认为6
-          }))
-          .pipe(dest(destPath));
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+                .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
+                .on('error', (err) => {
+                  fail(`mpCommonDep编译报错${err}`);
+                })
+                // .pipe(postcss([base64()]))
+                // .on('error', (err) => {
+                //   fail(`postcss编译报错${err}`);
+                // })
+                // .pipe(px2rpx({
+                //   designWidth: 375, // 设计稿宽度，默认为750
+                //   precision: 2, // 小数最大精度，默认为6
+                // }))
+                .pipe(dest(destPath));
+            },
+          },
+        );
         break;
       case 'json':
-        srcPipe
-          .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
-          .on('error', (err) => {
-            fail(`mpJsonDep编译报错${err}`);
-          })
-          .pipe(dest(destPath));
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+                .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
+                .on('error', (err) => {
+                  fail(`mpJsonDep编译报错${err}`);
+                })
+                .pipe(dest(destPath));
+            },
+          },
+        );
         break;
       case 'wxml':
-        srcPipe
-          .pipe(mpWxmlDep(tmsConfig, module, isWatch))
-          .pipe(dest(destPath));
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+                .pipe(mpWxmlDep(tmsConfig, module, isWatch))
+                .pipe(dest(destPath));
+            },
+          },
+        );
         break;
       case 'image':
-        srcPipe
-          // .pipe(cache(image()))
-          // .on('error', (err) => {
-          //   fail(`image编译报错${err}`);
-          // })
-          .pipe(dest(destPath));
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+              // .pipe(cache(image()))
+              // .on('error', (err) => {
+              //   fail(`image编译报错${err}`);
+              // })
+                .pipe(dest(destPath));
+            },
+          },
+        );
         break;
       case 'other':
-        srcPipe
-          .pipe(dest(destPath));
+        compileTasksMap.set(
+          globValue,
+          {
+            module,
+            taskFn: () => {
+              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+              // const srcPipe = srcTask();
+              const srcPipe = src(globValue, { ...srcOption });
+              return srcPipe
+                .pipe(dest(destPath));
+            },
+          },
+        );
         break;
       default:
         break;
     }
   });
+  return compileTasksMap;
 };

package/src/compile/dev.js

@@ -1,11 +1,15 @@
 const path = require('path');
 const fs = require('fs');
-const watch = require('gulp-watch');
-const { resolve } = require('../utils/widgets');
+const ora = require('ora');
+const { parallel, series } = require('gulp');
+const { resolve, mergeMap } = require('../utils/widgets');
 const { buildOutputAppJson } = require('../core/buildAppJson');
 const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
+const watch = require('./watch');
+const { info } = require('../utils/log');
 
+const watchEvents = ['add', 'change', 'unlink', 'unlinkDir'];
 function excludeGlob(glob) {
   const otherArr = new Set();
   otherArr.add('!**/*.{ttf,otf,woff,eot}');
@@ -31,19 +35,21 @@ function adaptPath(pathDir) {
   newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
   return newPath;
 }
-
 module.exports = async (tmsConfig, newModules, isWatch = true) => {
+  const compileTasksMap = new Map();
   // 监听app.json
   if (isWatch) {
-    watch(resolve('app.json'), { ignoreInitial: false, events: ['add', 'change'] }, () => {
-      buildOutputAppJson(tmsConfig, newModules, isWatch);
-    });
+    watch(
+      [resolve('app.json')],
+      { ignoreInitial: false, events: watchEvents },
+      () => buildOutputAppJson(tmsConfig, newModules, isWatch),
+    );
   } else {
     buildOutputAppJson(tmsConfig, newModules, isWatch);
   }
 
   // 监听根目录的文件
-  compile(tmsConfig, {
+  mergeMap(compileTasksMap, compile(tmsConfig, {
     glob: {
       json: DEFAULT_COPY_CONFIG.map(item => resolve(item)),
       // wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
@@ -53,7 +59,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
     destPath: resolve(tmsConfig.outputDir),
     srcOption: { allowEmpty: true },
     isWatch,
-  });
+  }));
 
   // 监听模块的文件
   for (let module of newModules) {
@@ -65,22 +71,24 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
 
     if (isWatch) {
       // 监听模块配置文件
-      watch(`${resolve(module.path)}/**/module.config.json`, {  events: ['change'] }, () => {
-        buildOutputAppJson(tmsConfig, newModules, isWatch);
-      });
+      watch(
+        [`${resolve(module.path)}/**/module.config.json`],
+        { events: watchEvents },
+        () => buildOutputAppJson(tmsConfig, newModules, isWatch),
+      );
     }
 
     const excludes = module.exclude.map(key => `!${resolve(key)}`);
     const modulePath = adaptPath(module.path);
     const glob = {
       js: [`${modulePath}/**/*.{js,ts,wxs}`, ...excludes],
-      json: [`${modulePath}/**/*.json`, ...excludes],
+      json: [`${modulePath}/**/*.json`, `!${modulePath}/**/module.config.json`, ...excludes],
       wxss: [`${modulePath}/**/*.{less,wxss}`, ...excludes],
       wxml: [`${modulePath}/**/*.wxml`, ...excludes],
       image: [`${modulePath}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
     };
 
-    compile(tmsConfig, {
+    mergeMap(compileTasksMap, compile(tmsConfig, {
       glob: {
         ...glob,
         other: [`${modulePath}/**/*`, ...excludeGlob(glob)],
@@ -89,7 +97,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       module: { from: module.path, to: module.root },
       srcOption: { allowEmpty: true },
       isWatch,
-    });
+    }));
   }
 
   // 静态资源目录-拷贝
@@ -114,7 +122,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       }
 
       const from = fs.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
-      compile(tmsConfig, {
+      mergeMap(compileTasksMap, compile(tmsConfig, {
         glob,
         destPath: item.to,
         module: {
@@ -123,7 +131,35 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
         },
         srcOption: { allowEmpty: true },
         isWatch,
+      }));
+    }
+  }
+
+  let sTime;
+  let eTime;
+  const spinner = ora();
+  function end(cb) {
+    if (isWatch) {
+      compileTasksMap.forEach(({ taskFn, module }, globValue) => {
+        watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
       });
     }
+    eTime = new Date().getTime() - sTime;
+    spinner.succeed(`首次编译完成， 耗时${eTime / 1000}s, 微信开发者工具打开项目即刻预览。`);
+    spinner.stop();
+    cb();
+  }
+
+  function start(cb) {
+    info('启动编译...');
+    spinner.start();
+    sTime = new Date().getTime();
+    cb();
   }
+
+  const compileTasks = [];
+  compileTasksMap.forEach(({ taskFn }) => {
+    compileTasks.push(taskFn);
+  });
+  series(start, parallel(...compileTasks), end)();
 };

package/src/compile/watch.js

@@ -0,0 +1,29 @@
+const watch = require('gulp-watch');
+const path = require('path');
+const shellJs = require('shelljs');
+const { info } = require('../utils/log');
+const { resolve } = require('../utils/widgets');
+const { global } = require('../utils/global');
+
+module.exports = function (glob, watchOptions, callback, module) {
+  watch(glob, {
+    readDelay: 100,
+    ...watchOptions,
+  }, (vinyl) => {
+    const file = vinyl.history[0];
+    const fileDirArr = file.replace(/\\/g, '/').split('/');
+    const fileName = fileDirArr.slice(fileDirArr.length - 2).join('/');
+
+    if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
+      const tmsConfig = global.getData('tmsConfig');
+      const anaFileRelativeModule = path.relative(resolve(module.from), file);
+      const anaFileDestFile = resolve(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+      info(`删除${fileName}`);
+      shellJs.rm('-rf', anaFileDestFile);
+      return;
+    }
+
+    info(`更新${fileName}`);
+    return callback(vinyl);
+  });
+};

package/src/core/cloneModules.js

@@ -21,7 +21,9 @@ function replaceGitUrlAccount(httpRepoUrl, moduleName) {
   const tmsPrivateCf = global.getData('tmsPrivateCf');
 
   let gitUrl = httpRepoUrl;
-  const { username = '', pass = '' } = tmsPrivateCf?.gitAccout?.[moduleName] || {};
+  const { username = '', pass = '' } = tmsPrivateCf?.gitAccout?.[moduleName]
+    || tmsPrivateCf?.gitAccount?.[moduleName]
+    || {};
 
   const urlPrefixReg = /http(s)?:\/\//;
   if (username && pass && urlPrefixReg.test(gitUrl)) {
@@ -74,6 +76,7 @@ function md5ByGitUrlBranch(gitUrl, branch) {
  * @returns { array } modules 描述模块的列表
  */
 async function cloneModules(sourceDir, targetDir, modules) {
+  const cwd = process.cwd();
   // 收集下载模块代码的任务
   const downloadTasksMap = collectDownLoadTasksMap(sourceDir, targetDir, modules);
 
@@ -94,6 +97,7 @@ async function cloneModules(sourceDir, targetDir, modules) {
   });
 
   await Promise.all(arrPromises);
+  shelljs.cd(cwd);
 }
 
 /**
@@ -154,12 +158,12 @@ function collectDownLoadTasksMap(sourceDir, targetDir,  modules) {
         let promiseTask;
         if (fs.existsSync(sourcePath) && fs.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info(`git pull仓库:${httpRepoUrl}`);
+            info(`git pull:${httpRepoUrl}`);
             return pullRepoForGit(sourcePath, branch);
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info(`git clone仓库: ${httpRepoUrl}`);
+            info(`git clone: ${httpRepoUrl}`);
             return downloadRepoForGit(gitUrl, sourcePath, branch);
           };
         }

package/src/core/isInIt.js

@@ -1,21 +1,17 @@
 const fs = require('fs');
 const { resolve } = require('../utils/widgets');
-const { MODULE_CONFIG_FILENAME, MODULE_CODE_DIR } = require('../config/constant');
+const { MODULE_CODE_DIR } = require('../config/constant');
 const { checkRemoteModGitUrlBranch } = require('./cloneModules');
 const { checkDependencies } = require('./checkDependencies');
 const { fail } = require('../utils/log');
 
-function checkModule(targetModules, contextDir) {
+function checkModule(targetModules) {
   // 判断\源码\dist\是否存在用户指定的模块
   for (const item of targetModules) {
     // 此模块没有root字段(原因：没有merge到module.config.json的配置项。第三方模块的代码可能还没有下载)
     if (!item.root) {
       return true;
     }
-    // 判断dist目录是否有该模块
-    if (!fs.existsSync(`${contextDir}/${item.root}/${MODULE_CONFIG_FILENAME}`)) {
-      return true;
-    }
 
     // 判断第三方远程模块git地址与branch是否有更新
     if (checkRemoteModGitUrlBranch(MODULE_CODE_DIR, item)) {

package/src/core/npm.js

@@ -10,7 +10,6 @@ const glob = require('glob-ignore');
 const log = require('../utils/log');
 const { npmInstall } = require('../utils/widgets');
 const { handleError } = require('./handleError');
-const { info } = require('console');
 
 const shellJsOption = { async: false, silent: true };
 const dirPath = process.cwd(); // 项目根目录
@@ -52,8 +51,8 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
             ...shellJsOption,
             cwd: packageJsonDir,
           };
-          shell.exec('tar -xzvf ./node_modules.tar.gz -C ./',  newShellJsOption);
-          shell.exec('rm -rf ./node_modules.tar.gz', newShellJsOption);
+          shell.exec('tar -xvf ./node_modules.tar.gz -C ./',  newShellJsOption);
+          shell.rm('-rf', './node_modules');
         },
       };
 
@@ -70,14 +69,14 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
           promiseTask = (packageJsonPath, cacheNMPath, shell) => {
             fsExtra.emptydirSync(cacheNMPath);
             shell.cp('-f', packageJsonPath, cacheNMPath);
-            info(`npm install: ${packageJsonPath}`);
+            log.info(`npm install: ${packageJsonPath}`);
             return npmInstall(cacheNMPath).then(() => {
               const newShellJsOption = {
                 ...shellJsOption,
                 cwd: cacheNMPath,
               };
-              shell.exec('tar -zcvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
-              shell.exec('rm -rf ./node_modules', newShellJsOption);
+              shell.exec('tar -cvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
+              shell.rm('-rf', './node_modules');
             });
           };
         }
@@ -99,6 +98,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 
 // 遍历安装指定目录下所有项目的npm依赖
 const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
+  const cwd = process.cwd();
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
 
   // 收集npm install的任务
@@ -121,6 +121,7 @@ const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
   });
 
   await Promise.all(arrPromises);
+  shell.cd(cwd);
 };
 
 /**

package/src/core/symbolicLink.js

@@ -11,7 +11,12 @@ const symLink = (tmsConfig) => {
   try {
     if (tmsConfig.cloudModules) {
       tmsConfig.cloudModules.forEach((item) => {
-        fs.symlinkSync(resolve(item.path), resolve(DEFAULT_CLOUD_MODULE_DIR, item.name));
+        const path = resolve(DEFAULT_CLOUD_MODULE_DIR, item.name);
+        fs.access(path, fs.constants.F_OK, (res) => {
+          if (res) {
+            fs.symlinkSync(resolve(item.path), path);
+          }
+        });
       });
     }
   } catch (e) {

package/src/core/tmsMpconfig.js

@@ -3,7 +3,7 @@
  */
 const loadash = require('lodash');
 const fs = require('fs');
-const { TMS_NAME, TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
+const { TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
 const { resolve, isObject, isArray } = require('../utils/widgets');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
 const { fail } = require('../utils/log');
@@ -77,15 +77,18 @@ const readTmsPrivateCf = function () {
  * @param { array } modules
  * @returns
  */
-const checkModules = function (tmsConfig, modules) {
+const checkModules = function (tmsConfig, modules, isQuit = false) {
   const targetModules = [];
   modules.forEach((moduleName) => {
     const module = tmsConfig.modules.find(module => module.name === moduleName);
     module && targetModules.push(module);
   });
+
+
   if (targetModules.length === 0) {
-    fail(`你启动的模块无效，尝试 ${TMS_NAME} -m moduleName`);
-    process.exit(1);
+    fail(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
+    >name字段与module.config.json的name字段是否一致`);
+    isQuit && process.exit(1);
   }
   return targetModules;
 };
@@ -175,7 +178,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
           }
         });
         if (!findModule) {
-          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
+          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -213,10 +216,12 @@ const subModulesMergeDepModules = (tmsConfig, modules) => {
       // 如果所有模块的dep都在moduleNames内，则所有依赖都齐了
       // 否则递归处理，根据name找到相关配置加到modules里
       if (moduleNames.indexOf(item) === -1) {
-        isOver = false;
         const tmpModules = checkModules(tmsConfig, [...new Set([item])]);
-        mergeModules = [...mergeModules, ...tmpModules];
-        mergeModules = tmsModulesMergeLocalModuleCfg(mergeModules, tmsConfig.appName);
+        if (tmpModules.length > 0) {
+          isOver = false;
+          mergeModules = [...mergeModules, ...tmpModules];
+          mergeModules = tmsModulesMergeLocalModuleCfg(mergeModules, tmsConfig.appName);
+        }
       }
     });
   });

package/src/index.js

@@ -39,9 +39,7 @@ function registerCommand(program, commands) {
 registerCommand(program, commands);
 
 program.on('--help', () => {
-  info();
   info(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);
-  info();
 });
 
 // 捕获未注册的命令
@@ -49,8 +47,7 @@ program
   .arguments('<command>')
   .action((cmd) => {
     program.outputHelp();
-    info(`  ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
-    info();
+    info(` ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
     suggestCommands(cmd);
     process.exitCode = 1;
   });

package/src/scripts/run/index.js

@@ -55,12 +55,16 @@ async function run(commandName, cmd) {
     tmsConfig.modules,
   );
 
-  const modules = checkModules(tmsConfig, [
-    ...new Set([
-      ...tmsConfig.mainPackages,
-      ...specificModules,
-    ]),
-  ]);
+  const modules = checkModules(
+    tmsConfig,
+    [
+      ...new Set([
+        ...tmsConfig.mainPackages,
+        ...specificModules,
+      ]),
+    ],
+    true,
+  );
 
   // tms.config.js的modules 合并 module.config.json的配置项
   let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
@@ -72,6 +76,7 @@ async function run(commandName, cmd) {
     env,
     cmd,
     tmsPrivateCf,
+    tmsConfig,
   });
 
   switch (commandName) {

package/src/utils/io.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { info } = require('../utils/log');
+const { relativeCwdPath } = require('../utils/widgets');
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -44,11 +45,11 @@ function diffContentCopyFile(originFile, destFile) {
     const depDestContent = fs.readFileSync(destFile, 'utf8');
     const depOriginContent = fs.readFileSync(originFile, 'utf8');
     if (depDestContent !== depOriginContent) {
-      info(`拷贝${originFile}内容到${destFile}`);
+      info(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info(`拷贝${originFile}内容到${destFile}`);
+    info(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 }