@tmsfe/tmskit 0.0.3 → 0.0.4

package/README.md

@@ -1,24 +1,12 @@
 # tmskit 
 
-
 ```
-npm install 
-npm run dev // rollup将tmskit src的代码编译到dist
-
-cd /Users/odile/woindexrkspace/tms-frontend/tools/tmskit/test2
-node  /Users/odile/workspace/tms-frontend/tools/tmskit/main.js run  bootstrap -m index
-node  /Users/odile/workspace/tms-frontend/tools/tmskit/main.js run  dev -m index
+1. npm install -g @tmsfe/tmskit
 
-ps: 上面命令-具体目录根据自己的项目情况进行填写
+2. 创建小程序
+tmskit create webapp
 
 
-todo:
-  1. npm install下载过程 优化 no cache . tar  cp 
-  2. webppck entry component page  不需要重新启动dev
-  3. webpack 抽取公共代码
-  4. 多端的设计 （web、server）
-  5. window的兼容
-  6. build命令
-  7. webpack引入entry 优化。 处理entry的后缀文件
-  8. 模块拷贝的路径/home/main
+3. 安装依赖和构建miniprogram_npm
+tmskit run install
 ```

package/dist/index.cjs.js

@@ -4,22 +4,22 @@ var require$$0 = require('commander');
 var require$$1 = require('leven');
 var require$$2 = require('ora');
 var require$$1$1 = require('path');
-var require$$1$2 = require('fs');
-var require$$0$1 = require('shelljs');
+var require$$0$1 = require('fs');
+var require$$0$2 = require('shelljs');
 var require$$6$1 = require('download-git-repo');
-var require$$0$2 = require('chalk');
-var require$$0$3 = require('async');
-var require$$1$3 = require('ejs');
-var require$$1$4 = require('inquirer');
-var require$$0$4 = require('metalsmith');
-var require$$0$5 = require('miniprogram-ci');
-var require$$0$6 = require('lodash');
+var require$$0$3 = require('chalk');
+var require$$0$4 = require('async');
+var require$$1$2 = require('ejs');
+var require$$1$3 = require('inquirer');
+var require$$0$5 = require('metalsmith');
+var require$$0$6 = require('miniprogram-ci');
+var require$$0$7 = require('lodash');
 var require$$7 = require('replace-ext');
-var require$$0$7 = require('webpack-chain');
-var require$$0$8 = require('webpack');
-var require$$0$9 = require('webpack/lib/SingleEntryPlugin');
+var require$$0$8 = require('webpack-chain');
+var require$$0$9 = require('webpack');
+var require$$0$a = require('webpack/lib/SingleEntryPlugin');
 var require$$3$1 = require('copy-webpack-plugin');
-var require$$1$5 = require('semver');
+var require$$1$4 = require('semver');
 var require$$3$2 = require('glob-ignore');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
@@ -28,22 +28,22 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
-var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6$1);
 var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
+var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6$1);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$3);
-var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
-var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
+var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
 var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
-var require$$7__default = /*#__PURE__*/_interopDefaultLegacy(require$$7);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
+var require$$7__default = /*#__PURE__*/_interopDefaultLegacy(require$$7);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$0__default$9 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
+var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
-var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
+var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 var require$$3__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$3$2);
 
 function getAugmentedNamespace(n) {
@@ -67,10 +67,10 @@ const program$1 = require$$0__default;
 const leven = require$$1__default;
 const ora = require$$2__default;
 const path$7 = require$$1__default$1;
-const fs$b = require$$1__default$2;
-const shelljs$6 = require$$0__default$1;
+const fs$b = require$$0__default$1;
+const shelljs$6 = require$$0__default$2;
 const download = require$$6__default;
-const chalk$3 = require$$0__default$2;
+const chalk$3 = require$$0__default$3;
 const shelljsOptons = {
   slient: true
 }; // 获取当前目录
@@ -306,7 +306,7 @@ var constant = /*#__PURE__*/Object.freeze({
 
 var require$$3 = /*@__PURE__*/getAugmentedNamespace(constant);
 
-const fs$a = require$$1__default$2;
+const fs$a = require$$0__default$1;
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -333,7 +333,7 @@ var io$2 = {
   ensureDirExist
 };
 
-const chalk$2 = require$$0__default$2;
+const chalk$2 = require$$0__default$3;
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
  */
@@ -384,8 +384,8 @@ var log$2 = {
   warn
 };
 
-const async = require$$0__default$3;
-const ejs = require$$1__default$3;
+const async = require$$0__default$4;
+const ejs = require$$1__default$2;
 
 const render$1 = (files, metalsmith, next) => {
   const keys = Object.keys(files);
@@ -404,8 +404,8 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$9 = require$$1__default$2;
-const inquirer = require$$1__default$4;
+const fs$9 = require$$0__default$1;
+const inquirer = require$$1__default$3;
 const {
   resolve: resolve$b
 } = widgets;
@@ -484,7 +484,7 @@ var ask_1 = ask$1;
 const FILES_TO_IGNORE$1 = ['node_modules'];
 var ignoreFiles = FILES_TO_IGNORE$1;
 
-const Metalsmith = require$$0__default$4;
+const Metalsmith = require$$0__default$5;
 const render = render_1;
 const ask = ask_1;
 const FILES_TO_IGNORE = ignoreFiles;
@@ -502,8 +502,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$8 = require$$1__default$2;
-const shelljs$5 = require$$0__default$1;
+const fs$8 = require$$0__default$1;
+const shelljs$5 = require$$0__default$2;
 const {
   TEMPLATE_DIR,
   TEMPLATE_PATH,
@@ -548,17 +548,16 @@ async function create(appName) {
   const cwd = process.cwd();
   const targetDir = path$5.resolve(cwd, appName);
   const appType = 'mp';
-  createAppDir(targetDir); // 创建缓存目录
+  await createAppDir(targetDir); // 创建缓存目录
 
   io$1.ensureDirExist(TEMPLATE_DIR); // 拉取git模板
 
-  await createTask$4(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'feat-albertluo-template82b'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
+  await createTask$4(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, {
     appName,
     appType
   }).then(() => {
-    succeed('项目创建完成，开始初始化...');
     shelljs$5.cd(appName);
 
     const hooks = require(resolve$a(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
@@ -576,6 +575,7 @@ async function create(appName) {
     }
 
     shelljs$5.rm('-rf', resolve$a(appName, TEMPLATE_TKIT_DIR));
+    succeed('项目创建完成.');
   }).catch(err => {
     fail$9(err.message);
     console.log('详细的错误信息:', err);
@@ -584,7 +584,7 @@ async function create(appName) {
 
 var create_1 = create;
 
-const fs$7 = require$$1__default$2;
+const fs$7 = require$$0__default$1;
 const {
   DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$4,
   MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1
@@ -753,9 +753,9 @@ var buildAppJson = {
 /**
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
-const fs$6 = require$$1__default$2;
+const fs$6 = require$$0__default$1;
 const path$4 = require$$1__default$1;
-const shell = require$$0__default$1;
+const shell = require$$0__default$2;
 const LOG = log$2;
 const dirpath = process.cwd(); // 项目根目录
 
@@ -892,7 +892,7 @@ var npmUtils = {
 };
 
 /* eslint-disable require-jsdoc */
-const ci = require$$0__default$5;
+const ci = require$$0__default$6;
 const path$3 = require$$1__default$1;
 /**
  * 获取小程序ci的Project对象
@@ -1008,7 +1008,7 @@ var global = {
   getGlobalInstance: getGlobalInstance$1
 };
 
-const MetalSmith = require$$0__default$4;
+const MetalSmith = require$$0__default$5;
 const {
   getGlobalInstance
 } = global;
@@ -1019,8 +1019,8 @@ const {
 const {
   fail: fail$7
 } = log$2;
-const fs$5 = require$$1__default$2;
-const shelljs$4 = require$$0__default$1;
+const fs$5 = require$$0__default$1;
+const shelljs$4 = require$$0__default$2;
 /**
  * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
  * @param { string } sourceDir 缓存文件夹
@@ -1130,8 +1130,8 @@ var defaultTmsConfig$1 = {
   }
 };
 
-const loadash = require$$0__default$6;
-const fs$4 = require$$1__default$2;
+const loadash = require$$0__default$7;
+const fs$4 = require$$0__default$1;
 const {
   TMS_NAME: TMS_NAME$1,
   TMS_CONFIG_FILENAME,
@@ -1236,8 +1236,8 @@ var tkitUtils = {
   tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3
 };
 
-const shelljs$3 = require$$0__default$1;
-const fs$3 = require$$1__default$2;
+const shelljs$3 = require$$0__default$2;
+const fs$3 = require$$0__default$1;
 const io = io$2;
 const {
   resolve: resolve$6,
@@ -1337,7 +1337,7 @@ async function bootstrap(tmsConfig, targetModules) {
 var init$5 = bootstrap;
 
 const path$2 = require$$1__default$1;
-const fs$2 = require$$1__default$2;
+const fs$2 = require$$0__default$1;
 const {
   resolve: resolve$5
 } = widgets;
@@ -1601,8 +1601,8 @@ var utils = {
   getAlias: getAlias$1
 };
 
-const WebpackChain = require$$0__default$7;
-const webpack$2 = require$$0__default$8;
+const WebpackChain = require$$0__default$8;
+const webpack$2 = require$$0__default$9;
 const {
   getEntry: getEntry$1,
   stringified,
@@ -1665,7 +1665,7 @@ var base = (tmsConfig, modules) => {
   return webpackConfig;
 };
 
-const SingleEntryPlugin = require$$0__default$9;
+const SingleEntryPlugin = require$$0__default$a;
 const {
   DEFAULT_WEBPACK_ENTRY,
   DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$1
@@ -1728,7 +1728,7 @@ var dev$2 = (...args) => {
   return webpackDevConfig;
 };
 
-const webpack$1 = require$$0__default$8;
+const webpack$1 = require$$0__default$9;
 const webDevConfig = dev$2;
 const {
   setupDevWebPackHooks
@@ -1764,8 +1764,8 @@ var devServer = (...args) => {
   return compiler;
 };
 
-const fs$1 = require$$1__default$2;
-const semver$1 = require$$1__default$5;
+const fs$1 = require$$0__default$1;
+const semver$1 = require$$1__default$4;
 const {
   resolve: resolve$3
 } = widgets;
@@ -1773,7 +1773,7 @@ const path$1 = require$$1__default$1;
 const {
   fail: fail$2
 } = log$2;
-const shelljs$2 = require$$0__default$1;
+const shelljs$2 = require$$0__default$2;
 
 const getLatestVersion = npmName => {
   const data = shelljs$2.exec(`npm view ${npmName} version`);
@@ -1857,7 +1857,7 @@ var checkDependencies_1 = {
 };
 
 const webpackServer = devServer;
-const fs = require$$1__default$2;
+const fs = require$$0__default$1;
 const {
   resolve: resolve$2
 } = widgets;
@@ -1955,7 +1955,7 @@ var build$2 = (...args) => {
   return webpackBuildConfig;
 };
 
-const webpack = require$$0__default$8;
+const webpack = require$$0__default$9;
 const webBuildConfig = build$2;
 const {
   createTask: createTask$2
@@ -1998,7 +1998,7 @@ var buildServer = async (...args) => {
   return compiler;
 };
 
-const shelljs$1 = require$$0__default$1;
+const shelljs$1 = require$$0__default$2;
 const webpackBuildServer = buildServer;
 const {
   resolve: resolve$1
@@ -2016,7 +2016,7 @@ async function build$1(tmsConfig, targetModules, env) {
 
 var build_1 = build$1;
 
-const shelljs = require$$0__default$1;
+const shelljs = require$$0__default$2;
 const {
   createTask: createTask$1
 } = widgets;
@@ -2029,8 +2029,6 @@ const path = require$$1__default$1;
 function npmInstall(contextDir) {
   return new Promise((resolve, reject) => {
     glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      console.log('files', files);
-
       if (err) {
         reject(err);
       }
@@ -2151,7 +2149,7 @@ var entry = [{
 
 var require$$6 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.3",
+	version: "0.0.4",
 	description: "tmskit",
 	main: "main.js",
 	bin: {
@@ -2180,40 +2178,24 @@ var require$$6 = {
 		"rollup-plugin-typescript2": "0.27.0"
 	},
 	dependencies: {
-		"@babel/core": "^7.15.0",
-		"@babel/plugin-transform-modules-commonjs": "^7.16.0",
-		"@babel/preset-env": "^7.16.0",
 		async: "^3.2.2",
-		axios: "^0.21.4",
-		"babel-core": "^6.26.3",
-		"babel-loader": "^8.2.3",
 		chalk: "^4.1.0",
 		commander: "^6.2.1",
 		"copy-webpack-plugin": "^9.1.0",
-		"cross-env": "^7.0.3",
 		"download-git-repo": "^3.0.2",
 		ejs: "^3.1.5",
-		"file-loader": "^6.2.0",
-		"fs-extra": "^9.0.1",
 		"glob-ignore": "^1.0.2",
 		inquirer: "^7.3.3",
 		leven: "3.1.0",
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
-		"mini-css-extract-plugin": "^2.4.5",
-		minimist: "^1.2.5",
 		"miniprogram-ci": "1.4.13",
 		ora: "^5.1.0",
 		"replace-ext": "^2.0.0",
 		shelljs: "^0.8.4",
 		"ts-loader": "^9.2.6",
-		tslib: "^1.14.1",
-		typescript: "^3.8.3",
-		"url-loader": "^4.1.1",
-		username: "5.1.0",
 		webpack: "^5.64.0",
-		"webpack-chain": "^6.5.1",
-		"webpack-cli": "^4.9.1"
+		"webpack-chain": "^6.5.1"
 	},
 	engines: {
 		node: "^12.17.0 || >= 14.0.0"
@@ -2225,10 +2207,10 @@ var require$$6 = {
 
 const {
   exec
-} = require$$0__default$1;
-const semver = require$$1__default$5;
+} = require$$0__default$2;
+const semver = require$$1__default$4;
 const packageJson = require$$6;
-const chalk$1 = require$$0__default$2;
+const chalk$1 = require$$0__default$3;
 const {
   log: log$1
 } = widgets;
@@ -2267,7 +2249,7 @@ function initCliContext() {
 
 var init$1 = initCliContext;
 
-const chalk = require$$0__default$2;
+const chalk = require$$0__default$3;
 const program = require$$0__default;
 const {
   log,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "tmskit",
   "main": "main.js",
   "bin": {
@@ -29,40 +29,24 @@
     "rollup-plugin-typescript2": "0.27.0"
   },
   "dependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
     "async": "^3.2.2",
-    "axios": "^0.21.4",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^8.2.3",
     "chalk": "^4.1.0",
     "commander": "^6.2.1",
     "copy-webpack-plugin": "^9.1.0",
-    "cross-env": "^7.0.3",
     "download-git-repo": "^3.0.2",
     "ejs": "^3.1.5",
-    "file-loader": "^6.2.0",
-    "fs-extra": "^9.0.1",
     "glob-ignore": "^1.0.2",
     "inquirer": "^7.3.3",
     "leven": "3.1.0",
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
-    "mini-css-extract-plugin": "^2.4.5",
-    "minimist": "^1.2.5",
     "miniprogram-ci": "1.4.13",
     "ora": "^5.1.0",
     "replace-ext": "^2.0.0",
     "shelljs": "^0.8.4",
     "ts-loader": "^9.2.6",
-    "tslib": "^1.14.1",
-    "typescript": "^3.8.3",
-    "url-loader": "^4.1.1",
-    "username": "5.1.0",
     "webpack": "^5.64.0",
-    "webpack-chain": "^6.5.1",
-    "webpack-cli": "^4.9.1"
+    "webpack-chain": "^6.5.1"
   },
   "engines": {
     "node": "^12.17.0 || >= 14.0.0"

package/src/scripts/create/generator.js

@@ -1,5 +1,4 @@
 const Metalsmith = require('metalsmith');
-const fs = require('fs');
 const render = require('./render');
 const ask = require('./ask');
 const FILES_TO_IGNORE = require('./ignoreFiles');

package/src/scripts/create/index.js

@@ -33,7 +33,7 @@ async function create(appName) {
   const cwd = process.cwd();
   const targetDir = path.resolve(cwd, appName);
   const appType = 'mp';
-  createAppDir(targetDir);
+  await createAppDir(targetDir);
 
   // 创建缓存目录
   io.ensureDirExist(TEMPLATE_DIR);
@@ -41,7 +41,7 @@ async function create(appName) {
   await createTask(downloadRepoForGit, '拉取模板仓库', '拉取模板仓库完成')(
     'https://git.woa.com/tmsfe/tms-frontend.git',
     TEMPLATE_DIR,
-    'feat-albertluo-template82b',
+    'master',
   );
 
   // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
@@ -49,8 +49,6 @@ async function create(appName) {
     appName,
     appType,
   }).then(() => {
-    succeed('项目创建完成，开始初始化...');
-
     shelljs.cd(appName);
     const hooks = require(resolve(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
     if (hooks.afterCreate) {
@@ -63,6 +61,7 @@ async function create(appName) {
       });
     }
     shelljs.rm('-rf', resolve(appName, TEMPLATE_TKIT_DIR));
+    succeed('项目创建完成.');
   })
     .catch((err) => {
       fail(err.message);

package/src/scripts/run/install/index.js

@@ -7,7 +7,6 @@ const path = require('path');
 function npmInstall(contextDir) {
   return new Promise((resolve, reject) => {
     glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      console.log('files', files);
       if (err) {
         reject(err);
       }