Merge pull request #19993 from twbs/eslint-1.7.3

Upgrade ESlint to v1.7.3
twbs · May 31, 2016 · d8e1180 · d8e1180
2 parents 5a35ad6 + 412481b
commit d8e1180
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 65 deletions.
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
diff --git a/js/.eslintrc b/js/.eslintrc
@@ -21,6 +21,7 @@
         "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,
@@ -29,6 +30,7 @@
         "no-inner-declarations": 2,
         "no-invalid-regexp": 2,
         "no-irregular-whitespace": 2,
+        "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}],
         "no-negated-in-lhs": 2,
         "no-obj-calls": 2,
         "no-regex-spaces": 2,

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^4.1.3",
-    "eslint": "^1.5.1",
+    "eslint": "^1.7.3",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",