Upgrade ESLint to v2.4.0 (#20042)

Refs #19908.

[skip sauce]
[skip validator]

diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index e742b8e249b4f900ea4f52de3cf968acadce333f..b89fd189eef3a93b4a06b21d574d767102fcbd38 100644 (file)
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -916,9 +916,9 @@
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
     },
     "eslint": {
-      "version": "2.3.0",
-      "from": "eslint@2.3.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.3.0.tgz",
+      "version": "2.4.0",
+      "from": "eslint@2.4.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.4.0.tgz",
       "dependencies": {
         "argparse": {
           "version": "1.0.7",

diff --git a/package.json b/package.json
index 28df1b3468344c6e12d8fd1253b72e0ae19ebcf8..8604d9f586992fb069f226c5285c3c03ab426a56 100644 (file)
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^6.0.4",
-    "eslint": "^2.3.0",
+    "eslint": "^2.4.0",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",