From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 Feb 2025 09:48:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5651'
X-Git-Tag: live~166
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a3ef47b82d84e965d35c5c6811df9e5a252169ff?hp=6edb8dae058979f9c5cb198ad4f7af3f700ba84b

Merge remote-tracking branch 'upstream/pull/5651'
---

diff --git a/config/eslint.js b/config/eslint.js
index 2dcd0d5a1..c968d9e9a 100644
--- a/config/eslint.js
+++ b/config/eslint.js
@@ -1,3 +1,5 @@
+/* eslint sort-keys: ["error", "asc", {minKeys: 5}] */
+
 const globals = require("globals");
 const js = require("@eslint/js");
 const erb = require("eslint-plugin-erb");
@@ -27,8 +29,8 @@ module.exports = [
         Cookies: "readonly",
         I18n: "readonly",
         L: "readonly",
-        OSM: "writable",
         Matomo: "readonly",
+        OSM: "writable",
         Turbo: "readonly",
         updateLinks: "readonly"
       }
@@ -43,7 +45,6 @@ module.exports = [
       reportUnusedDisableDirectives: "off"
     },
     rules: {
-      /* eslint sort-keys: ["warn"] */
       "@stylistic/array-bracket-newline": ["error", "consistent"],
       "@stylistic/array-bracket-spacing": "error",
       "@stylistic/block-spacing": "error",