@tmsfe/tmskit 0.0.5-beta.5 → 0.0.7

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'); // eslint-disable-line

package/package.json

@@ -1,69 +1,75 @@
-{
-  "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.5",
-  "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",
-    "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.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"
+  }
+}

package/src/config/constant.js

@@ -1,70 +1,71 @@
-const path = require('path');
-
-// 用户目录
-const HOME_DIR =  process.env.HOME;
-
-// 所有文件的缓存目录
-const CACHE_DIR = path.resolve(HOME_DIR, '.tmskit');
-
-// 脚手架模板代码所在目录
-const TEMPLATE_DIR = path.resolve(CACHE_DIR, 'template');
-
-// 第三方模块源码存放的临时缓存目录
-const MODULE_CODE_DIR = path.resolve(CACHE_DIR, 'modules_code');
-
-// 脚手架模板代码的具体路径
-const TEMPLATE_PATH = path.resolve(TEMPLATE_DIR, 'tools/tms-cli-template');
-
-// 脚手架的名称
-const TMS_NAME = 'tmskit';
-
-// 脚手架的配置名称
-const TMS_CONFIG_FILENAME = 'tms.config.js';
-
-
-// 模块代码的默认在modules子目录
-const DEFAULT_MODULE_DIR = 'modules';
-
-// 模块的配置文件的名称
-const MODULE_CONFIG_FILENAME = 'module.config.json';
-
-// 默认的webpack entry
-const DEFAULT_WEBPACK_ENTRY = {
-  app: path.resolve(process.cwd(), 'app'),
-};
-
-// 默认从源码拷贝到编译后的配置
-const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json'];
-
-// 开发模式
-const MODE = {
-  main: 'tkitmain',
-  all: 'all',
-  multi: 'multi',
-};
-
-const ENV = {
-  dev: 'development',
-  prod: 'production',
-};
-
-const  TEMPLATE_TKIT_DIR = '_tmskit';
-const MODULE_CONFIG_INVALID_KEY = ['entranceDeclare', 'entryPagePath'];
-
-export {
-  HOME_DIR,
-  CACHE_DIR,
-  TEMPLATE_DIR,
-  TEMPLATE_PATH,
-  TMS_NAME,
-  TMS_CONFIG_FILENAME,
-  DEFAULT_MODULE_DIR,
-  MODULE_CONFIG_FILENAME,
-  DEFAULT_WEBPACK_ENTRY,
-  DEFAULT_COPY_CONFIG,
-  MODULE_CODE_DIR,
-  MODE,
-  ENV,
-  TEMPLATE_TKIT_DIR,
-  MODULE_CONFIG_INVALID_KEY,
-};
+const path = require('path');
+
+// 用户目录
+const HOME_DIR =  process.env.HOME;
+
+// 所有文件的缓存目录
+const CACHE_DIR = path.resolve(HOME_DIR, '.tmskit');
+
+// 脚手架模板代码所在目录
+const TEMPLATE_DIR = path.resolve(CACHE_DIR, 'template');
+
+// 第三方模块源码存放的临时缓存目录
+const MODULE_CODE_DIR = path.resolve(CACHE_DIR, 'modules_code');
+
+// 脚手架模板代码的具体路径
+const TEMPLATE_PATH = path.resolve(TEMPLATE_DIR, 'tools/tms-cli-template');
+
+// 脚手架的名称
+const TMS_NAME = 'tmskit';
+
+// 脚手架的配置名称
+const TMS_CONFIG_FILENAME = 'tms.config.js';
+
+const TMS_PRIVATE_FILENAME = 'tms.private.config.js';
+
+// 模块代码的默认在modules子目录
+const DEFAULT_MODULE_DIR = 'modules';
+
+// 模块的配置文件的名称
+const MODULE_CONFIG_FILENAME = 'module.config.json';
+
+// 默认的webpack entry
+const DEFAULT_WEBPACK_ENTRY = {
+  app: path.resolve(process.cwd(), 'app'),
+};
+
+// 默认从源码拷贝到编译后的配置
+const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json'];
+
+// 开发模式
+const MODE = {
+  all: 'all',
+  multi: 'multi',
+};
+
+const ENV = {
+  dev: 'development',
+  prod: 'production',
+};
+
+const  TEMPLATE_TKIT_DIR = '_tmskit';
+const MODULE_CONFIG_INVALID_KEY = ['entranceDeclare', 'entryPagePath'];
+
+export {
+  HOME_DIR,
+  CACHE_DIR,
+  TEMPLATE_DIR,
+  TEMPLATE_PATH,
+  TMS_NAME,
+  TMS_CONFIG_FILENAME,
+  TMS_PRIVATE_FILENAME,
+  DEFAULT_MODULE_DIR,
+  MODULE_CONFIG_FILENAME,
+  DEFAULT_WEBPACK_ENTRY,
+  DEFAULT_COPY_CONFIG,
+  MODULE_CODE_DIR,
+  MODE,
+  ENV,
+  TEMPLATE_TKIT_DIR,
+  MODULE_CONFIG_INVALID_KEY,
+};

package/src/config/defaultTmsConfig.js

@@ -1,16 +1,16 @@
-// tmsConfig默认配置项
-module.exports = {
-  // 全局的环境配置项
-  envData: {},
-  // 模块配置信息
-  modules: [],
-  cloudDir: 'cloud',
-  // 第三方依赖代码需要拷贝到本项目的
-  dependencies: {},
-  /** 编译输出文件夹位置 */
-  outputDir: 'dist',
-  /** 源码监听路径 */
-  sourceDir: './',
-  /** 静态资源目录 */
-  static: [],
-};
+// tmsConfig默认配置项
+module.exports = {
+  // 全局的环境配置项
+  envData: {},
+  // 模块配置信息
+  modules: [],
+  cloudDir: 'cloud',
+  // 第三方依赖代码需要拷贝到本项目的
+  dependencies: {},
+  /** 编译输出文件夹位置 */
+  outputDir: 'dist',
+  /** 源码监听路径 */
+  sourceDir: './',
+  /** 静态资源目录 */
+  static: [],
+};

package/src/entry.js

@@ -1,60 +1,60 @@
-module.exports = [
-  {
-    command: 'create <app-name>',
-    description: '创建新的应用',
-    action: (appName, cmd) => {
-      require('./scripts/create')(appName, cmd);
-    },
-  },
-  {
-    name: 'run',
-    type: 'child',
-    description: '项目开发使用的命令',
-    commands: [
-      {
-        command: 'install',
-        description: '安装依赖',
-        options: [
-          ['-m, --module [moduleName]', '模块名称'],
-          ['-e, --env [env]', '环境变量'],
-        ],
-        action: (cmd) => {
-          require('./scripts/run/index')('install', cmd);
-        },
-      },
-      {
-        command: 'dev',
-        description: 'dev 打包编译',
-        options: [
-          ['-m, --module [moduleName]', '模块名称'],
-          ['-e, --env [env]', '环境变量'],
-        ],
-        action: (cmd) => {
-          require('./scripts/run/index')('dev', cmd);
-        },
-      },
-      {
-        command: 'build',
-        description: 'prod 打包编译',
-        options: [
-          ['-m, --module [moduleName]', '模块名称'],
-          ['-e, --env [env]', '环境变量'],
-        ],
-        action: (cmd) => {
-          require('./scripts/run/index')('build', cmd);
-        },
-      },
-      {
-        command: 'init',
-        description: '根据模块配置初始化项目(eg: 动态拷贝模块、下载依赖、生成app.json等)',
-        options: [
-          ['-m, --module [moduleName]', '模块名称'],
-          ['-e, --env [env]', '环境变量'],
-        ],
-        action: (cmd) => {
-          require('./scripts/run/index')('init', cmd);
-        },
-      },
-    ],
-  },
-];
+module.exports = [
+  {
+    command: 'create <app-name>',
+    description: '创建新的应用',
+    action: (appName, cmd) => {
+      require('./scripts/create')(appName, cmd);
+    },
+  },
+  {
+    name: 'run',
+    type: 'child',
+    description: '项目开发使用的命令',
+    commands: [
+      {
+        command: 'install',
+        description: '安装依赖',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('install', cmd);
+        },
+      },
+      {
+        command: 'dev',
+        description: 'dev 打包编译',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('dev', cmd);
+        },
+      },
+      {
+        command: 'build',
+        description: 'prod 打包编译',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('build', cmd);
+        },
+      },
+      {
+        command: 'init',
+        description: '根据模块配置初始化项目(eg: 动态拷贝模块、下载依赖、生成app.json等)',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('init', cmd);
+        },
+      },
+    ],
+  },
+];

package/src/gulp/build.js

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

package/src/gulp/compile.js

@@ -1,87 +1,81 @@
-const { src, dest, lastRun } = require('gulp');
-const px2rpx = require('gulp-px-to-rpx');
-const postcss = require('gulp-postcss');
-const watch = require('gulp-watch');
-const cache = require('gulp-cache');
-const image = require('gulp-image');
-const replaceEnv = require('./replaceEnv');
-const { mpCommonDep } = require('./plugins/mpCommonDep');
-const { mpJsonDep } = require('./plugins/mpJsonDep');
-const { mpWxmlDep } = require('./plugins/mpWxmlDep');
-const base64 = require('./plugins/postcss-font-base64');
-const { fail } = require('../utils/log');
-
-const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
-module.exports = function (
-  tmsConfig,
-  {
-    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(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(`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 { 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;
+    }
+  });
+};