crabatool 1.0.184 → 1.0.186

package/package.json

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

package/tool/checkjs.js

@@ -379,6 +379,12 @@ module.exports.start = async function() {
   if (status != '无异常') { // 检查结果检查就不发到钉钉了； ps:健康也发到钉钉，鼓励开发继续保持；
     postWebhooks(id, reportUrl, webhookList);
   }
+
+  if (errCount > 0 && config.errorAbort) {
+    var tips = '警告！！！代码检测发现异常，已终止当前构建任务。请修复代码后重新构建。';
+    utils.postWeebhooks(tips);
+    throw new Error(tips);
+  }
 }
 
 async function eslintCheck(content) {

package/tool/compress.js

@@ -4,18 +4,19 @@ var path = require('path');
 var fs = require('fs');
 var utils = require('../lib/utils.js');
 var mergeTool = require('./merge/mergeTool.js');
-
-var _jsPath = path.join(config.targetPath, 'src/Carpa.Web/js');
-var _tempPath = path.join(config.targetPath, '__build');
-var _zipName = path.join(config.targetPath, 'craba.zip');
-var _tempJsPath = path.join(_tempPath, 'js');
-var _tempSkinPath = path.join(_tempPath, 'skins');
-var _pkgPath = utils.getCrabaPackgePath(path.join(_jsPath, 'package.json'));
 var _blackFilePath = path.join(__dirname, 'merge/black_fun_list.txt');
+var _jsPath, _tempPath, _zipName, _tempJsPath, _tempSkinPath, _pkgPath;
 
 module.exports.run = function() {
   console.log('环境变量:', process.env.REMOTE_BUILD);
 
+  _jsPath = path.join(config.targetPath, 'src/Carpa.Web/js');
+  _tempPath = path.join(config.targetPath, '__build');
+  _zipName = path.join(config.targetPath, 'craba.zip');
+  _tempJsPath = path.join(_tempPath, 'js');
+  _tempSkinPath = path.join(_tempPath, 'skins');
+  _pkgPath = utils.getCrabaPackgePath(path.join(_jsPath, 'package.json'));
+
   if (fs.existsSync(_zipName)) {
     fs.unlinkSync(_zipName);
   }
@@ -94,7 +95,6 @@ function doCompress() {
   compressAndMergeCss(inNames, skinPath, 'craba.min.css');
 }
 
-
 function compressCrabaJs(inNames, outName, onEnd) {
   inNames = inNames.map((s) => {
     return path.join(_jsPath, s);

package/tool/start.js

@@ -88,6 +88,7 @@ class Start {
       { name: '-globals', type: 'array' },
 
       { name: '-ignoreCompress', type: 'boolean' },
+      { name: '-errorAbort', type: 'boolean' },
       { name: '-hidejspath', type: 'boolean' },
       { name: '-Debug', type: 'boolean' },
       { name: '-checkgspx', type: 'boolean' },