@tmsfe/tmskit 0.0.47 → 0.0.49

package/dist/index.cjs.js

@@ -603,10 +603,10 @@ var global_1 = {
       fail(`${path.dirname(tmsConfigPath)}没有找到tms.config.js，请进行配置`);
       process.exit(1);
     }
+    const env = global.getData('commandName');
     const tmsConfigFn = require(tmsConfigPath);
-    const isDev = global.getData('isDev');
     const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn({
-      isDev
+      env
     }) : tmsConfigFn;
 
     // 合并默认值
@@ -621,10 +621,10 @@ var global_1 = {
     let tmsPrivateCf = {};
     const tmsPrivatePath = configPath ? `${configPath}/${TMS_PRIVATE_FILENAME}` : resolve(TMS_PRIVATE_FILENAME);
     if (fs.existsSync(tmsPrivatePath)) {
+      const env = global.getData('commandName');
       const tmsPrivateFn = require(tmsPrivatePath);
-      const isDev = global.getData('isDev');
       tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn({
-        isDev
+        env
       }) : tmsPrivateFn;
     }
     return tmsPrivateCf;
@@ -1406,8 +1406,8 @@ function updateMainPackages(appJson, mainPackages = []) {
   }
   // 拼装 app.pages
   foundMainPackages.forEach(subpackage => {
-    if (!subpackage.pages || !subpackage.pages.length) {
-      fail$6(`主包 ${subpackage} 不能没有 pages`);
+    if (!subpackage.allowNoPages && (!subpackage.pages || !subpackage.pages.length)) {
+      fail$6(`主包 ${subpackage} 不能没有 pages`, foundMainPackages, subpackage);
       process.exit(-1);
     }
     subpackage.pages.forEach(page => {
@@ -4014,10 +4014,7 @@ 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');
-  }
+  global.setData('commandName', commandName);
   // 用户本地的配置
   const tmsConfig = getTmsConfig$1();
   try {
@@ -4072,6 +4069,7 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       });
       return;
     case 'dev':
+      global.setData('isDev', true);
       dev(tmsConfig, newModules);
       report$1('run:dev', {
         appName: tmsConfig.appName
@@ -4084,6 +4082,7 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       });
       return;
     case 'build':
+      global.setData('isDev', false);
       build(tmsConfig, newModules);
       report$1('run:build', {
         appName: tmsConfig.appName
@@ -4196,7 +4195,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.47",
+	version: "0.0.49",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -4255,7 +4254,7 @@ var require$$12 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		minimatch: "^5.1.0",
-		"miniprogram-ci": "2.1.14",
+		"miniprogram-ci": "1.8.25",
 		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.47",
+  "version": "0.0.49",
   "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": "2.1.14",
+    "miniprogram-ci": "1.8.25",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/core/buildAppJson.js

@@ -26,8 +26,8 @@ function updateMainPackages(appJson, mainPackages = []) {
   }
   // 拼装 app.pages
   foundMainPackages.forEach((subpackage) => {
-    if (!subpackage.pages || !subpackage.pages.length) {
-      fail(`主包 ${subpackage} 不能没有 pages`);
+    if (!subpackage.allowNoPages && (!subpackage.pages || !subpackage.pages.length)) {
+      fail(`主包 ${subpackage} 不能没有 pages`, foundMainPackages, subpackage);
       process.exit(-1);
     }
     subpackage.pages.forEach((page) => {

package/src/core/tmsMpconfig.js

@@ -23,9 +23,9 @@ const readTmsConfig = function (configPath) {
     fail(`${path.dirname(tmsConfigPath)}没有找到tms.config.js，请进行配置`);
     process.exit(1);
   }
+  const env = global.getData('commandName');
   const tmsConfigFn = require(tmsConfigPath);
-  const isDev = global.getData('isDev');
-  const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn({ isDev }) : tmsConfigFn;
+  const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn({ env }) : tmsConfigFn;
 
   // 合并默认值
   return loadash.mergeWith({}, defaultTmsConfig, tmsConfig);
@@ -40,9 +40,9 @@ const readTmsPrivateCf = function (configPath) {
   let tmsPrivateCf = {};
   const tmsPrivatePath = configPath ? `${configPath}/${TMS_PRIVATE_FILENAME}` : resolve(TMS_PRIVATE_FILENAME);
   if (fs.existsSync(tmsPrivatePath)) {
+    const env = global.getData('commandName');
     const tmsPrivateFn = require(tmsPrivatePath);
-    const isDev = global.getData('isDev');
-    tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn({ isDev }) : tmsPrivateFn;
+    tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn({ env }) : tmsPrivateFn;
   }
 
   return tmsPrivateCf;

package/src/scripts/run/index.js

@@ -50,10 +50,7 @@ const getSpecificModuleNames = (moduleArg, modules) => {
 };
 
 async function run(commandName, cmdOptions) {
-  if (['dev', 'build'].includes(commandName)) {
-    // 先缓存环境，因为tmsConfig可能会用到
-    global.setData('isDev', commandName === 'dev');
-  }
+  global.setData('commandName', commandName);
   // 用户本地的配置
   const tmsConfig = getTmsConfig();
   try {
@@ -105,6 +102,7 @@ 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;
@@ -113,6 +111,7 @@ 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;