@tmsfe/tmskit 0.0.7 → 0.0.9-beta.1

package/main.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('./dist/index.cjs'); // eslint-disable-line
+#!/usr/bin/env node
+
+require('dist/index.cjs.js'); // eslint-disable-line

package/package.json

@@ -1,75 +1,73 @@
-{
-  "name": "@tmsfe/tmskit",
-  "version": "0.0.7",
-  "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"
-  },
-  "author": "tms·web",
-  "license": "ISC",
-  "buildOptions": {
-    "formats": [
-      "cjs"
-    ]
-  },
-  "devDependencies": {
-    "@rollup/plugin-babel": "^5.0.2",
-    "@rollup/plugin-commonjs": "^19.0.0",
-    "@rollup/plugin-dynamic-import-vars": "^1.1.1",
-    "@rollup/plugin-json": "^4.0.3",
-    "rollup": "^2.6.1",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-terser": "^6.1.0",
-    "rollup-plugin-typescript2": "0.27.0"
-  },
-  "dependencies": {
-    "async": "^3.2.2",
-    "chalk": "^4.1.0",
-    "commander": "^8.3.0",
-    "copy-webpack-plugin": "^9.1.0",
-    "download-git-repo": "^3.0.2",
-    "ejs": "^3.1.5",
-    "fs-extra": "^10.0.1",
-    "glob-ignore": "^1.0.2",
-    "gulp": "^4.0.2",
-    "gulp-cache": "^1.1.3",
-    "gulp-image": "^5.1.0",
-    "gulp-postcss": "^9.0.1",
-    "gulp-px-to-rpx": "^1.0.7",
-    "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",
-    "strip-comments": "^2.0.1",
-    "through2": "^4.0.2",
-    "vinyl-sourcemaps-apply": "^0.2.0"
-  },
-  "engines": {
-    "node": "^12.17.0 || >= 14.13.1"
-  },
-  "jest": {
-    "testEnvironment": "jest-environment-node"
-  }
-}
+{
+  "name": "@tmsfe/tmskit",
+  "version": "0.0.9-beta.1",
+  "description": "tmskit",
+  "main": "dist/index.cjs",
+  "bin": {
+    "tmskit": "main.js"
+  },
+  "files": [
+    "src",
+    "dist",
+    "main.js",
+    "package.json"
+  ],
+  "scripts": {
+    "dev": "rollup -wc --environment TARGET:tmskit",
+    "build": "rollup -c --environment TARGET:tmskit"
+  },
+  "author": "tms·web",
+  "license": "ISC",
+  "buildOptions": {
+    "formats": [
+      "cjs"
+    ]
+  },
+  "devDependencies": {
+    "@rollup/plugin-babel": "^5.0.2",
+    "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-dynamic-import-vars": "^1.1.1",
+    "@rollup/plugin-json": "^4.0.3",
+    "rollup": "^2.6.1",
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-replace": "^2.2.0",
+    "rollup-plugin-terser": "^6.1.0",
+    "rollup-plugin-typescript2": "0.27.0"
+  },
+  "dependencies": {
+    "async": "^3.2.2",
+    "chalk": "^4.1.0",
+    "commander": "^8.3.0",
+    "copy-webpack-plugin": "^9.1.0",
+    "ejs": "^3.1.5",
+    "fs-extra": "^10.0.1",
+    "glob-ignore": "^1.0.2",
+    "gulp": "^4.0.2",
+    "gulp-cache": "^1.1.3",
+    "gulp-postcss": "^9.0.1",
+    "gulp-px-to-rpx": "^1.0.7",
+    "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",
+    "strip-comments": "^2.0.1",
+    "through2": "^4.0.2",
+    "vinyl-sourcemaps-apply": "^0.2.0"
+  },
+  "engines": {
+    "node": "^12.17.0 || >= 14.13.1"
+  },
+  "jest": {
+    "testEnvironment": "jest-environment-node"
+  }
+}

package/src/{gulp → compile}/build.js

@@ -1,5 +1,5 @@
-const dev = require('./dev');
-
-module.exports = async (tmsConfig, newModules) => {
-  dev(tmsConfig, newModules, false);
-};
+const dev = require('./dev');
+
+module.exports = async (tmsConfig, newModules) => {
+  dev(tmsConfig, newModules, false);
+};

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

@@ -1,81 +1,90 @@
-const { src, dest, lastRun } = require('gulp');
-const px2rpx = require('gulp-px-to-rpx');
-const watch = require('gulp-watch');
-// const cache = require('gulp-cache');
-// const image = require('gulp-image');
-const replaceEnv = require('./plugins/replaceEnv');
-const { mpCommonDep } = require('./plugins/mpCommonDep');
-const { mpJsonDep } = require('./plugins/mpJsonDep');
-const { mpWxmlDep } = require('./plugins/mpWxmlDep');
-const { fail } = require('../utils/log');
-
-const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
-module.exports = function (
-  tmsConfig,
-  {
-    glob,
-    destPath,
-    srcOption,
-    module,
-    watchOption = { events: ['change', 'add', 'unlink'] },
-    isWatch,
-  },
-) {
-  Object.keys(glob).forEach((globKey) => {
-    const globValue = glob[globKey];
-    const task = () => src(globValue, { ...srcOption, since: since(task) });
-    let srcPipe = task();
-
-    if (isWatch) {
-      srcPipe = srcPipe.pipe(watch(globValue, watchOption));
-    }
-
-    switch (globKey) {
-      case 'js':
-        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(`js编译报错${err}`);
-          });
-        break;
-      case 'wxss':
-        srcPipe
-          .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
-          .pipe(px2rpx({
-            designWidth: 375, // 设计稿宽度，默认为750
-            precision: 2, // 小数最大精度，默认为6
-          }))
-          .pipe(dest(destPath));
-        break;
-      case 'json':
-        srcPipe
-          .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
-          .on('error', (err) => {
-            fail(`json编译报错${err}`);
-          })
-          .pipe(dest(destPath));
-        break;
-      case 'wxml':
-        srcPipe
-          .pipe(mpWxmlDep(tmsConfig, module, isWatch))
-          .pipe(dest(destPath));
-        break;
-      case 'image':
-        srcPipe
-          // .pipe(cache(image()))
-          // .on('error', (err) => {
-          //   fail(`image编译报错${err}`);
-          // })
-          .pipe(dest(destPath));
-        break;
-      case 'other':
-        srcPipe
-          .pipe(dest(destPath));
-        break;
-      default:
-        break;
-    }
-  });
-};
+const { src, dest, lastRun } = require('gulp');
+const px2rpx = require('gulp-px-to-rpx');
+const watch = require('gulp-watch');
+// const cache = require('gulp-cache');
+// const image = require('gulp-image');
+// const replaceEnv = require('./plugins/replaceEnv');
+const { mpCommonDep } = require('./plugins/mpCommonDep');
+const { mpJsonDep } = require('./plugins/mpJsonDep');
+const { mpWxmlDep } = require('./plugins/mpWxmlDep');
+// const postcss = require('gulp-postcss');
+// const base64 = require('./plugins/postcss-font-base64');
+const { fail } = require('../utils/log');
+
+const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
+module.exports = function (
+  tmsConfig,
+  {
+    glob,
+    destPath,
+    srcOption,
+    module,
+    watchOption = { events: ['change', 'add', 'unlink'] },
+    isWatch,
+  },
+) {
+  Object.keys(glob).forEach((globKey) => {
+    const globValue = glob[globKey];
+    const task = () => src(globValue, { ...srcOption, since: since(task) });
+    let srcPipe = task();
+
+    if (isWatch) {
+      srcPipe = srcPipe.pipe(watch(globValue, watchOption));
+    }
+
+    switch (globKey) {
+      case 'js':
+        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(`js编译报错${err}`);
+          });
+        break;
+      case 'wxss':
+        srcPipe
+          .pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch))
+          .on('error', (err) => {
+            fail(`mpCommonDep编译报错${err}`);
+          })
+          // .pipe(postcss([base64()]))
+          // .on('error', (err) => {
+          //   fail(`postcss编译报错${err}`);
+          // })
+          .pipe(px2rpx({
+            designWidth: 375, // 设计稿宽度，默认为750
+            precision: 2, // 小数最大精度，默认为6
+          }))
+          .pipe(dest(destPath));
+        break;
+      case 'json':
+        srcPipe
+          .pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch))
+          .on('error', (err) => {
+            fail(`mpJsonDep编译报错${err}`);
+          })
+          .pipe(dest(destPath));
+        break;
+      case 'wxml':
+        srcPipe
+          .pipe(mpWxmlDep(tmsConfig, module, isWatch))
+          .pipe(dest(destPath));
+        break;
+      case 'image':
+        srcPipe
+          // .pipe(cache(image()))
+          // .on('error', (err) => {
+          //   fail(`image编译报错${err}`);
+          // })
+          .pipe(dest(destPath));
+        break;
+      case 'other':
+        srcPipe
+          .pipe(dest(destPath));
+        break;
+      default:
+        break;
+    }
+  });
+};

package/src/{gulp → compile}/dev.js

@@ -1,102 +1,129 @@
-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 path = require('path');
+const fs = require('fs');
+const watch = require('gulp-watch');
+const { resolve } = require('../utils/widgets');
+const { buildOutputAppJson } = require('../core/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);
+}
+
+function adaptPath(pathDir) {
+  let newPath = pathDir;
+  newPath = newPath.startsWith('/') ? newPath : resolve(newPath);
+  newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
+  return newPath;
+}
+
+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 modulePath = adaptPath(module.path);
+    const glob = {
+      js: [`${modulePath}/**/*.{js,ts,wxs}`, ...excludes],
+      json: [`${modulePath}/**/*.json`, ...excludes],
+      wxss: [`${modulePath}/**/*.{less,wxss}`, ...excludes],
+      wxml: [`${modulePath}/**/*.wxml`, ...excludes],
+      image: [`${modulePath}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
+    };
+
+    compile(tmsConfig, {
+      glob: {
+        ...glob,
+        other: [`${modulePath}/**/*`, ...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) {
+      item.from = adaptPath(item.from);
+      item.to = adaptPath(item.to);
+
+      let glob = {};
+      const ext = path.extname(item.from).slice(1);
+      if (ext)  {
+        glob[ext] = [item.from];
+      } else {
+        glob = {
+          js: [`${item.from}/**/*.{js,ts,wxs}`],
+          json: [`${item.from}/**/*.json`],
+          wxss: [`${item.from}/**/*.{less,wxss}`],
+          wxml: [`${item.from}/**/*.wxml`],
+          image: [`${item.from}/**/*.{png,jpg,jpeg,gif,svg}`],
+        };
+        glob.other = [`${item.from}/**/*`, ...excludeGlob(glob)];
+      }
+
+      const from = fs.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
+      compile(tmsConfig, {
+        glob,
+        destPath: item.to,
+        module: {
+          from,
+          to: item.to,
+        },
+        srcOption: { allowEmpty: true },
+        isWatch,
+      });
+    }
+  }
+};