@tmsfe/tmskit 0.0.1 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.1",
+  "version": "0.0.5",
   "description": "tmskit",
   "main": "main.js",
   "bin": {
@@ -18,49 +18,34 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
     "@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",
-    "async": "^3.2.2",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^8.2.3",
-    "copy-webpack-plugin": "^9.1.0",
-    "cross-env": "^7.0.3",
-    "leven": "3.1.0",
-    "metalsmith": "^2.3.0",
-    "minimist": "^1.2.5",
     "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",
-    "ts-loader": "^9.2.6",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.64.0",
-    "webpack-cli": "^4.9.1"
+    "rollup-plugin-typescript2": "0.27.0"
   },
   "dependencies": {
-    "axios": "^0.21.4",
+    "async": "^3.2.2",
     "chalk": "^4.1.0",
     "commander": "^6.2.1",
+    "copy-webpack-plugin": "^9.1.0",
     "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",
-    "mini-css-extract-plugin": "^2.4.5",
+    "metalsmith": "^2.3.0",
     "miniprogram-ci": "1.4.13",
     "ora": "^5.1.0",
     "replace-ext": "^2.0.0",
-    "rollup-plugin-replace": "^2.2.0",
     "shelljs": "^0.8.4",
-    "tslib": "^1.14.1",
-    "typescript": "^3.8.3",
-    "username": "5.1.0",
+    "ts-loader": "^9.2.6",
+    "webpack": "^5.64.0",
     "webpack-chain": "^6.5.1"
   },
   "engines": {

package/src/config/constant.js

@@ -48,6 +48,8 @@ const ENV = {
   prod: 'production',
 };
 
+const  TEMPLATE_TKIT_DIR = '_tmskit';
+
 export {
   HOME_DIR,
   CACHE_DIR,
@@ -62,4 +64,5 @@ export {
   MODULE_CODE_DIR,
   MODE,
   ENV,
+  TEMPLATE_TKIT_DIR,
 };

package/src/index.js

@@ -24,7 +24,7 @@ commands.forEach((cmd) => {
 
 program.on('--help', () => {
   log();
-  log(`  Run ${chalk.cyan('tms <command> --help')} for detailed usage of given command.`);
+  log(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);
   log();
 });
 

package/src/scripts/create/ask.js

@@ -1,17 +1,19 @@
 const fs = require('fs');
 const inquirer = require('inquirer');
+const { resolve } = require('../../utils/widgets');
+const { TEMPLATE_TKIT_DIR } = require('../../config/constant');
 /**
  * 获取模板内的问题
- * @param {string} templateDir 模板目录
+ * @param {string} dir questions.json所在的目录
  * @returns {Array} inquirer 问题数组
  */
-const parseTemplateQuestions = (templateDir) => {
+const parseTemplateQuestions = (dir) => {
   let prompts = [];
-  if (!fs.existsSync(`${templateDir}/questions.json`)) {
+  if (!fs.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
   try {
-    const json = JSON.parse(fs.readFileSync(`${templateDir}/questions.json`));
+    const json = JSON.parse(fs.readFileSync(`${dir}/questions.json`));
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
         if (!isQuestionType(item)) {
@@ -38,7 +40,7 @@ const isQuestionType = (result) => {
 };
 
 const ask = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(templateDir);
+  const prompts = parseTemplateQuestions(resolve(templateDir, TEMPLATE_TKIT_DIR));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter((prompt) => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {

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');
@@ -18,7 +17,6 @@ const generator = (buildDir, distDir, preMetadata) => new Promise((resolve, reje
       if (err) {
         reject(err);
       } else {
-        fs.unlinkSync(`${distDir}/questions.json`);
         resolve('finish');
       }
     });

package/src/scripts/create/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const shelljs = require('shelljs');
-const { TEMPLATE_DIR, TEMPLATE_PATH } = require('../../config/constant.js');
+const { TEMPLATE_DIR, TEMPLATE_PATH, TEMPLATE_TKIT_DIR } = require('../../config/constant.js');
 const { downloadRepoForGit, createTask, resolve } = require('../../utils/widgets');
 const io = require('../../utils/io');
 const { fail, succeed } = require('../../utils/log');
@@ -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);
@@ -49,12 +49,19 @@ async function create(appName) {
     appName,
     appType,
   }).then(() => {
-    succeed('项目创建完成，开始初始化...');
     shelljs.cd(appName);
-    // 初始化构件主包的代码， 让用户打开项目可以跑起来
-    if (fs.existsSync(resolve(`${appName}/tms.config.js`))) {
-      shelljs.exec('tmskit run build');
+    const hooks = require(resolve(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    if (hooks.afterCreate) {
+      hooks.afterCreate.forEach((item) => {
+        if (typeof item === 'function') {
+          item.call(null, shelljs, { appName });
+        } else {
+          shelljs.exec(item);
+        }
+      });
     }
+    shelljs.rm('-rf', resolve(appName, TEMPLATE_TKIT_DIR));
+    succeed('项目创建完成.');
   })
     .catch((err) => {
       fail(err.message);

package/src/scripts/run/index.js

@@ -1,7 +1,8 @@
 const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
-const { createTask  } = require('../../utils/widgets');
+const install = require('./install/index');
+const { createTask, resolve  } = require('../../utils/widgets');
 const { MODE } = require('../../config/constant');
 const { readTmsConfig, checkModules } = require('../../utils/tkitUtils');
 
@@ -22,6 +23,11 @@ const handleModulesArg = (cmd) => {
 };
 
 async function run(commandName, cmd) {
+  if (commandName === 'install') {
+    install(resolve('./'));
+    return;
+  }
+
   const moduleArg = handleModulesArg(cmd);
   const { env } = cmd;
 

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

@@ -0,0 +1,39 @@
+const shelljs = require('shelljs');
+const { createTask } = require('../../../utils/widgets');
+const { buildMpNpm } = require('../../../utils/mpCiUtils');
+const glob = require('glob-ignore');
+const path = require('path');
+
+function npmInstall(contextDir) {
+  return new Promise((resolve, reject) => {
+    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
+      if (err) {
+        reject(err);
+      }
+      files.forEach((file) => {
+        const dir = path.dirname(file);
+        shelljs.cd(dir);
+        shelljs.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', { silent: false });
+      });
+      resolve();
+    });
+  });
+}
+
+async function install(contextDir) {
+  // npm install
+  await createTask(
+    npmInstall,
+    '开始npm install',
+    'npm install完成',
+  )(contextDir);
+
+  // 构建miniprograme_npm
+  await createTask(
+    buildMpNpm,
+    '开始构建miniprogram_npm',
+    '构建miniprogram_npm 完成',
+  )({ appId: 'null', projectPath: contextDir, privateKey: 'null' });
+}
+
+module.exports = install;

package/src/utils/widgets.js

@@ -96,7 +96,7 @@ function downloadRepo(dest, downloadOptions = { repoUrl: '', gitUrl: '', branch:
 function downloadRepoForGit(url, dest, branch) {
   const cwd = process.cwd();
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     // 如果目标目录不存在
     if (fs.existsSync(dest)) {
       shelljs.rm('-rf', path.join(dest));
@@ -105,17 +105,10 @@ function downloadRepoForGit(url, dest, branch) {
     shelljs.mkdir('-p', dest);
     shelljs.cd(dest);
 
-    shelljs.exec(`git clone ${url} ${dest} --depth=1`, shelljsOptons);
-
-    shelljs.exec(`git checkout ${branch}`, (code) => {
-      if (code === 0) {
-        shelljs.cd(cwd);
+    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
 
-        resolve();
-      }
-
-      reject();
-    });
+    shelljs.cd(cwd);
+    resolve();
   });
 }
 

package/src/webpack/plugins/entryExtractPlugin/index.js

@@ -5,7 +5,6 @@ const { getEntry } = require('../../utils');
 class EntryExtraPlugin {
   constructor(options = {}) {
     this.options = options;
-    this.scriptExtensions = options.scriptExtensions || ['.ts', '.js'];
   }
 
   applyEntry(compiler, entry) {

package/src/webpack/plugins/px2rpx/index.js

@@ -1,14 +0,0 @@
-const px2rpx = postcss.plugin('postcss-px2rpx', (opts = {}) => {
-  const { proportion = 1, minPixelValue = 0 } = opts;
-
-  return (root) => {
-    root.replaceValues(pxRegExp, { fast: 'px' }, (string) => {
-      const pixels = parseInt(string, 10);
-      if (pixels < minPixelValue) return `${pixels}px`;
-      return `${proportion * parseInt(string, 10)}rpx`;
-    });
-  };
-});
-
-
-export default px2rpx;