Merge pull request #696 from HSF/dep_updated_nov24

README.md

@@ -60,8 +60,15 @@ yarn install
 # For macOS you must install the following:
 # brew install pkg-config cairo pango libpng jpeg giflib librsvg pixman
 
+# For Ubuntu, you may need to install:
+# sudo apt-get install xserver-xorg-dev libxi-dev libxext-dev -y
+# Also, if gyp fails with not being able to find python:
+# sudo ln -s  /usr/bin/python2 /usr/bin/python
+
 # Run phoenix-event-display and phoenix-app in development/watch mode
 yarn start
+# If this does not do anything, make sure you have not missed a warning.
+# e.g. if you are using an older version of node (we are currently using v20), then it may not work
 ```
 
 Now both the `phoenix-event-display` and `phoenix-app` will start in development/watch mode. Any changes made to the `phoenix-event-display` will rebuild and hot reload the `phoenix-app`. You can access the app by navigating to [`http://localhost:4200`](http://localhost:4200) on the browser.

package.json

@@ -23,24 +23,24 @@
     "docs:coverage": "yarn workspace phoenix-event-display docs:coverage"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.1.1",
+    "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.9.1",
-    "@types/jest": "~29.5.12",
-    "@types/node": "^22.5.2",
-    "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^8.4.0",
-    "eslint": "^9.9.1",
+    "@eslint/js": "^9.14.0",
+    "@types/jest": "~29.5.14",
+    "@types/node": "^22.9.0",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.14.0",
+    "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "husky": "^9.1.5",
+    "husky": "^9.1.6",
     "jest": "~29.7.0",
     "jest-environment-jsdom": "~29.7.0",
-    "lerna": "^8.1.8",
+    "lerna": "^8.1.9",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
-    "ts-jest-mock-import-meta": "^1.2.0",
+    "ts-jest-mock-import-meta": "^1.2.1",
     "typescript": "~5.5.4"
   },
   "packageManager": "[email protected]",

packages/phoenix-event-display/package.json

@@ -38,26 +38,26 @@
     "eslint:fix": "yarn eslint --fix"
   },
   "dependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.26.0",
     "@tweenjs/tween.js": "^23.1.2",
     "dat.gui": "^0.7.9",
     "html2canvas": "^1.4.1",
-    "jsroot": "^7.7.3",
+    "jsroot": "^7.8.0",
     "jszip": "^3.10.1",
     "stats-js": "^1.0.1",
-    "three": "^0.168.0"
+    "three": "^0.170.0"
   },
   "devDependencies": {
-    "@babel/helper-string-parser": "^7.24.8",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@compodoc/compodoc": "^1.1.25",
+    "@babel/helper-string-parser": "^7.25.9",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@compodoc/compodoc": "^1.1.26",
     "@types/dat.gui": "^0.7.13",
-    "@types/three": "^0.168.0",
+    "@types/three": "^0.170.0",
     "esbuild-loader": "^4.2.2",
     "jest": "^29.7.0",
     "ts-jest": "~29.2.5",
     "typescript": "~5.5.4",
-    "webpack": "^5.94.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   },
   "peerDependencies": {

packages/phoenix-event-display/src/loaders/objects/tracks.ts

@@ -230,6 +230,10 @@ export class TracksMaterial extends ShaderMaterial {
   /** If the material is of track. */
   isTracksMaterial: boolean;
 
+  static get type() {
+    return 'TracksMaterial';
+  }
+
   /**
    * Create the tracks material.
    * @param params Params for creating the tracks material.
@@ -248,7 +252,6 @@ export class TracksMaterial extends ShaderMaterial {
       fragmentShader: tracks_vert,
     });
     this.isTracksMaterial = true;
-    this.type = 'TracksMaterial';
 
     Object.defineProperties(this, {
       lineWidth: {

packages/phoenix-event-display/src/managers/three-manager/controls-manager.ts

@@ -162,21 +162,21 @@ export class ControlsManager {
    * @returns Currently active camera.
    */
   getActiveCamera(): Camera {
-    return this.activeControls.object;
+    return this.activeControls.object as Camera;
   }
   /**
    * Get the main camera.
    * @returns Main camera.
    */
   getMainCamera(): Camera {
-    return this.mainControls.object;
+    return this.mainControls.object as Camera;
   }
   /**
    * Get the camera for overlay.
    * @returns The camera for overlay.
    */
   getOverlayCamera(): Camera {
-    return this.overlayControls.object;
+    return this.overlayControls.object as Camera;
   }
   /**
    * Get the main and overlay cameras.

packages/phoenix-ng/package.json

@@ -24,38 +24,38 @@
     "deploy:web:single": "ng build phoenix-app --configuration singleEvent --output-path ./docs --base-href \"./\" && cp ./docs/index.html ./docs/404.html"
   },
   "dependencies": {
-    "@angular/animations": "^18.2.2",
-    "@angular/cdk": "^18.2.2",
-    "@angular/common": "^18.2.2",
-    "@angular/compiler": "^18.2.2",
-    "@angular/core": "^18.2.2",
-    "@angular/forms": "^18.2.2",
-    "@angular/material": "^18.2.2",
-    "@angular/platform-browser": "^18.2.2",
-    "@angular/platform-browser-dynamic": "^18.2.2",
-    "@angular/router": "^18.2.2",
+    "@angular/animations": "^18.2.11",
+    "@angular/cdk": "^18.2.12",
+    "@angular/common": "^18.2.11",
+    "@angular/compiler": "^18.2.11",
+    "@angular/core": "^18.2.11",
+    "@angular/forms": "^18.2.11",
+    "@angular/material": "^18.2.12",
+    "@angular/platform-browser": "^18.2.11",
+    "@angular/platform-browser-dynamic": "^18.2.11",
+    "@angular/router": "^18.2.11",
     "css-element-queries": "^1.2.3",
     "cypress-plugin-snapshots": "https://github.com/meinaart/cypress-plugin-snapshots.git",
     "jszip": "^3.10.1",
     "phoenix-event-display": "^2.16.0",
     "phoenix-ui-components": "^2.16.0",
     "qrcode": "1.5.4",
     "rxjs": "^7.8.1",
-    "three": "^0.168.0",
-    "tslib": "^2.7.0",
+    "three": "^0.170.0",
+    "tslib": "^2.8.1",
     "typescript": "~5.5.4",
     "zone.js": "^0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.2.2",
-    "@angular/cli": "~18.2.2",
-    "@angular/compiler-cli": "~18.2.2",
-    "@angular/language-service": "^18.2.2",
+    "@angular-devkit/build-angular": "^18.2.11",
+    "@angular/cli": "~18.2.11",
+    "@angular/compiler-cli": "~18.2.11",
+    "@angular/language-service": "^18.2.11",
     "@types/qrcode": "^1.5.5",
     "concurrently": "^8.2.2",
-    "cypress": "^13.14.1",
+    "cypress": "^13.15.2",
     "jest": "^29.7.0",
-    "jest-preset-angular": "^14.2.2",
+    "jest-preset-angular": "^14.2.4",
     "ng-packagr": "^18.2.1",
     "ts-jest": "^29.2.5"
   },

packages/phoenix-ng/projects/phoenix-ui-components/package.json

@@ -25,16 +25,16 @@
     "zone.js": "*"
   },
   "dependencies": {
-    "@angular/animations": "^18.2.2",
-    "@angular/cdk": "^18.2.2",
-    "@angular/forms": "^18.2.2",
-    "@angular/material": "^18.2.2",
-    "@angular/platform-browser": "^18.2.2",
+    "@angular/animations": "^18.2.11",
+    "@angular/cdk": "^18.2.12",
+    "@angular/forms": "^18.2.11",
+    "@angular/material": "^18.2.12",
+    "@angular/platform-browser": "^18.2.11",
     "css-element-queries": "^1.2.3",
     "qrcode": "1.5.4",
     "rxjs": "^7.8.1",
-    "three": "^0.168.0",
-    "tslib": "^2.7.0"
+    "three": "^0.170.0",
+    "tslib": "^2.8.1"
   },
   "devDependencies": {
     "node-fetch": "^3.3.2",