Skip to content

Commit e3dbe60

Browse files
committed
AC-1509: Remove outdated JSCS static tests from magento
1 parent a30edcb commit e3dbe60

13 files changed

+685
-5784
lines changed

.github/workflows/php.yml

-3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,3 @@ jobs:
7575

7676
- name: Run ESLint
7777
run: npm run eslint -- eslint/rules
78-
79-
- name: Run JSCS
80-
run: npm run jscs eslint/rules Magento2

eslint/.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"./.eslintrc-reset",
44
"./.eslintrc-magento",
55
"./.eslintrc-jquery",
6-
"./.eslintrc-misc"
6+
"./.eslintrc-misc",
7+
"./.eslintrc-jscs"
78
]
89
}

eslint/.eslintrc-jscs

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"rules": {
3+
"no-with": 2,
4+
"space-before-function-paren": [
5+
2,
6+
{
7+
"anonymous": "always",
8+
"named": "never",
9+
"asyncArrow": "always"
10+
}
11+
],
12+
"curly": [
13+
2,
14+
"all"
15+
],
16+
"keyword-spacing": [
17+
2,
18+
{}
19+
],
20+
"no-empty": [
21+
2,
22+
{
23+
"allowEmptyCatch": true
24+
}
25+
],
26+
"no-mixed-spaces-and-tabs": 2,
27+
"no-multiple-empty-lines": 2,
28+
"no-multi-str": 2,
29+
"space-unary-ops": [
30+
2,
31+
{
32+
"words": false,
33+
"nonwords": false
34+
}
35+
],
36+
"space-in-parens": [
37+
2,
38+
"never"
39+
],
40+
"comma-dangle": [
41+
2,
42+
"never"
43+
],
44+
"no-trailing-spaces": 2,
45+
"comma-style": [
46+
2,
47+
"last"
48+
],
49+
"eol-last": 2,
50+
"one-var": [
51+
2,
52+
"always"
53+
],
54+
"space-infix-ops": 2,
55+
"space-before-blocks": [
56+
2,
57+
"always"
58+
],
59+
"quotes": [
60+
2,
61+
"single"
62+
]
63+
}
64+
}

eslint/rules/jquery-no-andSelf.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
// jscs:disable requireCurlyBraces
35-
if (node.callee.type !== 'MemberExpression') return;
34+
if (node.callee.type !== 'MemberExpression') {return;}
3635

37-
if (node.callee.property.name !== 'andSelf') return;
38-
// jscs:enable requireCurlyBraces
36+
if (node.callee.property.name !== 'andSelf') {return;}
3937

4038
if (utils.isjQuery(node)) {
4139
context.report({

eslint/rules/jquery-no-bind-unbind.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
// jscs:disable requireCurlyBraces
35-
if (node.callee.type !== 'MemberExpression') return;
34+
if (node.callee.type !== 'MemberExpression') {return;}
3635

37-
if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
38-
// jscs:enable requireCurlyBraces
36+
if (!['bind', 'unbind'].includes(node.callee.property.name)) {return;}
3937

4038
if (utils.isjQuery(node)) {
4139
context.report({

eslint/rules/jquery-no-click-event-shorthand.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ module.exports = {
3434
'mouseup', 'mousemove','mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
3535
'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'];
3636

37-
// jscs:disable requireCurlyBraces
38-
if (node.callee.type !== 'MemberExpression') return;
37+
if (node.callee.type !== 'MemberExpression') {return;}
3938

40-
if (!names.includes(node.callee.property.name)) return;
41-
// jscs:enable requireCurlyBraces
39+
if (!names.includes(node.callee.property.name)) {return;}
4240

4341
if (utils.isjQuery(node)) {
4442
name = node.callee.property.name;

eslint/rules/jquery-no-delegate-undelegate.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
// jscs:disable requireCurlyBraces
35-
if (node.callee.type !== 'MemberExpression') return;
34+
if (node.callee.type !== 'MemberExpression') {return;}
3635

37-
if (!['delegate', 'undelegate'].includes(node.callee.property.name)) return;
38-
// jscs:enable requireCurlyBraces
36+
if (!['delegate', 'undelegate'].includes(node.callee.property.name)) {return;}
3937

4038
if (utils.isjQuery(node)) {
4139
context.report({

eslint/rules/jquery-no-event-shorthand.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ module.exports = {
3131
var names = ['load', 'unload', 'error'],
3232
name;
3333

34-
// jscs:disable requireCurlyBraces
35-
if (node.callee.type !== 'MemberExpression') return;
34+
if (node.callee.type !== 'MemberExpression') {return;}
3635

37-
if (!names.includes(node.callee.property.name)) return;
38-
// jscs:enable requireCurlyBraces
36+
if (!names.includes(node.callee.property.name)) {return;}
3937

4038
if (utils.isjQuery(node)) {
4139
name = node.callee.property.name;

eslint/rules/jquery-no-size.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
// jscs:disable requireCurlyBraces
35-
if (node.callee.type !== 'MemberExpression') return;
34+
if (node.callee.type !== 'MemberExpression') {return;}
3635

37-
if (node.callee.property.name !== 'size') return;
38-
// jscs:enable requireCurlyBraces
36+
if (node.callee.property.name !== 'size') {return;}
3937

4038
if (utils.isjQuery(node)) {
4139
context.report({

eslint/rules/jquery-no-trim.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ module.exports = {
2929
* @param {Object} node - The node to check.
3030
*/
3131
CallExpression: function (node) {
32-
// jscs:disable requireCurlyBraces
33-
if (node.callee.type !== 'MemberExpression') return;
32+
if (node.callee.type !== 'MemberExpression') {return;}
3433

35-
if (node.callee.object.name !== '$') return;
34+
if (node.callee.object.name !== '$') {return;}
3635

37-
if (node.callee.property.name !== 'trim') return;
38-
// jscs:enable requireCurlyBraces
36+
if (node.callee.property.name !== 'trim') {return;}
3937

4038
context.report({
4139
node: node,

jscs/.jscsrc

-119
This file was deleted.

0 commit comments

Comments
 (0)