@tmsfe/tmskit 0.0.6 → 0.0.7

package/src/gulp/dev.js

@@ -1,102 +1,102 @@
-const watch = require('gulp-watch');
-const { resolve } = require('../utils/widgets');
-const { buildOutputAppJson } = require('../utils/buildAppJson');
-const { DEFAULT_COPY_CONFIG } = require('../config/constant');
-const compile = require('./compile');
-
-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]}`;
-      otherArr.add(data);
-    } if (Array.isArray(glob[globKey])) {
-      glob[globKey].forEach((value) => {
-        if (typeof value === 'string') {
-          const data = value.startsWith('!') ? value : `!${value}`;
-          otherArr.add(data);
-        }
-      });
-    }
-  });
-  return Array.from(otherArr);
-}
-
-module.exports = async (tmsConfig, newModules, isWatch = true) => {
-  // 监听app.json
-  if (isWatch) {
-    watch(resolve('app.json'), { ignoreInitial: false, events: ['add', 'change'] }, () => {
-      buildOutputAppJson(tmsConfig, newModules, isWatch);
-    });
-  } else {
-    buildOutputAppJson(tmsConfig, newModules, isWatch);
-  }
-
-  // 监听根目录的文件
-  compile(tmsConfig, {
-    glob: {
-      json: DEFAULT_COPY_CONFIG.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: '' },
-    destPath: resolve(tmsConfig.outputDir),
-    srcOption: { allowEmpty: true },
-    isWatch,
-  });
-
-  // 监听模块的文件
-  for (let module of newModules) {
-    // 处理默认参数
-    module = {
-      ...{ exclude: [] },
-      ...module,
-    };
-
-    if (isWatch) {
-      // 监听模块配置文件
-      watch(`${resolve(module.path)}/**/module.config.json`, {  events: ['change'] }, () => {
-        buildOutputAppJson(tmsConfig, newModules, isWatch);
-      });
-    }
-
-    const excludes = module.exclude.map(key => `!${resolve(key)}`);
-    const glob = {
-      js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
-      json: [`${resolve(module.path)}/**/*.json`, ...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)}/**/*`, ...excludeGlob(glob)],
-      },
-      destPath: resolve(tmsConfig.outputDir, module.root),
-      module: { from: module.path, to: module.root },
-      srcOption: { allowEmpty: true },
-      isWatch,
-    });
-  }
-
-  // 静态资源目录-拷贝
-  if (tmsConfig?.static && tmsConfig?.static.length > 0) {
-    for (const item of tmsConfig.static) {
-      const from = item?.from.startsWith('/') ? item.from : resolve(item.from);
-      const to = item?.to.startsWith('/') ? item.to : resolve(item.to);
-
-      compile(tmsConfig, {
-        glob: {
-          other: [from],
-        },
-        destPath: to,
-        module: item,
-        srcOption: { allowEmpty: true },
-        isWatch,
-      });
-    }
-  }
-};
+const watch = require('gulp-watch');
+const { resolve } = require('../utils/widgets');
+const { buildOutputAppJson } = require('../utils/buildAppJson');
+const { DEFAULT_COPY_CONFIG } = require('../config/constant');
+const compile = require('./compile');
+
+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]}`;
+      otherArr.add(data);
+    } if (Array.isArray(glob[globKey])) {
+      glob[globKey].forEach((value) => {
+        if (typeof value === 'string') {
+          const data = value.startsWith('!') ? value : `!${value}`;
+          otherArr.add(data);
+        }
+      });
+    }
+  });
+  return Array.from(otherArr);
+}
+
+module.exports = async (tmsConfig, newModules, isWatch = true) => {
+  // 监听app.json
+  if (isWatch) {
+    watch(resolve('app.json'), { ignoreInitial: false, events: ['add', 'change'] }, () => {
+      buildOutputAppJson(tmsConfig, newModules, isWatch);
+    });
+  } else {
+    buildOutputAppJson(tmsConfig, newModules, isWatch);
+  }
+
+  // 监听根目录的文件
+  compile(tmsConfig, {
+    glob: {
+      json: DEFAULT_COPY_CONFIG.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: '' },
+    destPath: resolve(tmsConfig.outputDir),
+    srcOption: { allowEmpty: true },
+    isWatch,
+  });
+
+  // 监听模块的文件
+  for (let module of newModules) {
+    // 处理默认参数
+    module = {
+      ...{ exclude: [] },
+      ...module,
+    };
+
+    if (isWatch) {
+      // 监听模块配置文件
+      watch(`${resolve(module.path)}/**/module.config.json`, {  events: ['change'] }, () => {
+        buildOutputAppJson(tmsConfig, newModules, isWatch);
+      });
+    }
+
+    const excludes = module.exclude.map(key => `!${resolve(key)}`);
+    const glob = {
+      js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
+      json: [`${resolve(module.path)}/**/*.json`, ...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)}/**/*`, ...excludeGlob(glob)],
+      },
+      destPath: resolve(tmsConfig.outputDir, module.root),
+      module: { from: module.path, to: module.root },
+      srcOption: { allowEmpty: true },
+      isWatch,
+    });
+  }
+
+  // 静态资源目录-拷贝
+  if (tmsConfig?.static && tmsConfig?.static.length > 0) {
+    for (const item of tmsConfig.static) {
+      const from = item?.from.startsWith('/') ? item.from : resolve(item.from);
+      const to = item?.to.startsWith('/') ? item.to : resolve(item.to);
+
+      compile(tmsConfig, {
+        glob: {
+          other: [from],
+        },
+        destPath: to,
+        module: item,
+        srcOption: { allowEmpty: true },
+        isWatch,
+      });
+    }
+  }
+};

package/src/gulp/plugins/less.js

@@ -1,116 +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));
-      });
-  });
-};
+/* 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));
+      });
+  });
+};