Skip to content

Commit 90790da

Browse files
committed
ESLint configuration moved to JSON file. Changed default task mode.
1 parent 3419c71 commit 90790da

File tree

3 files changed

+19
-28
lines changed

3 files changed

+19
-28
lines changed

dev/tools/grunt/configs/eslint.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

dev/tools/grunt/configs/eslint.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"file": {
3+
"options": {
4+
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
5+
"reset": true,
6+
"useEslintrc": false
7+
}
8+
},
9+
"test": {
10+
"options": {
11+
"configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
12+
"reset": true,
13+
"outputFile": "dev/tests/static/eslint-error-report.xml",
14+
"format": "junit",
15+
"quiet": true
16+
}
17+
}
18+
}

dev/tools/grunt/tasks/static.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function (grunt) {
1717
};
1818

1919
grunt.registerTask('static', function (target) {
20-
var currentTarget = target || 'test',
20+
var currentTarget = target || 'file',
2121
file = grunt.option('file'),
2222
tasks = [
2323
'eslint:' + currentTarget,

0 commit comments

Comments
 (0)