Bump JSCS to ^2.2.1

cvrebert · Oct 1, 2015 · c5bf416 · c5bf416
1 parent 622bd56
commit c5bf416
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -1,38 +1,35 @@
 {
   "disallowEmptyBlocks": true,
-  "disallowKeywords": ["with"],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
+  "disallowMultipleSpaces": true,
   "disallowMultipleVarDecl": true,
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceBeforeComma": true,
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "disallowSpaceBeforeSemicolon": true,
   "disallowSpacesInCallExpression": true,
   "disallowSpacesInsideBrackets": true,
+  "disallowTabs": true,
   "disallowTrailingWhitespace": true,
   "requireCapitalizedConstructors": true,
   "requireCommaBeforeLineBreak": true,
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch", "case", "default"],
   "requireLineFeedAtFileEnd": true,
+  "requireNumericLiterals": true,
+  "requireObjectKeysOnNewLine": true,
   "requireOperatorBeforeLineBreak": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireParenthesesAroundIIFE": true,
+  "requireSemicolons": true,
   "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
   "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireSpacesInConditionalExpression": true,
   "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
   "requireSpacesInForStatement": true,
+  "requireSpread": true,
   "validateIndentation": 4,
   "validateLineBreaks": "LF",
-  "validateParameterSeparator": ", ",
-  "plugins": [
-    "jscs-jsdoc"
-  ],
-  "jsDoc": {
-    "checkAnnotations": {
-      "preset": "jsdoc3"
-    },
-    "checkParamNames": true,
-    "checkRedundantParams": true,
-    "requireParamTypes": true
-  }
+  "validateNewlineAfterArrayElements": true,
+  "validateParameterSeparator": ", "
 }
diff --git a/package.json b/package.json
@@ -38,8 +38,7 @@
     "coveralls": "^2.11.2",
     "eslint": "^1.5.1",
     "istanbul": "^0.3.14",
-    "jscs": "^1.13.1",
-    "jscs-jsdoc": "^1.0.1",
+    "jscs": "^2.2.1",
     "jshint": "^2.7.0",
     "mocha": "^2.2.5",
     "mocha-lcov-reporter": "^1.0.0"

diff --git a/test/unit-tests.js b/test/unit-tests.js
@@ -53,11 +53,13 @@ describe('parseQuery()', function () {
                 preTypeHack: '',
                 type: 'all',
                 postTypeHack: '',
-                expressions: [{
-                    modifier: 'min',
-                    feature: 'resolution',
-                    value: '3e1dpcm'
-                }]
+                expressions: [
+                    {
+                        modifier: 'min',
+                        feature: 'resolution',
+                        value: '3e1dpcm'
+                    }
+                ]
             }
         ]);
 
@@ -68,11 +70,13 @@ describe('parseQuery()', function () {
                 preTypeHack: '',
                 type: 'screen',
                 postTypeHack: '',
-                expressions: [{
-                    modifier: 'min',
-                    feature: 'width',
-                    value: '0\\0'
-                }]
+                expressions: [
+                    {
+                        modifier: 'min',
+                        feature: 'width',
+                        value: '0\\0'
+                    }
+                ]
             }
         ]);