chore: update to ng18

7185 · May 22, 2024 · 4241060 · 4241060
1 parent fd7d90b
commit 4241060
Show file tree

Hide file tree

Showing 28 changed files with 2,094 additions and 1,705 deletions.
diff --git a/action-parser/package.json b/action-parser/package.json
@@ -17,12 +17,12 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "prettier": "^3.2.5",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.1.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   }

diff --git a/backend/package.json b/backend/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@fastify/cookie": "^9.3.1",
-    "@fastify/static": "^7.0.3",
+    "@fastify/static": "^7.0.4",
     "@nestjs/axios": "^3.0.2",
     "@nestjs/cache-manager": "^2.2.2",
     "@nestjs/common": "^10.3.8",
@@ -33,8 +33,8 @@
     "@nestjs/platform-ws": "^10.3.8",
     "@nestjs/serve-static": "^4.0.2",
     "@nestjs/websockets": "^10.3.8",
-    "@prisma/client": "^5.13.0",
-    "axios": "^1.6.8",
+    "@prisma/client": "^5.14.0",
+    "axios": "^1.7.2",
     "cache-manager": "^5.5.2",
     "class-validator": "^0.14.1",
     "reflect-metadata": "^0.2.2",
@@ -46,20 +46,20 @@
     "@nestjs/schematics": "^10.1.1",
     "@nestjs/testing": "^10.3.8",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
     "@types/supertest": "^6.0.2",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "prettier": "^3.2.5",
-    "prisma": "^5.13.0",
+    "prisma": "^5.14.0",
     "source-map-support": "^0.5.20",
     "supertest": "^7.0.0",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.1.3",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",

diff --git a/frontend/package.json b/frontend/package.json
@@ -15,17 +15,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.2.0",
-    "@angular/cdk": "^17.2.0",
-    "@angular/common": "^17.2.0",
-    "@angular/compiler": "^17.2.0",
-    "@angular/core": "^17.2.0",
-    "@angular/forms": "^17.3.7",
-    "@angular/material": "^17.3.7",
-    "@angular/platform-browser": "^17.2.0",
-    "@angular/platform-browser-dynamic": "^17.3.7",
-    "@angular/router": "^17.3.7",
-    "@angular/ssr": "^17.3.6",
+    "@angular/animations": "^18.0.0",
+    "@angular/cdk": "^18.0.0",
+    "@angular/common": "^18.0.0",
+    "@angular/compiler": "^18.0.0",
+    "@angular/core": "^18.0.0",
+    "@angular/forms": "^18.0.0",
+    "@angular/material": "^18.0.0",
+    "@angular/platform-browser": "^18.0.0",
+    "@angular/platform-browser-dynamic": "^18.0.0",
+    "@angular/router": "^18.0.0",
+    "@angular/ssr": "^18.0.0",
     "@fontsource/arimo": "^5.0.20",
     "@fortawesome/angular-fontawesome": "^0.14.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -40,27 +40,27 @@
     "rxjs": "^7.8.1",
     "three": "^0.164.1",
     "three-mesh-bvh": "^0.7.4",
-    "three-rwx-loader": "^0.12.3",
+    "three-rwx-loader": "^0.12.4",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.6",
-    "@angular-eslint/builder": "^17.3.0",
+    "@angular-devkit/build-angular": "^18.0.0",
+    "@angular-eslint/builder": "^17.5.0",
     "@angular-eslint/eslint-plugin": "^17.0.0",
     "@angular-eslint/eslint-plugin-template": "^17.0.0",
-    "@angular-eslint/schematics": "^17.3.0",
-    "@angular-eslint/template-parser": "^17.3.0",
-    "@angular/cli": "^17.3.6",
-    "@angular/compiler-cli": "^17.3.7",
-    "@angular/language-service": "^17.3.7",
-    "@types/node": "^20.12.10",
-    "@types/three": "^0.164.0",
+    "@angular-eslint/schematics": "^17.5.0",
+    "@angular-eslint/template-parser": "^17.5.0",
+    "@angular/cli": "^18.0.0",
+    "@angular/compiler-cli": "^18.0.0",
+    "@angular/language-service": "^18.0.0",
+    "@types/node": "^20.12.12",
+    "@types/three": "^0.164.1",
     "@types/webgl2": "^0.0.11",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-jsdoc": "^48.2.5",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",

diff --git a/frontend/src/app/animation/avatar-animation.service.ts b/frontend/src/app/animation/avatar-animation.service.ts
@@ -89,8 +89,8 @@ export class AvatarAnimationService {
     fflate
   }
   private frameRate = 60
-  private engineSvc = inject(EngineService)
-  private propSvc = inject(PropService)
+  private readonly engineSvc = inject(EngineService)
+  private readonly propSvc = inject(PropService)
 
   constructor() {
     effect(() => {

diff --git a/frontend/src/app/auth/auth.component.ts b/frontend/src/app/auth/auth.component.ts
@@ -48,10 +48,10 @@ export class AuthComponent implements OnInit {
   passwordCtl: FormControl<string | null>
   private returnUrl: string
 
-  private http = inject(HttpService)
-  private fb = inject(FormBuilder)
-  private router = inject(Router)
-  private route = inject(ActivatedRoute)
+  private readonly http = inject(HttpService)
+  private readonly fb = inject(FormBuilder)
+  private readonly router = inject(Router)
+  private readonly route = inject(ActivatedRoute)
 
   constructor() {
     this.usernameCtl = this.fb.control('', [

diff --git a/frontend/src/app/engine/build.service.ts b/frontend/src/app/engine/build.service.ts
@@ -37,7 +37,7 @@ export class BuildService {
   private cellSelection: Group | null = null
   private propSelection: Group | null = null
   private propSelectionBox: LineSegments | null = null
-  private inputSysSvc = inject(InputSystemService)
+  private readonly inputSysSvc = inject(InputSystemService)
 
   selectProp(prop: Group, buildNode: Group) {
     if (this.cellSelection != null) {

diff --git a/frontend/src/app/engine/engine.component.ts b/frontend/src/app/engine/engine.component.ts
@@ -21,8 +21,8 @@ export class EngineComponent implements OnInit, OnDestroy, AfterViewInit {
   labelZone = viewChild.required<ElementRef<HTMLDivElement>>('labelZone')
   labelDesc = viewChild.required<ElementRef<HTMLDivElement>>('labelDesc')
 
-  private engineSvc = inject(EngineService)
-  private world = inject(WorldService)
+  private readonly engineSvc = inject(EngineService)
+  private readonly world = inject(WorldService)
 
   ngOnInit(): void {
     this.engineSvc.createScene(

diff --git a/frontend/src/app/engine/engine.service.ts b/frontend/src/app/engine/engine.service.ts
@@ -83,13 +83,13 @@ export class EngineService {
   playerPosition = signal(new Vector3())
   worldFog = {color: 0x00007f, near: 0, far: 120, enabled: false}
 
-  private userSvc = inject(UserService)
-  private inputSysSvc = inject(InputSystemService)
-  private audioSvc = inject(AudioService)
-  private propSvc = inject(PropService)
-  private buildSvc = inject(BuildService)
-  private propAnimSvc = inject(PropAnimationService)
-  private propActionSvc = inject(PropActionService)
+  private readonly userSvc = inject(UserService)
+  private readonly inputSysSvc = inject(InputSystemService)
+  private readonly audioSvc = inject(AudioService)
+  private readonly propSvc = inject(PropService)
+  private readonly buildSvc = inject(BuildService)
+  private readonly propAnimSvc = inject(PropAnimationService)
+  private readonly propActionSvc = inject(PropActionService)
 
   private terrain: Group
   private water: Group

diff --git a/frontend/src/app/engine/inputsystem.service.ts b/frontend/src/app/engine/inputsystem.service.ts
@@ -87,7 +87,7 @@ export class InputSystemService {
   ])
 
   private keyMap: Map<string, PressedKey>
-  private settings = inject(SettingsService)
+  private readonly settings = inject(SettingsService)
 
   constructor() {
     this.keyMap = new Map(this.settings.get('keymap') ?? this.defaultKeymap)

diff --git a/frontend/src/app/engine/player.ts b/frontend/src/app/engine/player.ts
@@ -21,7 +21,7 @@ export class Player {
   static readonly MAX_STEP_LENGTH = environment.world.collider.maxStepLength
   static readonly MAX_NB_STEPS = environment.world.collider.maxNbSteps
 
-  private inputSysSvc = inject(InputSystemService)
+  private readonly inputSysSvc = inject(InputSystemService)
 
   avatar: Group
   state = 'idle'

diff --git a/frontend/src/app/network/socket.service.ts b/frontend/src/app/network/socket.service.ts
@@ -19,8 +19,8 @@ export class SocketService {
   messages: Subject<Message> = new Subject()
   connected = false
 
-  private engineSvc = inject(EngineService)
-  private userSvc = inject(UserService)
+  private readonly engineSvc = inject(EngineService)
+  private readonly userSvc = inject(UserService)
   private connecting = false
   private socket: WebSocketSubject<unknown> = webSocket({
     url: environment.url.websocket

diff --git a/frontend/src/app/ui/ui-chat-zone/ui-chat-zone.component.ts b/frontend/src/app/ui/ui-chat-zone/ui-chat-zone.component.ts
@@ -42,8 +42,8 @@ export class UiChatZoneComponent implements OnInit {
     VirtualScrollerComponent
   )
 
-  socket = inject(SocketService)
-  usrSvc = inject(UserService)
+  readonly socket = inject(SocketService)
+  readonly usrSvc = inject(UserService)
   faComments = faComments
   data = []
   message = ''

diff --git a/frontend/src/app/ui/ui-controls/ui-controls.component.ts b/frontend/src/app/ui/ui-controls/ui-controls.component.ts
@@ -41,8 +41,8 @@ export class UiControlsComponent implements OnInit {
   controlsKeymap = Array(this.controlsLabels.length).fill([null, null])
   activeKey: [number | null, number | null] = [null, null]
 
-  private inputSysSvc = inject(InputSystemService)
-  private cdRef = inject(ChangeDetectorRef)
+  private readonly inputSysSvc = inject(InputSystemService)
+  private readonly cdRef = inject(ChangeDetectorRef)
   private cancel: Subject<boolean> | null = null
   private oldKey = 'nop'
 

diff --git a/frontend/src/app/ui/ui-prop-edit/ui-prop-edit.component.ts b/frontend/src/app/ui/ui-prop-edit/ui-prop-edit.component.ts
@@ -61,8 +61,8 @@ export class UiPropEditComponent {
     date?: number
   }>
 
-  private buildSvc = inject(BuildService)
-  private propSvc = inject(PropService)
+  private readonly buildSvc = inject(BuildService)
+  private readonly propSvc = inject(PropService)
 
   constructor() {
     this.selectedProp = this.buildSvc.selectedPropSignal

diff --git a/frontend/src/app/ui/ui-settings/ui-settings.component.ts b/frontend/src/app/ui/ui-settings/ui-settings.component.ts
@@ -28,9 +28,9 @@ export class UiSettingsComponent implements OnInit {
   maxFps: number
   maxLights: number
   archivedMedia = false
-  dialogRef = inject(MatDialogRef<UiSettingsComponent>)
-  private engineSvc = inject(EngineService)
-  private settings = inject(SettingsService)
+  readonly dialogRef = inject(MatDialogRef<UiSettingsComponent>)
+  private readonly engineSvc = inject(EngineService)
+  private readonly settings = inject(SettingsService)
 
   constructor() {
     effect(() => {

diff --git a/frontend/src/app/ui/ui-teleport/ui-teleport.component.ts b/frontend/src/app/ui/ui-teleport/ui-teleport.component.ts
@@ -26,11 +26,11 @@ export class UiTeleportComponent {
   worldName: string
   coordinates: string
   name: string
-
   data: {type: number} = inject(MAT_DIALOG_DATA)
-  private teleportSvc = inject(TeleportService)
-  private settings = inject(SettingsService)
-  private world = inject(WorldService)
+
+  private readonly teleportSvc = inject(TeleportService)
+  private readonly settings = inject(SettingsService)
+  private readonly world = inject(WorldService)
 
   go() {
     this.teleportSvc.teleport.set({

diff --git a/frontend/src/app/ui/ui-terrain-edit/ui-terrain-edit.component.ts b/frontend/src/app/ui/ui-terrain-edit/ui-terrain-edit.component.ts
@@ -50,7 +50,7 @@ export class UiTerrainEditComponent {
     hole?: boolean
   }>
   height = 0
-  private buildSvc = inject(BuildService)
+  private readonly buildSvc = inject(BuildService)
 
   constructor() {
     this.selectedCell = this.buildSvc.selectedCellSignal

diff --git a/frontend/src/app/ui/ui-toolbar/ui-toolbar.component.scss b/frontend/src/app/ui/ui-toolbar/ui-toolbar.component.scss
@@ -2,13 +2,13 @@
 @use '@angular/material' as mat;
 @import '../../../styles/_variables';
 
-$color-config: mat.get-color-config($lemuria-theme);
+$color-config: mat.m2-get-color-config($lemuria-theme);
 
 $primary-palette: map.get($color-config, 'primary');
 
 .pill{
-  background-color: mat.get-color-from-palette($primary-palette, 500);
-  color: mat.get-color-from-palette($primary-palette, '500-contrast');
+  background-color: mat.m2-get-color-from-palette($primary-palette, 500);
+  color: mat.m2-get-color-from-palette($primary-palette, '500-contrast');
   border-radius: 10px;
   padding: 4px;
 }

diff --git a/frontend/src/app/ui/ui-toolbar/ui-toolbar.component.ts b/frontend/src/app/ui/ui-toolbar/ui-toolbar.component.ts
@@ -104,16 +104,16 @@ export class UiToolbarComponent implements OnInit, AfterViewInit {
   strFps = '0 FPS 0 draws'
   strMem = '0 Geom. 0 Text.'
 
-  dialog = inject(MatDialog)
-  socket = inject(SocketService)
-  worldSvc = inject(WorldService)
-  teleportSvc = inject(TeleportService)
-  private renderer = inject(Renderer2)
-  private cdRef = inject(ChangeDetectorRef)
-  private engineSvc = inject(EngineService)
-  private http = inject(HttpService)
-  private userSvc = inject(UserService)
-  private settings = inject(SettingsService)
+  readonly dialog = inject(MatDialog)
+  readonly socket = inject(SocketService)
+  readonly worldSvc = inject(WorldService)
+  readonly teleportSvc = inject(TeleportService)
+  private readonly renderer = inject(Renderer2)
+  private readonly cdRef = inject(ChangeDetectorRef)
+  private readonly engineSvc = inject(EngineService)
+  private readonly http = inject(HttpService)
+  private readonly userSvc = inject(UserService)
+  private readonly settings = inject(SettingsService)
   private compass = viewChild.required<ElementRef>('compass')
 
   constructor() {

diff --git a/frontend/src/app/ui/ui.component.ts b/frontend/src/app/ui/ui.component.ts
@@ -30,7 +30,7 @@ export class UiComponent {
   loadPropEdit: Signal<boolean>
   loadTerrainEdit: Signal<boolean>
 
-  private buildSvc = inject(BuildService)
+  private readonly buildSvc = inject(BuildService)
 
   constructor() {
     this.loadPropEdit = computed(

diff --git a/frontend/src/app/user/user.service.ts b/frontend/src/app/user/user.service.ts
@@ -11,7 +11,7 @@ export class UserService {
   avatarChanged: Subject<User> = new Subject()
   currentName = 'Anonymous'
 
-  private http = inject(HttpService)
+  private readonly http = inject(HttpService)
 
   currentUser() {
     return this.http.getLogged()

diff --git a/frontend/src/app/world/lighting.service.ts b/frontend/src/app/world/lighting.service.ts
@@ -7,7 +7,7 @@ export class LightingService {
   private light: AmbientLight
   private dirLight: DirectionalLight
   private dirLightTargetObj: Object3D
-  private engineSvc = inject(EngineService)
+  private readonly engineSvc = inject(EngineService)
 
   constructor() {
     this.light = new AmbientLight(0xffffff, 2.5)

diff --git a/frontend/src/app/world/prop-action.service.ts b/frontend/src/app/world/prop-action.service.ts
@@ -42,11 +42,11 @@ export class PropActionService {
   private textureLoader = new TextureLoader()
   private remoteUrl = /.+\..+\/.+/
   private actionParser = new Action()
-  private teleportSvc = inject(TeleportService)
-  private settings = inject(SettingsService)
-  private audioSvc = inject(AudioService)
-  private propSvc = inject(PropService)
-  private http = inject(HttpService)
+  private readonly teleportSvc = inject(TeleportService)
+  private readonly settings = inject(SettingsService)
+  private readonly audioSvc = inject(AudioService)
+  private readonly propSvc = inject(PropService)
+  private readonly http = inject(HttpService)
   private archiveApiQueue = new Subject<{
     prop: Group
     url: string

diff --git a/frontend/src/app/world/terrain.service.ts b/frontend/src/app/world/terrain.service.ts
@@ -20,9 +20,9 @@ import {TERRAIN_PAGE_SIZE, Utils} from '../utils'
 export class TerrainService {
   terrain: Group
   water: Group
-  private engineSvc = inject(EngineService)
-  private http = inject(HttpService)
-  private propSvc = inject(PropService)
+  private readonly engineSvc = inject(EngineService)
+  private readonly http = inject(HttpService)
+  private readonly propSvc = inject(PropService)
   private textureLoader = new TextureLoader()
   private terrainMaterials = []
   private waterBottomGeom: PlaneGeometry