@tmsfe/tmskit 0.0.16 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -64,7 +64,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "miniprogram-ci": "1.4.13",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.1.0",
     "plugin-error": "^1.0.0",

package/src/compile/dev.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const ora = require('ora');
+const chalk = require('chalk');
 const { parallel, series } = require('gulp');
 const { resolve, mergeMap } = require('../utils/widgets');
 const { buildOutputAppJson } = require('../core/buildAppJson');
@@ -37,17 +38,6 @@ function adaptPath(pathDir) {
 }
 module.exports = async (tmsConfig, newModules, isDev = true) => {
   const compileTasksMap = new Map();
-  // 监听app.json
-  if (isDev) {
-    watch(
-      [resolve('app.json')],
-      { ignoreInitial: false, events: watchEvents },
-      () => buildOutputAppJson(tmsConfig, newModules, isDev),
-      { from: resolve(), to: resolve(tmsConfig.outputDir) },
-    );
-  } else {
-    buildOutputAppJson(tmsConfig, newModules, isDev);
-  }
 
   // 监听根目录的文件
   mergeMap(compileTasksMap, compile(tmsConfig, {
@@ -148,15 +138,25 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
   }
   async function end(cb) {
     if (isDev) {
+      // 监听app.json
+      watch(
+        [resolve('app.json')],
+        { ignoreInitial: false, events: watchEvents },
+        () => buildOutputAppJson(tmsConfig, newModules, isDev),
+        { from: resolve(), to: resolve(tmsConfig.outputDir) },
+      );
+      // 监听其他文件
       compileTasksMap.forEach(({ taskFn, module }, globValue) => {
         watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
       });
+    } else {
+      buildOutputAppJson(tmsConfig, newModules, isDev);
     }
     eTime = new Date().getTime() - sTime;
     if (typeof tmsConfig?.hooks?.afterCompile === 'function') {
       await tmsConfig?.hooks?.afterCompile({ isDev, tmsConfig, modules: newModules });
     }
-    spinner.succeed(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`);
+    spinner.succeed(chalk.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
     spinner.stop();
     cb();
   }
@@ -165,5 +165,6 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
   compileTasksMap.forEach(({ taskFn }) => {
     compileTasks.push(taskFn);
   });
+  // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
   series(start, parallel(...compileTasks), end)();
 };

package/src/compile/plugins/mpJsonDep.js

@@ -49,7 +49,7 @@ function mpJsonDep(
                 }
 
                 // eslint-disable-next-line
-                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
+                const reg = new RegExp(`^(\./|\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = componentPath.match(reg) || [];
                 if (regRes[2]) {
                   const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);

package/src/core/buildAppJson.js

@@ -1,12 +1,14 @@
 /**
  * 生成编译后的app.json
  */
+/* eslint-disable no-param-reassign */
 const fs = require('fs');
 const { MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
-const { getModuleConfig, getValidModules } = require('./tmsMpconfig');
+const { getModuleConfig } = require('./tmsMpconfig');
 const { fail } = require('../utils/log');
 const { resolve, isObject } = require('../utils/widgets');
 const { handleError } = require('./handleError');
+const { global } = require('../utils/global');
 
 /**
  * 更新appJson里面的主包配置
@@ -36,7 +38,6 @@ function updateMainPackages(appJson, mainPackages = []) {
 
   // 去掉 subpackages 中的主包配置
   const foundMainPackageNames = foundMainPackages.map(item => item.name);
-  // eslint-disable-next-line
   appJson.subpackages = appJson.subpackages.filter(subpackage => !foundMainPackageNames.includes(subpackage.name));
 
   return appJson;
@@ -62,17 +63,15 @@ const getAppJsonContent = (sourceAppJsonPath) => {
 /**
  * 更新app.json中的subpackages
  * @param {Object} appJson
- * @param {Object} modulesConfig
+ * @param {Object} modulesConfigs
  */
-const updateSubpackages = (appJson, modulesConfig) => {
+const updateSubpackages = (appJson, modulesConfigs) => {
   // eslint-disable-next-line
-  for (const name in modulesConfig) {
-    const moduleInfo = isObject(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name];
-    // 过滤 pages 为空的情况
-    const validModules = getValidModules(moduleInfo);
-    // eslint-disable-next-line
-    appJson.subpackages = appJson.subpackages.concat(validModules);
+  for (const modulePath in modulesConfigs) {
+    const moduleInfo = isObject(modulesConfigs[modulePath]) ? [modulesConfigs[modulePath]] : modulesConfigs[modulePath];
+    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
   }
+  appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
 };
 
 /**
@@ -105,9 +104,7 @@ const fixAppJson = (appJson) => {
       if (['requiredBackgroundModes', 'embeddedAppIdList'].indexOf(key) > -1) {
         // 提到appjson最上层处理
         const preVal = appJson[key];
-        // eslint-disable-next-line
         preVal ? appJson[key] = Array.from(new Set(preVal
-          // eslint-disable-next-line
           .slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
         return;
       }
@@ -115,7 +112,6 @@ const fixAppJson = (appJson) => {
     if (invalidKeys.length) {
       fail(`不支持分包${subp?.name}配置${invalidKeys.join(',')}\n`);
     }
-    // eslint-disable-next-line
     invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
     return subp;
   });
@@ -130,7 +126,6 @@ const fixAppJson = (appJson) => {
   if (pluginsErrMsg) {
     fail(`plugins配置出现错误:${pluginsErrMsg}`);
   }
-  // eslint-disable-next-line
   appJson.subpackages = subps;
 };
 
@@ -143,11 +138,11 @@ const fixAppJson = (appJson) => {
 function buildOutputAppJson(tmsConfig, modules) {
   try {
     // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
+    const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
     // 获取app.json的配置
     const appJson = getAppJsonContent(resolve('./app.json'));
     // 更新app.json中的subpackages
-    updateSubpackages(appJson, modulesConfig);
+    updateSubpackages(appJson, modulesConfigs);
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
     // 更新主包，需在subpackages处理完成后执行， pages/
@@ -155,7 +150,9 @@ function buildOutputAppJson(tmsConfig, modules) {
 
     fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
     if (typeof tmsConfig?.hooks?.updateAppJson === 'function') {
-      tmsConfig?.hooks?.updateAppJson(appJson);
+      tmsConfig?.hooks?.updateAppJson({
+        tmsConfig, module, appJson, isDev: global.getData('isDev'),
+      });
     }
 
     return appJson;

package/src/core/tmsMpconfig.js

@@ -93,40 +93,38 @@ const checkModules = function (tmsConfig, modules, isQuit = false) {
   return targetModules;
 };
 
-/**
- * 过滤页面为空的分包
- * @param {Array} moduleCfg 模块配置内容
- * @returns pages不为空的分包
- */
-const getValidModules = (moduleCfg) => {
-  // 过滤 pages 为空的情况
-  const validModules = moduleCfg.filter(item => item.pages.length > 0);
-  return validModules;
-};
-
 /**
  * 适配处理module.config.json的字段
  * @param { object } fileContent module.config.json的内容
  * @param { string } appName 小程序的名称
  */
 function adaptMpCgContent(fileContent, appName) {
-  const content = fileContent.contents ? JSON.parse(fileContent.contents.toString()) : JSON.parse(fileContent);
+  const handleContent = function (appName, current) {
+    let res = current;
+    if (appName && current.mpConfig && current.mpConfig[appName]) {
+      res = { ...current, ...current.mpConfig[appName] };
+    }
+
+    delete res.mpConfig;
+    delete res.isSubpackages;
+    return res;
+  };
+
+  let content = JSON.parse(fileContent);
 
   if (isArray(content)) {
     let i = content.length - 1;
     while (i >= 0) {
-      let current = content[i];
-
-      if (appName && current.mpConfig && current.mpConfig[appName]) {
-        current = { ...current, ...current.mpConfig[appName] };
-      }
-
-      delete current.mpConfig;
-      delete current.isSubpackages;
-
-      content[i] = current;
+      content[i] = handleContent(appName, content[i]);
       i--; // eslint-disable-line
     }
+  } else {
+    if (appName && content.mpConfig && content.mpConfig[appName]) {
+      content = { ...content, ...content.mpConfig[appName] };
+      delete content.mpConfig;
+      delete content.isSubpackages;
+    }
+    content = handleContent(appName, content);
   }
   return content;
 }
@@ -168,7 +166,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
         let moduleConfigContent = fs.readFileSync(moduleConfigPath, 'utf-8');
         moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
         const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-        getValidModules(moduleContentArr).forEach(({ name }, moduleContentArrIndex) => {
+        moduleContentArr.forEach(({ name }, moduleContentArrIndex) => {
           if (name === moduleName) {
             findModule = true;
             newModules.push({
@@ -178,7 +176,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
           }
         });
         if (!findModule) {
-          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
+          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -232,7 +230,6 @@ module.exports = {
   readTmsConfig,
   readTmsPrivateCf,
   getModuleConfig,
-  getValidModules,
   checkModules,
   tmsModulesMergeLocalModuleCfg,
   subModulesMergeDepModules,

package/src/entry.js

@@ -34,6 +34,17 @@ module.exports = [
           require('./scripts/run/index')('dev', cmd);
         },
       },
+      {
+        command: 'cloud',
+        description: '云函数开发',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('cloud', cmd);
+        },
+      },
       {
         command: 'build',
         description: 'prod 打包编译',

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

@@ -9,6 +9,9 @@ async function build(tmsConfig, targetModules, env) {
 
   const { targetModules: newModules } = await init(tmsConfig, targetModules);
 
+  if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
+    await tmsConfig?.hooks?.beforeCompile({ isDev: false, tmsConfig, modules: newModules });
+  };
   compileBuild(tmsConfig, newModules, env);
 }
 

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

@@ -0,0 +1,12 @@
+const { symLink } = require('../../../core/symbolicLink');
+const { handleError } = require('../../../core/handleError');
+const { succeed } = require('../../../utils/log');
+
+module.exports = async (tmsConfig) => {
+  try {
+    await symLink(tmsConfig);
+    succeed('云函数创建软链成功');
+  } catch (e) {
+    handleError(`创建软链错误: ${e}`);
+  }
+};

package/src/scripts/run/index.js

@@ -2,6 +2,7 @@ const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
 const install = require('./install/index');
+const cloud = require('./cloud/index');
 const { global } = require('../../utils/global');
 const {
   readTmsConfig,
@@ -87,6 +88,9 @@ async function run(commandName, cmd) {
       global.setData('isDev', true);
       dev(tmsConfig, newModules, env);
       return;
+    case 'cloud':
+      cloud(tmsConfig, env);
+      return;
     case 'install':
       install(tmsConfig, newModules, env);
       return;