feat(app): change ohif viewer to ohif app (#3451)

2023-06-06 20:06:31 -04:00 · 2023-06-06 20:06:31 -04:00 · 16afa740b6
commit 16afa740b6
parent 6715ad9bd6
333 changed files with 2123 additions and 1149 deletions
--- a/.circleci/build-and-publish-docs.sh
+++ b/.circleci/build-and-publish-docs.sh
@ -1,69 +0,0 @@
-#!/bin/bash
-
-# Set directory to location of this script
-# https://stackoverflow.com/a/3355423/1867984
-cd "$(dirname "$0")"
-
-yarn -v
-node -v
-
-echo 'Installing Gitbook CLI'
-
-yarn global bin
-yarn config get prefix
-yarn config set prefix ~/.yarn
-export PATH="$PATH:`yarn global bin`"
-
-echo 'Running Gitbook installation'
-
-# Generate all version's GitBook output
-# For each directory in /docs ...
-cd ./../docs/
-for D in *; do
-    if [ -d "${D}" ]; then
-
-			echo "Generating output for: ${D}"
-			cd "${D}"
-
-			# Clear previous output, generate new
-			rm -rf _book
-			gitbook install
-			gitbook build
-
-			cd ..
-
-		fi
-done
-
-# Move CNAME File into `latest`
-cp CNAME ./latest/_book/CNAME
-
-# Create a history folder in our latest version's output
-mkdir ./latest/_book/history
-
-# Move each version's files to latest's history folder
-for D in *; do
-	if [ -d "${D}" ]; then
-		if [ "${D}" == v* ] ; then
-
-			echo "Moving ${D} to the latest version's history folder"
-
-			mkdir "./latest/_book/history/${D}"
-			cp -v -r "./${D}/_book"/* "./latest/_book/history/${D}"
-
-		fi
-	fi
-done
-
-# Back to repo root
-cd ..
-
-echo "Done generating documentation output"
-echo 'STARTING PUBLISH'
-
-# WILL ALWAYS FAIL IF INITIATED FROM PR BRANCH
-npx gh-pages \
-  --silent \
-  --repo https://$GITHUB_TOKEN@github.com/OHIF/Viewers.git \
-  --message 'Autogenerated Message: [ci skip]' \
-	--dist docs/latest/_book
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -44,9 +44,7 @@ jobs:
      # Update yarn
      - run: yarn -v
      # Checkout code and ALL Git Tags
-      - checkout:
-          post:
-            - git fetch --all
+      - checkout
      - restore_cache:
          name: Restore Yarn and Cypress Package Cache
          keys:
@ -65,18 +63,18 @@ jobs:
      - run:
          name: 'JavaScript Test Suite'
          command: yarn run test:unit:ci
-      # PLATFORM/VIEWER
+      # platform/app
      - run:
          name: 'VIEWER: Combine report output'
          command: |
-            viewerCov="/home/circleci/repo/platform/viewer/coverage"
+            viewerCov="/home/circleci/repo/platform/app/coverage"
            touch "${viewerCov}/reports"
            cat "${viewerCov}/clover.xml" >> "${viewerCov}/reports"
            echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
            cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
            echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
      - codecov/upload:
-          file: '/home/circleci/repo/platform/viewer/coverage/reports'
+          file: '/home/circleci/repo/platform/app/coverage/reports'
          flags: 'viewer'
      # PLATFORM/CORE
      - run:
@ -102,10 +100,7 @@ jobs:
      - run: yarn config set workspaces-experimental true

      # Checkout code and ALL Git Tags
-      - checkout:
-          post:
-            - git fetch --all
-
+      - checkout
      - restore_cache:
          name: Restore Yarn and Cypress Package Cache
          keys:
@ -128,9 +123,9 @@ jobs:
            # Set our version number using vars
            echo $CIRCLE_BUILD_NUM
            # Build our image, auth, and push
-            docker build --tag ohif/viewer:PR_BUILD-$CIRCLE_BUILD_NUM .
+            docker build --tag ohif/app:PR_BUILD-$CIRCLE_BUILD_NUM .
            echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-            docker push ohif/viewer:PR_BUILD-$CIRCLE_BUILD_NUM
+            docker push ohif/app:PR_BUILD-$CIRCLE_BUILD_NUM

  ###
  # Workflow: DEPLOY
@ -139,9 +134,7 @@ jobs:
    <<: *defaults
    steps:
      # Checkout code and ALL Git Tags
-      - checkout:
-          post:
-            - git fetch --all
+      - checkout
      - restore_cache:
          name: Restore Yarn and Cypress Package Cache
          keys:
@ -157,72 +150,89 @@ jobs:
            - ~/.cache ## Cache yarn and Cypress
          key: yarn-packages-{{ checksum "yarn.lock" }}
      # Build & Test
+      - run:
+          name: 'Perform the versioning before build'
+          command: node ./version.mjs
      - run:
          name: 'Build the OHIF Viewer'
          command: yarn run build
          no_output_timeout: 45m
-      # - run:
-      #     name: 'Upload SourceMaps, Send Deploy Notification'
-      #     command: |
-      #       # export FILE_1=$(find ./build/static/js -type f -name "2.*.js" -exec basename {} \;)
-      #       # export FILE_MAIN=$(find ./build/static/js -type f -name "main.*.js" -exec basename {} \;)
-      #       # export FILE_RUNTIME_MAIN=$(find ./build/static/js -type f -name "runtime~main.*.js" -exec basename {} \;)
-      #       # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_1.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_1
-      #       # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_MAIN
-      #       # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_RUNTIME_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_RUNTIME_MAIN
-      #       curl --request POST https://api.rollbar.com/api/1/deploy/ -F access_token=$ROLLBAR_TOKEN -F environment=$GOOGLE_STORAGE_BUCKET -F revision=$CIRCLE_SHA1 -F local_username=CircleCI
+      - run:
+          name: 'Upload SourceMaps, Send Deploy Notification'
+          command: |
+            # export FILE_1=$(find ./build/static/js -type f -name "2.*.js" -exec basename {} \;)
+            # export FILE_MAIN=$(find ./build/static/js -type f -name "main.*.js" -exec basename {} \;)
+            # export FILE_RUNTIME_MAIN=$(find ./build/static/js -type f -name "runtime~main.*.js" -exec basename {} \;)
+            # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_1.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_1
+            # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_MAIN
+            # curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_RUNTIME_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_RUNTIME_MAIN
+            curl --request POST https://api.rollbar.com/api/1/deploy/ -F access_token=$ROLLBAR_TOKEN -F environment=$GOOGLE_STORAGE_BUCKET -F revision=$CIRCLE_SHA1 -F local_username=CircleCI
      # Persist :+1:
      - persist_to_workspace:
          root: ~/repo
          paths:
-            - platform/viewer/dist
-            - netlify.toml
-            - .netlify
+            - platform/app/dist
+            - Dockerfile
+            - version.txt
+            - commit.txt
+            - version.json

-  DEPLOY_TO_DEV:
-    docker:
-      - image: circleci/node:16.14.0
-        environment:
-          TERM: xterm
-          NETLIFY_SITE_ID: 32708787-c9b0-4634-b50f-7ca41952da77
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run: cd .netlify && npm install
-      - run:
-          cp .netlify/deploy-workflow/_redirects platform/viewer/dist/_redirects
-      - run: cd .netlify && npm run deploy
+  # DEPLOY_TO_DEV:
+  #   docker:
+  #     - image: circleci/node:16.14.0
+  #       environment:
+  #         TERM: xterm
+  #         NETLIFY_SITE_ID: 32708787-c9b0-4634-b50f-7ca41952da77
+  #   working_directory: ~/repo
+  #   steps:
+  #     - attach_workspace:
+  #         at: ~/repo
+  #     - run: cd .netlify && npm install
+  #     - run: cp .netlify/deploy-workflow/_redirects platform/app/dist/_redirects
+  #     - run: cd .netlify && npm run deploy

-  DEPLOY_TO_STAGING:
-    docker:
-      - image: circleci/node:16.14.0
-        environment:
-          TERM: xterm
-          NETLIFY_SITE_ID: c7502ae3-b150-493c-8422-05701e44a969
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run: cd .netlify && npm install
-      - run:
-          cp .netlify/deploy-workflow/_redirects platform/viewer/dist/_redirects
-      - run: cd .netlify && npm run deploy
+  # DEPLOY_TO_STAGING:
+  #   docker:
+  #     - image: circleci/node:16.14.0
+  #       environment:
+  #         TERM: xterm
+  #         NETLIFY_SITE_ID: c7502ae3-b150-493c-8422-05701e44a969
+  #   working_directory: ~/repo
+  #   steps:
+  #     - attach_workspace:
+  #         at: ~/repo
+  #     - run: cd .netlify && npm install
+  #     - run: cp .netlify/deploy-workflow/_redirects platform/app/dist/_redirects
+  #     - run: cd .netlify && npm run deploy

-  DEPLOY_TO_PRODUCTION:
-    docker:
-      - image: circleci/node:16.14.0
-        environment:
-          TERM: xterm
-          NETLIFY_SITE_ID: 79c4a5da-5c95-4dc9-84f7-45fd9dfe21b0
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run: cd .netlify && npm install
-      - run:
-          cp .netlify/deploy-workflow/_redirects platform/viewer/dist/_redirects
-      - run: cd .netlify && npm run deploy
+  # DEPLOY_TO_PRODUCTION:
+  #   docker:
+  #     - image: circleci/node:16.14.0
+  #       environment:
+  #         TERM: xterm
+  #         NETLIFY_SITE_ID: 79c4a5da-5c95-4dc9-84f7-45fd9dfe21b0
+  #   working_directory: ~/repo
+  #   steps:
+  #     - attach_workspace:
+  #         at: ~/repo
+  #     - run: cd .netlify && npm install
+  #     - run: cp .netlify/deploy-workflow/_redirects platform/app/dist/_redirects
+  #     - run: cd .netlify && npm run deploy
+
+  #   DEPLOY_TO_RELEASE_DEV:
+  #     docker:
+  #       - image: circleci/node:16.14.0
+  #         environment:
+  #           TERM: xterm
+  #           NETLIFY_SITE_ID: 3270878-22
+  #     working_directory: ~/repo
+  #     steps:
+  #       - attach_workspace:
+  #           at: ~/repo
+  #       - run: cd .netlify && npm install
+  #       - run:
+  #           cp .netlify/deploy-workflow/_redirects platform/app/dist/_redirects
+  #       - run: cd .netlify && npm run deploy

  ###
  # Workflow: RELEASE
@ -232,9 +242,9 @@ jobs:
    steps:
      - run: yarn -v
      # Checkout code and ALL Git Tags
-      - checkout:
-          post:
-            - git fetch --all
+      - checkout
+      - attach_workspace:
+          at: ~/repo
      # Use increasingly general patterns to restore cache
      - restore_cache:
          name: Restore Yarn and Cypress Package Cache
@ -261,31 +271,36 @@ jobs:
          name: Authenticate with NPM registry
          command:
            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
-      - run: npx lerna version
-      - run: yarn run build:package-all
-      - run: yarn run lerna:publish
-      - run: npx lerna run ci:generateSuccessVersion --stream
+      - run:
+          name: Increase the event emitter limit
+          command: |
+            node ./increaseEventEmitterLimit.mjs
+      - run:
+          name: build half of the packages (to avoid out of memory in circleci)
+          command: |
+            yarn run build:package-all
+      - run:
+          name: build the other half of the packages
+          command: |
+            yarn run build:package-all-1
+      - run:
+          name: publish package versions
+          command: |
+            node ./publish-version.mjs
+      - run:
+          name: Again set the NPM registry (was deleted in the version script)
+          command:
+            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: publish package dist
+          command: |
+            node ./publish-package.mjs
      - persist_to_workspace:
          root: ~/repo
-          paths: .
+          paths:
+            - .

-  DOCS_PUBLISH:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: Avoid hosts unknown for github
-          command: |
-            rm -rf ~/.ssh
-            mkdir ~/.ssh/
-            echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
-            git config --global user.email "danny.ri.brown+ohif-bot@gmail.com"
-            git config --global user.name "ohif-bot"
-      - run: yarn global add gitbook-cli gh-pages
-      - run: chmod +x ~/repo/.circleci/build-and-publish-docs.sh
-      - run: ~/repo/.circleci/build-and-publish-docs.sh
-
-  DOCKER_MASTER_PUBLISH:
+  DOCKER_RELEASE_PUBLISH:
    <<: *defaults
    steps:
      - attach_workspace:
@ -293,26 +308,61 @@ jobs:
      - setup_remote_docker:
          docker_layer_caching: false
      - run:
-          name: Build and push Docker image
+          name: Build and push Docker image from the release branch
          command: |
            # This file will exist if a new version was published by
-            # our command in the previous job. Created in npm ci:generateSuccessVersion script
-            # in the `platform/viewer` project.
-            if [[ ! -e platform/viewer/success_version.txt ]]; then
+            # our command in the previous job.
+            if [[ ! -e version.txt ]]; then
              exit 0
            else
              # Remove npm config
              rm -f ./.npmrc
              # Set our version number using vars
-              export IMAGE_VERSION=$(cat platform/viewer/success_version.txt)
-              export IMAGE_VERSION_FULL=v$IMAGE_VERSION.${CIRCLE_BUILD_NUM}
+              export IMAGE_VERSION=$(cat version.txt)
+              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
              echo $IMAGE_VERSION
              echo $IMAGE_VERSION_FULL
              # Build our image, auth, and push
-              docker build --tag ohif/$IMAGE_NAME:$IMAGE_VERSION_FULL --tag ohif/$IMAGE_NAME:latest .
+              docker build --tag ohif/app:$IMAGE_VERSION_FULL --tag ohif/app:latest .
              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-              docker push ohif/$IMAGE_NAME:$IMAGE_VERSION_FULL
-              docker push ohif/$IMAGE_NAME:latest
+              docker push ohif/app:$IMAGE_VERSION_FULL
+              docker push ohif/app:latest
+            fi
+
+  DOCKER_BETA_PUBLISH:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo
+      - setup_remote_docker:
+          docker_layer_caching: false
+      - run:
+          name:
+            Build and push Docker image from the master branch (beta releases)
+          command: |
+            echo $(ls -l)
+
+            # This file will exist if a new version was published by
+            # our command in the previous job.
+            if [[ ! -e version.txt ]]; then
+              echo "don't have version txt"
+              exit 0
+            else
+              echo "Building and pushing Docker image from the master branch (beta releases)"
+              rm -f ./.npmrc
+              # Set our version number using vars
+              export IMAGE_VERSION=$(cat version.txt)
+              export IMAGE_VERSION_FULL=v$IMAGE_VERSION
+              echo $IMAGE_VERSION
+              echo $IMAGE_VERSION_FULL
+              # Build our image, auth, and push
+
+              echo "starting docker build"
+              docker build --tag ohif/app:$IMAGE_VERSION_FULL .
+              echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
+
+              echo "starting docker push"
+              docker push ohif/app:$IMAGE_VERSION_FULL
            fi

 workflows:
@ -320,13 +370,8 @@ workflows:

  PR_CHECKS:
    jobs:
-      - UNIT_TESTS:
-          filters:
-            branches:
-              ignore:
-                - master
-                - feature/*
-                - hotfix/*
+      - UNIT_TESTS
+
      # E2E: PWA
      - cypress/run:
          name: 'E2E: PWA'
@ -340,7 +385,7 @@ workflows:
          yarn: true
          record: true
          store_artifacts: true
-          working_directory: platform/viewer
+          working_directory: platform/app
          build: yarn test:data
          start: yarn run test:e2e:serve
          spec: 'cypress/integration/**/*'
@ -349,11 +394,11 @@ workflows:
          no-workspace: true # Don't persist workspace
          post-steps:
            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
+                path: platform/app/cypress/screenshots
            - store_artifacts:
-                path: platform/viewer/cypress/videos
+                path: platform/app/cypress/videos
            - store_test_results:
-                path: platform/viewer/cypress/results
+                path: platform/app/cypress/results
          requires:
            - UNIT_TESTS

@ -370,7 +415,7 @@ workflows:
            - run: 'rm -rf ~/.yarn && yarn -v && yarn global add wait-on'
          yarn: true
          store_artifacts: false
-          working_directory: platform/viewer
+          working_directory: platform/app
          build:
            yarn test:data && npx cross-env QUICK_BUILD=true
            APP_CONFIG=config/dicomweb-server.js yarn run build
@ -380,35 +425,41 @@ workflows:
          no-workspace: true # Don't persist workspace
          post-steps:
            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
+                path: platform/app/cypress/screenshots
            - store_artifacts:
-                path: platform/viewer/cypress/videos
+                path: platform/app/cypress/videos
          requires:
            - AWAIT_APPROVAL

-  DEPLOY:
+  # Our master branch deploys to viewer-dev.ohif.org, the viewer.ohif.org is
+  # deployed from the release branch which is more stable and less frequently updated.
+  DEPLOY_MASTER:
    jobs:
      - BUILD:
          filters:
            branches:
              only: master
-      - DEPLOY_TO_DEV:
+      - NPM_PUBLISH:
          requires:
            - BUILD
-      - PROMOTE_TO_STAGING:
-          type: approval
+      - DOCKER_BETA_PUBLISH:
          requires:
-            - DEPLOY_TO_DEV
-      - DEPLOY_TO_STAGING:
+            - NPM_PUBLISH
+
+  # Our release branch deploys to viewer.ohif.org and is more stable and less
+  # frequently updated after being tested in the staging environment.
+  DEPLOY_RELEASE:
+    jobs:
+      - BUILD:
+          filters:
+            branches:
+              only: release
+      - NPM_PUBLISH:
          requires:
-            - PROMOTE_TO_STAGING
-      # - PROMOTE_TO_PRODUCTION:
-      #     type: approval
-      #     requires:
-      #       - DEPLOY_TO_STAGING
-      # - DEPLOY_TO_PRODUCTION:
-      #     requires:
-      #       - PROMOTE_TO_PRODUCTION
+            - BUILD
+      - DOCKER_RELEASE_PUBLISH:
+          requires:
+            - NPM_PUBLISH
  ###
  # Unit and E2E tests have already run for PR_CHECKS
  # Re-running should not gain us any confidence here
@ -434,7 +485,7 @@ workflows:
  #               add wait-on' # Use yarn latest
  #         yarn: true
  #         store_artifacts: false
-  #         working_directory: platform/viewer
+  #         working_directory: platform/app
  #         build:
  #           npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js yarn run
  #           build
@ -444,11 +495,11 @@ workflows:
  #         no-workspace: true # Don't persist workspace
  #         post-steps:
  #           - store_artifacts:
-  #               path: platform/viewer/cypress/screenshots
+  #               path: platform/app/cypress/screenshots
  #           - store_artifacts:
-  #               path: platform/viewer/cypress/videos
+  #               path: platform/app/cypress/videos
  #           - store_test_results:
-  #               path: platform/viewer/cypress/results
+  #               path: platform/app/cypress/results
  #         filters:
  #           branches:
  #             only: master
--- a/.codecov.yml
+++ b/.codecov.yml
@ -22,4 +22,4 @@ flags:
      - platform/core
  viewer:
    paths:
-      - platform/viewer
+      - platform/app
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@ -9,7 +9,7 @@ body:
      value: |
        👋 Hello, and thank you for contributing to our project! Your support is greatly appreciated.

-        🔍 Before proceeding, please make sure to read our [Rules of Conduct](https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md) and familiarize yourself with our [development process](https://v3-docs.ohif.org/development/our-process).
+        🔍 Before proceeding, please make sure to read our [Rules of Conduct](https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md) and familiarize yourself with our [development process](https:/docs.ohif.org/development/our-process).

        ❓ If you're here to seek general support or ask a question, we encourage you to visit our [community discussion board](https://community.ohif.org/)

--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@ -10,7 +10,7 @@ body:

        🔍 Before you proceed, please read our [Rules of Conduct](https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md).

-        🚀 If your request is specific to your needs, consider contributing it yourself! Read our [contributing guides](https://v3-docs.ohif.org/development/contributing) to get started.
+        🚀 If your request is specific to your needs, consider contributing it yourself! Read our [contributing guides](https://docs.ohif.org/development/contributing) to get started.

        🖊️ Please provide as much detail as possible for your feature request. Mock-up screenshots, workflow or logic flow diagrams are very helpful. Discuss how your requested feature would interact with existing features.

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -1,6 +1,6 @@
 <!-- Do Not Delete This! pr_template -->
 <!-- Please read our Rules of Conduct: https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md -->
-<!-- 🕮 Read our guide about our Contributing Guide here https://v3-docs.ohif.org/development/contributing -->
+<!-- 🕮 Read our guide about our Contributing Guide here https://docs.ohif.org/development/contributing -->
 <!-- :hand: Thank you for starting this amazing contribution! -->

 <!--
@ -75,7 +75,7 @@ after the commits are squashed.

 #### Public Documentation Updates

-<!-- https://v3-docs.ohif.org/ -->
+<!-- https://docs.ohif.org/ -->

 - [] The documentation page has been updated as necessary for any public API
  additions or removals.
--- a/.gitignore
+++ b/.gitignore
@ -38,7 +38,7 @@ screenshots/
 .locize

 # autogenerated files
-platform/viewer/src/pluginImports.js
+platform/app/src/pluginImports.js
 /Viewers.iml
-platform/viewer/.recipes/Nginx-Dcm4Che/dcm4che/dcm4che-arc/*
-platform/viewer/.recipes/OpenResty-Orthanc/logs/*
+platform/app/.recipes/Nginx-Dcm4Che/dcm4che/dcm4che-arc/*
+platform/app/.recipes/OpenResty-Orthanc/logs/*
--- a/.netlify/build-deploy-preview.sh
+++ b/.netlify/build-deploy-preview.sh
@ -14,7 +14,7 @@ node -v
 # Build && Move PWA Output
 yarn run build:ci
 mkdir -p ./.netlify/www/pwa
-mv platform/viewer/dist/* .netlify/www/pwa -v
+mv platform/app/dist/* .netlify/www/pwa -v
 echo 'Web application built and copied'

 # Build && Move Docusaurus Output (for the docs themselves)
--- a/.netlify/package.json
+++ b/.netlify/package.json
@ -7,7 +7,7 @@
    "yarn": ">=1.16.0"
  },
  "scripts": {
-    "deploy": "netlify deploy --prod --dir ./../platform/viewer/dist"
+    "deploy": "netlify deploy --prod --dir ./../platform/app/dist"
  },
  "devDependencies": {
    "netlify-cli": "^2.21.0"
--- a/.webpack/rules/cssToJavaScript.js
+++ b/.webpack/rules/cssToJavaScript.js
@ -2,7 +2,7 @@ const autoprefixer = require('autoprefixer');
 const path = require('path');
 const tailwindcss = require('tailwindcss');
 const tailwindConfigPath = path.resolve(
-  '../../platform/viewer/tailwind.config.js'
+  '../../platform/app/tailwind.config.js'
 );
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const devMode = process.env.NODE_ENV !== 'production';
--- a/.webpack/webpack.base.js
+++ b/.webpack/webpack.base.js
@ -2,16 +2,16 @@
 const dotenv = require('dotenv');
 //
 const path = require('path');
+const fs = require('fs');
+
 const webpack = require('webpack');

 // ~~ PLUGINS
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
  .BundleAnalyzerPlugin;
 const TerserJSPlugin = require('terser-webpack-plugin');
-const CopyPlugin = require('copy-webpack-plugin');

 // ~~ PackageJSON
-const PACKAGE = require('../platform/viewer/package.json');
 // const vtkRules = require('vtk.js/Utilities/config/dependency.js').webpack.core
 //   .rules;
 // ~~ RULES
@ -25,10 +25,17 @@ const NODE_ENV = process.env.NODE_ENV;
 const QUICK_BUILD = process.env.QUICK_BUILD;
 const BUILD_NUM = process.env.CIRCLE_BUILD_NUM || '0';

+// read from ../version.txt
+const VERSION_NUMBER =
+  fs.readFileSync(path.join(__dirname, '../version.txt'), 'utf8') || '';
+
+const COMMIT_HASH =
+  fs.readFileSync(path.join(__dirname, '../commit.txt'), 'utf8') || '';
+
 //
 dotenv.config();

-module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
+module.exports = (env, argv, { SRC_DIR, ENTRY }) => {
  if (!process.env.NODE_ENV) {
    throw new Error('process.env.NODE_ENV not set');
  }
@ -40,9 +47,7 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
  const config = {
    mode: isProdBuild ? 'production' : 'development',
    devtool: isProdBuild ? 'source-map' : 'cheap-module-source-map',
-    entry: {
-      app: `${SRC_DIR}/index.js`,
-    },
+    entry: ENTRY,
    optimization: {
      // splitChunks: {
      //   // include all types of chunks
@ -50,7 +55,7 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
      // },
      //runtimeChunk: 'single',
      minimize: isProdBuild,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      // clean: true,
@ -103,14 +108,14 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
      mainFields: ['module', 'browser', 'main'],
      alias: {
        // Viewer project
-        '@': path.resolve(__dirname, '../platform/viewer/src'),
+        '@': path.resolve(__dirname, '../platform/app/src'),
        '@components': path.resolve(
          __dirname,
-          '../platform/viewer/src/components'
+          '../platform/app/src/components'
        ),
-        '@hooks': path.resolve(__dirname, '../platform/viewer/src/hooks'),
-        '@routes': path.resolve(__dirname, '../platform/viewer/src/routes'),
-        '@state': path.resolve(__dirname, '../platform/viewer/src/state'),
+        '@hooks': path.resolve(__dirname, '../platform/app/src/hooks'),
+        '@routes': path.resolve(__dirname, '../platform/app/src/routes'),
+        '@state': path.resolve(__dirname, '../platform/app/src/state'),
        'dicom-microscopy-viewer':
          'dicom-microscopy-viewer/dist/dynamic-import/dicomMicroscopyViewer.min.js',
        '@cornerstonejs/dicom-image-loader':
@ -122,7 +127,7 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
        path.resolve(__dirname, '../node_modules'),
        // Hoisted Yarn Workspace Modules
        path.resolve(__dirname, '../../../node_modules'),
-        path.resolve(__dirname, '../platform/viewer/node_modules'),
+        path.resolve(__dirname, '../platform/app/node_modules'),
        path.resolve(__dirname, '../platform/ui/node_modules'),
        SRC_DIR,
      ],
@ -139,10 +144,9 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
        'process.env.DEBUG': JSON.stringify(process.env.DEBUG),
        'process.env.APP_CONFIG': JSON.stringify(process.env.APP_CONFIG || ''),
        'process.env.PUBLIC_URL': JSON.stringify(process.env.PUBLIC_URL || '/'),
-        'process.env.VERSION_NUMBER': JSON.stringify(
-          process.env.VERSION_NUMBER || PACKAGE.productVersion || ''
-        ),
        'process.env.BUILD_NUM': JSON.stringify(BUILD_NUM),
+        'process.env.VERSION_NUMBER': JSON.stringify(VERSION_NUMBER),
+        'process.env.COMMIT_HASH': JSON.stringify(COMMIT_HASH),
        /* i18n */
        'process.env.USE_LOCIZE': JSON.stringify(process.env.USE_LOCIZE || ''),
        'process.env.LOCIZE_PROJECTID': JSON.stringify(
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-# This dockerfile is used to publish the `ohif/viewer` image on dockerhub.
+# This dockerfile is used to publish the `ohif/app` image on dockerhub.
 #
 # It's a good example of how to build our static application and package it
 # with a web server capable of hosting it as static content.
@ -68,6 +68,6 @@ RUN rm /etc/nginx/conf.d/default.conf
 USER nginx
 COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
 RUN chmod 777 /usr/src/entrypoint.sh
-COPY --from=builder /usr/src/app/platform/viewer/dist /usr/share/nginx/html
+COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html
 ENTRYPOINT ["/usr/src/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
--- a/README.md
+++ b/README.md
@ -8,13 +8,16 @@ provided by the <a href="https://ohif.org/">Open Health Imaging Foundation (OHIF


 <div align="center">
-  <a href="https://docs.ohif.org/"><strong>Read The Docs</strong></a> |
-  <a href="https://github.com/OHIF/Viewers/tree/master/docs/latest">Edit the docs</a>
+  <a href="https://docs.ohif.org/"><strong>Read The Docs</strong></a>
 </div>
 <div align="center">
  <a href="https://viewer.ohif.org/">Live Demo</a> |
-  <a href="https://react.ohif.org/">Component Library</a>
+  <a href="https://ui.ohif.org/">Component Library</a>
 </div>
+<div align="center">
+  📰 <a href="https://ohif.org/news/"><strong>Join OHIF Newsletter</strong></a> 📰
+</div>
+


 <hr />
@ -23,13 +26,13 @@ provided by the <a href="https://ohif.org/">Open Health Imaging Foundation (OHIF
 [![NPM downloads][npm-downloads-image]][npm-url]
 [![Pulls][docker-pulls-img]][docker-image-url]
 [![MIT License][license-image]][license-url]
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FOHIF%2FViewers.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FOHIF%2FViewers?ref=badge_shield)
-
-[![Netlify Status][netlify-image]][netlify-url]
-[![CircleCI][circleci-image]][circleci-url]
-[![codecov][codecov-image]][codecov-url]
 [![This project is using Percy.io for visual regression testing.][percy-image]](percy-url)
-[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors)
+<!-- [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FOHIF%2FViewers.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FOHIF%2FViewers?ref=badge_shield) -->
+
+<!-- [![Netlify Status][netlify-image]][netlify-url] -->
+<!-- [![CircleCI][circleci-image]][circleci-url] -->
+<!-- [![codecov][codecov-image]][codecov-url] -->
+<!-- [![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors) -->
 <!-- prettier-ignore-end -->

 ## About
@ -55,7 +58,7 @@ contributions of individuals, research groups, and commercial organizations.

 ### Built to Adapt

-After more than 5-years of integrating with many companies and organizations,
+After more than 8-years of integrating with many companies and organizations,
 The OHIF Viewer has been rebuilt from the ground up to better address the
 varying workflow and configuration needs of its many users. All of the Viewer's
 core features are built using it's own extension system. The same extensibility
@ -66,6 +69,7 @@ that allows us to offer:
 - Maximum Intensity Project (MIP)
 - Whole slide microscopy viewing
 - PDF and Dicom Structured Report rendering
+- Segmentation rendering as labelmaps and contours
 - User Access Control (UAC)
 - Context specific toolbar and side panel content
 - and many others
@ -79,63 +83,22 @@ forking).
 We offer support through
 [GitHub Issues](https://github.com/OHIF/Viewers/issues/new/choose). You can:

- [Report a Bug 🐛](https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Community%3A+Report+%3Abug%3A&template=---bug-report.md)
- [Request a Feature 🚀](https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Community%3A+Request+%3Ahand%3A&template=---feature-request.md)
- [Ask a Question 🤗](https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Community%3A+Question+%3Aquestion%3A&template=---support-question.md)
+- [Report a Bug 🐛](https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Community%3A+Report+%3Abug%3A%2CAwaiting+Reproduction&projects=&template=bug-report.yml&title=%5BBug%5D+)
+- [Request a Feature 🚀](https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Community%3A+Request+%3Ahand%3A&projects=&template=feature-request.yml&title=%5BFeature+Request%5D+)
+- [Ask a Question 🤗](community.ohif.org)
+- [Slack Channel](https://join.slack.com/t/cornerstonejs/shared_invite/zt-1r8xb2zau-dOxlD6jit3TN0Uwf928w9Q)

 For commercial support, academic collaborations, and answers to common
 questions; please read our
 [documented FAQ](https://docs.ohif.org/faq/index.html#does-ohif-offer-commercial-support).

-## Quick Start Deployment
-
-> This is only one of many ways to configure and deploy the OHIF Viewer. To
-> learn more about your options, and how to choose the best one for your
-> requirements, check out
-> [our deployment recipes and documentation](https://docs.ohif.org/deployment/).
-
-The fastest and easiest way to get started is to include the OHIF Viewer with a
-script tag. In practice, this is as simple as:
-
- Including the following dependencies with script tags:
-  - [React](https://unpkg.com/react@16/umd/react.production.min.js)
-  - [React Dom](https://unpkg.com/react-dom@16/umd/react-dom.production.min.js)
-  - The [OHIF Viewer](https://unpkg.com/@ohif/viewer)
- Have an element with an ID of `root` on the page
- Configure the OHIF Viewer at `window.config`:
-
-```js
-window.config = {
-  routerBasename: '/',
-  servers: {
-    dicomWeb: [
-      {
-        name: 'DCM4CHEE',
-        qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
-        wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
-        qidoSupportsIncludeField: true,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-      },
-    ],
-  },
-};
-```
-
- Install the viewer:
-  `window.OHIFStandaloneViewer.installViewer(window.config);`
-
-This exact setup is demonstrated in this
-[CodeSandbox](https://codesandbox.io/s/viewer-script-tag-tprch) and in our
-[Embedding The Viewer](https://docs.ohif.org/deployment/recipes/embedded-viewer.html)
-deployment recipe.

 ## Developing

 ### Requirements

 - [Yarn 1.17.3+](https://yarnpkg.com/en/docs/install)
- [Node 10+](https://nodejs.org/en/)
+- [Node 16+](https://nodejs.org/en/)
 - Yarn Workspaces should be enabled on your machine:
  - `yarn config set workspaces-experimental true`

@ -171,7 +134,6 @@ also supports a number of commands that can be found in their respective
 | ---------------------------- | ------------------------------------------------------------- |
 | **Develop**                  |                                                               |
 | `dev` or `start`             | Default development experience for Viewer                     |
-| `dev:project <package-name>` | Replace with `core`, `ui`, `i18n`, `cornerstone`, `vtk`, etc. |
 | `test:unit`                  | Jest multi-project test runner; overall coverage              |
 | **Deploy**                   |                                                               |
 | `build`\*                    | Builds production output for our PWA Viewer                   |  |
@ -179,7 +141,7 @@ also supports a number of commands that can be found in their respective
 \* - For more information on our different builds, check out our [Deploy
 Docs][deployment-docs]

-## Projects
+## Project

 The OHIF Medical Image Viewing Platform is maintained as a
 [`monorepo`][monorepo]. This means that this repository, instead of containing a
@ -190,20 +152,32 @@ you'll see the following:
 .
 ├── extensions               #
 │   ├── _example             # Skeleton of example extension
-│   ├── default              #
-│   ├── cornerstone       # image rendering and tools w/ Cornerstone
-│   ├── cornerstone- dicom-sr #
-│   └── measurement-tracking #
+│   ├── default              # basic set of useful functionalities (datasources, panels, etc)
+│   ├── cornerstone       # image rendering and tools w/ Cornerstone3D
+│   ├── cornerstone-dicom-sr # DICOM Structured Report rendering and export
+│   ├── cornerstone-dicom-sr # DICOM Structured Report rendering and export
+│   ├── cornerstone-dicom-seg # DICOM Segmentation rendering and export
+│   ├── cornerstone-dicom-rt # DICOM RTSTRUCT rendering
+│   ├── cornerstone-microscopy # Whole Slide Microscopy rendering
+│   ├── dicom-pdf # PDF rendering
+│   ├── dicom-video # DICOM RESTful Services
+│   ├── measurement-tracking # Longitudinal measurement tracking
+│   ├── tmtv # Total Metabolic Tumor Volume (TMTV) calculation
+|
+
 │
 ├── modes                    #
 │   ├── _example             # Skeleton of example mode
 │   ├── basic-dev-mode       # Basic development mode
-│   └── longitudinal         # Longitudinal mode (measurement tracking)
+│   ├── longitudinal         # Longitudinal mode (measurement tracking)
+│   ├── tmtv       # Total Metabolic Tumor Volume (TMTV) calculation mode
+│   └── microscopy          # Whole Slide Microscopy mode
 │
 ├── platform                 #
 │   ├── core                 # Business Logic
 │   ├── i18n                 # Internationalization Support
 │   ├── ui                   # React component library
+│   ├── docs                 # Documentation
 │   └── viewer               # Connects platform and extension projects
 │
 ├── ...                      # misc. shared configuration
@ -215,22 +189,7 @@ you'll see the following:
 Want to better understand why and how we've structured this repository? Read
 more about it in our [Architecture Documentation][ohif-architecture].

-### Platform

-These projects comprise the
-
-| Name                            | Description                                                                                          | Links             |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------- | ----------------- |
-| [@ohif/core][platform-core]     | Business logic and classes that model the data, services, and extensions that are framework agnostic | [NPM][core-npm]   |
-| [@ohif/i18n][platform-i18n]     | Language files and small API for wrapping component/ui text for translations                         | [NPM][i18n-npm]   |
-| [@ohif/viewer][platform-viewer] | The OHIF Viewer. Where we consume and configure all platform library's and extensions                | [NPM][viewer-npm] |
-| [@ohif/ui][platform-ui]         | Reusable React components we consume and compose to build our Viewer's UI                            | [NPM][ui-npm]     |
-
-### Extensions
-
-This is a list of Extensions maintained by the OHIF Core team. It is possible to
-customize and configure these extensions, and you can even create your own. You
-can [read more about extensions here][ohif-extensions].

 | Name                                                 | Description                                           | Links                  |
 | ---------------------------------------------------- | ----------------------------------------------------- | ---------------------- |
@ -298,9 +257,9 @@ MIT © [OHIF](https://github.com/OHIF)
 [semantic-image]: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
 [semantic-url]: https://github.com/semantic-release/semantic-release
 <!-- ROW -->
-[npm-url]: https://npmjs.org/package/@ohif/viewer
-[npm-downloads-image]: https://img.shields.io/npm/dm/@ohif/viewer.svg?style=flat-square
-[npm-version-image]: https://img.shields.io/npm/v/@ohif/viewer.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/@ohif/app
+[npm-downloads-image]: https://img.shields.io/npm/dm/@ohif/app.svg?style=flat-square
+[npm-version-image]: https://img.shields.io/npm/v/@ohif/app.svg?style=flat-square
 [docker-pulls-img]: https://img.shields.io/docker/pulls/ohif/viewer.svg?style=flat-square
 [docker-image-url]: https://hub.docker.com/r/ohif/viewer
 [license-image]: https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square
@ -316,7 +275,7 @@ MIT © [OHIF](https://github.com/OHIF)
 [deployment-docs]: https://docs.ohif.org/deployment/
 [react-url]: https://reactjs.org/
 [pwa-url]: https://developers.google.com/web/progressive-web-apps/
-[ohif-viewer-url]: https://www.npmjs.com/package/@ohif/viewer
+[ohif-viewer-url]: https://www.npmjs.com/package/@ohif/app
 [configuration-url]: https://docs.ohif.org/configuring/
 [extensions-url]: https://docs.ohif.org/extensions/
 <!-- Platform -->
@ -326,8 +285,8 @@ MIT © [OHIF](https://github.com/OHIF)
 [i18n-npm]: https://www.npmjs.com/package/@ohif/i18n
 [platform-ui]: platform/ui/README.md
 [ui-npm]: https://www.npmjs.com/package/@ohif/ui
-[platform-viewer]: platform/viewer/README.md
-[viewer-npm]: https://www.npmjs.com/package/@ohif/viewer
+[platform-viewer]: platform/app/README.md
+[viewer-npm]: https://www.npmjs.com/package/@ohif/app
 <!-- Extensions -->
 [extension-cornerstone]: extensions/cornerstone/README.md
 [cornerstone-npm]: https://www.npmjs.com/package/@ohif/extension-cornerstone
--- a/commit.txt
+++ b/commit.txt
@ -0,0 +1 @@
+aaae33c7a2ea7fcd127634f64bff2eb5d4b15bf3
--- a/extensions/cornerstone-dicom-rt/.webpack/webpack.dev.js
+++ b/extensions/cornerstone-dicom-rt/.webpack/webpack.dev.js
@ -1,8 +1,12 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/cornerstone-dicom-rt/.webpack/webpack.prod.js
+++ b/extensions/cornerstone-dicom-rt/.webpack/webpack.prod.js
@ -1,63 +1,55 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const pkg = require('../package.json');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const pkg = require('./../package.json');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
+  .BundleAnalyzerPlugin;

-const outputFile = 'index.umd.js';
-const rootDir = path.resolve(__dirname, '../');
-const outputFolder = path.join(__dirname, `../dist/umd/${pkg.name}/`);
-
-// Todo: add ESM build for the extension in addition to umd build
-
-const config = {
-  mode: 'production',
-  entry: rootDir + '/' + pkg.module,
-  devtool: 'source-map',
-  output: {
-    path: outputFolder,
-    filename: outputFile,
-    library: pkg.name,
-    libraryTarget: 'umd',
-    chunkFilename: '[name].chunk.js',
-    umdNamedDefine: true,
-    globalObject: "typeof self !== 'undefined' ? self : this",
-  },
-  externals: [
-    {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react',
-      },
-      '@ohif/core': {
-        commonjs2: '@ohif/core',
-        commonjs: '@ohif/core',
-        amd: '@ohif/core',
-        root: '@ohif/core',
-      },
-      '@ohif/ui': {
-        commonjs2: '@ohif/ui',
-        commonjs: '@ohif/ui',
-        amd: '@ohif/ui',
-        root: '@ohif/ui',
-      },
-    },
-  ],
-  module: {
-    rules: [
-      {
-        test: /(\.jsx|\.js|\.tsx|\.ts)$/,
-        loader: 'babel-loader',
-        exclude: /(node_modules|bower_components)/,
-        resolve: {
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js', '.jsx', '.tsx', '.ts'],
-  },
+const ROOT_DIR = path.join(__dirname, './..');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
 };

-module.exports = config;
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, ENTRY, DIST_DIR });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: false,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-extension-cornerstone-dicom-rt',
+      libraryTarget: 'umd',
+      filename: pkg.main,
+    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
+    plugins: [
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+      }),
+      // new BundleAnalyzerPlugin(),
+    ],
+  });
+};
--- a/extensions/cornerstone-dicom-rt/package.json
+++ b/extensions/cornerstone-dicom-rt/package.json
@ -1,16 +1,19 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "DICOM RT read workflow",
  "author": "OHIF",
  "license": "MIT",
-  "main": "dist/umd/@ohif/dicom-rt/index.umd.js",
+  "main": "dist/ohif-extension-cornerstone-dicom-rt.umd.js",
  "module": "src/index.tsx",
  "files": [
    "dist/**",
    "public/**",
    "README.md"
  ],
+  "publishConfig": {
+    "access": "public"
+  },
  "repository": "OHIF/Viewers",
  "keywords": [
    "ohif-extension"
@ -21,17 +24,17 @@
    "yarn": ">=1.18.0"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:dicom-seg": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/i18n": "^1.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/i18n": "3.5.0-beta.1",
    "prop-types": "^15.6.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
@ -53,11 +56,11 @@
    "@babel/plugin-transform-arrow-functions": "^7.2.0",
    "@babel/plugin-transform-regenerator": "^7.16.7",
    "@babel/plugin-transform-runtime": "^7.17.0",
-    "babel-plugin-inline-react-svg": "^2.0.1",
    "@babel/preset-env": "^7.5.0",
    "@babel/preset-react": "^7.16.7",
    "babel-eslint": "^8.0.3",
    "babel-loader": "^8.0.0-beta.4",
+    "babel-plugin-inline-react-svg": "^2.0.1",
    "clean-webpack-plugin": "^4.0.0",
    "copy-webpack-plugin": "^10.2.0",
    "cross-env": "^7.0.3",
@ -65,7 +68,7 @@
    "eslint": "^5.0.1",
    "eslint-loader": "^2.0.0",
    "webpack": "^5.50.0",
-    "webpack-merge": "^5.7.3",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.2",
+    "webpack-merge": "^5.7.3"
  }
 }
--- a/extensions/cornerstone-dicom-seg/.webpack/webpack.dev.js
+++ b/extensions/cornerstone-dicom-seg/.webpack/webpack.dev.js
@ -1,8 +1,12 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/cornerstone-dicom-seg/.webpack/webpack.prod.js
+++ b/extensions/cornerstone-dicom-seg/.webpack/webpack.prod.js
@ -1,63 +1,60 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const pkg = require('../package.json');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');

-const outputFile = 'index.umd.js';
-const rootDir = path.resolve(__dirname, '../');
-const outputFolder = path.join(__dirname, `../dist/umd/${pkg.name}/`);
+const pkg = require('./../package.json');

-// Todo: add ESM build for the extension in addition to umd build
-
-const config = {
-  mode: 'production',
-  entry: rootDir + '/' + pkg.module,
-  devtool: 'source-map',
-  output: {
-    path: outputFolder,
-    filename: outputFile,
-    library: pkg.name,
-    libraryTarget: 'umd',
-    chunkFilename: '[name].chunk.js',
-    umdNamedDefine: true,
-    globalObject: "typeof self !== 'undefined' ? self : this",
-  },
-  externals: [
-    {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react',
-      },
-      '@ohif/core': {
-        commonjs2: '@ohif/core',
-        commonjs: '@ohif/core',
-        amd: '@ohif/core',
-        root: '@ohif/core',
-      },
-      '@ohif/ui': {
-        commonjs2: '@ohif/ui',
-        commonjs: '@ohif/ui',
-        amd: '@ohif/ui',
-        root: '@ohif/ui',
-      },
-    },
-  ],
-  module: {
-    rules: [
-      {
-        test: /(\.jsx|\.js|\.tsx|\.ts)$/,
-        loader: 'babel-loader',
-        exclude: /(node_modules|bower_components)/,
-        resolve: {
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js', '.jsx', '.tsx', '.ts'],
-  },
+const ROOT_DIR = path.join(__dirname, '../');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
 };

-module.exports = config;
+const outputName = `ohif-${pkg.name.split('/').pop()}`;
+
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: true,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-extension-cornerstone-dicom-seg',
+      libraryTarget: 'umd',
+      filename: pkg.main,
+    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
+    plugins: [
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+      }),
+      // new MiniCssExtractPlugin({
+      //   filename: `./dist/${outputName}.css`,
+      //   chunkFilename: `./dist/${outputName}.css`,
+      // }),
+    ],
+  });
+};
--- a/extensions/cornerstone-dicom-seg/package.json
+++ b/extensions/cornerstone-dicom-seg/package.json
@ -1,10 +1,10 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "DICOM SEG read workflow",
  "author": "OHIF",
  "license": "MIT",
-  "main": "dist/umd/@ohif/dicom-seg/index.umd.js",
+  "main": "dist/ohif-extension-cornerstone-dicom-seg.umd.js",
  "module": "src/index.tsx",
  "files": [
    "dist/**",
@ -15,23 +15,26 @@
  "keywords": [
    "ohif-extension"
  ],
+  "publishConfig": {
+    "access": "public"
+  },
  "engines": {
    "node": ">=14",
    "npm": ">=6",
    "yarn": ">=1.18.0"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:dicom-seg": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/i18n": "^1.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/i18n": "3.5.0-beta.1",
    "prop-types": "^15.6.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
@ -53,11 +56,11 @@
    "@babel/plugin-transform-arrow-functions": "^7.2.0",
    "@babel/plugin-transform-regenerator": "^7.16.7",
    "@babel/plugin-transform-runtime": "^7.17.0",
-    "babel-plugin-inline-react-svg": "^2.0.1",
    "@babel/preset-env": "^7.5.0",
    "@babel/preset-react": "^7.16.7",
    "babel-eslint": "^8.0.3",
    "babel-loader": "^8.0.0-beta.4",
+    "babel-plugin-inline-react-svg": "^2.0.1",
    "clean-webpack-plugin": "^4.0.0",
    "copy-webpack-plugin": "^11.0.0",
    "cross-env": "^7.0.3",
@ -65,7 +68,7 @@
    "eslint": "^5.0.1",
    "eslint-loader": "^2.0.0",
    "webpack": "^5.50.0",
-    "webpack-merge": "^5.7.3",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.2",
+    "webpack-merge": "^5.7.3"
  }
 }
--- a/extensions/cornerstone-dicom-seg/src/index.tsx
+++ b/extensions/cornerstone-dicom-seg/src/index.tsx
@ -3,9 +3,7 @@ import React from 'react';

 import { Types } from '@ohif/core';

-import getSopClassHandlerModule, {
-  protocols,
-} from './getSopClassHandlerModule';
+import getSopClassHandlerModule from './getSopClassHandlerModule';
 import PanelSegmentation from './panels/PanelSegmentation';
 import getHangingProtocolModule from './getHangingProtocolModule';

@ -90,8 +88,4 @@ const extension = {
  getHangingProtocolModule,
 };

-export default extension;
-
-// Export the protocols separately to allow for extending it at compile time
-// in other modules
-export { protocols };
+export default extension;
--- a/extensions/cornerstone-dicom-sr/.webpack/webpack.dev.js
+++ b/extensions/cornerstone-dicom-sr/.webpack/webpack.dev.js
@ -3,6 +3,10 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/cornerstone-dicom-sr/.webpack/webpack.prod.js
+++ b/extensions/cornerstone-dicom-sr/.webpack/webpack.prod.js
@ -1,17 +1,23 @@
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
 const path = require('path');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');

 const pkg = require('./../package.json');
-const webpackCommon = require('./../../../.webpack/webpack.base.js');

-const ROOT_DIR = path.join(__dirname, './../');
+const ROOT_DIR = path.join(__dirname, '../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+const outputName = `ohif-${pkg.name.split('/').pop()}`;
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -31,19 +37,25 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-extension-cornerstone-dicom-sr',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
-      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
-      }),
+      // new MiniCssExtractPlugin({
+      //   filename: `./dist/${outputName}.css`,
+      //   chunkFilename: `./dist/${outputName}.css`,
+      // }),
    ],
  });
 };
--- a/extensions/cornerstone-dicom-sr/package.json
+++ b/extensions/cornerstone-dicom-sr/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension for an SR Cornerstone Viewport",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-cornerstone-dicom-sr.umd.js",
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -23,19 +23,19 @@
    "ohif-extension"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev",
    "test:unit": "jest --watchAll",
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": ">=3.0.0",
-    "@ohif/extension-cornerstone": ">=3.0.0",
-    "@ohif/extension-measurement-tracking": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-measurement-tracking": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "^0.29.5",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
@ -44,9 +44,9 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "classnames": "^2.3.2",
    "@cornerstonejs/adapters": "^1.1.0",
    "@cornerstonejs/core": "^1.1.0",
-    "@cornerstonejs/tools": "^1.1.0"
+    "@cornerstonejs/tools": "^1.1.0",
+    "classnames": "^2.3.2"
  }
 }
--- a/extensions/cornerstone/.webpack/webpack.dev.js
+++ b/extensions/cornerstone/.webpack/webpack.dev.js
@ -1,8 +1,12 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/cornerstone/.webpack/webpack.prod.js
+++ b/extensions/cornerstone/.webpack/webpack.prod.js
@ -1,15 +1,22 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
 const pkg = require('./../package.json');

-const ROOT_DIR = path.join(__dirname, './..');
+const ROOT_DIR = path.join(__dirname, '../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+const outputName = `ohif-${pkg.name.split('/').pop()}`;

 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -29,15 +36,25 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-extension-cornerstone',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
+      new MiniCssExtractPlugin({
+        filename: `./dist/${outputName}.css`,
+        chunkFilename: `./dist/${outputName}.css`,
+      }),
    ],
  });
 };
--- a/extensions/cornerstone/jest.config.js
+++ b/extensions/cornerstone/jest.config.js
@ -8,6 +8,6 @@ module.exports = {
  // rootDir: "../.."
  // testMatch: [
  //   //`<rootDir>/platform/${pack.name}/**/*.spec.js`
-  //   "<rootDir>/platform/viewer/**/*.test.js"
+  //   "<rootDir>/platform/app/**/*.test.js"
  // ]
 };
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-cornerstone.umd.js",
  "module": "src/index.tsx",
  "types": "src/types/index.ts",
  "exports": {
@ -25,20 +25,20 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
-    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build": "cross-env NODE_ENV=production webpack --progress --config .webpack/webpack.prod.js",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
-    "@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.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "^0.29.6",
    "dicom-parser": "^1.8.21",
    "hammerjs": "^2.0.8",
--- a/extensions/default/.webpack/webpack.dev.js
+++ b/extensions/default/.webpack/webpack.dev.js
@ -3,6 +3,11 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/default/.webpack/webpack.prod.js
+++ b/extensions/default/.webpack/webpack.prod.js
@ -5,12 +5,18 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');

 const pkg = require('./../package.json');
-const ROOT_DIR = path.join(__dirname, './../');
+
+const ROOT_DIR = path.join(__dirname, '../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.ts`,
+};
+
+const outputName = `ohif-${pkg.name.split('/').pop()}`;

 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -30,18 +36,24 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-extension-default',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
+        filename: `./dist/${outputName}.css`,
+        chunkFilename: `./dist/${outputName}.css`,
      }),
    ],
  });
--- a/extensions/default/package.json
+++ b/extensions/default/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-default",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "Common/default features and functionality for basic image viewing",
  "author": "OHIF Core Team",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-default.umd.js",
  "module": "src/index.ts",
  "publishConfig": {
    "access": "public"
@ -23,15 +23,15 @@
    "ohif-extension"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:dicom-pdf": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/i18n": "^1.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/i18n": "3.5.0-beta.1",
    "dcmjs": "^0.29.5",
    "dicomweb-client": "^0.10.2",
    "prop-types": "^15.6.2",
--- a/extensions/default/src/ViewerLayout/index.tsx
+++ b/extensions/default/src/ViewerLayout/index.tsx
@ -81,7 +81,7 @@ function ViewerLayout({

  const { hotkeyDefinitions, hotkeyDefaults } = hotkeysManager;
  const versionNumber = process.env.VERSION_NUMBER;
-  const buildNumber = process.env.BUILD_NUM;
+  const commitHash = process.env.COMMIT_HASH;

  const menuOptions = [
    {
@ -91,7 +91,7 @@ function ViewerLayout({
        show({
          content: AboutModal,
          title: 'About OHIF Viewer',
-          contentProps: { versionNumber, buildNumber },
+          contentProps: { versionNumber, commitHash },
        }),
    },
    {
--- a/extensions/default/src/commandsModule.ts
+++ b/extensions/default/src/commandsModule.ts
@ -12,7 +12,7 @@ import findViewportsByPosition, {

 import { ContextMenuProps } from './CustomizableContextMenu/types';
 import { NavigateHistory } from './types/commandModuleTypes';
-import { history } from '@ohif/viewer';
+import { history } from '@ohif/app';

 const { subscribeToNextViewportGridChange } = utils;

--- a/extensions/dicom-microscopy/.webpack/webpack.dev.js
+++ b/extensions/dicom-microscopy/.webpack/webpack.dev.js
@ -3,6 +3,11 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/dicom-microscopy/.webpack/webpack.prod.js
+++ b/extensions/dicom-microscopy/.webpack/webpack.prod.js
@ -1,63 +1,61 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const pkg = require('../package.json');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');

-const outputFile = 'index.umd.js';
-const rootDir = path.resolve(__dirname, '../');
-const outputFolder = path.join(__dirname, `../dist/umd/${pkg.name}/`);
+const pkg = require('./../package.json');

-// Todo: add ESM build for the extension in addition to umd build
-
-const config = {
-  mode: 'production',
-  entry: rootDir + '/' + pkg.module,
-  devtool: 'source-map',
-  output: {
-    path: outputFolder,
-    filename: outputFile,
-    library: pkg.name,
-    libraryTarget: 'umd',
-    chunkFilename: '[name].chunk.js',
-    umdNamedDefine: true,
-    globalObject: "typeof self !== 'undefined' ? self : this",
-  },
-  externals: [
-    {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react',
-      },
-      '@ohif/core': {
-        commonjs2: '@ohif/core',
-        commonjs: '@ohif/core',
-        amd: '@ohif/core',
-        root: '@ohif/core',
-      },
-      '@ohif/ui': {
-        commonjs2: '@ohif/ui',
-        commonjs: '@ohif/ui',
-        amd: '@ohif/ui',
-        root: '@ohif/ui',
-      },
-    },
-  ],
-  module: {
-    rules: [
-      {
-        test: /(\.jsx|\.js|\.tsx|\.ts)$/,
-        loader: 'babel-loader',
-        exclude: /(node_modules|bower_components)/,
-        resolve: {
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js', '.jsx', '.tsx', '.ts'],
-  },
+const ROOT_DIR = path.join(__dirname, '../');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
 };

-module.exports = config;
+const outputName = `ohif-${pkg.name.split('/').pop()}`;
+
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: true,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-extension-dicom-microscopy',
+      libraryTarget: 'umd',
+      filename: pkg.main,
+    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(dicom-microscopy-viewer)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
+    plugins: [
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+      }),
+      new MiniCssExtractPlugin({
+        filename: `./dist/${outputName}.css`,
+        chunkFilename: `./dist/${outputName}.css`,
+      }),
+    ],
+  });
+};
--- a/extensions/dicom-microscopy/package.json
+++ b/extensions/dicom-microscopy/package.json
@ -1,10 +1,10 @@
 {
  "name": "@ohif/extension-dicom-microscopy",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension for DICOM microscopy",
  "author": "Bill Wallace, md-prog",
  "license": "MIT",
-  "main": "dist/umd/@ohif/extension-dicom-microscopy/index.umd.js",
+  "main": "dist/ohif-extension-dicom-microscopy.umd.js",
  "files": [
    "dist/**",
    "public/**",
@ -21,17 +21,17 @@
    "yarn": ">=1.18.0"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:dicom-pdf": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/i18n": "^1.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/i18n": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "prop-types": "^15.6.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
--- a/extensions/dicom-microscopy/src/services/MicroscopyService.ts
+++ b/extensions/dicom-microscopy/src/services/MicroscopyService.ts
--- a/extensions/dicom-pdf/.webpack/webpack.dev.js
+++ b/extensions/dicom-pdf/.webpack/webpack.dev.js
@ -0,0 +1,12 @@
+const path = require('path');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, ENTRY, DIST_DIR });
+};
--- a/extensions/dicom-pdf/.webpack/webpack.prod.js
+++ b/extensions/dicom-pdf/.webpack/webpack.prod.js
@ -0,0 +1,55 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
+const path = require('path');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const pkg = require('./../package.json');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
+  .BundleAnalyzerPlugin;
+
+const ROOT_DIR = path.join(__dirname, './..');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, ENTRY, DIST_DIR });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: false,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-extension-dicom-pdf',
+      libraryTarget: 'umd',
+      filename: `${pkg.main}`,
+    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
+    plugins: [
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+      }),
+      // new BundleAnalyzerPlugin(),
+    ],
+  });
+};
--- a/extensions/dicom-pdf/package.json
+++ b/extensions/dicom-pdf/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-dicom-pdf",
-  "version": "3.0.1",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension for PDF display",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-dicom-pdf.umd.js",
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -20,16 +20,16 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev",
    "test:unit": "jest --watchAll",
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "^0.29.5",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
--- a/extensions/dicom-video/.webpack/webpack.dev.js
+++ b/extensions/dicom-video/.webpack/webpack.dev.js
@ -1,8 +1,12 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, ENTRY, DIST_DIR });
 };
--- a/extensions/dicom-video/.webpack/webpack.prod.js
+++ b/extensions/dicom-video/.webpack/webpack.prod.js
@ -1,15 +1,20 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const path = require('path');
 const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const pkg = require('./../package.json');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
+  .BundleAnalyzerPlugin;

 const ROOT_DIR = path.join(__dirname, './..');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};

 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, ENTRY, DIST_DIR });

  return merge(commonConfig, {
    stats: {
@ -25,19 +30,26 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtDICOMSR',
+      library: 'ohif-extension-dicom-video',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
+      // new BundleAnalyzerPlugin(),
    ],
  });
 };
--- a/extensions/dicom-video/package.json
+++ b/extensions/dicom-video/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-dicom-video",
-  "version": "3.0.1",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension for video display",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-dicom-video.umd.js",
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -20,16 +20,16 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev",
    "test:unit": "jest --watchAll",
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "^0.29.5",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
--- a/extensions/measurement-tracking/.webpack/webpack.dev.js
+++ b/extensions/measurement-tracking/.webpack/webpack.dev.js
@ -3,6 +3,10 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/measurement-tracking/.webpack/webpack.prod.js
+++ b/extensions/measurement-tracking/.webpack/webpack.prod.js
@ -2,6 +2,8 @@ const webpack = require('webpack');
 const { merge } = require('webpack-merge');
 const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
+  .BundleAnalyzerPlugin;

 const pkg = require('./../package.json');
 const webpackCommon = require('./../../../.webpack/webpack.base.js');
@ -10,8 +12,12 @@ const ROOT_DIR = path.join(__dirname, './../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -27,23 +33,26 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-extension-measurement-tracking',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
-      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
-      }),
+      // new BundleAnalyzerPlugin(),
    ],
  });
 };
--- a/extensions/measurement-tracking/package.json
+++ b/extensions/measurement-tracking/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-measurement-tracking",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "Tracking features and functionality for basic image viewing",
  "author": "OHIF Core Team",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-measurement-tracking.umd.js",
  "module": "src/index.tsx",
  "publishConfig": {
    "access": "public"
@ -23,30 +23,30 @@
    "ohif-extension"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:dicom-pdf": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "classnames": "^2.3.2",
    "@cornerstonejs/core": "^1.1.0",
    "@cornerstonejs/tools": "^1.1.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-sr": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
+    "classnames": "^2.3.2",
    "dcmjs": "^0.29.5",
    "lodash.debounce": "^4.17.21",
    "prop-types": "^15.6.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "webpack": "^5.50.0",
-    "webpack-merge": "^5.7.3",
-    "@ohif/ui": "^2.0.0"
+    "webpack-merge": "^5.7.3"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/ui": "3.5.0-beta.1",
    "@xstate/react": "^0.8.1",
    "xstate": "^4.10.0"
  }
--- a/extensions/test-extension/.webpack/webpack.dev.js
+++ b/extensions/test-extension/.webpack/webpack.dev.js
@ -1,8 +1,13 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/extensions/test-extension/.webpack/webpack.prod.js
+++ b/extensions/test-extension/.webpack/webpack.prod.js
@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const path = require('path');
 const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const pkg = require('./../package.json');
@ -8,8 +8,12 @@ const ROOT_DIR = path.join(__dirname, './..');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -25,15 +29,22 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtDICOMSR',
+      library: 'ohif-extension-test',
      libraryTarget: 'umd',
      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
--- a/extensions/test-extension/package.json
+++ b/extensions/test-extension/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-test",
-  "version": "0.0.1",
+  "version": "3.5.0-beta.1",
  "description": "OHIF extension used inside e2e testing",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-test.umd.js",
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -20,16 +20,16 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build:package-1": "yarn run build",
    "start": "yarn run dev",
    "test:unit": "jest --watchAll",
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "0.29.4",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
--- a/extensions/tmtv/.webpack/webpack.dev.js
+++ b/extensions/tmtv/.webpack/webpack.dev.js
@ -1,8 +1,8 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

 module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR , ENTRY});
 };
--- a/extensions/tmtv/.webpack/webpack.prod.js
+++ b/extensions/tmtv/.webpack/webpack.prod.js
@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const {merge} = require('webpack-merge');
 const path = require('path');
 const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const pkg = require('./../package.json');
@ -8,8 +8,13 @@ const ROOT_DIR = path.join(__dirname, './..');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
+};
+
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -25,15 +30,21 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtDICOMSR',
+      library: 'ohif-extension-tmtv',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
--- a/extensions/tmtv/package.json
+++ b/extensions/tmtv/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/extension-tmtv",
-  "version": "3.0.1",
-  "description": "OHIF extension for Total Metabolic Tumore Volume",
+  "version": "3.5.0-beta.1",
+  "description": "OHIF extension for Total Metabolic Tumor Volume",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-tmtv.umd.js",
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -20,7 +20,7 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
    "start": "yarn run dev",
@ -28,8 +28,8 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/ui": "3.5.0-beta.1",
    "dcmjs": "^0.29.5",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
--- a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
@ -269,7 +269,7 @@ export default function PanelRoiThresholdSegmentation({
        onClick={() => {
          // navigate to a url in a new tab
          window.open(
-            'https://github.com/OHIF/Viewers/blob/v3-stable/modes/tmtv/README.md',
+            'https://github.com/OHIF/Viewers/blob/master/modes/tmtv/README.md',
            '_blank'
          );
        }}
--- a/increaseEventEmitterLimit.mjs
+++ b/increaseEventEmitterLimit.mjs
@ -0,0 +1,7 @@
+// increase the event emitter limit
+import { EventEmitter } from 'events';
+
+EventEmitter.defaultMaxListeners = 1000;
+
+// process
+process.setMaxListeners(1000);
--- a/lerna.json
+++ b/lerna.json
@ -1,19 +1,6 @@
 {
-  "version": "independent",
+  "version": "3.5.0-beta.1",
  "packages": ["extensions/*", "platform/*", "modes/*"],
  "npmClient": "yarn",
-  "useWorkspaces": true,
-  "command": {
-    "publish": {
-      "ignoreChanges": ["*.md", "*.yml", "*.spec.js", "*.test.js"],
-      "message": "chore(release): publish"
-    },
-    "version": {
-      "allowBranch": "master",
-      "conventionalCommits": true,
-      "createRelease": "github",
-      "yes": true,
-      "message": "chore(release): publish [skip ci]"
-    }
-  }
+  "useWorkspaces": true
 }
--- a/modes/basic-dev-mode/.webpack/webpack.dev.js
+++ b/modes/basic-dev-mode/.webpack/webpack.dev.js
@ -1,8 +1,13 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/modes/basic-dev-mode/.webpack/webpack.prod.js
+++ b/modes/basic-dev-mode/.webpack/webpack.prod.js
@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const path = require('path');
 const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const pkg = require('./../package.json');
@ -8,8 +8,13 @@ const ROOT_DIR = path.join(__dirname, './..');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -25,15 +30,21 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFModeLongitudinal',
+      library: 'ohif-mode-basic-dev',
      libraryTarget: 'umd',
-      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
--- a/modes/basic-dev-mode/package.json
+++ b/modes/basic-dev-mode/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/mode-basic-dev-mode",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "Basic OHIF Viewer Using Cornerstone",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-mode-basic-dev-mode.umd.js",
  "module": "src/index.js",
  "engines": {
    "node": ">=10",
@ -20,7 +20,7 @@
    "access": "public"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
@ -29,12 +29,12 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
-    "@ohif/extension-dicom-pdf": "^3.0.1",
-    "@ohif/extension-dicom-video": "^3.0.1"
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-sr": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/extension-dicom-pdf": "3.5.0-beta.1",
+    "@ohif/extension-dicom-video": "3.5.0-beta.1"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13"
--- a/modes/basic-test-mode/.webpack/webpack.dev.js
+++ b/modes/basic-test-mode/.webpack/webpack.dev.js
@ -3,6 +3,11 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/modes/basic-test-mode/.webpack/webpack.prod.js
+++ b/modes/basic-test-mode/.webpack/webpack.prod.js
@ -10,9 +10,12 @@ const ROOT_DIR = path.join(__dirname, './../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-const fileName = 'index.umd.js';
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -28,23 +31,30 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-mode-basic-test',
      libraryTarget: 'umd',
      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
-      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
-      }),
+      // new MiniCssExtractPlugin({
+      //   filename: './dist/[name].css',
+      //   chunkFilename: './dist/[id].css',
+      // }),
    ],
  });
 };
--- a/modes/basic-test-mode/package.json
+++ b/modes/basic-test-mode/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/mode-test",
-  "version": "0.0.1",
+  "version": "3.5.0-beta.1",
  "description": "Basic mode for testing",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-mode-test.umd.js",
  "module": "src/index.js",
  "engines": {
    "node": ">=14",
@ -23,7 +23,7 @@
    "ohif-mode"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
@ -32,14 +32,14 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
-    "@ohif/extension-dicom-pdf": "^3.0.1",
-    "@ohif/extension-dicom-video": "^3.0.1",
-    "@ohif/extension-measurement-tracking": "^3.0.0",
-    "@ohif/extension-test": "0.0.1"
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-sr": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/extension-dicom-pdf": "3.5.0-beta.1",
+    "@ohif/extension-dicom-video": "3.5.0-beta.1",
+    "@ohif/extension-measurement-tracking": "3.5.0-beta.1",
+    "@ohif/extension-test": "3.5.0-beta.1"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13"
--- a/modes/longitudinal/.webpack/webpack.dev.js
+++ b/modes/longitudinal/.webpack/webpack.dev.js
@ -3,6 +3,11 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/modes/longitudinal/.webpack/webpack.prod.js
+++ b/modes/longitudinal/.webpack/webpack.prod.js
@ -9,10 +9,12 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const ROOT_DIR = path.join(__dirname, './../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};

-const fileName = 'index.umd.js';
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -28,23 +30,30 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-mode-longitudinal',
      libraryTarget: 'umd',
      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
-      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
-      }),
+      // new MiniCssExtractPlugin({
+      //   filename: './dist/[name].css',
+      //   chunkFilename: './dist/[id].css',
+      // }),
    ],
  });
 };
--- a/modes/longitudinal/package.json
+++ b/modes/longitudinal/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/mode-longitudinal",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "Longitudinal Workflow",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-mode-longitudinal.js",
  "module": "src/index.js",
  "engines": {
    "node": ">=14",
@ -23,7 +23,7 @@
    "ohif-mode"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
@ -32,15 +32,15 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-seg": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-rt": "^3.0.0",
-    "@ohif/extension-dicom-pdf": "^3.0.1",
-    "@ohif/extension-dicom-video": "^3.0.1",
-    "@ohif/extension-measurement-tracking": "^3.0.0"
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-rt": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-seg": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-sr": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/extension-dicom-pdf": "3.5.0-beta.1",
+    "@ohif/extension-dicom-video": "3.5.0-beta.1",
+    "@ohif/extension-measurement-tracking": "3.5.0-beta.1"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13"
--- a/modes/microscopy/.webpack/webpack.dev.js
+++ b/modes/microscopy/.webpack/webpack.dev.js
@ -3,6 +3,13 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/modes/microscopy/.webpack/webpack.prod.js
+++ b/modes/microscopy/.webpack/webpack.prod.js
@ -1,62 +1,59 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const pkg = require('../package.json');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');

-const outputFile = 'index.umd.js';
-const rootDir = path.resolve(__dirname, '../');
-const outputFolder = path.join(__dirname, `../dist/umd/${pkg.name}/`);
+const pkg = require('./../package.json');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');

-// Todo: add ESM build for the mode in addition to umd build
-const config = {
-  mode: 'production',
-  entry: rootDir + '/' + pkg.module,
-  devtool: 'source-map',
-  output: {
-    path: outputFolder,
-    filename: outputFile,
-    library: pkg.name,
-    libraryTarget: 'umd',
-    chunkFilename: '[name].chunk.js',
-    umdNamedDefine: true,
-    globalObject: "typeof self !== 'undefined' ? self : this",
-  },
-  externals: [
-    {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react',
-      },
-      '@ohif/core': {
-        commonjs2: '@ohif/core',
-        commonjs: '@ohif/core',
-        amd: '@ohif/core',
-        root: '@ohif/core',
-      },
-      '@ohif/ui': {
-        commonjs2: '@ohif/ui',
-        commonjs: '@ohif/ui',
-        amd: '@ohif/ui',
-        root: '@ohif/ui',
-      },
-    },
-  ],
-  module: {
-    rules: [
-      {
-        test: /(\.jsx|\.js|\.tsx|\.ts)$/,
-        loader: 'babel-loader',
-        exclude: /(node_modules|bower_components)/,
-        resolve: {
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js', '.jsx', '.tsx', '.ts'],
-  },
+const ROOT_DIR = path.join(__dirname, './../');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+const ENTRY = {
+  app: `${SRC_DIR}/index.tsx`,
 };

-module.exports = config;
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: false,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-mode-microscopy',
+      libraryTarget: 'umd',
+      libraryExport: 'default',
+      filename: pkg.main,
+    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
+    plugins: [
+      new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+      }),
+      // new MiniCssExtractPlugin({
+      //   filename: './dist/[name].css',
+      //   chunkFilename: './dist/[id].css',
+      // }),
+    ],
+  });
+};
--- a/modes/microscopy/package.json
+++ b/modes/microscopy/package.json
@ -1,10 +1,10 @@
 {
  "name": "@ohif/mode-microscopy",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "OHIF mode for DICOM microscopy",
-  "author": "Bill Wallace, md-prog",
+  "author": "OHIF",
  "license": "MIT",
-  "main": "dist/umd/@ohif/mode-microscopy/index.umd.js",
+  "main": "dist/ohif-mode-microscopy.umd.js",
  "files": [
    "dist/**",
    "public/**",
@ -14,6 +14,9 @@
  "keywords": [
    "ohif-mode"
  ],
+  "publishConfig": {
+    "access": "public"
+  },
  "module": "src/index.tsx",
  "engines": {
    "node": ">=14",
@ -21,7 +24,7 @@
    "yarn": ">=1.16.0"
  },
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
@ -30,8 +33,8 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-dicom-microscopy": "^3.0.0"
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-dicom-microscopy": "3.5.0-beta.1"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13"
@ -59,7 +62,7 @@
    "eslint": "^5.0.1",
    "eslint-loader": "^2.0.0",
    "webpack": "^5.50.0",
-    "webpack-merge": "^5.7.3",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.2",
+    "webpack-merge": "^5.7.3"
  }
 }
--- a/modes/tmtv/.webpack/webpack.dev.js
+++ b/modes/tmtv/.webpack/webpack.dev.js
@ -3,6 +3,11 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };
--- a/modes/tmtv/.webpack/webpack.prod.js
+++ b/modes/tmtv/.webpack/webpack.prod.js
@ -10,9 +10,13 @@ const ROOT_DIR = path.join(__dirname, './../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');

-const fileName = 'index.umd.js';
+const ENTRY = {
+  app: `${SRC_DIR}/index.js`,
+};
+
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });

  return merge(commonConfig, {
    stats: {
@ -28,23 +32,30 @@ module.exports = (env, argv) => {
    },
    optimization: {
      minimize: true,
-      sideEffects: true,
+      sideEffects: false,
    },
    output: {
      path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-mode-tmtv',
      libraryTarget: 'umd',
      libraryExport: 'default',
      filename: pkg.main,
    },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
    plugins: [
      new webpack.optimize.LimitChunkCountPlugin({
        maxChunks: 1,
      }),
-      new MiniCssExtractPlugin({
-        filename: './dist/[name].css',
-        chunkFilename: './dist/[id].css',
-      }),
+      // new MiniCssExtractPlugin({
+      //   filename: './dist/[name].css',
+      //   chunkFilename: './dist/[id].css',
+      // }),
    ],
  });
 };
--- a/modes/tmtv/package.json
+++ b/modes/tmtv/package.json
@ -1,11 +1,11 @@
 {
  "name": "@ohif/mode-tmtv",
-  "version": "3.0.0",
+  "version": "3.5.0-beta.1",
  "description": "Total Metabolic Tumor Volume Workflow",
  "author": "OHIF",
  "license": "MIT",
  "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-mode-tmtv.umd.js",
  "module": "src/index.js",
  "engines": {
    "node": ">=14",
@ -23,7 +23,7 @@
    "ohif-mode"
  ],
  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
    "dev:cornerstone": "yarn run dev",
    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
    "build:package": "yarn run build",
@ -32,13 +32,13 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
  },
  "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/extension-default": "^3.0.0",
-    "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
-    "@ohif/extension-dicom-pdf": "^3.0.1",
-    "@ohif/extension-dicom-video": "^3.0.1",
-    "@ohif/extension-measurement-tracking": "^3.0.0"
+    "@ohif/core": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone": "3.5.0-beta.1",
+    "@ohif/extension-cornerstone-dicom-sr": "3.5.0-beta.1",
+    "@ohif/extension-default": "3.5.0-beta.1",
+    "@ohif/extension-dicom-pdf": "3.5.0-beta.1",
+    "@ohif/extension-dicom-video": "3.5.0-beta.1",
+    "@ohif/extension-measurement-tracking": "3.5.0-beta.1"
  },
  "dependencies": {
    "@babel/runtime": "^7.20.13"
--- a/nx.json
+++ b/nx.json
@ -51,7 +51,7 @@
      "dependsOn": ["^test:e2e:serve"]
    },
    "build": {
-      "outputs": ["{projectRoot}/platform/viewer/dist"]
+      "outputs": ["{projectRoot}/platform/app/dist"]
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -26,6 +26,7 @@
    "build:ui:deploy-preview": "lerna run build:ui:deploy-preview --stream",
    "build:demo": "lerna run build:viewer:demo --stream",
    "build:package-all": "lerna run build:package --parallel --stream",
+    "build:package-all-1": "lerna run build:package-1 --parallel --stream",
    "dev": "lerna run dev:viewer --stream",
    "dev:project": ".scripts/dev.sh",
    "dev:orthanc": "lerna run dev:orthanc --stream",
@ -50,8 +51,7 @@
    "lerna:clean": "lerna clean",
    "lerna:cache": "./netlify-lerna-cache.sh",
    "lerna:restore": "./netlify-lerna-restore.sh",
-    "lerna:version": "npx lerna version prerelease --force-publish",
-    "lerna:publish": "lerna publish from-package --dist-tag next",
+    "lerna:customVersion": "node version.mjs",
    "link-list": "npm ls --depth=0 --link=true"
  },
  "dependencies": {
@ -103,6 +103,7 @@
    "eslint-plugin-react-hooks": "^4.4.0",
    "eslint-plugin-tsdoc": "^0.2.11",
    "eslint-webpack-plugin": "^2.5.3",
+    "execa": "^7.1.1",
    "extract-css-chunks-webpack-plugin": "^4.5.4",
    "html-webpack-plugin": "^5.3.2",
    "husky": "^3.0.0",
@ -120,6 +121,7 @@
    "postcss-preset-env": "^7.4.3",
    "prettier": "^1.18.2",
    "react-hot-loader": "^4.13.0",
+    "semver": "^7.5.1",
    "serve": "^14.2.0",
    "shader-loader": "^1.3.1",
    "start-server-and-test": "^1.10.0",
--- a/platform/viewer/.all-contributorsrc
+++ b/platform/viewer/.all-contributorsrc
--- a/platform/viewer/.browserslistrc
+++ b/platform/viewer/.browserslistrc
--- a/platform/viewer/.dockerignore
+++ b/platform/viewer/.dockerignore
--- a/platform/viewer/.env
+++ b/platform/viewer/.env
--- a/platform/viewer/.env.example
+++ b/platform/viewer/.env.example
--- a/platform/viewer/.eslintignore
+++ b/platform/viewer/.eslintignore
--- a/platform/viewer/.recipes/Nginx-Dcm4che/docker-compose-dcm4che.env
+++ b/platform/viewer/.recipes/Nginx-Dcm4che/docker-compose-dcm4che.env
--- a/platform/viewer/.recipes/Nginx-Dcm4che/docker-compose.yml
+++ b/platform/viewer/.recipes/Nginx-Dcm4che/docker-compose.yml
--- a/platform/viewer/.recipes/Nginx-Dcm4che/etc/localtime
+++ b/platform/viewer/.recipes/Nginx-Dcm4che/etc/localtime
--- a/platform/viewer/.recipes/Nginx-Dcm4che/etc/timezone
+++ b/platform/viewer/.recipes/Nginx-Dcm4che/etc/timezone
--- a/platform/viewer/.recipes/Nginx-Dcm4che/nginx-proxy/conf/nginx.conf
+++ b/platform/viewer/.recipes/Nginx-Dcm4che/nginx-proxy/conf/nginx.conf
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/.dockerignore
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/.dockerignore
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/.env
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/.env
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/nginx.conf
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/nginx.conf
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/ohif-keycloak-realm.json
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/ohif-keycloak-realm.json
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/orthanc.json
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/config/orthanc.json
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/docker-compose.yml
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/docker-compose.yml
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/dockerfile
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/dockerfile
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/account/.githold
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/account/.githold
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/admin/.githold
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/admin/.githold
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/email/.githold
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/email/.githold
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/resources/css/styles.css
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/resources/css/styles.css
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/resources/img/background.jpg
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/resources/img/background.jpg
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/theme.properties
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/theme.properties
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/welcome/.githold
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/welcome/.githold
--- a/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/orthanc-db/.gitignore
+++ b/platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/volumes/orthanc-db/.gitignore
--- a/platform/viewer/.recipes/OpenResty-Orthanc/.dockerignore
+++ b/platform/viewer/.recipes/OpenResty-Orthanc/.dockerignore
--- a/platform/viewer/.recipes/OpenResty-Orthanc/.env
+++ b/platform/viewer/.recipes/OpenResty-Orthanc/.env
--- a/Show More
+++ b/Show More