From 21963bd723448ad70347b30df538a3dc1ce35852 Mon Sep 17 00:00:00 2001 From: Andrii Beziazychnyi Date: Tue, 22 Mar 2022 16:41:27 +0100 Subject: [PATCH] AC-2700: Update `grunt-eslint` npm dependency --- dev/tools/grunt/configs/eslint.json | 6 ++---- package.json.sample | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/tools/grunt/configs/eslint.json b/dev/tools/grunt/configs/eslint.json index 9d6d360fa177b..4f96d8c9d5569 100644 --- a/dev/tools/grunt/configs/eslint.json +++ b/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 diff --git a/package.json.sample b/package.json.sample index ef4c1a3c8afab..fa3177927872a 100644 --- a/package.json.sample +++ b/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",