From 4e16099ad3ab777b09f6ac8f181025cfd656ab6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20H=2E=20K=C3=B6hler?= Date: Tue, 18 Feb 2025 13:36:26 -0300 Subject: [PATCH] fix: lodash dependencies (#4791) --- bun.lock | 295 +++++++++--------- extensions/cornerstone/package.json | 6 +- .../src/utils/interleaveCenterLoader.ts | 4 +- .../src/utils/interleaveTopToBottom.ts | 4 +- extensions/default/package.json | 4 +- .../default/src/MergeDataSource/index.ts | 3 +- extensions/dicom-microscopy/package.json | 3 +- platform/app/package.json | 1 - platform/core/package.json | 3 +- platform/core/src/classes/HotkeysManager.ts | 4 +- platform/ui/package.json | 4 +- yarn.lock | 31 +- 12 files changed, 197 insertions(+), 165 deletions(-) diff --git a/bun.lock b/bun.lock index 30ffdf39d..4455e9817 100644 --- a/bun.lock +++ b/bun.lock @@ -32,7 +32,7 @@ }, "addOns/externals/devDependencies": { "name": "@externals/devDependencies", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@kitware/vtk.js": "32.1.1", @@ -120,14 +120,14 @@ }, "addOns/externals/dicom-microscopy-viewer": { "name": "@externals/dicom-microscopy-viewer", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "dicom-microscopy-viewer": "^0.46.1", }, }, "extensions/cornerstone": { "name": "@ohif/extension-cornerstone", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^2.19.3", @@ -137,22 +137,22 @@ "@itk-wasm/morphological-contour-interpolation": "1.1.0", "@kitware/vtk.js": "32.1.1", "html2canvas": "^1.4.1", + "lodash.compact": "^3.0.1", "lodash.debounce": "^4.0.8", + "lodash.flatten": "^4.4.0", "lodash.merge": "^4.6.2", + "lodash.zip": "^4.2.0", "shader-loader": "^1.3.1", "worker-loader": "^3.0.8", }, - "devDependencies": { - "lodash": "^4.17.21", - }, "peerDependencies": { "@cornerstonejs/codec-charls": "^1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/dicom-image-loader": "^2.19.3", - "@ohif/core": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -164,7 +164,7 @@ }, "extensions/cornerstone-dicom-pmap": { "name": "@ohif/extension-cornerstone-dicom-pmap", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^2.19.3", @@ -173,10 +173,10 @@ "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -187,16 +187,16 @@ }, "extensions/cornerstone-dicom-rt": { "name": "@ohif/extension-cornerstone-dicom-rt", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -207,7 +207,7 @@ }, "extensions/cornerstone-dicom-seg": { "name": "@ohif/extension-cornerstone-dicom-seg", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^2.19.3", @@ -216,10 +216,10 @@ "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -230,7 +230,7 @@ }, "extensions/cornerstone-dicom-sr": { "name": "@ohif/extension-cornerstone-dicom-sr", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^2.19.3", @@ -239,10 +239,10 @@ "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-measurement-tracking": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-measurement-tracking": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -252,7 +252,7 @@ }, "extensions/cornerstone-dynamic-volume": { "name": "@ohif/extension-cornerstone-dynamic-volume", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/core": "^2.19.3", @@ -260,11 +260,11 @@ "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -274,14 +274,16 @@ }, "extensions/default": { "name": "@ohif/extension-default", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/calculate-suv": "^1.1.0", + "lodash.get": "^4.4.2", + "lodash.uniqby": "^4.7.0", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", "dcmjs": "*", "dicomweb-client": "^0.10.4", "prop-types": "^15.6.2", @@ -295,20 +297,21 @@ }, "extensions/dicom-microscopy": { "name": "@ohif/extension-dicom-microscopy", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "colormap": "^2.3", + "lodash.debounce": "^4.0.8", "mathjs": "^12.4.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -319,14 +322,14 @@ }, "extensions/dicom-pdf": { "name": "@ohif/extension-dicom-pdf", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -336,14 +339,14 @@ }, "extensions/dicom-video": { "name": "@ohif/extension-dicom-video", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -353,20 +356,20 @@ }, "extensions/measurement-tracking": { "name": "@ohif/extension-measurement-tracking", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/ui": "3.10.0-beta.97", "@xstate/react": "^3.2.2", "xstate": "^4.10.0", }, "peerDependencies": { "@cornerstonejs/core": "^2.19.3", "@cornerstonejs/tools": "^2.19.3", - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "classnames": "^2.3.2", "dcmjs": "*", "lodash.debounce": "^4.0.8", @@ -379,14 +382,14 @@ }, "extensions/test-extension": { "name": "@ohif/extension-test", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "0.38.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -396,14 +399,14 @@ }, "extensions/tmtv": { "name": "@ohif/extension-tmtv", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -413,7 +416,7 @@ }, "modes/basic-dev-mode": { "name": "@ohif/mode-basic-dev-mode", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -423,17 +426,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", }, }, "modes/basic-test-mode": { "name": "@ohif/mode-test", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -443,19 +446,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", - "@ohif/extension-measurement-tracking": "3.10.0-beta.95", - "@ohif/extension-test": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", + "@ohif/extension-measurement-tracking": "3.10.0-beta.97", + "@ohif/extension-test": "3.10.0-beta.97", }, }, "modes/longitudinal": { "name": "@ohif/mode-longitudinal", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -465,32 +468,32 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", - "@ohif/extension-measurement-tracking": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", + "@ohif/extension-measurement-tracking": "3.10.0-beta.97", }, }, "modes/microscopy": { "name": "@ohif/mode-microscopy", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.97", }, }, "modes/preclinical-4d": { "name": "@ohif/mode-preclinical-4d", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", }, @@ -499,17 +502,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-tmtv": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-tmtv": "3.10.0-beta.97", }, }, "modes/segmentation": { "name": "@ohif/mode-segmentation", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -541,19 +544,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", }, }, "modes/tmtv": { "name": "@ohif/mode-tmtv", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -563,18 +566,18 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", - "@ohif/extension-measurement-tracking": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", + "@ohif/extension-measurement-tracking": "3.10.0-beta.97", }, }, "platform/app": { "name": "@ohif/app", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", @@ -583,23 +586,23 @@ "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/dicom-image-loader": "^2.19.3", "@emotion/serialize": "^1.1.3", - "@ohif/core": "3.10.0-beta.95", - "@ohif/extension-cornerstone": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.95", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.95", - "@ohif/extension-default": "3.10.0-beta.95", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.95", - "@ohif/extension-dicom-pdf": "3.10.0-beta.95", - "@ohif/extension-dicom-video": "3.10.0-beta.95", - "@ohif/extension-test": "3.10.0-beta.95", - "@ohif/i18n": "3.10.0-beta.95", - "@ohif/mode-basic-dev-mode": "3.10.0-beta.95", - "@ohif/mode-longitudinal": "3.10.0-beta.95", - "@ohif/mode-microscopy": "3.10.0-beta.95", - "@ohif/mode-test": "3.10.0-beta.95", - "@ohif/ui": "3.10.0-beta.95", - "@ohif/ui-next": "3.10.0-beta.95", + "@ohif/core": "3.10.0-beta.97", + "@ohif/extension-cornerstone": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.97", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.97", + "@ohif/extension-default": "3.10.0-beta.97", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.97", + "@ohif/extension-dicom-pdf": "3.10.0-beta.97", + "@ohif/extension-dicom-video": "3.10.0-beta.97", + "@ohif/extension-test": "3.10.0-beta.97", + "@ohif/i18n": "3.10.0-beta.97", + "@ohif/mode-basic-dev-mode": "3.10.0-beta.97", + "@ohif/mode-longitudinal": "3.10.0-beta.97", + "@ohif/mode-microscopy": "3.10.0-beta.97", + "@ohif/mode-test": "3.10.0-beta.97", + "@ohif/ui": "3.10.0-beta.97", + "@ohif/ui-next": "3.10.0-beta.97", "@svgr/webpack": "^8.1.0", "@types/react": "^18.3.3", "classnames": "^2.3.2", @@ -635,13 +638,12 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@types/node": "^20.12.12", "identity-obj-proxy": "3.0.x", - "lodash": "^4.17.21", "tailwindcss": "3.2.4", }, }, "platform/cli": { "name": "@ohif/cli", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "bin": { "ohif-cli": "src/index.js" }, @@ -665,7 +667,7 @@ }, "platform/core": { "name": "@ohif/core", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "dcmjs": "*", @@ -674,8 +676,7 @@ "immutability-helper": "^3.1.1", "isomorphic-base64": "^1.0.2", "lodash.clonedeep": "^4.5.0", - "lodash.merge": "^4.6.2", - "lodash.mergewith": "^4.6.2", + "lodash.isequal": "^4.5.0", "moment": "*", "object-hash": "2.1.1", "query-string": "^6.14.0", @@ -692,14 +693,14 @@ "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/dicom-image-loader": "^2.19.3", - "@ohif/ui": "3.10.0-beta.95", + "@ohif/ui": "3.10.0-beta.97", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21", }, }, "platform/i18n": { "name": "@ohif/i18n", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@babel/runtime": "^7.20.13", "i18next-locize-backend": "^2.0.0", @@ -724,7 +725,7 @@ }, "platform/ui": { "name": "@ohif/ui", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@testing-library/react": "^13.1.0", "browser-detect": "^0.2.28", @@ -736,7 +737,9 @@ "d3-selection": "3", "d3-shape": "3", "d3-zoom": "3", - "lodash.debounce": "4.0.8", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.merge": "^4.6.1", "moment": "*", "mousetrap": "^1.6.5", "react": "^18.3.1", @@ -782,7 +785,7 @@ }, "platform/ui-next": { "name": "@ohif/ui-next", - "version": "3.10.0-beta.95", + "version": "3.10.0-beta.97", "dependencies": { "@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-checkbox": "^1.1.1", @@ -3735,8 +3738,12 @@ "lodash.clonedeep": ["lodash.clonedeep@4.5.0", "", {}, "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="], + "lodash.compact": ["lodash.compact@3.0.1", "", {}, "sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ=="], + "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], + "lodash.flatten": ["lodash.flatten@4.4.0", "", {}, "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="], + "lodash.get": ["lodash.get@4.4.2", "", {}, "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="], "lodash.isequal": ["lodash.isequal@4.5.0", "", {}, "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="], @@ -3747,14 +3754,16 @@ "lodash.merge": ["lodash.merge@4.6.2", "", {}, "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="], - "lodash.mergewith": ["lodash.mergewith@4.6.2", "", {}, "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="], - "lodash.once": ["lodash.once@4.1.1", "", {}, "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="], "lodash.sortby": ["lodash.sortby@4.7.0", "", {}, "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="], "lodash.uniq": ["lodash.uniq@4.5.0", "", {}, "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="], + "lodash.uniqby": ["lodash.uniqby@4.7.0", "", {}, "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="], + + "lodash.zip": ["lodash.zip@4.2.0", "", {}, "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="], + "log-symbols": ["log-symbols@4.1.0", "", { "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" } }, "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="], "log-update": ["log-update@4.0.0", "", { "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", "slice-ansi": "^4.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="], diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index b612671cf..1e7a5e056 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -49,9 +49,6 @@ "react-dom": "^18.3.1", "react-resize-detector": "^10.0.1" }, - "devDependencies": { - "lodash": "^4.17.21" - }, "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^2.19.3", @@ -63,6 +60,9 @@ "html2canvas": "^1.4.1", "lodash.debounce": "^4.0.8", "lodash.merge": "^4.6.2", + "lodash.flatten": "^4.4.0", + "lodash.zip": "^4.2.0", + "lodash.compact": "^3.0.1", "shader-loader": "^1.3.1", "worker-loader": "^3.0.8" } diff --git a/extensions/cornerstone/src/utils/interleaveCenterLoader.ts b/extensions/cornerstone/src/utils/interleaveCenterLoader.ts index 16ed7eeeb..413a6a843 100644 --- a/extensions/cornerstone/src/utils/interleaveCenterLoader.ts +++ b/extensions/cornerstone/src/utils/interleaveCenterLoader.ts @@ -1,6 +1,8 @@ import { cache, imageLoadPoolManager, Enums } from '@cornerstonejs/core'; import getInterleavedFrames from './getInterleavedFrames'; -import { compact, flatten, zip } from 'lodash'; +import zip from 'lodash.zip'; +import compact from 'lodash.compact'; +import flatten from 'lodash.flatten'; // Map of volumeId and SeriesInstanceId const volumeIdMapsToLoad = new Map(); diff --git a/extensions/cornerstone/src/utils/interleaveTopToBottom.ts b/extensions/cornerstone/src/utils/interleaveTopToBottom.ts index 9caad9087..8ef729b00 100644 --- a/extensions/cornerstone/src/utils/interleaveTopToBottom.ts +++ b/extensions/cornerstone/src/utils/interleaveTopToBottom.ts @@ -1,5 +1,7 @@ import { cache, imageLoadPoolManager, Enums } from '@cornerstonejs/core'; -import { compact, flatten, zip } from 'lodash'; +import zip from 'lodash.zip'; +import compact from 'lodash.compact'; +import flatten from 'lodash.flatten'; // Map of volumeId and SeriesInstanceId const volumeIdMapsToLoad = new Map(); diff --git a/extensions/default/package.json b/extensions/default/package.json index b2728089f..8c413494a 100644 --- a/extensions/default/package.json +++ b/extensions/default/package.json @@ -46,6 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/calculate-suv": "^1.1.0" + "@cornerstonejs/calculate-suv": "^1.1.0", + "lodash.get": "^4.4.2", + "lodash.uniqby": "^4.7.0" } } diff --git a/extensions/default/src/MergeDataSource/index.ts b/extensions/default/src/MergeDataSource/index.ts index 607427b5c..92f54151d 100644 --- a/extensions/default/src/MergeDataSource/index.ts +++ b/extensions/default/src/MergeDataSource/index.ts @@ -1,5 +1,6 @@ import { DicomMetadataStore, IWebApiDataSource } from '@ohif/core'; -import { get, uniqBy } from 'lodash'; +import get from 'lodash.get'; +import uniqBy from 'lodash.uniqby'; import { MergeConfig, CallForAllDataSourcesAsyncOptions, diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json index ee25ceace..a1f743a64 100644 --- a/extensions/dicom-microscopy/package.json +++ b/extensions/dicom-microscopy/package.json @@ -47,6 +47,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "colormap": "^2.3", - "mathjs": "^12.4.2" + "mathjs": "^12.4.2", + "lodash.debounce": "^4.0.8" } } diff --git a/platform/app/package.json b/platform/app/package.json index 1d005b48a..e0d8afbf9 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -108,7 +108,6 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@types/node": "^20.12.12", "identity-obj-proxy": "3.0.x", - "lodash": "^4.17.21", "tailwindcss": "3.2.4" } } diff --git a/platform/core/package.json b/platform/core/package.json index e6e3641ec..342715f04 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -50,8 +50,7 @@ "immutability-helper": "^3.1.1", "isomorphic-base64": "^1.0.2", "lodash.clonedeep": "^4.5.0", - "lodash.merge": "^4.6.2", - "lodash.mergewith": "^4.6.2", + "lodash.isequal": "^4.5.0", "moment": "*", "object-hash": "2.1.1", "query-string": "^6.14.0", diff --git a/platform/core/src/classes/HotkeysManager.ts b/platform/core/src/classes/HotkeysManager.ts index b7ca44308..64d2b0f81 100644 --- a/platform/core/src/classes/HotkeysManager.ts +++ b/platform/core/src/classes/HotkeysManager.ts @@ -1,6 +1,6 @@ import objectHash from 'object-hash'; +import isEqual from 'lodash.isequal'; import { hotkeys } from '../utils'; -import isequal from 'lodash.isequal'; import Hotkey from './Hotkey'; /** @@ -65,7 +65,7 @@ export class HotkeysManager { setHotkeys(hotkeyDefinitions = [], name = 'hotkey-definitions') { try { const definitions = this.getValidDefinitions(hotkeyDefinitions); - if (isequal(definitions, this.hotkeyDefaults)) { + if (isEqual(definitions, this.hotkeyDefaults)) { localStorage.removeItem(name); } else { localStorage.setItem(name, JSON.stringify(definitions)); diff --git a/platform/ui/package.json b/platform/ui/package.json index a9452ca36..c7f69acd9 100644 --- a/platform/ui/package.json +++ b/platform/ui/package.json @@ -43,7 +43,9 @@ "d3-selection": "3", "d3-shape": "3", "d3-zoom": "3", - "lodash.debounce": "4.0.8", + "lodash.debounce": "^4.0.8", + "lodash.clonedeep": "^4.5.0", + "lodash.merge": "^4.6.1", "moment": "*", "mousetrap": "^1.6.5", "react": "^18.3.1", diff --git a/yarn.lock b/yarn.lock index af4dc7871..b32777dd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13952,17 +13952,27 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== -lodash.debounce@4.0.8, lodash.debounce@^4.0.8: +lodash.compact@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5" + integrity sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ== + +lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g== + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== -lodash.isequal@4.5.0: +lodash.isequal@4.5.0, lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== @@ -13977,16 +13987,11 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== -lodash.merge@^4.6.2: +lodash.merge@^4.6.1, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.mergewith@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" - integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== - lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" @@ -14002,6 +14007,16 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== +lodash.uniqby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" + integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww== + +lodash.zip@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" + integrity sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg== + lodash@^4.0.1, lodash@^4.1.1, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"