Merge branch 'AC-2575-upgrade-grunt-eslint' into delivery-bunch-w13

Author: andrewbess

dev/tools/grunt/configs/eslint.json

@@ -1,17 +1,15 @@
 {
   "file": {
     "options": {
-      "configFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
+      "overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
       "rulePaths": ["vendor/magento/magento-coding-standard/eslint/rules"],
-      "reset": true,
       "useEslintrc": false
     }
   },
   "test": {
     "options": {
-      "configFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
+      "overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
       "rulePaths": ["vendor/magento/magento-coding-standard/eslint/rules"],
-      "reset": true,
       "outputFile": "dev/tests/static/eslint-error-report.xml",
       "format": "junit",
       "quiet": true

package.json.sample

@@ -20,7 +20,7 @@
     "grunt-contrib-jasmine": "~1.2.0",
     "grunt-contrib-less": "~2.1.0",
     "grunt-contrib-watch": "~1.1.0",
-    "grunt-eslint": "~23.0.0",
+    "grunt-eslint": "~24.0.0",
     "grunt-exec": "~3.0.0",
     "grunt-replace": "~2.0.2",
     "grunt-styledocco": "~0.3.0",