From 2b16f5c5100c8a42bccad028903eadac2875e20c Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@chrisrebert.com>
Date: Sat, 4 Jun 2016 14:28:34 -0700
Subject: [PATCH] Update ESLint to v2.5.3 (#20043)

Refs #19908.

[skip sauce]
[skip validator]
---
 grunt/npm-shrinkwrap.json | 52 +++++++++++++++++++--------------------
 js/.eslintrc.json         |  3 +++
 js/src/carousel.js        | 11 ++++++---
 package.json              |  2 +-
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index b89fd189ee..cfc670cd6c 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -18,14 +18,14 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
     },
     "acorn-jsx": {
-      "version": "3.0.1",
-      "from": "acorn-jsx@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "version": "2.0.1",
+      "from": "acorn-jsx@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-2.0.1.tgz",
       "dependencies": {
         "acorn": {
-          "version": "3.1.0",
-          "from": "acorn@^3.0.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
+          "version": "2.7.0",
+          "from": "acorn@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"
         }
       }
     },
@@ -916,9 +916,9 @@
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
     },
     "eslint": {
-      "version": "2.4.0",
-      "from": "eslint@2.4.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.4.0.tgz",
+      "version": "2.5.3",
+      "from": "eslint@2.5.3",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.5.3.tgz",
       "dependencies": {
         "argparse": {
           "version": "1.0.7",
@@ -931,14 +931,14 @@
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
         },
         "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.4 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+          "version": "7.0.3",
+          "from": "glob@>=7.0.3 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
         },
         "globals": {
-          "version": "8.18.0",
-          "from": "globals@>=8.11.0 <9.0.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
+          "version": "9.7.0",
+          "from": "globals@>=9.2.0 <10.0.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.7.0.tgz"
         },
         "js-yaml": {
           "version": "3.6.1",
@@ -950,11 +950,6 @@
           "from": "lodash@>=4.0.0 <5.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
         },
-        "shelljs": {
-          "version": "0.5.3",
-          "from": "shelljs@>=0.5.3 <0.6.0",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-        },
         "user-home": {
           "version": "2.0.0",
           "from": "user-home@>=2.0.0 <3.0.0",
@@ -963,9 +958,9 @@
       }
     },
     "espree": {
-      "version": "3.1.5",
-      "from": "espree@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.5.tgz",
+      "version": "3.1.3",
+      "from": "espree@3.1.3",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz",
       "dependencies": {
         "acorn": {
           "version": "3.1.0",
@@ -1734,9 +1729,14 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
     },
     "ignore": {
-      "version": "2.2.19",
-      "from": "ignore@>=2.2.19 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-2.2.19.tgz"
+      "version": "3.1.2",
+      "from": "ignore@>=3.0.10 <4.0.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.1.2.tgz"
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "from": "imurmurhash@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
     },
     "in-publish": {
       "version": "2.0.0",
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 1bf696daeb..f64ef2e709 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -24,6 +24,7 @@
         "no-dupe-args": "error",
         "no-dupe-keys": "error",
         "no-duplicate-case": "error",
+        "no-duplicate-imports": "error",
         "no-empty": "error",
         "no-empty-character-class": "error",
         "no-empty-pattern": "error",
@@ -43,6 +44,7 @@
         "no-sparse-arrays": "error",
         "no-unexpected-multiline": "error",
         "no-unreachable": "error",
+        "no-useless-escape": "error",
         "use-isnan": "error",
         "valid-jsdoc": "off",
         "valid-typeof": "error",
@@ -166,6 +168,7 @@
         "space-infix-ops": "error",
         "space-in-parens": "error",
         "space-unary-ops": "error",
+        "max-statements-per-line": ["error", { "max": 1 }],
 
         // es6
         "arrow-parens": "error",
diff --git a/js/src/carousel.js b/js/src/carousel.js
index f990c699ab..e24aed08f6 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -238,9 +238,14 @@ const Carousel = (($) => {
       }
 
       switch (event.which) {
-        case ARROW_LEFT_KEYCODE: this.prev(); break
-        case ARROW_RIGHT_KEYCODE: this.next(); break
-        default: return
+        case ARROW_LEFT_KEYCODE:
+          this.prev()
+          break
+        case ARROW_RIGHT_KEYCODE:
+          this.next()
+          break
+        default:
+          return
       }
     }
 
diff --git a/package.json b/package.json
index 8604d9f586..d5f02993f7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^6.0.4",
-    "eslint": "^2.4.0",
+    "eslint": "^2.5.3",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",