Merge 766823a64b into b07c0ae39f

searx/static/themes/simple/.eslintrc.json

@@ -1,28 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": 12
-    },
-    "rules": {
-        "indent": ["error", 2],
-        "keyword-spacing": ["error", { "before": true, "after": true }],
-        "no-trailing-spaces": 2,
-        "space-before-function-paren": ["error", "always"],
-        "space-infix-ops": "error",
-        "comma-spacing": ["error", { "before": false, "after": true }],
-        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-        "curly": ["error", "multi-line"],
-        "block-spacing": ["error", "always"],
-        "dot-location": ["error", "property"],
-        "key-spacing": ["error", { "beforeColon": false, "afterColon": true }],
-        "spaced-comment": ["error", "always", {
-            "line": { "markers": ["*package", "!", "/", ",", "="] },
-            "block": { "balanced": true, "markers": ["*package", "!", ",", ":", "::", "flow-include"], "exceptions": ["*"] }
-        }]
-    }
-}

searx/static/themes/simple/eslint.config.js

@@ -0,0 +1,26 @@
+module.exports = [
+  {
+    "rules": {
+      "indent": ["error", 2],
+      "keyword-spacing": ["error", { "before": true, "after": true }],
+      "no-trailing-spaces": 2,
+      "space-before-function-paren": ["error", "always"],
+      "space-infix-ops": "error",
+      "comma-spacing": ["error", { "before": false, "after": true }],
+      "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+      "curly": ["error", "multi-line"],
+      "block-spacing": ["error", "always"],
+      "dot-location": ["error", "property"],
+      "key-spacing": ["error", { "beforeColon": false, "afterColon": true }],
+      "spaced-comment": [
+	"error", "always", {
+          "line": { "markers": ["*package", "!", "/", ",", "="] },
+          "block": { "balanced": true, "markers": ["*package", "!", ",", ":", "::", "flow-include"], "exceptions": ["*"] }
+	}
+      ]
+    },
+    languageOptions: {
+      ecmaVersion: 12
+    }
+  }
+];

searx/static/themes/simple/gruntfile.js

@@ -35,7 +35,7 @@ module.exports = function (grunt) {
     },
     eslint: {
       options: {
-        overrideConfigFile: '.eslintrc.json',
+        overrideConfigFile: 'eslint.config.js',
         failOnError: true,
         fix: grunt.option('fix')
       },

searx/static/themes/simple/package.json

@@ -8,7 +8,7 @@
     "grunt-contrib-uglify": "~5.2.1",
     "grunt-xmlmin": "~0.1.8",
     "grunt-contrib-watch": "~1.1.0",
-    "grunt-eslint": "^24.0.0",
+    "grunt-eslint": "^25.0.0",
     "grunt-stylelint": "^0.16.0",
     "grunt-image": "^6.4.0",
     "ionicons": "^7.1.0",