@tmsfe/tmskit 0.0.12 → 0.0.15

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/scripts/run/init/index.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../core/buildAppJson');
-const { symLink } = require('../../../core/symbolicLink');
 const { MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../core/cloneModules');
 const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../core/tmsMpconfig');
@@ -69,12 +68,6 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  await createTask(
-    symLink,
-    '开始创建软链接',
-    '创建软链接完成',
-  )(tmsConfig);
-
   return newModules;
 }
 async function init(tmsConfig, targetModules) {

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);
   }
 }

package/src/utils/log.js

@@ -1,4 +1,5 @@
 const chalk = require('chalk');
+const moment = require('moment');
 
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
@@ -13,7 +14,7 @@ const resetCfg = decodeURIComponent('%1B%5B0m'); // \033[0m转义后的字符按
 const fail = (message = '') => {
   const redStyleConfig = decodeURIComponent('%1B%5B41%3B30m'); // \033[41;30m转义后的字符按，console时输出红色文字
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
-  console.log(`${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 /**
@@ -24,7 +25,7 @@ const fail = (message = '') => {
 const succeed = (message = '') => {
   const greenStyleConfig = decodeURIComponent('%1B%5B42%3B30m'); // \033[42;30m转义后的字符按，console时输出绿色文字
   const greenFontStyleConfig = decodeURIComponent('%1B%5B40%3B32m'); // \033[40;32m转义后的字符按，console时输出绿色文字
-  console.log(`${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 
@@ -34,10 +35,10 @@ const succeed = (message = '') => {
  * @returns {undefined} 无
  */
 const warn = (message) => {
-  console.log(chalk.yellow(message));
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk.yellow(message));
 };
 
-const info = (...args) => console.log(...args);
+const info = (...args) => console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 module.exports = {
   fail,

package/src/utils/widgets.js

@@ -114,7 +114,7 @@ function pullRepoForGit(dest, branch) {
 function npmInstall(dir) {
   return new Promise((resolve, reject) => {
     shelljs.exec(
-      'npx yarn --production --registry http://mirrors.tencent.com/npm/',
+      'npm install --production --registry http://mirrors.tencent.com/npm/',
       { cwd: dir, silent: true },
       (code, stdout, stderr) => {
         if (code !== 0) {
@@ -147,7 +147,6 @@ function createTask(task, startText, endText) {
     const spinner = ora(startText);
 
     spinner.start();
-    info('\n');
 
     const result = await task(...args);
 
@@ -165,6 +164,22 @@ function createTask(task, startText, endText) {
  */
 const camelize = str => str.replace(/-(\w)/g, (a, c) => (c ? c.toUpperCase() : ''));
 
+const mergeMap = function (obj, src) {
+  for (const [k, v] of src) {
+    if (obj.has(k)) {
+      obj.set(k, obj.get(k) + v);
+    } else {
+      obj.set(k, v);
+    }
+  }
+
+  return obj;
+};
+
+const relativeCwdPath = function (file) {
+  return path.relative(process.cwd(), file);
+};
+
 module.exports = {
   resolve,
   isObject,
@@ -175,4 +190,6 @@ module.exports = {
   suggestCommands,
   camelize,
   npmInstall,
+  mergeMap,
+  relativeCwdPath,
 };