fix: Merge issues

Author: wayfarer3130

packages/dicomImageLoader/package.json

@@ -102,10 +102,10 @@
     "prepublishOnly": "yarn run build:loader"
   },
   "dependencies": {
-    "@cornerstonejs/codec-charls": "5.0.0-beta.1",
-    "@cornerstonejs/codec-libjpeg-turbo-8bit": "5.0.0-beta.1",
-    "@cornerstonejs/codec-openjpeg": "5.0.0-beta.1",
-    "@cornerstonejs/codec-openjph": "5.0.0-beta.1",
+    "@cornerstonejs/codec-charls": "1.2.3",
+    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
+    "@cornerstonejs/codec-openjpeg": "1.3.0",
+    "@cornerstonejs/codec-openjph": "2.4.7",
     "comlink": "4.4.2",
     "dicom-parser": "1.8.21",
     "jpeg-lossless-decoder-js": "2.1.2",
@@ -121,9 +121,6 @@
     "@cornerstonejs/metadata": ">=4.18.0 <6.0.0-0",
     "dicom-parser": "1.8.21"
   },
-  "devDependencies": {
-    "@cornerstonejs/core": "5.0.0-beta.1"
-  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"

packages/labelmap-interpolation/package.json

@@ -63,9 +63,5 @@
     "@cornerstonejs/core": ">=5.0.0-beta.1 <6.0.0-0",
     "@cornerstonejs/tools": ">=5.0.0-beta.1 <6.0.0-0",
     "@kitware/vtk.js": "34.15.1"
-  },
-  "devDependencies": {
-    "@cornerstonejs/core": "5.0.0-beta.1",
-    "@cornerstonejs/tools": "5.0.0-beta.1"
   }
 }

packages/metadata/src/utilities/imageIdToURI.ts

@@ -2,9 +2,13 @@
  * Removes the data loader scheme from the imageId
  *
  * @param imageId - Image ID
- * @returns imageId without the data loader scheme
+ * @returns imageId without the data loader scheme, or empty string if imageId is falsy
  */
 export default function imageIdToURI(imageId: string): string {
+  if (!imageId) {
+    return '';
+  }
+
   const colonIndex = imageId.indexOf(':');
-  return imageId.substring(colonIndex + 1);
+  return colonIndex === -1 ? imageId : imageId.substring(colonIndex + 1);
 }

packages/polymorphic-segmentation/package.json

@@ -61,9 +61,5 @@
     "@cornerstonejs/core": ">=5.0.0-beta.1 <6.0.0-0",
     "@cornerstonejs/tools": ">=5.0.0-beta.1 <6.0.0-0",
     "@kitware/vtk.js": "34.15.1"
-  },
-  "devDependencies": {
-    "@cornerstonejs/core": "5.0.0-beta.1",
-    "@cornerstonejs/tools": "5.0.0-beta.1"
   }
 }