csshint - npm Package Compare versions

Comparing version 0.3.0 to 0.3.1

CHANGELOG.md

 CHANGELOG
 ===
 
+#### 2016.09.24
+
+1. 配置文件统一为 .csshintrc（JSON or YAML）
+
 #### 2016.09.19
@@ -5,0 +9,0 @@

lib/config.js

@@ -14,6 +14,2 @@ 'use strict';
 
-var _stripJsonComments = require('strip-json-comments');
-
-var _stripJsonComments2 = _interopRequireDefault(_stripJsonComments);
-
 var _jsYaml = require('js-yaml');
@@ -25,16 +21,13 @@
 
-/**
- * @file 对配置文件的读取合并等等
- * @author ielgnaw([e-mail])
- */
+'use strict'; /**
+               * @file 对配置文件的读取合并等等
+               * @author ielgnaw([e-mail])
+               */
 
-'use strict';
-
 var STORAGE = null;
 
-var JSON_YAML_REG = /.+\.(json|yml)$/i;
+// const JSON_YAML_REG = /.+\.(json|yml)$/i;
 
 /**
  * 获取 merge 后的配置文件
- * 用户自定义的配置文件优先级 .csshintrc > config.yml > config.json
  *
@@ -52,26 +45,31 @@ * @param {string} filePath 待检查的文件路径，根据这个路径去寻找用户自定义的配置文件，然后和默认的配置文件 merge
     var manis = new _manis2.default({
-        files: ['.csshintrc', 'config.yml', 'config.json'],
-        loader: function loader(content, filePath) {
+        files: ['.csshintrc'],
+        loader: function loader(content) {
             if (!content) {
                 return '';
             }
-
-            if ((0, _path.basename)(filePath) === '.csshintrc') {
-                return JSON.parse((0, _stripJsonComments2.default)(content));
-            }
-
-            var match = filePath.match(JSON_YAML_REG);
-
-            if (match) {
-                var suffix = match[1];
-                if (suffix === 'json') {
-                    return JSON.parse((0, _stripJsonComments2.default)(content));
-                } else if (suffix === 'yml') {
-                    return _jsYaml2.default.load(content);
-                }
-            }
+            var ret = void 0;
+            try {
+                ret = _jsYaml2.default.load(content);
+            } catch (e) {}
+            // if (basename(filePath) === '.csshintrc') {
+            //     return JSON.parse(stripJSONComments(content));
+            // }
+            //
+            // let match = filePath.match(JSON_YAML_REG);
+            //
+            // if (match) {
+            //     let suffix = match[1];
+            //     if (suffix === 'json') {
+            //         return JSON.parse(stripJSONComments(content));
+            //     }
+            //     else if (suffix === 'yml') {
+            //         return yaml.load(content);
+            //     }
+            // }
+            return ret;
         }
     });
 
-    manis.setDefault((0, _path.join)(__dirname, './config.yml'));
+    manis.setDefault((0, _path.join)(__dirname, './csshint.yml'));
 
@@ -82,2 +80,2 @@ STORAGE = manis.from(filePath);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25maWcuanMiXSwibmFtZXMiOlsibG9hZENvbmZpZyIsIlNUT1JBR0UiLCJKU09OX1lBTUxfUkVHIiwiZmlsZVBhdGgiLCJyZWZyZXNoIiwibWFuaXMiLCJmaWxlcyIsImxvYWRlciIsImNvbnRlbnQiLCJKU09OIiwicGFyc2UiLCJtYXRjaCIsInN1ZmZpeCIsImxvYWQiLCJzZXREZWZhdWx0IiwiX19kaXJuYW1lIiwiZnJvbSJdLCJtYXBwaW5ncyI6Ijs7Ozs7UUF5QmdCQSxVLEdBQUFBLFU7O0FBcEJoQjs7OztBQUNBOztBQUNBOzs7O0FBQ0E7Ozs7OztBQVJBOzs7OztBQVVBOztBQUVBLElBQUlDLFVBQVUsSUFBZDs7QUFFQSxJQUFNQyxnQkFBZ0Isa0JBQXRCOztBQUVBOzs7Ozs7Ozs7QUFTTyxTQUFTRixVQUFULENBQW9CRyxRQUFwQixFQUE4QkMsT0FBOUIsRUFBdUM7QUFDMUMsUUFBSSxDQUFDQSxPQUFELElBQVlILE9BQWhCLEVBQXlCO0FBQ3JCLGVBQU9BLE9BQVA7QUFDSDs7QUFFRCxRQUFJSSxRQUFRLG9CQUFVO0FBQ2xCQyxlQUFPLENBQ0gsWUFERyxFQUVILFlBRkcsRUFHSCxhQUhHLENBRFc7QUFNbEJDLGNBTmtCLGtCQU1YQyxPQU5XLEVBTUZMLFFBTkUsRUFNUTtBQUN0QixnQkFBSSxDQUFDSyxPQUFMLEVBQWM7QUFDVix1QkFBTyxFQUFQO0FBQ0g7O0FBRUQsZ0JBQUksb0JBQVNMLFFBQVQsTUFBdUIsWUFBM0IsRUFBeUM7QUFDckMsdUJBQU9NLEtBQUtDLEtBQUwsQ0FBVyxpQ0FBa0JGLE9BQWxCLENBQVgsQ0FBUDtBQUNIOztBQUVELGdCQUFJRyxRQUFRUixTQUFTUSxLQUFULENBQWVULGFBQWYsQ0FBWjs7QUFFQSxnQkFBSVMsS0FBSixFQUFXO0FBQ1Asb0JBQUlDLFNBQVNELE1BQU0sQ0FBTixDQUFiO0FBQ0Esb0JBQUlDLFdBQVcsTUFBZixFQUF1QjtBQUNuQiwyQkFBT0gsS0FBS0MsS0FBTCxDQUFXLGlDQUFrQkYsT0FBbEIsQ0FBWCxDQUFQO0FBQ0gsaUJBRkQsTUFHSyxJQUFJSSxXQUFXLEtBQWYsRUFBc0I7QUFDdkIsMkJBQU8saUJBQUtDLElBQUwsQ0FBVUwsT0FBVixDQUFQO0FBQ0g7QUFDSjtBQUNKO0FBMUJpQixLQUFWLENBQVo7O0FBNkJBSCxVQUFNUyxVQUFOLENBQWlCLGdCQUFLQyxTQUFMLEVBQWdCLGNBQWhCLENBQWpCOztBQUVBZCxjQUFVSSxNQUFNVyxJQUFOLENBQVdiLFFBQVgsQ0FBVjs7QUFFQSxXQUFPRixPQUFQO0FBQ0giLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAZmlsZSDlr7nphY3nva7mlofku7bnmoTor7vlj5blkIjlubbnrYnnrYlcbiAqIEBhdXRob3IgaWVsZ25hdyh3dWppMDIyM0BnbWFpbC5jb20pXG4gKi9cblxuaW1wb3J0IE1hbmlzIGZyb20gJ21hbmlzJztcbmltcG9ydCB7am9pbiwgYmFzZW5hbWV9IGZyb20gJ3BhdGgnO1xuaW1wb3J0IHN0cmlwSlNPTkNvbW1lbnRzIGZyb20gJ3N0cmlwLWpzb24tY29tbWVudHMnO1xuaW1wb3J0IHlhbWwgZnJvbSAnanMteWFtbCc7XG5cbid1c2Ugc3RyaWN0JztcblxubGV0IFNUT1JBR0UgPSBudWxsO1xuXG5jb25zdCBKU09OX1lBTUxfUkVHID0gLy4rXFwuKGpzb258eW1sKSQvaTtcblxuLyoqXG4gKiDojrflj5YgbWVyZ2Ug5ZCO55qE6YWN572u5paH5Lu2XG4gKiDnlKjmiLfoh6rlrprkuYnnmoTphY3nva7mlofku7bkvJjlhYjnuqcgLmNzc2hpbnRyYyA+IGNvbmZpZy55bWwgPiBjb25maWcuanNvblxuICpcbiAqIEBwYXJhbSB7c3RyaW5nfSBmaWxlUGF0aCDlvoXmo4Dmn6XnmoTmlofku7bot6/lvoTvvIzmoLnmja7ov5nkuKrot6/lvoTljrvlr7vmib7nlKjmiLfoh6rlrprkuYnnmoTphY3nva7mlofku7bvvIznhLblkI7lkozpu5jorqTnmoTphY3nva7mlofku7YgbWVyZ2VcbiAqIEBwYXJhbSB7Ym9vbGVhbn0gcmVmcmVzaCDmmK/lkKblvLrliLbliLfmlrDlhoXlrZjkuK3lt7Lnu4/lrZjlnKjnmoTphY3nva5cbiAqXG4gKiBAcmV0dXJuIHtPYmplY3R9IG1lcmdlIOWQjueahOmFjee9ruWvueixoVxuICovXG5leHBvcnQgZnVuY3Rpb24gbG9hZENvbmZpZyhmaWxlUGF0aCwgcmVmcmVzaCkge1xuICAgIGlmICghcmVmcmVzaCAmJiBTVE9SQUdFKSB7XG4gICAgICAgIHJldHVybiBTVE9SQUdFO1xuICAgIH1cblxuICAgIGxldCBtYW5pcyA9IG5ldyBNYW5pcyh7XG4gICAgICAgIGZpbGVzOiBbXG4gICAgICAgICAgICAnLmNzc2hpbnRyYycsXG4gICAgICAgICAgICAnY29uZmlnLnltbCcsXG4gICAgICAgICAgICAnY29uZmlnLmpzb24nXG4gICAgICAgIF0sXG4gICAgICAgIGxvYWRlcihjb250ZW50LCBmaWxlUGF0aCkge1xuICAgICAgICAgICAgaWYgKCFjb250ZW50KSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuICcnO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBpZiAoYmFzZW5hbWUoZmlsZVBhdGgpID09PSAnLmNzc2hpbnRyYycpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gSlNPTi5wYXJzZShzdHJpcEpTT05Db21tZW50cyhjb250ZW50KSk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIGxldCBtYXRjaCA9IGZpbGVQYXRoLm1hdGNoKEpTT05fWUFNTF9SRUcpO1xuXG4gICAgICAgICAgICBpZiAobWF0Y2gpIHtcbiAgICAgICAgICAgICAgICBsZXQgc3VmZml4ID0gbWF0Y2hbMV07XG4gICAgICAgICAgICAgICAgaWYgKHN1ZmZpeCA9PT0gJ2pzb24nKSB7XG4gICAgICAgICAgICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKHN0cmlwSlNPTkNvbW1lbnRzKGNvbnRlbnQpKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgZWxzZSBpZiAoc3VmZml4ID09PSAneW1sJykge1xuICAgICAgICAgICAgICAgICAgICByZXR1cm4geWFtbC5sb2FkKGNvbnRlbnQpO1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgIH0pO1xuXG4gICAgbWFuaXMuc2V0RGVmYXVsdChqb2luKF9fZGlybmFtZSwgJy4vY29uZmlnLnltbCcpKTtcblxuICAgIFNUT1JBR0UgPSBtYW5pcy5mcm9tKGZpbGVQYXRoKTtcblxuICAgIHJldHVybiBTVE9SQUdFO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25maWcuanMiXSwibmFtZXMiOlsibG9hZENvbmZpZyIsIlNUT1JBR0UiLCJmaWxlUGF0aCIsInJlZnJlc2giLCJtYW5pcyIsImZpbGVzIiwibG9hZGVyIiwiY29udGVudCIsInJldCIsImxvYWQiLCJlIiwic2V0RGVmYXVsdCIsIl9fZGlybmFtZSIsImZyb20iXSwibWFwcGluZ3MiOiI7Ozs7O1FBdUJnQkEsVSxHQUFBQSxVOztBQWxCaEI7Ozs7QUFDQTs7QUFDQTs7Ozs7O0FBRUEsYSxDQVRBOzs7OztBQVdBLElBQUlDLFVBQVUsSUFBZDs7QUFFQTs7QUFFQTs7Ozs7Ozs7QUFRTyxTQUFTRCxVQUFULENBQW9CRSxRQUFwQixFQUE4QkMsT0FBOUIsRUFBdUM7QUFDMUMsUUFBSSxDQUFDQSxPQUFELElBQVlGLE9BQWhCLEVBQXlCO0FBQ3JCLGVBQU9BLE9BQVA7QUFDSDs7QUFFRCxRQUFJRyxRQUFRLG9CQUFVO0FBQ2xCQyxlQUFPLENBQ0gsWUFERyxDQURXO0FBSWxCQyxjQUprQixrQkFJWEMsT0FKVyxFQUlGO0FBQ1osZ0JBQUksQ0FBQ0EsT0FBTCxFQUFjO0FBQ1YsdUJBQU8sRUFBUDtBQUNIO0FBQ0QsZ0JBQUlDLFlBQUo7QUFDQSxnQkFBSTtBQUNBQSxzQkFBTSxpQkFBS0MsSUFBTCxDQUFVRixPQUFWLENBQU47QUFDSCxhQUZELENBR0EsT0FBT0csQ0FBUCxFQUFVLENBQUU7QUFDWjtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxtQkFBT0YsR0FBUDtBQUNIO0FBN0JpQixLQUFWLENBQVo7O0FBZ0NBSixVQUFNTyxVQUFOLENBQWlCLGdCQUFLQyxTQUFMLEVBQWdCLGVBQWhCLENBQWpCOztBQUVBWCxjQUFVRyxNQUFNUyxJQUFOLENBQVdYLFFBQVgsQ0FBVjs7QUFFQSxXQUFPRCxPQUFQO0FBQ0giLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAZmlsZSDlr7nphY3nva7mlofku7bnmoTor7vlj5blkIjlubbnrYnnrYlcbiAqIEBhdXRob3IgaWVsZ25hdyh3dWppMDIyM0BnbWFpbC5jb20pXG4gKi9cblxuaW1wb3J0IE1hbmlzIGZyb20gJ21hbmlzJztcbmltcG9ydCB7am9pbn0gZnJvbSAncGF0aCc7XG5pbXBvcnQgeWFtbCBmcm9tICdqcy15YW1sJztcblxuJ3VzZSBzdHJpY3QnO1xuXG5sZXQgU1RPUkFHRSA9IG51bGw7XG5cbi8vIGNvbnN0IEpTT05fWUFNTF9SRUcgPSAvLitcXC4oanNvbnx5bWwpJC9pO1xuXG4vKipcbiAqIOiOt+WPliBtZXJnZSDlkI7nmoTphY3nva7mlofku7ZcbiAqXG4gKiBAcGFyYW0ge3N0cmluZ30gZmlsZVBhdGgg5b6F5qOA5p+l55qE5paH5Lu26Lev5b6E77yM5qC55o2u6L+Z5Liq6Lev5b6E5Y675a+75om+55So5oi36Ieq5a6a5LmJ55qE6YWN572u5paH5Lu277yM54S25ZCO5ZKM6buY6K6k55qE6YWN572u5paH5Lu2IG1lcmdlXG4gKiBAcGFyYW0ge2Jvb2xlYW59IHJlZnJlc2gg5piv5ZCm5by65Yi25Yi35paw5YaF5a2Y5Lit5bey57uP5a2Y5Zyo55qE6YWN572uXG4gKlxuICogQHJldHVybiB7T2JqZWN0fSBtZXJnZSDlkI7nmoTphY3nva7lr7nosaFcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGxvYWRDb25maWcoZmlsZVBhdGgsIHJlZnJlc2gpIHtcbiAgICBpZiAoIXJlZnJlc2ggJiYgU1RPUkFHRSkge1xuICAgICAgICByZXR1cm4gU1RPUkFHRTtcbiAgICB9XG5cbiAgICBsZXQgbWFuaXMgPSBuZXcgTWFuaXMoe1xuICAgICAgICBmaWxlczogW1xuICAgICAgICAgICAgJy5jc3NoaW50cmMnXG4gICAgICAgIF0sXG4gICAgICAgIGxvYWRlcihjb250ZW50KSB7XG4gICAgICAgICAgICBpZiAoIWNvbnRlbnQpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gJyc7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBsZXQgcmV0O1xuICAgICAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgICAgICByZXQgPSB5YW1sLmxvYWQoY29udGVudCk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBjYXRjaCAoZSkge31cbiAgICAgICAgICAgIC8vIGlmIChiYXNlbmFtZShmaWxlUGF0aCkgPT09ICcuY3NzaGludHJjJykge1xuICAgICAgICAgICAgLy8gICAgIHJldHVybiBKU09OLnBhcnNlKHN0cmlwSlNPTkNvbW1lbnRzKGNvbnRlbnQpKTtcbiAgICAgICAgICAgIC8vIH1cbiAgICAgICAgICAgIC8vXG4gICAgICAgICAgICAvLyBsZXQgbWF0Y2ggPSBmaWxlUGF0aC5tYXRjaChKU09OX1lBTUxfUkVHKTtcbiAgICAgICAgICAgIC8vXG4gICAgICAgICAgICAvLyBpZiAobWF0Y2gpIHtcbiAgICAgICAgICAgIC8vICAgICBsZXQgc3VmZml4ID0gbWF0Y2hbMV07XG4gICAgICAgICAgICAvLyAgICAgaWYgKHN1ZmZpeCA9PT0gJ2pzb24nKSB7XG4gICAgICAgICAgICAvLyAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKHN0cmlwSlNPTkNvbW1lbnRzKGNvbnRlbnQpKTtcbiAgICAgICAgICAgIC8vICAgICB9XG4gICAgICAgICAgICAvLyAgICAgZWxzZSBpZiAoc3VmZml4ID09PSAneW1sJykge1xuICAgICAgICAgICAgLy8gICAgICAgICByZXR1cm4geWFtbC5sb2FkKGNvbnRlbnQpO1xuICAgICAgICAgICAgLy8gICAgIH1cbiAgICAgICAgICAgIC8vIH1cbiAgICAgICAgICAgIHJldHVybiByZXQ7XG4gICAgICAgIH1cbiAgICB9KTtcblxuICAgIG1hbmlzLnNldERlZmF1bHQoam9pbihfX2Rpcm5hbWUsICcuL2Nzc2hpbnQueW1sJykpO1xuXG4gICAgU1RPUkFHRSA9IG1hbmlzLmZyb20oZmlsZVBhdGgpO1xuXG4gICAgcmV0dXJuIFNUT1JBR0U7XG59XG4iXX0=

package.json

 {
   "name": "csshint",
   "description": "lint your css code",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "keywords": [
@@ -6,0 +6,0 @@ "csslint",

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Lines of code

5939

increased by0.07%

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Total package byte prevSize

706341

decreased by-0.04%

No dependency changes