summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-16 18:24:08 +0000
committerGerrit Code Review <review@openstack.org>2016-03-16 18:24:08 +0000
commitf8d711cd54fcb546450a6004d4288a2f20e33ab4 (patch)
treeb0b183d944ab091babb82bb644bbb83146975cc9
parent038fa2c02b193396dff2e79b2059763658c4e0e7 (diff)
parentc1f64a8684e73610edcfcfa05fe305b9f6f1b2b1 (diff)
Merge "Upgraded eslint version"
-rw-r--r--.eslintrc24
-rw-r--r--package.json4
2 files changed, 26 insertions, 2 deletions
diff --git a/.eslintrc b/.eslintrc
index e7dfddc..012d4e2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -229,6 +229,10 @@ rules:
229 # http://eslint.org/docs/rules/no-caller 229 # http://eslint.org/docs/rules/no-caller
230 no-caller: 2 230 no-caller: 2
231 231
232 # disallow lexical declarations in case clauses
233 # http://eslint.org/docs/rules/no-case-declarations
234 no-case-declarations: 0
235
232 # Disallow division operators explicitly at beginning of regular expression 236 # Disallow division operators explicitly at beginning of regular expression
233 # http://eslint.org/docs/rules/no-div-regex 237 # http://eslint.org/docs/rules/no-div-regex
234 no-div-regex: 2 238 no-div-regex: 2
@@ -241,6 +245,10 @@ rules:
241 # http://eslint.org/docs/rules/no-empty-label 245 # http://eslint.org/docs/rules/no-empty-label
242 no-empty-label: 2 246 no-empty-label: 2
243 247
248 # disallow use of empty destructuring patterns
249 # http://eslint.org/docs/rules/no-empty-pattern
250 no-empty-pattern: 0
251
244 # Disallow comparisons to null without a type-checking operator 252 # Disallow comparisons to null without a type-checking operator
245 # http://eslint.org/docs/rules/no-eq-null 253 # http://eslint.org/docs/rules/no-eq-null
246 no-eq-null: 2 254 no-eq-null: 2
@@ -293,6 +301,10 @@ rules:
293 # http://eslint.org/docs/rules/no-loop-func 301 # http://eslint.org/docs/rules/no-loop-func
294 no-loop-func: 2 302 no-loop-func: 2
295 303
304 # disallow the use of magic numbers
305 # http://eslint.org/docs/rules/no-magic-numbers
306 no-magic-numbers: 0
307
296 # Disallow use of multiple spaces 308 # Disallow use of multiple spaces
297 # http://eslint.org/docs/rules/no-multi-spaces 309 # http://eslint.org/docs/rules/no-multi-spaces
298 no-multi-spaces: 2 310 no-multi-spaces: 2
@@ -648,6 +660,10 @@ rules:
648 - 2 660 - 2
649 - max: 1 661 - max: 1
650 662
663 # disallow negated conditions
664 # http://eslint.org/docs/rules/no-negated-condition
665 no-negated-condition: 0
666
651 # Disallow nested ternary expressions 667 # Disallow nested ternary expressions
652 # http://eslint.org/docs/rules/no-nested-ternary 668 # http://eslint.org/docs/rules/no-nested-ternary
653 no-nested-ternary: 0 669 no-nested-ternary: 0
@@ -789,6 +805,10 @@ rules:
789 ############################################################################# 805 #############################################################################
790 # ECMAScript 6 (All Off) 806 # ECMAScript 6 (All Off)
791 ############################################################################# 807 #############################################################################
808 # require braces in arrow function body
809 # http://eslint.org/docs/rules/arrow-body-style
810 arrow-body-style: 0
811
792 # require parens in arrow function arguments 812 # require parens in arrow function arguments
793 # http://eslint.org/docs/rules/arrow-parens 813 # http://eslint.org/docs/rules/arrow-parens
794 arrow-parens: 0 814 arrow-parens: 0
@@ -805,6 +825,10 @@ rules:
805 # http://eslint.org/docs/rules/generator-star-spacing 825 # http://eslint.org/docs/rules/generator-star-spacing
806 generator-star-spacing: 0 826 generator-star-spacing: 0
807 827
828 # disallow arrow functions where a condition is expected
829 # http://eslint.org/docs/rules/no-arrow-condition
830 no-arrow-condition: 0
831
808 # disallow modifying variables of class declarations 832 # disallow modifying variables of class declarations
809 # http://eslint.org/docs/rules/no-class-assign 833 # http://eslint.org/docs/rules/no-class-assign
810 no-class-assign: 0 834 no-class-assign: 0
diff --git a/package.json b/package.json
index 8307040..ca0a18c 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
29 }, 29 },
30 "homepage": "https://wiki.openstack.org/wiki/QA", 30 "homepage": "https://wiki.openstack.org/wiki/QA",
31 "peerDependencies": { 31 "peerDependencies": {
32 "eslint": "^1.5.1" 32 "eslint": "^1.10.1"
33 }, 33 },
34 "devDependencies": { 34 "devDependencies": {
35 "eslint": "1.5.1", 35 "eslint": "1.10.1",
36 "jasmine": "2.3.1" 36 "jasmine": "2.3.1"
37 }, 37 },
38 "dependencies": { 38 "dependencies": {