Skip to content

Commit b931813

Browse files
committed
AC-13683::Investigate latest patch version of grunt-eslint
1 parent 727294d commit b931813

File tree

4 files changed

+83
-63
lines changed

4 files changed

+83
-63
lines changed

composer.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"preferred-install": "dist",
1717
"sort-packages": true
1818
},
19+
"repositories": [
20+
{
21+
"type": "vcs",
22+
"url": "[email protected]:magento-gl/magento-coding-standard.git"
23+
}
24+
],
1925
"require": {
2026
"php": "~8.2.0||~8.3.0||~8.4.0",
2127
"ext-bcmath": "*",
@@ -98,7 +104,7 @@
98104
"dg/bypass-finals": "^1.4",
99105
"friendsofphp/php-cs-fixer": "^3.22",
100106
"carlos-mg89/oauth": "^0.8.17",
101-
"magento/magento-coding-standard": "*",
107+
"magento/magento-coding-standard": "dev-AC-13683-v1",
102108
"magento/magento2-functional-testing-framework": "^5.0",
103109
"pdepend/pdepend": "3.x-dev",
104110
"phpmd/phpmd": "3.x-dev",

composer.lock

+25-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tools/grunt/configs/eslint.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"file": {
33
"options": {
4-
"overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
5-
"rulePaths": ["vendor/magento/magento-coding-standard/eslint/rules"],
4+
"overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/eslint.config.mjs",
65
"useEslintrc": false
76
}
87
},
98
"test": {
109
"options": {
11-
"overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/.eslintrc",
12-
"rulePaths": ["vendor/magento/magento-coding-standard/eslint/rules"],
10+
"overrideConfigFile": "vendor/magento/magento-coding-standard/eslint/eslint.config.mjs",
1311
"outputFile": "dev/tests/static/eslint-error-report.xml",
1412
"format": "junit",
1513
"quiet": true

package.json.sample

+49-45
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"homepage": "https://magento.com/",
1111
"devDependencies": {
12+
"eslint-formatter-junit": "~8.40.0",
1213
"glob": "~11.0.0",
1314
"grunt": "~1.6.1",
1415
"grunt-banner": "~0.6.0",
@@ -20,7 +21,7 @@
2021
"grunt-contrib-jasmine": "~4.0.0",
2122
"grunt-contrib-less": "~3.0.0",
2223
"grunt-contrib-watch": "~1.1.0",
23-
"grunt-eslint": "~24.3.0",
24+
"grunt-eslint": "~25.0.0",
2425
"grunt-exec": "~3.0.0",
2526
"grunt-replace": "~2.0.2",
2627
"grunt-styledocco": "~0.3.0",
@@ -38,48 +39,51 @@
3839
"time-grunt": "~2.0.0",
3940
"underscore": "1.13.7"
4041
},
41-
"overrides": {
42-
"styledocco": {
43-
"uglify-js": "~3.4.9",
44-
"marked": "~5.1.0",
45-
"clean-css": "~5.3.2"
46-
},
47-
"mkdirp" : {
48-
"minimist":"~1.2.6"
49-
},
50-
"optimist" : {
51-
"minimist":"~1.2.6"
52-
},
53-
"meow": {
54-
"trim-newlines":"~3.0.1"
55-
},
56-
"node-minify": {
57-
"terser": "~5.18.0"
58-
},
59-
"grunt-contrib-imagemin": {
60-
"css-select":"~5.1.0",
61-
"nth-check": "~2.1.1"
62-
},
63-
"bin-version-check": {
64-
"semver-regex": "~3.1.4"
65-
},
66-
"cacheable-request": {
67-
"http-cache-semantics": "~4.1.1"
68-
},
69-
"babel-core": {
70-
"json5": "~2.2.3"
71-
},
72-
"svgo": {
73-
"js-yaml": "~4.1.0"
74-
},
75-
"css-select": {
76-
"nth-check": "~2.1.1"
77-
},
78-
"latest-version": {
79-
"package-json": "~7.0.0"
80-
},
81-
"fast-glob": {
82-
"glob-parent": "~6.0.2"
83-
}
84-
}
42+
"overrides": {
43+
"styledocco": {
44+
"uglify-js": "~3.4.9",
45+
"marked": "~5.1.0",
46+
"clean-css": "~5.3.2"
47+
},
48+
"mkdirp": {
49+
"minimist": "~1.2.6"
50+
},
51+
"optimist": {
52+
"minimist": "~1.2.6"
53+
},
54+
"meow": {
55+
"trim-newlines": "~3.0.1"
56+
},
57+
"node-minify": {
58+
"terser": "~5.18.0"
59+
},
60+
"grunt-contrib-imagemin": {
61+
"css-select": "~5.1.0",
62+
"nth-check": "~2.1.1"
63+
},
64+
"bin-version-check": {
65+
"semver-regex": "~3.1.4"
66+
},
67+
"cacheable-request": {
68+
"http-cache-semantics": "~4.1.1"
69+
},
70+
"babel-core": {
71+
"json5": "~2.2.3"
72+
},
73+
"svgo": {
74+
"js-yaml": "~4.1.0"
75+
},
76+
"css-select": {
77+
"nth-check": "~2.1.1"
78+
},
79+
"latest-version": {
80+
"package-json": "~7.0.0"
81+
},
82+
"fast-glob": {
83+
"glob-parent": "~6.0.2"
84+
}
85+
},
86+
"dependencies": {
87+
"magento-coding-standard-eslint-plugin": "file:vendor/magento/magento-coding-standard/eslint"
88+
}
8589
}

0 commit comments

Comments
 (0)