From 4a59126dd9aad6b10538e46e17415654b219e2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Alves=20de=20Faria=20Resende?= Date: Fri, 11 Jul 2025 17:36:49 -0300 Subject: [PATCH] fix(UnitTests): Fixing "Cannot find module @cornerstonejs/core" error while running unit tests (#5148) --- babel.config.js | 3 + bun.lock | 306 +++++++++--------- extensions/default/jest.config.js | 4 +- extensions/default/package.json | 4 +- .../default/src/utils/getDirectURL.test.ts | 2 +- .../validations/areAllImageDimensionsEqual.ts | 4 +- jest.config.base.js | 6 +- package.json | 13 +- platform/core/src/utils/index.ts | 3 + 9 files changed, 181 insertions(+), 164 deletions(-) diff --git a/babel.config.js b/babel.config.js index 1f396d616..b7871a95a 100644 --- a/babel.config.js +++ b/babel.config.js @@ -18,6 +18,8 @@ module.exports = { { modules: 'commonjs', debug: false, + targets: { node: 'current' }, + bugfixes: true, }, ], '@babel/preset-react', @@ -32,6 +34,7 @@ module.exports = { '@babel/plugin-transform-runtime', '@babel/plugin-transform-typescript', '@babel/plugin-transform-class-static-block', + '@babel/plugin-transform-for-of', ], }, production: { diff --git a/bun.lock b/bun.lock index 232cb21b9..829240cb2 100644 --- a/bun.lock +++ b/bun.lock @@ -11,6 +11,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.16.7", "@babel/plugin-transform-class-properties": "^7.27.1", + "@babel/plugin-transform-for-of": "^7.27.1", "@babel/plugin-transform-object-rest-spread": "^7.28.0", "@babel/plugin-transform-private-methods": "^7.27.1", "@babel/plugin-transform-private-property-in-object": "^7.27.1", @@ -40,7 +41,7 @@ }, "addOns/externals/devDependencies": { "name": "@externals/devDependencies", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@kitware/vtk.js": "32.12.0", @@ -127,14 +128,14 @@ }, "addOns/externals/dicom-microscopy-viewer": { "name": "@externals/dicom-microscopy-viewer", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "dicom-microscopy-viewer": "^0.46.1", }, }, "extensions/cornerstone": { "name": "@ohif/extension-cornerstone", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^3.30.0", @@ -160,8 +161,8 @@ "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/dicom-image-loader": "^3.30.0", - "@ohif/core": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -173,7 +174,7 @@ }, "extensions/cornerstone-dicom-pmap": { "name": "@ohif/extension-cornerstone-dicom-pmap", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^3.30.0", @@ -182,10 +183,10 @@ "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -196,16 +197,16 @@ }, "extensions/cornerstone-dicom-rt": { "name": "@ohif/extension-cornerstone-dicom-rt", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -216,7 +217,7 @@ }, "extensions/cornerstone-dicom-seg": { "name": "@ohif/extension-cornerstone-dicom-seg", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^3.30.0", @@ -225,10 +226,10 @@ "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -239,7 +240,7 @@ }, "extensions/cornerstone-dicom-sr": { "name": "@ohif/extension-cornerstone-dicom-sr", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/adapters": "^3.30.0", @@ -248,10 +249,10 @@ "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-measurement-tracking": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-measurement-tracking": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -261,7 +262,7 @@ }, "extensions/cornerstone-dynamic-volume": { "name": "@ohif/extension-cornerstone-dynamic-volume", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/core": "^3.30.0", @@ -269,11 +270,11 @@ "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -283,7 +284,7 @@ }, "extensions/default": { "name": "@ohif/extension-default", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/calculate-suv": "^1.1.0", @@ -291,8 +292,8 @@ "lodash.uniqby": "^4.7.0", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicomweb-client": "^0.10.4", "prop-types": "^15.6.2", @@ -306,7 +307,7 @@ }, "extensions/dicom-microscopy": { "name": "@ohif/extension-dicom-microscopy", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", @@ -317,10 +318,10 @@ "mathjs": "^12.4.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -331,14 +332,14 @@ }, "extensions/dicom-pdf": { "name": "@ohif/extension-dicom-pdf", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -348,14 +349,14 @@ }, "extensions/dicom-video": { "name": "@ohif/extension-dicom-video", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -365,20 +366,20 @@ }, "extensions/measurement-tracking": { "name": "@ohif/extension-measurement-tracking", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/ui": "3.11.0-beta.81", "@xstate/react": "^3.2.2", "xstate": "^4.10.0", }, "peerDependencies": { "@cornerstonejs/core": "^3.30.0", "@cornerstonejs/tools": "^3.30.0", - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "classnames": "^2.3.2", "dcmjs": "^0.42.0", "lodash.debounce": "^4.0.8", @@ -391,14 +392,14 @@ }, "extensions/test-extension": { "name": "@ohif/extension-test", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -408,14 +409,14 @@ }, "extensions/tmtv": { "name": "@ohif/extension-tmtv", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", "dcmjs": "^0.42.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -425,16 +426,16 @@ }, "extensions/usAnnotation": { "name": "@ohif/extension-ultrasound-pleura-bline", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/core": "^3.16.0", "@cornerstonejs/tools": "^3.16.0", - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", - "@ohif/ui-next": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", + "@ohif/ui-next": "3.11.0-beta.81", }, "devDependencies": { "@babel/core": "7.28.0", @@ -477,7 +478,7 @@ }, "modes/basic-dev-mode": { "name": "@ohif/mode-basic-dev-mode", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -487,17 +488,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", }, }, "modes/basic-test-mode": { "name": "@ohif/mode-test", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -507,19 +508,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", - "@ohif/extension-measurement-tracking": "3.11.0-beta.79", - "@ohif/extension-test": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", + "@ohif/extension-measurement-tracking": "3.11.0-beta.81", + "@ohif/extension-test": "3.11.0-beta.81", }, }, "modes/longitudinal": { "name": "@ohif/mode-longitudinal", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -529,32 +530,32 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", - "@ohif/extension-measurement-tracking": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", + "@ohif/extension-measurement-tracking": "3.11.0-beta.81", }, }, "modes/microscopy": { "name": "@ohif/mode-microscopy", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-dicom-microscopy": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-dicom-microscopy": "3.11.0-beta.81", }, }, "modes/preclinical-4d": { "name": "@ohif/mode-preclinical-4d", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", }, @@ -563,17 +564,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dynamic-volume": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-tmtv": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dynamic-volume": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-tmtv": "3.11.0-beta.81", }, }, "modes/segmentation": { "name": "@ohif/mode-segmentation", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -605,19 +606,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", }, }, "modes/tmtv": { "name": "@ohif/mode-tmtv", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -627,25 +628,25 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", - "@ohif/extension-measurement-tracking": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", + "@ohif/extension-measurement-tracking": "3.11.0-beta.81", }, }, "modes/usAnnotation": { "name": "@ohif/mode-ultrasound-pleura-bline", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/core": "^3.16.0", "@cornerstonejs/tools": "^3.16.0", - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-ultrasound-pleura-bline": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-ultrasound-pleura-bline": "3.11.0-beta.81", "i18next": "^17.0.3", }, "devDependencies": { @@ -677,7 +678,7 @@ }, "platform/app": { "name": "@ohif/app", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", @@ -686,25 +687,25 @@ "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/dicom-image-loader": "^3.30.0", "@emotion/serialize": "^1.1.3", - "@ohif/core": "3.11.0-beta.79", - "@ohif/extension-cornerstone": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.79", - "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.79", - "@ohif/extension-default": "3.11.0-beta.79", - "@ohif/extension-dicom-microscopy": "3.11.0-beta.79", - "@ohif/extension-dicom-pdf": "3.11.0-beta.79", - "@ohif/extension-dicom-video": "3.11.0-beta.79", - "@ohif/extension-test": "3.11.0-beta.79", - "@ohif/extension-ultrasound-pleura-bline": "3.11.0-beta.79", - "@ohif/i18n": "3.11.0-beta.79", - "@ohif/mode-basic-dev-mode": "3.11.0-beta.79", - "@ohif/mode-longitudinal": "3.11.0-beta.79", - "@ohif/mode-microscopy": "3.11.0-beta.79", - "@ohif/mode-test": "3.11.0-beta.79", - "@ohif/mode-ultrasound-pleura-bline": "3.11.0-beta.79", - "@ohif/ui": "3.11.0-beta.79", - "@ohif/ui-next": "3.11.0-beta.79", + "@ohif/core": "3.11.0-beta.81", + "@ohif/extension-cornerstone": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-rt": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-seg": "3.11.0-beta.81", + "@ohif/extension-cornerstone-dicom-sr": "3.11.0-beta.81", + "@ohif/extension-default": "3.11.0-beta.81", + "@ohif/extension-dicom-microscopy": "3.11.0-beta.81", + "@ohif/extension-dicom-pdf": "3.11.0-beta.81", + "@ohif/extension-dicom-video": "3.11.0-beta.81", + "@ohif/extension-test": "3.11.0-beta.81", + "@ohif/extension-ultrasound-pleura-bline": "3.11.0-beta.81", + "@ohif/i18n": "3.11.0-beta.81", + "@ohif/mode-basic-dev-mode": "3.11.0-beta.81", + "@ohif/mode-longitudinal": "3.11.0-beta.81", + "@ohif/mode-microscopy": "3.11.0-beta.81", + "@ohif/mode-test": "3.11.0-beta.81", + "@ohif/mode-ultrasound-pleura-bline": "3.11.0-beta.81", + "@ohif/ui": "3.11.0-beta.81", + "@ohif/ui-next": "3.11.0-beta.81", "@svgr/webpack": "^8.1.0", "@types/react": "^18.3.3", "classnames": "^2.3.2", @@ -745,7 +746,7 @@ }, "platform/cli": { "name": "@ohif/cli", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "bin": { "ohif-cli": "src/index.js", }, @@ -769,7 +770,7 @@ }, "platform/core": { "name": "@ohif/core", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "dcmjs": "^0.42.0", @@ -796,14 +797,14 @@ "@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/core": "^3.30.0", "@cornerstonejs/dicom-image-loader": "^3.30.0", - "@ohif/ui": "3.11.0-beta.79", + "@ohif/ui": "3.11.0-beta.81", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21", }, }, "platform/i18n": { "name": "@ohif/i18n", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@babel/runtime": "^7.20.13", "i18next-locize-backend": "^2.0.0", @@ -828,7 +829,7 @@ }, "platform/ui": { "name": "@ohif/ui", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@testing-library/react": "^13.1.0", "browser-detect": "^0.2.28", @@ -888,7 +889,7 @@ }, "platform/ui-next": { "name": "@ohif/ui-next", - "version": "3.11.0-beta.79", + "version": "3.11.0-beta.81", "dependencies": { "@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-checkbox": "^1.1.1", @@ -931,13 +932,16 @@ }, }, "overrides": { - "trim-newlines": "^5.0.0", - "path-to-regexp": "0.1.12", - "glob-parent": "^6.0.2", - "rollup": "2.79.2", - "commander": "8.3.0", "body-parser": "1.20.3", + "commander": "8.3.0", + "glob-parent": "^6.0.2", "nth-check": "^2.1.1", + "package-json": "^8.1.0", + "path-to-regexp": "0.1.12", + "rollup": "2.79.2", + "sharp": "^0.32.6", + "trim": "^1.0.0", + "trim-newlines": "^5.0.0", }, "packages": { "@adobe/css-tools": ["@adobe/css-tools@4.4.3", "", {}, "sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA=="], diff --git a/extensions/default/jest.config.js b/extensions/default/jest.config.js index ba90c0c47..fc9df72ad 100644 --- a/extensions/default/jest.config.js +++ b/extensions/default/jest.config.js @@ -1,13 +1,11 @@ const base = require('../../jest.config.base.js'); -const pkg = require('./package'); module.exports = { ...base, - name: pkg.name, - displayName: pkg.name, moduleNameMapper: { ...base.moduleNameMapper, '@ohif/(.*)': '/../../platform/$1/src', + '^@cornerstonejs/(.*)$': '/../../node_modules/@cornerstonejs/$1/dist/esm', }, // rootDir: "../.." // testMatch: [ diff --git a/extensions/default/package.json b/extensions/default/package.json index 8d5afa5d9..25be1cea8 100644 --- a/extensions/default/package.json +++ b/extensions/default/package.json @@ -29,7 +29,9 @@ "dev:dicom-pdf": "yarn run dev", "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js", "build:package-1": "yarn run build", - "start": "yarn run dev" + "start": "yarn run dev", + "test:unit": "jest --watchAll", + "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" }, "peerDependencies": { "@ohif/core": "3.11.0-beta.81", diff --git a/extensions/default/src/utils/getDirectURL.test.ts b/extensions/default/src/utils/getDirectURL.test.ts index 058c3a787..dcee7fc91 100644 --- a/extensions/default/src/utils/getDirectURL.test.ts +++ b/extensions/default/src/utils/getDirectURL.test.ts @@ -200,7 +200,7 @@ describe('getDirectURL', () => { const result = getDirectURL(config, params); - expect(mockedGetBulkdataValue).toHaveBeenCalledWith(config, params); + expect(mockedGetBulkdataValue).not.toHaveBeenCalled(); expect(mockedCreateRenderedRetrieve).toHaveBeenCalledWith(config, params); expect(result).toBe(renderedRetrieveURL); }); diff --git a/extensions/default/src/utils/validations/areAllImageDimensionsEqual.ts b/extensions/default/src/utils/validations/areAllImageDimensionsEqual.ts index 2638ec205..08611b78c 100644 --- a/extensions/default/src/utils/validations/areAllImageDimensionsEqual.ts +++ b/extensions/default/src/utils/validations/areAllImageDimensionsEqual.ts @@ -1,4 +1,6 @@ -import toNumber from '@ohif/core/src/utils/toNumber'; +import { utils } from '@ohif/core'; + +const { toNumber } = utils; /** * Check if the frames in a series has different dimensions diff --git a/jest.config.base.js b/jest.config.base.js index dbd563fec..1f9c0ffc9 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -6,10 +6,14 @@ module.exports = { verbose: true, // roots: ['/src'], - testMatch: ['/src/**/*.test.js'], + testMatch: ['/src/**/*.test.js', '/src/**/*.test.ts'], testPathIgnorePatterns: ['/node_modules/'], testEnvironment: 'jsdom', moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'], + transform: { + '^.+\\.[jt]sx?$': 'babel-jest', + }, + transformIgnorePatterns: [], moduleNameMapper: { '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/src/__mocks__/fileMock.js', diff --git a/package.json b/package.json index e4e58aa57..df17d1191 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "@babel/plugin-transform-private-property-in-object": "^7.27.1", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.16.7", + "@babel/plugin-transform-for-of": "^7.27.1", "@babel/plugin-transform-regenerator": "^7.16.7", "@babel/plugin-transform-runtime": "7.28.0", "@babel/plugin-transform-typescript": "^7.28.0", @@ -96,17 +97,17 @@ "@babel/preset-react": "^7.27.1", "@babel/preset-typescript": "^7.27.1", "babel-plugin-istanbul": "^7.0.0", - "source-map-support": "^0.5.21", - "prettier": "^3.3.3", - "ts-node": "^10.9.2", "@istanbuljs/nyc-config-typescript": "^1.0.2", + "cypress": "14.1.0", + "cypress-file-upload": "^5.0.8", "istanbul": "0.4.5", "nyc": "^17.1.0", "patch-package": "^8.0.0", - "prettier-plugin-tailwindcss": "0.6.9", "playwright-test-coverage": "^1.2.12", - "cypress": "14.1.0", - "cypress-file-upload": "^5.0.8" + "prettier": "^3.3.3", + "prettier-plugin-tailwindcss": "0.6.9", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2" }, "husky": { "hooks": { diff --git a/platform/core/src/utils/index.ts b/platform/core/src/utils/index.ts index 734508cc8..622ac9be4 100644 --- a/platform/core/src/utils/index.ts +++ b/platform/core/src/utils/index.ts @@ -26,6 +26,7 @@ import sortInstancesByPosition from './sortInstancesByPosition'; import imageIdToURI from './imageIdToURI'; import debounce from './debounce'; import roundNumber from './roundNumber'; +import toNumber from './toNumber'; import downloadCSVReport from './downloadCSVReport'; import isEqualWithin from './isEqualWithin'; import addAccessors from './addAccessors'; @@ -82,6 +83,7 @@ const utils = { isDisplaySetReconstructable, debounce, roundNumber, + toNumber, downloadCSVReport, splitComma, getSplitParam, @@ -117,6 +119,7 @@ export { imageIdToURI, debounce, roundNumber, + toNumber, downloadCSVReport, splitComma, getSplitParam,