diff --git a/addOns/externals/dicom-microscopy-viewer/package.json b/addOns/externals/dicom-microscopy-viewer/package.json index bc083c84a..c6ff1f444 100644 --- a/addOns/externals/dicom-microscopy-viewer/package.json +++ b/addOns/externals/dicom-microscopy-viewer/package.json @@ -4,6 +4,6 @@ "version": "3.12.0-beta.123", "license": "MIT", "dependencies": { - "dicom-microscopy-viewer": "0.48.6" + "dicom-microscopy-viewer": "0.48.17" } } diff --git a/bun.lock b/bun.lock index e6472787e..37e5b59b1 100644 --- a/bun.lock +++ b/bun.lock @@ -52,7 +52,7 @@ }, "addOns/externals/devDependencies": { "name": "@externals/devDependencies", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@kitware/vtk.js": "34.15.1", @@ -137,14 +137,14 @@ }, "addOns/externals/dicom-microscopy-viewer": { "name": "@externals/dicom-microscopy-viewer", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { - "dicom-microscopy-viewer": "0.48.6", + "dicom-microscopy-viewer": "0.48.17", }, }, "extensions/cornerstone": { "name": "@ohif/extension-cornerstone", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/adapters": "4.15.9", @@ -170,8 +170,8 @@ "@cornerstonejs/codec-openjpeg": "1.3.0", "@cornerstonejs/codec-openjph": "2.4.7", "@cornerstonejs/dicom-image-loader": "4.15.9", - "@ohif/core": "3.12.0-beta.122", - "@ohif/ui": "3.12.0-beta.122", + "@ohif/core": "3.12.0-beta.123", + "@ohif/ui": "3.12.0-beta.123", "dcmjs": "0.45.0", "dicom-parser": "1.8.21", "hammerjs": "2.0.8", @@ -183,7 +183,7 @@ }, "extensions/cornerstone-dicom-pmap": { "name": "@ohif/extension-cornerstone-dicom-pmap", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/adapters": "4.15.9", @@ -206,7 +206,7 @@ }, "extensions/cornerstone-dicom-rt": { "name": "@ohif/extension-cornerstone-dicom-rt", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "react-color": "2.19.3", @@ -226,7 +226,7 @@ }, "extensions/cornerstone-dicom-seg": { "name": "@ohif/extension-cornerstone-dicom-seg", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/adapters": "4.15.9", @@ -249,7 +249,7 @@ }, "extensions/cornerstone-dicom-sr": { "name": "@ohif/extension-cornerstone-dicom-sr", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/adapters": "4.15.9", @@ -258,10 +258,10 @@ "classnames": "2.5.1", }, "peerDependencies": { - "@ohif/core": "3.12.0-beta.122", - "@ohif/extension-cornerstone": "3.12.0-beta.122", - "@ohif/extension-measurement-tracking": "3.12.0-beta.122", - "@ohif/ui": "3.12.0-beta.122", + "@ohif/core": "3.12.0-beta.123", + "@ohif/extension-cornerstone": "3.12.0-beta.123", + "@ohif/extension-measurement-tracking": "3.12.0-beta.123", + "@ohif/ui": "3.12.0-beta.123", "dcmjs": "0.45.0", "dicom-parser": "1.8.21", "hammerjs": "2.0.8", @@ -271,7 +271,7 @@ }, "extensions/cornerstone-dynamic-volume": { "name": "@ohif/extension-cornerstone-dynamic-volume", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/core": "4.15.9", @@ -293,7 +293,7 @@ }, "extensions/default": { "name": "@ohif/extension-default", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/calculate-suv": "1.1.0", @@ -301,8 +301,8 @@ "lodash.uniqby": "4.7.0", }, "peerDependencies": { - "@ohif/core": "3.12.0-beta.122", - "@ohif/i18n": "3.12.0-beta.122", + "@ohif/core": "3.12.0-beta.123", + "@ohif/i18n": "3.12.0-beta.123", "dcmjs": "0.45.0", "dicomweb-client": "0.10.4", "prop-types": "15.8.1", @@ -316,7 +316,7 @@ }, "extensions/dicom-microscopy": { "name": "@ohif/extension-dicom-microscopy", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/codec-charls": "1.2.3", @@ -341,7 +341,7 @@ }, "extensions/dicom-pdf": { "name": "@ohif/extension-dicom-pdf", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "classnames": "2.5.1", @@ -358,7 +358,7 @@ }, "extensions/dicom-video": { "name": "@ohif/extension-dicom-video", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "classnames": "2.5.1", @@ -375,20 +375,20 @@ }, "extensions/measurement-tracking": { "name": "@ohif/extension-measurement-tracking", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", - "@ohif/ui": "3.12.0-beta.122", + "@ohif/ui": "3.12.0-beta.123", "@xstate/react": "3.2.2", "xstate": "4.38.3", }, "peerDependencies": { "@cornerstonejs/core": "4.15.9", "@cornerstonejs/tools": "4.15.9", - "@ohif/core": "3.12.0-beta.122", - "@ohif/extension-cornerstone-dicom-sr": "3.12.0-beta.122", - "@ohif/extension-default": "3.12.0-beta.122", - "@ohif/ui": "3.12.0-beta.122", + "@ohif/core": "3.12.0-beta.123", + "@ohif/extension-cornerstone-dicom-sr": "3.12.0-beta.123", + "@ohif/extension-default": "3.12.0-beta.123", + "@ohif/ui": "3.12.0-beta.123", "classnames": "2.5.1", "dcmjs": "0.45.0", "lodash.debounce": "4.0.8", @@ -401,7 +401,7 @@ }, "extensions/test-extension": { "name": "@ohif/extension-test", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "classnames": "2.5.1", @@ -418,7 +418,7 @@ }, "extensions/tmtv": { "name": "@ohif/extension-tmtv", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "classnames": "2.5.1", @@ -435,7 +435,7 @@ }, "extensions/usAnnotation": { "name": "@ohif/extension-ultrasound-pleura-bline", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/core": "4.15.9", @@ -487,7 +487,7 @@ }, "modes/basic": { "name": "@ohif/mode-basic", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", }, @@ -508,7 +508,7 @@ }, "modes/basic-dev-mode": { "name": "@ohif/mode-basic-dev-mode", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -528,7 +528,7 @@ }, "modes/basic-test-mode": { "name": "@ohif/mode-test", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -550,7 +550,7 @@ }, "modes/longitudinal": { "name": "@ohif/mode-longitudinal", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -574,7 +574,7 @@ }, "modes/microscopy": { "name": "@ohif/mode-microscopy", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -586,7 +586,7 @@ }, "modes/preclinical-4d": { "name": "@ohif/mode-preclinical-4d", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", }, @@ -605,7 +605,7 @@ }, "modes/segmentation": { "name": "@ohif/mode-segmentation", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -650,7 +650,7 @@ }, "modes/tmtv": { "name": "@ohif/mode-tmtv", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next": "17.3.1", @@ -671,7 +671,7 @@ }, "modes/usAnnotation": { "name": "@ohif/mode-ultrasound-pleura-bline", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/core": "4.15.9", @@ -710,7 +710,7 @@ }, "platform/app": { "name": "@ohif/app", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "@cornerstonejs/codec-charls": "1.2.3", @@ -789,7 +789,7 @@ }, "platform/cli": { "name": "@ohif/cli", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "bin": { "ohif-cli": "src/index.js", }, @@ -813,7 +813,7 @@ }, "platform/core": { "name": "@ohif/core", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "dcmjs": "0.45.0", @@ -840,14 +840,14 @@ "@cornerstonejs/codec-openjph": "2.4.7", "@cornerstonejs/core": "4.15.9", "@cornerstonejs/dicom-image-loader": "4.15.9", - "@ohif/ui": "3.12.0-beta.122", + "@ohif/ui": "3.12.0-beta.123", "cornerstone-math": "0.1.9", "dicom-parser": "1.8.21", }, }, "platform/i18n": { "name": "@ohif/i18n", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@babel/runtime": "7.28.2", "i18next-locize-backend": "2.2.2", @@ -872,7 +872,7 @@ }, "platform/ui": { "name": "@ohif/ui", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@testing-library/react": "13.4.0", "browser-detect": "0.2.28", @@ -923,7 +923,7 @@ }, "platform/ui-next": { "name": "@ohif/ui-next", - "version": "3.12.0-beta.122", + "version": "3.12.0-beta.123", "dependencies": { "@radix-ui/react-accordion": "1.2.11", "@radix-ui/react-checkbox": "1.3.2", @@ -2768,7 +2768,7 @@ "detective": ["detective@5.2.1", "", { "dependencies": { "acorn-node": "^1.8.2", "defined": "^1.0.0", "minimist": "^1.2.6" }, "bin": { "detective": "bin/detective.js" } }, "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="], - "dicom-microscopy-viewer": ["dicom-microscopy-viewer@0.48.6", "", { "dependencies": { "@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", "colormap": "^2.3", "dcmjs": "^0.41.0", "dicomicc": "^0.1", "dicomweb-client": "^0.10.3", "image-type": "^4.1", "mathjs": "^11.2", "ol": "^10.4.0", "uuid": "^9.0" } }, "sha512-cTQ14qE3zqzlH0QOIhxbrIOsLVNCV6/i9qDrIiOnmD3I1R2W6cwRN4iMgQ0c6zas/9+o645Tu37FA6BqQ3fIlg=="], + "dicom-microscopy-viewer": ["dicom-microscopy-viewer@0.48.17", "", { "dependencies": { "@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", "colormap": "^2.3", "dcmjs": "^0.41.0", "dicomicc": "^0.1", "dicomweb-client": "^0.10.3", "image-type": "^4.1", "mathjs": "^11.2", "ol": "^10.6.0", "uuid": "^9.0" } }, "sha512-lzl9wXSg5skCp93kUj+VFFydt1wSgVFIrNw/BeUsP+Im+csUukPE0l1KJPC3xbJNAfyqTCU1PZ3aYSEdVD7aCg=="], "dicom-parser": ["dicom-parser@1.8.21", "", {}, "sha512-lYCweHQDsC8UFpXErPlg86Px2A8bay0HiUY+wzoG3xv5GzgqVHU3lziwSc/Gzn7VV7y2KeP072SzCviuOoU02w=="], diff --git a/platform/docs/docs/development/link.md b/platform/docs/docs/development/link.md index 92d93eb6a..5e3692871 100644 --- a/platform/docs/docs/development/link.md +++ b/platform/docs/docs/development/link.md @@ -19,10 +19,12 @@ code linking and execution. The method to link locally using `bun` differs sligh :::tip -Linking locally with `bun` provides for running the [playwright tests](./playwright-testing.md) locally so as to include (and test) local changes from Cornerstone3D! +Linking locally with `bun` provides for running the [playwright tests](./playwright-testing.md) locally so as to include (and test) local changes from Cornerstone3D and other libraries like dicom-microscopy-viewer. ::: +### Linking Cornerstone3D + In the local Cornerstone3D, simply replace `yarn` with `bun` for each of the commands. For example, in `cornerstone/packages/core` the following would be done. ``` @@ -49,4 +51,29 @@ cornerstone packages to link locally in the `resolutions`. ... ``` -In OHIF, run `bun install -f` and then run OHIF using either `bun dev` or `bun dev:fast`. +In OHIF, run `bun install -f --config=.\bunfig.update-lockfile.toml` and then run OHIF using either `bun dev` or `bun dev:fast`. + +### Linking dicom-microscopy-viewer + +The process for linking other libraries such as the dicom-microscopy-viewer is similar to that of linking Cornerstone3D. + +``` +# In the local dicom-microscopy-viewer directory +bun unlink +bun link +bun webpack:dynamic-import:watch +``` +In OHIF, edit the root `package.json` file to include the dicom-microscopy-viewer package in the `resolutions`. The following is an example of this... + +``` + ... + "resolutions": { + "commander": "8.3.0", + "path-to-regexp": "0.1.12", + "dicom-microscopy-viewer": "link:dicom-microscopy-viewer", + ... + }, + ... +``` + +In OHIF, run `bun install -f --config=.\bunfig.update-lockfile.toml` and then run OHIF using either `bun dev` or `bun dev:fast`. diff --git a/yarn.lock b/yarn.lock index 4c810d44d..3afa50717 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7530,10 +7530,10 @@ detective@^5.2.1: defined "^1.0.0" minimist "^1.2.6" -dicom-microscopy-viewer@0.48.6: - version "0.48.6" - resolved "https://registry.yarnpkg.com/dicom-microscopy-viewer/-/dicom-microscopy-viewer-0.48.6.tgz#dc9e8f7bb86c8aabf6b24d96a46be3a9f5f4f7f1" - integrity sha512-cTQ14qE3zqzlH0QOIhxbrIOsLVNCV6/i9qDrIiOnmD3I1R2W6cwRN4iMgQ0c6zas/9+o645Tu37FA6BqQ3fIlg== +dicom-microscopy-viewer@0.48.17: + version "0.48.17" + resolved "https://registry.yarnpkg.com/dicom-microscopy-viewer/-/dicom-microscopy-viewer-0.48.17.tgz#7e2c9764a13a729f56076b2255c90939b170ac38" + integrity sha512-lzl9wXSg5skCp93kUj+VFFydt1wSgVFIrNw/BeUsP+Im+csUukPE0l1KJPC3xbJNAfyqTCU1PZ3aYSEdVD7aCg== dependencies: "@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" @@ -7545,7 +7545,7 @@ dicom-microscopy-viewer@0.48.6: dicomweb-client "^0.10.3" image-type "^4.1" mathjs "^11.2" - ol "^10.4.0" + ol "^10.6.0" uuid "^9.0" dicom-parser@1.8.21: @@ -13867,10 +13867,10 @@ oidc-client@1.11.5: crypto-js "^4.0.0" serialize-javascript "^4.0.0" -ol@^10.4.0: - version "10.6.1" - resolved "https://registry.yarnpkg.com/ol/-/ol-10.6.1.tgz#950f3914b4eec978f087b36aa74ce1e18c41ab09" - integrity sha512-xp174YOwPeLj7c7/8TCIEHQ4d41tgTDDhdv6SqNdySsql5/MaFJEJkjlsYcvOPt7xA6vrum/QG4UdJ0iCGT1cg== +ol@^10.6.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/ol/-/ol-10.7.0.tgz#6a072a602cab3a5d9b35356de8b837221d78379b" + integrity sha512-122U5gamPqNgLpLOkogFJhgpywvd/5en2kETIDW+Ubfi9lPnZ0G9HWRdG+CX0oP8od2d6u6ky3eewIYYlrVczw== dependencies: "@types/rbush" "4.0.0" earcut "^3.0.0"