Merge pull request #637 from HSF/main-update-deps

Main update deps

.yarnrc.yml

@@ -7,3 +7,9 @@ plugins:
 yarnPath: .yarn/releases/yarn-3.3.1.cjs
 
 checksumBehavior: update
+
+packageExtensions:
+  "jsroot@*":
+    dependencies:
+      jspdf: "*"
+      svg2pdf.js: "*"

package.json

@@ -25,7 +25,6 @@
   "devDependencies": {
     "@types/jest": "~29.5.3",
     "@types/node": "^20.4.9",
-    "@types/three": "^0.155.0",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "eslint": "^8.46.0",
@@ -41,5 +40,8 @@
     "ts-jest-mock-import-meta": "^1.0.0",
     "typescript": "~5.1.6"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "peerDependencies": {
+    "ts-jest": "*"
+  }
 }

packages/phoenix-event-display/package.json

@@ -42,22 +42,25 @@
     "@tweenjs/tween.js": "^21.0.0",
     "dat.gui": "^0.7.9",
     "html2canvas": "^1.4.1",
-    "jsroot": "^7.4.1",
+    "jsroot": "^7.6.0",
     "jszip": "^3.10.1",
     "stats-js": "^1.0.1",
-    "three": "^0.160.0"
+    "three": "^0.162.0"
   },
   "devDependencies": {
     "@babel/helper-string-parser": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
     "@compodoc/compodoc": "^1.1.21",
     "@types/dat.gui": "^0.7.10",
-    "@types/three": "^0.155.0",
+    "@types/three": "^0.162.0",
     "esbuild-loader": "^3.1.0",
     "jest": "^29.6.2",
     "ts-jest": "~29.1.1",
     "typescript": "~5.1.6",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4"
+  },
+  "peerDependencies": {
+    "jspdf": "*"
   }
 }

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

@@ -355,7 +355,6 @@ export class PhoenixObjects {
     geometry.computeBoundingSphere();
     // material
     const color = hitsParams[0].color ?? EVENT_DATA_TYPE_COLORS.Hits;
-    console.log('color', color);
     const material = new PointsMaterial({
       size: 10,
       color: parseInt(hitsParams[0].color) ?? EVENT_DATA_TYPE_COLORS.Hits,

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

@@ -3,6 +3,7 @@ import { Tween, update as tweenUpdate } from '@tweenjs/tween.js';
 import {
   Group,
   Object3D,
+  Object3DEventMap,
   Vector3,
   Plane,
   Quaternion,
@@ -86,9 +87,13 @@ export class ThreeManager {
   /** Loop to run for each frame to update stats. */
   private uiLoop: () => void;
   /** Function to check if the object intersected with raycaster is an event data */
-  private isEventData: (elem: Intersection<Object3D<Event>>) => boolean;
+  private isEventData: (
+    elem: Intersection<Object3D<Object3DEventMap>>,
+  ) => boolean;
   /** Function to check if the object intersected with raycaster is visible or lies in the clipped region */
-  private isVisible: (elem: Intersection<Object3D<Event>>) => boolean;
+  private isVisible: (
+    elem: Intersection<Object3D<Object3DEventMap>>,
+  ) => boolean;
   /** 'click' event listener callback to show 3D coordinates of the clicked point */
   private show3DPointsCallback: (event: MouseEvent) => void;
   /** 'click' event listener callback to shift the cartesian grid at the clicked point */
@@ -341,7 +346,7 @@ export class ThreeManager {
   /**
    * Returns the mainIntersect upon clicking a point
    */
-  private getMainIntersect(event): Intersection<Object3D<Event>> {
+  private getMainIntersect(event): Intersection<Object3D<Object3DEventMap>> {
     const camera = this.controlsManager.getMainCamera();
     const scene = this.sceneManager.getScene();
     const raycaster = new Raycaster();

packages/phoenix-ng/package.json

@@ -35,12 +35,12 @@
     "@angular/platform-browser-dynamic": "^16.1.8",
     "@angular/router": "^16.1.8",
     "css-element-queries": "^1.2.3",
-    "cypress-plugin-snapshots": "^1.4.4",
+    "cypress-plugin-snapshots": "meinaart/cypress-plugin-snapshots#a8bd88380db56905f5df6fe27cb4eddb7b809b9e",
     "phoenix-event-display": "^2.14.1",
     "phoenix-ui-components": "^2.14.1",
     "qrcode": "1.5.3",
     "rxjs": "^7.8.1",
-    "three": "^0.160.0",
+    "three": "^0.162.0",
     "tslib": "^2.6.1",
     "typescript": "~5.1.6",
     "zone.js": "^0.13.1"
@@ -57,6 +57,10 @@
     "cypress": "^12.17.3",
     "jest": "^29.6.2",
     "jest-preset-angular": "^13.1.1",
-    "ng-packagr": "^16.1.0"
+    "ng-packagr": "^16.1.0",
+    "ts-jest": "^29.1.2"
+  },
+  "peerDependencies": {
+    "jspdf": "*"
   }
 }

packages/phoenix-ng/projects/phoenix-ui-components/lib/components/ui-menu/geometry-browser/geometry-browser-overlay/geometry-browser-overlay.component.test.ts

@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { GeometryBrowserOverlayComponent } from './geometry-browser-overlay.component';
 import { EventDisplayService, PhoenixUIModule } from 'phoenix-ui-components';
 import { ActiveVariable } from 'phoenix-event-display';
-import { Object3D, Event } from 'three';
+import { Object3D, Object3DEventMap } from 'three';
 
 describe('GeometryBrowserOverlayComponent', () => {
   let component: GeometryBrowserOverlayComponent;
@@ -80,7 +80,7 @@ describe('GeometryBrowserOverlayComponent', () => {
 
     component.changeCollection(mockSelectedValue);
 
-    const children: Object3D<Event>[] = [];
+    const children: Object3D<Object3DEventMap>[] = [];
 
     for (const child of mockChildren) {
       if (child.name === mockSelectedValue) {

packages/phoenix-ng/projects/phoenix-ui-components/lib/components/ui-menu/geometry-browser/geometry-browser-overlay/geometry-browser-overlay.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { ActiveVariable } from 'phoenix-event-display';
 import { EventDisplayService } from '../../../../services/event-display.service';
-import { Object3D, Event } from 'three';
+import { Object3D, Object3DEventMap } from 'three';
 
 @Component({
   selector: 'app-geometry-browser-overlay',
@@ -13,7 +13,7 @@ export class GeometryBrowserOverlayComponent implements OnInit {
   selectedCollection: string;
   showingCollection: any;
   activeObject: ActiveVariable<string>;
-  children: Object3D<Event>[];
+  children: Object3D<Object3DEventMap>[];
 
   constructor(private eventDisplay: EventDisplayService) {}
 

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

@@ -33,7 +33,7 @@
     "css-element-queries": "^1.2.3",
     "qrcode": "1.5.3",
     "rxjs": "^7.8.1",
-    "three": "^0.160.0",
+    "three": "^0.162.0",
     "tslib": "^2.6.1"
   },
   "devDependencies": {