From 8d1b665808ce3da8307c5597d821f31eb925cb99 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Mon, 22 Apr 2024 08:49:30 +0200
Subject: [PATCH] Migrate deprecated eslint config to to new format

The .eslintrc and .eslintignore formats are deprecated. The new format
uses a single eslint.config.js (or .mjs) file at the top.
---
 .eslintignore     |  1 -
 .eslintrc         | 54 --------------------------
 eslint.config.mjs | 98 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  1 +
 po/.eslintrc      |  5 ---
 tests/.eslintrc   | 15 --------
 utils/.eslintrc   |  8 ----
 7 files changed, 99 insertions(+), 83 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .eslintrc
 create mode 100644 eslint.config.mjs
 delete mode 100644 po/.eslintrc
 delete mode 100644 tests/.eslintrc
 delete mode 100644 utils/.eslintrc

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index d3816280..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-**/xtscancodes.js
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 10e15cec..00000000
--- a/.eslintrc
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2020": true
-    },
-    "parserOptions": {
-        "sourceType": "module",
-        "ecmaVersion": 2020
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        // Unsafe or confusing stuff that we forbid
-
-        "no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": true }],
-        "no-constant-condition": ["error", { "checkLoops": false }],
-        "no-var": "error",
-        "no-useless-constructor": "error",
-        "object-shorthand": ["error", "methods", { "avoidQuotes": true }],
-        "prefer-arrow-callback": "error",
-        "arrow-body-style": ["error", "as-needed", { "requireReturnForObjectLiteral": false } ],
-        "arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
-        "arrow-spacing": ["error"],
-        "no-confusing-arrow": ["error", { "allowParens": true }],
-
-        // Enforced coding style
-
-        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-        "indent": ["error", 4, { "SwitchCase": 1,
-                                 "VariableDeclarator": "first",
-                                 "FunctionDeclaration": { "parameters": "first" },
-                                 "FunctionExpression": { "parameters": "first" },
-                                 "CallExpression": { "arguments": "first" },
-                                 "ArrayExpression": "first",
-                                 "ObjectExpression": "first",
-                                 "ImportDeclaration": "first",
-                                 "ignoreComments": true }],
-        "comma-spacing": ["error"],
-        "comma-style": ["error"],
-        "curly": ["error", "multi-line"],
-        "func-call-spacing": ["error"],
-        "func-names": ["error"],
-        "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
-        "key-spacing": ["error"],
-        "keyword-spacing": ["error"],
-        "no-trailing-spaces": ["error"],
-        "semi": ["error"],
-        "space-before-blocks": ["error"],
-        "space-before-function-paren": ["error", { "anonymous": "always",
-                                                   "named": "never",
-                                                   "asyncArrow": "always" }],
-        "switch-colon-spacing": ["error"],
-        "camelcase": ["error", { allow: ["^XK_", "^XF86XK_"] }],
-    }
-}
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..e3bfcd78
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,98 @@
+import globals from "globals";
+import js from "@eslint/js";
+
+export default [
+    js.configs.recommended,
+    {
+        languageOptions: {
+            ecmaVersion: 2020,
+            sourceType: "module",
+            globals: {
+                ...globals.browser,
+                ...globals.es2020,
+            }
+        },
+        ignores: ["**/xtscancodes.js"],
+        rules: {
+            // Unsafe or confusing stuff that we forbid
+
+            "no-unused-vars": ["error", { "vars": "all",
+                                          "args": "none",
+                                          "ignoreRestSiblings": true,
+                                          "caughtErrors": "none" }],
+            "no-constant-condition": ["error", { "checkLoops": false }],
+            "no-var": "error",
+            "no-useless-constructor": "error",
+            "object-shorthand": ["error", "methods", { "avoidQuotes": true }],
+            "prefer-arrow-callback": "error",
+            "arrow-body-style": ["error", "as-needed", { "requireReturnForObjectLiteral": false } ],
+            "arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
+            "arrow-spacing": ["error"],
+            "no-confusing-arrow": ["error", { "allowParens": true }],
+
+            // Enforced coding style
+
+            "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+            "indent": ["error", 4, { "SwitchCase": 1,
+                                     "VariableDeclarator": "first",
+                                     "FunctionDeclaration": { "parameters": "first" },
+                                     "FunctionExpression": { "parameters": "first" },
+                                     "CallExpression": { "arguments": "first" },
+                                     "ArrayExpression": "first",
+                                     "ObjectExpression": "first",
+                                     "ImportDeclaration": "first",
+                                     "ignoreComments": true }],
+            "comma-spacing": ["error"],
+            "comma-style": ["error"],
+            "curly": ["error", "multi-line"],
+            "func-call-spacing": ["error"],
+            "func-names": ["error"],
+            "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
+            "key-spacing": ["error"],
+            "keyword-spacing": ["error"],
+            "no-trailing-spaces": ["error"],
+            "semi": ["error"],
+            "space-before-blocks": ["error"],
+            "space-before-function-paren": ["error", { "anonymous": "always",
+                                                       "named": "never",
+                                                       "asyncArrow": "always" }],
+            "switch-colon-spacing": ["error"],
+            "camelcase": ["error", { "allow": ["^XK_", "^XF86XK_"] }],
+        }
+    },
+    {
+        files: ["po/po2js", "po/xgettext-html"],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+            }
+        },
+    },
+    {
+        files: ["tests/*"],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+                ...globals.mocha,
+                sinon: false,
+                chai: false,
+            }
+        },
+        rules: {
+            "prefer-arrow-callback": 0,
+            // Too many anonymous callbacks
+            "func-names": "off",
+        },
+    },
+    {
+        files: ["utils/*"],
+        languageOptions: {
+            globals: {
+                ...globals.node,
+            }
+        },
+        rules: {
+            "no-console": 0,
+        },
+    },
+];
diff --git a/package.json b/package.json
index 482b86eb..9f22165b 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "commander": "latest",
     "eslint": "latest",
     "fs-extra": "latest",
+    "globals": "latest",
     "jsdom": "latest",
     "karma": "latest",
     "karma-mocha": "latest",
diff --git a/po/.eslintrc b/po/.eslintrc
deleted file mode 100644
index a0157e2a..00000000
--- a/po/.eslintrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "env": {
-        "node": true,
-    },
-}
diff --git a/tests/.eslintrc b/tests/.eslintrc
deleted file mode 100644
index 545fa2ed..00000000
--- a/tests/.eslintrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "env": {
-        "node": true,
-        "mocha": true
-    },
-    "globals": {
-        "chai": false,
-        "sinon": false
-    },
-    "rules": {
-        "prefer-arrow-callback": 0,
-        // Too many anonymous callbacks
-        "func-names": "off",
-    }
-}
diff --git a/utils/.eslintrc b/utils/.eslintrc
deleted file mode 100644
index b7dc129f..00000000
--- a/utils/.eslintrc
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "env": {
-    "node": true
-  },
-  "rules": {
-  	"no-console": 0
-  }
-}
\ No newline at end of file