Skip to content

Commit

Permalink
Merge pull request #672 from HSF/fix_deps2
Browse files Browse the repository at this point in the history
Dependency updates
  • Loading branch information
EdwardMoyse authored Jul 29, 2024
2 parents 03ae5af + f37fc97 commit c9379f3
Show file tree
Hide file tree
Showing 6 changed files with 925 additions and 591 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"devDependencies": {
"@types/jest": "~29.5.12",
"@types/node": "^20.14.2",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.11",
"eslint-plugin-prettier": "^5.2.1",
"husky": "^9.1.3",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"lerna": "^8.1.4",
"lerna": "^8.1.7",
"lint-staged": "^15.2.7",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"ts-jest-mock-import-meta": "^1.2.0",
"typescript": "~5.4.5"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/phoenix-event-display/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@tweenjs/tween.js": "^23.1.2",
"dat.gui": "^0.7.9",
"html2canvas": "^1.4.1",
"jsroot": "^7.7.1",
"jsroot": "^7.7.2",
"jszip": "^3.10.1",
"stats-js": "^1.0.1",
"three": "^0.165.0"
Expand All @@ -53,11 +53,11 @@
"@compodoc/compodoc": "^1.1.25",
"@types/dat.gui": "^0.7.13",
"@types/three": "^0.165.0",
"esbuild-loader": "^4.1.0",
"esbuild-loader": "^4.2.2",
"jest": "^29.7.0",
"ts-jest": "~29.1.4",
"ts-jest": "~29.2.3",
"typescript": "~5.4.5",
"webpack": "^5.92.0",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ export class PhoenixObjects {

// if radius is not part of clusterParams then set it to defaultRadius (if cylindrical is false), or radius+defaultZ otherwise
const radius = cylindrical
? clusterParams.radius ?? defaultRadius + defaultZ
: clusterParams.radius ?? defaultRadius;
? (clusterParams.radius ?? defaultRadius + defaultZ)
: (clusterParams.radius ?? defaultRadius);

const position = CoordinateHelper.sphericalToCartesian(
radius,
Expand Down
8 changes: 4 additions & 4 deletions packages/phoenix-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"three": "^0.165.0",
"tslib": "^2.6.3",
"typescript": "~5.4.5",
"zone.js": "^0.14.7"
"zone.js": "^0.14.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.8",
Expand All @@ -53,11 +53,11 @@
"@angular/language-service": "^17.3.11",
"@types/qrcode": "^1.5.5",
"concurrently": "^8.2.2",
"cypress": "^13.11.0",
"cypress": "^13.13.1",
"jest": "^29.7.0",
"jest-preset-angular": "^14.1.0",
"jest-preset-angular": "^14.2.0",
"ng-packagr": "^17.3.0",
"ts-jest": "^29.1.4"
"ts-jest": "^29.2.3"
},
"peerDependencies": {
"jspdf": "*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"node-fetch": "^3.3.2",
"rimraf": "^5.0.7"
"rimraf": "^5.0.9"
},
"module": "dist/fesm2022/phoenix-ui-components.mjs",
"typings": "dist/index.d.ts",
Expand Down
Loading

0 comments on commit c9379f3

Please sign in to comment.