@tmsfe/tmskit 0.0.13 → 0.0.15-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.13",
+  "version": "0.0.15-beta.1",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -14,7 +14,11 @@
   ],
   "scripts": {
     "dev": "rollup -wc --environment TARGET:tmskit",
-    "build": "rollup -c --environment TARGET:tmskit"
+    "build": "rollup -c --environment TARGET:tmskit",
+    "pub:patch": "sh build/publish.sh patch",
+    "pub:minor": "sh build/publish.sh minor",
+    "pub:major": "sh build/publish.sh major",
+    "postinstall": "cd node_modules/gulp-watch && npm install chokidar@3.5.3"
   },
   "author": "tms·web",
   "license": "ISC",
@@ -53,6 +57,7 @@
     "moment": "^2.29.1",
     "object-assign": "^4.0.1",
     "ora": "^5.1.0",
+    "patch-package": "^6.4.7",
     "plugin-error": "^1.0.0",
     "postcss": "^8.4.6",
     "precinct": "^8.3.1",

package/src/compile/compile.js

@@ -18,7 +18,7 @@ module.exports = function (
     destPath,
     srcOption,
     module,
-    isWatch,
+    isDev,
   },
 ) {
   const compileTasksMap = new Map();
@@ -31,14 +31,17 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
                 // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
-                .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch))
-                .pipe(dest(destPath))
+                .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isDev))
+                .on('error', (err) => {
+                  fail(`mpCommonDep编译报错${err}`);
+                })
+                .pipe(dest(newDestPath, { overwrite: true }))
                 .on('error', (err) => {
                   fail(`js编译报错${err}`);
                 });
@@ -51,12 +54,12 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
-                .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
+                .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isDev))
                 .on('error', (err) => {
                   fail(`mpCommonDep编译报错${err}`);
                 })
@@ -68,7 +71,10 @@ module.exports = function (
                 //   designWidth: 375, // 设计稿宽度，默认为750
                 //   precision: 2, // 小数最大精度，默认为6
                 // }))
-                .pipe(dest(destPath));
+                .pipe(dest(newDestPath))
+                .on('error', (err) => {
+                  fail(`wxss编译报错${err}`);
+                });
             },
           },
         );
@@ -78,16 +84,19 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
-                .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
+                .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isDev))
                 .on('error', (err) => {
                   fail(`mpJsonDep编译报错${err}`);
                 })
-                .pipe(dest(destPath));
+                .pipe(dest(newDestPath))
+                .on('error', (err) => {
+                  fail(`json编译报错${err}`);
+                });
             },
           },
         );
@@ -97,13 +106,19 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
-                .pipe(mpWxmlDep(tmsConfig, module, isWatch))
-                .pipe(dest(destPath));
+                .pipe(mpWxmlDep(tmsConfig, module, isDev))
+                .on('error', (err) => {
+                  fail(`mpWxmlDep编译报错${err}`);
+                })
+                .pipe(dest(newDestPath))
+                .on('error', (err) => {
+                  fail(`wxml编译报错${err}`);
+                });
             },
           },
         );
@@ -113,16 +128,19 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
               // .pipe(cache(image()))
               // .on('error', (err) => {
               //   fail(`image编译报错${err}`);
               // })
-                .pipe(dest(destPath));
+                .pipe(dest(newDestPath))
+                .on('error', (err) => {
+                  fail(`image编译报错${err}`);
+                });
             },
           },
         );
@@ -132,12 +150,15 @@ module.exports = function (
           globValue,
           {
             module,
-            taskFn: () => {
-              // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
-              // const srcPipe = srcTask();
-              const srcPipe = src(globValue, { ...srcOption });
+            taskFn: (sourceFile, targetPath) => {
+              const newGlobValue = Array.isArray(sourceFile) ? sourceFile : globValue;
+              const newDestPath = targetPath ? targetPath : destPath;
+              const srcPipe = src(newGlobValue, { ...srcOption });
               return srcPipe
-                .pipe(dest(destPath));
+                .pipe(dest(newDestPath))
+                .on('error', (err) => {
+                  fail(`编译报错${err}`);
+                });
             },
           },
         );

package/src/compile/dev.js

@@ -35,17 +35,18 @@ function adaptPath(pathDir) {
   newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
   return newPath;
 }
-module.exports = async (tmsConfig, newModules, isWatch = true) => {
+module.exports = async (tmsConfig, newModules, isDev = true) => {
   const compileTasksMap = new Map();
   // 监听app.json
-  if (isWatch) {
+  if (isDev) {
     watch(
       [resolve('app.json')],
       { ignoreInitial: false, events: watchEvents },
-      () => buildOutputAppJson(tmsConfig, newModules, isWatch),
+      () => buildOutputAppJson(tmsConfig, newModules, isDev),
+      { from: resolve(), to: resolve(tmsConfig.outputDir) },
     );
   } else {
-    buildOutputAppJson(tmsConfig, newModules, isWatch);
+    buildOutputAppJson(tmsConfig, newModules, isDev);
   }
 
   // 监听根目录的文件
@@ -55,10 +56,10 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       // wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
       // js: ['app.js', 'app.ts'].map(item => resolve(item)),
     },
-    module: { from: '', to: '' },
+    module: { from: resolve(), to: resolve(tmsConfig.outputDir) },
     destPath: resolve(tmsConfig.outputDir),
     srcOption: { allowEmpty: true },
-    isWatch,
+    isDev,
   }));
 
   // 监听模块的文件
@@ -68,18 +69,19 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       ...{ exclude: [] },
       ...module,
     };
+    const modulePath = adaptPath(module.path);
 
-    if (isWatch) {
+    if (isDev) {
       // 监听模块配置文件
       watch(
-        [`${resolve(module.path)}/**/module.config.json`],
+        [`${modulePath}/**/module.config.json`],
         { events: watchEvents },
-        () => buildOutputAppJson(tmsConfig, newModules, isWatch),
+        () => buildOutputAppJson(tmsConfig, newModules, isDev),
+        { from: modulePath, to: modulePath },
       );
     }
 
     const excludes = module.exclude.map(key => `!${resolve(key)}`);
-    const modulePath = adaptPath(module.path);
     const glob = {
       js: [`${modulePath}/**/*.{js,ts,wxs}`, ...excludes],
       json: [`${modulePath}/**/*.json`, `!${modulePath}/**/module.config.json`, ...excludes],
@@ -96,7 +98,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       destPath: resolve(tmsConfig.outputDir, module.root),
       module: { from: module.path, to: module.root },
       srcOption: { allowEmpty: true },
-      isWatch,
+      isDev,
     }));
   }
 
@@ -130,7 +132,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
           to: item.to,
         },
         srcOption: { allowEmpty: true },
-        isWatch,
+        isDev,
       }));
     }
   }
@@ -138,25 +140,27 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   let sTime;
   let eTime;
   const spinner = ora();
+  function start(cb) {
+    info('启动编译...');
+    spinner.start();
+    sTime = new Date().getTime();
+    cb();
+  }
   function end(cb) {
-    if (isWatch) {
+    if (isDev) {
       compileTasksMap.forEach(({ taskFn, module }, globValue) => {
         watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
       });
     }
     eTime = new Date().getTime() - sTime;
-    spinner.succeed(`首次编译完成， 耗时${eTime / 1000}s, 微信开发者工具打开项目即刻预览。`);
+    if (typeof tmsConfig?.hooks?.afterCompile === 'function') {
+      tmsConfig?.hooks?.afterCompile({ isDev, tmsConfig, modules: newModules });
+    }
+    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);

package/src/compile/watch.js

@@ -1,29 +1,46 @@
 const watch = require('gulp-watch');
 const path = require('path');
 const shellJs = require('shelljs');
-const { info } = require('../utils/log');
+const { info, warn } = require('../utils/log');
 const { resolve } = require('../utils/widgets');
 const { global } = require('../utils/global');
 
-module.exports = function (glob, watchOptions, callback, module) {
-  watch(glob, {
-    readDelay: 100,
+const TIP_MAP = {
+  'package.json': '若依赖有变动，请重新执行tmskit run dev',
+  'module.config.json': '若dependencies字段有变动，需要重新执行tmskit run dev才会生效',
+};
+
+const logTip = (fileName, tipMap) => {
+  // eslint-disable-next-line
+  for (const item in tipMap) {
+    if (fileName.indexOf(item) > -1) {
+      warn(`${fileName}有更新, ${tipMap[item]}`);
+      return;
+    }
+  }
+  info(`${fileName}有更新`);
+};
+
+module.exports = function (globValue, watchOptions, callback, module) {
+  watch(globValue, {
+    // readDelay: 100,
     ...watchOptions,
   }, (vinyl) => {
-    const file = vinyl.history[0];
-    const fileDirArr = file.replace(/\\/g, '/').split('/');
-    const fileName = fileDirArr.slice(fileDirArr.length - 2).join('/');
+    const sourceFile = vinyl.history[0];
+    const sourceFileDirArr = sourceFile.replace(/\\/g, '/').split('/');
+    const sourceFileName = sourceFileDirArr.slice(sourceFileDirArr.length - 2).join('/');
+
+    const tmsConfig = global.getData('tmsConfig');
+    const sourceFileRelativeModule = path.relative(resolve(module.from), sourceFile);
+    const targetFile = resolve(tmsConfig.outputDir, module.to, sourceFileRelativeModule);
 
     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);
+      info(`删除${sourceFileName}`);
+      shellJs.rm('-rf', targetFile);
       return;
     }
 
-    info(`更新${fileName}`);
-    return callback(vinyl);
+    logTip(sourceFileName, TIP_MAP);
+    return callback([sourceFile], path.dirname(targetFile));
   });
 };

package/src/core/buildAppJson.js

@@ -154,6 +154,9 @@ function buildOutputAppJson(tmsConfig, modules) {
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
     fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    if (typeof tmsConfig?.hooks?.updateAppJson === 'function') {
+      tmsConfig?.hooks?.updateAppJson(appJson);
+    }
 
     return appJson;
   } catch (e) {

package/src/core/mpCi.js

@@ -14,7 +14,7 @@ const getMpCi = ({ appId, projectPath, type = 'miniProgram', privateKey = 'TODO'
     privateKey,
     type,
     projectPath,
-    ignores: ['node_modules/**/*', ...ignores],
+    ignores: ['node_modules/**/*', 'cloud/**/*', ...ignores],
   });
 };
 

package/src/core/npm.js

@@ -51,8 +51,9 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
             ...shellJsOption,
             cwd: packageJsonDir,
           };
+          shell.cd(packageJsonDir);
           shell.exec('tar -xvf ./node_modules.tar.gz -C ./',  newShellJsOption);
-          shell.rm('-rf', './node_modules');
+          shell.rm('-rf', './node_modules.tar.gz');
         },
       };
 
@@ -75,6 +76,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
                 ...shellJsOption,
                 cwd: cacheNMPath,
               };
+              shell.cd(cacheNMPath);
               shell.exec('tar -cvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
               shell.rm('-rf', './node_modules');
             });

package/src/core/symbolicLink.js

@@ -1,7 +1,8 @@
 const fs = require('fs');
 const { resolve } = require('../utils/widgets');
 const { handleError } = require('./handleError');
-const { DEFAULT_CLOUD_MODULE_DIR } = require('../config/constant');
+const { ensureDirExist } = require('../utils/io');
+const { warn } = require('../utils/log');
 
 /**
  * 根据相关配置创建软链接
@@ -9,14 +10,19 @@ const { DEFAULT_CLOUD_MODULE_DIR } = require('../config/constant');
  */
 const symLink = (tmsConfig) => {
   try {
+    ensureDirExist(resolve(tmsConfig.cloudDir));
     if (tmsConfig.cloudModules) {
       tmsConfig.cloudModules.forEach((item) => {
-        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);
-          }
-        });
+        const sourcePath = resolve(item.path);
+        const targetPath = resolve(tmsConfig.cloudDir, item.name);
+
+        if (!fs.existsSync(sourcePath)) {
+          warn(`云函数${sourcePath}不存在`);
+          return;
+        }
+        if (!fs.existsSync(targetPath)) {
+          fs.symlinkSync(sourcePath, targetPath);
+        }
       });
     }
   } catch (e) {

package/src/entry.js

@@ -28,7 +28,7 @@ module.exports = [
         options: [
           ['-m, --module [moduleName]', '模块名称'],
           ['-e, --env [env]', '环境变量'],
-          ['-latest, --latest', '下载最新第三方模块代码、安装最新依赖'],
+          ['-noCache, --noCache', '不使用缓存功能'],
         ],
         action: (cmd) => {
           require('./scripts/run/index')('dev', cmd);

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

@@ -2,10 +2,10 @@ const shelljs = require('shelljs');
 const compileDev = require('../../../compile/dev');
 const { resolve } = require('../../../utils/widgets');
 const init = require('../init/index');
-const { isInit } = require('../../../core/isInIt');
 const { tmsModulesMergeLocalModuleCfg } = require('../../../core/tmsMpconfig');
 const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
+const { CACHE_DIR } = require('../../../config/constant');
 
 
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
@@ -24,16 +24,20 @@ function delOtherModule(tmsConfig, targetModules) {
 
 async function dev(tmsConfig, targetModules, env) {
   let newModules = targetModules;
-  const isLatest = global.getData('cmd').latest;
-
-  // 判断是否进行init命令
-  if (isLatest || isInit(tmsConfig, targetModules, resolve('dist'))) {
-    // init函数 下载第三方代码后，会将最新的tms.config.js的modules 合并 module.config.json的配置项返回
-    const initData = await init(tmsConfig, newModules);
-    newModules = initData.targetModules;
+  const { noCache } = global.getData('cmd');
+  if (noCache) {
+    shelljs.rm('-rf', resolve('dist'));
+    shelljs.rm('-rf', CACHE_DIR);
   }
 
+  // 初始化操作
+  const initData = await init(tmsConfig, newModules);
+  newModules = initData.targetModules;
+
   info('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
+    tmsConfig?.hooks?.beforeCompile({ isDev: true, tmsConfig, modules: newModules });
+  };
   delOtherModule(tmsConfig, newModules);
   compileDev(tmsConfig, newModules, env);
 }

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

@@ -3,12 +3,12 @@ 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');
 const { fail, info } = require('../../../utils/log');
 const install = require('../install');
+const { checkDependencies } = require('../../../core/checkDependencies');
 
 /**
  * 拷贝相关配置文件到编译输出目录
@@ -39,6 +39,25 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
   });
 };
 
+/**
+ * 校验相关配置项
+ * @param {*} targetModules
+ * @returns
+ */
+function checkConfig(targetModules) {
+  for (const item of targetModules) {
+    if (!item.root) {
+      throw new Error(`检查${item.name} module.config.json的root字段`);
+    }
+
+    // 判断源码目录是否有该模块
+    if (item.path && !fs.existsSync(resolve(item.path))) {
+      throw new Error(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+    }
+  }
+  return true;
+}
+
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
   await createTask(
@@ -52,6 +71,8 @@ async function task(tmsConfig, targetModules) {
   // A分包依赖了B分包的代码， merge B分包进行编译；
   newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
+  checkConfig(newModules);
+
   // 拷贝相关配置文件到输出目录
   await createTask(
     cpFilesToOutput,
@@ -60,7 +81,9 @@ async function task(tmsConfig, targetModules) {
   )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
 
   // install
-  await install(tmsConfig, newModules, false);
+  if (checkDependencies(newModules, resolve('./'), tmsConfig.outputDir)) {
+    await install(tmsConfig, newModules);
+  }
 
   // 动态生成编译后的app.json;
   await createTask(
@@ -69,12 +92,6 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  await createTask(
-    symLink,
-    '开始创建软链接',
-    '创建软链接完成',
-  )(tmsConfig);
-
   return newModules;
 }
 async function init(tmsConfig, targetModules) {
@@ -86,7 +103,7 @@ async function init(tmsConfig, targetModules) {
     };
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
-    fail(`init流程出现错误${errMsg}`);
+    fail(`初始化流程出现错误${errMsg}`);
     info('详细的错误信息', error);
     process.exit(1);
   }

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

@@ -1,10 +1,10 @@
 const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../core/mpCi');
 const { CACHE_DIR } = require('../../../config/constant');
-const { cloudNpmInstall, mpNpmInstallAll } = require('../../../core/npm');
+const { mpNpmInstallAll } = require('../../../core/npm');
 const { global } = require('../../../utils/global');
 
-async function install(tmsConfig, modules, isCloud = false) {
+async function install(tmsConfig, modules) {
   // 小程序npm install
   await createTask(
     mpNpmInstallAll,
@@ -19,13 +19,6 @@ async function install(tmsConfig, modules, isCloud = false) {
     '开始构建miniprogram_npm',
     '构建miniprogram_npm 完成',
   )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsPrivateCf.privateKey });
-
-  // 安装云函数的
-  isCloud && createTask(
-    cloudNpmInstall,
-    '云函数npm install',
-    '云函数npm install安装完毕',
-  )(resolve(tmsConfig.cloudDir));
 }
 
 module.exports = install;

package/src/utils/log.js

@@ -14,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(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 /**
@@ -25,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(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 
@@ -35,10 +35,10 @@ const succeed = (message = '') => {
  * @returns {undefined} 无
  */
 const warn = (message) => {
-  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk.yellow(message));
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk.yellow(message));
 };
 
-const info = (...args) => console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
+const info = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 module.exports = {
   fail,

package/src/utils/widgets.js

@@ -144,13 +144,13 @@ function createTask(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
 
-    const spinner = ora(startText);
-
+    const spinner = ora();
+    info(startText);
     spinner.start();
 
     const result = await task(...args);
 
-    endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
+    endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
     spinner.stop();
 
     return result;