@tmsfe/tmskit 0.0.5-beta.2 → 0.0.5-beta.3

package/dist/index.cjs.js

@@ -74,7 +74,7 @@ const leven = require$$1__default;
 const ora = require$$2__default;
 const path$8 = require$$1__default$1;
 const fs$c = require$$0__default$1;
-const shelljs$5 = require$$5__default;
+const shelljs$6 = require$$5__default;
 const download = require$$6__default;
 const chalk$3 = require$$0__default$2;
 const shelljsOptons = {
@@ -154,10 +154,10 @@ function downloadRepo(dest, downloadOptions = {
   } = downloadOptions;
 
   if (fs$c.existsSync(dest)) {
-    shelljs$5.rm('-rf', dest);
+    shelljs$6.rm('-rf', dest);
   }
 
-  shelljs$5.mkdir('-p', dest);
+  shelljs$6.mkdir('-p', dest);
   return new Promise(resolve => {
     download(`${repoUrl}#${branch}`, dest, {
       clone: true
@@ -186,13 +186,13 @@ function downloadRepoForGit$2(url, dest, branch) {
   return new Promise(resolve => {
     // 如果目标目录不存在
     if (fs$c.existsSync(dest)) {
-      shelljs$5.rm('-rf', path$8.join(dest));
+      shelljs$6.rm('-rf', path$8.join(dest));
     }
 
-    shelljs$5.mkdir('-p', dest);
-    shelljs$5.cd(dest);
-    shelljs$5.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
-    shelljs$5.cd(cwd);
+    shelljs$6.mkdir('-p', dest);
+    shelljs$6.cd(dest);
+    shelljs$6.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
+    shelljs$6.cd(cwd);
     resolve();
   });
 }
@@ -561,7 +561,7 @@ var generator_1 = generator$1;
 
 const path$5 = require$$1__default$1;
 const fs$9 = require$$0__default$1;
-const shelljs$4 = require$$5__default;
+const shelljs$5 = require$$5__default;
 const {
   TEMPLATE_DIR,
   TEMPLATE_PATH,
@@ -592,7 +592,7 @@ async function createAppDir(targetDir) {
       process.exit(1);
     }
   } else {
-    shelljs$4.mkdir('-p', targetDir);
+    shelljs$5.mkdir('-p', targetDir);
   }
 }
 /**
@@ -616,23 +616,23 @@ async function create(appName) {
     appName,
     appType
   }).then(() => {
-    shelljs$4.cd(appName);
+    shelljs$5.cd(appName);
 
     const hooks = require(resolve$a(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
         if (typeof item === 'function') {
-          item.call(null, shelljs$4, {
+          item.call(null, shelljs$5, {
             appName
           });
         } else {
-          shelljs$4.exec(item);
+          shelljs$5.exec(item);
         }
       });
     }
 
-    shelljs$4.rm('-rf', resolve$a(appName, TEMPLATE_TKIT_DIR));
+    shelljs$5.rm('-rf', resolve$a(appName, TEMPLATE_TKIT_DIR));
     succeed('项目创建完成.');
   }).catch(err => {
     fail$8(err.message);
@@ -855,7 +855,7 @@ const {
   fail: fail$6
 } = log$2;
 const fs$7 = require$$0__default$1;
-const shelljs$3 = require$$5__default;
+const shelljs$4 = require$$5__default;
 /**
  * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
  * @param { string } sourceDir 缓存文件夹
@@ -930,7 +930,7 @@ async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
     }
 
     if (fs$7.existsSync(targetPath)) {
-      shelljs$3.rm('-rf', targetPath);
+      shelljs$4.rm('-rf', targetPath);
     }
 
     await moveFile(sourcePath, targetPath, ['node_modules', '.git']);
@@ -962,7 +962,7 @@ var defaultTmsConfig$1 = {
     sourceDir: './',
 
     /** 源码Map */
-    copyDir: []
+    copy: []
   }
 };
 
@@ -1356,7 +1356,7 @@ async function install$2(tmsConfig, modules, isCloud = true) {
 
 var install_1 = install$2;
 
-const shelljs$2 = require$$5__default;
+const shelljs$3 = require$$5__default;
 const fs$4 = require$$0__default$1;
 const io = io$2;
 const {
@@ -1394,7 +1394,7 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
     if (fs$4.existsSync(resolve$5(item))) {
-      shelljs$2.cp('-rf', resolve$5(item), resolve$5(tmsConfig.gulp.outputDir, item));
+      shelljs$3.cp('-rf', resolve$5(item), resolve$5(tmsConfig.gulp.outputDir, item));
     }
   }); // 拷贝模块的package.json到编译输出目录
 
@@ -1408,7 +1408,7 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
 
     io.ensureDirExist(outputModuleDir);
     const modulePackagePath = resolve$5(item.path, 'package.json');
-    if (fs$4.existsSync(modulePackagePath)) shelljs$2.cp('-Rf', modulePackagePath, outputModuleDir);
+    if (fs$4.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
@@ -1849,27 +1849,27 @@ var compile = function (tmsConfig, {
   const compile$1 = compile;
 
   function handleOtherGlob(glob) {
-    const otherArr = [];
+    const otherArr = new Set();
     Object.keys(glob).forEach(globKey => {
       if (typeof glob[globKey] === 'string') {
         const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
-        otherArr.push(data);
+        otherArr.add(data);
       }
 
       if (Array.isArray(glob[globKey])) {
         glob[globKey].forEach(value => {
           if (typeof value === 'string') {
             const data = value.startsWith('!') ? value : `!${value}`;
-            otherArr.push(data);
+            otherArr.add(data);
           }
         });
       }
     });
-    return otherArr;
+    return Array.from(otherArr);
   }
 
   module.exports = async (tmsConfig, newModules, isWatch = true) => {
-    var _tmsConfig$gulp;
+    var _tmsConfig$gulp, _tmsConfig$gulp2;
 
     // 监听app.json
     if (isWatch) {
@@ -1904,7 +1904,7 @@ var compile = function (tmsConfig, {
     for (let module of newModules) {
       // 处理默认参数
       module = { ...{
-          excludes: []
+          exclude: []
         },
         ...module
       };
@@ -1943,9 +1943,9 @@ var compile = function (tmsConfig, {
     } // 监听copy模块
 
 
-    if ((tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp = tmsConfig.gulp) === null || _tmsConfig$gulp === void 0 ? void 0 : _tmsConfig$gulp.copyDir.length) > 0) {
-      for (const item of (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.copyDir) {
-        var _tmsConfig$gulp2;
+    if (tmsConfig !== null && tmsConfig !== void 0 && (_tmsConfig$gulp = tmsConfig.gulp) !== null && _tmsConfig$gulp !== void 0 && _tmsConfig$gulp.copy && (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.copy.length) > 0) {
+      for (const item of (_tmsConfig$gulp3 = tmsConfig.gulp) === null || _tmsConfig$gulp3 === void 0 ? void 0 : _tmsConfig$gulp3.copy) {
+        var _tmsConfig$gulp3;
 
         const glob = {
           js: `${item.from}/**/*.{js,ts,wxs}`,
@@ -1979,10 +1979,10 @@ const path = require$$1__default$1;
 const {
   fail: fail$1
 } = log$2;
-const shelljs$1 = require$$5__default;
+const shelljs$2 = require$$5__default;
 
 const getLatestVersion = npmName => {
-  const data = shelljs$1.exec(`npm view ${npmName} version`);
+  const data = shelljs$2.exec(`npm view ${npmName} version`);
   return data.stdout || '0.0.0';
 };
 /**
@@ -2141,9 +2141,11 @@ async function dev$2(tmsConfig, targetModules, env) {
 
 var dev_1 = dev$2;
 
+const shelljs$1 = require$$5__default;
 const dev$1 = dev$3.exports;
 
 var build$2 = async (tmsConfig, newModules) => {
+  shelljs$1.rm('-rf', tmsConfig.gulp.outputDir);
   dev$1(tmsConfig, newModules, false);
 };
 
@@ -2285,7 +2287,7 @@ var entry = [{
 
 var require$$6 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.5-beta.2",
+	version: "0.0.5-beta.3",
 	description: "tmskit",
 	main: "main.js",
 	bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.2",
+  "version": "0.0.5-beta.3",
   "description": "tmskit",
   "main": "main.js",
   "bin": {

package/src/config/defaultTmsConfig.js

@@ -13,6 +13,6 @@ module.exports = {
     /** 源码监听路径 */
     sourceDir: './',
     /** 源码Map */
-    copyDir: [],
+    copy: [],
   },
 };

package/src/gulp/build.js

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

package/src/gulp/dev.js

@@ -5,21 +5,21 @@ const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
 
 function handleOtherGlob(glob) {
-  const otherArr = [];
+  const otherArr = new Set();
   Object.keys(glob).forEach((globKey) => {
     if (typeof glob[globKey] === 'string') {
       const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
-      otherArr.push(data);
+      otherArr.add(data);
     } if (Array.isArray(glob[globKey])) {
       glob[globKey].forEach((value) => {
         if (typeof value === 'string') {
           const data = value.startsWith('!') ? value : `!${value}`;
-          otherArr.push(data);
+          otherArr.add(data);
         }
       });
     }
   });
-  return otherArr;
+  return Array.from(otherArr);
 }
 
 module.exports = async (tmsConfig, newModules, isWatch = true) => {
@@ -49,7 +49,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   for (let module of newModules) {
     // 处理默认参数
     module = {
-      ...{ excludes: [] },
+      ...{ exclude: [] },
       ...module,
     };
 
@@ -82,8 +82,8 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   }
 
   // 监听copy模块
-  if (tmsConfig?.gulp?.copyDir.length > 0) {
-    for (const item of tmsConfig.gulp?.copyDir) {
+  if (tmsConfig?.gulp?.copy && tmsConfig?.gulp?.copy.length > 0) {
+    for (const item of tmsConfig.gulp?.copy) {
       const glob = {
         js: `${item.from}/**/*.{js,ts,wxs}`,
         json: `${item.from}/**/*.json`,