[Test] Restore stylistic rules check

https://eslint.org/blog/2023/10/deprecating-formatting-rules/

diff --git a/.eslintrc.json b/.eslintrc.json
index 322185accb420d0b1e48f4a854186c7cb129cc98..97ff7c8f6494d34b77de4727ef048505b8141739 100644 (file)
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,76 +3,82 @@
         "browser": true,
         "es6": true
     },
-    "extends": "eslint:all",
+    "extends": [
+        "eslint:all",
+        "plugin:@stylistic/all-extends"
+    ],
     "globals": {
         "define": false
     },
+    "plugins": [
+      "@stylistic"
+    ],
     "rules": {
-        "array-bracket-newline": ["error", "consistent"],
-        "array-element-newline": "off",
-        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
         "camelcase": "off",
         "capitalized-comments": "off",
-        "comma-dangle": ["error", "only-multiline"],
         "curly": ["error", "multi-line"],
-        "dot-location": ["error", "property"],
         "func-names": "off",
         // "func-style": ["error", "declaration"],
-        "function-call-argument-newline": "off",
         "id-length": ["error", { "min": 1 }],
-        "indent": ["error", 4, { "SwitchCase": 1 }],
-        // "max-len": ["error", { "code": 120 }],
-        // "key-spacing": ["error", {
+        // "@stylistic/key-spacing": ["error", {
         //     "singleLine": { "afterColon": false }
         // }],
         "line-comment-position": "off",
         "logical-assignment-operators": ["error", "never"],
         "max-params": ["warn", 6],
         "max-statements": ["warn", 55],
-        "max-statements-per-line": ["error", { "max": 2 }],
         "multiline-comment-style": "off",
-        "multiline-ternary": ["error", "always-multiline"],
-        "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 5 }],
         "no-continue": "off",
-        "no-extra-parens": ["error", "functions"],
-        "no-implicit-globals": "off",
         "no-inline-comments": "off",
         "no-magic-numbers": "off",
         "no-negated-condition": "off",
         "no-plusplus": "off",
         "no-ternary": "off",
-        "object-curly-newline": ["error", { "consistent": true }],
-        "object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],
         "object-shorthand": "off",
         "one-var": "off",
-        "padded-blocks": "off",
         "prefer-arrow-callback": "off",
         "prefer-destructuring": "off",
         "prefer-named-capture-group": "off",
         "prefer-object-has-own": "off",
         "prefer-spread": "off",
         "prefer-template": "off",
-        "quote-props" : ["error", "consistent-as-needed"],
-        "quotes": ["error", "double", { "avoidEscape": true }],
-        "require-jsdoc": "off",
         "require-unicode-regexp": "off",
-        "space-before-function-paren": ["error", {
+
+        "@stylistic/array-bracket-newline": ["error", "consistent"],
+        "@stylistic/array-element-newline": "off",
+        "@stylistic/brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+        "@stylistic/comma-dangle": ["error", "only-multiline"],
+        "@stylistic/dot-location": ["error", "property"],
+        "@stylistic/function-call-argument-newline": "off",
+        "@stylistic/indent": ["error", 4, { "SwitchCase": 1 }],
+        "@stylistic/max-len": ["error", { "code": 120 }],
+        "@stylistic/max-statements-per-line": ["error", { "max": 2 }],
+        "@stylistic/multiline-ternary": ["error", "always-multiline"],
+        "@stylistic/newline-per-chained-call": ["error", { "ignoreChainWithDepth": 5 }],
+        "@stylistic/no-extra-parens": ["error", "functions"],
+        "@stylistic/object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],
+        "@stylistic/padded-blocks": "off",
+        "@stylistic/quote-props" : ["error", "consistent-as-needed"],
+        "@stylistic/quotes": ["error", "double", { "avoidEscape": true }],
+        "@stylistic/semi": ["error", "always"],
+        "@stylistic/space-before-function-paren": ["error", {
             "anonymous": "always",
             "named": "never"
         }],
-        "vars-on-top": "off",
 
 
         // Temporarily disabled rules
         "func-style": "off",
-        "function-paren-newline": "off",
-        "key-spacing": "off",
-        "max-len": "off",
         "max-lines": "off",
         "max-lines-per-function": "off",
         "no-invalid-this": "off",
         "prefer-exponentiation-operator": "off",
         "sort-keys": "off",
-        "sort-vars": "off"
+        "sort-vars": "off",
+
+        "@stylistic/function-paren-newline": "off",
+        "@stylistic/key-spacing": "off",
+        "@stylistic/max-len": "off",
+        "@stylistic/one-var-declaration-per-line": "off"
     }
 }

diff --git a/interface/js/app/selectors.js b/interface/js/app/selectors.js
index 759e3ea16817ffa416a77a980664d22c36b1bd4c..6535953b565295f539fec374dc94b921397a3d9b 100644 (file)
--- a/interface/js/app/selectors.js
+++ b/interface/js/app/selectors.js
@@ -40,7 +40,7 @@ define(["jquery", "app/rspamd"],
                 enable_disable_check_btn();
             }
             const selector = $("#selectorsSelArea").val();
-            if (selector.length && !rspamd.read_only ) {
+            if (selector.length && !rspamd.read_only) {
                 rspamd.query("plugins/selectors/check_selector?selector=" + encodeURIComponent(selector), {
                     method: "GET",
                     success: function (json) {

diff --git a/interface/js/main.js b/interface/js/main.js
index a86982f87348fabfd08516ea395f0be042e36eaf..4bc488895df8a1491b26e2a3be9ffb6ab07813c2 100644 (file)
--- a/interface/js/main.js
+++ b/interface/js/main.js
@@ -22,7 +22,7 @@ requirejs.config({
     shim: {
         app: {deps:["jquery"]},
         codejar: {exports: "CodeJar", deps:["linenumbers"]},
-        bootstrap: {exports:"bootstrap", deps:["jquery"]},  // Popovers require jQuery
+        bootstrap: {exports:"bootstrap", deps:["jquery"]}, // Popovers require jQuery
         d3: {exports:"d3"},
         d3evolution: {exports:"D3Evolution", deps:["d3.global", "jquery"]},
         d3pie: {exports:"D3Pie", deps:["d3.global", "jquery"]},
@@ -64,5 +64,5 @@ requirejs.onError = function (e) {
 // Load main UI
 require(["app/rspamd"], (rspamd) => {
     "use strict";
-    rspamd.connect()
+    rspamd.connect();
 });

diff --git a/package.json b/package.json
index 51860e1485c471dbd9a847b235bb2a7be88969fd..dd1bca360f790f2371a341d4d04145c102ce9e6c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
     "devDependencies": {
         "eslint": "*",
+        "@stylistic/eslint-plugin": "*",
         "stylelint": ">=13.6.0",
         "stylelint-config-standard": "*",
         "postcss-html": "*"