From d1b8ec85e25a33c824c4eb211cb5638e98fd616f Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@chrisrebert.com>
Date: Sat, 4 Jun 2016 15:07:16 -0700
Subject: [PATCH] Upgrade ESLint to v2.9.0 (#20047)

Refs #19908

[skip sauce]
[skip validator]
---
 grunt/npm-shrinkwrap.json | 24 ++++++++++++------------
 js/.eslintrc.json         |  4 +++-
 package.json              |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index 4dc8c8c89a..8e871521f1 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": "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",
+      "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",
       "dependencies": {
         "acorn": {
-          "version": "2.7.0",
-          "from": "acorn@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"
+          "version": "3.1.0",
+          "from": "acorn@^3.0.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
         }
       }
     },
@@ -916,9 +916,9 @@
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
     },
     "eslint": {
-      "version": "2.8.0",
-      "from": "eslint@2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.8.0.tgz",
+      "version": "2.9.0",
+      "from": "eslint@2.9.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.9.0.tgz",
       "dependencies": {
         "argparse": {
           "version": "1.0.7",
@@ -958,9 +958,9 @@
       }
     },
     "espree": {
-      "version": "3.1.3",
-      "from": "espree@3.1.3",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz",
+      "version": "3.1.4",
+      "from": "espree@3.1.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.4.tgz",
       "dependencies": {
         "acorn": {
           "version": "3.1.0",
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index f64ef2e709..452cd24017 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -136,6 +136,7 @@
         "keyword-spacing": "error",
         "linebreak-style": "error",
         "lines-around-comment": "off",
+        "max-statements-per-line": ["error", { "max": 1 }],
         "new-cap": "off",
         "newline-after-var": "off",
         "new-parens": "error",
@@ -152,6 +153,8 @@
         "no-trailing-spaces": "error",
         "no-underscore-dangle": "off",
         "no-unneeded-ternary": "error",
+        "no-unsafe-finally": "error",
+        "no-useless-computed-key": "error",
         "object-curly-spacing": ["warn", "always"],
         "one-var": "off",
         "operator-assignment": "error",
@@ -168,7 +171,6 @@
         "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/package.json b/package.json
index 493c270bcf..caf86f069d 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^6.0.4",
-    "eslint": "^2.8.0",
+    "eslint": "^2.9.0",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",