crabatool 1.0.151 → 1.0.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.151",
+  "version": "1.0.153",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/checkjs.js

@@ -64,15 +64,17 @@ module.exports.start = async function() {
     var eslintResults = await eslintCheck(content);
 
     // 检查编码
-    var ret = jschardet.detect(byte);
-    if (utils.isUtf8(byte, ret.encoding) || ret.encoding == 'UTF-8') {
-      utf8List.push(filePath);
-    } else {
-      var reg = /[\u4e00-\u9FA5]+/;
-      if (!reg.test(content)) { // 不包含中文的情况，jschardet把utf-8也认为是gbk了
+    if (config.checkutf8) {
+      var ret = jschardet.detect(byte);
+      if (utils.isUtf8(byte, ret.encoding) || ret.encoding == 'UTF-8') {
         utf8List.push(filePath);
       } else {
-        notUtf8List.push(`路径:${filePath} 编码:${ret.encoding}`);
+        var reg = /[\u4e00-\u9FA5]+/;
+        if (!reg.test(content)) { // 不包含中文的情况，jschardet把utf-8也认为是gbk了
+          utf8List.push(filePath);
+        } else {
+          notUtf8List.push(`路径:${filePath} 编码:${ret.encoding}`);
+        }
       }
     }
     pb.value++;
@@ -184,7 +186,11 @@ module.exports.start = async function() {
   info.push(`| 语法异常文件数Error | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
   info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |${calc(warnKeys.length, jsFiles.length)}|`);
   info.push(`| 语法提示文件数Info | ${infoKeys.length}个 |${calc(infoKeys.length, jsFiles.length)}|`);
-  info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |${calc(notUtf8List.length, jsFiles.length)}|`);
+
+  if (config.checkutf8) {
+    info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |${calc(notUtf8List.length, jsFiles.length)}|`);
+  }
+
   info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |${calc(bigList.length, jsFiles.length)}|`);
   info.push(`| gspx建议优化数 | ${warnGspxCount}个 |${calc(warnGspxCount, gspxData.count)}|`);
   info.push(`| gspx语法错误数 | ${gspxData.errorList.length}个 |${calc(gspxData.errorList.length, gspxData.count)}|`);
@@ -227,9 +233,11 @@ module.exports.start = async function() {
   webhookList.push(`7. 语法警告文件数Warn：${warnKeys.length}个，占比${calc(warnKeys.length, jsFiles.length)}`);
   //}
   webhookList.push(`8. 语法提示文件数Info：${infoKeys.length}个，占比${calc(infoKeys.length, jsFiles.length)}`);
-  if (notUtf8List.length > 0) {
+
+  if (config.checkutf8 && notUtf8List.length > 0) {
     webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个，占比${calc(notUtf8List.length, jsFiles.length)}`);
   }
+
   if (bigList.length > 0) {
     webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个，占比${calc(bigList.length, jsFiles.length)}`);
   }
@@ -298,7 +306,7 @@ module.exports.start = async function() {
   });
   //}
 
-  if (notUtf8List.length > 0) {
+  if (config.checkutf8 && notUtf8List.length > 0) {
     detail.push("");
     detail.push('# 非utf8清单如下');
     notUtf8List.forEach((s, index) => {

package/tool/start.js

@@ -56,7 +56,7 @@ class Start {
         start.installvscode();
       } else if (num == 8) {
         var options = {};
-        options.type = await question('选择项目类型：1. 普通craba项目;  2. ngp微前端项目; 输入编号：');
+        options.type = await question('选择项目类型：1. 普通craba纯前端项目;  2. ngp微前端项目；输入编号：');
         if (options.type != 1 && options.type != 2) options.type = 1;
         if (options.type == 2) {
           options.modName = await question('请输入微服务的模块名称：');
@@ -85,6 +85,7 @@ class Start {
     bindConfigByArgv('-ignoreCompress', 'boolean');
     bindConfigByArgv('-Debug', 'boolean');
     bindConfigByArgv('-checkgspx', 'boolean');
+    bindConfigByArgv('-checkutf8', 'boolean');
     //bindConfigByArgv('-branchName');
   }
 
@@ -261,7 +262,7 @@ async function waitFolder(question) {
   if (fs.existsSync(projectPath)) {
     if (fs.readdirSync(projectPath).length > 0) {
       var result = await question('输入的路径下有其他文件，避免文件覆盖或冲突，请确认是否在此路径下创建项目（Y/N)：');
-      if (result && result.toLowerCace() == 'y') {
+      if (result && result.toLowerCase() == 'y') {
         return projectPath;
       }
       return waitFolder(question);

package/tool/upgrade.js

@@ -82,15 +82,15 @@ class Upgrade {
 
   createProject(options) {
     var projectPath = "";
-    if (options.type == 1) {
+    if (options.type == 1) { // 普通前端项目
       projectPath = utils.join(options.projectPath, 'www');
-    } else if (options.type == 2) {
-      projectPath = `/web/src/main/resources/static/`;
-      if (!options.projectPath.includes(options.modName)) {
-        projectPath = utils.join(options.projectPath, options.modName, projectPath, options.modName);
-      } else {
-        projectPath = utils.join(options.projectPath, projectPath, options.modName);
+    } else if (options.type == 2) { // ngp微前端
+      var name1 = options.modName;
+      if (options.projectPath.includes(options.modName)) { // 输入的路径已经包含模块名了
+        name1 = '';
       }
+      projectPath = `${name1}/web/src/main/resources/static/${options.modName}`;
+      projectPath = utils.join(options.projectPath, projectPath);
     }
 
     this.done = this._createDone;