From c9a79468f477273013ab4456d8f0a9ac8cb35449 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Mon, 26 Sep 2016 13:40:02 +0800 Subject: [PATCH] switch to eslint-3 --- .codeclimate.yml | 1 + .eslintrc.js | 75 ++++++++++++++++-------------------------------- 2 files changed, 26 insertions(+), 50 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index d3c19ad6..53f90d17 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -12,6 +12,7 @@ engines: - javascript eslint: enabled: true + channel: "eslint-3" fixme: enabled: true rubocop: diff --git a/.eslintrc.js b/.eslintrc.js index 26319254..55c4bec8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,13 +28,11 @@ module.exports = { "dot-location": [2, "property"], "eol-last": 2, "eqeqeq": [2, "allow-null"], - // errors on code climate - disable for now - //"func-call-spacing": [2, "never"], + "func-call-spacing": [2, "never"], "handle-callback-err": [2, "^(err|error)$" ], "indent": [2, 2, { "SwitchCase": 1 }], "key-spacing": [2, { "beforeColon": false, "afterColon": true }], - // errors on code climate - disable for now - //"keyword-spacing": [2, { "before": true, "after": true }], + "keyword-spacing": [2, { "before": true, "after": true }], "new-cap": [2, { "newIsCap": true, "capIsNew": false }], "new-parens": 2, "no-array-constructor": 2, @@ -42,8 +40,7 @@ module.exports = { "no-class-assign": 2, "no-cond-assign": 2, "no-const-assign": 2, - // errors on code climate - disable for now - //"no-constant-condition": [2, { "checkLoops": false }], + "no-constant-condition": [2, { "checkLoops": false }], "no-control-regex": 2, "no-debugger": 2, "no-delete-var": 2, @@ -51,8 +48,7 @@ module.exports = { "no-dupe-class-members": 2, "no-dupe-keys": 2, "no-duplicate-case": 2, - // errors on code climate - disable for now - //"no-duplicate-imports": 2, + "no-duplicate-imports": 2, "no-empty-character-class": 2, "no-empty-pattern": 2, "no-eval": 2, @@ -64,16 +60,14 @@ module.exports = { "no-fallthrough": 2, "no-floating-decimal": 2, "no-func-assign": 2, - // errors on code climate - disable for now - //"no-global-assign": 2, + "no-global-assign": 2, "no-implied-eval": 2, "no-inner-declarations": [2, "functions"], "no-invalid-regexp": 2, "no-irregular-whitespace": 2, "no-iterator": 2, "no-label-var": 2, - // errors on code climate - disable for now - //"no-labels": [2, { "allowLoop": false, "allowSwitch": false }], + "no-labels": [2, { "allowLoop": false, "allowSwitch": false }], "no-lone-blocks": 2, "no-mixed-spaces-and-tabs": 2, "no-multi-spaces": 2, @@ -85,8 +79,7 @@ module.exports = { "no-new-func": 2, "no-new-object": 2, "no-new-require": 2, - // errors on code climate - disable for now - //"no-new-symbol": 2, + "no-new-symbol": 2, "no-new-wrappers": 2, "no-obj-calls": 2, "no-octal": 2, @@ -96,52 +89,38 @@ module.exports = { "no-redeclare": 2, "no-regex-spaces": 2, "no-return-assign": [2, "except-parens"], - // errors on code climate - disable for now - //"no-self-assign": 2, + "no-self-assign": 2, "no-self-compare": 2, "no-sequences": 2, "no-shadow-restricted-names": 2, "no-sparse-arrays": 2, - // errors on code climate - disable for now - //"no-tabs": 2, - // errors on code climate - disable for now - //"no-template-curly-in-string": 2, + "no-tabs": 2, + "no-template-curly-in-string": 2, "no-this-before-super": 2, "no-throw-literal": 2, "no-trailing-spaces": 2, "no-undef": 2, "no-undef-init": 2, "no-unexpected-multiline": 2, - // errors on code climate - disable for now - //"no-unmodified-loop-condition": 2, + "no-unmodified-loop-condition": 2, "no-unneeded-ternary": [2, { "defaultAssignment": false }], "no-unreachable": 2, - // errors on code climate - disable for now - //"no-unsafe-finally": 2, - // errors on code climate - disable for now - //"no-unsafe-negation": 2, + "no-unsafe-finally": 2, + "no-unsafe-negation": 2, "no-unused-vars": [2, { "vars": "all", "args": "none" }], "no-useless-call": 2, - // errors on code climate - disable for now - //"no-useless-computed-key": 2, - // errors on code climate - disable for now - //"no-useless-constructor": 2, - // errors on code climate - disable for now - //"no-useless-escape": 2, - // errors on code climate - disable for now - //"no-useless-rename": 2, - // errors on code climate - disable for now - //"no-whitespace-before-property": 2, + "no-useless-computed-key": 2, + "no-useless-constructor": 2, + "no-useless-escape": 2, + "no-useless-rename": 2, + "no-whitespace-before-property": 2, "no-with": 2, - // errors on code climate - disable for now - //"object-property-newline": [2, { "allowMultiplePropertiesPerLine": true }], + "object-property-newline": [2, { "allowMultiplePropertiesPerLine": true }], "one-var": [2, { "initialized": "never" }], "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }], "padded-blocks": [2, "never"], - // errors on code climate - disable for now - //"quotes": [2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }], - // errors on code climate - disable for now - //"rest-spread-spacing": [2, "never"], + "quotes": [2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }], + "rest-spread-spacing": [2, "never"], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], "space-before-blocks": [2, "always"], @@ -149,17 +128,13 @@ module.exports = { "space-in-parens": [2, "never"], "space-infix-ops": 2, "space-unary-ops": [2, { "words": true, "nonwords": false }], - // errors on code climate - disable for now - //"spaced-comment": [2, "always", { "line": { "markers": ["*package", "!", ","] }, "block": { "balanced": true, "markers": ["*package", "!", ","], "exceptions": ["*"] } }], - // errors on code climate - disable for now - //"template-curly-spacing": [2, "never"], - // errors on code climate - disable for now - //"unicode-bom": [2, "never"], + "spaced-comment": [2, "always", { "line": { "markers": ["*package", "!", ","] }, "block": { "balanced": true, "markers": ["*package", "!", ","], "exceptions": ["*"] } }], + "template-curly-spacing": [2, "never"], + "unicode-bom": [2, "never"], "use-isnan": 2, "valid-typeof": 2, "wrap-iife": [2, "any"], - // errors on code climate - disable for now - //"yield-star-spacing": [2, "both"], + "yield-star-spacing": [2, "both"], "yoda": [2, "never"], } }