From 53ed57dfa6e611b259c0efc9b14c0b1a09596247 Mon Sep 17 00:00:00 2001 From: Edward Moyse Date: Tue, 9 Jan 2024 14:49:43 +0100 Subject: [PATCH 1/2] Update Phoenix to three 0.160.0 --- packages/phoenix-event-display/package.json | 2 +- packages/phoenix-ng/package.json | 2 +- .../projects/phoenix-ui-components/package.json | 2 +- yarn.lock | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/phoenix-event-display/package.json b/packages/phoenix-event-display/package.json index a17fcd36..9a60419d 100644 --- a/packages/phoenix-event-display/package.json +++ b/packages/phoenix-event-display/package.json @@ -45,7 +45,7 @@ "jsroot": "^7.4.1", "jszip": "^3.10.1", "stats-js": "^1.0.1", - "three": "^0.155.0" + "three": "^0.160.0" }, "devDependencies": { "@babel/helper-string-parser": "^7.22.5", diff --git a/packages/phoenix-ng/package.json b/packages/phoenix-ng/package.json index a24c3d31..fb1181cf 100644 --- a/packages/phoenix-ng/package.json +++ b/packages/phoenix-ng/package.json @@ -40,7 +40,7 @@ "phoenix-ui-components": "^2.14.1", "qrcode": "1.5.3", "rxjs": "^7.8.1", - "three": "^0.155.0", + "three": "^0.160.0", "tslib": "^2.6.1", "typescript": "~5.1.6", "zone.js": "^0.13.1" diff --git a/packages/phoenix-ng/projects/phoenix-ui-components/package.json b/packages/phoenix-ng/projects/phoenix-ui-components/package.json index fc01deee..6f0ba275 100644 --- a/packages/phoenix-ng/projects/phoenix-ui-components/package.json +++ b/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.155.0", + "three": "^0.160.0", "tslib": "^2.6.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index ad015008..9a62b658 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16214,7 +16214,7 @@ cors@latest: jsroot: ^7.4.1 jszip: ^3.10.1 stats-js: ^1.0.1 - three: ^0.155.0 + three: ^0.160.0 ts-jest: ~29.1.1 typescript: ~5.1.6 webpack: ^5.88.2 @@ -16254,7 +16254,7 @@ cors@latest: phoenix-ui-components: ^2.14.1 qrcode: 1.5.3 rxjs: ^7.8.1 - three: ^0.155.0 + three: ^0.160.0 tslib: ^2.6.1 typescript: ~5.1.6 zone.js: ^0.13.1 @@ -16274,7 +16274,7 @@ cors@latest: node-fetch: ^3.3.2 qrcode: 1.5.3 rxjs: ^7.8.1 - three: ^0.155.0 + three: ^0.160.0 tslib: ^2.6.1 peerDependencies: "@angular/common": "*" @@ -18743,10 +18743,10 @@ proxy-middleware@latest: languageName: node linkType: hard -"three@npm:^0.155.0": - version: 0.155.0 - resolution: "three@npm:0.155.0" - checksum: 55de8af716686be2159b2ff407501ce2e6418b7d16a8dc57f3dcf9f08c4a6bedf0623fa8ddb67c1ae6f679d7ca53cfa0c64bab6b0577d6c467618389d5561211 +"three@npm:^0.160.0": + version: 0.160.0 + resolution: "three@npm:0.160.0" + checksum: ae9aadbcdfcbf2afdfeebc376abacd980c4cbcd0177dbe56e1420305bcc3dea9115b865932937b74445d937f463623a496e9784c39e238b32f982d6a22c6311d languageName: node linkType: hard From 1e6e340b47e223b0236bfa937bed3b5931f2dadb Mon Sep 17 00:00:00 2001 From: Edward Moyse Date: Tue, 9 Jan 2024 16:02:12 +0100 Subject: [PATCH 2/2] CI fixes --- .../src/tests/helpers/coordinate-helper.test.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/phoenix-event-display/src/tests/helpers/coordinate-helper.test.ts b/packages/phoenix-event-display/src/tests/helpers/coordinate-helper.test.ts index 23e5443d..d679e4af 100644 --- a/packages/phoenix-event-display/src/tests/helpers/coordinate-helper.test.ts +++ b/packages/phoenix-event-display/src/tests/helpers/coordinate-helper.test.ts @@ -24,9 +24,9 @@ describe('CoordinateHelper', () => { const theta = 0.705026843555238; const phi = 0.0; const vector = CoordinateHelper.sphericalToCartesian(radius, theta, phi); - expect(vector.x).toBe(0.6480542736638852); - expect(vector.y).toBe(-1.3183898417423734e-16); - expect(vector.z).toBe(0.7615941559557646); + expect(vector.x).toBe(0.6480542736638853); + expect(vector.y).toBe(5.551115123125783e-17); + expect(vector.z).toBe(0.7615941559557647); }); it('should get cartesian from eta/phi parameters', () => { @@ -34,9 +34,9 @@ describe('CoordinateHelper', () => { const eta = 1.0; const phi = 0.0; const vector = CoordinateHelper.etaPhiToCartesian(radius, eta, phi); - expect(vector.x).toBe(0.6480542736638852); - expect(vector.y).toBe(-1.3183898417423734e-16); - expect(vector.z).toBe(0.7615941559557646); + expect(vector.x).toBe(0.6480542736638853); + expect(vector.y).toBe(5.551115123125783e-17); + expect(vector.z).toBe(0.7615941559557647); }); it('should return the Quaternion to rotate to ATLAS coordinates', () => {