@tmsfe/tmskit 0.0.42 → 0.0.44

package/dist/index.cjs.js

@@ -505,6 +505,8 @@ var defaultTmsConfig = {
   dependencies: {},
   /** 编译输出文件夹位置 */
   outputDir: 'dist',
+  /** 是否在编译前清空输出目录 */
+  cleanOutputDirBeforeCompile: true,
   /** 源码监听路径 */
   sourceDir: './',
   /** 静态资源目录 */
@@ -540,6 +542,28 @@ var defaultTmsConfig = {
   }
 };
 
+const global$c = {
+  data: {},
+  setData(...args) {
+    if (args.length === 1) {
+      Object.keys(args[0]).forEach(k => {
+        if (args[0][k]) {
+          this.data[k] = args[0][k];
+        }
+      });
+    } else {
+      const [name, value] = args;
+      this.data[name] = value;
+    }
+  },
+  getData(name) {
+    return this.data[name];
+  }
+};
+var global_1 = {
+  global: global$c
+};
+
 /**
  * 用来读取处理tms.config.js与module.config.json字段
  */
@@ -562,6 +586,9 @@ var defaultTmsConfig = {
     getAbsolutePath
   } = widgets;
   const defaultTmsConfig$1 = defaultTmsConfig;
+  const {
+    global
+  } = global_1;
   const {
     fail
   } = log$1;
@@ -576,8 +603,11 @@ var defaultTmsConfig = {
       fail(`${path.dirname(tmsConfigPath)}没有找到tms.config.js，请进行配置`);
       process.exit(1);
     }
+    const isDev = global.getData('isDev');
     const tmsConfigFn = require(tmsConfigPath);
-    const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn() : tmsConfigFn;
+    const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn({
+      isDev
+    }) : tmsConfigFn;
 
     // 合并默认值
     return loadash.mergeWith({}, defaultTmsConfig$1, tmsConfig);
@@ -591,8 +621,12 @@ var defaultTmsConfig = {
     let tmsPrivateCf = {};
     const tmsPrivatePath = configPath ? `${configPath}/${TMS_PRIVATE_FILENAME}` : resolve(TMS_PRIVATE_FILENAME);
     if (fs.existsSync(tmsPrivatePath)) {
+      const isDev = global.getData('isDev');
+      console.log(isDev, 'isDev');
       const tmsPrivateFn = require(tmsPrivatePath);
-      tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn() : tmsPrivateFn;
+      tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn({
+        isDev
+      }) : tmsPrivateFn;
     }
     return tmsPrivateCf;
   };
@@ -1308,28 +1342,6 @@ var extendCmd = {
   loadExtendCmd: loadExtendCmd$1
 };
 
-const global$c = {
-  data: {},
-  setData(...args) {
-    if (args.length === 1) {
-      Object.keys(args[0]).forEach(k => {
-        if (args[0][k]) {
-          this.data[k] = args[0][k];
-        }
-      });
-    } else {
-      const [name, value] = args;
-      this.data[name] = value;
-    }
-  },
-  getData(name) {
-    return this.data[name];
-  }
-};
-var global_1 = {
-  global: global$c
-};
-
 const {
   fail: fail$7
 } = log$1;
@@ -3289,7 +3301,9 @@ async function dev$3(tmsConfig, targetModules) {
     noCache
   } = global$4.getData('cmdOptions');
   if (noCache) {
-    shelljs$1.rm('-rf', resolve$9(tmsConfig.outputDir));
+    if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+      shelljs$1.rm('-rf', resolve$9(tmsConfig.outputDir));
+    }
     shelljs$1.rm('-rf', MODULE_CODE_DIR);
     shelljs$1.rm('-rf', NODE_MODULES_DIR);
   }
@@ -3342,7 +3356,9 @@ const {
 async function build$1(tmsConfig, targetModules) {
   var _tmsConfig$hooks;
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve$8(tmsConfig.outputDir));
+  if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+    await shelljs.rm('-rf', resolve$8(tmsConfig.outputDir));
+  }
   const {
     modules: newModules
   } = await init$1(tmsConfig, targetModules);
@@ -3999,6 +4015,10 @@ const getSpecificModuleNames = (moduleArg, modules) => {
   return all.map(item => item.moduleName);
 };
 async function run(commandName, cmdOptions) {
+  if (['dev', 'build'].includes(commandName)) {
+    // 先缓存环境，因为tmsConfig可能会用到
+    global.setData('isDev', commandName === 'dev');
+  }
   // 用户本地的配置
   const tmsConfig = getTmsConfig$1();
   try {
@@ -4053,7 +4073,6 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       });
       return;
     case 'dev':
-      global.setData('isDev', true);
       dev(tmsConfig, newModules);
       report$1('run:dev', {
         appName: tmsConfig.appName
@@ -4066,7 +4085,6 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       });
       return;
     case 'build':
-      global.setData('isDev', false);
       build(tmsConfig, newModules);
       report$1('run:build', {
         appName: tmsConfig.appName
@@ -4179,7 +4197,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.42",
+	version: "0.0.44",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -4238,7 +4256,7 @@ var require$$12 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		minimatch: "^5.1.0",
-		"miniprogram-ci": "1.8.25",
+		"miniprogram-ci": "2.1.14",
 		moment: "^2.29.2",
 		"object-assign": "^4.0.1",
 		ora: "^5.4.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -59,7 +59,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "minimatch": "^5.1.0",
-    "miniprogram-ci": "1.8.25",
+    "miniprogram-ci": "2.1.14",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/config/defaultTmsConfig.js

@@ -9,6 +9,8 @@ module.exports = {
   dependencies: {},
   /** 编译输出文件夹位置 */
   outputDir: 'dist',
+  /** 是否在编译前清空输出目录 */
+  cleanOutputDirBeforeCompile: true,
   /** 源码监听路径 */
   sourceDir: './',
   /** 静态资源目录 */

package/src/core/tmsMpconfig.js

@@ -10,6 +10,7 @@ const JSON5 = require('json5');
 const { TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
 const { resolve, isObject, isArray, getAbsolutePath } = require('../utils/widgets');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
+const { global } = require('../utils/global');
 const { fail } = require('../utils/log');
 
 /**
@@ -22,8 +23,9 @@ const readTmsConfig = function (configPath) {
     fail(`${path.dirname(tmsConfigPath)}没有找到tms.config.js，请进行配置`);
     process.exit(1);
   }
+  const isDev = global.getData('isDev');
   const tmsConfigFn = require(tmsConfigPath);
-  const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn() : tmsConfigFn;
+  const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn({ isDev }) : tmsConfigFn;
 
   // 合并默认值
   return loadash.mergeWith({}, defaultTmsConfig, tmsConfig);
@@ -38,8 +40,10 @@ const readTmsPrivateCf = function (configPath) {
   let tmsPrivateCf = {};
   const tmsPrivatePath = configPath ? `${configPath}/${TMS_PRIVATE_FILENAME}` : resolve(TMS_PRIVATE_FILENAME);
   if (fs.existsSync(tmsPrivatePath)) {
+    const isDev = global.getData('isDev');
+    console.log(isDev, 'isDev');
     const tmsPrivateFn = require(tmsPrivatePath);
-    tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn() : tmsPrivateFn;
+    tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn({ isDev }) : tmsPrivateFn;
   }
 
   return tmsPrivateCf;

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

@@ -8,7 +8,9 @@ const { global } = require('../../../utils/global');
 
 async function build(tmsConfig, targetModules) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+    await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  }
 
   const { modules: newModules } = await init(tmsConfig, targetModules);
   info('当前build有效模块', newModules.map(item => item.moduleName).sort());

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

@@ -31,7 +31,9 @@ function delOtherPackages(tmsConfig, targetSubPackages) {
 async function dev(tmsConfig, targetModules) {
   const { noCache } = global.getData('cmdOptions');
   if (noCache) {
-    shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+    if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+      shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+    }
     shelljs.rm('-rf', MODULE_CODE_DIR);
     shelljs.rm('-rf', NODE_MODULES_DIR);
   }

package/src/scripts/run/index.js

@@ -50,6 +50,10 @@ const getSpecificModuleNames = (moduleArg, modules) => {
 };
 
 async function run(commandName, cmdOptions) {
+  if (['dev', 'build'].includes(commandName)) {
+    // 先缓存环境，因为tmsConfig可能会用到
+    global.setData('isDev', commandName === 'dev');
+  }
   // 用户本地的配置
   const tmsConfig = getTmsConfig();
   try {
@@ -101,7 +105,6 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       report('run:init', { appName: tmsConfig.appName });
       return;
     case 'dev':
-      global.setData('isDev', true);
       dev(tmsConfig, newModules);
       report('run:dev', { appName: tmsConfig.appName });
       return;
@@ -110,7 +113,6 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       report('run:install', { appName: tmsConfig.appName });
       return;
     case 'build':
-      global.setData('isDev', false);
       build(tmsConfig, newModules);
       report('run:build', { appName: tmsConfig.appName });
       return;