@tmsfe/tmskit 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -81,4 +81,4 @@
   "jest": {
     "testEnvironment": "jest-environment-node"
   }
-}
+}

package/src/compile/dev.js

@@ -103,7 +103,7 @@ module.exports = async (tmsConfig, modules, isDev = true) => {
       watch(
         [resolve('app.json')],
         { ignoreInitial: false, events: watchEvents },
-        () => buildOutputAppJson(tmsConfig, modules, isDev),
+        async () => await buildOutputAppJson(tmsConfig, modules, isDev),
         { from: resolve(), to: resolve(tmsConfig.outputDir) },
       );
       // 监听其他文件
@@ -111,7 +111,7 @@ module.exports = async (tmsConfig, modules, isDev = true) => {
         watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
       });
     } else {
-      buildOutputAppJson(tmsConfig, modules, isDev);
+      await buildOutputAppJson(tmsConfig, modules, isDev);
     }
     eTime = new Date().getTime() - sTime;
     if (typeof tmsConfig?.hooks?.afterFirstCompile === 'function') {

package/src/compile/watch.js

@@ -52,7 +52,7 @@ module.exports = function (globValue, watchOptions, callback, module) {
   watch(globValue, {
     // readDelay: 100,
     ...watchOptions,
-  }, (vinyl) => {
+  }, async (vinyl) => {
     const sourceFile = vinyl.history[0];
     const sourceFileDirArr = sourceFile.replace(/\\/g, '/').split('/');
     const sourceFileName = sourceFileDirArr.slice(sourceFileDirArr.length - 2).join('/');
@@ -66,7 +66,7 @@ module.exports = function (globValue, watchOptions, callback, module) {
       updateFileHook(tmsConfig, sourceFile, targetFile,  vinyl.event);
       return;
     }
-    runCallback({
+    await runCallback({
       tmsConfig,
       sourceFile,
       targetFile,

package/src/core/buildAppJson.js

@@ -120,7 +120,7 @@ const fixAppJson = (appJson) => {
  * @param {array} modules 用户要编译的模块列表
  * @returns
  */
-function buildOutputAppJson(tmsConfig, modules) {
+async function buildOutputAppJson(tmsConfig, modules) {
   try {
     // 获取所有模块，合并模块依赖的模块
     const modulesConfig = getModulesConfig(modules, tmsConfig.appName, false);
@@ -141,7 +141,7 @@ 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({
+      await tmsConfig?.hooks?.updateAppJson({
         tmsConfig: filterField(tmsConfig, ['gitAccount']),
         cmdOptions: global.getData('cmdOptions'),
         modules,

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

@@ -2,8 +2,9 @@ const shelljs = require('shelljs');
 const fs = require('fs');
 const path = require('path');
 const io = require('../../../utils/io');
-const { createTask, resolve, getAbsolutePath } = require('../../../utils/widgets');
+const { createTask, resolve, getAbsolutePath, filterField } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../core/mpCi');
+const { global } = require('../../../utils/global');
 const { setCache, getCache } = require('./cache');
 const { NODE_MODULES_DIR } = require('../../../config/constant');
 const { npmInstallAll } = require('../../../core/npm');
@@ -13,6 +14,15 @@ const { isDependenciesUpdate } = require('../../../core/checkDependencies');
 
 async function install(tmsConfig, subPackages, useCache = true) {
   const cwd = process.cwd();
+  // 加npm install之前的钩子
+  if (typeof tmsConfig?.hooks?.beforeNpmInstall === 'function') {
+    info('—————— 执行beforeNpmInstall ————');
+    await tmsConfig?.hooks?.beforeNpmInstall({
+      tmsConfig: filterField(tmsConfig, ['gitAccount']),
+      cmdOptions: global.getData('cmdOptions'),
+    });
+    info('—————— 执行beforeNpmInstall 完成 ————');
+  };
   const npmInstallRes = await createTask(
     npmInstall,
     '小程序 开始npm install',