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

package/dist/index.cjs.js

@@ -16,14 +16,17 @@ var require$$0$5 = require('lodash');
 var require$$0$6 = require('miniprogram-ci');
 var require$$3$1 = require('glob-ignore');
 var require$$0$7 = require('through2');
+var require$$0$8 = require('strip-comments');
 var require$$1$4 = require('precinct');
-var require$$0$8 = require('gulp');
-var require$$1$5 = require('gulp-px-to-rpx');
-var require$$2$1 = require('gulp-less');
-var require$$3$2 = require('gulp-rename');
-var require$$4 = require('gulp-watch');
+var require$$1$5 = require('htmlparser2');
+var require$$0$9 = require('postcss');
+var require$$0$a = require('gulp');
+var require$$1$6 = require('gulp-px-to-rpx');
+var require$$2$1 = require('gulp-postcss');
+var require$$3$2 = require('gulp-watch');
+var require$$4 = require('gulp-cache');
 var require$$5$1 = require('gulp-image');
-var require$$1$6 = require('semver');
+var require$$1$7 = require('semver');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -43,14 +46,17 @@ var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
-var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
+var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
+var require$$0__default$9 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
+var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
+var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
 var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 var require$$3__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$3$2);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var require$$5__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$5$1);
-var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
+var require$$1__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$1$7);
 
 function getAugmentedNamespace(n) {
 	if (n.__esModule) return n;
@@ -72,8 +78,8 @@ var src$2 = {};
 const program$1 = require$$0__default;
 const leven = require$$1__default;
 const ora = require$$2__default;
-const path$8 = require$$1__default$1;
-const fs$c = require$$0__default$1;
+const path$a = require$$1__default$1;
+const fs$e = require$$0__default$1;
 const shelljs$6 = require$$5__default;
 const download = require$$6__default;
 const chalk$3 = require$$0__default$2;
@@ -83,8 +89,8 @@ const shelljsOptons = {
 
 const cwd = process.cwd();
 
-function resolve$c(...args) {
-  return path$8.resolve(cwd, ...args);
+function resolve$d(...args) {
+  return path$a.resolve(cwd, ...args);
 }
 /**
  * 封装logs
@@ -153,7 +159,7 @@ function downloadRepo(dest, downloadOptions = {
     branch
   } = downloadOptions;
 
-  if (fs$c.existsSync(dest)) {
+  if (fs$e.existsSync(dest)) {
     shelljs$6.rm('-rf', dest);
   }
 
@@ -185,8 +191,8 @@ function downloadRepoForGit$2(url, dest, branch) {
   const cwd = process.cwd();
   return new Promise(resolve => {
     // 如果目标目录不存在
-    if (fs$c.existsSync(dest)) {
-      shelljs$6.rm('-rf', path$8.join(dest));
+    if (fs$e.existsSync(dest)) {
+      shelljs$6.rm('-rf', path$a.join(dest));
     }
 
     shelljs$6.mkdir('-p', dest);
@@ -243,7 +249,7 @@ function createTask$4(task, startText, endText) {
 const camelize = str => str.replace(/-(\w)/g, (a, c) => c ? c.toUpperCase() : '');
 
 var widgets = {
-  resolve: resolve$c,
+  resolve: resolve$d,
   log: log$3,
   isObject: isObject$2,
   isArray: isArray$1,
@@ -254,18 +260,18 @@ var widgets = {
   camelize
 };
 
-const path$7 = require('path'); // 用户目录
+const path$9 = require('path'); // 用户目录
 
 
 const HOME_DIR = process.env.HOME; // 所有文件的缓存目录
 
-const CACHE_DIR$1 = path$7.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$1 = path$9.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$7.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$9.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const MODULE_CODE_DIR$1 = path$7.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
+const MODULE_CODE_DIR$1 = path$9.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
 
-const TEMPLATE_PATH$1 = path$7.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
+const TEMPLATE_PATH$1 = path$9.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
 
 const TMS_NAME$2 = 'tmskit'; // 脚手架的配置名称
 
@@ -276,7 +282,7 @@ const DEFAULT_MODULE_DIR$4 = 'modules'; // 模块的配置文件的名称
 const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$7.resolve(process.cwd(), 'app')
+  app: path$9.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
 const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json']; // 开发模式
@@ -291,6 +297,7 @@ const ENV = {
   prod: 'production'
 };
 const TEMPLATE_TKIT_DIR$2 = '_tmskit';
+const MODULE_CONFIG_INVALID_KEY$1 = ['entranceDeclare', 'entryPagePath'];
 
 var constant = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -307,20 +314,31 @@ var constant = /*#__PURE__*/Object.freeze({
 	MODULE_CODE_DIR: MODULE_CODE_DIR$1,
 	MODE: MODE$1,
 	ENV: ENV,
-	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2
+	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
+	MODULE_CONFIG_INVALID_KEY: MODULE_CONFIG_INVALID_KEY$1
 });
 
 var require$$3 = /*@__PURE__*/getAugmentedNamespace(constant);
 
-const fs$b = require$$0__default$1;
-const path$6 = require$$1__default$1;
+const fs$d = require$$0__default$1;
+const path$8 = require$$1__default$1;
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
  * @returns
  */
 
-const isDirEmpty = dirname => fs$b.promises.readdir(dirname).then(files => files.length === 0);
+const isDirEmpty = dirname => fs$d.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
+
+
+const isFile = pathName => {
+  try {
+    const stat = fs$d.lstatSync(pathName);
+    return stat.isFile();
+  } catch {
+    return false;
+  }
+};
 /**
  * 确保目录存在，不存在就创建一个
  * @param {*} dirname 目录名
@@ -328,53 +346,80 @@ const isDirEmpty = dirname => fs$b.promises.readdir(dirname).then(files => files
 
 
 const ensureDirExist = dirname => {
-  if (!fs$b.existsSync(dirname)) {
-    fs$b.mkdirSync(dirname, {
+  if (!fs$d.existsSync(dirname)) {
+    fs$d.mkdirSync(dirname, {
       recursive: true
     });
   }
 }; // 复制文件
 
 
-const copyFile$2 = function (src, dest) {
-  if (fs$b.existsSync(dest)) {
-    fs$b.unlinkSync(dest);
+const copyFile = function (src, dest) {
+  if (fs$d.existsSync(dest)) {
+    fs$d.unlinkSync(dest);
   }
 
   const dir = dest.substr(0, dest.lastIndexOf('/'));
   ensureDirExist(dir);
-  fs$b.copyFileSync(src, dest);
-}; // 添加后缀
+  fs$d.copyFileSync(src, dest);
+}; // 判断文件内容是否一致，不一致再进行拷贝
+
+
+function diffContentCopyFile$3(originFile, destFile) {
+  if (fs$d.existsSync(destFile)) {
+    const depDestContent = fs$d.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$d.readFileSync(originFile, 'utf8');
+
+    if (depDestContent !== depOriginContent) {
+      console.log(`拷贝${originFile}内容到${destFile}`);
+      copyFile(originFile, destFile);
+    }
+  } else {
+    console.log(`拷贝${originFile}内容到${destFile}`);
+    copyFile(originFile, destFile);
+  }
+} // 添加后缀
 
 
-function ext$2(filePath, extensions) {
+function ext$3(filePath, extensions) {
   let newFilePath = filePath;
+  let extPath = ''; // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
 
   try {
-    const stat = fs$b.lstatSync(newFilePath);
+    const stat = fs$d.lstatSync(newFilePath);
 
     if (stat.isDirectory()) {
-      newFilePath += newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
+      extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
+      newFilePath += extPath;
     }
   } catch (e) {}
 
   for (const ext of extensions) {
     const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
 
-    if (fs$b.existsSync(file)) {
+    if (fs$d.existsSync(file)) {
       return {
-        file,
-        ext
+        ext,
+        extPath: extPath + ext,
+        file
       };
     }
   }
 
-  return null;
+  return {
+    ext: '',
+    extPath,
+    file: filePath
+  };
 } // 判断文件是否在某个目录
 
 
-const fileInDir$2 = (dir, file) => {
-  const relativePath = path$6.relative(dir, file);
+const fileInDir$3 = (dir, file) => {
+  if (!fs$d.existsSync(dir) || !fs$d.existsSync(file)) {
+    return false;
+  }
+
+  const relativePath = path$8.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -385,10 +430,12 @@ const fileInDir$2 = (dir, file) => {
 
 var io$2 = {
   isDirEmpty,
-  copyFile: copyFile$2,
+  copyFile,
+  diffContentCopyFile: diffContentCopyFile$3,
   ensureDirExist,
-  ext: ext$2,
-  fileInDir: fileInDir$2
+  ext: ext$3,
+  fileInDir: fileInDir$3,
+  isFile
 };
 
 const chalk$2 = require$$0__default$2;
@@ -404,7 +451,7 @@ const resetCfg = decodeURIComponent('%1B%5B0m'); // \033[0m转义后的字符按
  * @returns {undefined} 无
  */
 
-const fail$9 = (message = '') => {
+const fail$a = (message = '') => {
   const redStyleConfig = decodeURIComponent('%1B%5B41%3B30m'); // \033[41;30m转义后的字符按，console时输出红色文字
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
@@ -437,7 +484,7 @@ const warn = message => {
 };
 
 var log$2 = {
-  fail: fail$9,
+  fail: fail$a,
   succeed: succeed$1,
   warn
 };
@@ -462,10 +509,10 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$a = require$$0__default$1;
+const fs$c = require$$0__default$1;
 const inquirer = require$$1__default$3;
 const {
-  resolve: resolve$b
+  resolve: resolve$c
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -479,12 +526,12 @@ const {
 const parseTemplateQuestions = dir => {
   let prompts = [];
 
-  if (!fs$a.existsSync(`${dir}/questions.json`)) {
+  if (!fs$c.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
 
   try {
-    const json = JSON.parse(fs$a.readFileSync(`${dir}/questions.json`));
+    const json = JSON.parse(fs$c.readFileSync(`${dir}/questions.json`));
 
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
@@ -517,7 +564,7 @@ const isQuestionType = result => {
 };
 
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$b(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$c(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -559,8 +606,8 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$5 = require$$1__default$1;
-const fs$9 = require$$0__default$1;
+const path$7 = require$$1__default$1;
+const fs$b = require$$0__default$1;
 const shelljs$5 = require$$5__default;
 const {
   TEMPLATE_DIR,
@@ -570,11 +617,11 @@ const {
 const {
   downloadRepoForGit: downloadRepoForGit$1,
   createTask: createTask$3,
-  resolve: resolve$a
+  resolve: resolve$b
 } = widgets;
 const io$1 = io$2;
 const {
-  fail: fail$8,
+  fail: fail$9,
   succeed
 } = log$2;
 const generator = generator_1;
@@ -586,9 +633,9 @@ const generator = generator_1;
 
 async function createAppDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$9.existsSync(targetDir)) {
+  if (fs$b.existsSync(targetDir)) {
     if (!(await io$1.isDirEmpty(targetDir))) {
-      fail$8('该目录名已经存在，换个项目名字吧~');
+      fail$9('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
     }
   } else {
@@ -604,7 +651,7 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$5.resolve(cwd, appName);
+  const targetDir = path$7.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
@@ -612,13 +659,13 @@ async function create(appName) {
 
   await createTask$3(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-  generator(path$5.join(TEMPLATE_PATH, appType), targetDir, {
+  generator(path$7.join(TEMPLATE_PATH, appType), targetDir, {
     appName,
     appType
   }).then(() => {
     shelljs$5.cd(appName);
 
-    const hooks = require(resolve$a(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    const hooks = require(resolve$b(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
@@ -632,26 +679,27 @@ async function create(appName) {
       });
     }
 
-    shelljs$5.rm('-rf', resolve$a(appName, TEMPLATE_TKIT_DIR));
+    shelljs$5.rm('-rf', resolve$b(appName, TEMPLATE_TKIT_DIR));
     succeed('项目创建完成.');
   }).catch(err => {
-    fail$8(err.message);
+    fail$9(err.message);
     console.log('详细的错误信息:', err);
   });
 }
 
 var create_1 = create;
 
-const fs$8 = require$$0__default$1;
+const fs$a = require$$0__default$1;
 const {
   DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$3,
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+  MODULE_CONFIG_INVALID_KEY
 } = require$$3;
 const {
-  fail: fail$7
+  fail: fail$8
 } = log$2;
 const {
-  resolve: resolve$9,
+  resolve: resolve$a,
   isObject: isObject$1,
   isArray
 } = widgets;
@@ -700,10 +748,10 @@ function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFile
   modules.forEach(({
     path
   }) => {
-    const moduleConfigPath = resolve$9(path, moduleConfigFilename);
+    const moduleConfigPath = resolve$a(path, moduleConfigFilename);
 
-    if (fs$8.existsSync(moduleConfigPath)) {
-      const content = fs$8.readFileSync(moduleConfigPath, 'utf-8');
+    if (fs$a.existsSync(moduleConfigPath)) {
+      const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
       modulesConfig[moduleConfigPath] = setModuleConfig$1(content, appName, moduleDir);
     }
   });
@@ -728,7 +776,7 @@ function updateMainPackages(appJson, mainPackages = []) {
 
   foundMainPackages.forEach(subpackage => {
     if (!subpackage.pages || !subpackage.pages.length) {
-      fail$7(`主包 ${subpackage} 不能没有 pages`);
+      fail$8(`主包 ${subpackage} 不能没有 pages`);
       process.exit(-1);
     }
 
@@ -754,16 +802,16 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 
 const getAppJsonContent = sourceAppJsonPath => {
-  if (!fs$8.existsSync(sourceAppJsonPath)) {
-    fail$7(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
+  if (!fs$a.existsSync(sourceAppJsonPath)) {
+    fail$8(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
-  const appJson = JSON.parse(fs$8.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const appJson = JSON.parse(fs$a.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
   appJson.subpackages = [];
-  appJson.pages = [];
-  appJson.plugins = {};
+  appJson.pages = []; // appJson.plugins = {};
+
   delete appJson.entranceDeclare;
   return appJson;
 };
@@ -782,6 +830,68 @@ const updateSubpackages = (appJson, modulesConfig) => {
     appJson.subpackages = appJson.subpackages.concat(moduleInfo);
   }
 };
+/**
+ * 处理合并subpackages后的appjson, 整理重复不合法的地方
+ * @param {Object} appJson appjson
+ */
+
+
+const processAppJson = appJson => {
+  const {
+    subpackages
+  } = appJson;
+  const pluginsMap = {};
+  Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
+  const subps = subpackages.map(subp => {
+    const invalidKeys = [];
+    Object.keys(subp).forEach(key => {
+      if (key === 'plugins') {
+        Object.keys(subp.plugins).forEach(pk => {
+          pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
+        });
+        return;
+      }
+
+      if (MODULE_CONFIG_INVALID_KEY.indexOf(key) > -1) {
+        // 如果分包配置中有不支持的key，则错误提醒
+        invalidKeys.push(key);
+        return;
+      }
+
+      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;
+      }
+    });
+
+    if (invalidKeys.length) {
+      fail$8(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
+    } // eslint-disable-next-line
+
+
+    invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
+    return subp;
+  }); // 如果plugins重复，则错误提示
+
+  const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
+    if (pluginsMap[pk].length > 1) {
+      return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
+    }
+
+    return '';
+  }).reduce((pre, cur) => pre + cur, '');
+
+  if (pluginsErrMsg) {
+    fail$8(pluginsErrMsg);
+  } // eslint-disable-next-line
+
+
+  appJson.subpackages = subps;
+};
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
@@ -794,12 +904,14 @@ function buildOutputAppJson$1(tmsConfig, modules) {
   // 获取当前 modules 下的所有子模块的配置内容
   const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$3, MODULE_CONFIG_FILENAME$1); // 获取app.json的配置
 
-  const appJson = getAppJsonContent(resolve$9('./app.json')); // 更新app.json中的subpackages
+  const appJson = getAppJsonContent(resolve$a('./app.json')); // 更新app.json中的subpackages
+
+  updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
 
-  updateSubpackages(appJson, modulesConfig); // 更新主包，需在subpackages处理完成后执行， pages/
+  processAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
   updateMainPackages(appJson, tmsConfig.mainPackages);
-  fs$8.writeFileSync(resolve$9(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+  fs$a.writeFileSync(resolve$a(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
   return appJson;
 }
 
@@ -849,12 +961,12 @@ const {
 } = global;
 const {
   downloadRepoForGit,
-  resolve: resolve$8
+  resolve: resolve$9
 } = widgets;
 const {
-  fail: fail$6
+  fail: fail$7
 } = log$2;
-const fs$7 = require$$0__default$1;
+const fs$9 = require$$0__default$1;
 const shelljs$4 = require$$5__default;
 /**
  * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
@@ -869,7 +981,7 @@ function moveFile(sourceDir, targetDir, ignore = []) {
   return new Promise(resolve => {
     MetalSmith(__dirname).ignore(ignore).source(sourceDir).destination(targetDir).build(e => {
       if (e) {
-        fail$6(e); // eslint-disable-line
+        fail$7(e); // eslint-disable-line
 
         console.log('MetalSmith 详细的错误信息:', e);
       }
@@ -912,9 +1024,9 @@ async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
     path
   } = moduleInfo; // 源码临时存在的源目录
 
-  let sourcePath = resolve$8(sourceDir, path); // 源码要放到目标目录
+  let sourcePath = resolve$9(sourceDir, path); // 源码要放到目标目录
 
-  const targetPath = resolve$8(targetDir, path); // 设置模块的构建分支
+  const targetPath = resolve$9(targetDir, path); // 设置模块的构建分支
 
   const cloneBranch = buildGitTag && typeof buildGitTag === 'string' ? buildGitTag : 'master'; // 检查缓存中有没有
 
@@ -929,13 +1041,13 @@ async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
       sourcePath = globalInstance.getModuleCache(httpRepoUrl, cloneBranch).dest;
     }
 
-    if (fs$7.existsSync(targetPath)) {
+    if (fs$9.existsSync(targetPath)) {
       shelljs$4.rm('-rf', targetPath);
     }
 
     await moveFile(sourcePath, targetPath, ['node_modules', '.git']);
   } catch (e) {
-    fail$6(`downLoadAndMoveModule ${e}`); // eslint-disable-line
+    fail$7(`downLoadAndMoveModule ${e}`); // eslint-disable-line
 
     process.exit(-1);
   }
@@ -961,20 +1073,20 @@ var defaultTmsConfig$1 = {
     /** 源码监听路径 */
     sourceDir: './',
 
-    /** 源码Map */
-    copy: []
+    /** 静态资源目录 */
+    static: []
   }
 };
 
 const loadash = require$$0__default$5;
-const fs$6 = require$$0__default$1;
+const fs$8 = require$$0__default$1;
 const {
   TMS_NAME: TMS_NAME$1,
   TMS_CONFIG_FILENAME,
   MODULE_CONFIG_FILENAME
 } = require$$3;
 const {
-  resolve: resolve$7,
+  resolve: resolve$8,
   isObject
 } = widgets;
 const {
@@ -982,7 +1094,7 @@ const {
 } = buildAppJson;
 const defaultTmsConfig = defaultTmsConfig$1;
 const {
-  fail: fail$5
+  fail: fail$6
 } = log$2;
 /**
  * 读取tms.config.json
@@ -990,10 +1102,10 @@ const {
  */
 
 const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$7(TMS_CONFIG_FILENAME);
+  const tmsConfigPath = resolve$8(TMS_CONFIG_FILENAME);
 
-  if (!fs$6.existsSync(tmsConfigPath)) {
-    fail$5('当前执行目录没有tms.config.js的配置项，请进行配置');
+  if (!fs$8.existsSync(tmsConfigPath)) {
+    fail$6('当前执行目录没有tms.config.js的配置项，请进行配置');
     process.exit(1);
   }
 
@@ -1022,7 +1134,7 @@ const checkModules$1 = function (tmsConfig, modules) {
   });
 
   if (targetModules.length === 0) {
-    fail$5(`你启动的模块无效，尝试 ${TMS_NAME$1} -m moduleName`);
+    fail$6(`你启动的模块无效，尝试 ${TMS_NAME$1} -m moduleName`);
     process.exit(1);
   }
 
@@ -1043,10 +1155,10 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName, moduleDir) => {
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$7(relativePath, MODULE_CONFIG_FILENAME);
+    const moduleConfigPath = resolve$8(relativePath, MODULE_CONFIG_FILENAME);
 
-    if (fs$6.existsSync(moduleConfigPath)) {
-      let moduleConfigContent = fs$6.readFileSync(moduleConfigPath, 'utf-8');
+    if (fs$8.existsSync(moduleConfigPath)) {
+      let moduleConfigContent = fs$8.readFileSync(moduleConfigPath, 'utf-8');
       moduleConfigContent = setModuleConfig(moduleConfigContent, appName, moduleDir);
       const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
       moduleContentArr.forEach(({
@@ -1074,7 +1186,7 @@ var tkitUtils = {
 
 /* eslint-disable require-jsdoc */
 const ci = require$$0__default$6;
-const path$4 = require$$1__default$1;
+const path$6 = require$$1__default$1;
 /**
  * 获取小程序ci的Project对象
  * @returns {Object} 小程序ci对象
@@ -1088,7 +1200,7 @@ const getMpCi = ({
 }) => {
   var _cfgJsonContent$packO;
 
-  const cfgJsonContent = require(path$4.join(projectPath, 'project.config.json'));
+  const cfgJsonContent = require(path$6.join(projectPath, 'project.config.json'));
 
   const ignores = (cfgJsonContent === null || cfgJsonContent === void 0 ? void 0 : (_cfgJsonContent$packO = cfgJsonContent.packOptions) === null || _cfgJsonContent$packO === void 0 ? void 0 : _cfgJsonContent$packO.ignore.map(({
     value
@@ -1157,8 +1269,8 @@ var mpCiUtils = {
 /**
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
-const fs$5 = require$$0__default$1;
-const path$3 = require$$1__default$1;
+const fs$7 = require$$0__default$1;
+const path$5 = require$$1__default$1;
 const shell = require$$5__default;
 const glob = require$$3__default;
 const LOG = log$2;
@@ -1168,14 +1280,14 @@ const getTarNpmFilename = targetDir => `${targetDir.replace(/\//g, '-')}.tar.gz`
 
 
 const npmCache = function (targetDir, cacheDir) {
-  if (!fs$5.existsSync(cacheDir)) {
-    fs$5.mkdirSync(cacheDir);
+  if (!fs$7.existsSync(cacheDir)) {
+    fs$7.mkdirSync(cacheDir);
   }
 
   const tarNpmFilename = getTarNpmFilename(targetDir);
   const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
 
-  if (fs$5.existsSync(tarNpmFilePath)) {
+  if (fs$7.existsSync(tarNpmFilePath)) {
     shell.rm('-rf', tarNpmFilePath);
   }
 
@@ -1191,7 +1303,7 @@ const getNpmCache = function (targetDir, cacheDir) {
   const tarNpmFilename = getTarNpmFilename(targetDir);
   const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
 
-  if (fs$5.existsSync(tarNpmFilePath)) {
+  if (fs$7.existsSync(tarNpmFilePath)) {
     const cmd = `tar -zxvf ${tarNpmFilePath} -C ./`;
     shell.exec(cmd, {
       async: false,
@@ -1205,10 +1317,10 @@ const getNpmCache = function (targetDir, cacheDir) {
 const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
   await Promise.all(packageJsonFiles.map(file => new Promise(resolve => {
-    const dir = path$3.dirname(file);
+    const dir = path$5.dirname(file);
     shell.cd(dir);
 
-    if (!fs$5.existsSync(`${dir}/node_modules`)) {
+    if (!fs$7.existsSync(`${dir}/node_modules`)) {
       getNpmCache(dir, cacheDir);
     }
 
@@ -1238,7 +1350,7 @@ const findFilesByFilter = (startPath, filter) => {
 
   const find = (startPath, filter) => {
     // 目录不存在
-    if (!fs$5.existsSync(startPath)) {
+    if (!fs$7.existsSync(startPath)) {
       LOG.fail(`${startPath}目录不存在`);
       process.exit(-1);
       return;
@@ -1251,10 +1363,10 @@ const findFilesByFilter = (startPath, filter) => {
       return;
     }
 
-    const files = fs$5.readdirSync(startPath);
+    const files = fs$7.readdirSync(startPath);
     files.forEach(file => {
-      const filename = path$3.join(startPath, file);
-      const stat = fs$5.lstatSync(filename); // 当前文件是文件夹类型，继续递归
+      const filename = path$5.join(startPath, file);
+      const stat = fs$7.lstatSync(filename); // 当前文件是文件夹类型，继续递归
 
       if (stat.isDirectory()) {
         find(filename, filter);
@@ -1280,7 +1392,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json'; // 查找文件名
 
   const cwd = contextDir || dirpath;
-  const result = [path$3.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+  const result = [path$5.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach(subRoot => {
     if (!subRoot.root) {
@@ -1288,7 +1400,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
       process.exit(1);
     }
 
-    const toppath = path$3.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+    const toppath = path$5.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
 
     const list = findFilesByFilter(toppath, packageJsonName);
     result.push(...list);
@@ -1304,7 +1416,7 @@ function cloudNpmInstall$1(contextDir) {
       }
 
       files.forEach(file => {
-        const dir = path$3.dirname(file);
+        const dir = path$5.dirname(file);
         shell.cd(dir);
         shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', {
           silent: false
@@ -1323,7 +1435,7 @@ var npmUtils = {
 
 const {
   createTask: createTask$2,
-  resolve: resolve$6
+  resolve: resolve$7
 } = widgets;
 const {
   buildMpNpm
@@ -1343,24 +1455,24 @@ const {
 async function install$2(tmsConfig, modules, isCloud = true) {
   const newModules = tmsModulesMergeLocalModuleCfg$2(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$2); // 小程序npm install
 
-  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(newModules, resolve$6(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
+  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(newModules, resolve$7(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
 
   await createTask$2(buildMpNpm, '开始构建miniprograme_npm', '构建miniprograme_npm 完成')({
     appId: tmsConfig.appId,
-    projectPath: resolve$6('./'),
+    projectPath: resolve$7('./'),
     privateKey: tmsConfig.privateKey
   }); // 安装云函数的
 
-  isCloud && createTask$2(cloudNpmInstall, '云函数npm install', '云函数npm install安装完毕')(resolve$6(tmsConfig.cloudDir));
+  isCloud && createTask$2(cloudNpmInstall, '云函数npm install', '云函数npm install安装完毕')(resolve$7(tmsConfig.cloudDir));
 }
 
 var install_1 = install$2;
 
 const shelljs$3 = require$$5__default;
-const fs$4 = require$$0__default$1;
+const fs$6 = require$$0__default$1;
 const io = io$2;
 const {
-  resolve: resolve$5,
+  resolve: resolve$6,
   createTask: createTask$1
 } = widgets;
 const {
@@ -1378,7 +1490,7 @@ const {
   tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$1
 } = tkitUtils;
 const {
-  fail: fail$4
+  fail: fail$5
 } = log$2;
 const install$1 = install_1;
 /**
@@ -1390,31 +1502,31 @@ const install$1 = install_1;
  */
 
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve$5(tmsConfig.gulp.outputDir);
+  const outputDir = resolve$6(tmsConfig.gulp.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
-    if (fs$4.existsSync(resolve$5(item))) {
-      shelljs$3.cp('-rf', resolve$5(item), resolve$5(tmsConfig.gulp.outputDir, item));
+    if (fs$6.existsSync(resolve$6(item))) {
+      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.gulp.outputDir, item));
     }
   }); // 拷贝模块的package.json到编译输出目录
 
   targetModules.forEach(item => {
-    const outputModuleDir = resolve$5(`${tmsConfig.gulp.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$6(`${tmsConfig.gulp.outputDir}/${item.root}`);
 
-    if (!fs$4.existsSync(resolve$5(item.path))) {
-      fail$4(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+    if (!fs$6.existsSync(resolve$6(item.path))) {
+      fail$5(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
 
     io.ensureDirExist(outputModuleDir);
-    const modulePackagePath = resolve$5(item.path, 'package.json');
-    if (fs$4.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
+    const modulePackagePath = resolve$6(item.path, 'package.json');
+    if (fs$6.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
-  await createTask$1(cloneModules, '开始下载模块代码完成', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$5('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
+  await createTask$1(cloneModules, '开始下载模块代码完成', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$6('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
 
   const newModules = tmsModulesMergeLocalModuleCfg$1(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR$1);
   console.log('当前init的有效模块', newModules.map(item => item.name)); // 拷贝相关配置文件到输出目录
@@ -1438,10 +1550,10 @@ var init$5 = bootstrap;
 
 var dev$3 = {exports: {}};
 
-const through$2 = require$$0__default$7;
+const through$3 = require$$0__default$7;
 
 function replaceEnv$1(reg = /process\.env(\.(\w*))?/g, envData) {
-  const stream = through$2.obj(function (file, enc, cb) {
+  const stream = through$3.obj(function (file, enc, cb) {
     if (file.isBuffer()) {
       let contents = String(file.contents);
       let resReg; // eslint-disable-next-line
@@ -1469,54 +1581,121 @@ function replaceEnv$1(reg = /process\.env(\.(\w*))?/g, envData) {
 
 var replaceEnv_1 = replaceEnv$1;
 
-const through$1 = require$$0__default$7;
+/* eslint-disable no-param-reassign */
+const strip = require$$0__default$8; // 匹配规则
+
+const MATCH_RULE = new RegExp(/@import *(?:url\(['"]?([^'")]+)['"]?\)|['"]([^'"]+)['"]);?/g);
+/**
+ * 获取样式文件中的@import语句
+ * @param code 代码片段
+ * @returns 结果数组
+ */
+
+const findCssImports$1 = code => {
+  // 将buffer转成字符串
+  code = code.toString(); // 去除注释
+
+  code = strip.block(code); // 定义最后返回的结果
+
+  const result = [];
+  let matchList; // 循环遍历代码段，直至匹配结果为空
+
+  while (matchList = MATCH_RULE.exec(code)) {
+    var _matchList, _matchList2;
+
+    // 存入结果数组
+    result.push(((_matchList = matchList) === null || _matchList === void 0 ? void 0 : _matchList[1]) || ((_matchList2 = matchList) === null || _matchList2 === void 0 ? void 0 : _matchList2[2]));
+  } // 返回结果
+
+
+  return result;
+};
+
+var findCssImport = {
+  findCssImports: findCssImports$1
+};
+
+/* eslint-disable no-param-reassign */
+const {
+  fail: fail$4
+} = log$2;
+
+function pluginError$3(error, isWatch) {
+  const errMsg = error.message;
+
+  if (isWatch) {
+    fail$4(errMsg);
+  } else {
+    fail$4(errMsg);
+    process.exit(1);
+  }
+}
+
+var pluginError_1 = {
+  pluginError: pluginError$3
+};
+
+/* eslint-disable no-param-reassign */
+const through$2 = require$$0__default$7;
 const precinct = require$$1__default$4;
-const path$2 = require$$1__default$1;
+const path$4 = require$$1__default$1;
 const {
-  copyFile: copyFile$1,
-  ext: ext$1,
-  fileInDir: fileInDir$1
+  findCssImports
+} = findCssImport;
+const {
+  ext: ext$2,
+  fileInDir: fileInDir$2,
+  diffContentCopyFile: diffContentCopyFile$2
 } = io$2;
 const {
-  resolve: resolve$4
+  resolve: resolve$5
 } = widgets;
-const fs$3 = require$$0__default$1;
+const fs$5 = require$$0__default$1;
 const {
-  fail: fail$3
-} = log$2;
+  pluginError: pluginError$2
+} = pluginError_1;
+const cssFilter = ['.less', '.wxss'];
 
-const dfsFindJsDep$1 = function (anaFileOriginFile, anaFileDestFile, extensions) {
+const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensions, isWatch = true) {
   const resDep = new Map();
 
   function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
-    const contents = fs$3.readFileSync(anaFileOriginFile, 'utf8');
-    const deps = precinct(contents);
+    let contents = '';
+
+    try {
+      contents = fs$5.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError$2(e, isWatch);
+    }
+
+    const deps = cssFilter.indexOf(path$4.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
     deps.forEach(depItem => {
       if (depItem.startsWith('.')) {
         // 被依赖文件的存在的绝对路径
-        const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+        const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
 
-        const depOriginPathExt = ext$1(depOriginPath, extensions);
-
-        if (!depOriginPathExt) {
-          fail$3(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
-        } // 被依赖文件是否存在 include的path中 (只处理include的文件)
+        const {
+          ext: extAlias,
+          file: depOriginFile,
+          extPath
+        } = ext$2(depOriginPath, extensions);
 
+        if (!fs$5.existsSync(depOriginFile)) {
+          pluginError$2(new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`), isWatch);
+          return;
+        }
 
-        if (depOriginPathExt) {
-          const depOriginFile = depOriginPathExt.file;
-          const depDestPath = resolve$4(path$2.dirname(anaFileDestFile), depItem);
-          const depDestFile = depDestPath.endsWith(depOriginPathExt.ext) ? depDestPath : depDestPath + depOriginPathExt.ext;
+        const depDestPath = resolve$5(path$4.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);
-          }
+        if (!resDep.has(depDestFile)) {
+          resDep.set(depDestFile, {
+            anaFileOriginFile,
+            anaFileDestFile,
+            depDestFile,
+            depOriginFile
+          });
+          dfs(depOriginFile, depDestFile, extensions);
         }
       }
     });
@@ -1526,94 +1705,70 @@ const dfsFindJsDep$1 = function (anaFileOriginFile, anaFileDestFile, extensions)
   return resDep;
 };
 
-function handleCopyFile$1(depDestFile, depOriginFile) {
-  if (fs$3.existsSync(depDestFile)) {
-    const depDestContent = fs$3.readFileSync(depDestFile, 'utf8');
-    const depOriginContent = fs$3.readFileSync(depOriginFile, 'utf8');
-
-    if (depDestContent !== depOriginContent) {
-      console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-      copyFile$1(depOriginFile, depDestFile);
-    }
-  } else {
-    console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-    copyFile$1(depOriginFile, depDestFile);
-  }
-}
-
-function jsDep$1(tmsConfig, module, extensions = ['.js', '.ts', '.wxs']) {
-  const stream = through$1.obj(function (file, enc, cb) {
+function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
+  const stream = through$2.obj(function (file, enc, cb) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$2.relative(resolve$4(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$4(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$4.relative(resolve$5(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$5(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
-      const deps = precinct(contents);
+      const deps = cssFilter.indexOf(path$4.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$2.join(path$2.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
-
-            const depOriginPathExt = ext$1(depOriginPath, extensions);
-
-            if (!depOriginPathExt) {
-              fail$3(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
-            }
-
-            const isFileInDir = fileInDir$1(includePath, depOriginPathExt.file);
-
-            if (!isFileInDir) {
-              fail$3(`${depOriginPathExt.file}不在${includePath}不在文件夹内, 请检查应用路径`);
-            } // 被依赖文件是否存在 include的path中 (只处理include的文件)
-
-
-            if (depOriginPathExt && isFileInDir) {
-              // eslint-disable-next-line
-              const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-              const regRes = depItem.match(reg) || [];
-
-              if (regRes[2]) {
-                const depDestPath = resolve$4(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
-                const depDestFile = depDestPath.endsWith(depOriginPathExt.ext) ? depDestPath : depDestPath + depOriginPathExt.ext; // {
-                //   depOriginFile: '/Users/odile/workspace/tms-frontend1/miniprogram/thirdparty/libs/timer.js',
-                //   depDestFile: `/Users/odile/workspace/tms-frontend1/tools/demo1/dist/modules/
-                //                 aggredriving/thirdparty/libs/timer.js`,
-                //   beforeDepPath: '../../../../thirdparty/libs/timer',
-                //   afterDepPath: '../../thirdparty/libs/timer'
-                // }
-
-                if (!copyModules.has(depDestFile)) {
-                  copyModules.set(depDestFile, {
-                    depOriginFile: depOriginPathExt.file,
-                    depDestFile,
-                    beforeDepPath: depItem,
-                    afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestPath)
-                  });
-                }
+            const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+
+            const {
+              ext: extAlias,
+              file: depOriginFile,
+              extPath
+            } = ext$2(depOriginPath, extensions);
+
+            if (!fileInDir$2(includePath, depOriginFile)) {
+              pluginError$2(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$5(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$4.relative(path$4.dirname(anaFileDestFile), depDestPath)
+                });
               }
             }
           }
         });
-      });
+      }); // console.log('mpCommonDep copyModules', copyModules);
+
       copyModules.forEach(({
         depOriginFile,
         depDestFile,
         beforeDepPath,
         afterDepPath
       }) => {
-        handleCopyFile$1(depDestFile, depOriginFile);
-        contents = contents.replace(beforeDepPath, afterDepPath);
-        const defs = dfsFindJsDep$1(depOriginFile, depDestFile, extensions);
+        diffContentCopyFile$2(depOriginFile, depDestFile);
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+        const defs = dfsFindCommonDep$2(depOriginFile, depDestFile, extensions, isWatch);
         defs.forEach(item => {
-          handleCopyFile$1(item.depDestFile, item.depOriginFile);
-        });
-      }); // eslint-disable-next-line
-
+          diffContentCopyFile$2(item.depOriginFile, item.depDestFile);
+        }); // console.log('mpCommonDep defs', defs);
+      });
       file.contents = new Buffer(contents);
     }
 
@@ -1623,50 +1778,36 @@ function jsDep$1(tmsConfig, module, extensions = ['.js', '.ts', '.wxs']) {
   return stream;
 }
 
-var jsDep_1 = {
-  jsDep: jsDep$1,
-  dfsFindJsDep: dfsFindJsDep$1
+var mpCommonDep_1 = {
+  mpCommonDep: mpCommonDep$1,
+  dfsFindCommonDep: dfsFindCommonDep$2
 };
 
-const through = require$$0__default$7;
-const path$1 = require$$1__default$1;
+/* eslint-disable no-param-reassign */
+const through$1 = require$$0__default$7;
+const path$3 = require$$1__default$1;
 const {
-  copyFile,
-  ext,
-  fileInDir
+  ext: ext$1,
+  fileInDir: fileInDir$1,
+  diffContentCopyFile: diffContentCopyFile$1
 } = io$2;
 const {
-  resolve: resolve$3
+  resolve: resolve$4
 } = widgets;
-const fs$2 = require$$0__default$1;
+const fs$4 = require$$0__default$1;
 const {
-  fail: fail$2
-} = log$2;
+  pluginError: pluginError$1
+} = pluginError_1;
 const {
-  dfsFindJsDep
-} = jsDep_1;
+  dfsFindCommonDep: dfsFindCommonDep$1
+} = mpCommonDep_1;
 
-function handleCopyFile(depDestFile, depOriginFile) {
-  if (fs$2.existsSync(depDestFile)) {
-    const depDestContent = fs$2.readFileSync(depDestFile, 'utf8');
-    const depOriginContent = fs$2.readFileSync(depOriginFile, 'utf8');
-
-    if (depDestContent !== depOriginContent) {
-      console.log(`json拷贝${depOriginFile}内容到${depDestFile}`);
-      copyFile(depOriginFile, depDestFile);
-    }
-  } else {
-    console.log(`json拷贝${depOriginFile}内容到${depDestFile}`);
-    copyFile(depOriginFile, depDestFile);
-  }
-}
-
-function mpJsonDep$1(tmsConfig, module, extensions = ['.wxml'], filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less']) {
-  const stream = through.obj(function (file, enc, cb) {
+function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch) {
+  const stream = through$1.obj(function (file, enc, cb) {
     // 当前分析的文件的路径
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$1.relative(resolve$3(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$3(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$3.relative(resolve$4(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$4(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       const copyModules = new Map();
@@ -1682,38 +1823,36 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.wxml'], filesExt = ['.wx
               const componentPath = contents.usingComponents[componentKey];
 
               if (componentPath.indexOf(includeName) > -1) {
-                const depOriginPath = path$1.join(path$1.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
-
-                const depOriginPathExt = ext(depOriginPath, extensions);
-
-                if (!depOriginPathExt) {
-                  fail$2(`${anaFileOriginFile}的${componentPath}引用路径存找不到文件，请检查引用路径`);
-                }
+                const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
 
-                const isFileInDir = fileInDir(includePath, depOriginPathExt.file);
+                const {
+                  ext: extAlias,
+                  file: depOriginFile,
+                  extPath
+                } = ext$1(depOriginPath, extensions);
+                const isFileInDir = fileInDir$1(includePath, depOriginFile);
 
                 if (!isFileInDir) {
-                  fail$2(`${depOriginPathExt.file}不在${includePath}不在文件夹内, 请检查应用路径`);
-                }
-
-                if (depOriginPathExt && isFileInDir) {
-                  // eslint-disable-next-line
-                  const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-                  const regRes = componentPath.match(reg) || [];
-
-                  if (regRes[2]) {
-                    const depDestPath = resolve$3(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
-                    const depDestFile = depDestPath.endsWith(depOriginPathExt.ext) ? depDestPath : depDestPath + depOriginPathExt.ext;
-
-                    if (!copyModules.has(depDestFile)) {
-                      copyModules.set(depDestFile, {
-                        depOriginFile: depOriginPathExt.file,
-                        depOriginExt: depOriginPathExt.ext,
-                        depDestFile,
-                        beforeDepPath: componentPath,
-                        afterDepPath: path$1.relative(path$1.dirname(anaFileDestFile), depDestPath)
-                      });
-                    }
+                  pluginError$1(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$4(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$3.relative(path$3.dirname(anaFileDestFile), depDestPath)
+                    });
                   }
                 }
               }
@@ -1721,8 +1860,9 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.wxml'], filesExt = ['.wx
           });
         }
       } catch (e) {
-        fail$2(`解析jsonDep出现错误:${e}`);
-      }
+        pluginError$1(e, isWatch);
+      } // console.log('json copyModules', copyModules);
+
 
       copyModules.forEach(({
         depOriginFile,
@@ -1731,27 +1871,29 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.wxml'], filesExt = ['.wx
         beforeDepPath,
         afterDepPath
       }) => {
+        // 拷贝当前依赖组件几个部分 wxml、wxss、wxs、json
         filesExt.forEach(extKey => {
           const originFile = depOriginFile.replace(depOriginExt, extKey);
           const destFile = depDestFile.replace(depOriginExt, extKey);
 
-          if (fs$2.existsSync(originFile)) {
-            handleCopyFile(destFile, originFile);
-            const jsExtensions = ['.js', '.ts'];
+          if (fs$4.existsSync(originFile)) {
+            diffContentCopyFile$1(originFile, destFile);
+            const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
+
+            if (extensionsFilter.indexOf(extKey) > -1) {
+              const defs = dfsFindCommonDep$1(originFile, destFile, extensionsFilter); // console.log('json defs', defs);
 
-            if (jsExtensions.indexOf(extKey) > -1) {
-              const defs = dfsFindJsDep(originFile, destFile, jsExtensions);
               defs.forEach(item => {
-                handleCopyFile(item.depDestFile, item.depOriginFile);
+                diffContentCopyFile$1(item.depOriginFile, item.depDestFile);
               });
             }
           }
         });
         contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
-        contents = contents.replace(beforeDepPath, afterDepPath);
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
       });
-      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents; // eslint-disable-next-line
-
+      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
       file.contents = new Buffer(contents);
     }
 
@@ -1765,22 +1907,319 @@ var mpJsonDep_1 = {
   mpJsonDep: mpJsonDep$1
 };
 
+/* eslint-disable no-param-reassign */
+const through = require$$0__default$7;
+const htmlparser2 = require$$1__default$5;
+const fs$3 = require$$0__default$1;
+const path$2 = require$$1__default$1;
+const {
+  diffContentCopyFile,
+  ext,
+  fileInDir
+} = io$2;
+const {
+  resolve: resolve$3
+} = widgets;
+const {
+  dfsFindCommonDep
+} = mpCommonDep_1;
+const {
+  pluginError
+} = pluginError_1; // 处理后缀(源码引入依赖时，不带后缀的情况)
+
+const extFile = function (name, file) {
+  const extMap = {
+    import: '.wxml',
+    include: '.wxml',
+    wxs: '.wxs'
+  };
+  let extObj = {};
+
+  if (Object.keys(extMap).indexOf(name) > -1 && !file.endsWith(extMap[name])) {
+    extObj = ext(file, [extMap[name]]);
+  }
+
+  return {
+    extPath: extObj.extPath || '',
+    ext: extObj.ext || '',
+    file: extObj.file || file
+  };
+};
+
+const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = true) {
+  const resDep = {
+    image: new Map(),
+    wxml: new Map(),
+    wxs: new Map()
+  };
+
+  function dfs(anaFileOriginFile, anaFileDestFile) {
+    let contents = '';
+
+    try {
+      contents = fs$3.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError(e, isWatch);
+    }
+
+    const parser = new htmlparser2.Parser({
+      onopentag(name, attributes) {
+        var _attributes$src;
+
+        if (attributes !== null && attributes !== void 0 && (_attributes$src = attributes.src) !== null && _attributes$src !== void 0 && _attributes$src.startsWith('.')) {
+          const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
+
+          const {
+            ext,
+            file: depOriginFile,
+            extPath
+          } = extFile(name, depOriginPath);
+
+          if (!fs$3.existsSync(depOriginFile)) {
+            pluginError(new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`), isWatch);
+            return;
+          }
+
+          const depDestPath = path$2.join(path$2.dirname(anaFileDestFile), attributes.src);
+          const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath; // 收集wxml依赖
+
+          if (['import', 'include'].indexOf(name) > -1) {
+            resDep.wxml.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile
+            });
+            dfs(depOriginFile, depDestFile);
+          } // 收集image依赖
+          // if (name === 'image') {
+          //   resDep.image.set(attributes.src, {
+          //     anaFileOriginFile,
+          //     anaFileDestFile,
+          //     depDestFile,
+          //     depOriginFile,
+          //   });
+          //   dfs(depOriginFile, depDestFile);
+          // }
+          // 收集wxs依赖
+
+
+          if (name === 'wxs') {
+            resDep.wxs.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile
+            });
+            const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs']);
+            defs.forEach((item, key) => {
+              resDep.wxs.set(key, item);
+            });
+          }
+        }
+      }
+
+    });
+    parser.write(contents);
+    parser.end();
+  }
+
+  dfs(anaFileOriginFile, anaFileDestFile);
+  return resDep;
+};
+
+function mpWxmlDep$1(tmsConfig, module, isWatch) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 依赖分析的文件
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path$2.relative(resolve$3(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$3(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      const copyModules = new Map();
+      const parser = new htmlparser2.Parser({
+        onopentag(name, attributes) {
+          const nameFilter = ['import', 'include', 'wxs'];
+
+          if (nameFilter.indexOf(name) > -1 && attributes.src) {
+            const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
+
+            const {
+              ext,
+              file: depOriginFile,
+              extPath
+            } = extFile(name, depOriginPath);
+            Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
+              if (attributes.src.indexOf(includeName) > -1) {
+                const includePath = tmsConfig.gulp.dependencies[includeName];
+
+                if (!fileInDir(includePath, depOriginFile)) {
+                  pluginError(new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
+                  return;
+                } // eslint-disable-next-line
+
+
+                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = attributes.src.match(reg) || [];
+
+                if (regRes[2]) {
+                  const depDestPath = resolve$3(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
+
+                  if (!copyModules.has(depDestFile)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depDestFile,
+                      beforeDepPath: attributes.src,
+                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile)
+                    });
+                  }
+                }
+              }
+            });
+          }
+        }
+
+      });
+      parser.write(contents);
+      parser.end(); // console.log('wxml copyModules', copyModules);
+
+      copyModules.forEach(({
+        depOriginFile,
+        depDestFile,
+        beforeDepPath,
+        afterDepPath
+      }) => {
+        if (fs$3.existsSync(depOriginFile)) {
+          diffContentCopyFile(depOriginFile, depDestFile);
+          const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+          contents = contents.replace(reg, `"${afterDepPath}"`);
+        }
+
+        if (depOriginFile.endsWith('.wxml')) {
+          const defs = dfsFindWxmlDep(depOriginFile, depDestFile, isWatch); // console.log('wxml defs', defs);
+
+          [...defs.wxml, ...defs.wxs].forEach(([, item]) => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
+        }
+
+        if (depOriginFile.endsWith('.wxs')) {
+          const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs'], isWatch); // console.log('wxs defs', defs);
+
+          defs.forEach(item => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
+        }
+      });
+      file.contents = new Buffer(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+  return stream;
+}
+
+var mpWxmlDep_1 = {
+  mpWxmlDep: mpWxmlDep$1,
+  dfsFindWxmlDep
+};
+
+/* eslint-disable no-param-reassign */
+const postcss$1 = require$$0__default$9;
+const fs$2 = require$$0__default$1;
+const path$1 = require$$1__default$1;
+const {
+  fail: fail$3
+} = log$2;
+var postcssFontBase64 = postcss$1.plugin('postcss-font-base64', options => {
+  options = { ...options,
+    ...{
+      match: {
+        Scrabble: ['fakefont']
+      },
+      format: ['eot', 'woff', 'woff2', 'ttf']
+    }
+  };
+  return function (css, result) {
+    css.walkAtRules('font-face', fontFace => {
+      const fileTypeRegex = getRegexStringForFileTypes(options.format);
+      fontFace.replaceValues(new RegExp(`url\\(["']?.+\\.${fileTypeRegex}["']?\\)`), attr => {
+        const fontRePath = attr.replace(/(url|'|"|\(|\)|\?#iefix)/g, '');
+        const fontAbPath = path$1.join(path$1.dirname(result.opts.from), fontRePath);
+        const res64 = base64Encode(fontAbPath);
+        const newUrlStr = 'url(data:'.concat(getMimeType(attr)).concat(';charset=utf-8;base64,').concat(res64).concat(')');
+        return res64 ? newUrlStr : attr;
+      });
+    });
+
+    function getRegexStringForFileTypes(fileTypes) {
+      const regex = fileTypes.map(fileType => fileType === 'eot' ? fileType.concat('(\\?#iefix)?') : fileType).join('|');
+      return regex ? `(${regex})` : '';
+    } // helper functions
+
+
+    function getMimeType(attribute) {
+      const formats = {
+        '.woff': 'application/font-woff',
+        '.woff2': 'font/woff2',
+        '.ttf': 'application/font-sfnt',
+        '.eot': 'application/vnd.ms-fontobject',
+        '.otf': 'application/font-sfnt'
+      };
+      let match = '';
+      const extension = attribute.match(/\.[a-z]{3,4}/)[0];
+
+      if (extension in formats) {
+        match = formats[extension];
+      }
+      return match;
+    }
+
+    function base64Encode(file) {
+      if (fs$2.existsSync(file)) {
+        return readAndEncodeFile(file);
+      }
+
+      fail$3(`${file} does not exist.`);
+      return '';
+    }
+
+    function readAndEncodeFile(file) {
+      const bitmap = fs$2.readFileSync(file);
+      return new Buffer(bitmap).toString('base64');
+    }
+  };
+});
+
 const {
   src: src$1,
-  dest
-} = require$$0__default$8;
-const px2rpx = require$$1__default$5;
-const less = require$$2__default$1;
-const rename = require$$3__default$1;
-const watch = require$$4__default;
+  dest,
+  lastRun
+} = require$$0__default$a;
+const px2rpx = require$$1__default$6;
+const postcss = require$$2__default$1;
+const watch = require$$3__default$1;
+const cache = require$$4__default;
 const image = require$$5__default$1;
 const replaceEnv = replaceEnv_1;
 const {
-  jsDep
-} = jsDep_1;
+  mpCommonDep
+} = mpCommonDep_1;
 const {
   mpJsonDep
 } = mpJsonDep_1;
+const {
+  mpWxmlDep
+} = mpWxmlDep_1;
+const base64 = postcssFontBase64;
+const {
+  fail: fail$2
+} = log$2;
+
+const since = task => file => lastRun(task) > file.stat.ctime ? lastRun(task) : 0;
 
 var compile = function (tmsConfig, {
   glob,
@@ -1794,7 +2233,12 @@ var compile = function (tmsConfig, {
 }) {
   Object.keys(glob).forEach(globKey => {
     const globValue = glob[globKey];
-    let srcPipe = src$1(globValue, srcOption);
+
+    const task = () => src$1(globValue, { ...srcOption,
+      since: since(task)
+    });
+
+    let srcPipe = task();
 
     if (isWatch) {
       srcPipe = srcPipe.pipe(watch(globValue, watchOption));
@@ -1802,30 +2246,36 @@ var compile = function (tmsConfig, {
 
     switch (globKey) {
       case 'js':
-        srcPipe.pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData)).pipe(jsDep(tmsConfig, module)).pipe(dest(destPath));
+        srcPipe.pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData)).pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch)).pipe(dest(destPath)).on('error', err => {
+          fail$2(`js编译报错${err}`);
+        });
         break;
 
-      case 'css':
-        srcPipe.pipe(less()).pipe(px2rpx({
+      case 'wxss':
+        srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch)).pipe(postcss([base64()])).on('error', err => {
+          fail$2(`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(dest(destPath));
+        srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch)).on('error', err => {
+          fail$2(`json编译报错${err}`);
+        }).pipe(dest(destPath));
         break;
 
-      case 'html':
-        srcPipe.pipe(dest(destPath));
+      case 'wxml':
+        srcPipe.pipe(mpWxmlDep(tmsConfig, module, isWatch)).pipe(dest(destPath));
         break;
 
       case 'image':
-        srcPipe.pipe(image()).pipe(dest(destPath));
+        srcPipe.pipe(cache(image())).on('error', err => {
+          fail$2(`image编译报错${err}`);
+        }).pipe(dest(destPath));
         break;
 
       case 'other':
@@ -1836,7 +2286,7 @@ var compile = function (tmsConfig, {
 };
 
 (function (module) {
-  const watch = require$$4__default;
+  const watch = require$$3__default$1;
   const {
     resolve
   } = widgets;
@@ -1848,8 +2298,9 @@ var compile = function (tmsConfig, {
   } = require$$3;
   const compile$1 = 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]}`;
@@ -1887,7 +2338,7 @@ var compile = function (tmsConfig, {
     compile$1(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: {
@@ -1922,13 +2373,13 @@ var compile = function (tmsConfig, {
       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$1(tmsConfig, {
         glob: { ...glob,
-          other: [`${resolve(module.path)}/**/*`, ...handleOtherGlob(glob)]
+          other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)]
         },
         destPath: resolve(tmsConfig.gulp.outputDir, module.root),
         module: {
@@ -1943,20 +2394,20 @@ var compile = function (tmsConfig, {
     } // 监听copy模块
 
 
-    if (tmsConfig !== null && tmsConfig !== void 0 && (_tmsConfig$gulp = tmsConfig.gulp) !== null && _tmsConfig$gulp !== void 0 && _tmsConfig$gulp.copy && (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.copy.length) > 0) {
-      for (const item of (_tmsConfig$gulp3 = tmsConfig.gulp) === null || _tmsConfig$gulp3 === void 0 ? void 0 : _tmsConfig$gulp3.copy) {
+    if (tmsConfig !== null && tmsConfig !== void 0 && (_tmsConfig$gulp = tmsConfig.gulp) !== null && _tmsConfig$gulp !== void 0 && _tmsConfig$gulp.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.static.length) > 0) {
+      for (const item of (_tmsConfig$gulp3 = tmsConfig.gulp) === null || _tmsConfig$gulp3 === void 0 ? void 0 : _tmsConfig$gulp3.static) {
         var _tmsConfig$gulp3;
 
         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$1(tmsConfig, {
           glob: { ...glob,
-            other: [`${item.from}/**/*`, ...handleOtherGlob(glob)]
+            other: [`${item.from}/**/*`, ...excludeGlob(glob)]
           },
           destPath: item.to,
           module: item,
@@ -1971,7 +2422,7 @@ var compile = function (tmsConfig, {
 })(dev$3);
 
 const fs$1 = require$$0__default$1;
-const semver$1 = require$$1__default$6;
+const semver$1 = require$$1__default$7;
 const {
   resolve: resolve$2
 } = widgets;
@@ -2287,12 +2738,18 @@ var entry = [{
 
 var require$$6 = {
 	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"
@@ -2324,21 +2781,27 @@ var require$$6 = {
 		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"
@@ -2348,7 +2811,7 @@ var require$$6 = {
 	}
 };
 
-const semver = require$$1__default$6;
+const semver = require$$1__default$7;
 const packageJson = require$$6;
 const chalk$1 = require$$0__default$2;
 const {