@tmsfe/tmskit 0.0.24-beta.0 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.24-beta.0",
+  "version": "0.0.26",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -33,6 +33,7 @@
     "@rollup/plugin-json": "^4.0.3",
     "rollup": "^2.6.1"
   },
+  "whiteDependencies": {},
   "dependencies": {
     "ansi-colors": "1.1.0",
     "anymatch": "^1.3.0",
@@ -40,7 +41,6 @@
     "chalk": "^4.1.0",
     "chokidar": "^3.5.3",
     "commander": "^8.3.0",
-    "copy-webpack-plugin": "^9.1.0",
     "ejs": "^3.1.5",
     "fancy-log": "1.3.2",
     "fs-extra": "^10.0.1",
@@ -58,7 +58,7 @@
     "miniprogram-ci": "1.8.25",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
-    "ora": "^5.1.0",
+    "ora": "^5.4.1",
     "path-is-absolute": "^1.0.1",
     "plugin-error": "^1.0.0",
     "postcss": "^8.4.6",
@@ -66,7 +66,7 @@
     "readable-stream": "^2.2.2",
     "replace-ext": "^2.0.0",
     "request": "^2.88.2",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "slash": "^1.0.0",
     "strip-comments": "^2.0.1",
     "through2": "^4.0.2",
@@ -81,4 +81,4 @@
   "jest": {
     "testEnvironment": "jest-environment-node"
   }
-}
+}

package/src/entry.js

@@ -83,7 +83,7 @@ module.exports = [
         command: 'upload',
         description: '小程序上传',
         options: [
-          ['-version, --version [version]', '上传代码版本，version 指定版本号'],
+          ['--version [version]', '上传代码版本，version 指定版本号'],
           ['-d, --desc [desc]', '上传代码时的备注'],
           ['-i, --info-output [infoOutput]', '相关信息会被输出到给定路径'],
           ['-r, --robot [robot]', '指定使用哪一个 ci 机器人，可选值：1 ~ 30'],

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

@@ -7,7 +7,7 @@ const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
 const { MODULE_CODE_DIR, NODE_MODULES_DIR } = require('../../../config/constant');
 const report = require('../../../core/report');
-const { recommendVersion } = require('../../../core/recommendVersion');
+// const { recommendVersion } = require('../../../core/recommendVersion');
 
 
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
@@ -35,7 +35,7 @@ async function dev(tmsConfig, targetModules) {
     shelljs.rm('-rf', NODE_MODULES_DIR);
   }
   // 推荐tmskit的版本
-  await recommendVersion();
+  // await recommendVersion();
 
   // 初始化操作
   const { subPackages, modules: newModules } = await init(tmsConfig, targetModules);

package/src/scripts/run/index.js

@@ -91,29 +91,29 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
   switch (commandName) {
     case 'init':
       init(tmsConfig, newModules);
-      report('run:init', { appName: tmsConfig?.appName });
+      report('run:init', { appName: tmsConfig.appName });
       return;
     case 'dev':
       global.setData('isDev', true);
       dev(tmsConfig, newModules);
-      report('run:dev', { appName: tmsConfig?.appName });
+      report('run:dev', { appName: tmsConfig.appName });
       return;
     case 'install':
       install(tmsConfig, subPackages, false);
-      report('run:install', { appName: tmsConfig?.appName });
+      report('run:install', { appName: tmsConfig.appName });
       return;
     case 'build':
       global.setData('isDev', false);
       build(tmsConfig, newModules);
-      report('run:build', { appName: tmsConfig?.appName });
+      report('run:build', { appName: tmsConfig.appName });
       return;
     case 'preview':
       preview(tmsConfig, cmdOptions);
-      report('run:preview', { appName: tmsConfig?.appName });
+      report('run:preview', { appName: tmsConfig.appName });
       return;
     case 'upload':
       upload(tmsConfig, cmdOptions);
-      report('run:upload', { appName: tmsConfig?.appName });
+      report('run:upload', { appName: tmsConfig.appName });
       return;
     default:
       return;

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

@@ -4,7 +4,7 @@ const { resolve, createTask, getAbsolutePath, filterField } = require('../../../
 const { handleError } = require('../../../core/handleError');
 const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
-const { getAllSize, outputInfo, getDefaultDesc } = require('./utils');
+const { getAllSize, outputInfo, getDesc } = require('./utils');
 const report = require('../../../core/report');
 
 
@@ -19,7 +19,7 @@ const handleParams = (tmsConfig, cmdOptions) => {
     projectPath: resolve(tmsConfig.outputDir),
     privateKey: params.privateKey || tmsConfig.privateKey,
     robot: params.robot || 30,
-    desc: params.desc || getDefaultDesc(),
+    desc: params.desc || getDesc(params.desc),
     qrcodeOutputDest: getAbsolutePath(params.qrcodeOutputDest || ''),
   };
 };

package/src/scripts/run/preview/utils.js

@@ -15,10 +15,10 @@ function getAllSize(data = {}) {
   return allSize;
 }
 
-const getDefaultDesc = () => {
+const getDesc = (desc = '') => {
   const user =  getGitUser();
   const date = moment().format('YYYY-MM-DD HH:mm:ss');
-  return `构建人: ${user}; 构建时间：${date}`;
+  return `构建描述：${desc}; 构建人: ${user}; 构建时间：${date}`;
 };
 
 const outputInfo = (infoOutput, data) => {
@@ -37,7 +37,7 @@ const getDetaultVersion = () => {
 
 module.exports = {
   getAllSize,
-  getDefaultDesc,
+  getDesc,
   outputInfo,
   getDetaultVersion,
 };

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

@@ -3,7 +3,7 @@ const { resolve, createTask, filterField } = require('../../../utils/widgets');
 const { handleError } = require('../../../core/handleError');
 const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
-const { getAllSize, outputInfo, getDefaultDesc } = require('../preview/utils');
+const { getAllSize, outputInfo, getDesc } = require('../preview/utils');
 const report = require('../../../core/report');
 
 const handleParams = (tmsConfig, cmdOptions) => {
@@ -13,7 +13,7 @@ const handleParams = (tmsConfig, cmdOptions) => {
   };
 
   if (!params.version) {
-    throw new Error('请指定传入版本号 eg: tmskit run upload -v 2022.28.5');
+    throw new Error('请指定传入版本号 eg: tmskit run upload --version 2022.28.5');
   }
   return {
     ...params,
@@ -21,7 +21,7 @@ const handleParams = (tmsConfig, cmdOptions) => {
     projectPath: resolve(tmsConfig.outputDir),
     privateKey: params.privateKey || tmsConfig.privateKey,
     robot: params.robot || 30,
-    desc: params.desc || getDefaultDesc(),
+    desc: params.desc || getDesc(params.desc),
   };
 };
 
@@ -43,8 +43,8 @@ async function upload(tmsConfig, cmdOptions) {
     };
     const uploadRes = await createTask(
       mpCi.uploadMp,
-      '正在构建预览码',
-      '构建预览码完成',
+      '正在上传小程序代码',
+      '上传小程序代码完成',
     )({
       ...params,
     });

package/src/core/cache.js

@@ -1,36 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const { CACHE_FILE, CACHE_DIR } = require('../config/constant');
-const { ensureDirExist } = require('../utils/io');
-
-function getCache(projectDir, type) {
-  const filePath = `${CACHE_DIR}/${CACHE_FILE}`;
-  if (!fs.existsSync(filePath)) {
-    return null;
-  }
-  const content = require(filePath);
-  return content?.[projectDir]?.[type];
-}
-
-
-function setCache(projectDir, type = 'miniprogram_npm', data) {
-  const filePath = `${CACHE_DIR}/${CACHE_FILE}`;
-  if (!fs.existsSync(filePath)) {
-    const dir = path.dirname(filePath);
-    ensureDirExist(dir);
-    fs.writeFileSync(filePath, '{}');
-  }
-  const content = require(filePath);
-  if (!content[projectDir]) {
-    content[projectDir] = {};
-  }
-  content[projectDir] = {
-    [type]: data,
-  };
-  fs.writeFileSync(filePath, JSON.stringify(content, null, 2));
-}
-
-module.exports = {
-  setCache,
-  getCache,
-};