Use eslint 9.x + update deps

package.json

@@ -29,14 +29,14 @@
     "sonar": "sonar-scanner"
   },
   "dependencies": {
-    "@angular/animations": "^18.1.2",
-    "@angular/common": "^18.1.2",
-    "@angular/compiler": "^18.1.2",
-    "@angular/core": "^18.1.2",
-    "@angular/forms": "^18.1.2",
-    "@angular/platform-browser": "^18.1.2",
-    "@angular/platform-browser-dynamic": "^18.1.2",
-    "@angular/router": "^18.1.2",
+    "@angular/animations": "^18.1.4",
+    "@angular/common": "^18.1.4",
+    "@angular/compiler": "^18.1.4",
+    "@angular/core": "^18.1.4",
+    "@angular/forms": "^18.1.4",
+    "@angular/platform-browser": "^18.1.4",
+    "@angular/platform-browser-dynamic": "^18.1.4",
+    "@angular/router": "^18.1.4",
     "@ngx-translate/http-loader": "^8.0.0",
     "angular-oauth2-oidc": "^17.0.2",
     "bootstrap": "^5.3.3",
@@ -47,15 +47,15 @@
     "tslib": "^2.6.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.1.2",
-    "@angular-eslint/builder": "18.1.0",
-    "@angular-eslint/eslint-plugin": "18.1.0",
-    "@angular-eslint/eslint-plugin-template": "18.1.0",
-    "@angular-eslint/schematics": "18.1.0",
-    "@angular-eslint/template-parser": "18.1.0",
-    "@angular/cdk": "^18.1.2",
-    "@angular/cli": "~18.1.2",
-    "@angular/compiler-cli": "^18.1.2",
+    "@angular-devkit/build-angular": "^18.1.4",
+    "@angular-eslint/builder": "18.2.0",
+    "@angular-eslint/eslint-plugin": "18.2.0",
+    "@angular-eslint/eslint-plugin-template": "18.2.0",
+    "@angular-eslint/schematics": "18.2.0",
+    "@angular-eslint/template-parser": "18.2.0",
+    "@angular/cdk": "^18.1.4",
+    "@angular/cli": "~18.1.4",
+    "@angular/compiler-cli": "^18.1.4",
     "@iconify-icons/akar-icons": "^1.2.19",
     "@iconify-icons/clarity": "^1.2.8",
     "@iconify-icons/emojione-monotone": "^1.2.4",
@@ -77,40 +77,40 @@
     "@iconify/icons-vaadin": "^1.2.4",
     "@iconify/icons-whh": "^1.2.3",
     "@types/jasmine": "~5.1.4",
-    "@typescript-eslint/eslint-plugin": "7.17.0",
-    "@typescript-eslint/parser": "7.17.0",
+    "@typescript-eslint/eslint-plugin": "8.1.0",
+    "@typescript-eslint/parser": "8.1.0",
     "cordova-android": "^13.0.0",
     "cordova-electron": "^4.0.0",
     "cordova-ios": "^7.1.1",
     "cordova-plugin-device": "^3.0.0",
     "cordova-plugin-googleplus": "8.5.2",
     "cordova-plugin-inappbrowser": "^6.0.0",
     "cordova-plugin-statusbar": "^4.0.0",
-    "electron": "^31.3.0",
+    "electron": "^31.3.1",
     "electron-builder": "^24.13.3",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-security": "^3.0.1",
-    "eslint-plugin-sonar": "^0.14.1",
+    "eslint-plugin-sonarjs": "^1.0.4",
     "iconify-icon": "^2.1.0",
     "jasmine-core": "~5.2.0",
-    "karma": "~6.4.3",
+    "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-firefox-launcher": "^2.1.3",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
     "prettier": "^3.3.3",
     "prettier-eslint": "^16.3.0",
-    "sonarqube-scanner": "^4.0.1"
+    "sonarqube-scanner": "^4.2.0"
   },
   "overrides": {
     "electron@<=31.0.0": "$electron",
     "electron-builder@<=24.0.0": "$electron-builder",
-    "@typescript-eslint/parser@<=7.0.0": "7.17.0"
+    "@typescript-eslint/parser@<=7.0.0": "7.18.0"
   },
   "cordova": {
     "platforms": [

.eslintrc.json → src/.eslintrc.json

@@ -7,8 +7,14 @@
     "filenames",
     "prettier",
     "security",
-    "sonar"
+    "sonarjs"
   ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "ecmaVersion": "latest",
+      "sourceType": "module",
+      "project": "./tsconfig.json"
+  },
   "overrides": [
     {
       "files": [
@@ -37,8 +43,7 @@
             "prefix": "app",
             "style": "kebab-case"
           }
-        ],
-        "sonar/deprecation": 1
+        ]
       }
     },
     {
@@ -55,8 +60,7 @@
           {
             "parser": "angular"
           }
-        ],
-        "sonar/deprecation": 1
+        ]
       }
     }
   ]

src/app/alliance/alliance-evict-popup.sub-component.ts

@@ -26,12 +26,8 @@ export class AllianceEvictPopupSubComponent {
   }
 
   possible() {
-    if (
-      this.user.getPropertyNb('recruiter') > 0 &&
-      this.info.allow_eject === 1
-    ) {
-      return true;
-    }
-    return false;
+    return (
+      this.user.getPropertyNb('recruiter') > 0 && this.info.allow_eject === 1
+    );
   }
 }

src/app/attacks/attacks-diamond.component.ts

@@ -156,16 +156,6 @@ export class AttacksDiamondComponent implements OnInit, OnDestroy {
     });
     this.socket.on('realWaveAttackSum', data => {
       this.realWaveAttackSum = data;
-      const newTab = [];
-      let j = 0;
-      for (const i in this.realWaveAttackSum) {
-        if (
-          this.realWaveAttackSum[i as keyof typeof this.realWaveAttackSum] > 0
-        ) {
-          newTab.push(j);
-          j++;
-        }
-      }
     });
     this.socket.on('waveAttackSum', data => {
       this.waveAttackSum = data;

src/app/attacks/attacks-seabattles.component.html

@@ -146,25 +146,42 @@
                     @case (1) {
                       <div
                         class="case unknown"
+                        role="button"
                         tabIndex="0"
-                        (click)="selectCase(x, y)"></div>
+                        aria-hidden="true"
+                        (click)="selectCase(x, y)"
+                        (keyup.enter)="selectCase(x, y)"></div>
                     }
                     @case (3) {
                       <div
                         class="case {{ 'player' + getCase(x, y).color_id }}"
-                        (click)="selectCase(x, y)">
+                        role="button"
+                        tabIndex="0"
+                        aria-hidden="true"
+                        (click)="selectCase(x, y)"
+                        (keyup.enter)="selectCase(x, y)">
                         <div class="army"></div>
                       </div>
                     }
                     @case (4) {
                       <div
                         class="case {{ 'player' + getCase(x, y).color_id }}"
-                        (click)="selectCase(x, y)">
+                        role="button"
+                        tabIndex="0"
+                        aria-hidden="true"
+                        (click)="selectCase(x, y)"
+                        (keyup.enter)="selectCase(x, y)">
                         <div class="capital"></div>
                       </div>
                     }
                     @default {
-                      <div class="case" (click)="selectCase(x, y)"></div>
+                      <div
+                        class="case"
+                        role="button"
+                        tabIndex="0"
+                        aria-hidden="true"
+                        (click)="selectCase(x, y)"
+                        (keyup.enter)="selectCase(x, y)"></div>
                     }
                   }
                 }

src/app/details/details.component.ts

@@ -65,15 +65,16 @@ export class DetailsComponent implements OnInit {
     const buildingList = this.user.getBuildings();
 
     for (const i in buildingList) {
-      if (this.user.getPropertyNb(buildingList[i].code) > 0) {
-        if (buildingList[i].consumption) {
-          const consumption = buildingList[i].consumption;
-          for (const consum in consumption) {
-            this.variation[consum as keyof typeof this.variation] -=
-              consumption[consum as keyof typeof consumption] *
-              this.user.getPropertyNb(buildingList[i].code);
-            this.nbvariation[consum as keyof typeof this.nbvariation]++;
-          }
+      if (
+        this.user.getPropertyNb(buildingList[i].code) > 0 &&
+        buildingList[i].consumption
+      ) {
+        const consumption = buildingList[i].consumption;
+        for (const consum in consumption) {
+          this.variation[consum as keyof typeof this.variation] -=
+            consumption[consum as keyof typeof consumption] *
+            this.user.getPropertyNb(buildingList[i].code);
+          this.nbvariation[consum as keyof typeof this.nbvariation]++;
         }
       }
     }

src/app/main/main.component.ts

@@ -91,8 +91,9 @@ export class MainComponent implements OnInit, OnDestroy {
               this.checkMaintenance(result.maintenance);
             }
           }
-        } catch (e) {
+        } catch (e: unknown) {
           this.displayServerModal = true;
+          console.log(e);
         }
 
         if (this.displayServerModal) {

src/app/messages/messages.component.ts

@@ -123,8 +123,8 @@ export class MessagesComponent implements OnInit, OnDestroy {
       }
     });
 
-    this.socket.on('msgInfo', msgInfo => {
-      this.currentMsg = msgInfo;
+    this.socket.on('msgInfo', (msgInfo: object) => {
+      this.currentMsg = msgInfo as typeof this.currentMsg;
       this.reported = 0;
       setTimeout(() => {
         this.scroller.scrollToAnchor('msgBlock');
@@ -174,7 +174,8 @@ export class MessagesComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const url = this.socket.url + '/api/playerProfile/' + username + '.json';
+    const url =
+      this.socket.url + '/api/playerProfile/' + username.toString() + '.json';
 
     this.sub = this.http.get(url).subscribe(result => {
       const res = result as { membre_id: number; username: string };

src/app/options/options-account-information-popup.sub-component.ts

@@ -71,11 +71,13 @@ export class OptionsAccountInformationPopupSubComponent
 
       reader.readAsDataURL(files[0]);
       reader.onload = (event2: ProgressEvent<FileReader>) => {
-        const playerImage = {
-          name: name,
-          data: event2.target!.result,
-        };
-        this.socket.emit('accountImgUpload', playerImage);
+        if (event2.target) {
+          const playerImage = {
+            name: name,
+            data: event2.target.result,
+          };
+          this.socket.emit('accountImgUpload', playerImage);
+        }
       };
     }
   }

src/app/sanctuary/sanctuary-strength-update-popup.sub-component.ts

@@ -32,7 +32,7 @@ export class SanctuaryStrengthUpdatePopupSubComponent {
   }
 
   canUpdate() {
-    if (this.info.price) {
+    if (Object.keys(this.info.price).length > 0) {
       if (this.info.sanctuaries_power >= 125) {
         return false;
       }

src/app/storeroom/storeroom.component.ts

@@ -61,7 +61,7 @@ export class StoreroomComponent implements OnInit, OnDestroy {
     this.storeroomList = [];
     this.storeroomMyList = [];
 
-    this.storeroom_ress = [].constructor(10);
+    this.storeroom_ress = [].constructor(10) as typeof this.storeroom_ress;
     this.storeroomMin = {
       min: 0,
       rate: 0,

src/main.ts

@@ -4,6 +4,6 @@ import { AppModule } from './app/app.module';
 
 platformBrowserDynamic()
   .bootstrapModule(AppModule)
-  .catch(err => {
+  .catch((err: unknown) => {
     console.error(err);
   });

src/services/user.service.ts

@@ -523,12 +523,10 @@ export class UserComponent {
   }
 
   getDatasAlliance() {
-    const datas = this.getProperty('datas') as {
+    return this.getProperty('datas') as {
       alliance: { create: number };
       war: { minmembers: number };
     };
-
-    return datas;
   }
 
   questValidateAuto() {