@tmsfe/tmskit 0.0.13 → 0.0.14

package/README.md

@@ -9,7 +9,7 @@ tmskit create webapp
 
 
 3. cd webapp
-tmskit run dev -m <模块名> -e <环境名>
+tmskit run dev -m <模块名>
 
 使用文档详见： https://open.go.qq.com/tmskit/
 ```
@@ -25,4 +25,9 @@ npm run dev
 cd example
 node /Users/odile/workspace/tms-frontend1/tools/tmskit/dist/index.cjs  run dev 
 
+
+3. 发布tmskit
+npm run pub:patch (小版本)
+npm run pub:minor (中版本)
+npm run pub:major (大版本)
 ```

package/dist/index.cjs.js

@@ -128,7 +128,7 @@ const program$1 = require$$0__default$1;
 const leven = require$$1__default$1;
 const ora = require$$2__default;
 const path$b = require$$1__default$2;
-const fs$e = require$$0__default$2;
+const fs$d = require$$0__default$2;
 const shelljs$6 = require$$0__default$3;
 const {
   info: info$8
@@ -141,7 +141,7 @@ const shelljsOptions = {
 
 const cwd = process.cwd();
 
-function resolve$g(...args) {
+function resolve$f(...args) {
   return path$b.resolve(cwd, ...args);
 }
 /**
@@ -198,7 +198,7 @@ function downloadRepoForGit$2(url, dest, branch) {
   const cwd = process.cwd();
   return new Promise((resolve, reject) => {
     // 如果目标目录不存在
-    if (fs$e.existsSync(dest)) {
+    if (fs$d.existsSync(dest)) {
       shelljs$6.rm('-rf', path$b.join(dest));
     }
 
@@ -315,7 +315,7 @@ const relativeCwdPath$1 = function (file) {
 };
 
 var widgets = {
-  resolve: resolve$g,
+  resolve: resolve$f,
   isObject: isObject$2,
   isArray: isArray$1,
   createTask: createTask$3,
@@ -350,7 +350,7 @@ const TMS_PRIVATE_FILENAME$1 = 'tms.private.config.js'; // 模块代码的默认
 
 const DEFAULT_MODULE_DIR = 'modules'; // 模块代码的默认在modules子目录
 
-const DEFAULT_CLOUD_MODULE_DIR$1 = './cloud'; // 模块的配置文件的名称
+const DEFAULT_CLOUD_MODULE_DIR = './cloud'; // 模块的配置文件的名称
 
 const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
 
@@ -383,12 +383,12 @@ var constant = /*#__PURE__*/Object.freeze({
 	ENV: ENV,
 	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
 	MODULE_CONFIG_INVALID_KEY: MODULE_CONFIG_INVALID_KEY$1,
-	DEFAULT_CLOUD_MODULE_DIR: DEFAULT_CLOUD_MODULE_DIR$1
+	DEFAULT_CLOUD_MODULE_DIR: DEFAULT_CLOUD_MODULE_DIR
 });
 
 var require$$4 = /*@__PURE__*/getAugmentedNamespace(constant);
 
-const fs$d = require$$0__default$2;
+const fs$c = require$$0__default$2;
 const path$9 = require$$1__default$2;
 const {
   info: info$7
@@ -402,12 +402,12 @@ const {
  * @returns
  */
 
-const isDirEmpty = dirname => fs$d.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
+const isDirEmpty = dirname => fs$c.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
 
 
 const isFile = pathName => {
   try {
-    const stat = fs$d.lstatSync(pathName);
+    const stat = fs$c.lstatSync(pathName);
     return stat.isFile();
   } catch {
     return false;
@@ -420,8 +420,8 @@ const isFile = pathName => {
 
 
 const ensureDirExist = dirname => {
-  if (!fs$d.existsSync(dirname)) {
-    fs$d.mkdirSync(dirname, {
+  if (!fs$c.existsSync(dirname)) {
+    fs$c.mkdirSync(dirname, {
       recursive: true
     });
   }
@@ -429,20 +429,20 @@ const ensureDirExist = dirname => {
 
 
 const copyFile = function (src, dest) {
-  if (fs$d.existsSync(dest)) {
-    fs$d.unlinkSync(dest);
+  if (fs$c.existsSync(dest)) {
+    fs$c.unlinkSync(dest);
   }
 
   const dir = path$9.dirname(dest);
   ensureDirExist(dir);
-  fs$d.copyFileSync(src, dest);
+  fs$c.copyFileSync(src, dest);
 }; // 判断文件内容是否一致，不一致再进行拷贝
 
 
 function diffContentCopyFile$3(originFile, destFile) {
-  if (fs$d.existsSync(destFile)) {
-    const depDestContent = fs$d.readFileSync(destFile, 'utf8');
-    const depOriginContent = fs$d.readFileSync(originFile, 'utf8');
+  if (fs$c.existsSync(destFile)) {
+    const depDestContent = fs$c.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$c.readFileSync(originFile, 'utf8');
 
     if (depDestContent !== depOriginContent) {
       info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
@@ -460,7 +460,7 @@ function ext$3(filePath, extensions) {
   let extPath = ''; // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
 
   try {
-    const stat = fs$d.lstatSync(newFilePath);
+    const stat = fs$c.lstatSync(newFilePath);
 
     if (stat.isDirectory()) {
       extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
@@ -471,7 +471,7 @@ function ext$3(filePath, extensions) {
   for (const ext of extensions) {
     const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
 
-    if (fs$d.existsSync(file)) {
+    if (fs$c.existsSync(file)) {
       return {
         ext,
         extPath: extPath + ext,
@@ -489,7 +489,7 @@ function ext$3(filePath, extensions) {
 
 
 const fileInDir$3 = (dir, file) => {
-  if (!fs$d.existsSync(dir) || !fs$d.existsSync(file)) {
+  if (!fs$c.existsSync(dir) || !fs$c.existsSync(file)) {
     return false;
   }
 
@@ -532,10 +532,10 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$c = require$$0__default$2;
+const fs$b = require$$0__default$2;
 const inquirer = require$$1__default$4;
 const {
-  resolve: resolve$f
+  resolve: resolve$e
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -549,12 +549,12 @@ const {
 const parseTemplateQuestions = dir => {
   let prompts = [];
 
-  if (!fs$c.existsSync(`${dir}/questions.json`)) {
+  if (!fs$b.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
 
   try {
-    const json = JSON.parse(fs$c.readFileSync(`${dir}/questions.json`));
+    const json = JSON.parse(fs$b.readFileSync(`${dir}/questions.json`));
 
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
@@ -587,7 +587,7 @@ const isQuestionType = result => {
 };
 
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$f(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$e(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -630,7 +630,7 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 var generator_1 = generator$1;
 
 const path$8 = require$$1__default$2;
-const fs$b = require$$0__default$2;
+const fs$a = require$$0__default$2;
 const shelljs$5 = require$$0__default$3;
 const {
   TEMPLATE_DIR,
@@ -640,7 +640,7 @@ const {
 const {
   downloadRepoForGit: downloadRepoForGit$1,
   createTask: createTask$2,
-  resolve: resolve$e
+  resolve: resolve$d
 } = widgets;
 const io$1 = io$2;
 const {
@@ -657,7 +657,7 @@ const generator = generator_1;
 
 async function createAppDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$b.existsSync(targetDir)) {
+  if (fs$a.existsSync(targetDir)) {
     if (!(await io$1.isDirEmpty(targetDir))) {
       fail$8('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
@@ -689,7 +689,7 @@ async function create(appName) {
   }).then(() => {
     shelljs$5.cd(appName);
 
-    const hooks = require(resolve$e(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    const hooks = require(resolve$d(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
@@ -703,7 +703,7 @@ async function create(appName) {
       });
     }
 
-    shelljs$5.rm('-rf', resolve$e(appName, TEMPLATE_TKIT_DIR));
+    shelljs$5.rm('-rf', resolve$d(appName, TEMPLATE_TKIT_DIR));
     succeed('项目创建完成.');
   }).catch(err => {
     fail$8(err.message);
@@ -736,14 +736,14 @@ var defaultTmsConfig$1 = {
  * 用来读取处理tms.config.js与module.config.json字段
  */
 const loadash = require$$0__default$6;
-const fs$a = require$$0__default$2;
+const fs$9 = require$$0__default$2;
 const {
   TMS_CONFIG_FILENAME,
   MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
   TMS_PRIVATE_FILENAME
 } = require$$4;
 const {
-  resolve: resolve$d,
+  resolve: resolve$c,
   isObject: isObject$1,
   isArray
 } = widgets;
@@ -758,9 +758,9 @@ const path$7 = require$$1__default$2;
  */
 
 const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$d(TMS_CONFIG_FILENAME);
+  const tmsConfigPath = resolve$c(TMS_CONFIG_FILENAME);
 
-  if (!fs$a.existsSync(tmsConfigPath)) {
+  if (!fs$9.existsSync(tmsConfigPath)) {
     fail$7('当前执行目录没有tms.config.js的配置项，请进行配置');
     process.exit(1);
   }
@@ -808,9 +808,9 @@ const convertModules = modules => {
 
 const readTmsPrivateCf$1 = function () {
   let tmsPrivateCf = {};
-  const tmsPrivatePath = resolve$d(TMS_PRIVATE_FILENAME);
+  const tmsPrivatePath = resolve$c(TMS_PRIVATE_FILENAME);
 
-  if (fs$a.existsSync(tmsPrivatePath)) {
+  if (fs$9.existsSync(tmsPrivatePath)) {
     tmsPrivateCf = require(tmsPrivatePath);
   } // 处理modules字段
 
@@ -902,10 +902,10 @@ function getModuleConfig$1(modules = [], appName, moduleConfigFilename) {
   modules.forEach(({
     path
   }) => {
-    const moduleConfigPath = resolve$d(path, moduleConfigFilename);
+    const moduleConfigPath = resolve$c(path, moduleConfigFilename);
 
-    if (fs$a.existsSync(moduleConfigPath)) {
-      const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
+    if (fs$9.existsSync(moduleConfigPath)) {
+      const content = fs$9.readFileSync(moduleConfigPath, 'utf-8');
       modulesConfig[moduleConfigPath] = adaptMpCgContent(content, appName);
     }
   });
@@ -926,12 +926,12 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$d(relativePath, MODULE_CONFIG_FILENAME$1);
+    const moduleConfigPath = resolve$c(relativePath, MODULE_CONFIG_FILENAME$1);
 
-    if (fs$a.existsSync(moduleConfigPath)) {
+    if (fs$9.existsSync(moduleConfigPath)) {
       try {
         let findModule = false;
-        let moduleConfigContent = fs$a.readFileSync(moduleConfigPath, 'utf-8');
+        let moduleConfigContent = fs$9.readFileSync(moduleConfigPath, 'utf-8');
         moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
         const moduleContentArr = isObject$1(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
         getValidModules$1(moduleContentArr).forEach(({
@@ -1041,7 +1041,7 @@ const {
   global: global$5
 } = global_1;
 
-function handleError$5(error) {
+function handleError$4(error) {
   const errMsg = typeof error === 'object' ? error.message : error;
   const isDev = global$5.getData('isDev');
 
@@ -1054,13 +1054,13 @@ function handleError$5(error) {
 }
 
 var handleError_1 = {
-  handleError: handleError$5
+  handleError: handleError$4
 };
 
 /**
  * 生成编译后的app.json
  */
-const fs$9 = require$$0__default$2;
+const fs$8 = require$$0__default$2;
 const {
   MODULE_CONFIG_FILENAME,
   MODULE_CONFIG_INVALID_KEY
@@ -1073,11 +1073,11 @@ const {
   fail: fail$5
 } = log$1;
 const {
-  resolve: resolve$c,
+  resolve: resolve$b,
   isObject
 } = widgets;
 const {
-  handleError: handleError$4
+  handleError: handleError$3
 } = handleError_1;
 /**
  * 更新appJson里面的主包配置
@@ -1123,12 +1123,12 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 
 const getAppJsonContent = sourceAppJsonPath => {
-  if (!fs$9.existsSync(sourceAppJsonPath)) {
+  if (!fs$8.existsSync(sourceAppJsonPath)) {
     fail$5(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
-  const appJson = JSON.parse(fs$9.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const appJson = JSON.parse(fs$8.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
   appJson.subpackages = [];
   appJson.pages = []; // appJson.plugins = {};
@@ -1234,17 +1234,17 @@ function buildOutputAppJson$1(tmsConfig, modules) {
     // 获取当前 modules 下的所有子模块的配置内容
     const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
 
-    const appJson = getAppJsonContent(resolve$c('./app.json')); // 更新app.json中的subpackages
+    const appJson = getAppJsonContent(resolve$b('./app.json')); // 更新app.json中的subpackages
 
     updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
 
     fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
     updateMainPackages(appJson, tmsConfig.mainPackages);
-    fs$9.writeFileSync(resolve$c(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    fs$8.writeFileSync(resolve$b(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
     return appJson;
   } catch (e) {
-    handleError$4(`生成app.json出现错误: ${e}`);
+    handleError$3(`生成app.json出现错误: ${e}`);
   }
 }
 
@@ -1252,42 +1252,6 @@ var buildAppJson = {
   buildOutputAppJson: buildOutputAppJson$1
 };
 
-const fs$8 = require$$0__default$2;
-const {
-  resolve: resolve$b
-} = widgets;
-const {
-  handleError: handleError$3
-} = handleError_1;
-const {
-  DEFAULT_CLOUD_MODULE_DIR
-} = require$$4;
-/**
- * 根据相关配置创建软链接
- * @param { object } tmsConfig
- */
-
-const symLink$1 = tmsConfig => {
-  try {
-    if (tmsConfig.cloudModules) {
-      tmsConfig.cloudModules.forEach(item => {
-        const path = resolve$b(DEFAULT_CLOUD_MODULE_DIR, item.name);
-        fs$8.access(path, fs$8.constants.F_OK, res => {
-          if (res) {
-            fs$8.symlinkSync(resolve$b(item.path), path);
-          }
-        });
-      });
-    }
-  } catch (e) {
-    handleError$3(`创建软链错误: ${e}`);
-  }
-};
-
-var symbolicLink = {
-  symLink: symLink$1
-};
-
 /**
  * 下载第三方代码
  */
@@ -1556,7 +1520,7 @@ const getMpCi = ({
     privateKey,
     type,
     projectPath,
-    ignores: ['node_modules/**/*', ...ignores]
+    ignores: ['node_modules/**/*', 'cloud/**/*', ...ignores]
   });
 }; // 用小程序ci工具构建小程序
 
@@ -1674,8 +1638,9 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
           const newShellJsOption = { ...shellJsOption,
             cwd: packageJsonDir
           };
+          shell.cd(packageJsonDir);
           shell.exec('tar -xvf ./node_modules.tar.gz -C ./', newShellJsOption);
-          shell.rm('-rf', './node_modules');
+          shell.rm('-rf', './node_modules.tar.gz');
         }
       };
 
@@ -1697,6 +1662,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
               const newShellJsOption = { ...shellJsOption,
                 cwd: cacheNMPath
               };
+              shell.cd(cacheNMPath);
               shell.exec('tar -cvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
               shell.rm('-rf', './node_modules');
             });
@@ -1891,9 +1857,6 @@ const {
 const {
   buildOutputAppJson
 } = buildAppJson;
-const {
-  symLink
-} = symbolicLink;
 const {
   MODULE_CODE_DIR: MODULE_CODE_DIR$1,
   DEFAULT_COPY_CONFIG
@@ -1954,7 +1917,6 @@ async function task(tmsConfig, targetModules) {
   await install$1(tmsConfig, newModules, false); // 动态生成编译后的app.json;
 
   await createTask(buildOutputAppJson, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules);
-  await createTask(symLink, '开始创建软链接', '创建软链接完成')(tmsConfig);
   return newModules;
 }
 
@@ -3294,7 +3256,7 @@ var entry = [{
 
 var require$$7 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.13",
+	version: "0.0.14",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -3308,7 +3270,10 @@ var require$$7 = {
 	],
 	scripts: {
 		dev: "rollup -wc --environment TARGET:tmskit",
-		build: "rollup -c --environment TARGET:tmskit"
+		build: "rollup -c --environment TARGET:tmskit",
+		"pub:patch": "sh build/publish.sh patch",
+		"pub:minor": "sh build/publish.sh minor",
+		"pub:major": "sh build/publish.sh major"
 	},
 	author: "tms·web",
 	license: "ISC",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -14,7 +14,10 @@
   ],
   "scripts": {
     "dev": "rollup -wc --environment TARGET:tmskit",
-    "build": "rollup -c --environment TARGET:tmskit"
+    "build": "rollup -c --environment TARGET:tmskit",
+    "pub:patch": "sh build/publish.sh patch",
+    "pub:minor": "sh build/publish.sh minor",
+    "pub:major": "sh build/publish.sh major"
   },
   "author": "tms·web",
   "license": "ISC",

package/src/core/mpCi.js

@@ -14,7 +14,7 @@ const getMpCi = ({ appId, projectPath, type = 'miniProgram', privateKey = 'TODO'
     privateKey,
     type,
     projectPath,
-    ignores: ['node_modules/**/*', ...ignores],
+    ignores: ['node_modules/**/*', 'cloud/**/*', ...ignores],
   });
 };
 

package/src/core/npm.js

@@ -51,8 +51,9 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
             ...shellJsOption,
             cwd: packageJsonDir,
           };
+          shell.cd(packageJsonDir);
           shell.exec('tar -xvf ./node_modules.tar.gz -C ./',  newShellJsOption);
-          shell.rm('-rf', './node_modules');
+          shell.rm('-rf', './node_modules.tar.gz');
         },
       };
 
@@ -75,6 +76,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
                 ...shellJsOption,
                 cwd: cacheNMPath,
               };
+              shell.cd(cacheNMPath);
               shell.exec('tar -cvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
               shell.rm('-rf', './node_modules');
             });

package/src/core/symbolicLink.js

@@ -1,7 +1,8 @@
 const fs = require('fs');
 const { resolve } = require('../utils/widgets');
 const { handleError } = require('./handleError');
-const { DEFAULT_CLOUD_MODULE_DIR } = require('../config/constant');
+const { ensureDirExist } = require('../utils/io');
+const { warn } = require('../utils/log');
 
 /**
  * 根据相关配置创建软链接
@@ -9,14 +10,19 @@ const { DEFAULT_CLOUD_MODULE_DIR } = require('../config/constant');
  */
 const symLink = (tmsConfig) => {
   try {
+    ensureDirExist(resolve(tmsConfig.cloudDir));
     if (tmsConfig.cloudModules) {
       tmsConfig.cloudModules.forEach((item) => {
-        const path = resolve(DEFAULT_CLOUD_MODULE_DIR, item.name);
-        fs.access(path, fs.constants.F_OK, (res) => {
-          if (res) {
-            fs.symlinkSync(resolve(item.path), path);
-          }
-        });
+        const sourcePath = resolve(item.path);
+        const targetPath = resolve(tmsConfig.cloudDir, item.name);
+
+        if (!fs.existsSync(sourcePath)) {
+          warn(`云函数${sourcePath}不存在`);
+          return;
+        }
+        if (!fs.existsSync(targetPath)) {
+          fs.symlinkSync(sourcePath, targetPath);
+        }
       });
     }
   } catch (e) {

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

@@ -3,7 +3,6 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../core/buildAppJson');
-const { symLink } = require('../../../core/symbolicLink');
 const { MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../core/cloneModules');
 const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../core/tmsMpconfig');
@@ -69,12 +68,6 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  await createTask(
-    symLink,
-    '开始创建软链接',
-    '创建软链接完成',
-  )(tmsConfig);
-
   return newModules;
 }
 async function init(tmsConfig, targetModules) {