@tmsfe/tmskit 0.0.7 → 0.0.8

package/src/{gulp → compile}/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));
+      });
+  });
+};

package/src/{gulp → compile}/plugins/mpCommonDep.js

@@ -1,131 +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.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.dependencies).forEach((includeName) => {
-        const includePath = tmsConfig.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.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).replace(/\\/g, '/'),
-                });
-              }
-            }
-          }
-        });
-      });
-
-      // 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 = Buffer.from(contents);
-    }
-    this.push(file);
-    cb();
-  });
-
-  return stream;
-}
-
-module.exports = {
-  mpCommonDep,
-  dfsFindCommonDep,
-};
+/* 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.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.dependencies).forEach((includeName) => {
+        const includePath = tmsConfig.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.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).replace(/\\/g, '/'),
+                });
+              }
+            }
+          }
+        });
+      });
+
+      // 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 = Buffer.from(contents);
+    }
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpCommonDep,
+  dfsFindCommonDep,
+};