crabatool 1.0.26 → 1.0.29

package/.vscode/launch.json

@@ -4,6 +4,7 @@
   // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+  
     {
       "type": "pwa-node",
       "request": "launch",

package/index.js

@@ -27,16 +27,27 @@ module.exports.run = function(options) {
   waitInput();
 }
 
+function bindConfigByArgv(key) {
+  if (process.argv.length < 3) return null;
+
+  var arr = [...process.argv];
+  if (arr.includes(key)) {
+    var index = arr.indexOf(key);
+    var value = arr[index + 1];
+    if (!value) throw new Error(key + '参数缺少参数值');
+    key = key.substr(1);
+    config[key] = value;
+  }
+}
 function checkConfig() {
-  if (process.argv.length > 2) {
-    var arr = [...process.argv];
-    // 支持根据参数传入web地址，开发环境是地址1，构建环境是地址2，而配置是写死的，通过参数灵活指定
-    if (arr.includes('-webPath')) {
-      var index = arr.indexOf('-webPath');
-      var webPath = arr[index + 1];
-      if (!webPath) throw new Error('-webPath参数缺少参数值');
-      config.webPath = webPath;
-    }
+  bindConfigByArgv('-webPath');
+  bindConfigByArgv('-port');
+  bindConfigByArgv('-modName');
+  bindConfigByArgv('-ignoreCheck');
+  bindConfigByArgv('-webhooks');
+
+  if (config.ignoreCheck && typeof config.ignoreCheck == 'string') {
+    config.ignoreCheck = config.ignoreCheck.split(',');
   }
 
   if (!config.webPath) {

package/lib/utils.js

@@ -359,18 +359,17 @@ class Utils {
     }
 
     getFiles(options, fileList) {
-        var ignores = options.ignores;
         var exts = options.exts;
         var source = options.source;
-        if (ignores && !fileList) {
-            ignores = ignores.map((item) => { return path.join(source, item) });
+        if (options.ignores && !fileList) {
+            options.ignores = options.ignores.map((item) => { return path.join(source, item) });
         }
 
         if (!fileList) fileList = [];
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
             var filePath = path.join(source, fileName);
-            if (ignores && ignores.includes(filePath)) {
+            if (options.ignores && options.ignores.includes(filePath)) {
                 return;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run",
     "checkjs": "node ./test/test.js -checkjs",
-    "webPath": "node ./test/test.js -checkjs -webPath F:、\newcrabadoc\\www"
+    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabademo -ignoreCheck ueditor,iconfont,biconfont,js\\math.min.js,js\\es6-promise.auto.min.js,js\\craba.rollup.min.js"
   },
   "author": "wssf",
   "dependencies": {

package/tool/checkjs.js

@@ -8,7 +8,7 @@ var path = require('path');
 var axios = require('axios');
 
 module.exports.start = function() {
-  var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js' });
+  var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js', ignores: config.ignoreCheck });
 
   var fileSize = 300;
   var errList = [];