From 9324da7aeb35055c0b8ce9eccc0b56ac2b9c5574 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 00:11:19 -0700 Subject: Upgrade ESLint to v1.10.3 Refs #19908 --- .hound.yml | 2 +- js/.eslintrc | 184 ------------------------------------------------------ js/.eslintrc.json | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +- 4 files changed, 187 insertions(+), 187 deletions(-) delete mode 100644 js/.eslintrc create mode 100644 js/.eslintrc.json diff --git a/.hound.yml b/.hound.yml index 8a21bdf44..4589de64b 100644 --- a/.hound.yml +++ b/.hound.yml @@ -10,7 +10,7 @@ javascript: eslint: enabled: true - config_file: js/.eslintrc + config_file: js/.eslintrc.json jscs: enabled: true diff --git a/js/.eslintrc b/js/.eslintrc deleted file mode 100644 index 619df7cb3..000000000 --- a/js/.eslintrc +++ /dev/null @@ -1,184 +0,0 @@ -{ - "root": true, - "parser": "babel-eslint", - "env": { - "browser": true, - "jquery": true - }, - "rules": { - - // Possible Errors - "comma-dangle": [2, "never"], - "handle-callback-err": 2, - "no-bitwise": 2, - "no-cond-assign": 2, - "no-console": 2, - "no-constant-condition": 2, - "no-control-regex": 2, - "no-debugger": 2, - "no-dupe-args": 2, - "no-dupe-keys": 2, - "no-duplicate-case": 2, - "no-empty": 2, - "no-empty-character-class": 2, - "no-empty-pattern": 2, - "no-ex-assign": 2, - "no-extra-boolean-cast": 2, - "no-extra-parens": 0, - "no-extra-semi": 2, - "no-func-assign": 2, - "no-inner-declarations": 2, - "no-invalid-regexp": 2, - "no-irregular-whitespace": 2, - "no-negated-in-lhs": 2, - "no-obj-calls": 2, - "no-regex-spaces": 2, - "no-sparse-arrays": 2, - "no-unexpected-multiline": 2, - "no-unreachable": 2, - "use-isnan": 2, - "valid-jsdoc": 0, - "valid-typeof": 2, - - //Best Practices - "accessor-pairs": 2, - "block-scoped-var": 2, - "consistent-return": 2, - "curly": 2, - "default-case": 2, - "dot-location": 0, - "dot-notation": 0, - "eqeqeq": 2, - "guard-for-in": 2, - "no-alert": 2, - "no-caller": 2, - "no-case-declarations": 2, - "no-div-regex": 2, - "no-else-return": 2, - "no-empty-label": 2, - "no-eq-null": 2, - "no-eval": 2, - "no-extend-native": 2, - "no-extra-bind": 2, - "no-fallthrough": 2, - "no-floating-decimal": 2, - "no-implicit-coercion": 2, - "no-implied-eval": 2, - "no-invalid-this": 0, - "no-iterator": 2, - "no-labels": 2, - "no-lone-blocks": 2, - "no-loop-func": 2, - "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}], - "no-multi-spaces": 0, - "no-multi-str": 2, - "no-native-reassign": 2, - "no-new": 2, - "no-new-func": 0, - "no-new-wrappers": 2, - "no-octal": 2, - "no-octal-escape": 2, - "no-param-reassign": 0, - "no-process-env": 2, - "no-proto": 2, - "no-redeclare": 2, - "no-return-assign": 2, - "no-script-url": 2, - "no-self-compare": 2, - "no-sequences": 2, - "no-throw-literal": 2, - "no-unused-expressions": 2, - "no-useless-call": 2, - "no-useless-concat": 2, - "no-void": 2, - "no-warning-comments": 0, - "no-with": 2, - "radix": 2, - "vars-on-top": 0, - "wrap-iife": 2, - "yoda": 2, - - // Variables - "init-declarations": 0, - "no-catch-shadow": 2, - "no-delete-var": 2, - "no-label-var": 2, - "no-shadow": 0, - "no-shadow-restricted-names": 2, - "no-undef": 2, - "no-undefined": 0, - "no-undef-init": 2, - "no-unused-vars": 2, - "no-use-before-define": 0, - - // Stylistic - "array-bracket-spacing": 2, - "block-spacing": 2, - "brace-style": 2, - "camelcase": 2, - "comma-spacing": 2, - "comma-style": 2, - "computed-property-spacing": 2, - "consistent-this": 2, - "eol-last": 2, - "func-names": 0, - "func-style": 0, - "indent": [2, 2, {"SwitchCase": 1}], - "key-spacing": 0, - "linebreak-style": 2, - "lines-around-comment": 0, - "new-cap": 0, - "newline-after-var": 0, - "new-parens": 2, - "no-array-constructor": 2, - "no-continue": 0, - "no-inline-comments": 0, - "no-lonely-if": 2, - "no-mixed-spaces-and-tabs": 2, - "no-multiple-empty-lines": 2, - "no-nested-ternary": 0, - "no-new-object": 2, - "no-spaced-func": 2, - "no-ternary": 0, - "no-trailing-spaces": 2, - "no-underscore-dangle": 0, - "no-unneeded-ternary": 2, - "object-curly-spacing": [1, "always"], - "one-var": 0, - "operator-assignment": 2, - "operator-linebreak": 0, - "padded-blocks": 0, - "quote-props": [2, "as-needed"], - "quotes": [2, "single"], - "semi": [2, "never"], - "semi-spacing": 2, - "sort-vars": 2, - "space-after-keywords": 2, - "space-before-blocks": 2, - "space-before-function-paren": 0, - "spaced-comment": 2, - "space-infix-ops": 2, - "space-in-parens": 2, - "space-return-throw-case": 2, - "space-unary-ops": 2, - - // es6 - "arrow-parens": 2, - "arrow-spacing": 2, - "constructor-super": 2, - "generator-star-spacing": 2, - "no-class-assign": 2, - "no-const-assign": 2, - "no-dupe-class-members": 2, - "no-this-before-super": 2, - "no-var": 2, - "object-shorthand": 2, - "prefer-arrow-callback": 2, - "prefer-const": 0, - "prefer-reflect": 0, - "prefer-spread": 2, - "prefer-template": 2, - "require-yield": 2 - - } -} diff --git a/js/.eslintrc.json b/js/.eslintrc.json new file mode 100644 index 000000000..619df7cb3 --- /dev/null +++ b/js/.eslintrc.json @@ -0,0 +1,184 @@ +{ + "root": true, + "parser": "babel-eslint", + "env": { + "browser": true, + "jquery": true + }, + "rules": { + + // Possible Errors + "comma-dangle": [2, "never"], + "handle-callback-err": 2, + "no-bitwise": 2, + "no-cond-assign": 2, + "no-console": 2, + "no-constant-condition": 2, + "no-control-regex": 2, + "no-debugger": 2, + "no-dupe-args": 2, + "no-dupe-keys": 2, + "no-duplicate-case": 2, + "no-empty": 2, + "no-empty-character-class": 2, + "no-empty-pattern": 2, + "no-ex-assign": 2, + "no-extra-boolean-cast": 2, + "no-extra-parens": 0, + "no-extra-semi": 2, + "no-func-assign": 2, + "no-inner-declarations": 2, + "no-invalid-regexp": 2, + "no-irregular-whitespace": 2, + "no-negated-in-lhs": 2, + "no-obj-calls": 2, + "no-regex-spaces": 2, + "no-sparse-arrays": 2, + "no-unexpected-multiline": 2, + "no-unreachable": 2, + "use-isnan": 2, + "valid-jsdoc": 0, + "valid-typeof": 2, + + //Best Practices + "accessor-pairs": 2, + "block-scoped-var": 2, + "consistent-return": 2, + "curly": 2, + "default-case": 2, + "dot-location": 0, + "dot-notation": 0, + "eqeqeq": 2, + "guard-for-in": 2, + "no-alert": 2, + "no-caller": 2, + "no-case-declarations": 2, + "no-div-regex": 2, + "no-else-return": 2, + "no-empty-label": 2, + "no-eq-null": 2, + "no-eval": 2, + "no-extend-native": 2, + "no-extra-bind": 2, + "no-fallthrough": 2, + "no-floating-decimal": 2, + "no-implicit-coercion": 2, + "no-implied-eval": 2, + "no-invalid-this": 0, + "no-iterator": 2, + "no-labels": 2, + "no-lone-blocks": 2, + "no-loop-func": 2, + "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}], + "no-multi-spaces": 0, + "no-multi-str": 2, + "no-native-reassign": 2, + "no-new": 2, + "no-new-func": 0, + "no-new-wrappers": 2, + "no-octal": 2, + "no-octal-escape": 2, + "no-param-reassign": 0, + "no-process-env": 2, + "no-proto": 2, + "no-redeclare": 2, + "no-return-assign": 2, + "no-script-url": 2, + "no-self-compare": 2, + "no-sequences": 2, + "no-throw-literal": 2, + "no-unused-expressions": 2, + "no-useless-call": 2, + "no-useless-concat": 2, + "no-void": 2, + "no-warning-comments": 0, + "no-with": 2, + "radix": 2, + "vars-on-top": 0, + "wrap-iife": 2, + "yoda": 2, + + // Variables + "init-declarations": 0, + "no-catch-shadow": 2, + "no-delete-var": 2, + "no-label-var": 2, + "no-shadow": 0, + "no-shadow-restricted-names": 2, + "no-undef": 2, + "no-undefined": 0, + "no-undef-init": 2, + "no-unused-vars": 2, + "no-use-before-define": 0, + + // Stylistic + "array-bracket-spacing": 2, + "block-spacing": 2, + "brace-style": 2, + "camelcase": 2, + "comma-spacing": 2, + "comma-style": 2, + "computed-property-spacing": 2, + "consistent-this": 2, + "eol-last": 2, + "func-names": 0, + "func-style": 0, + "indent": [2, 2, {"SwitchCase": 1}], + "key-spacing": 0, + "linebreak-style": 2, + "lines-around-comment": 0, + "new-cap": 0, + "newline-after-var": 0, + "new-parens": 2, + "no-array-constructor": 2, + "no-continue": 0, + "no-inline-comments": 0, + "no-lonely-if": 2, + "no-mixed-spaces-and-tabs": 2, + "no-multiple-empty-lines": 2, + "no-nested-ternary": 0, + "no-new-object": 2, + "no-spaced-func": 2, + "no-ternary": 0, + "no-trailing-spaces": 2, + "no-underscore-dangle": 0, + "no-unneeded-ternary": 2, + "object-curly-spacing": [1, "always"], + "one-var": 0, + "operator-assignment": 2, + "operator-linebreak": 0, + "padded-blocks": 0, + "quote-props": [2, "as-needed"], + "quotes": [2, "single"], + "semi": [2, "never"], + "semi-spacing": 2, + "sort-vars": 2, + "space-after-keywords": 2, + "space-before-blocks": 2, + "space-before-function-paren": 0, + "spaced-comment": 2, + "space-infix-ops": 2, + "space-in-parens": 2, + "space-return-throw-case": 2, + "space-unary-ops": 2, + + // es6 + "arrow-parens": 2, + "arrow-spacing": 2, + "constructor-super": 2, + "generator-star-spacing": 2, + "no-class-assign": 2, + "no-const-assign": 2, + "no-dupe-class-members": 2, + "no-this-before-super": 2, + "no-var": 2, + "object-shorthand": 2, + "prefer-arrow-callback": 2, + "prefer-const": 0, + "prefer-reflect": 0, + "prefer-spread": 2, + "prefer-template": 2, + "require-yield": 2 + + } +} diff --git a/package.json b/package.json index d358bb866..db64c2afe 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", - "eslint": "eslint --config js/.eslintrc js/src", + "eslint": "eslint --config js/.eslintrc.json js/src", "test": "npm run eslint && grunt test" }, "style": "dist/css/bootstrap.css", @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.9.0", + "eslint": "^1.10.3", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3