From 0befdcd90a1a7fb0acb25caf471aebae2cdd41da Mon Sep 17 00:00:00 2001 From: Scott Anderson <662325+scottanderson@users.noreply.github.com> Date: Sun, 17 Aug 2025 04:31:15 -0400 Subject: [PATCH] Enable the Enable `max-len` and `max-lines` eslint rules (#1842) ## Description: Enable the Enable `max-len` and `max-lines` eslint rules. Fixes #1785 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced --- eslint.config.js | 5 ++-- src/client/FlagInput.ts | 7 +++-- src/client/FlagInputModal.ts | 5 +++- src/client/HostLobbyModal.ts | 24 ++++++++++++++--- src/client/JoinPrivateLobbyModal.ts | 8 +++++- src/client/LangSelector.ts | 7 ++++- src/client/LanguageModal.ts | 7 +++-- src/client/LocalServer.ts | 5 +++- src/client/PublicLobby.ts | 15 ++++++----- src/client/SinglePlayerModal.ts | 3 ++- src/client/TerritoryPatternsModal.ts | 3 ++- src/client/UsernameInput.ts | 9 +++++-- src/client/components/Difficulties.ts | 2 ++ src/client/components/NewsButton.ts | 3 ++- src/client/graphics/layers/ChatDisplay.ts | 7 ++--- src/client/graphics/layers/ControlPanel.ts | 3 ++- src/client/graphics/layers/EmojiTable.ts | 23 +++++++++------- src/client/graphics/layers/EventsDisplay.ts | 13 ++++++--- src/client/graphics/layers/GameLeftSidebar.ts | 8 +++--- .../graphics/layers/GameRightSidebar.ts | 11 +++++--- src/client/graphics/layers/GutterAdModal.ts | 8 ++++-- src/client/graphics/layers/Leaderboard.ts | 4 ++- src/client/graphics/layers/MultiTabModal.ts | 3 ++- src/client/graphics/layers/NameLayer.ts | 7 +++-- src/client/graphics/layers/OptionsMenu.ts | 4 ++- .../graphics/layers/PlayerInfoOverlay.ts | 4 ++- src/client/graphics/layers/RadialMenu.ts | 5 +++- src/client/graphics/layers/SettingsModal.ts | 27 ++++++++++++------- src/client/graphics/layers/SpawnAd.ts | 3 ++- src/client/graphics/layers/UnitDisplay.ts | 4 ++- src/core/Schemas.ts | 1 + src/core/configuration/DefaultConfig.ts | 1 + src/core/game/GameImpl.ts | 1 + src/core/game/PlayerImpl.ts | 1 + src/core/game/TerrainMapLoader.ts | 3 ++- src/server/Worker.ts | 14 +++++++++- .../handler/message/PreJoinHandler.ts | 4 ++- 37 files changed, 191 insertions(+), 71 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 79471768f..b5f747860 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -103,8 +103,8 @@ export default [ "func-call-spacing": ["error", "never"], "function-call-argument-newline": ["error", "consistent"], "max-depth": ["error", { max: 5 }], - // "max-len": ["error", { code: 120 }], // TODO: Enable this rule, https://github.com/openfrontio/OpenFrontIO/issues/1785 - "max-lines": ["error", { max: 1065, skipBlankLines: true, skipComments: true }], + "max-len": ["error", { code: 120 }], + "max-lines": ["error", { max: 676, skipBlankLines: true, skipComments: true }], "max-lines-per-function": ["error", { max: 561 }], "no-loss-of-precision": "error", "no-multi-spaces": "error", @@ -138,6 +138,7 @@ export default [ "@typescript-eslint/no-unsafe-argument": "off", "@typescript-eslint/no-unsafe-assignment": "off", "@typescript-eslint/no-unsafe-member-access": "off", + "max-len": "off", "sort-keys": "off", }, }, diff --git a/src/client/FlagInput.ts b/src/client/FlagInput.ts index aeb1f0493..0412ea9ab 100644 --- a/src/client/FlagInput.ts +++ b/src/client/FlagInput.ts @@ -56,12 +56,15 @@ export class FlagInput extends LitElement {
diff --git a/src/client/FlagInputModal.ts b/src/client/FlagInputModal.ts index eb4b65ad3..0c42bb71f 100644 --- a/src/client/FlagInputModal.ts +++ b/src/client/FlagInputModal.ts @@ -19,7 +19,10 @@ export class FlagInputModal extends LitElement { return html` ` : html` ` @@ -678,7 +694,9 @@ export class HostLobbyModal extends LitElement { await this.putGameConfig(); console.log( - `Starting private game with map: ${GameMapType[this.selectedMap as keyof typeof GameMapType]} ${this.useRandomMap ? " (Randomly selected)" : ""}`, + `Starting private game with map: ${ + GameMapType[this.selectedMap as keyof typeof GameMapType]} ${ + this.useRandomMap ? " (Randomly selected)" : ""}`, ); this.close(); const config = await getServerConfigFromClient(); diff --git a/src/client/JoinPrivateLobbyModal.ts b/src/client/JoinPrivateLobbyModal.ts index d67697836..d126d6ace 100644 --- a/src/client/JoinPrivateLobbyModal.ts +++ b/src/client/JoinPrivateLobbyModal.ts @@ -67,7 +67,13 @@ export class JoinPrivateLobbyModal extends LitElement { xmlns="http://www.w3.org/2000/svg" > diff --git a/src/client/LangSelector.ts b/src/client/LangSelector.ts index 76d40d86e..073e81d88 100644 --- a/src/client/LangSelector.ts +++ b/src/client/LangSelector.ts @@ -303,7 +303,12 @@ export class LangSelector extends LitElement {