Merge branch 'master' into customizable-TS

platform/app/.recipes/OpenResty-Orthanc/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       # Project root
       context: ./../../../../
       # Relative to context
-      dockerfile: ./platform/viewer/.recipes/OpenResty-Orthanc/dockerfile
+      dockerfile: ./platform/app/.recipes/OpenResty-Orthanc/dockerfile
     image: webapp:latest
     container_name: webapp
     volumes:

platform/app/.recipes/OpenResty-Orthanc/dockerfile

@@ -79,6 +79,6 @@ RUN luarocks install lua-resty-openidc
 RUN luarocks install luacrypto
 
 # Copy build output to image
-COPY --from=builder /usr/src/app/platform/viewer/dist /var/www/html
+COPY --from=builder /usr/src/app/platform/app/dist /var/www/html
 
 ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]

platform/app/README.md

@@ -1,8 +1,8 @@
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <div align="center">
-  <h1>@ohif/viewer</h1>
-  <p><strong>@ohif/viewer</strong> is a zero-footprint medical image viewer provided by the <a href="https://ohif.org/">Open Health Imaging Foundation (OHIF)</a>. It is a configurable and extensible progressive web application with out-of-the-box support for image archives which support <a href="https://www.dicomstandard.org/dicomweb/">DICOMweb</a>.</p>
+  <h1>@ohif/app</h1>
+  <p><strong>@ohif/app</strong> is a zero-footprint medical image viewer provided by the <a href="https://ohif.org/">Open Health Imaging Foundation (OHIF)</a>. It is a configurable and extensible progressive web application with out-of-the-box support for image archives which support <a href="https://www.dicomstandard.org/dicomweb/">DICOMweb</a>.</p>
 </div>
 
 

platform/app/jest.config.js

@@ -0,0 +1,14 @@
+const base = require('../../jest.config.base.js');
+const pkg = require('./package');
+
+module.exports = {
+  ...base,
+  name: pkg.name,
+  displayName: pkg.name,
+  setupFilesAfterEnv: ['<rootDir>/src/__tests__/globalSetup.js'],
+  // rootDir: "../.."
+  // testMatch: [
+  //   //`<rootDir>/platform/${pack.name}/**/*.spec.js`
+  //   "<rootDir>/platform/app/**/*.test.js"
+  // ]
+};

platform/app/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@ohif/viewer",
-  "version": "5.0.0",
-  "productVersion": "3.3.0",
+  "name": "@ohif/app",
+  "version": "3.6.0-beta.0",
+  "productVersion": "3.4.0",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -47,31 +47,31 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-seg": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-rt": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-dicom-pdf": "^3.0.1",
-    "@ohif/extension-dicom-video": "^3.0.1",
-    "@ohif/extension-dicom-microscopy": "^3.0.0",
-    "@ohif/extension-test": "0.0.1",
-    "@ohif/i18n": "^1.0.0",
-    "@ohif/mode-basic-dev-mode": "^3.0.0",
-    "@ohif/mode-test": "^0.0.1",
-    "@ohif/mode-longitudinal": "^3.0.0",
-    "@ohif/mode-microscopy": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
-    "@types/react": "^17.0.38",
-    "classnames": "^2.3.2",
-    "core-js": "^3.16.1",
-    "cornerstone-math": "^0.1.9",
-    "@cornerstonejs/dicom-image-loader": "^0.6.8",
     "@cornerstonejs/codec-charls": "^1.2.3",
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
+    "@cornerstonejs/dicom-image-loader": "^0.6.8",
+    "@ohif/core": "3.6.0-beta.0",
+    "@ohif/extension-cornerstone": "3.6.0-beta.0",
+    "@ohif/extension-cornerstone-dicom-rt": "3.6.0-beta.0",
+    "@ohif/extension-cornerstone-dicom-seg": "3.6.0-beta.0",
+    "@ohif/extension-cornerstone-dicom-sr": "3.6.0-beta.0",
+    "@ohif/extension-default": "3.6.0-beta.0",
+    "@ohif/extension-dicom-microscopy": "3.6.0-beta.0",
+    "@ohif/extension-dicom-pdf": "3.6.0-beta.0",
+    "@ohif/extension-dicom-video": "3.6.0-beta.0",
+    "@ohif/extension-test": "3.6.0-beta.0",
+    "@ohif/i18n": "3.6.0-beta.0",
+    "@ohif/mode-basic-dev-mode": "3.6.0-beta.0",
+    "@ohif/mode-longitudinal": "3.6.0-beta.0",
+    "@ohif/mode-microscopy": "3.6.0-beta.0",
+    "@ohif/mode-test": "3.6.0-beta.0",
+    "@ohif/ui": "3.6.0-beta.0",
+    "@types/react": "^17.0.38",
+    "classnames": "^2.3.2",
+    "core-js": "^3.16.1",
+    "cornerstone-math": "^0.1.9",
     "dcmjs": "^0.29.5",
     "detect-gpu": "^4.0.16",
     "dicom-parser": "^1.8.9",