From dabc729cfc4458264c6f7642004d41dd5c214bfd Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 25 May 2015 23:43:21 -0700 Subject: [PATCH] Update `covert`, `jscs`, `eslint`, `semver` --- .eslintrc | 9 ++++++--- .jscs.json | 38 +++++++++++++++++++++++++++++++++++++- package.json | 8 ++++---- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index 6d9994c..59a446f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -23,12 +23,13 @@ "eol-last": [2], "eqeqeq": [2], "func-names": [0], - "func-style": [0, "declaration"], + "func-style": [2, "expression"], "generator-star-spacing": [2, "after"], "global-strict": [0, "never"], "guard-for-in": [0], "handle-callback-err": [0], "key-spacing": [2, { "beforeColon": false, "afterColon": true }], + "linebreak-style": [2, "unix"], "quotes": [2, "single", "avoid-escape"], "max-depth": [0, 4], "max-len": [0, 80, 4], @@ -119,11 +120,12 @@ "no-sync": [0], "no-ternary": [0], "no-throw-literal": [2], - "no-trailing-spaces": [2], + "no-trailing-spaces": [2, { "skipBlankLines": false }], "no-undef": [2], "no-undef-init": [2], "no-undefined": [0], "no-underscore-dangle": [2], + "no-unneeded-ternary": [2], "no-unreachable": [2], "no-unused-expressions": [2], "no-unused-vars": [2, { "vars": "all", "args": "after-used" }], @@ -132,9 +134,10 @@ "no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }], "no-with": [2], "no-wrap-func": [2], + "object-shorthand": [2, "never"], "one-var": [0], "operator-assignment": [0, "always"], - "operator-linebreak": [2, "after"], + "operator-linebreak": [2, "none"], "padded-blocks": [0], "quote-props": [0], "radix": [0], diff --git a/.jscs.json b/.jscs.json index 496777b..7abfe0b 100644 --- a/.jscs.json +++ b/.jscs.json @@ -1,6 +1,12 @@ { "additionalRules": [], + "requireSemicolons": true, + + "disallowMultipleSpaces": true, + + "disallowIdentifierNames": [], + "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"], @@ -63,6 +69,36 @@ "validateQuoteMarks": { "escape": true, "mark": "'" - } + }, + + "disallowOperatorBeforeLineBreak": [], + + "requireSpaceBeforeKeywords": [ + "do", + "for", + "if", + "else", + "switch", + "case", + "try", + "catch", + "finally", + "while", + "with", + "return" + ], + + "validateAlignedFunctionParameters": { + "lineBreakAfterOpeningBraces": true, + "lineBreakBeforeClosingBraces": true + }, + + "requirePaddingNewLinesBeforeExport": true, + + "validateNewlineAfterArrayElements": { + "maximum": 1 + }, + + "requirePaddingNewLinesAfterUseStrict": true } diff --git a/package.json b/package.json index a9fceb3..60d8044 100644 --- a/package.json +++ b/package.json @@ -34,12 +34,12 @@ "dependencies": {}, "devDependencies": { "tape": "^4.0.0", - "covert": "^1.0.1", - "jscs": "^1.11.3", + "covert": "^1.1.0", + "jscs": "^1.13.1", "editorconfig-tools": "^0.1.1", "nsp": "^1.0.1", - "eslint": "^0.19.0", - "semver": "^4.3.3", + "eslint": "^0.21.2", + "semver": "^4.3.4", "replace": "^0.3.0" }, "testling": {