@tmsfe/tmskit 0.0.5-beta.3 → 0.0.5-beta.4

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.3",
+  "version": "0.0.5-beta.4",
   "description": "tmskit",
   "main": "main.js",
   "bin": {
     "tmskit": "main.js"
   },
+  "files": ["src", "dist", "main.js", "package.json"],
   "scripts": {
     "dev": "rollup -wc --environment TARGET:tmskit",
     "build": "rollup -c --environment TARGET:tmskit"
@@ -37,21 +38,27 @@
     "ejs": "^3.1.5",
     "glob-ignore": "^1.0.2",
     "gulp": "^4.0.2",
+    "gulp-cache": "^1.1.3",
     "gulp-image": "^5.1.0",
-    "gulp-less": "^5.0.0",
+    "gulp-postcss": "^9.0.1",
     "gulp-px-to-rpx": "^1.0.7",
-    "gulp-rename": "^2.0.0",
     "gulp-watch": "^5.0.1",
+    "htmlparser2": "^7.2.0",
     "inquirer": "^7.3.3",
     "leven": "3.1.0",
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "miniprogram-ci": "1.4.13",
+    "object-assign": "^4.0.1",
     "ora": "^5.1.0",
+    "plugin-error": "^1.0.0",
+    "postcss": "^8.4.6",
     "precinct": "^8.3.1",
     "replace-ext": "^2.0.0",
     "shelljs": "^0.8.4",
-    "through2": "^4.0.2"
+    "strip-comments": "^2.0.1",
+    "through2": "^4.0.2",
+    "vinyl-sourcemaps-apply": "^0.2.0"
   },
   "engines": {
     "node": "^12.17.0 || >= 14.13.1"

package/src/config/constant.js

@@ -49,6 +49,7 @@ const ENV = {
 };
 
 const  TEMPLATE_TKIT_DIR = '_tmskit';
+const MODULE_CONFIG_INVALID_KEY = ['entranceDeclare', 'entryPagePath'];
 
 export {
   HOME_DIR,
@@ -65,4 +66,5 @@ export {
   MODE,
   ENV,
   TEMPLATE_TKIT_DIR,
+  MODULE_CONFIG_INVALID_KEY,
 };

package/src/config/defaultTmsConfig.js

@@ -12,7 +12,7 @@ module.exports = {
     outputDir: 'dist',
     /** 源码监听路径 */
     sourceDir: './',
-    /** 源码Map */
-    copy: [],
+    /** 静态资源目录 */
+    static: [],
   },
 };

package/src/gulp/compile.js

@@ -1,13 +1,17 @@
-const { src, dest } = require('gulp');
+const { src, dest, lastRun } = require('gulp');
 const px2rpx = require('gulp-px-to-rpx');
-const less = require('gulp-less');
-const rename = require('gulp-rename');
+const postcss = require('gulp-postcss');
 const watch = require('gulp-watch');
+const cache = require('gulp-cache');
 const image = require('gulp-image');
 const replaceEnv = require('./replaceEnv');
-const { jsDep } = require('./jsDep');
-const { mpJsonDep } = require('./mpJsonDep');
+const { mpCommonDep } = require('./plugins/mpCommonDep');
+const { mpJsonDep } = require('./plugins/mpJsonDep');
+const { mpWxmlDep } = require('./plugins/mpWxmlDep');
+const base64 = require('./plugins/postcss-font-base64');
+const { fail } = require('../utils/log');
 
+const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
 module.exports = function (
   tmsConfig,
   {
@@ -21,7 +25,9 @@ module.exports = function (
 ) {
   Object.keys(glob).forEach((globKey) => {
     const globValue = glob[globKey];
-    let srcPipe = src(globValue, srcOption);
+    const task = () => src(globValue, { ...srcOption, since: since(task) });
+    let srcPipe = task();
+
     if (isWatch) {
       srcPipe = srcPipe.pipe(watch(globValue, watchOption));
     }
@@ -30,31 +36,44 @@ module.exports = function (
       case 'js':
         srcPipe
           .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
-          .pipe(jsDep(tmsConfig, module))
-          .pipe(dest(destPath));
+          .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch))
+          .pipe(dest(destPath))
+          .on('error', (err) => {
+            fail(`js编译报错${err}`);
+          });
         break;
-      case 'css':
+      case 'wxss':
         srcPipe
-          .pipe(less())
+          .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
+          .pipe(postcss([base64()]))
+          .on('error', (err) => {
+            fail(`postcss编译报错${err}`);
+          })
           .pipe(px2rpx({
             designWidth: 375, // 设计稿宽度，默认为750
             precision: 2, // 小数最大精度，默认为6
           }))
-          .pipe(rename({ extname: '.wxss' }))
           .pipe(dest(destPath));
         break;
       case 'json':
         srcPipe
-          .pipe(mpJsonDep(tmsConfig, module))
+          .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
+          .on('error', (err) => {
+            fail(`json编译报错${err}`);
+          })
           .pipe(dest(destPath));
         break;
-      case 'html':
+      case 'wxml':
         srcPipe
+          .pipe(mpWxmlDep(tmsConfig, module, isWatch))
           .pipe(dest(destPath));
         break;
       case 'image':
         srcPipe
-          .pipe(image())
+          .pipe(cache(image()))
+          .on('error', (err) => {
+            fail(`image编译报错${err}`);
+          })
           .pipe(dest(destPath));
         break;
       case 'other':

package/src/gulp/dev.js

@@ -4,8 +4,9 @@ const { buildOutputAppJson } = require('../utils/buildAppJson');
 const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
 
-function handleOtherGlob(glob) {
+function excludeGlob(glob) {
   const otherArr = new Set();
+  otherArr.add('!**/*.{ttf,otf,woff,eot}');
   Object.keys(glob).forEach((globKey) => {
     if (typeof glob[globKey] === 'string') {
       const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
@@ -36,7 +37,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   compile(tmsConfig, {
     glob: {
       json: DEFAULT_COPY_CONFIG.map(item => resolve(item)),
-      css: ['app.less', 'app.wxss'].map(item => resolve(item)),
+      wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
       js: ['app.js', 'app.ts'].map(item => resolve(item)),
     },
     module: { from: '', to: '' },
@@ -64,15 +65,15 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
     const glob = {
       js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
       json: [`${resolve(module.path)}/**/*.json`, ...excludes],
-      css: [`${resolve(module.path)}/**/*.{less,wxss}`, ...excludes],
-      html: [`${resolve(module.path)}/**/*.wxml`, ...excludes],
+      wxss: [`${resolve(module.path)}/**/*.{less,wxss}`, ...excludes],
+      wxml: [`${resolve(module.path)}/**/*.wxml`, ...excludes],
       image: [`${resolve(module.path)}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
     };
 
     compile(tmsConfig, {
       glob: {
         ...glob,
-        other: [`${resolve(module.path)}/**/*`, ...handleOtherGlob(glob)],
+        other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)],
       },
       destPath: resolve(tmsConfig.gulp.outputDir, module.root),
       module: { from: module.path, to: module.root },
@@ -82,20 +83,20 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   }
 
   // 监听copy模块
-  if (tmsConfig?.gulp?.copy && tmsConfig?.gulp?.copy.length > 0) {
-    for (const item of tmsConfig.gulp?.copy) {
+  if (tmsConfig?.gulp?.static && tmsConfig?.gulp?.static.length > 0) {
+    for (const item of tmsConfig.gulp?.static) {
       const glob = {
         js: `${item.from}/**/*.{js,ts,wxs}`,
         json: `${item.from}/**/*.json`,
-        css: `${item.from}/**/*.{less,wxss}`,
-        html: `${item.from}/**/*.wxml`,
+        wxss: `${item.from}/**/*.{less,wxss}`,
+        wxml: `${item.from}/**/*.wxml`,
         image: `${item.from}/**/*.{png,jpg,jpeg,gif,svg}`,
       };
 
       compile(tmsConfig, {
         glob: {
           ...glob,
-          other: [`${item.from}/**/*`, ...handleOtherGlob(glob)],
+          other: [`${item.from}/**/*`, ...excludeGlob(glob)],
         },
         destPath: item.to,
         module: item,

package/src/gulp/plugins/less.js

@@ -0,0 +1,116 @@
+/* eslint-disable no-param-reassign */
+const fs             = require('fs');
+const path           = require('path');
+const less           = require('less');
+const through2       = require('through2');
+const replaceExt     = require('replace-ext');
+const assign         = require('object-assign');
+const applySourceMap = require('vinyl-sourcemaps-apply');
+const PluginError    = require('plugin-error');
+const { fail } = require('../../utils/log');
+
+function inlineSources(map) {
+  if (map.sourcesContent) {
+    return Promise.resolve(map);
+  }
+
+  return Promise.all(map.sources.map(source => new Promise((resolve, reject) => {
+    fs.readFile(source, 'utf8', (err, data) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    });
+  }))).then(
+    (contents) => {
+      map.sourcesContent = contents;
+      return map;
+    },
+    () => map,
+  );
+}
+
+function renderLess(str, opts) {
+  return new Promise((resolve, reject) => {
+    less.render(str, opts, (err, res) => {
+      if (err) {
+        reject(err);
+      } else {
+        const obj = {
+          result: res.css,
+          imports: res.imports,
+        };
+        if (opts.sourceMap && res.map) {
+          obj.sourcemap = JSON.parse(res.map);
+          inlineSources(obj.sourcemap).then((map) => {
+            obj.sourcemap = map;
+            resolve(obj);
+          });
+        } else {
+          resolve(obj);
+        }
+      }
+    });
+  });
+}
+
+module.exports = function (options) {
+  const opts = assign({}, {
+    compress: false,
+    paths: [],
+    isWatch: false,
+  }, options);
+
+  return through2.obj((file, enc, cb) => {
+    if (file.isNull()) {
+      return cb(null, file);
+    }
+
+    if (file.isStream()) {
+      return cb(new PluginError('gulp-less', 'Streaming not supported'));
+    }
+
+    const str = file.contents.toString();
+
+    // Injects the path of the current file
+    opts.filename = file.path;
+
+    // Bootstrap source maps
+    if (file.sourceMap || opts.sourcemap) {
+      opts.sourceMap = true;
+    }
+
+    renderLess(str, opts).then((res) => {
+      file.contents = Buffer.from(res.result);
+      file.path = replaceExt(file.path, '.wxss');
+      if (res.sourcemap) {
+        res.sourcemap.file = file.relative;
+        res.sourcemap.sources = res.sourcemap.sources.map(source => path.relative(file.base, source));
+
+        applySourceMap(file, res.sourcemap);
+      }
+      return file;
+    })
+      .then((file) => {
+        console.log(`less编译完成${file.path}`);
+        cb(null, file);
+      })
+      .catch((err) => {
+        // Convert the keys so PluginError can read them
+        err.lineNumber = err.line;
+        err.fileName = err.filename;
+
+        // Add a better error message
+        const message = `${err.message} in file ${err.fileName} line no. ${err.lineNumber}`;
+        err.message = message;
+        if (opts.isWatch) {
+          // watch的时候，报错提示，不退出进程
+          fail(err);
+          return cb(null, file);
+        }
+        // 不watch的时候，报错退出进程
+        return cb(new PluginError('gulp-less', err));
+      });
+  });
+};

package/src/gulp/plugins/mpCommonDep.js

@@ -0,0 +1,131 @@
+/* eslint-disable no-param-reassign */
+const through = require('through2');
+const precinct = require('precinct');
+const path = require('path');
+const { findCssImports }  = require('../../utils/findCssImport');
+const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
+const { resolve } = require('../../utils/widgets');
+const fs = require('fs');
+const { pluginError } = require('./utils/pluginError');
+
+const cssFilter = ['.less', '.wxss'];
+const dfsFindCommonDep = function (anaFileOriginFile, anaFileDestFile, extensions, isWatch = true) {
+  const resDep = new Map();
+  function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
+    let contents = '';
+    try {
+      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError(e, isWatch);
+    }
+    const deps = cssFilter.indexOf(path.extname(anaFileOriginFile)) > -1
+      ? findCssImports(contents)
+      : precinct(contents);
+    deps.forEach((depItem) => {
+      if (depItem.startsWith('.')) {
+        // 被依赖文件的存在的绝对路径
+        const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+        // 被依赖文件加上后缀
+        const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+        if (!fs.existsSync(depOriginFile)) {
+          pluginError(
+            new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`),
+            isWatch,
+          );
+          return;
+        }
+
+        const depDestPath = resolve(path.dirname(anaFileDestFile), depItem);
+        const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+        if (!resDep.has(depDestFile)) {
+          resDep.set(depDestFile, {
+            anaFileOriginFile,
+            anaFileDestFile,
+            depDestFile,
+            depOriginFile,
+          });
+          dfs(depOriginFile, depDestFile, extensions);
+        }
+      }
+    });
+  }
+  dfs(anaFileOriginFile, anaFileDestFile, extensions);
+
+  return resDep;
+};
+
+function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 依赖分析的文件
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      const deps = cssFilter.indexOf(path.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
+
+      const copyModules = new Map();
+      Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
+        const includePath = tmsConfig.gulp.dependencies[includeName];
+        deps.forEach((depItem) => {
+          if (depItem.indexOf(includeName) > -1) {
+            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
+            const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+            // 被依赖文件加上后缀
+            const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+            if (!fileInDir(includePath, depOriginFile)) {
+              pluginError(
+                new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
+                isWatch,
+              );
+              return;
+            }
+
+            // eslint-disable-next-line
+            const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+            const regRes = depItem.match(reg) || [];
+            if (regRes[2]) {
+              const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+              const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+              if (!copyModules.has(depDestFile)) {
+                copyModules.set(depDestFile, {
+                  depOriginFile,
+                  depDestFile,
+                  beforeDepPath: depItem,
+                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                });
+              }
+            }
+          }
+        });
+      });
+
+      // console.log('mpCommonDep copyModules', copyModules);
+      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
+        diffContentCopyFile(depOriginFile, depDestFile);
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+
+        const defs = dfsFindCommonDep(depOriginFile, depDestFile, extensions, isWatch);
+        defs.forEach((item) => {
+          diffContentCopyFile(item.depOriginFile, item.depDestFile);
+        });
+        // console.log('mpCommonDep defs', defs);
+      });
+
+      file.contents = new Buffer(contents);
+    }
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpCommonDep,
+  dfsFindCommonDep,
+};

package/src/gulp/plugins/mpJsonDep.js

@@ -0,0 +1,108 @@
+/* eslint-disable no-param-reassign */
+const through = require('through2');
+const path = require('path');
+const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
+const { resolve } = require('../../utils/widgets');
+const fs = require('fs');
+const { pluginError } = require('./utils/pluginError');
+const { dfsFindCommonDep } = require('./mpCommonDep');
+
+function mpJsonDep(
+  tmsConfig,
+  module,
+  extensions = ['.json'],
+  filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'],
+  isWatch,
+) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 当前分析的文件的路径
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      const copyModules = new Map();
+      let contents = String(file.contents);
+      try {
+        contents = JSON.parse(contents);
+        if (contents.usingComponents) {
+          Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
+            const includePath = tmsConfig.gulp.dependencies[includeName];
+            Object.keys(contents.usingComponents).forEach((componentKey) => {
+              const componentPath = contents.usingComponents[componentKey];
+              if (componentPath.indexOf(includeName) > -1) {
+                const depOriginPath = path.join(path.dirname(anaFileOriginFile), componentPath);
+                // 被依赖文件加上后缀
+                const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+                const isFileInDir = fileInDir(includePath, depOriginFile);
+                if (!isFileInDir) {
+                  pluginError(
+                    new Error(`${anaFileOriginFile}引用的路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
+                    isWatch,
+                  );
+                  return;
+                }
+
+                // eslint-disable-next-line
+                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = componentPath.match(reg) || [];
+                if (regRes[2]) {
+                  const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+
+                  if (!copyModules.has(depDestFile)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depOriginExt: extAlias,
+                      depDestFile,
+                      beforeDepPath: componentPath,
+                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                    });
+                  }
+                }
+              }
+            });
+          });
+        }
+      } catch (e) {
+        pluginError(e, isWatch);
+      }
+      // console.log('json copyModules', copyModules);
+      copyModules.forEach(({ depOriginFile, depOriginExt, depDestFile, beforeDepPath, afterDepPath }) => {
+        // 拷贝当前依赖组件几个部分 wxml、wxss、wxs、json
+        filesExt.forEach((extKey) => {
+          const originFile = depOriginFile.replace(depOriginExt, extKey);
+          const destFile = depDestFile.replace(depOriginExt, extKey);
+
+          if (fs.existsSync(originFile)) {
+            diffContentCopyFile(originFile, destFile);
+
+            const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
+            if (extensionsFilter.indexOf(extKey) > -1) {
+              const defs = dfsFindCommonDep(originFile, destFile, extensionsFilter);
+              // console.log('json defs', defs);
+              defs.forEach((item) => {
+                diffContentCopyFile(item.depOriginFile, item.depDestFile);
+              });
+            }
+          }
+        });
+        contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+      });
+      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+      file.contents = new Buffer(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpJsonDep,
+};