chore: Switch to @cornerstonejs/calculate-suv, fix build issues (#6)

* chore: Switch to @cornerstonejs/calculate-suv * Update releaserc to use main instead of master * fix missing build script
cornerstonejs · Mar 22, 2022 · 8152604 · 8152604
1 parent b2b04bf
commit 8152604
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
             - packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
             - packages-v1-{{ .Branch }}-
             - packages-v1-
-      - run: yarn install
+      - run: yarn install --frozen-lockfile
       - save_cache:
           name: Save Package Cache
           paths:

diff --git a/.releaserc.json b/.releaserc.json
@@ -1,3 +1,3 @@
 {
-  "branch": "master"
+  "branch": "main"
 }
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@babel/runtime": "^7.16.7",
+    "@cornerstonejs/calculate-suv": "1.0.1",
     "@microsoft/api-extractor": "7.19.5",
     "@types/node": "^14.18.9",
     "@types/react": "^17.0.38",
@@ -52,7 +53,6 @@
     "autoprefixer": "^10.4.2",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "^6.1.1",
-    "calculate-suv": "git+ssh://[email protected]/PrecisionMetrics/calculate-suv.git#main",
     "clean-webpack-plugin": "^3.0.0",
     "commander": "^9.0.0",
     "copy-webpack-plugin": "^8.1.0",

diff --git a/packages/demo/src/helpers/createImageIdsAndCacheMetaData.js b/packages/demo/src/helpers/createImageIdsAndCacheMetaData.js
@@ -1,6 +1,6 @@
 import { api } from 'dicomweb-client'
 import dcmjs from 'dcmjs'
-import { calculateSUVScalingFactors } from '@precisionmetrics/calculate-suv'
+import { calculateSUVScalingFactors } from '@cornerstonejs/calculate-suv'
 import { getPTImageIdInstanceMetadata } from './getPTImageIdInstanceMetadata'
 import { utilities } from '@cornerstonejs/core'
 

diff --git a/packages/demo/src/helpers/getPTImageIdInstanceMetadata.ts b/packages/demo/src/helpers/getPTImageIdInstanceMetadata.ts
@@ -1,8 +1,8 @@
 import { metaData } from '@cornerstonejs/core'
-import {
+import type {
   InstanceMetadata,
   PhilipsPETPrivateGroup,
-} from '@precisionmetrics/calculate-suv/src/types'
+} from '@cornerstonejs/calculate-suv'
 
 export default function getPTImageIdInstanceMetadata(
   imageId: string

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -19,7 +19,7 @@
     "prep-coverage": "cd ../.. && yarn run test:ci && cd packages/docs && yarn run copy-coverage-to-docs",
     "prep-examples": "cd ../.. && yarn run build-all-examples && cd packages/docs && yarn run copy-examples-to-docs",
     "prep": "yarn run prep-coverage && yarn run prep-examples",
-    "docs:ci": "cross-env NODE_OPTIONS=--max_old_space_size=16384 && yarn run prep && yarn run build",
+    "docs:ci": "cross-env NODE_OPTIONS=--max_old_space_size=16384 && yarn run prep && yarn run build:docs",
     "write-translations": "docusaurus write-translations",
     "write-heading-ids": "docusaurus write-heading-ids"
   },

diff --git a/packages/streaming-image-volume-loader/package.json b/packages/streaming-image-volume-loader/package.json
@@ -22,12 +22,12 @@
   "peerDependencies": {
     "@cornerstonejs/core": "^0.1.0",
     "cornerstone-wado-image-loader": "^4.1.2",
-    "@precisionmetrics/calculate-suv": "^0.1.0"
+    "@cornerstonejs/calculate-suv": "1.0.1"
   },
   "devDependencies": {
     "@cornerstonejs/core": "^0.1.0",
     "cornerstone-wado-image-loader": "^4.1.2",
-    "@precisionmetrics/calculate-suv": "^0.1.0"
+    "@cornerstonejs/calculate-suv": "1.0.1"
   },
   "contributors": [{
     "name": "Cornerstone.js Contributors",

diff --git a/utils/demo/helpers/createImageIdsAndCacheMetaData.js b/utils/demo/helpers/createImageIdsAndCacheMetaData.js
@@ -1,6 +1,6 @@
 import { api } from 'dicomweb-client'
 import dcmjs from 'dcmjs'
-import { calculateSUVScalingFactors } from '@precisionmetrics/calculate-suv'
+import { calculateSUVScalingFactors } from '@cornerstonejs/calculate-suv'
 import { getPTImageIdInstanceMetadata } from './getPTImageIdInstanceMetadata'
 import { utilities } from '@cornerstonejs/core'
 import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'

diff --git a/utils/demo/helpers/getPTImageIdInstanceMetadata.ts b/utils/demo/helpers/getPTImageIdInstanceMetadata.ts
@@ -1,8 +1,8 @@
 import { metaData } from '@cornerstonejs/core'
-import {
+import type {
   InstanceMetadata,
   PhilipsPETPrivateGroup,
-} from '@precisionmetrics/calculate-suv/src/types'
+} from '@cornerstonejs/calculate-suv'
 
 export default function getPTImageIdInstanceMetadata(
   imageId: string

diff --git a/yarn.lock b/yarn.lock
@@ -1257,6 +1257,11 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@cornerstonejs/[email protected]":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/calculate-suv/-/calculate-suv-1.0.1.tgz#03981a3cedeb58c68b2103b682e0c66d058f814a"
+  integrity sha512-N3pzkaSAAbO0UEijOJQoLuQXwtUYVIChpAkgvzOvj9JOreV2gE5D9ogOb7ueeiPN3jMYMYxU390DQ9A1YiuEzQ==
+
 "@cornerstonejs/codec-charls@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-charls/-/codec-charls-0.1.1.tgz#e55d4aa908732d0cc902888b7f3856c5a996df7f"
@@ -3176,11 +3181,6 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
   integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
 
-"@precisionmetrics/calculate-suv@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@precisionmetrics/calculate-suv/-/calculate-suv-0.1.0.tgz#a95d3db6d748ebca2c75c3bdff49994cd38e63ac"
-  integrity sha512-pVOpLMEP7lGYhRznL2t/YQM42QnFMaYFfCf3MHUc7LU8Al/5g/iogl317XvGZGnzNh0OXLH2vVpy6Xg8qB7YqQ==
-
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"
@@ -5517,10 +5517,6 @@ cachedir@^2.3.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
-"calculate-suv@git+ssh://[email protected]/PrecisionMetrics/calculate-suv.git#main":
-  version "0.0.0-semantic-release"
-  resolved "git+ssh://[email protected]/PrecisionMetrics/calculate-suv.git#555a2b4085cc81ad6a95a3bf1456e00fc4a63856"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"