@tmsfe/tmskit 0.0.15-beta.4 → 0.0.16

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.15-beta.4",
+  "version": "0.0.16",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
     "tmskit": "main.js"
   },
   "files": [
+    "build",
     "src",
     "dist",
     "main.js",
@@ -17,8 +18,7 @@
     "build": "rollup -c --environment TARGET:tmskit",
     "pub:patch": "sh build/publish.sh patch",
     "pub:minor": "sh build/publish.sh minor",
-    "pub:major": "sh build/publish.sh major",
-    "postinstall": "cd ./node_modules/gulp-watch && npm install chokidar@3.5.3"
+    "pub:major": "sh build/publish.sh major"
   },
   "author": "tms·web",
   "license": "ISC",
@@ -39,8 +39,18 @@
     "rollup-plugin-typescript2": "0.27.0"
   },
   "dependencies": {
+    "ansi-colors": "1.1.0",
+    "anymatch": "^1.3.0",
+    "fancy-log": "1.3.2",
+    "glob-parent": "^3.0.1",
+    "path-is-absolute": "^1.0.1",
+    "readable-stream": "^2.2.2",
+    "slash": "^1.0.0",
+    "vinyl": "^2.1.0",
+    "vinyl-file": "^2.0.0",
     "async": "^3.2.2",
     "chalk": "^4.1.0",
+    "chokidar": "^3.5.3",
     "commander": "^8.3.0",
     "copy-webpack-plugin": "^9.1.0",
     "ejs": "^3.1.5",
@@ -57,7 +67,6 @@
     "moment": "^2.29.1",
     "object-assign": "^4.0.1",
     "ora": "^5.1.0",
-    "patch-package": "^6.4.7",
     "plugin-error": "^1.0.0",
     "postcss": "^8.4.6",
     "precinct": "^8.3.1",

package/src/compile/dev.js

@@ -9,7 +9,7 @@ const compile = require('./compile');
 const watch = require('./watch');
 const { info } = require('../utils/log');
 
-const watchEvents = ['add', 'change', 'unlink', 'unlinkDir'];
+const watchEvents = ['add', 'change', 'unlink', 'addDir', 'unlinkDir'];
 function excludeGlob(glob) {
   const otherArr = new Set();
   otherArr.add('!**/*.{ttf,otf,woff,eot}');
@@ -146,7 +146,7 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
     sTime = new Date().getTime();
     cb();
   }
-  function end(cb) {
+  async function end(cb) {
     if (isDev) {
       compileTasksMap.forEach(({ taskFn, module }, globValue) => {
         watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
@@ -154,7 +154,7 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
     }
     eTime = new Date().getTime() - sTime;
     if (typeof tmsConfig?.hooks?.afterCompile === 'function') {
-      tmsConfig?.hooks?.afterCompile({ isDev, tmsConfig, modules: newModules });
+      await tmsConfig?.hooks?.afterCompile({ isDev, tmsConfig, modules: newModules });
     }
     spinner.succeed(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`);
     spinner.stop();

package/src/compile/plugins/gulp-watch/index.js

@@ -0,0 +1,172 @@
+
+/* eslint-disable */
+// 该文件源于npm包 gulp-watch 但内部有bug, 故源码进行单独修改
+const assign = require('object-assign');
+const path = require('path');
+const PluginError = require('plugin-error');
+const fancyLog = require('fancy-log');
+const colors = require('ansi-colors');
+const chokidar = require('chokidar');
+const { Duplex } = require('readable-stream');
+const vinyl = require('vinyl-file');
+const File = require('vinyl');
+const anymatch = require('anymatch');
+const pathIsAbsolute = require('path-is-absolute');
+const globParent = require('glob-parent');
+const slash = require('slash');
+
+function normalizeGlobs(globs) {
+  if (!globs) {
+    throw new PluginError('gulp-watch', 'glob argument required');
+  }
+
+  if (typeof globs === 'string') {
+    globs = [globs];
+  }
+
+  if (!Array.isArray(globs)) {
+    throw new PluginError('gulp-watch', `glob should be String or Array, not ${typeof globs}`);
+  }
+
+  return globs;
+}
+
+function watch(globs, opts, cb) {
+  const originalGlobs = globs;
+  globs = normalizeGlobs(globs);
+
+  if (typeof opts === 'function') {
+    cb = opts;
+    opts = {};
+  }
+
+  opts = assign({}, watch._defaultOptions, opts);
+  cb = cb || function () {};
+
+  function resolveFilepath(filepath) {
+    if (pathIsAbsolute(filepath)) {
+      return path.normalize(filepath);
+    }
+    return path.resolve(opts.cwd || process.cwd(), filepath);
+  }
+
+  function resolveGlob(glob) {
+    let mod = '';
+
+    if (glob[0] === '!') {
+      mod = glob[0];
+      glob = glob.slice(1);
+    }
+
+    return mod + slash(resolveFilepath(glob));
+  }
+  globs = globs.map(resolveGlob);
+
+  const baseForced = Boolean(opts.base);
+  const outputStream = new Duplex({ objectMode: true, allowHalfOpen: true });
+
+  outputStream._write = function _write(file, enc, done) {
+    cb(file);
+    this.push(file);
+    done();
+  };
+
+  outputStream._read = function _read() { };
+
+  const watcher = chokidar.watch(globs, opts);
+
+  opts.events.forEach((ev) => {
+    watcher.on(ev, processEvent.bind(undefined, ev));
+  });
+
+  ['add', 'change', 'unlink', 'addDir', 'unlinkDir', 'error', 'ready', 'raw']
+    .forEach((ev) => {
+      watcher.on(ev, outputStream.emit.bind(outputStream, ev));
+    });
+
+  outputStream.add = function add(newGlobs) {
+    newGlobs = normalizeGlobs(newGlobs)
+      .map(resolveGlob);
+    watcher.add(newGlobs);
+    globs.push.apply(globs, newGlobs);
+  };
+  outputStream.unwatch = watcher.unwatch.bind(watcher);
+  outputStream.close = function () {
+    watcher.close();
+    this.emit('end');
+  };
+
+  function processEvent(event, filepath) {
+    filepath = resolveFilepath(filepath);
+    const fileOpts = assign({}, opts);
+
+    let glob;
+    let currentFilepath = filepath;
+    while (!(glob = globs[anymatch(globs, currentFilepath, true)]) && currentFilepath !== (currentFilepath = path.dirname(currentFilepath))) {} // eslint-disable-line no-empty-blocks/no-empty-blocks
+
+    if (!glob) {
+      console.error('[gulp-watch]没有匹配到glob')
+      return;
+    }
+
+    if (!baseForced) {
+      fileOpts.base = path.normalize(globParent(glob));
+    }
+
+    // Do not stat deleted files
+    if (event === 'unlink' || event === 'unlinkDir' || event === 'addDir') {
+      fileOpts.path = filepath;
+
+      write(event, null, new File(fileOpts));
+      return;
+    }
+
+    // Workaround for early read
+    setTimeout(() => {
+      vinyl.read(filepath, fileOpts).then((file) => {
+        write(event, null, file);
+      });
+    }, opts.readDelay);
+  }
+
+  function write(event, err, file) {
+    if (err) {
+      outputStream.emit('error', err);
+      return;
+    }
+
+    if (opts.verbose) {
+      log(event, file);
+    }
+
+    file.event = event;
+    outputStream.push(file);
+    cb(file);
+  }
+
+  function log(event, file) {
+    event = event[event.length - 1] === 'e' ? `${event}d` : `${event}ed`;
+
+    const msg = [colors.magenta(file.relative), 'was', event];
+
+    if (opts.name) {
+      msg.unshift(`${colors.cyan(opts.name)} saw`);
+    }
+
+    fancyLog.info.apply(null, msg);
+  }
+
+  return outputStream;
+}
+
+// This is not part of the public API as that would lead to global state (singleton) pollution,
+// and allow unexpected interference between unrelated modules that make use of gulp-watch.
+// This can be useful for unit tests and root application configuration, though.
+// Avoid modifying gulp-watch's default options inside a library/reusable package, please.
+watch._defaultOptions = {
+  events: ['add', 'change', 'unlink'],
+  ignoreInitial: true,
+  readDelay: 10,
+};
+
+module.exports = watch;

package/src/compile/watch.js

@@ -1,9 +1,10 @@
-const watch = require('gulp-watch');
+const watch = require('./plugins/gulp-watch');
 const path = require('path');
 const shellJs = require('shelljs');
 const { info, warn } = require('../utils/log');
 const { resolve } = require('../utils/widgets');
 const { global } = require('../utils/global');
+const { findAllFilesOfDir } = require('../utils/io');
 
 const TIP_MAP = {
   'package.json': '若依赖有变动，请重新执行tmskit run dev',
@@ -21,6 +22,12 @@ const logTip = (fileName, tipMap) => {
   info(`${fileName}有更新`);
 };
 
+const getTargetFile = (sourceFile, module, outputDir) => {
+  const sourceFileRelativeModule = path.relative(resolve(module.from), sourceFile);
+  const targetFile = resolve(outputDir, module.to, sourceFileRelativeModule);
+  return targetFile;
+};
+
 module.exports = function (globValue, watchOptions, callback, module) {
   watch(globValue, {
     // readDelay: 100,
@@ -31,9 +38,21 @@ module.exports = function (globValue, watchOptions, callback, module) {
     const sourceFileName = sourceFileDirArr.slice(sourceFileDirArr.length - 2).join('/');
 
     const tmsConfig = global.getData('tmsConfig');
-    const sourceFileRelativeModule = path.relative(resolve(module.from), sourceFile);
-    const targetFile = resolve(tmsConfig.outputDir, module.to, sourceFileRelativeModule);
 
+    if (vinyl.event === 'addDir') {
+      info(`更新${sourceFileName}目录`);
+      const files = findAllFilesOfDir(sourceFile);
+      for (const file of files) {
+        const fileDirArr = file.replace(/\\/g, '/').split('/');
+        const fileName = fileDirArr.slice(fileDirArr.length - 2).join('/');
+        const targetFile = getTargetFile(file, module, tmsConfig.outputDir);
+        logTip(fileName, TIP_MAP);
+        callback([file], path.dirname(targetFile));
+      }
+      return;
+    }
+
+    const targetFile = getTargetFile(sourceFile, module, tmsConfig.outputDir);
     if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
       info(`删除${sourceFileName}`);
       shellJs.rm('-rf', targetFile);

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

@@ -7,6 +7,7 @@ const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
 const { CACHE_DIR } = require('../../../config/constant');
 
+
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
 function delOtherModule(tmsConfig, targetModules) {
   const modules = tmsModulesMergeLocalModuleCfg(tmsConfig.modules, tmsConfig.appName);
@@ -25,7 +26,7 @@ async function dev(tmsConfig, targetModules, env) {
   let newModules = targetModules;
   const { noCache } = global.getData('cmd');
   if (noCache) {
-    shelljs.rm('-rf', resolve('dist'));
+    shelljs.rm('-rf', resolve(tmsConfig.outputDir));
     shelljs.rm('-rf', CACHE_DIR);
   }
 
@@ -35,7 +36,7 @@ async function dev(tmsConfig, targetModules, env) {
 
   info('当前dev启动的有效模块', newModules.map(item => item.name).sort());
   if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
-    tmsConfig?.hooks?.beforeCompile({ isDev: true, tmsConfig, modules: newModules });
+    await tmsConfig?.hooks?.beforeCompile({ isDev: true, tmsConfig, modules: newModules });
   };
   delOtherModule(tmsConfig, newModules);
   compileDev(tmsConfig, newModules, env);

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

@@ -17,7 +17,7 @@ const { checkDependencies } = require('../../../core/checkDependencies');
  * @param { array } defaultFiles 默认需要拷贝的配置项
  * @returns
  */
-const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
+const cpFilesToOutput = function (tmsConfig, defaultFiles) {
   const outputDir = resolve(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach((item) => {
@@ -25,18 +25,6 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
       shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
     }
   });
-
-  // 拷贝模块的package.json到编译输出目录
-  targetModules.forEach((item) => {
-    const outputModuleDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
-    if (!fs.existsSync(resolve(item.path))) {
-      fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
-      process.exit(1);
-    }
-    io.ensureDirExist(outputModuleDir);
-    const modulePackagePath = resolve(item.path, 'package.json');
-    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
-  });
 };
 
 /**
@@ -78,7 +66,7 @@ async function task(tmsConfig, targetModules) {
     cpFilesToOutput,
     '开始拷贝文件到编译输出目录',
     '拷贝文件到编译输出目录完成',
-  )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
+  )(tmsConfig, DEFAULT_COPY_CONFIG);
 
   // install
   if (checkDependencies(newModules, resolve('./'), tmsConfig.outputDir)) {

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

@@ -1,10 +1,26 @@
+const shelljs = require('shelljs');
+const fs = require('fs');
+const io = require('../../../utils/io');
 const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../core/mpCi');
 const { CACHE_DIR } = require('../../../config/constant');
 const { mpNpmInstallAll } = require('../../../core/npm');
 const { global } = require('../../../utils/global');
+const { fail } = require('../../../utils/log');
 
 async function install(tmsConfig, modules) {
+  // 拷贝模块的package.json到编译输出目录
+  modules.forEach((item) => {
+    const outputModuleDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
+    if (!fs.existsSync(resolve(item.path))) {
+      fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+      process.exit(1);
+    }
+    io.ensureDirExist(outputModuleDir);
+    const modulePackagePath = resolve(item.path, 'package.json');
+    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
+  });
+
   // 小程序npm install
   await createTask(
     mpNpmInstallAll,

package/src/utils/io.js

@@ -97,6 +97,25 @@ const fileInDir = (dir, file) => {
 };
 
 
+function findAllFilesOfDir(dir) {
+  const list = [];
+  function listFile(dir) {
+    const arr = fs.readdirSync(dir);
+    arr.forEach((item) => {
+      const fullPath = path.join(dir, item);
+      const stats = fs.statSync(fullPath);
+      if (stats.isDirectory()) {
+        listFile(fullPath);
+      } else {
+        list.push(fullPath);
+      }
+    });
+    return list;
+  }
+  listFile(dir);
+  return list;
+}
+
 module.exports = {
   isDirEmpty,
   copyFile,
@@ -105,4 +124,5 @@ module.exports = {
   ext,
   fileInDir,
   isFile,
+  findAllFilesOfDir,
 };

package/CHANGELOG.md

@@ -1,32 +0,0 @@
-##
- 1. [0.0.5] 支持创建新的小程序
- 2. [0.0.6] 支持编译功能
- 3. [0.0.7]
-  * 更新切换开发环境需要重启构建工具，调整为改代码直接生效
-  * 修复切换第三方代码库分支后，构建工具没有重新拉代码的问题
-  * 修复thirdparty代码没有正确构建问题
-  * 新增对一个仓库下多个分包的支持
-  * 优化代码下载流程，多仓库并行下载，第三方代码下载时间60s->15s
-  * 本地private.config.js配置，支持指定屏蔽某些模块，屏蔽所有远程模块的设置
- 4. [0.0.10] 
-  * 优化npm install并行改成串行,60个模块开发第一次启动由100s优化至40s, 第二次启动2s；
-  * 添加global全局缓存变量,避免变量层层传递的问题
-  * 增加--latest参数，重新初始化操作(拉去第三方模块、npm下载、生成appJson)
-  * 修复获取用户指定模块的bug
- 5. [0.0.12] 云函数支持创建软连, 支持引入项目外的云函数能力
-
- 6. [0.0.13] 
-  * 首次编译完成，提示用户编译完成.
-  * 日志添加时间戳
-  * 编译代码有更新时，增加提示日志
-  * 删除源码文件或文件夹时，支持监听文件变动，删除编译文件
-  * fix window中tar命令的兼容性问题
-7. [0.0.15]
-  * 删除原函数软连功能
-  * fix 修复dist node_module.tar.gz没有删除bug
-8. [-]
-  * fix: 日志打印多空行问题
-  * add: 增加--noCache的参数，支持不使用缓存运行dev
-  * add: package.json、module.config.json更新后，提示重新启动dev
-  * fix: gulp-watch更新某个文件时，编译多个文件的问题
-  * 策略：拉取第三方代码，dev流程都会执行