[tools] Update JSCS

Jonoh89 · Jul 11, 2016 · 2217980 · 2217980
1 parent df311c6
commit 2217980
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 66 deletions.
diff --git a/.jscs.json b/.jscs.json
@@ -1,78 +1,60 @@
 {
-    "excludeFiles": [
-        "node_modules/**",
-        "lib/**",
-        "lib-cov/**"
-    ],
-    "requireCurlyBraces": [
-        "else",
-        "while",
-        "do"
-    ],
+    "disallowMultipleSpaces": true,
+    "disallowMultipleVarDecl": true,
+    "disallowNewlineBeforeBlockStatements": true,
+    "disallowPaddingNewlinesInBlocks": true,
+    "disallowSpaceBeforePostfixUnaryOperators": true,
+    "disallowSpacesInCallExpression": true,
+    "disallowSpacesInFunction": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInsideArrayBrackets": true,
+    "disallowSpacesInsideObjectBrackets": true,
+    "disallowSpacesInsideParentheses": true,
+    "disallowTrailingComma": true,
+    "disallowTrailingWhitespace": true,
+    "esnext": true,
+    "maximumLineLength": 80,
+    "requireBlocksOnNewline": 1,
+    "requireCamelCaseOrUpperCaseIdentifiers": true,
+    "requireCapitalizedComments": true,
+    "requireCapitalizedConstructors": true,
+    "requireCommaBeforeLineBreak": true,
+    "requireDotNotation": true,
+    "requireLineBreakAfterVariableAssignment": true,
+    "requireSemicolons": true,
+    "requireSpaceAfterBinaryOperators": true,
     "requireSpaceAfterKeywords": [
+        "do",
+        "for",
         "if",
         "else",
-        "for",
-        "while",
-        "do",
         "switch",
+        "case",
+        "try",
+        "catch",
+        "while",
         "return",
-        "catch"
-    ],
-    "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
-    "disallowSpacesInFunctionExpression": { "beforeOpeningRoundBrace": true },
-    "disallowMultipleVarDecl": true,
-    "disallowLeftStickedOperators": [
-        "?",
-        "+",
-        "-",
-        "/",
-        "*",
-        "=",
-        "==",
-        "===",
-        "!=",
-        "!==",
-        ">",
-        ">=",
-        "<",
-        "<="
+        "typeof"
     ],
-    "disallowRightStickedOperators": [
-        "?",
-        "+",
-        "/",
-        "*",
-        ":",
-        ",",
-        "=",
-        "==",
-        "===",
-        "!=",
-        "!==",
-        ">",
-        ">=",
-        "<",
-        "<="
-    ],
-    "requireRightStickedOperators": ["!"],
-    "requireLeftStickedOperators": [","],
-    "disallowImplicitTypeConversion": [
-        "numeric",
-        "boolean",
-        "binary",
-        "string"
+    "requireSpaceAfterLineComment": true,
+    "requireSpaceBeforeBinaryOperators": true,
+    "requireSpaceBeforeBlockStatements": true,
+    "requireSpaceBeforeKeywords": [
+        "else",
+        "while",
+        "catch"
     ],
-    "disallowKeywords": ["with"],
-    "disallowKeywordsOnNewLine": ["else", "catch"],
-    "requireLineFeedAtFileEnd": true,
+    "requireSpaceBetweenArguments": true,
+    "requireSpacesInForStatement": true,
+    "validateIndentation": 4,
     "validateJSDoc": {
         "checkParamNames": true,
         "checkRedundantParams": true,
         "requireParamTypes": true
     },
-    "requireSpacesInsideObjectBrackets": "all",
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpaceAfterObjectKeys": true,
-    "disallowQuotedKeysInObjects": true
+    "validateQuoteMarks": {
+        "mark": "'",
+        "escape": true
+    }
 }
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "babel-core": "^5.4.7",
     "gulp-babel": "^5.1.0",
-    "jscs": "1.4.5",
+    "jscs": "1.13.1",
     "jshint": "2.8.0",
     "jshint-groups": "0.5.3",
     "mocha": "1.20.1"

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -20,7 +20,7 @@ printf "\n\
 --------------\n\
  Running JSCS\n\
 --------------\n\n"
-test ./node_modules/.bin/jscs .
+test ./node_modules/.bin/jscs ./src
 
 # Run tests
 printf "\n\