chore(release): publish %s [skip ci]

- @ohif/extension-cornerstone@0.0.39-alpha.0
 - @ohif/extension-dicom-html@0.0.4-alpha.0
 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0
 - @ohif/extension-dicom-pdf@0.0.8-alpha.0
 - @ohif/extension-vtk@0.1.4-alpha.0
 - @ohif/core@0.11.1-alpha.0
 - @ohif/i18n@0.2.3-alpha.0
 - @ohif/ui@0.2.18-alpha.0
 - @ohif/viewer@0.0.22-alpha.0

.browserslistrc

@@ -1,6 +0,0 @@
-# Browsers that we support
-
-> 1%
-IE 11
-not dead
-not op_mini all

.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
-./node_modules/.bin/gh-pages \
-  --silent \
-  --repo https://$GITHUB_TOKEN@github.com/OHIF/Viewers.git \
-  --message 'Autogenerated Message: [ci skip]' \
-	--dist docs/latest/_book

.circleci/config.yml

@@ -9,27 +9,19 @@ version: 2.1
 # create pull request previews and to update `https://docs.ohif.org`
 ###
 
-## https://github.com/cypress-io/circleci-orb
-##
 orbs:
   codecov: codecov/codecov@1.0.5
-  cypress: cypress-io/cypress@1.11.0
 
 defaults: &defaults
   docker:
-    - image: circleci/node:12.9.1
-      environment:
-        TERM: xterm # Enable colors in term
+    - image: circleci/node:10.16.0
   working_directory: ~/repo
 
 jobs:
-  UNIT_TESTS:
+  PR_UNIT_TESTS:
     <<: *defaults
-    steps:
-      # Update yarn
-      - run: yarn -v
-      #- run: rm -rf ~/.yarn && npm i -g yarn && yarn -v
 
+    steps:
       # Enable yarn workspaces
       - run: yarn config set workspaces-experimental true
 
@@ -37,32 +29,30 @@ jobs:
       - checkout:
           post:
             - git fetch --all
-
       - restore_cache:
           name: Restore Yarn and Cypress Package Cache
           keys:
             # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
-
+            - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - yarn-packages-v1-{{ .Branch }}-
+            - yarn-packages-v1-
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
-
       - save_cache:
           name: Save Yarn Package Cache
           paths:
             - ~/.cache ## Cache yarn and Cypress
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
 
       # RUN TESTS
       - run:
-          name: 'JavaScript Test Suite'
+          name: "JavaScript Test Suite"
           command: yarn run test:unit:ci
 
       # PLATFORM/VIEWER
       - run:
-          name: 'VIEWER: Combine report output'
+          name: "VIEWER: Combine report output"
           command: |
             viewerCov="/home/circleci/repo/platform/viewer/coverage"
             touch "${viewerCov}/reports"
@@ -71,12 +61,12 @@ jobs:
             cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
             echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
       - codecov/upload:
-          file: '/home/circleci/repo/platform/viewer/coverage/reports'
-          flags: 'viewer'
+          file: "/home/circleci/repo/platform/viewer/coverage/reports"
+          flags: "viewer"
 
       # PLATFORM/CORE
       - run:
-          name: 'CORE: Combine report output'
+          name: "CORE: Combine report output"
           command: |
             coreCov="/home/circleci/repo/platform/core/coverage"
             touch "${coreCov}/reports"
@@ -85,15 +75,13 @@ jobs:
             cat "${coreCov}/lcov.info" >> "${coreCov}/reports"
             echo "\<<\<<\<< EOF" >> "${coreCov}/reports"
       - codecov/upload:
-          file: '/home/circleci/repo/platform/core/coverage/reports'
-          flags: 'core'
+          file: "/home/circleci/repo/platform/core/coverage/reports"
+          flags: "core"
 
-  UNIT_TESTS_PERSIST_WORKSPACE:
+  MERGE_UNIT_TESTS:
     <<: *defaults
-    steps:
-      # Update yarn
-      #- run: rm -rf ~/.yarn && npm i -g yarn && yarn -v
 
+    steps:
       # Enable yarn workspaces
       - run: yarn config set workspaces-experimental true
 
@@ -101,32 +89,30 @@ jobs:
       - checkout:
           post:
             - git fetch --all
-
       - restore_cache:
           name: Restore Yarn and Cypress Package Cache
           keys:
             # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
-
+            - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - yarn-packages-v1-{{ .Branch }}-
+            - yarn-packages-v1-
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
-
       - save_cache:
           name: Save Yarn Package Cache
           paths:
             - ~/.cache ## Cache yarn and Cypress
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
 
       # RUN TESTS
       - run:
-          name: 'JavaScript Test Suite'
+          name: "JavaScript Test Suite"
           command: yarn run test:unit:ci
 
       # PLATFORM/VIEWER
       - run:
-          name: 'VIEWER: Combine report output'
+          name: "VIEWER: Combine report output"
           command: |
             viewerCov="/home/circleci/repo/platform/viewer/coverage"
             touch "${viewerCov}/reports"
@@ -135,12 +121,12 @@ jobs:
             cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
             echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
       - codecov/upload:
-          file: '/home/circleci/repo/platform/viewer/coverage/reports'
-          flags: 'viewer'
+          file: "/home/circleci/repo/platform/viewer/coverage/reports"
+          flags: "viewer"
 
       # PLATFORM/CORE
       - run:
-          name: 'CORE: Combine report output'
+          name: "CORE: Combine report output"
           command: |
             coreCov="/home/circleci/repo/platform/core/coverage"
             touch "${coreCov}/reports"
@@ -149,39 +135,38 @@ jobs:
             cat "${coreCov}/lcov.info" >> "${coreCov}/reports"
             echo "\<<\<<\<< EOF" >> "${coreCov}/reports"
       - codecov/upload:
-          file: '/home/circleci/repo/platform/core/coverage/reports'
-          flags: 'core'
-
-      # Persist :+1:
-      - persist_to_workspace: &persist_to_workspace
-          root: ~/repo
-          paths: .
-
-  NPM_PUBLISH:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run:
-          name: Avoid hosts unknown for github
-          command:
-            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking
-            no\n" > ~/.ssh/config
-      - run: git config --global user.email "danny.ri.brown+ohif-bot@gmail.com"
-      - run: git config --global user.name "ohif-bot"
-      - run:
-          name: Authenticate with registry
-          command:
-            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
-      - run: npx lerna version
-      - run: npx lerna publish from-package
+          file: "/home/circleci/repo/platform/core/coverage/reports"
+          flags: "core"
 
       # Persist :+1:
       - persist_to_workspace:
           root: ~/repo
           paths: .
 
-  DOCS_PUBLISH:
+  e2e_test:
+    working_directory: ~/repo
+    docker:
+      - image: cypress/base:8
+        environment:
+          ## this enables colors in the output
+          TERM: xterm
+    steps:
+      - attach_workspace:
+          at: ~/repo
+      - restore_cache:
+          name: Restore Yarn and Cypress Package Cache
+          keys:
+            # when lock file changes, use increasingly general patterns to restore cache
+            - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - yarn-packages-v1-{{ .Branch }}-
+            - yarn-packages-v1-
+      # - run: $(yarn bin)/cypress run --record
+      # Shouldn't be needed if we're using a package cache that contains Cypress
+      # Could do a check here, if it doesn't exist, install cypress?
+      - run: yarn install
+      - run: yarn run test:e2e:ci
+
+  npm_publish:
     <<: *defaults
     steps:
       - attach_workspace:
@@ -191,32 +176,55 @@ jobs:
           command:
             mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking
             no\n" > ~/.ssh/config
-      - run: git config --global user.email "danny.ri.brown+ohif-bot@gmail.com"
-      - run: git config --global user.name "ohif-bot"
-      - run: yarn global add gitbook-cli
-      - run: yarn global add gh-pages
-      - run: chmod +x ~/repo/.circleci/build-and-publish-docs.sh
-      - run: ~/repo/.circleci/build-and-publish-docs.sh
+      # --no-ci argument is not ideal; however, semantic-rlease thinks we're
+      # attempting to run it from a `pr`, which is not the case
+      - run:
+          name: Publish using Semantic Release
+          command: npx semantic-release --debug
+      # Persist :+1:
+      - persist_to_workspace:
+          root: ~/repo
+          paths: .
 
-  DOCKER_MASTER_PUBLISH:
+  docs_publish:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo
+      - run:
+          name: Avoid hosts unknown for github
+          command:
+            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking
+            no\n" > ~/.ssh/config
+      - run: git config --global user.email "gh-pages@localhost"
+      - run: git config --global user.name "npm gh-pages"
+      - run: yarn global add gh-pages
+      - run:
+          name: Generate Docs
+          command: yarn run staticDeploy
+      - run:
+          name: Publish Docs
+          command: yarn run docs:publish
+
+  docker_publish:
     <<: *defaults
     steps:
       - attach_workspace:
           at: ~/repo
       - setup_remote_docker:
-          docker_layer_caching: false
+          docker_layer_caching: true
       - run:
           name: Build and push Docker image
           command: |
             # This file will exist if a new version was published by
             # our `semantic-release` command in the previous job
-            if [[ ! -e platform/viewer/success_version.txt ]]; then
+            if [[ ! -e tmp/updated-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=$(cat tmp/updated-version.txt)
               export IMAGE_VERSION_FULL=v$IMAGE_VERSION.${CIRCLE_BUILD_NUM}
               echo $IMAGE_VERSION
               echo $IMAGE_VERSION_FULL
@@ -227,69 +235,45 @@ jobs:
               docker push ohif/$IMAGE_NAME:latest
             fi
 
-  DOCKER_PR_PUBLISH:
+  build_demo_site:
     <<: *defaults
     steps:
-      # Enable yarn workspaces
-      - run: yarn config set workspaces-experimental true
-
-      # Checkout code and ALL Git Tags
-      - checkout:
-          post:
-            - git fetch --all
-
+      # Download and cache dependencies
+      - checkout
       - restore_cache:
-          name: Restore Yarn and Cypress Package Cache
+          name: Restore Yarn Package Cache
           keys:
             # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
-
+            - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - yarn-packages-v1-{{ .Branch }}-
+            - yarn-packages-v1-
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
-
-      - setup_remote_docker:
-          docker_layer_caching: false
-
-      - run:
-          name: Build and push Docker image
-          command: |
-            # Remove npm config
-            rm -f ./.npmrc
-            # 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 .
-            echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-            docker push ohif/viewer:PR_BUILD-$CIRCLE_BUILD_NUM
-
-  VIEWER_DEMO_BUILD:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/repo
+      - save_cache:
+          name: Save Yarn Package Cache
+          paths:
+            - ~/.cache/yarn
+          key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
       # Build & Test
       - run:
-          name: 'Build Demo Site'
-          command: yarn run build:demo
-          no_output_timeout: 45m
-      - run:
-          name: 'Upload SourceMaps, Send Deploy Notification'
+          name: "Build Demo Site, 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
+            yarn build:demo:ci
+            perl -i -pe 's#</head>#`cat .circleci/rollbar.html` #e' build/index.html
+            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: .
 
-  VIEWER_DEMO_PUBLISH:
+  demo_site_publish:
     working_directory: ~/repo
     docker:
       - image: google/cloud-sdk
@@ -297,164 +281,63 @@ jobs:
       - attach_workspace:
           at: ~/repo
       - setup_remote_docker:
-          docker_layer_caching: false
+          docker_layer_caching: true
       - run:
           name: Deploy latest version to viewer.ohif.org
           command: |
-            # https://circleci.com/docs/2.0/google-auth/#authorization
-            echo $GCLOUD_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
-            gcloud --quiet config set project ${GOOGLE_PROJECT_ID}
-            gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
-            # Remove all files in Storage Bucket; Push latest
-            gsutil -m rm gs://$GOOGLE_STORAGE_BUCKET/**
-            gsutil -m rsync -R platform/viewer/dist gs://$GOOGLE_STORAGE_BUCKET
+            # This file will exist if a new version was published by
+            # our `semantic-release` command in the previous job
+            #if [[ ! -e tmp/updated-version.txt ]]; then
+            #  exit 0
+            #else
+              echo $GCLOUD_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
+              gcloud --quiet config set project ${GOOGLE_PROJECT_ID}
+              gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
+
+              gsutil -m rm gs://$GOOGLE_STORAGE_BUCKET/**
+              gsutil -m rsync -R build gs://$GOOGLE_STORAGE_BUCKET
+            #fi
 
 workflows:
   version: 2
 
   # PULL REQUESTS
-  PR_CHECKS:
+  pull_requests:
     jobs:
-      - UNIT_TESTS:
+      - PR_UNIT_TESTS:
           filters:
             branches:
               ignore:
                 - master
                 - feature/*
                 - hotfix/*
-      # E2E: PWA
-      - cypress/run:
-          name: 'E2E: PWA'
-          executor: cypress/browsers-chrome76
-          browser: chrome
-          pre-steps:
-            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
-                add wait-on' # Use yarn latest
-          yarn: true
-          record: false
-          store_artifacts: false
-          working_directory: platform/viewer
-          build: npx cross-env QUICK_BUILD=true yarn run build
-          start: yarn run test:e2e:serve
-          wait-on: 'http://localhost:3000'
-          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-          no-workspace: true # Don't persist workspace
-          post-steps:
-            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
-          requires:
-            - UNIT_TESTS
-      # E2E: script-tag
-      - cypress/run:
-          name: 'E2E: Script Tag'
-          executor: cypress/browsers-chrome76
-          browser: chrome
-          pre-steps:
-            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
-                add wait-on' # Use yarn latest
-          yarn: true
-          record: false
-          store_artifacts: false
-          working_directory: platform/viewer
-          build: npx cross-env QUICK_BUILD=true yarn run build:package
-          start: yarn run test:e2e:serve
-          spec: 'cypress/integration/common/**/*'
-          wait-on: 'http://localhost:3000'
-          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-          no-workspace: true # Don't persist workspace
-          post-steps:
-            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
-          requires:
-            - UNIT_TESTS
-
-  PR_OPTIONAL_DOCKER_PUBLISH:
-    jobs:
-      # https://circleci.com/docs/2.0/workflows/#holding-a-workflow-for-a-manual-approval
-      - AWAIT_APPROVAL:
-          type: approval
-      # Update hub.docker.org
-      - DOCKER_PR_PUBLISH:
-          context: Docker Hub
-          requires:
-            - AWAIT_APPROVAL
 
   # MERGE TO MASTER
-  RELEASE:
+  cut_release:
     jobs:
-      - UNIT_TESTS_PERSIST_WORKSPACE:
+      - MERGE_UNIT_TESTS:
           filters:
             branches:
               only: master
-      # E2E: PWA + Persist
-      - cypress/run:
-          name: 'E2E: PWA'
-          executor: cypress/browsers-chrome76
-          browser: chrome
-          pre-steps:
-            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
-                add wait-on' # Use yarn latest
-          yarn: true
-          record: false
-          store_artifacts: true
-          working_directory: platform/viewer
-          build: npx cross-env QUICK_BUILD=true yarn run build
-          start: yarn run test:e2e:serve
-          wait-on: 'http://localhost:3000'
-          command: 'yarn run test:e2e:ci'
-          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-          no-workspace: true # Don't persist workspace
-          post-steps:
-            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
-            - store_test_results:
-                path: cypress/results
+      - e2e_test:
           requires:
-            - UNIT_TESTS_PERSIST_WORKSPACE
-      # E2E: script-tag
-      - cypress/run:
-          name: 'E2E: Script Tag'
-          executor: cypress/browsers-chrome76
-          browser: chrome
-          pre-steps:
-            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
-                add wait-on' # Use yarn latest
-          yarn: true
-          record: false
-          store_artifacts: false
-          working_directory: platform/viewer
-          build: npx cross-env QUICK_BUILD=true yarn run build:package
-          start: yarn run test:e2e:serve
-          spec: 'cypress/integration/common/**/*'
-          wait-on: 'http://localhost:3000'
-          cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-          no-workspace: true # Don't persist workspace
-          post-steps:
-            - store_artifacts:
-                path: platform/viewer/cypress/screenshots
-            - store_test_results:
-                path: cypress/results
-          requires:
-            - UNIT_TESTS_PERSIST_WORKSPACE
+            - MERGE_UNIT_TESTS
       # Update NPM
-      - NPM_PUBLISH:
+      - npm_publish:
           requires:
-            - 'E2E: Script Tag'
-            - 'E2E: PWA'
+            - e2e_test
       # Update docs.ohif.org
-      - DOCS_PUBLISH:
+      - docs_publish:
           requires:
-            - 'E2E: Script Tag'
-            - 'E2E: PWA'
-      - VIEWER_DEMO_BUILD:
-          requires:
-            - 'E2E: Script Tag'
-            - 'E2E: PWA'
-      # Update viewer.ohif.org
-      - VIEWER_DEMO_PUBLISH:
-          requires:
-            - VIEWER_DEMO_BUILD
+            - e2e_test
       # Update hub.docker.org
-      - DOCKER_MASTER_PUBLISH:
+      - docker_publish:
           requires:
-            - NPM_PUBLISH
+            - npm_publish
+      # Update viewer.ohif.org
+      - build_demo_site:
+          requires:
+            - e2e_test
+      - demo_site_publish:
+          requires:
+            - build_demo_site

.circleci/rollbar.html

@@ -0,0 +1,15 @@
+<script>
+// Note: This is a client access token so there is no issue with having it publicly available
+var _rollbarConfig = {
+    accessToken: "739c64cd39e84592ba062bc29aac9769",
+    captureUncaught: true,
+    captureUnhandledRejections: true,
+    payload: {
+        environment: "viewer.ohif.org"
+    }
+};
+// Rollbar Snippet
+!function(r){var e={};function o(n){if(e[n])return e[n].exports;var t=e[n]={i:n,l:!1,exports:{}};return r[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.m=r,o.c=e,o.d=function(r,e,n){o.o(r,e)||Object.defineProperty(r,e,{enumerable:!0,get:n})},o.r=function(r){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})},o.t=function(r,e){if(1&e&&(r=o(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var t in r)o.d(n,t,function(e){return r[e]}.bind(null,t));return n},o.n=function(r){var e=r&&r.__esModule?function(){return r.default}:function(){return r};return o.d(e,"a",e),e},o.o=function(r,e){return Object.prototype.hasOwnProperty.call(r,e)},o.p="",o(o.s=0)}([function(r,e,o){var n=o(1),t=o(4);_rollbarConfig=_rollbarConfig||{},_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://cdnjs.cloudflare.com/ajax/libs/rollbar.js/2.7.1/rollbar.min.js",_rollbarConfig.async=void 0===_rollbarConfig.async||_rollbarConfig.async;var a=n.setupShim(window,_rollbarConfig),l=t(_rollbarConfig);window.rollbar=n.Rollbar,a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,l)},function(r,e,o){var n=o(2);function t(r){return function(){try{return r.apply(this,arguments)}catch(r){try{console.error("[Rollbar]: Internal error",r)}catch(r){}}}}var a=0;function l(r,e){this.options=r,this._rollbarOldOnError=null;var o=a++;this.shimId=function(){return o},"undefined"!=typeof window&&window._rollbarShims&&(window._rollbarShims[o]={handler:e,messages:[]})}var i=o(3),d=function(r,e){return new l(r,e)},c=function(r){return new i(d,r)};function s(r){return t(function(){var e=Array.prototype.slice.call(arguments,0),o={shim:this,method:r,args:e,ts:new Date};window._rollbarShims[this.shimId()].messages.push(o)})}l.prototype.loadFull=function(r,e,o,n,a){var l=!1,i=e.createElement("script"),d=e.getElementsByTagName("script")[0],c=d.parentNode;i.crossOrigin="",i.src=n.rollbarJsUrl,o||(i.async=!0),i.onload=i.onreadystatechange=t(function(){if(!(l||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){i.onload=i.onreadystatechange=null;try{c.removeChild(i)}catch(r){}l=!0,function(){var e;if(void 0===r._rollbarDidLoad){e=new Error("rollbar.js did not load");for(var o,n,t,l,i=0;o=r._rollbarShims[i++];)for(o=o.messages||[];n=o.shift();)for(t=n.args||[],i=0;i<t.length;++i)if("function"==typeof(l=t[i])){l(e);break}}"function"==typeof a&&a(e)}()}}),c.insertBefore(i,d)},l.prototype.wrap=function(r,e,o){try{var n;if(n="function"==typeof e?e:function(){return e||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._rollbar_wrapped&&(r._rollbar_wrapped=function(){o&&"function"==typeof o&&o.apply(this,arguments);try{return r.apply(this,arguments)}catch(o){var e=o;throw e&&("string"==typeof e&&(e=new String(e)),e._rollbarContext=n()||{},e._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=e),e}},r._rollbar_wrapped._isWrap=!0,r.hasOwnProperty))for(var t in r)r.hasOwnProperty(t)&&(r._rollbar_wrapped[t]=r[t]);return r._rollbar_wrapped}catch(e){return r}};for(var p="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleUnhandledRejection,captureEvent,captureDomContentLoaded,captureLoad".split(","),u=0;u<p.length;++u)l.prototype[p[u]]=s(p[u]);r.exports={setupShim:function(r,e){if(r){var o=e.globalAlias||"Rollbar";if("object"==typeof r[o])return r[o];r._rollbarShims={},r._rollbarWrappedError=null;var a=new c(e);return t(function(){e.captureUncaught&&(a._rollbarOldOnError=r.onerror,n.captureUncaughtExceptions(r,a,!0),n.wrapGlobals(r,a,!0)),e.captureUnhandledRejections&&n.captureUnhandledRejections(r,a,!0);var t=e.autoInstrument;return!1!==e.enabled&&(void 0===t||!0===t||"object"==typeof t&&t.network)&&r.addEventListener&&(r.addEventListener("load",a.captureLoad.bind(a)),r.addEventListener("DOMContentLoaded",a.captureDomContentLoaded.bind(a))),r[o]=a,a})()}},Rollbar:c}},function(r,e){function o(r,e,o){if(e.hasOwnProperty&&e.hasOwnProperty("addEventListener")){for(var n=e.addEventListener;n._rollbarOldAdd&&n.belongsToShim;)n=n._rollbarOldAdd;var t=function(e,o,t){n.call(this,e,r.wrap(o),t)};t._rollbarOldAdd=n,t.belongsToShim=o,e.addEventListener=t;for(var a=e.removeEventListener;a._rollbarOldRemove&&a.belongsToShim;)a=a._rollbarOldRemove;var l=function(r,e,o){a.call(this,r,e&&e._rollbar_wrapped||e,o)};l._rollbarOldRemove=a,l.belongsToShim=o,e.removeEventListener=l}}r.exports={captureUncaughtExceptions:function(r,e,o){if(r){var n;if("function"==typeof e._rollbarOldOnError)n=e._rollbarOldOnError;else if(r.onerror){for(n=r.onerror;n._rollbarOldOnError;)n=n._rollbarOldOnError;e._rollbarOldOnError=n}var t=function(){var o=Array.prototype.slice.call(arguments,0);!function(r,e,o,n){r._rollbarWrappedError&&(n[4]||(n[4]=r._rollbarWLine truncated
+// End Rollbar Snippet
+</script>
+</head>

.codecov.yml

@@ -8,13 +8,11 @@ coverage:
   status:
     project:
       default:
-        threshold: 0.5%
+        threshold: 0.10%
       core:
         flags: core
-        threshold: 0.5%
       viewer:
         flags: viewer
-        threshold: 0.5%
     patch: off
 flags:
   core:

.docker/Viewer-v2.x/entrypoint.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# If CLIENT_ID is specified, use the google.js configuration with the modified ID
-if [ ! -z "$CLIENT_ID" ]
-  then
-  	echo "Google Cloud Healthcare $CLIENT_ID has been provided: "
-  	echo $CLIENT_ID
-  	echo "Updating config..."
-
-  	# - Use SED to replace the CLIENT_ID that is currently in google.js
-	sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/google.js
-
-	# - Copy google.js to overwrite app-config.js
-	cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
-fi
-
-echo "Starting Nginx to serve the OHIF Viewer..."
-
-exec "$@"

.dockerignore

@@ -1,30 +0,0 @@
-# Reduces size of context and hides
-# files from Docker (can't COPY or ADD these)
-
-# Output
-dist/
-build/
-
-# Dependencies
-node_modules/
-
-# Root
-README.md
-Dockerfile
-dockerfile
-
-# Misc. Config
-.git
-.DS_Store
-.gitignore
-.vscode
-.circleci
-
-# Unnecessary things to pull into container
-.circleci/
-.github/
-.netlify/
-.scripts/
-.vscode/
-coverage/
-docs/

.env.example

@@ -1 +0,0 @@
-PERCY_TOKEN=<your token here>

.eslintrc

@@ -16,7 +16,6 @@
   },
   "globals": {
     "cy": true,
-    "before": true,
     "context": true,
     "Cypress": true,
     "assert": true

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -1,33 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: Create a report to help us improve
-title: ''
-labels: 'Community: Report :bug:'
-assignees: ''
----
-
-> **Before Creating an issue**
->
-> - Are you running the latest version?
-> - Are you reporting to the correct repository?
-> - Did you search existing issues?
-
-## Bug Report
-
-### Describe the Bug
-
-_A clear and concise description of what the bug is._
-
-### What steps can we follow to reproduce the bug?
-
-1. First step
-2. Second step
-3. ...
-
-```js
-Please use code blocks to show formatted errors or code snippets
-```
-
-> :warning: Reports we cannot reproduce are at risk of being marked stale and
-> closed. The more information you can provide, the more likely we are to look
-> into and address your issue.

.github/ISSUE_TEMPLATE/---feature-request.md

@@ -1,25 +0,0 @@
----
-name: "\U0001F680 Feature request"
-about: Suggest an idea for this project
-title: ''
-labels: 'Community: Request :hand:'
-assignees: ''
----
-
-> :hand: Many people requests features. Tell us why yours is important to the
-> community. How does it add value? Why _this feature_?
->
-> Is your request very specific to your needs? Consider
-> [contributing it](https://docs.ohif.org/contributing.html) yourself! Or reach
-> out to a community member that offers
-> [consulting services](https://docs.ohif.org/help.html#paid--commercial).
-
-## Request
-
-**What feature or change would you like to see made?**
-
-...
-
-**Why should we prioritize this feature?**
-
-...

.github/ISSUE_TEMPLATE/---support-question.md

@@ -1,18 +0,0 @@
----
-name: "\U0001F917 Support Question"
-about: "I have a question \U0001F4AC"
-title: ''
-labels: 'Community: Question :question:'
-assignees: ''
----
-
-> :hand: We are a small team with limited resources. Your question is much more
-> likely to be answered if it is
-> [a good question](https://stackoverflow.com/help/how-to-ask)
-
-**Description**
-
-Questions can often be answered by our documentation. Unable to find an answer
-in our docs? We'll try to help. In the meantime, if you answer your own
-question, please respond with the answer here so that others may benefit as
-well. Better yet, open a PR to expand our docs ^\_^

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -1,29 +0,0 @@
-### Request Checklist
-
-- [] Brief description of changes
-- [] Links to any relevant issues
-- [] Required status checks are passing
-- [] `@mention` a maintainer to request a review
-
-#### Special
-
-> If this PR is not on a branch for this repo, it is "untrusted" and does not
-> have access to env vars. Reviewers can kick off a trusted docker deploy by:
->
-> 1. Verifying there are no malicious changes to CI build
-> 2. Using the [git-push-fork-to-upstream-branch][script] script
-> 3. Executing the manual approval step in the CI workflow
-
-- [] Request docker publish of PR
-
-_Want to improve this process? Consider PR'ing the ability for reviewers to add
-a label to trigger this process._
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[blog]: https://circleci.com/blog/triggering-trusted-ci-jobs-on-untrusted-forks/
-[script]: https://github.com/jklukas/git-push-fork-to-upstream-branch
-<!-- prettier-ignore-end -->

.github/stale.yml

@@ -1,28 +0,0 @@
-# GitHub App: Stale
-# https://github.com/apps/stale
-#
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 21
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - 'Story :raised_hands:'
-  - 'Bug: Verified :bug:'
-  - 'Task: CI/Tooling 🤖'
-  - 'Task: Docs 📖'
-  - 'Task: Docs :book:'
-  - 'Task: Refactor 🛠'
-  - 'Task: Tests :microscope:'
-  - 'PR: Awaiting Review 👀'
-  - 'Triage 🏳️'
-  - 'Announcement 🎉'
-# Label to use when marking an issue as stale
-staleLabel: 'Stale :baguette_bread:'
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.gitignore

@@ -8,7 +8,6 @@ docs/_book
 src/version.js
 junit.xml
 coverage/
-.docz/
 
 # YALC (for Erik)
 .yalc
@@ -21,7 +20,6 @@ npm-debug.log
 package-lock.json
 yarn-error.log
 .DS_Store
-.env
 
 # Common Example Data Directories
 sampledata/
@@ -29,7 +27,4 @@ example/deps/
 docker/dcm4che/dcm4che-arc
 
 # Cypress test results
-videos/
-
-# Locize settings
-.locize
+cypress/videos/

.netlify/build-deploy-preview.sh

@@ -3,25 +3,79 @@
 # Set directory to location of this script
 # https://stackoverflow.com/a/3355423/1867984
 cd "$(dirname "$0")"
-cd .. # Up to project root
 
 # Helpful to verify which versions we're using
 yarn -v
 node -v
 
+# Install GitBook CLI
+echo 'Installing Gitbook CLI'
+yarn global add gitbook-cli
+npm install -g gitbook-cli
+
+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
+			node /opt/buildhome/.nvm/versions/node/v10.16.0/lib/node_modules/gitbook-cli/bin/gitbook.js install
+			node /opt/buildhome/.nvm/versions/node/v10.16.0/lib/node_modules/gitbook-cli/bin/gitbook.js 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 it's a directory
+	if [ -d "${D}" ]; then
+	  # If the directory name starts with `v` (v1, v2, etc.)
+		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
+cd ..
+
+# Build and copy the PWA Viewer into the demo directory
+mkdir ./docs/latest/_book/demo/
+
 # Install build deps and all monorepo package dependencies. Yarn Workspaces
 # should also symlink all projects appropriately
 yarn install --no-ignore-optional --pure-lockfile
 
-# Build && Move PWA Output
-yarn run build:ci
-mkdir -p ./.netlify/www/pwa
-mv platform/viewer/dist/* .netlify/www/pwa -v
+# Navigate to our Viewer project
+cd ./platform/viewer/
 
-# Build && Move script output
-# yarn run build:package
+# Create a Versions File
+# node -p -e '"export default "' + require(\"./../package.json\").version + '";"' > src/version.js
+yarn run version
+# Copy over wado-image-loader codecs and worker file
+cp ./../../node_modules/cornerstone-wado-image-loader/dist/*.min.js* public -v
+# Build using react-scripts
+# npx cross-env PUBLIC_URL=/demo REACT_APP_CONFIG=config/netlify.js react-scripts --max_old_space_size=4096 build
+# Build using WebPack
+# TODO: consume public/config correctly instead of hardcode
+npx webpack --config config/webpack.prod.js --mode production --env.production
+# Copy output to the folder that is our publish target
+npx cpx "dist/**/*" ./../../docs/latest/_book/demo --verbose
 
 echo 'Nothing left to see here. Go home, folks.'
-
-# Build using react-scripts
-# npx cross-env PUBLIC_URL=/demo APP_CONFIG=config/netlify.js react-scripts --max_old_space_size=4096 build

.netlify/publishStaticSite.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Set directory to location of this script
+# https://stackoverflow.com/a/3355423/1867984
+cd "$(dirname "$0")"
+
+echo 'PUBLISHING'
+
+./node_modules/.bin/gh-pages \
+  --silent \
+  --repo https://$GITHUB_TOKEN@github.com/OHIF/Viewers.git \
+  --message 'Autogenerated Message: [ci skip]' \
+	--dist docs/latest/_book

.netlify/www/_redirects

@@ -1,6 +0,0 @@
-# Specific to our deploy-preview
-# Our docs are published using CircleCI + GitBook
-# Confgure redirects using netlify.toml
-
-# PWA Demo
-/pwa/* /pwa/index.html 200

.netlify/www/index.html

@@ -1,14 +0,0 @@
-<html>
-  <head>
-    <title>OHIF Viewer: Deploy Preview</title>
-  </head>
-  <body>
-    <h1>Index of Previews</h1>
-
-    <ul>
-      <li>
-        <a href="/pwa">Progressive Web App</a>
-      </li>
-    </ul>
-  </body>
-</html>

.prettierrc

@@ -1,8 +0,0 @@
-{
-  "trailingComma": "es5",
-  "printWidth": 80,
-  "proseWrap": "always",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true
-}

.scripts/dev.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-# https://github.com/shelljs/shelljs
-# https://github.com/shelljs/shelljs#exclude-options
-PROJECT=$1
-
-if [ -z "$PROJECT" ]
-then
-  # Default
-  npx lerna run dev:viewer
-else
-  eval "npx lerna run dev:$PROJECT"
-fi
-
-read -p 'Press [Enter] key to continue...'

.vscode/settings.json

@@ -1,8 +1,10 @@
 {
   "editor.rulers": [80, 120],
+
   // ===
   // Spacing
   // ===
+
   "editor.insertSpaces": true,
   "editor.tabSize": 2,
   "editor.trimAutoWhitespace": true,
@@ -10,23 +12,19 @@
   "files.eol": "\n",
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
+
   // ===
   // Event Triggers
   // ===
+
   "editor.formatOnSave": true,
   "eslint.autoFixOnSave": true,
   "eslint.run": "onSave",
   "eslint.validate": [
-    {
-      "language": "javascript",
-      "autoFix": true
-    },
-    {
-      "language": "javascriptreact",
-      "autoFix": true
-    }
+    { "language": "javascript", "autoFix": true },
+    { "language": "javascriptreact", "autoFix": true }
   ],
-  "prettier.disableLanguages": ["html"],
+  "prettier.disableLanguages": [],
   "prettier.endOfLine": "lf",
   "workbench.colorCustomizations": {}
 }

.webpack/helpers/excludeNodeModulesExcept.js

@@ -1,22 +0,0 @@
-const path = require('path');
-
-function excludeNodeModulesExcept(modules) {
-  var pathSep = path.sep;
-  if (pathSep == '\\')
-    // must be quoted for use in a regexp:
-    pathSep = '\\\\';
-  var moduleRegExps = modules.map(function(modName) {
-    return new RegExp('node_modules' + pathSep + modName);
-  });
-
-  return function(modulePath) {
-    if (/node_modules/.test(modulePath)) {
-      for (var i = 0; i < moduleRegExps.length; i++)
-        if (moduleRegExps[i].test(modulePath)) return false;
-      return true;
-    }
-    return false;
-  };
-}
-
-module.exports = excludeNodeModulesExcept;

.webpack/rules/cssToJavaScript.js

@@ -1,17 +0,0 @@
-const autoprefixer = require('autoprefixer');
-
-const cssToJavaScript = {
-  test: /\.css$/,
-  use: [
-    'style-loader',
-    { loader: 'css-loader', options: { importLoaders: 1 } },
-    {
-      loader: 'postcss-loader',
-      options: {
-        plugins: () => [autoprefixer('last 2 version', 'ie >= 11')],
-      },
-    },
-  ],
-};
-
-module.exports = cssToJavaScript;

.webpack/rules/loadShaders.js

@@ -1,10 +0,0 @@
-/**
- * This is exclusively used by `vtk.js` to bundle glsl files.
- */
-const loadShaders = {
-  test: /\.glsl$/i,
-  include: /vtk\.js[\/\\]Sources/,
-  loader: 'shader-loader',
-};
-
-module.exports = loadShaders;

.webpack/rules/loadWebWorkers.js

@@ -1,17 +0,0 @@
-/**
- * This allows us to include web workers in our bundle, and VTK.js
- * web workers in our bundle. While this increases bundle size, it
- * cuts down on the number of includes we need for `script tag` usage.
- */
-const loadWebWorkers = {
-  test: /\.worker\.js$/,
-  include: /vtk\.js[\/\\]Sources/,
-  use: [
-    {
-      loader: 'worker-loader',
-      options: { inline: true, fallback: false },
-    },
-  ],
-};
-
-module.exports = loadWebWorkers;

.webpack/rules/stylusToJavaScript.js

@@ -1,10 +0,0 @@
-const stylusToJavaScript = {
-  test: /\.styl$/,
-  use: [
-    { loader: 'style-loader' }, // 3. Style nodes from JS Strings
-    { loader: 'css-loader' }, // 2. CSS to CommonJS
-    { loader: 'stylus-loader' }, // 1. Stylus to CSS
-  ],
-};
-
-module.exports = stylusToJavaScript;

.webpack/rules/transpileJavaScript.js

@@ -1,39 +0,0 @@
-const excludeNodeModulesExcept = require('./../helpers/excludeNodeModulesExcept.js');
-
-function transpileJavaScript(mode) {
-  const exclude =
-    mode === 'production'
-      ? excludeNodeModulesExcept([
-          'vtk.js',
-          // 'dicomweb-client',
-          // https://github.com/react-dnd/react-dnd/blob/master/babel.config.js
-          'react-dnd',
-          // https://github.com/dcmjs-org/dcmjs/blob/master/.babelrc
-          // https://github.com/react-dnd/react-dnd/issues/1342
-          // 'dcmjs', // contains: loglevelnext
-          // https://github.com/shellscape/loglevelnext#browser-support
-          // 'loglevelnext',
-          // https://github.com/dcmjs-org/dicom-microscopy-viewer/issues/35
-          // 'dicom-microscopy-viewer',
-          // https://github.com/openlayers/openlayers#supported-browsers
-          // 'ol', --> Should be fine
-        ])
-      : excludeNodeModulesExcept([]);
-
-  return {
-    test: /\.jsx?$/,
-    // These are packages that are not transpiled to our lowest supported
-    // JS version (currently ES5). Most of these leverage ES6+ features,
-    // that we need to transpile to a different syntax.
-    exclude,
-    loader: 'babel-loader',
-    options: {
-      // Find babel.config.js in monorepo root
-      // https://babeljs.io/docs/en/options#rootmode
-      rootMode: 'upward',
-      envName: mode,
-    },
-  };
-}
-
-module.exports = transpileJavaScript;

.webpack/webpack.base.js

@@ -1,108 +0,0 @@
-// ~~ ENV
-const dotenv = require('dotenv');
-//
-const path = require('path');
-const webpack = require('webpack');
-const PACKAGE = require('../platform/viewer/package.json');
-// ~~ RULES
-const loadShadersRule = require('./rules/loadShaders.js');
-const loadWebWorkersRule = require('./rules/loadWebWorkers.js');
-const transpileJavaScriptRule = require('./rules/transpileJavaScript.js');
-// ~~ PLUGINS
-const TerserJSPlugin = require('terser-webpack-plugin');
-// ~~ ENV VARS
-const NODE_ENV = process.env.NODE_ENV;
-const QUICK_BUILD = process.env.QUICK_BUILD;
-const BUILD_NUM = process.env.CIRCLE_BUILD_NUM || '0';
-
-//
-dotenv.config();
-
-module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
-  if (!process.env.NODE_ENV) {
-    throw new Error('process.env.NODE_ENV not set');
-  }
-
-  const mode = NODE_ENV === 'production' ? 'production' : 'development';
-  const isProdBuild = NODE_ENV === 'production';
-  const isQuickBuild = QUICK_BUILD === 'true';
-
-  const config = {
-    mode: isProdBuild ? 'production' : 'development',
-    devtool: isProdBuild ? 'source-map' : 'cheap-module-eval-source-map',
-    entry: {
-      app: `${SRC_DIR}/index.js`,
-    },
-    optimization: {
-      minimize: isProdBuild,
-      sideEffects: true,
-    },
-    context: SRC_DIR,
-    stats: {
-      colors: true,
-      hash: true,
-      timings: true,
-      assets: true,
-      chunks: false,
-      chunkModules: false,
-      modules: false,
-      children: false,
-      warnings: true,
-    },
-    module: {
-      rules: [
-        transpileJavaScriptRule(mode),
-        loadWebWorkersRule,
-        loadShadersRule,
-      ],
-    },
-    resolve: {
-      // Which directories to search when resolving modules
-      modules: [
-        // Modules specific to this package
-        path.resolve(__dirname, '../node_modules'),
-        // Hoisted Yarn Workspace Modules
-        path.resolve(__dirname, '../../../node_modules'),
-        SRC_DIR,
-      ],
-      // Attempt to resolve these extensions in order.
-      extensions: ['.js', '.jsx', '.json', '*'],
-      // symlinked resources are resolved to their real path, not their symlinked location
-      symlinks: true,
-    },
-    plugins: [
-      new webpack.DefinePlugin({
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-        '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(PACKAGE.version || ''),
-        'process.env.BUILD_NUM': JSON.stringify(BUILD_NUM),
-      }),
-    ],
-    // Fix: https://github.com/webpack-contrib/css-loader/issues/447#issuecomment-285598881
-    // For issue in cornerstone-wado-image-loader
-    node: {
-      fs: 'empty',
-    },
-  };
-
-  if (isProdBuild) {
-    config.optimization.minimizer = [
-      new TerserJSPlugin({
-        // Supports:
-        // source-map and inline-source-map
-        sourceMap: isProdBuild && !isQuickBuild,
-        parallel: true,
-        terserOptions: {},
-      }),
-    ];
-  }
-
-  if (isQuickBuild) {
-    config.optimization.minimize = false;
-    config.devtool = false;
-  }
-
-  return config;
-};

.webpack/webpack.common.js

@@ -0,0 +1,90 @@
+const path = require("path");
+const ExtractCssChunks = require("extract-css-chunks-webpack-plugin");
+
+const SRC_DIR = path.join(__dirname, "../src");
+const PUBLIC_DIR = path.join(__dirname, "../public");
+const DIST_DIR = path.join(__dirname, "../dist");
+
+module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
+  return {
+    entry: {
+      app: `${SRC_DIR}/index.js`
+    },
+    context: SRC_DIR,
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          exclude: [/node_modules/, /packages\\extension/],
+          loader: "babel-loader",
+          options: {
+            // Find babel.config.js in monorepo root
+            // https://babeljs.io/docs/en/options#rootmode
+            rootMode: "upward",
+            presets: [
+              [
+                "@babel/preset-env",
+                {
+                  // Do not transform ES6 modules to another format.
+                  // Webpack will take care of that.
+                  modules: false
+                }
+              ]
+            ]
+          }
+        },
+        {
+          test: /\.css$/,
+          use: [
+            "style-loader",
+            ExtractCssChunks.loader,
+            { loader: "css-loader", options: { importLoaders: 1 } },
+            {
+              loader: "postcss-loader",
+              options: {
+                config: {
+                  path: "./postcss.config.js"
+                }
+              }
+            }
+          ]
+        },
+        /**
+         * This allows us to include web workers in our bundle, and VTK.js
+         * web workers in our bundle. While this increases bundle size, it
+         * cuts down on the number of includes we need for `script tag` usage.
+         */
+        {
+          test: /\.worker\.js$/,
+          include: /vtk\.js[\/\\]Sources/,
+          use: [
+            {
+              loader: "worker-loader",
+              options: { inline: true, fallback: false }
+            }
+          ]
+        },
+        /**
+         * This is exclusively used by `vtk.js` to bundle glsl files.
+         */
+        {
+          test: /\.glsl$/i,
+          include: /vtk\.js[\/\\]Sources/,
+          loader: "shader-loader"
+        }
+      ]
+    },
+    resolve: {
+      // Which directories to search when resolving modules
+      modules: [
+        path.resolve(__dirname, "../node_modules"),
+        path.resolve(__dirname, "../../../node_modules"),
+        SRC_DIR
+      ],
+      // Attempt to resolve these extensions in order.
+      extensions: [".js", ".jsx", ".json", "*"],
+      // symlinked resources are resolved to their real path, not their symlinked location
+      symlinks: true
+    }
+  };
+};

.webpack/webpack.commonjs.js

@@ -1,19 +0,0 @@
-const merge = require('webpack-merge');
-const webpackBase = require('./webpack.base.js');
-const cssToJavaScriptRule = require('./rules/cssToJavaScript.js');
-const stylusToJavaScriptRule = require('./rules/stylusToJavaScript.js');
-
-/**
- * WebPack configuration for CommonJS Bundles. Extends rules of BaseConfig by making
- * sure we're bundling styles and other files that would normally be split in a
- * PWA.
- */
-module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
-  const baseConfig = webpackBase(env, argv, { SRC_DIR, DIST_DIR });
-
-  return merge(baseConfig, {
-    module: {
-      rules: [cssToJavaScriptRule, stylusToJavaScriptRule],
-    },
-  });
-};

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Open Health Imaging Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,185 +1,38 @@
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<div align="center">
-  <h1>OHIF Medical Imaging Viewer</h1>
-  <p><strong>The OHIF Viewer</strong> is a zero-footprint medical image viewer provided by the <a href="http://ohif.org/">Open Health Imaging Foundation (OHIF)</a>. It is a configurable and extensible progressive web application with out-of-the-box support for image archives which support <a href="https://www.dicomstandard.org/dicomweb/">DICOMweb</a>.</p>
-</div>
-
-
-<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>
-</div>
-<div align="center">
-  <a href="https://viewer.ohif.org/">Live Demo</a> |
-  <a href="https://react.ohif.org/">Component Library</a>
-</div>
-
-
-<hr />
-
-[![NPM version][npm-version-image]][npm-url]
-[![NPM downloads][npm-downloads-image]][npm-url]
-[![Pulls][docker-pulls-img]][docker-image-url]
-[![MIT License][license-image]][license-url]
+# OHIF Medical Imaging Platform
 
+[![lerna][lerna-image]][lerna-url]
 [![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)
-<!-- prettier-ignore-end -->
 
-## About
+## The Problem
 
-The OHIF Medical Imaging Viewer is for viewing medical images. It can retrieve
-and load images from most sources and formats; render sets in 2D, 3D, and
-reconstructed representations; allows for the manipulation, annotation, and
-serialization of observations; supports internationalization, OpenID Connect,
-offline use, hotkeys, and many more features.
-
-Almost everything offers some degree of customization and configuration. If it
-doesn't support something you need, we accept pull requests and have an ever
-improving Extension System.
+...
 
 ## Why Choose Us
 
-### Community & Experience
+...
 
-The OHIF Viewer is a collaborative effort that has served as the basis for many
-active, production, and FDA Cleared medical imaging viewers. It benefits from
-our extensive community's collective experience, and from the sponsored
-contributions of individuals, research groups, and commercial organizations.
+## Quick Start
 
-### Built to Adapt
-
-After more than 5-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
-that allows us to offer:
-
-- 2D and 3D medical image viewing
-- Multiplanar Reconstruction (MPR)
-- Maximum Intensity Project (MIP)
-- Whole slide microscopy viewing
-- PDF and Dicom Structured Report rendering
-- User Access Control (UAC)
-- Context specific toolbar and side panel content
-- and many others
-
-Can be leveraged by you to customize the viewer for your workflow, and to add
-any new functionality you may need (and wish to maintain privately without
-forking).
-
-### Support
-
-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)
-
-For commercial support, academic collaberations, and answers to common
-questions; please read our
-[documented FAQ](https://docs.ohif.org/frequently-asked-questions.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/)
-- Yarn Workspaces should be enabled on your machine:
-  - `yarn config set workspaces-experimental true`
-
-### Getting Started
-
-1. [Fork this repository][how-to-fork]
-2. [Clone your forked repository][how-to-clone]
-   - `git clone https://github.com/YOUR-USERNAME/Viewers.git`
-3. Navigate to the cloned project's directory
-4. Add this repo as a `remote` named `upstream`
-   - `git remote add upstream https://github.com/OHIF/Viewers.git`
-5. `yarn install` to restore dependencies and link projects
-
-#### To Develop
-
-_From this repository's root directory:_
-
-```bash
-# Enable Yarn Workspaces
-yarn config set workspaces-experimental true
-
-# Restore dependencies
-yarn install
-```
+...
 
 ## Commands
 
-These commands are available from the root directory. Each project directory
-also supports a number of commands that can be found in their respective
-`README.md` and `project.json` files.
+### Global
 
-| Yarn Commands                | Description                                                   |
-| ---------------------------- | ------------------------------------------------------------- |
-| **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                   |
-| `build:package`\*            | Builds production `commonjs` output for our Viewer            |
-| `build:package-all`\*        | Builds commonjs bundles for all projects                      |
+| Commands        |     |                                                       |
+| --------------- | --- | ----------------------------------------------------- |
+| `build:package` |     | Builds commonjs bundles for all projects              |
+| `test:unit`     |     | Jest multi-project test runner; overall coverage      |
+| `test:unit:ci`  |     | Runs tests in parallel. Reports coverage per project. |
 
-\* - For more information on our different builds, check out our [Deploy
-Docs][deployment-docs]
+### Local
 
-## Projects
+| Commands       |     |                                                   |
+| -------------- | --- | ------------------------------------------------- |
+| `test:unit`    |     | Runs tests while watching for changes             |
+| `test:unit:ci` |     | Runs tests, collects coverage, reports to codecov |
+
+## Developing
 
 The OHIF Medical Image Viewing Platform is maintained as a
 [`monorepo`][monorepo]. This means that this repository, instead of containing a
@@ -209,58 +62,72 @@ 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].
+more about it in our [Architecture Documentation](#todo).
 
-### Platform
+### Requirements
 
-These projects comprise the
+- [Yarn 1.17.3+](https://yarnpkg.com/en/docs/install)
+- [Node 8+](https://nodejs.org/en/)
+- Yarn Workspaces should be enabled on your machine:
+  - `yarn config set workspaces-experimental true`
 
-| 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]     |
+### Getting Started
 
-### Extensions
+1. [Fork this repository][how-to-fork]
+2. [Clone your forked repository][how-to-clone]
+   - `git clone https://github.com/YOUR-USERNAME/Viewers.git`
+3. Navigate to the cloned project's directory
+4. Add this repo as a `remote` named `upstream`
+   - `git remote add upstream https://github.com/OHIF/Viewers.git`
+5. `yarn install` to restore dependencies and link projects
 
-This is a list of Extensions maintained by the OHIF Core team. It's possible to
-customize and configure these extensions, and you can even create your own. You
-can [read more about extensions here][ohif-extensions].
+#### To Develop
 
-| Name                                                           | Description                                             | Links                  |
-| -------------------------------------------------------------- | ------------------------------------------------------- | ---------------------- |
-| [@ohif/extension-cornestone][extension-cornerstone]            | 2D image viewing, annotation, and segementation tools   | [NPM][cornerstone-npm] |
-| [@ohif/extension-dicom-html][extension-dicom-html]             | Support for viewing DICOM SR as rendered HTML           | [NPM][html-npm]        |
-| [@ohif/extension-dicom-microscopy][extension-dicom-microscopy] | Whole slide microscopy viewing                          | [NPM][microscopy-npm]  |
-| [@ohif/extension-dicom-pdf][extension-dicom-pdf]               | View DICOM wrapped PDFs in a viewport                   | [NPM][pdf-npm]         |
-| [@ohif/extension-vtk][extension-vtk]                           | Volume rendering, reconstruction, and 3D visualizations | [NPM][vtk-npm]         |
+```bash
+# Force install
+yarn install --force
 
-## Acknowledgments
+# Link
+# Redundent with yarn workspaces
+npx lerna bootstrap
+```
 
-To acknowledge the OHIF Viewer in an academic publication, please cite
+```bash
+# Link for local dev
+cd ./extensions/my-package
+npx lerna add @ohif/my-package --scope=@ohif/my-package-consumer
+```
 
-> _LesionTracker: Extensible Open-Source Zero-Footprint Web Viewer for Cancer
-> Imaging Research and Clinical Trials_
->
-> Trinity Urban, Erik Ziegler, Rob Lewis, Chris Hafey, Cheryl Sadow, Annick D.
-> Van den Abbeele and Gordon J. Harris
->
-> _Cancer Research_, November 1 2017 (77) (21) e119-e122 DOI:
-> [10.1158/0008-5472.CAN-17-0334](https://www.doi.org/10.1158/0008-5472.CAN-17-0334)
+```bash
+# Add shared dev dependency for workspace
+yarn add --dev -W package-name
+```
 
-**Note:** If you use or find this repository helpful, please take the time to
-star this repository on Github. This is an easy way for us to assess adoption
-and it can help us obtain future funding for the project.
+// module vs main vs jsnext:main vs browser
+https://babeljs.io/blog/2018/06/26/on-consuming-and-publishing-es2015+-packages
 
-This work is supported primarily by the National Institutes of Health, National
-Cancer Institute, Informatics Technology for Cancer Research (ITCR) program,
-under a
-[grant to Dr. Gordon Harris at Massachusetts General Hospital (U24 CA199460)](https://projectreporter.nih.gov/project_info_description.cfm?aid=8971104).
+Webpack: https://webpack.js.org/configuration/resolve/
 
-## License
+UMD builds go through
 
-MIT © [OHIF](https://github.com/OHIF)
+- index.umd.js
+- Extensions passed in via window config
+
+PWA builds go through
+
+- index.js
+- Extensions specified in file or by window config
+
+> The module property should point to a script that utilizes ES2015 module
+> syntax but no other syntax features that aren't yet supported by browsers or
+> node. This enables webpack to parse the module syntax itself, allowing for
+> lighter bundles via tree shaking if users are only consuming certain parts of
+> the library.
+
+## Notes
+
+Lerna requires `GH_TOKEN` for GitHub authentication token
+`git remote update` 1st call, need to verify host key
 
 <!--
   Links
@@ -272,55 +139,10 @@ MIT © [OHIF](https://github.com/OHIF)
 [lerna-url]: https://lerna.js.org/
 [netlify-image]: https://api.netlify.com/api/v1/badges/a5d369ab-18a6-41c3-bcde-83805205ac7f/deploy-status
 [netlify-url]: https://app.netlify.com/sites/ohif/deploys
-[all-contributors-image]: https://img.shields.io/badge/all_contributors-0-orange.svg?style=flat-square
-[circleci-image]: https://circleci.com/gh/OHIF/Viewers.svg?style=svg
-[circleci-url]: https://circleci.com/gh/OHIF/Viewers
-[codecov-image]: https://codecov.io/gh/OHIF/Viewers/branch/master/graph/badge.svg
-[codecov-url]: https://codecov.io/gh/OHIF/Viewers/branch/master
-[prettier-image]: https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square
-[prettier-url]: https://github.com/prettier/prettier
-[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
-[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
-[license-url]: LICENSE
-[percy-image]: https://percy.io/static/images/percy-badge.svg
-[percy-url]: https://percy.io/Open-Health-Imaging-Foundation/OHIF-Viewer
 <!-- Links -->
 [monorepo]: https://en.wikipedia.org/wiki/Monorepo
 [how-to-fork]: https://help.github.com/en/articles/fork-a-repo
 [how-to-clone]: https://help.github.com/en/articles/fork-a-repo#step-2-create-a-local-clone-of-your-fork
-[ohif-architecture]: https://docs.ohif.org/advanced/architecture.html
-[ohif-extensions]: https://docs.ohif.org/advanced/architecture.html
-[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
-[configuration-url]: https://docs.ohif.org/essentials/configuration.html
-[extensions-url]: https://docs.ohif.org/advanced/extensions.html
-<!-- Platform -->
-[platform-core]: platform/core/README.md
-[core-npm]: https://www.npmjs.com/package/@ohif/core
-[platform-i18n]: platform/i18n/README.md
-[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
-<!-- Extensions -->
-[extension-cornerstone]: extensions/cornerstone/README.md
-[cornerstone-npm]: https://www.npmjs.com/package/@ohif/extension-cornerstone
-[extension-dicom-html]: extensions/dicom-html/README.md
-[html-npm]: https://www.npmjs.com/package/@ohif/extension-dicom-html
-[extension-dicom-microscopy]: extensions/dicom-microscopy/README.md
-[microscopy-npm]: https://www.npmjs.com/package/@ohif/extension-dicom-microscopy
-[extension-dicom-pdf]: extensions/dicom-pdf/README.md
-[pdf-npm]: https://www.npmjs.com/package/@ohif/extension-dicom-pdf
-[extension-vtk]: extensions/vtk/README.md
-[vtk-npm]: https://www.npmjs.com/package/@ohif/extension-vtk
+
+
 <!-- prettier-ignore-end -->

babel.config.js

@@ -1,63 +1,50 @@
-const aliases = require('./aliases.config');
-const path = require('path');
+const aliases = require("./aliases.config");
+const path = require("path");
 
-// https://babeljs.io/docs/en/options#babelrcroots
 module.exports = {
-  babelrcRoots: ['./platform/*', './extensions/*'],
-  plugins: ['inline-react-svg', '@babel/plugin-proposal-class-properties'],
+  // https://babeljs.io/docs/en/options#babelrcroots
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        targets: {
+          ie: "11"
+        }
+      }
+    ],
+    "@babel/preset-react"
+  ],
+  babelrcRoots: ["./platform/*", "./extensions/*"],
+  plugins: [
+    "inline-react-svg",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-object-rest-spread",
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-transform-regenerator",
+    "@babel/plugin-transform-runtime",
+    [
+      "module-resolver",
+      {
+        // https://github.com/tleunen/babel-plugin-module-resolver/issues/338
+        // There seem to be a bug with module-resolver with a mono-repo setup:
+        // It doesn't resolve paths correctly when using root/alias combo, so we
+        // use this function instead.
+        resolvePath(sourcePath, currentFile, opts) {
+          // This will return undefined if aliases has no key for the sourcePath,
+          // in which case module-resolver will fallback on its default behaviour.
+          return aliases[sourcePath];
+        }
+      }
+    ]
+  ],
   env: {
-    test: {
-      presets: [
-        [
-          // TODO: https://babeljs.io/blog/2019/03/19/7.4.0#migration-from-core-js-2
-          '@babel/preset-env',
-          {
-            modules: 'commonjs',
-            debug: false,
-          },
-        ],
-        '@babel/preset-react',
-      ],
-      plugins: [
-        '@babel/plugin-proposal-object-rest-spread',
-        '@babel/plugin-syntax-dynamic-import',
-        '@babel/plugin-transform-regenerator',
-        '@babel/plugin-transform-runtime',
-      ],
+    debug: {
+      sourceMaps: "inline",
+      retainLines: true
     },
-    production: {
-      presets: [
-        // WebPack handles ES6 --> Target Syntax
-        ['@babel/preset-env', { modules: false }],
-        '@babel/preset-react',
-      ],
-      ignore: ['**/*.test.jsx', '**/*.test.js', '__snapshots__', '__tests__'],
-    },
-    development: {
-      presets: [
-        // WebPack handles ES6 --> Target Syntax
-        ['@babel/preset-env', { modules: false }],
-        '@babel/preset-react',
-      ],
-      plugins: ['react-hot-loader/babel'],
-      ignore: ['**/*.test.jsx', '**/*.test.js', '__snapshots__', '__tests__'],
-    },
-  },
+    build: {
+      ignore: ["**/*.test.jsx", "**/*.test.js", "__snapshots__", "__tests__"]
+    }
+  }
+  // ignore: ["node_modules"]
 };
-
-// TODO: Plugins; Aliases
-// We don't currently use aliases, but this is a nice snippet that would help
-// [
-//   'module-resolver',
-//   {
-//     // https://github.com/tleunen/babel-plugin-module-resolver/issues/338
-//     // There seem to be a bug with module-resolver with a mono-repo setup:
-//     // It doesn't resolve paths correctly when using root/alias combo, so we
-//     // use this function instead.
-//     resolvePath(sourcePath, currentFile, opts) {
-//       // This will return undefined if aliases has no key for the sourcePath,
-//       // in which case module-resolver will fallback on its default behaviour.
-//       return aliases[sourcePath];
-//     },
-//   },
-// ],

build-and-publish-docs.sh

@@ -1,64 +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 add gitbook-cli
-
-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 'PUBLISHING'
-
-./node_modules/.bin/gh-pages \
-  --silent \
-  --repo https://$GITHUB_TOKEN@github.com/OHIF/Viewers.git \
-  --message 'Autogenerated Message: [ci skip]' \
-	--dist docs/latest/_book

docs/_redirects

@@ -1,3 +0,0 @@
-# Netlify redirects
-# SPA rules for our docs
-/*    /index.html   200

docs/latest/README.md

@@ -1,7 +1,7 @@
 <div class='row'>
 	<div class='column' style='text-align: right; padding: 0 20px'>
-		<strong>Looking for a Live Demo?</strong>
-		<a href="http://viewer.ohif.org/">Preview The OHIF Viewer</a>
+		<strong>Looking for a Deploy Preview?</strong>
+		<a onclick="function redirect() { window.location.href='/demo/'; } redirect();">Deploy Preview for Viewer</a>
 	</div>
 	<div class='column' style='text-align: left; padding: 0 20px'>
 		<a href="https://www.netlify.com">
@@ -33,14 +33,14 @@ yourself unable to extend the viewer for your purposes, please reach out via our
 [GitHub issues][gh-issues]. We are actively seeking feedback on ways to improve
 our integration and extension points.
 
-## Where to next?
+## Where to Next?
 
 Check out these helpful links:
 
 - Ready to dive into some code? Check out our
   [Getting Started Guide](./essentials/getting-started.md).
 - We're an active, vibrant community.
-  [Learn how you can be more involved.](./contributing/index.md)
+  [Learn how you can be more involved.](./contributing.md)
 - Feeling lost? Read our [help page](./help.md).
 
 <!--

docs/latest/SUMMARY.md

@@ -45,7 +45,7 @@
 
 ---
 
+- [Contributing](contributing.md)
 - [FAQ](frequently-asked-questions.md)
-- [Contributing](contributing/index.md)
-- [Browser Support](browser-support.md)
+- [Roadmap](roadmap.md)
 - [Help](help.md)

docs/latest/advanced/_maintained-extensions-table.md

@@ -10,7 +10,7 @@
         <!-- CORNERSTONE.js -->
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/@ohif/extension-cornerstone">
+                <a href="https://www.npmjs.com/package/ohif-cornerstone-extension">
                     Cornerstone
                 </a>
             </td>
@@ -22,7 +22,7 @@
         <!-- VTK.js -->
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/@ohif/extension-vtk">
+                <a href="https://www.npmjs.com/package/ohif-vtk-extension">
                     VTK.js
                 </a>
             </td>
@@ -33,30 +33,30 @@
         </tr>
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-html">DICOM HTML</a>
+                <a href="">HTML</a>
             </td>
             <td>
-                Renders text and HTML content for <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js#L4-L12">specific SopClassUIDs</a>.
+                Renders text and HTML content for <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlSopClassHandler.js#L7-L15">specific SopClassUIDs</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-pdf">DICOM PDF</a>
+                <a href="https://www.npmjs.com/package/ohif-dicom-pdf-extension">PDF</a>
             </td>
             <td>
-                Renders PDFs for a <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-pdf/src/OHIFDicomPDFSopClassHandler.js#L4-L6">specific SopClassUID</a>.
+                Renders PDFs for a <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFSopClassHandler.js#L8">specific SopClassUID</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-microscopy">DICOM Microscopy</a>
+                <a href="https://www.npmjs.com/package/ohif-dicom-microscopy-extension">Microscopy</a>
             </td>
             <td>
-                Renders Microscopy images for a <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-microscopy/src/DicomMicroscopySopClassHandler.js#L5-L7">specific SopClassUID</a>.
+                Renders Microscopy images for a <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopySopClassHandler.js#L6">specific SopClassUID</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
     </tbody>
-</table>
+</table>

docs/latest/advanced/architecture.md

@@ -12,48 +12,28 @@ architected, and the role each of it's dependent libraries plays.
 
 ## Overview
 
-The [OHIF Medical Image Viewing Platform][viewers-project] is maintained as a
-[`monorepo`][monorepo]. This means that this repository, instead of containing a
-single project, contains many projects. If you explore our project structure,
-you'll see the following:
-
-```bash
-.
-├── extensions
-│   ├── _example            # Skeleton of example extension
-│   ├── cornerstone         # 2D images w/ Cornerstone.js
-│   ├── dicom-html          # Structured Reports as HTML in viewport
-│   ├── dicom-microscopy    # Whole slide microscopy viewing
-│   ├── dicom-pdf           # View DICOM wrapped PDFs in viewport
-│   └── vtk                 # MPR and Volume support w/ VTK.js
-│
-├── platform
-│   ├── core                # Business Logic
-│   ├── i18n                # Internationalization Support
-│   ├── ui                  # React component library
-│   └── viewer              # Connects platform and extension projects
-│
-├── ...                     # misc. shared configuration
-├── lerna.json              # MonoRepo (Lerna) settings
-├── package.json            # Shared devDependencies and commands
-└── README.md
-```
-
-Continue reading to see how these libraries work together to create the OHIF
-Viewer.
+The [`OHIF/Viewers`][viewers-project] project contains the source code for the
+OHIF Medical Imaging Viewer. It is effectively a React [progressive web
+app][pwa] (PWA) that combines the business logic housed in
+[`OHIF/ohif-core`][core] and the components in our React Component library
+[`OHIF/react-viewerbase`][component-library]. It provides customization for
+common use cases through [configuration][configuration] and for adding
+functionality via [extensions][extensions].
 
 ### Business Logic
 
-The [`@ohif/core`][core-github] project offers pre-packaged solutions for
-features common to Web-based medical imaging viewers. For example:
+Our goal is to maintain the majority of our business logic in
+[`OHIF/ohif-core`](https://github.com/OHIF/ohif-core). `ohif-core` offers
+pre-packaged solutions for features common to Web-based medical imaging viewers.
+For example:
 
 - Hotkeys
-- DICOM Web requests
+- DICOM Web
 - Hanging Protocols
 - Managing a study's measurements
 - Managing a study's DICOM metadata
 - A flexible pattern for extensions
-- And many others
+- [And many others](https://github.com/OHIF/ohif-core/blob/master/src/index.js#L49-L69)
 
 It does this while remaining decoupled from any particular view library or
 rendering logic. While we use it to power our React Viewer, it can be used with
@@ -61,42 +41,20 @@ Vue, React, Vanilla JS, or any number of other frameworks.
 
 ### React Component Library
 
-[`@ohif/ui`][ui-github] is a React Component library that contains the reusable
-components that power the OHIF Viewer. It allows us to build, compose, and test
-components in isolation; easing the development process by reducing the need to
-stand-up a local PACS with test case data.
-
-Extension authors can also use these same components when building their
-extension's UI; allowing for a consistent look and feel with the rest of the
-application.
+[`OHIF/react-viewerbase`](https://github.com/OHIF/react-viewerbase) is a React
+Component library that contains the reusable components that power the OHIF
+Viewer. It allows us to build, compose, and test components in isolation; easing
+the development process by reducing the need to stand-up a local PACS with test
+case data.
 
 [Check out our component library!](https://react.ohif.org/)
 
-### Internationalization (i18n)
+### Misc. Extensions
 
-...
-
-### The Viewer
-
-...
-
-### Extensions & Configuration
-
-While OHIF maintains several high value and commonly requested features in its
-own extensions, there are many instances where one may wish to further extend
-the viewer. Some common use cases include:
-
-- Adding AI/ML tools and insights
-- Custom workflows for guided diagnosis
-- Collecting specific annotations for training data or reports
-- Authentication and granular permissions
-- Teleconsultation workflow, image comments, and tracking
-- Adding surgical templating tools and reports
-- and many others
-
-We expose common integration points via [extensions](./extensions.md) to make
-this possible. The viewer and many of our own extensions also offer
-[configuration][configuration]. For a list of extensions maintained by OHIF,
+Want to add custom logic or UI Components to the OHIF Viewer, but don't want to
+maintain a fork? We expose common integration points via
+[extensions](./extensions.md) to make that possible. For a list of extensions
+maintained by OHIF,
 [check out this helpful table](./extensions.html#ohif-maintained-extensions).
 
 If you find yourself thinking "I wish the Viewer could do X", and you can't
@@ -109,14 +67,15 @@ looking for ways to improve our extensibility ^\_^
 
 This diagram is a conceptual illustration of how the Viewer is architected.
 
-1. (optional) `extensions` can be registered with `@ohif/core`'s extension
+1. (optional) `extensions` can be registered with `ohif-core`'s extension
    manager
-2. `@ohif/core` provides bussiness logic and a way for `@ohif/viewer` to access
+2. `ohif-core` provides bussiness logic and a way for `viewer` to access
    registered extensions
-3. The `@ohif/viewer` composes and provides data to components from our
-   component library (`@ohif/ui`)
-4. The `@ohif/viewer` can be built and served as a stand-alone PWA, or as an
-   embeddable package ([`@ohif/viewer`][viewer-npm])
+3. The `viewer` composes and provides data to components from our component
+   library (`react-viewerbase`)
+4. The `viewer` can be built and served as a stand-alone PWA, or as an
+   embeddable package
+   ([`ohif-viewer`](https://www.npmjs.com/package/ohif-viewer))
 
 ![Architecture Diagram](../assets/img/architecture-diagram.png)
 
@@ -124,17 +83,17 @@ This diagram is a conceptual illustration of how the Viewer is architected.
 
 ## Common Questions
 
-> When should I use the packaged source `@ohif/viewer` versus building a PWA
-> from the source?
+> When should I use the packaged source `ohif-viewer` versus building a PWA from
+> the source?
 
 ...
 
 > Can I create my own Viewer using Vue.js or Angular.js?
 
 You can, but you will not be able to leverage as much of the existing code and
-components. `@ohif/core` could still be used for business logic, and to provide
-a model for extensions. `@ohif/ui` would then become a guide for the components
-you would need to recreate.
+components. `ohif-core` could still be used for business logic, and to provide a
+model for extensions. `react-viewerbase` would then become a guide for the
+components you would need to recreate.
 
 <!--
   Links
@@ -142,10 +101,9 @@ you would need to recreate.
 
 <!-- prettier-ignore-start -->
 [viewers-project]: https://github.com/OHIF/Viewers
-[viewer-npm]: https://www.npmjs.com/package/@ohif/viewer
 [pwa]: https://developers.google.com/web/progressive-web-apps/
+[core]: https://github.com/OHIF/ohif-core
+[component-library]: https://github.com/OHIF/react-viewerbase
 [configuration]: ../essentials/configuration.md
-[extensions]: ./extensions.md
-[core-github]: https://github.com/OHIF/viewers/platform/core
-[ui-github]: https://github.com/OHIF/Viewers/platform/ui
+[extensions]: ./extensions.m
 <!-- prettier-ignore-end -->

docs/latest/advanced/extensions.md

@@ -140,8 +140,8 @@ children: PropTypes.node,
 customProps: PropTypes.object
 ```
 
-Viewport components are managed by the `ViewportGrid` Component. Which Viewport
-component is used depends on:
+Viewport components are managed by the `LayoutManager`. Which Viewport component
+is used depends on:
 
 - The Layout Configuration
 - Registered SopClassHandlers
@@ -152,15 +152,14 @@ component is used depends on:
 <center><i>An example of three Viewports</i></center>
 
 For a complete example implementation,
-[check out the OHIFCornerstoneViewport](https://github.com/OHIF/Viewers/blob/master/extensions/cornerstone/src/OHIFCornerstoneViewport.js).
+[check out the OHIFCornerstoneViewport](https://github.com/OHIF/Viewers/blob/react/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js).
 
 #### Toolbar
 
 An extension can register a Toolbar Module by providing a `getToolbarModule()`
 method that returns a React Component. The component does not receive any props.
 If you want to modify or react to state, you will need to connect to the redux
-store. The given toolbar must determine its set of elements and the context of
-them. The set of elements will be listed on toolbar `definitions`.
+store.
 
 ![Toolbar Extension](../assets/img/extensions-toolbar.gif)
 
@@ -169,39 +168,7 @@ them. The set of elements will be listed on toolbar `definitions`.
 Toolbar components are rendered in the `ToolbarRow` component.
 
 For a complete example implementation,
-[check out the OHIFCornerstoneViewport's Toolbar Module](https://github.com/OHIF/Viewers/blob/master/extensions/cornerstone/src/toolbarModule.js).
-
-##### Toolbar Custom Component
-
-Toolbar elements can define its own custom react component to be consumed when
-rendering it. So far, it accepts `Functional` and `Class` Components. For that,
-you just need to expose your `CustomToolbarComponent` as the value of key
-`CustomComponent`. In case the property `CustomComponent` is not present, a
-default toolbar component will be used to render it. See bellow
-
-```js
-definitions: [
-...
-    {
-        id: 'Custom',
-        label: 'Custom',
-        icon: 'custom-icon',
-        CustomComponent: CustomToolbarComponent,
-    }
-...
-]
-
-```
-
-`CustomComponent` components will receive the following props:
-
-- parentContext: parent context. (In most of the cases it will be a ToolbarRow
-  instance)
-- toolbarClickCallback: callback method when clicking on toolbar
-- button: its own definition object
-- key: react key prop
-- activeButtons: list of active elements
-- isActive: if current
+[check out the OHIFCornerstoneViewport's Toolbar Module](https://github.com/OHIF/Viewers/blob/react/extensions/ohif-cornerstone-extension/src/ToolbarModule.js).
 
 #### SopClassHandler
 
@@ -231,7 +198,7 @@ _app.js_
 
 ```js
 import { createStore, combineReducers } from 'redux';
-import OHIF from '@ohif/core';
+import OHIF from 'ohif-core';
 import OHIFCornerstoneExtension from 'ohif-cornerstone-extension';
 
 const combined = combineReducers(OHIF.redux.reducers);
@@ -247,8 +214,8 @@ ExtensionManager.registerExtensions(store, extensions);
 
 A small number of powerful extensions for popular use cases are maintained by
 OHIF. They're co-located in the
-[`OHIF/Viewers`](https://github.com/OHIF/Viewers) repository, in the top level
-[`extensions/`](https://github.com/OHIF/Viewers/tree/master/extensions)
+[`OHIF/Viewers`](https://github.com/OHIF/Viewers/tree/react/) repository, in the
+top level [`extensions/`](https://github.com/OHIF/Viewers/tree/react/extensions)
 directory.
 
 {% include "./_maintained-extensions-table.md" %}
@@ -258,6 +225,6 @@ directory.
 -->
 
 <!-- prettier-ignore-start -->
-[example-ext-src]: https://github.com/OHIF/Viewers/tree/master/extensions/_example/src
-[module-types]: https://github.com/OHIF/Viewers/blob/master/platform/core/src/extensions/MODULE_TYPES.js
+[example-ext-src]: https://github.com/OHIF/Viewers/blob/master/extensions/_ohif-example-extension/src/index.js)
+[module-types]: https://github.com/OHIF/ohif-core/blob/43c08a29eff3fb646a0e83a03a236ddd84f4a6e8/src/plugins.js#L1-L6
 <!-- prettier-ignore-end -->

docs/latest/browser-support.md

@@ -1,47 +0,0 @@
-# Browser Support
-
-The browsers that we support are specified in the `.browserlistrc` file located
-in the `platform/viewer` project. While we leverage the latest language features
-when writing code, we rely on `babel` to _transpile_ our code so that it can run
-in the browsers that we support.
-
-## In Practice
-
-The OHIF Viewer is capable of _running_ on:
-
-- IE 11
-- FireFox
-- Chrome
-- Safari
-- Edge
-
-However, we do not have the resources to adequately test and maintain bug free
-functionality across all of these. In order to push web based medical imaging
-forward, we focus our development efforts on recent version of modern evergreen
-browsers.
-
-Our support of older browsers equates to our willingness to review PRs for bug
-fixes, and target their minimum JS support whenever possible.
-
-### Polyfills
-
-> A polyfill, or polyfiller, is a piece of code (or plugin) that provides the
-> technology that you, the developer, expect the browser to provide natively.
-
-An example of a polyfill is that you expect `Array.prototype.filter` to exist,
-but for some reason, the browser that's being used has not implemented that
-language feature yet. Our earlier transpilation will rectify _syntax_
-discrepencies, but unimplemented features require a "temporary" implementation.
-That's where polyfills step in.
-
-You can utilize a service like [polyfill.io](https://polyfill.io/v3/) to
-auto-detect and apply polyfills as needed, or you can update the PWA build to
-include polyfill's in your bundle by incorporating [core-js][core-js]
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[core-js]: https://github.com/zloirock/core-js/blob/master/docs/2019-03-19-core-js-3-babel-and-a-look-into-the-future.md
-<!-- prettier-ignore-end -->

docs/latest/connecting-to-image-archives/google-cloud-healthcare.md

@@ -1,5 +1,11 @@
 # Google Cloud Healthcare
 
+> ATTENTION: The original documentation for this integration lives in the legacy
+> `version 1` Meteor documentation. You can
+> [find it here](/history/v1/connecting-to-image-archives/google-cloud-healthcare.html).
+> These docs will mirror the Meteor documentation until our `React`
+> implementation has been updated to work with Google Cloud Healthcare.
+
 > The [Google Cloud Healthcare API](https://cloud.google.com/healthcare/) is a
 > powerful option for storing medical imaging data in the cloud.
 
@@ -10,7 +16,10 @@ store their data in the cloud. It offers an
 [almost-entirely complete DICOMWeb API](https://cloud.google.com/healthcare/docs/dicom)
 which requires tokens generated via the
 [OAuth 2.0 Sign In flow](https://developers.google.com/identity/sign-in/web/sign-in).
-Images can even be transcoded on the fly if this is desired.
+Images can even be transcoded on the fly if this is desired. The Cloud
+Healthcare API is a very attractive option because it allows us to avoid
+deploying the Meteor server entirely. We can just deploy OHIF as a client-only
+static site application.
 
 ## Setup a Google Cloud Healthcare Project
 
@@ -37,8 +46,8 @@ Images can even be transcoded on the fly if this is desired.
     [OAuth 2.0 Client ID](https://support.google.com/cloud/answer/6158849?hl=en)
   - Add your domain (e.g. `http://localhost:3000`) to Authorized JavaScript
     origins.
-  - Add your domain, plus `callback` (e.g. `http://localhost:3000/callback`) to
-    Authorized Redirect URIs.
+  - Add your domain, plus `_oauth/google` (e.g.
+    `http://localhost:3000/_oauth/google`) to Authorized Redirect URIs.
   - Save your Client ID for later.
 
 - (Optional): Enable Public Datasets that are being hosted by Google:
@@ -46,26 +55,70 @@ Images can even be transcoded on the fly if this is desired.
 
 ## Run the viewer with your OAuth Client ID
 
-1. Open the `config/google.js` file and change `YOURCLIENTID` to your Client ID
-   value.
-1. Run the OHIF Viewer using the config/google.js configuration file
+1. Open the `config/oidc-googleCloud.json` file and change `YOURCLIENTID` to
+   your Client ID value.
+1. Run the OHIF Viewer using the oidc-googleCloud.json configuration file
 
 ```bash
 cd OHIFViewer
-yarn install
-APP_CONFIG=config/google.js yarn run dev
+METEOR_PACKAGE_DIRS="../Packages" meteor npm install
+METEOR_PACKAGE_DIRS="../Packages" meteor --settings ../config/oidc-googleCloud.json
 ```
 
 ## Running via Docker
 
-The OHIF Viewer Docker container can be connected to Google Cloud Healthcare by
-providing a Client ID at runtime. This is a very simple method to get up and
-running.
+OHIF is also providing a Docker container which can connect to Google Cloud
+Healthcare with a Client ID which is provided at runtime. This is a very simple
+method to get up and running. Internally, the container is running
+[Nginx](https://nginx.org/) to serve the
+[Standalone Viewer](../standalone-viewer/usage.md).
 
 1. Install Docker (https://www.docker.com/)
 1. Run the Docker container, providing a Client ID as an environment variable.
    Client IDs look like `xyz.apps.googleusercontent.com`.
 
 ```bash
-docker run --env CLIENT_ID=$CLIENT_ID --publish 5000:80 ohif/viewer:latest
+docker run --env CLIENT_ID=$CLIENT_ID --publish 3000:80 ohif/viewer-google-cloud:latest
+```
+
+## Building the ohif/viewer-google-cloud Docker Image
+
+The
+[ohif/viewer-google-cloud](https://cloud.docker.com/u/ohif/repository/docker/ohif/viewer-google-cloud)
+Docker image is built as follows. The Dockerfile and nginx.conf are in the
+`/dockersupport/viewer-google-cloud` folder.
+
+1. [Install Meteor](https://www.meteor.com/install)
+1. Clone the repository
+
+```bash
+git clone https://github.com/OHIF/Viewers.git
+cd Viewers
+```
+
+1. Install meteor-build-client-fixed2 so you can build the Standalone Viewer
+
+```bash
+npm install -g meteor-build-client-fixed2
+```
+
+1. Build the Standalone client-only OHIF Viewer
+
+```bash
+cd OHIFViewer/
+METEOR_PACKAGE_DIRS="../Packages" meteor npm install
+METEOR_PACKAGE_DIRS="../Packages" meteor-build-client-fixed2 ../dockersupport/viewer-google-cloud/build -s ../config/oidc.json
+```
+
+1. Build the Docker image
+
+```bash
+cd ../dockersupport/viewer-google-cloud
+docker build -t ohif/viewer-google-cloud .
+```
+
+1. Run the Docker image using an OAuth Client ID
+
+```bash
+docker run --env CLIENT_ID={$someID}.apps.googleusercontent.com --publish 3000:80 ohif/viewer-google-cloud
 ```

docs/latest/contributing.md

@@ -0,0 +1,103 @@
+# Contributing
+
+## I would like to contribute code - how do I do this?
+
+Fork the repository, make your change and submit a pull request.
+
+- The OHIF Viewer consists of code from three different repositories. Make sure
+  your change is modifying the appropriate one:
+  - `ohif-core`: Business Logic
+  - `react-viewerbase`: Reusable React Component Library
+  - `Viewers`: The glue, PWA, and primary extension point
+- At a minimum, you may want to read the following documentation:
+  - [Essentials: Getting Started](./essentials/getting-started.md)
+  - [Advanced: Architecture](./advanced/architecture.md)
+
+### When changes impact multiple repositories
+
+This is a particularly tricky scenario. We don't want to publish code in one
+repository, just so we can test and complete the other half of its requirements
+in another. Thankfully, there are a couple of ways you can test unpublished
+dependent changes locally before publishing:
+
+- [Use `yarn link`](https://yarnpkg.com/en/docs/cli/link)
+
+For example if you are working on `ohif-core` and would like to use your local
+version to debug a problem in `Viewers`, simply run yarn link inside of the
+`ohif-core` project.
+
+- If you're experiencing issues with `yarn link`,
+  [try `yalc`](https://github.com/whitecolor/yalc)
+
+Yalc provides an improved workflow as we add more and more dependent packages
+that are "in-progress". This comes into play as we begin working on extensions
+and their dependencies.
+
+```js
+// Install yalc for the first time
+yarn global add yalc
+
+// EXAMPLE: using an in-development version of ohif-core w/ Viewers locally
+// 1. Navigate to ohif-core's project root
+yarn install
+yalc publish
+
+// 2. Run the following after each change to ohif-core
+yarn build
+yalc push .
+
+// 3. Use the local package in our Viewers project. Navigate to the Viewers
+//    Project root.
+yarn install
+yalc add ohif-core
+yarn run dev
+```
+
+## Any guidance on submitting changes?
+
+While we do appreciate code contributions, triaging and integrating contributed
+code changes can be very time consuming. Please consider the following tips when
+working on your pull requests:
+
+- Functionality is appropriate for the repository. Consider creating a GitHub
+  issue to discuss your suggested changes.
+- The scope of the pull request is not too large. Please consider separate pull
+  requests for each feature as big pull requests are very time consuming to
+  understand.
+
+We will provide feedback on your pull requests as soon as possible. Following
+the tips above will help ensure your changes are reviewed.
+
+## Testing contribution pull requests
+
+OHIF uses [netlify](netlify.com) so that pull requests are autogenerated and
+available for testing.
+
+For example, [this url][example-url] allows you to test [pull request 237, the
+request that created this FAQ entry,][pr-237] using data pulled from Amazon S3.
+
+Replacing the number 237 in the link below with your pull request number should
+let you test it as well and you can use this link for discussions on github
+without requiring reviewers to download and build your branch.
+
+```bash
+https://deploy-preview-237--ohif.netlify.com/viewer/?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/sampleDICOM.json
+```
+
+If you have made a documentation change, a link like this will let you preview
+the gitbook generated by the pull request:
+
+```bash
+https://deploy-preview-237--ohif.netlify.com/contributing.html
+```
+
+<!--
+  Links
+  -->
+
+<!-- prettier-ignore-start -->
+
+[example-url]: https://deploy-preview-237--ohif.netlify.com/viewer/?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/sampleDICOM.json
+[pr-237]: https://github.com/OHIF/Viewers/pull/237
+
+<!-- prettier-ignore-end -->

docs/latest/contributing/index.md

@@ -1,146 +0,0 @@
-# Contributing
-
-## How can I help?
-
-Fork the repository, make your change and submit a pull request. If you would
-like to discuss the changes you intend to make to clarify where or how they
-should be implemented, please don't hesitate to create a new issue. At a
-minimum, you may want to read the following documentation:
-
-- [Essentials: Getting Started](./essentials/getting-started.md)
-- [Advanced: Architecture](./advanced/architecture.md)
-
-Pull requests that are:
-
-- Small
-- [Well tested](./testing.md)
-- Decoupled
-
-Are much more likely to get reviewed and merged in a timely manner.
-
-## When changes impact multiple repositories
-
-While this can be tricky, we've tried to reduce how often this situation crops
-up this with our [recent switch to a monorepo][monorepo]. Our maintained
-extensions, ui components, internationalization library, and business logic can
-all be developed by simply running `yarn run dev` from the repository root.
-
-Testing the viewer with locally developed, unpublished package changes from a
-package outside of the monorepo is most common with extension development. Let's
-demonstrate how to accomplish this with two commonly forked extension
-dependencies:
-
-### `cornerstone-tools`
-
-On your local file system:
-
-```bash
-# code/my-projects/
-.
-├── cornerstonejs/cornerstone-tools
-└── ohif/viewers
-```
-
-- Open a terminal/shell
-- Navigate to `cornerstonejs/cornerstone-tools`
-  - `npm install`
-  - [`yarn link`](https://yarnpkg.com/en/docs/cli/link)
-  - `npm run dev`
-- Open a new terminal/shell
-- Navigate to `ohif/viewers`.
-  - `yarn install`
-  - [`yarn link cornerstone-tools`](https://yarnpkg.com/en/docs/cli/link)
-  - `yarn run dev`
-
-As you make changed to `cornerstone-tools`, and it's output is rebuilt, you
-should see the following behavior:
-
-<div style="text-align: center;">
-  <a href="/assets/img/cornerstone-tools-link.gif">
-    <img src="/assets/img/cornerstone-tools-link.gif" alt="Example of linked cornerstone-tools package" style="margin: 0 auto; max-width: 500px;" />
-  </a>
-  <div><i>example of linked cornerstone-tools package</i></div>
-</div>
-
-If you wish to stop using your local package, run the following commands in the
-`ohif/viewers` repository root:
-
-- `yarn unlink cornerstone-tools`
-- `yarn install --force`
-
-### `react-vtkjs-viewport`
-
-On your local file system:
-
-```bash
-# code/my-projects/
-.
-├── ohif/react-vtkjs-viewport
-└── ohif/viewers
-```
-
-- Open a terminal/shell
-- Navigate to `ohif/react-vtkjs-viewport`
-  - `yarn install`
-  - [`yarn link`](https://yarnpkg.com/en/docs/cli/link)
-  - `yarn run start`
-- Open a new terminal/shell
-- Navigate to `ohif/viewers`.
-  - `yarn install`
-  - [`yarn link react-vtkjs-viewport`](https://yarnpkg.com/en/docs/cli/link)
-  - `yarn run dev`
-
-#### Other linkage notes
-
-We're still working out some of the kinks with local package development as
-there are a lot of factors that can influence the behavior of our development
-server and bundler. If you encounter issues not addressed here, please don't
-hesitate to reach out on GitHub.
-
-## Any guidance on submitting changes?
-
-While we do appreciate code contributions, triaging and integrating contributed
-code changes can be very time consuming. Please consider the following tips when
-working on your pull requests:
-
-- Functionality is appropriate for the repository. Consider creating a GitHub
-  issue to discuss your suggested changes.
-- The scope of the pull request is not too large. Please consider separate pull
-  requests for each feature as big pull requests are very time consuming to
-  understand.
-
-We will provide feedback on your pull requests as soon as possible. Following
-the tips above will help ensure your changes are reviewed.
-
-## Testing contribution pull requests
-
-OHIF uses [netlify](netlify.com) so that pull requests are autogenerated and
-available for testing.
-
-For example, [this url][example-url] allows you to test [pull request 237, the
-request that created this FAQ entry,][pr-237] using data pulled from Amazon S3.
-
-Replacing the number 237 in the link below with your pull request number should
-let you test it as well and you can use this link for discussions on github
-without requiring reviewers to download and build your branch.
-
-```bash
-https://deploy-preview-237--ohif.netlify.com/viewer/?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/sampleDICOM.json
-```
-
-If you have made a documentation change, a link like this will let you preview
-the gitbook generated by the pull request:
-
-```bash
-https://deploy-preview-237--ohif.netlify.com/contributing.html
-```
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[example-url]: https://deploy-preview-237--ohif.netlify.com/viewer/?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/sampleDICOM.json
-[pr-237]: https://github.com/OHIF/Viewers/pull/237
-[monorepo]: https://github.com/OHIF/Viewers/issues/768
-<!-- prettier-ignore-end -->

docs/latest/contributing/testing.md

@@ -1,145 +0,0 @@
-# Contributing: Tests
-
-> Testing is an opinionated topic. Here is a rough overview of our testing
-> philosiphy. See something you want to discuss or think should be changed? Open
-> a PR and let's discuss.
-
-You're an engineer. You know how to write code, and writing tests isn't all that
-different. But do you know why we write tests? Do you know when to write one, or
-what kind of test to write? How do you know if a test is a _"good"_ test? This
-document's goal is to give you the tools you need to make those determinations.
-
-Okay. So why do we write tests? To increase our... **CONFIDENCE**
-
-- If I do a large refactor, does everything still work?
-- If I changed some critical piece of code, is it safe to push to production?
-
-Gaining the confidence we need to answer these questions after every change is
-costly. Good tests allow us to answer them without manual regression testing.
-What and how we choose to test to increase that confidence is nuanced.
-
-## Kinds of Tests
-
-Test's buy us confidence, but not all tests are created equal. Each kind of test
-has a different cost to write and maintain. An expensive test is worth it if it
-gives us confidence that a payment is processed, but it may not be the best
-choice for asserting an element's border color.
-
-| Test Type   | Example                                                                  | Speed            | Cost                                                                     |
-| ----------- | ------------------------------------------------------------------------ | ---------------- | ------------------------------------------------------------------------ |
-| Static      | `addNums(1, '2')` called with `string`, expected `int`.                  | :rocket: Instant | :money_with_wings:                                                       |
-| Unit        | `addNums(1, 2)` returns expected result `3`                              | :airplane: Fast  | :money_with_wings::money_with_wings:                                     |
-| Integration | Clicking "Sign In", navigates to the dashboard (mocked network requests) | :running: Okay   | :money_with_wings::money_with_wings::money_with_wings:                   |
-| End-to-end  | Clicking "Sign In", navigates to the dashboard (no mocks)                | :turtle: Slow    | :money_with_wings::money_with_wings::money_with_wings::money_with_wings: |
-
-- :rocket: Speed: How quickly tests run
-- :money_with_wings: Cost: Time to write, and to debug when broken (more points
-  of failure)
-
-### Static Code Analysis
-
-Modern tooling gives us this "for free". It can catch invalid regular
-expressions, unused variables, and guarantee we're calling methods/functions
-with the expected paramater types.
-
-Example Tooling:
-
-- [ESLint][eslint-rules]
-- [TypeScript][typescript-docs] or [Flow][flow-org]
-
-### Unit Tests
-
-The building blocks of our libraries and applications. For these, you'll often
-be testing a single function or method. Conceptually, this equates to:
-
-_Pure Function Test:_
-
-- If I call `sum(2, 2)`, I expect the output to be `4`
-
-_Side Effect Test:_
-
-- If I call `resetViewport(viewport)`, I expect `cornerstone.reset` to be called
-  with `viewport`
-
-#### When to use
-
-Anything that is exposed as public API should have unit tests.
-
-#### When to avoid
-
-You're actually testing implementation details. You're testing implementation
-details if:
-
-- Your test does something that the consumer of your code would never do.
-  - IE. Using a private function
-- A refactor can break your tests
-
-### Integration Tests
-
-We write integration tests to gain confidence that several units work together.
-Generally, we want to mock as little as possible for these tests. In practice,
-this means only mocking network requests.
-
-#### When to use
-
-...
-
-### End-to-End Tests
-
-These are the most expensive tests to write and maintain. Largely because, when
-they fail, they have the largest number of potential points of failure. So why
-do we write them? Because they also buy us the most confidence.
-
-#### When to use
-
-Mission critical features and functionality, or to cover a large breadth of
-functionality until unit tests catch up. Unsure if we should have a test for
-feature `X` or scenario `Y`? Open an issue and let's discuss.
-
-## Summary
-
-- Does your test increase confidence?
-- Does the test type chosen balance the cost-to-confidence ratio?
-
-## Further Reading
-
-### General
-
-- [Assert(js) Conf 2018 Talks][assert-js-talks]
-  - [Write tests. Not too many. Mostly integration.][kent-talk] - Kent C. Dodds
-  - [I see your point, but…][gleb-talk] - Gleb Bahmutov
-- [Static vs Unit vs Integration vs E2E Testing][kent-blog] - Kent C. Dodds
-  (Blog)
-
-### End-to-end Testing w/ Cypress
-
-- [Getting Started](https://docs.cypress.io/guides/overview/why-cypress.html)
-  - Be sure to check out `Getting Started` and `Core Concepts`
-- [Best Practices](https://docs.cypress.io/guides/references/best-practices.html)
-- [Example Recipes](https://docs.cypress.io/examples/examples/recipes.html)
-
-## Testing Dorito
-
-[![testing dorito][testing-dorito-img]][testing-dorito]
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[eslint-rules]: https://eslint.org/docs/rules/
-[typescript-docs]: https://www.typescriptlang.org/docs/home.html
-[flow-org]: https://flow.org/
-<!-- Talks -->
-[assert-js-talks]: https://www.youtube.com/playlist?list=PLZ66c9_z3umNSrKSb5cmpxdXZcIPNvKGw
-[kent-talk]: https://www.youtube.com/watch?list=PLV5CVI1eNcJgNqzNwcs4UKrlJdhfDjshf
-[gleb-talk]: https://www.youtube.com/watch?v=5FnalKRjpZk
-[kent-blog]: https://kentcdodds.com/blog/unit-vs-integration-vs-e2e-tests
-<!-- Images -->
-[testing-trophy]: https://twitter.com/kentcdodds/status/960723172591992832?ref_src=twsrc%5Etfw%7Ctwcamp%5Etweetembed%7Ctwterm%5E960723172591992832&ref_url=https%3A%2F%2Fkentcdodds.com%2Fblog%2Fwrite-tests
-[aaron-square]: https://twitter.com/Carofine247/status/966727489274961920
-[gleb-pyramid]: https://twitter.com/Carofine247/status/966764532046684160/photo/3
-[testing-pyramid]: https://dojo.ministryoftesting.com/dojo/lessons/the-mobile-test-pyramid
-[testing-dorito]: https://twitter.com/denvercoder/status/960752578198843392
-[testing-dorito-img]: https://pbs.twimg.com/media/DVVHXycUMAAcN-F?format=jpg&name=4096x4096
-<!-- prettier-ignore-end -->

docs/latest/deployment/index.md

@@ -1,11 +1,11 @@
 # Deployment
 
 The OHIF Viewer can be embedded in other web applications via it's [packaged
-script source][viewer-npm], or served up as a stand-alone PWA ([progressive web
-application][pwa-url]) by building and hosting a collection of static assets. In
-either case, you will need to configure your instance of the Viewer so that it
-can connect to your data source (the database or PACS that provides the data
-your Viewer will display).
+script source][ohif-viewer-npm], or served up as a stand-alone PWA ([progressive
+web application][pwa-url]) by building and hosting a collection of static
+assets. In either case, you will need to configure your instance of the Viewer
+so that it can connect to your data source (the database or PACS that provides
+the data your Viewer will display).
 
 ## Overview
 
@@ -196,7 +196,8 @@ Please feel free to suggest or contribute your own recipes.
   -->
 
 <!-- prettier-ignore-start -->
-[viewer-npm]: https://www.npmjs.com/package/@ohif/viewer
+
+[ohif-viewer-npm]: https://www.npmjs.com/package/ohif-viewer
 [pwa-url]: https://developers.google.com/web/progressive-web-apps/
 [static-assets-url]: https://www.maxcdn.com/one/visual-glossary/static-content/
 [app-store]: https://medium.freecodecamp.org/i-built-a-pwa-and-published-it-in-3-app-stores-heres-what-i-learned-7cb3f56daf9b
@@ -205,5 +206,5 @@ Please feel free to suggest or contribute your own recipes.
 [host-static-assets]: https://www.netlify.com/blog/2016/05/18/9-reasons-your-site-should-be-static/
 [cors]: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
 [code-flows]: https://medium.com/@darutk/diagrams-of-all-the-openid-connect-flows-6968e3990660
-[code-sandbox]: https://codesandbox.io/s/viewer-script-tag-tprch
+[code-sandbox]: https://codesandbox.io/s/ohif-viewer-script-tag-usage-b3st9
 <!-- prettier-ignore-end -->

docs/latest/deployment/recipes/build-for-production.md

@@ -19,6 +19,9 @@ _With Git:_
 ```bash
 # Clone the remote repository to your local machine
 git clone https://github.com/OHIF/Viewers.git
+
+# Make sure the local code reflects the `react` version of the OHIF Viewer
+git checkout react
 ```
 
 More on: _[`git clone`](https://git-scm.com/docs/git-clone),
@@ -26,7 +29,7 @@ More on: _[`git clone`](https://git-scm.com/docs/git-clone),
 
 _From .zip:_
 
-[OHIF/Viewers: react.zip](https://github.com/OHIF/Viewers/archive/master.zip)
+[OHIF/Viewers: react.zip](https://github.com/OHIF/Viewers/archive/react.zip)
 
 ### Restore Dependencies & Build
 
@@ -34,24 +37,20 @@ Open your terminal, and navigate to the directory containing the source files.
 Next run these commands:
 
 ```js
-// If you haven't already, enable yarn workspaces
-yarn config set workspaces-experimental true
-
 // Restore dependencies
 yarn install
 
 // Build source code for production
-yarn run build
+yarn run build:web
 ```
 
-If everything worked as expected, you should have a new `dist/` directory in the
-project's folder. It should roughly resemble the following:
+If everything worked as expected, you should have a new `build/` directory in
+the project's folder. It should roughly resemble the following:
 
 ```bash
-<root>platform/viewer/dist/
-├── app-config.js
-├── app.bundle.js
-├── app.css
+build
+├── config/
+├── static/
 ├── index.html
 ├── manifest.json
 ├── service-worker.js
@@ -65,15 +64,61 @@ how to configure the project for your own imaging archive below.
 
 ### Configuration
 
-The configuration for our viewer is in the `<root>platform/viewer/public/config`
-directory. Our build process knows which configuration file to use based on the
-`APP_CONFIG` environment variable. By default, its value is
-[`config/default.js`][default-config]. The majority of the viewer's features,
-and registered extension's features, are configured using this file.
+> This step assumes you have an imaging archive. If you need assistance setting
+> one up, check out the [`Data Source` Guide](./../../essentials/data-source.md)
+> or a deployment recipe that contains an open source Image Archive
 
-The easiest way to apply your own configuration is to modify the `default.js`
-file. For more advanced cofiguration options, check out our
-[configuration essentials guide](/essentials/configuration.md).
+#### How it Works
+
+The configuration for our project is in the `/public/config` directory. Our
+build process knows which configuration file to use based on the
+`REACT_APP_CONFIG` environment variable. By default, its value is
+[`default.js`](https://github.com/OHIF/Viewers/blob/react/public/config/default.js).
+When we build, the `%REACT_APP_CONFIG%` value in
+our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/react/public/index.html#L12-L15)
+file is substituted for the correct configuration file's name. This sets
+the`window.config` equal to our configuration file's value.
+
+#### How do I configure my project?
+
+The simplest way is to update the existing default config:
+
+_/public/config/default.js_
+
+```js
+window.config = {
+  routerBasename: '/',
+  relativeWebWorkerScriptsPath: '',
+  servers: {
+    dicomWeb: [
+      {
+        name: 'DCM4CHEE',
+        wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado',
+        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',
+        requestOptions: {
+          requestFromBrowser: true,
+        },
+      },
+    ],
+  },
+}
+```
+
+You can also create a new config file and specify its path relative to the build
+output's root by setting the `REACT_APP_CONFIG` environment variable. You can
+set the value of this environment variable a few different ways:
+
+- [Add a temporary environment variable in your shell](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-temporary-environment-variables-in-your-shell)
+- [Add environment specific variables in `.env` file(s)](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-development-environment-variables-in-env)
+- Using the `cross-env` package in an npm script:
+  - `"build": "cross-env REACT_APP_CONFIG=config/my-config.js react-scripts build"`
+
+After updating the configuration, `yarn run build:web` to generate updated build
+output.
 
 ## Next Steps
 
@@ -97,7 +142,7 @@ _Advanced_
 ### Testing Build Output Locally
 
 A quick way to test your build output locally is to spin up a small webserver.
-You can do this by running the following commands in the `dist/` output
+You can do this by running the following commands in the `build/` output
 directory:
 
 ```js
@@ -118,7 +163,8 @@ web application. For a starting point, check out this repository's own use of:
 
 - [CircleCI][circleci]: [config.yaml][circleci-config]
 - [Netlify][netlify]: [netlify.toml][netlify.toml] |
-  [build-deploy-preview.sh][build-deploy-preview.sh]
+  [generateStaticSite.sh][generatestaticsite.sh]
+- [Semantic-Release][semantic-release]: [.releaserc][releaserc]
 
 ## Troubleshooting
 
@@ -128,8 +174,10 @@ web application. For a starting point, check out this repository's own use of:
 
 <!-- prettier-ignore-start -->
 [circleci]: https://circleci.com/gh/OHIF/Viewers
-[circleci-config]: https://github.com/OHIF/Viewers/blob/master/.circleci/config.yml
+[circleci-config]: https://github.com/OHIF/Viewers/blob/react/.circleci/config.yml
 [netlify]: https://app.netlify.com/sites/ohif/deploys
-[netlify.toml]: https://github.com/OHIF/Viewers/blob/master/netlify.toml
-[build-deploy-preview.sh]: https://github.com/OHIF/Viewers/blob/master/.netlify/build-deploy-preview.sh
+[netlify.toml]: https://github.com/OHIF/Viewers/blob/react/netlify.toml
+[generateStaticSite.sh]: https://github.com/OHIF/Viewers/blob/react/generateStaticSite.sh
+[semantic-release]: https://semantic-release.gitbook.io/semantic-release/
+[releaserc]: https://github.com/OHIF/Viewers/blob/react/.releaserc
 <!-- prettier-ignore-end -->

docs/latest/deployment/recipes/embedded-viewer.md

@@ -12,18 +12,35 @@ include tags. Here's how it works:
 
 <ul>
   <li>
-    <a href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700&display=swap">
-      <code>Google Font: Roboto</code>
+    <a href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+      <code>bootstrap@3.3.7</code>
     </a>
   </li>
   <li>
-    <a href="https://unpkg.com/@ohif/viewer">
-      <code>@ohif/viewer@latest</code>
+    <a href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700|Sanchez&display=swap">
+      <code>Google Fonts, Sanchez & Roboto</code>
+    </a>
+  </li>
+  <li>
+    <a href="https://unpkg.com/react@16/umd/react.production.min.js">
+      <code>react@16.8.6</code>
+    </a>
+  </li>
+  <li>
+    <a href="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js">
+      <code>react-dom@16.8.6</code>
+    </a>
+  </li>
+  <li>
+    <a href="https://unpkg.com/ohif-viewer/dist/index.umd.js">
+      <code>ohif-viewer@latest</code>
     </a>
   </li>
 </ul>
 
 <ol start="2">
+  <li>The <a href="">WADO Image Loader Codecs and Web Worker source code</a>
+  should be accessible from your server's root</li>
   <li>Create a JS Object to hold the OHIF Viewer's configuration. Here are some
    example values that would allow the viewer to hit our public PACS:</li>
 </ol>
@@ -33,6 +50,8 @@ include tags. Here's how it works:
 window.config = {
   // default: '/'
   routerBasename: '/',
+  // default: ''
+  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {
@@ -43,64 +62,28 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
+        requestOptions: {
+          requestFromBrowser: true,
+        },
       },
     ],
   },
 };
 ```
 
-<ol start="3"><li>
+<ol start="5"><li>
   Render the viewer in the web page's target <code>div</code>
 </li></ol>
 
 ```js
-// Made available by the `@ohif/viewer` script included in step 1
-var containerId = 'id-of-div-to-render-component-to';
-var componentRenderedOrUpdatedCallback = function() {
-  console.log('OHIF Viewer rendered/updated');
-};
-window.OHIFViewer.installViewer(
-  window.config,
-  containerId,
-  componentRenderedOrUpdatedCallback
-);
+// Made available by the `ohif-viewer` script included in step 1
+var Viewer = window.OHIFStandaloneViewer.App;
+var app = React.createElement(Viewer, window.config, null);
+
+ReactDOM.render(app, document.getElementById('ohif-viewer-target'));
 ```
 
-You can see a live example of this recipe in [this CodeSandbox][code-sandbox].
-
-## Add Extensions
-
-The UMD build of the OHIF Viewer is a "light weight" build that only contains
-the core extensions required for basic 2D image viewing. It's possible to add
-other extensions at runtime.
-
-This only requires us to include a single script tag, and add it using the
-`extensions` key to our config. In this practical example, we register our
-popular whole slide microscopy extension:
-
-```html
-<script
-  src="https://unpkg.com/@ohif/extension-dicom-microscopy@0.50.5/dist/index.umd.js"
-  crossorigin
-></script>
-
-<!-- --->
-<script>
-  window.config = {
-    // ...
-    extensions: [OHIFExtDicomMicroscopy],
-  };
-</script>
-```
-
-You can see an example of a slide microscopy study in the viewer [with the
-extension enabled here][whole-slide-ext-demo] ([source code][ext-code-sandbox])
-and [without it here][whole-slide-base-demo] ([source code][code-sandbox]).
-
-You can read more about extensions and how to create your own in our
-[extensions guide](/advanced/extensions.md).
-
-#### FAQ
+#### Tips & Tricks
 
 > I'm having trouble getting this to work. Where can I go for help?
 
@@ -108,34 +91,16 @@ First, check out this fully functional [CodeSandbox][code-sandbox] example. If
 you're still having trouble, feel free to search or GitHub issues. Can't find
 anything related your problem? Create a new one.
 
-> My application's styles are impacting the OHIF Viewer's look and feel. What
-> can I do?
+> When I include bootstrap, other styles on my page no longer work correctly.
+> What can I do?
 
-When you include stylesheets and scripts, they are added globally. This has the
-potential of causing conflicts with other scripts and styles on the page. To
-prevent this, `embed` the viewer in a new/empty web page. Have that working?
-Good. Now `embed` that new page using an
+When we include `bootsrap` (and the other dependencies), they are added
+globally. This has the potential of causing conflicts with other scripts and
+styles on the page. To prevent this, `embed` the viewer in a new/empty web page.
+Have that working? Good. Now `embed` that new page using an
 [`<iframe>` element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe).
 
 This should produce the expected result while also protecting your page from any
 globally defined styles/scripts.
 
-> We're trying to embed the OHIF Viewer into an existing React App, but seeing
-> react-dom and react conflicts. What can we do?
-
-`installViewer` is a convenience method that pulls in some dependencies that may
-not be compatible with existing `react` apps. `@ohif/viewer` also exports `App`
-which is a react component that takes the `configuration` outlined above as
-props. You can use it as a reusable component, and to avoid `react` version
-conflict issues.
-
-<!--
-  LINKS
-  -->
-
-<!-- prettier-ignore-start -->
-[code-sandbox]: https://codesandbox.io/s/viewer-script-tag-tprch
-[whole-slide-base-demo]: https://tprch.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2020.1519719354.757
-[ext-code-sandbox]: https://codesandbox.io/s/viewer-script-tag-microscopy-extension-44unk
-[whole-slide-ext-demo]: https://44unk.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2448.1519719572.518
-<!-- prettier-ignore-end -->
+[code-sandbox]: https://codesandbox.io/s/ohif-viewer-script-tag-usage-b3st9

docs/latest/deployment/recipes/nginx--image-archive.md

@@ -11,7 +11,7 @@ control.
 Do not use this recipe to host sensitive medical data on the open web. Depending
 on your company's policies, this may be an appropriate setup on an internal
 network when protected with a server's basic authentication. For a more robust
-setup, check out our [user account control recipe](./user-account-control.md)
+setup, check out our [user account control recpie](./user-account-control.md)
 that builds on the lessons learned here.
 
 ## Overview
@@ -51,7 +51,7 @@ We can solve this one of two ways:
 
 This solution uses the first approach, but you can see an example of the second
 in the `docker-compose` bundled with this project for local development:
-[HERE](https://github.com/OHIF/Viewers/blob/master/platform/viewer/.recipes/Nginx-Orthanc/docker-compose.yml)
+[HERE](#)
 
 You can read more about CORS in this Medium article: [Understanding
 CORS][understanding-cors]
@@ -121,9 +121,13 @@ likely want to update:
 
 #### OHIF Viewer
 
-The OHIF Viewer's configuration is imported from a static `.js` file. The configuration we use is set to a specific file when we build the viewer, and determined by the env variable: `APP_CONFIG`. You can see where we set its value in the `dockerfile` for this solution:
+The OHIF Viewer's configuration is imported from a static `.js` file and made
+available globally at `window.config`. The configuration we use is set to a
+specific file when we build the viewer, and determined by the env variable:
+`REACT_APP_CONFIG`. You can see where we set its value in the `dockerfile` for
+this solution:
 
-`ENV APP_CONFIG=config/docker_openresty-orthanc.js`
+`ENV REACT_APP_CONFIG=config/docker_openresty-orthanc.js`
 
 You can find the configuration we're using here:
 `/public/config/docker_openresty-orthanc.js`

docs/latest/deployment/recipes/user-account-control.md

@@ -122,9 +122,13 @@ likely want to update:
 
 #### OHIF Viewer
 
-The OHIF Viewer's configuration is imported from a static `.js` file. The configuration we use is set to a specific file when we build the viewer, and determined by the env variable: `APP_CONFIG`. You can see where we set its value in the `dockerfile` for this solution:
+The OHIF Viewer's configuration is imported from a static `.js` file and made
+available globally at `window.config`. The configuration we use is set to a
+specific file when we build the viewer, and determined by the env variable:
+`REACT_APP_CONFIG`. You can see where we set its value in the `dockerfile` for
+this solution:
 
-`ENV APP_CONFIG=config/docker_openresty-orthanc-keycloak.js`
+`ENV REACT_APP_CONFIG=config/docker_openresty-orthanc-keycloak.js`
 
 You can find the configuration we're using here:
 `/public/config/docker_openresty-orthanc-keycloak.js`
@@ -277,9 +281,9 @@ community members put together:
 [orthanc-docs]: http://book.orthanc-server.com/users/configuration.html#configuration
 [lua-resty-openidc-docs]: https://github.com/zmartzone/lua-resty-openidc
 <!-- SRC -->
-[config]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/src/config.js
-[dockerfile]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
-[config-nginx]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
-[config-orthanc]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
-[config-keycloak]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
+[config]: #
+[dockerfile]: #
+[config-nginx]: #
+[config-orthanc]: #
+[config-keycloak]: #
 <!-- prettier-ignore-end -->

docs/latest/essentials/configuration.md

@@ -4,51 +4,27 @@
 > one up, check out the [`Data Source` Guide](./data-source.md) or a deployment
 > recipe that contains an open source Image Archive
 
-## Overview
+## How it Works
 
-### Configuration Files
-
-The configuration for our viewer is in the `<root>platform/viewer/public/config`
-directory. Our build process knows which configuration file to use based on the
-`APP_CONFIG` environment variable. By default, its value is
-[`config/default.js`][default-config]. The majority of the viewer's features,
-and registered extension's features, are configured using this file.
-
-**Embedded Use Note:**
-
-Alternatively, when using the `commonjs` bundle for embedded use cases, these
-same values are what you'll pass to `installViewer` method:
-
-`OHIFStandaloneViewer.installViewer(window.config)`
-
-### Environment Variables
-
-We use environment variables at build and dev time to change the Viewer's
-behavior. We can update the `HTML_TEMPLATE` to easily change which extensions
-are registered, and specify a different `APP_CONFIG` to connect to an
-alternative data source (or even specify different default hotkeys).
-
-| Environment Variable | Description                                                                                        | Default             |
-| -------------------- | -------------------------------------------------------------------------------------------------- | ------------------- |
-| `HTML_TEMPLATE`      | Which [HTML template][html-templates] to use as our web app's entry point. Specific to PWA builds. | `index.html`        |
-| `PUBLIC_URL`         | The route relative to the host that the app will be served from. Specific to PWA builds.           | `/`                 |
-| `APP_CONFIG`         | Which [configuration file][config-file] to copy to output as `app-config.js`                       | `config/default.js` |
-| `PROXY_TARGET`       | When developing, proxy requests that match this pattern to `PROXY_DOMAIN`                          | `undefined`         |
-| `PROXY_DOMAIN`       | When developing, proxy requests from `PROXY_TARGET` to `PROXY_DOMAIN`                              | `undefined`         |
-
-### Registering Extensions
-
-> :warn: Instructions coming soon
+The configuration for our project is in the `/public/config` directory. Our
+build process knows which configuration file to use based on the
+`REACT_APP_CONFIG` environment variable. By default, its value is
+[`default.js`](https://github.com/OHIF/Viewers/blob/react/public/config/default.js).
+When we build, the `%REACT_APP_CONFIG%` value in
+our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/react/public/index.html#L12-L15)
+file is substituted for the correct configuration file's name. This sets the
+`window.config` equal to our configuration file's value.
 
 ## How do I configure my project?
 
 The simplest way is to update the existing default config:
 
-_/platform/viewer/public/config/default.js_
+_/public/config/default.js_
 
 ```js
 window.config = {
   routerBasename: '/',
+  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {
@@ -59,34 +35,23 @@ window.config = {
         qidoSupportsIncludeField: true,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
+        requestOptions: {
+          requestFromBrowser: true,
+        },
       },
     ],
   },
-};
+}
 ```
 
 You can also create a new config file and specify its path relative to the build
-output's root by setting the `APP_CONFIG` environment variable. You can set the
-value of this environment variable a few different ways:
+output's root by setting the `REACT_APP_CONFIG` environment variable. You can
+set the value of this environment variable a few different ways:
 
-- ~[Add a temporary environment variable in your shell](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-temporary-environment-variables-in-your-shell)~
-  - Previous `react-scripts` functionality that we need to duplicate with
-    `dotenv-webpack`
-- ~[Add environment specific variables in `.env` file(s)](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-development-environment-variables-in-env)~
-  - Previous `react-scripts` functionality that we need to duplicate with
-    `dotenv-webpack`
+- [Add a temporary environment variable in your shell](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-temporary-environment-variables-in-your-shell)
+- [Add environment specific variables in `.env` file(s)](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-development-environment-variables-in-env)
 - Using the `cross-env` package in an npm script:
-  - `"build": "cross-env APP_CONFIG=config/my-config.js react-scripts build"`
+  - `"build": "cross-env REACT_APP_CONFIG=config/my-config.js react-scripts build"`
 
-After updating the configuration, `yarn run build` to generate updated build
+After updating the configuration, `yarn run build:web` to generate updated build
 output.
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[default-config]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/config/default.js
-[html-templates]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/public/html-templates
-[config-files]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/public/config
-<!-- prettier-ignore-end -->

docs/latest/essentials/data-source.md

@@ -35,10 +35,10 @@ For our purposes, we will be using `Orthanc`, but you can see a list of
 _Not sure if you have `docker` installed already? Try running `docker --version`
 in command prompt or terminal_
 
-> If you are using `Docker Toolbox` you need to change the _PROXY_DOMAIN_
-> parameter in _platform/viewer/package.json_ to http://192.168.99.100:8042 or
-> the ip docker-machine ip throws. This is the value [`WebPack`][webpack-proxy]
-> uses to proxy requests
+> If you are using `Docker Toolbox` you need to change the _proxy_ parameter in
+> _package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip
+> throws. This is the value [`react-scripts`][react-proxy] uses to proxy
+> requests
 
 ### Running Orthanc
 
@@ -51,9 +51,8 @@ yarn run orthanc:up
 
 _Upload your first Study:_
 
-1. Navigate to
-   [Orthanc's web interface](http://localhost:8042/app/explorer.html) at
-   `http://localhost:8042/app/explorer.html` in a web browser.
+1. Navigate to [Orthanc's web interface](http://localhost:8899) at
+   `http://localhost:8899` in a web browser.
 2. In the top right corner, click "Upload"
 3. Click "Select files to upload..." and select one or more DICOM files
 4. Click "Start the upload"
@@ -61,20 +60,17 @@ _Upload your first Study:_
 #### Orthanc: Learn More
 
 You can see the `docker-compose.yml` file this command runs at
-[`<project-root>/.docker/Nginx-Orthanc/`][orthanc-docker-compose], and more on
-Orthanc for Docker in [Orthanc's documentation][orthanc-docker].
+[`<project-root>/docker/Nginx-Docker/`](#), and more on Orthanc for Docker in
+[Orthanc's documentation][orthanc-docker].
 
 ### Connecting to Orthanc
 
 Now that we have a local Orthanc instance up and running, we need to configure
 our web application to connect to it. Open a new terminal window, navigate to
-this repository's root directory, and run:
+this project's root directory, and run:
 
 ```bash
-# If you haven't already, enable yarn workspaces
-yarn config set workspaces-experimental true
-
-# Restore dependencies
+# If you haven't already, restore dependencies
 yarn install
 
 # Run our dev command, but with the local orthanc config
@@ -91,28 +87,24 @@ is running the `dev:orthanc` script in our project's `package.json`. That script
 is:
 
 ```js
-cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://localhost:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js -w
+cross-env PORT=5000 REACT_APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start
 ```
 
-- `cross-env` sets three environment variables
-  - PROXY_TARGET: `/dicom-web`
-  - PROXY_DOMAIN: `http://localhost:8042`
-  - APP_CONFIG: `config/docker_nginx-orthanc.js`
-- `webpack-dev-server` runs using the `.webpack/webpack.pwa.js` configuration
-  file. It will watch for changes and update as we develop.
+- `cross-env` sets two environment variables
+  - PORT: 5000
+  - REACT_APP_CONFIG: `config/docker_nginx-orthanc.js`
+- `react-scripts` runs it's `start` script. This is [the de-facto
+  way][cra-start] to run a "Create React App" in development mode.
 
-`PROXY_TARGET` and `PROXY_DOMAIN` tell our development server to proxy requests
-to `Orthanc`. This allows us to bypass CORS issues that normally occur when
-requesting resources that live at a different domain.
-
-The `APP_CONFIG` value tells our app which file to load on to `window.config`.
-By default, our app uses the file at
-`<project-root>/platform/viewer/public/config/default.js`. Here is what that
-configuration looks like:
+The `REACT_APP_CONFIG` value tells our app which file to load on to
+`window.config`. By default, our app uses the file at
+`<project-root>/public/config/default.js`. Here is what that configuration looks
+like:
 
 ```js
 window.config = {
   routerBasename: '/',
+  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {
@@ -155,8 +147,8 @@ _Feel free to make a Pull Request if you want to add to this list._
 [dcmjs-org]: https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado
 [dicom-web]: https://en.wikipedia.org/wiki/DICOMweb
 [storescu]: http://support.dcmtk.org/docs/storescu.html
-[webpack-proxy]: https://webpack.js.org/configuration/dev-server/#devserverproxy
-[orthanc-docker-compose]: https://github.com/OHIF/Viewers/tree/master/.docker/Nginx-Orthanc
+[cra-start]: https://github.com/facebook/create-react-app#npm-start-or-yarn-start
+[react-proxy]: https://facebook.github.io/create-react-app/docs/proxying-api-requests-in-development#configuring-the-proxy-manually
 <!-- Archives -->
 [dcm4chee]: https://github.com/dcm4che/dcm4chee-arc-light
 [dcm4chee-docker]: https://github.com/dcm4che/dcm4chee-arc-light/wiki/Running-on-Docker

docs/latest/essentials/getting-started.md

@@ -24,7 +24,8 @@ graphic that illustrates this setup][triangular-workflow].
 Alternatively, if you intend to use the OHIF Viewer as a starting point, and you
 aren't as concerned with syncing updates, then follow these steps:
 
-1. Navigate to the [OHIF/Viewers][ohif-viewers] repository
+1. Navigate to the [OHIF/Viewers/tree/react][ohif-viewers-react-repo] repository
+   and branch
 2. Click `Clone or download`, and then `Download ZIP`
 3. Use the contents of the `.zip` file as a starting point for your viewer
 
@@ -38,8 +39,6 @@ aren't as concerned with syncing updates, then follow these steps:
 
 - [Node.js & NPM](https://nodejs.org/en/)
 - [Yarn](https://yarnpkg.com/en/)
-- Yarn workspaces should be enabled:
-  - `yarn config set workspaces-experimental true`
 
 ### Kick the tires
 
@@ -51,18 +50,21 @@ following commands:
 yarn install
 
 # Start local development server
-yarn run dev
+yarn start
 ```
 
 You should see the following output:
 
 ```bash
-@ohif/viewer: i ｢wds｣: Project is running at http://localhost:3000/
-@ohif/viewer: i ｢wds｣: webpack output is served from /
-@ohif/viewer: i ｢wds｣: Content not from webpack is served from D:\code\ohif\Viewers\platform\viewer
-@ohif/viewer: i ｢wds｣: 404s will fallback to /index.html
+Compiled successfully!
 
-# And a list of all generated files
+You can now view ohif-viewer in the browser.
+
+  Local:            http://localhost:5000/
+  On Your Network:  http://10.74.20.83:5000/
+
+Note that the development build is not optimized.
+To create a production build, use yarn build.
 ```
 
 ### 🎉 Celebrate 🎉
@@ -79,17 +81,15 @@ You should see the following output:
 
 ```bash
 # Build static assets to host a PWA
-yarn run build
+yarn run build:web
 
-# Build packaged output (script-tag use)
+# Build packaged output
 yarn run build:package
 ```
 
 ## Next Steps
 
-Take a look at the sidebar. Depending on how you intend to use The OHIF Viewer,
-different topics may be more pertinent than others. At a minimum, reading "The
-Essentials" and the deployment recipes should be a good starting point.
+...
 
 ## Troubleshooting
 
@@ -111,5 +111,5 @@ Essentials" and the deployment recipes should be a good starting point.
 [sync-changes]: https://help.github.com/en/articles/syncing-a-fork
 [triangular-workflow]: https://github.blog/2015-07-29-git-2-5-including-multiple-worktrees-and-triangular-workflows/#improved-support-for-triangular-workflows
 [ohif-viewers-repo]: https://github.com/OHIF/Viewers
-[ohif-viewers]: https://github.com/OHIF/Viewers
+[ohif-viewers-react-repo]: https://github.com/OHIF/Viewers/tree/react
 <!-- prettier-ignore-end -->

docs/latest/essentials/installation.md

@@ -5,52 +5,38 @@ processes:
 
 ```bash
 # Static Asset output: For deploying PWAs
-yarn run build
+yarn run build:web
 
 # Single `.js` script, for embedding viewer into existing apps
 yarn run build:package
 ```
 
-## Progressive Web Application (PWA)
+## create-react-app (PWA)
 
-> [Progressive Web Apps][pwa] are a new breed of web applications that meet the
-> [following requirements][pwa-checklist]. Notably, targeting a PWA allows us
-> provide a reliable, fast, and engaging experience across different devices and
-> network conditions.
+> [create-react-app](https://github.com/facebook/create-react-app) provides
+> pre-configured build process for developing front-end applications with
+> [React](https://reactjs.org/).
 
-The OHIF Viewer is maintained as a [monorepo][monorepo]. We use WebPack to build
-the many small static assets that comprise our application. Also generated is an
-`index.html` that will serve as an entry point for loading configuration and the
-application, as well as a `service-worker` that can intelligently cache files so
-that subsequent requests are from the local file system instead of over the
-network.
+The ohif-viewer package can be run as a create-react-app application. This is
+useful for development, debugging, or evolving the OHIF Viewer into your own
+custom imaging application.
 
 You can read more about this particular strategy in our
 [Build for Production Deployment Guide](./../deployment/recipes/build-for-production.md)
 
-## Commonjs Bundle (Packaged Script)
+## Rollup (Packaged Script)
 
-The [@ohif/viewer][viewer-npm] package is built with WebPack to provide a React
-component that can be dropped into a larger application. The `OHIFViewer`
-component is the entire viewer, configurable via React `props`. This is useful
-for including the OHIF Viewer in a larger web application, as the entire
-application can be provided via a `<script>` tag with no build process required.
+> [Rollup](https://rollupjs.org/guide/en) is a module bundler for JavaScript. It
+> uses the new standardized format for code modules included in the ES6 revision
+> of JavaScript.
 
-The bundle is not as performant or as optimized as the PWA build. It includes
-fonts, styles, and the core extensions. If you find yourself facing performance
-issues, you may wish to tweak what's included in this bundle or switch to the
-PWA build.
+The [ohif-viewer](https://www.npmjs.com/package/ohif-viewer) package can be
+built with Rollup to provide a set of React components which can be dropped into
+a larger application. Specifically, the ohif-viewer package provides a React
+component named `OHIFViewer` which is the entire viewer, configurable via React
+`props`. This is useful for including the OHIF Viewer in a larger web
+application, as the entire application can be provided via a `<script>` tag with
+no build process required.
 
 You can read more about this particular strategy in our
 [Embedded Viewer Deployment Guide](./../deployment/recipes/embedded-viewer.md)
-
-<!--
-  Links
-  -->
-
-<!-- prettier-ignore-start -->
-[pwa]: https://developers.google.com/web/progressive-web-apps/
-[pwa-checklist]: https://developers.google.com/web/progressive-web-apps/checklist
-[monorepo]: https://github.com/OHIF/Viewers/issues/768
-[viewer-npm]: https://www.npmjs.com/package/@ohif/viewer
-<!-- prettier-ignore-end -->

docs/latest/essentials/themeing.md

@@ -4,7 +4,7 @@ Themeing is currently accomplished with color variables that are defined within
 the [`:root`](https://css-tricks.com/almanac/selectors/r/root/) selector
 (allowing them to cascade across all elements). This repository's components,
 and the ones we consume from our
-[`@ohif/ui` component library](https://react.ohif.org/styling-and-theming)
+[React Viewerbase component library](https://react.ohif.org/styling-and-theming)
 utilize them. We are interested in pursuing more robust themeing options, and
 open to pull requests and discussion issues.
 
@@ -80,12 +80,12 @@ function RadicalImagingLogo() {
       href: 'http://radicalimaging.com',
     },
     React.createElement('h5', {}, 'RADICAL IMAGING')
-  );
+  )
 }
 
 props.whiteLabelling = {
   logoComponent: RadicalImagingLogo(),
-};
+}
 ```
 
 <!--

docs/latest/essentials/translating.md

@@ -145,8 +145,8 @@ becomes a new namespace automatically.
 - CineDialog: Translations for the toll tips inside the Cine Player Dialog
 - Common: all common jargons that can be reused like `t('$t(common:image)')`
 - Header: translations related to OHIF's Header Top Bar
-- MeasurementTable - Translations for the `@ohif/ui` Measurement Table
-- UserPreferencesModal - Translations for the `@ohif/ui` Preferences Modal
+- MeasurementTable - Translations for the react-viewerbase Measurement Table
+- UserPreferencesModal - Translations for the react-viewerbase Preferences Modal
 
 ### How to use another NameSpace inside the current NameSpace?
 

docs/latest/frequently-asked-questions.md

@@ -1,28 +1,45 @@
 # Frequently Asked Questions
 
-## Index
+## How do I file a bug?
 
-- [Report a bug][report-bug]
-- [Request a feature][new-feature]
-- [Commercial Support & Consulting][commercial-support]
-- [Academic collaborations][academic]
-- [FDA Clearance or CE Marking][fda-clearance]
-- [HIPAA Compliance][hipaa]
+We accept and triage bug reports through Github primarily.
 
-### How do I report a bug?
+- [Create a Github account](https://github.com/join)
+- Search the current [Issue List](https://github.com/OHIF/Viewers/issues) to
+  ensure you are not creating a duplicate issue.
+  - If your issue already exists, post a comment to show us that this issue also
+    affects you.
+- If no prior issue exists,
+  [Create a New Issue](https://github.com/OHIF/Viewers/issues/new) on the
+  repository.
 
-Navigate to our [GitHub Repository][new-issue], and submit a new bug report.
-Follow the steps outlined in the [Bug Report Template][bug-report-template].
+Some tips for filing a new issue:
+
+- **Make sure your issue is reproducible**: If we try to reproduce your issue
+  given your provided steps and we cannot reproduce it, we will not be able to
+  fix it. _Nobody wants to spend time guessing how to reproduce your issue!_
+  Before filing, please reproduce your issue more than once and clearly describe
+  the steps taken.
+- **If you are reporting a user interface issue, provide screenshots**: A
+  picture is worth a thousand words. If your issue concerns the UI, screenshots
+  will help us identify the issue dramatically faster since it can be extremely
+  challenging to describe UI bugs with text. _You should still clearly describe
+  the steps that you took to produce the issue_.
+- **Include platform & environment**: Your operating system, web browser, and
+  web browser version are highly relevant for many bugs. Please provide these
+  with all bug reports.
+- **Include expected and actual result**: Tell us what you expected to happen,
+  and what actually happened. If you don't do this, we might not consider it a
+  bug.
 
 ### How can I request a new feature?
 
 At the moment we are in the process of defining our roadmap and will do our best
 to communicate this to the community. If your requested feature is on the
 roadmap, then it will most likely be built at some point. If it is not, you are
-welcome to build it yourself and [contribute it](contributing/index.md). If you
+welcome to build it yourself and [contribute it](../contributing.md). If you
 have resources and would like to fund the development of a feature, please
-[contact us](http://www.ohif.org) or work with community members that offer
-[consulting services][commercial-support].
+[contact us](http://www.ohif.org).
 
 ### Who should I contact about Academic Collaborations?
 
@@ -32,7 +49,7 @@ collaborators. We are always happy to hear about new groups interested in using
 the OHIF framework, and may be able to provide development support if the
 proposed collaboration has an impact on cancer research.
 
-### Does OHIF offer commercial support?
+### Do you offer commercial support?
 
 The Open Health Imaging Foundation does not offer commercial support, however,
 some community members do offer consulting services. The following contacts may
@@ -43,39 +60,36 @@ be useful:
 **Please file a Pull Request if you wish to add your name or organization to
 this list.**
 
-### Does The OHIF Viewer have [510(k) Clearance][501k-clearance] from the U.S. F.D.A or [CE Marking][ce-marking] from the European Commission?
+### I emailed my question to you directly and you did not respond. Why not?
 
-**NO.** The OHIF Viewer is **NOT** F.D.A. cleared or CE Marked. It is the users
-responsibility to ensure compliance with applicable rules and regulations. The
+Emailing developers directly is not a shortcut to faster support. Please file
+your issues and questions on Github so that everyone can benefit from the
+discussion and solutions.
+
+### Do your Viewers have [510(k) Clearance][501k-clearance] from the U.S. F.D.A or [CE Marking][ce-marking] from the European Commission?
+
+**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer, **NOT** F.D.A.
+cleared or CE Marked. It is the users responsibility to ensure compliance with
+applicable rules and regulations. The
 [License](https://github.com/OHIF/Viewers/blob/master/LICENSE) for the OHIF
-Platform does not prevent your company or group from seeking F.D.A. clearance
-for a product built using the platform.
+Framework does not prevent your company or group from seeking F.D.A. clearance
+for a product built using the framework.
 
 If you have gone this route (or are going there), please let us know because we
 would be interested to hear about your experience.
 
-### Is The OHIF Viewer [HIPAA][hipaa-def] Compliant?
+### Are your Viewers [HIPAA][hipaa] Compliant?
 
-**NO.** The OHIF Viewer **DOES NOT** fulfill all of the criteria to become HIPAA
-Compliant. It is the users responsibility to ensure compliance with applicable
-rules and regulations.
+**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer **DO NOT**
+fulfill all of the criteria to become HIPAA Compliant. It is the users
+responsibility to ensure compliance with applicable rules and regulations.
 
 <!--
   Links
   -->
 
 <!-- prettier-ignore-start -->
-<!-- INDEX -->
-[report-bug]: #how-do-i-report-a-bug
-[new-feature]: #how-can-i-request-a-new-feature
-[commercial-support]: #does-ohif-offer-commercial-support
-[academic]: #who-should-i-contact-about-academic-collaborations
-[fda-clearance]: #does-the-ohif-viewer-have-510k-clearance-from-the-us-fda-or-ce-marking-from-the-european-commission
-[hipaa]: #is-the-ohif-viewer-hipaa-compliant
-<!-- OTHER -->
 [501k-clearance]: https://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/HowtoMarketYourDevice/PremarketSubmissions/PremarketNotification510k/
 [ce-marking]: https://ec.europa.eu/growth/single-market/ce-marking_en
-[hipaa-def]: https://en.wikipedia.org/wiki/Health_Insurance_Portability_and_Accountability_Act
-[new-issue]: https://github.com/OHIF/Viewers/issues/new/choose
-[bug-report-template]: https://github.com/OHIF/Viewers/issues/new?assignees=&labels=Bug+Report+%3Abug%3A&template=---bug-report.md&title=
+[hipaa]: https://en.wikipedia.org/wiki/Health_Insurance_Portability_and_Accountability_Act
 <!-- prettier-ignore-end -->

docs/latest/help.md

@@ -3,7 +3,7 @@
 We all need a little help sometimes. Don't let a few roadblocks stand in the way
 of you building something awesome.
 
-## Community Support
+## Free
 
 If you're a developer looking to contribute code, documentation, or discussion;
 we are more than happy to help provide clarification and answer questions via
@@ -21,7 +21,7 @@ resources and must be judicious with how we allocate them. If you find yourself
 in this situation and in need of assistance, it may be in your best interest to
 persue paid support.
 
-## Commercial Support
+## Paid / Commercial
 
 The Open Health Imaging Foundation does not offer commercial support, however,
 some community members do offer consulting services:

docs/latest/roadmap.md

@@ -0,0 +1,25 @@
+# Roadmap
+
+If you want to know what's planned for the very near future,
+[check out our roadmap](https://ohif.canny.io/). The best way to influence when
+and what is worked on is to contribute to the conversation by creating GitHub
+issues, and contributing code through pull requests. OHIF's high level
+priorities for the near future are:
+
+- Feature parity with version 1
+- Extension and configuration improvements with key integration partners
+- Continued Developer Experience Improvements
+- Segmentation Tools, and improved VTK.js support
+
+More granular information will make it's way to the backlog as these items
+become scoped for development by core maintainers.
+
+> Don't hesitate to ask questions, propose features, or create pull requests.
+> We're here, we're listening, and we're ready to build the best open source
+> medical imaging viewer on the web.
+
+### Roadmap Generously Powered by Canny.io
+
+<a href="https://ohif.canny.io/">
+  <img height="30" src="assets/img/canny-full.png" />
+</a>

docs/latest/yarn.lock

@@ -1074,10 +1074,10 @@ gitbook-plugin-sitemap@^1.2.0:
   dependencies:
     sitemap "1.5.0"
 
-gitbook-plugin-theme-cornerstone@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/gitbook-plugin-theme-cornerstone/-/gitbook-plugin-theme-cornerstone-1.1.4.tgz#bc21b65acee2ac67e2ddb0986442ec448fe0c7fb"
-  integrity sha512-BADgFyEKhkc0pPSBRwXa5VU2UoYQkd2cRwjrtjHyV6w4h/M7uyeWYFOcsgi2ju3rpHRCwF8lMg/TtDdAV8V1SQ==
+gitbook-plugin-theme-cornerstone@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gitbook-plugin-theme-cornerstone/-/gitbook-plugin-theme-cornerstone-1.1.3.tgz#320e1d688eaf27dbf8d580f285509b55984437fd"
+  integrity sha512-fURj67XGQ5rZPj8LXbwEviMxLfWgN/s08t9Wnp1dQqffBUJwsLe00R/IeecOjsQHJ3Gvb8GjbXJ6qzIDGu5hPA==
 
 gitbook-plugin-versions@^2.1.4:
   version "2.1.4"
@@ -1608,9 +1608,9 @@ lodash.map@^4.4.0:
   integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
 
 lodash.merge@^4.4.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+  integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
 
 lodash.pad@^4.1.0:
   version "4.5.1"

docs/v1/faq/general.md

@@ -1,93 +1,47 @@
 # Frequently Asked Questions - General
-
 ### How do I file a bug?
-
 We accept and triage bug reports through Github primarily.
-
 1. [Create a Github account](https://github.com/join)
-2. Search the current [Issue List](https://github.com/OHIF/Viewers/issues) to
-   ensure you are not creating a duplicate issue.
+2. Search the current [Issue List](https://github.com/OHIF/Viewers/issues) to ensure you are not creating a duplicate issue.
 
-If your issue already exists, post a comment to show us that this issue also
-affects you.
+  If your issue already exists, post a comment to show us that this issue also affects you.
 
-3. If no prior issue exists,
-   [Create a New Issue](https://github.com/OHIF/Viewers/issues/new) on the
-   repository.
+3. If no prior issue exists, [Create a New Issue](https://github.com/OHIF/Viewers/issues/new) on the repository.
 
 Some tips for filing a new issue:
-
-- **Make sure your issue is reproducible**: If we try to reproduce your issue
-  given your provided steps and we cannot reproduce it, we will not be able to
-  fix it. _Nobody wants to spend time guessing how to reproduce your issue!_
-  Before filing, please reproduce your issue more than once and clearly describe
-  the steps taken.
-- **If you are reporting a user interface issue, provide screenshots**: A
-  picture is worth a thousand words. If your issue concerns the UI, screenshots
-  will help us identify the issue dramatically faster since it can be extremely
-  challenging to describe UI bugs with text. _You should still clearly describe
-  the steps that you took to produce the issue_.
-- **Include platform & environment**: Your operating system, web browser, and
-  web browser version are highly relevant for many bugs. Please provide these
-  with all bug reports.
-- **Include expected and actual result**: Tell us what you expected to happen,
-  and what actually happened. If you don't do this, we might not consider it a
-  bug.
+* **Make sure your issue is reproducible**: If we try to reproduce your issue given your provided steps and we cannot reproduce it, we will not be able to fix it. *Nobody wants to spend time guessing how to reproduce your issue!* Before filing, please reproduce your issue more than once and clearly describe the steps taken.
+* **If you are reporting a user interface issue, provide screenshots**: A picture is worth a thousand words. If your issue concerns the UI, screenshots will help us identify the issue dramatically faster since it can be extremely challenging to describe UI bugs with text. *You should still clearly describe the steps that you took to produce the issue*.
+* **Include platform & environment**: Your operating system, web browser, and web browser version are highly relevant for many bugs. Please provide these with all bug reports.
+* **Include expected and actual result**: Tell us what you expected to happen, and what actually happened. If you don't do this, we might not consider it a bug.
 
 ### How can I request a new feature?
 
-At the moment we are in the process of defining our roadmap and will do our best
-to communicate this to the community. If your requested feature is on the
-roadmap, then it will most likely be built at some point. If it is not, you are
-welcome to build it yourself and [contribute it](../contributing.md). If you
-have resources and would like to fund the development of a feature, please
-[contact us](http://www.ohif.org).
+At the moment we are in the process of defining our roadmap and will do our best to communicate this to the community. If your requested feature is on the roadmap, then it will most likely be built at some point. If it is not, you are welcome to build it yourself and [contribute it](../contributing.md). If you have resources and would like to fund the development of a feature, please [contact us](http://www.ohif.org).
 
 ### Who should I contact about Academic Collaborations?
 
-[Gordon J. Harris](http://www.dfhcc.harvard.edu/insider/member-detail/member/gordon-j-harris-phd/)
-at Massachusetts General Hospital is the primary contact for any academic
-collaborators. We are always happy to hear about new groups interested in using
-the OHIF framework, and may be able to provide development support if the
-proposed collaboration has an impact on cancer research.
+[Gordon J. Harris](http://www.dfhcc.harvard.edu/insider/member-detail/member/gordon-j-harris-phd/) at Massachusetts General Hospital is the primary contact for any academic collaborators. We are always happy to hear about new groups interested in using the OHIF framework, and may be able to provide development support if the proposed collaboration has an impact on cancer research.
 
 ### Do you offer commercial support?
 
-The Open Health Imaging Foundation does not offer commercial support, however,
-some community members do offer consulting services. The following contacts may
-be useful:
+The Open Health Imaging Foundation does not offer commercial support, however, some community members do offer consulting services. The following contacts may be useful:
 
-- Rob Lewis ([Radical Imaging](http://radicalimaging.com/))
+* Rob Lewis ([Radical Imaging](http://radicalimaging.com/))
 
-**Please file a Pull Request if you wish to add your name or organization to
-this list.**
+**Please file a Pull Request if you wish to add your name or organization to this list.**
 
 ### I emailed my question to you directly and you did not respond. Why not?
 
-Emailing developers directly is not a shortcut to faster support. Please file
-your issues and questions on Github so that everyone can benefit from the
-discussion and solutions.
+Emailing developers directly is not a shortcut to faster support. Please file your issues and questions on Github so that everyone can benefit from the discussion and solutions.
 
 ### Do your Viewers have [510(k) Clearance](https://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/HowtoMarketYourDevice/PremarketSubmissions/PremarketNotification510k/) from the U.S. F.D.A or [CE Marking](https://ec.europa.eu/growth/single-market/ce-marking_en) from the European Commission?
 
-**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer, **NOT** F.D.A.
-cleared or CE Marked. It is the users responsibility to ensure compliance with
-applicable rules and regulations. The
-[License](https://github.com/OHIF/Viewers/blob/master/LICENSE) for the OHIF
-Framework does not prevent your company or group from seeking F.D.A. clearance
-for a product built using the framework.
+**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer, **NOT** F.D.A. cleared or CE Marked. It is the users responsibility to ensure compliance with applicable rules and regulations. The [License](https://github.com/OHIF/Viewers/blob/master/LICENSE) for the OHIF Framework does not prevent your company or group from seeking F.D.A. clearance for a product built using the framework.
 
-If you have gone this route (or are going there), please let us know because we
-would be interested to hear about your experience.
+If you have gone this route (or are going there), please let us know because we would be interested to hear about your experience.
 
 ### Are your Viewers [HIPAA](https://en.wikipedia.org/wiki/Health_Insurance_Portability_and_Accountability_Act) Compliant?
 
-**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer **DO NOT**
-fulfill all of the criteria to become HIPAA Compliant. It is the users
-responsibility to ensure compliance with applicable rules and regulations.
+**NO.** The OHIF Viewer, Lesion Tracker, and Standalone Viewer **DO NOT** fulfill all of the criteria to become HIPAA Compliant. It is the users responsibility to ensure compliance with applicable rules and regulations.
 
-The Lesion Tracker application demonstrates some available components and
-features (e.g. [Audit Trail](../lesion-tracker/audit-trail.md), automatic
-logoff, and unique user identification for
-[User Accounts](../lesion-tracker/user-accounts.md)) which could be used by
-third parties seeking HIPAA compliance.
+The Lesion Tracker application demonstrates some available components and features (e.g. [Audit Trail](../lesion-tracker/audit-trail.md), automatic logoff, and unique user identification for [User Accounts](../lesion-tracker/user-accounts.md)) which could be used by third parties seeking HIPAA compliance.

extensions/cornerstone/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

extensions/cornerstone/.eslintrc

@@ -0,0 +1,16 @@
+{
+  "extends": [
+  	"react-app",
+  	"eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "parser": "babel-eslint",
+  "env": {
+    "jest": true
+  },
+  "settings": {
+    "react": {
+      "version": "detect",
+    },
+  },
+}

extensions/cornerstone/.gitignore

@@ -0,0 +1,26 @@
+
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+
+# builds
+build
+dist
+.rpt2_cache
+
+# misc
+.DS_Store
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.idea
+
+yalc.lock
+.yalc

extensions/cornerstone/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 9
+  - 8

extensions/cornerstone/.webpack/webpack.dev.js

@@ -1,8 +0,0 @@
-const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.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 });
-};

extensions/cornerstone/.webpack/webpack.prod.js

@@ -1,44 +0,0 @@
-const webpack = require('webpack');
-const merge = require('webpack-merge');
-const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
-const pkg = require('./../package.json');
-
-const ROOT_DIR = path.join(__dirname, './..');
-const SRC_DIR = path.join(__dirname, '../src');
-const DIST_DIR = path.join(__dirname, '../dist');
-
-module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
-
-  return merge(commonConfig, {
-    devtool: 'source-map',
-    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: 'OHIFExtCornerstone',
-      libraryTarget: 'umd',
-      libraryExport: 'default',
-      filename: pkg.main,
-    },
-    plugins: [
-      new webpack.optimize.LimitChunkCountPlugin({
-        maxChunks: 1,
-      }),
-    ],
-  });
-};

extensions/cornerstone/CHANGELOG.md

@@ -3,288 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.4.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.3.1...@ohif/extension-cornerstone@1.4.0) (2019-10-26)
-
-
-### Features
-
-* Snapshot Download Tool ([#840](https://github.com/OHIF/Viewers/issues/840)) ([450e098](https://github.com/OHIF/Viewers/commit/450e0981a5ba054fcfcb85eeaeb18371af9088f8))
-
-
-
-
-
-## [1.3.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.3.0...@ohif/extension-cornerstone@1.3.1) (2019-10-09)
-
-
-### Bug Fixes
-
-* 🐛 set tools bidirectional, eraser and annotate command ([#1020](https://github.com/OHIF/Viewers/issues/1020)) ([a28984e](https://github.com/OHIF/Viewers/commit/a28984e))
-
-
-
-
-
-# [1.3.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.5...@ohif/extension-cornerstone@1.3.0) (2019-10-09)
-
-
-### Features
-
-* Multiple fixes and implementation changes to react-cornerstone-viewport ([1cc94f3](https://github.com/OHIF/Viewers/commit/1cc94f3))
-
-
-
-
-
-## [1.2.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.4...@ohif/extension-cornerstone@1.2.5) (2019-09-27)
-
-
-### Bug Fixes
-
-* version bump issue ([#963](https://github.com/OHIF/Viewers/issues/963)) ([e607ed2](https://github.com/OHIF/Viewers/commit/e607ed2)), closes [#962](https://github.com/OHIF/Viewers/issues/962)
-
-
-
-
-
-# [2.0.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.2...@ohif/extension-cornerstone@2.0.0) (2019-09-27)
-
-
-### Bug Fixes
-
-* 🐛 Add DicomLoaderService & FileLoaderService to fix SR, PDF, and SEG support in local file and WADO-RS-only use cases ([#862](https://github.com/OHIF/Viewers/issues/862)) ([e7e1a8a](https://github.com/OHIF/Viewers/commit/e7e1a8a)), closes [#838](https://github.com/OHIF/Viewers/issues/838)
-* version bump issue ([#962](https://github.com/OHIF/Viewers/issues/962)) ([c80ea17](https://github.com/OHIF/Viewers/commit/c80ea17))
-
-
-### BREAKING CHANGES
-
-* DICOM Seg
-
-
-
-
-
-# [2.0.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.2...@ohif/extension-cornerstone@2.0.0) (2019-09-27)
-
-
-### Bug Fixes
-
-* 🐛 Add DicomLoaderService & FileLoaderService to fix SR, PDF, and SEG support in local file and WADO-RS-only use cases ([#862](https://github.com/OHIF/Viewers/issues/862)) ([e7e1a8a](https://github.com/OHIF/Viewers/commit/e7e1a8a)), closes [#838](https://github.com/OHIF/Viewers/issues/838)
-
-
-### BREAKING CHANGES
-
-* DICOM Seg
-
-
-
-
-
-## [1.2.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.1...@ohif/extension-cornerstone@1.2.2) (2019-09-26)
-
-
-### Bug Fixes
-
-* Add some code splitting for PWA build ([#937](https://github.com/OHIF/Viewers/issues/937)) ([8938035](https://github.com/OHIF/Viewers/commit/8938035))
-
-
-
-
-
-## [1.2.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.2.0...@ohif/extension-cornerstone@1.2.1) (2019-09-17)
-
-
-### Bug Fixes
-
-* bump cornerstone-tools version in peerDeps ([4afc88c](https://github.com/OHIF/Viewers/commit/4afc88c))
-
-
-
-
-
-# [1.2.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.1.1...@ohif/extension-cornerstone@1.2.0) (2019-09-12)
-
-
-### Features
-
-* **Annotate:** Add annotate tool back to toolbar ([26be967](https://github.com/OHIF/Viewers/commit/26be967))
-
-
-
-
-
-## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.1.0...@ohif/extension-cornerstone@1.1.1) (2019-09-12)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-# [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.0.1...@ohif/extension-cornerstone@1.1.0) (2019-09-12)
-
-
-### Features
-
-* **BidirectionalTool:** Add BidrectionalTool to "more" menu ([#911](https://github.com/OHIF/Viewers/issues/911)) ([e40cbae](https://github.com/OHIF/Viewers/commit/e40cbae))
-* **EraserTool:** add eraserTool to @ohif/extension-cornerstone ([#912](https://github.com/OHIF/Viewers/issues/912)) ([698d274](https://github.com/OHIF/Viewers/commit/698d274))
-
-
-
-
-
-## [1.0.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@1.0.0...@ohif/extension-cornerstone@1.0.1) (2019-09-10)
-
-
-### Bug Fixes
-
-* simplify runtime-extension usage ([ac5dbda](https://github.com/OHIF/Viewers/commit/ac5dbda))
-
-
-
-
-
-# [1.0.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.5...@ohif/extension-cornerstone@1.0.0) (2019-09-09)
-
-
-### Features
-
-* 🎸 Upgraded to cornerstoneTools 4.0 ([86adb51](https://github.com/OHIF/Viewers/commit/86adb51))
-
-
-### BREAKING CHANGES
-
-* n
-
-
-
-
-
-## [0.50.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.4...@ohif/extension-cornerstone@0.50.5) (2019-09-06)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.3...@ohif/extension-cornerstone@0.50.4) (2019-09-04)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.2...@ohif/extension-cornerstone@0.50.3) (2019-09-04)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-## [0.50.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.1...@ohif/extension-cornerstone@0.50.2) (2019-09-04)
-
-
-### Bug Fixes
-
-* measurementsAPI issue caused by production build ([#842](https://github.com/OHIF/Viewers/issues/842)) ([49d3439](https://github.com/OHIF/Viewers/commit/49d3439))
-
-
-
-
-
-## [0.50.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.0-alpha.10...@ohif/extension-cornerstone@0.50.1) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.9...@ohif/extension-cornerstone@0.50.0-alpha.10) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-## [0.0.39-alpha.9](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.8...@ohif/extension-cornerstone@0.0.39-alpha.9) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-## 0.0.39-alpha.8 (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-
-
-
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.6...@ohif/extension-cornerstone@0.0.39-alpha.7) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.5...@ohif/extension-cornerstone@0.0.39-alpha.6) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.4...@ohif/extension-cornerstone@0.0.39-alpha.5) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.3...@ohif/extension-cornerstone@0.0.39-alpha.4) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.2...@ohif/extension-cornerstone@0.0.39-alpha.3) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.39-alpha.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.1...@ohif/extension-cornerstone@0.0.39-alpha.2) (2019-08-07)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
-## [0.0.39-alpha.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.0...@ohif/extension-cornerstone@0.0.39-alpha.1) (2019-08-07)
-
-**Note:** Version bump only for package @ohif/extension-cornerstone
-
 ## 0.0.39-alpha.0 (2019-08-05)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

extensions/cornerstone/config/webpack.common.js

@@ -0,0 +1,67 @@
+const path = require('path');
+const webpack = require('webpack');
+const ExtractCssChunks = require('extract-css-chunks-webpack-plugin');
+
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+
+module.exports = (env, argv) => {
+  return {
+    entry: {
+      app: `${SRC_DIR}/index.js`,
+    },
+    context: SRC_DIR,
+    resolve: {
+      extensions: ['.js', '.jsx', '.json', '*'],
+      symlinks: true,
+    },
+    module: {
+      rules: [
+        {
+          test: /\.(js|jsx)$/,
+          exclude: [/node_modules/],
+          loader: 'babel-loader',
+          options: {
+            // Find babel.config.js in monorepo root
+            // https://babeljs.io/docs/en/options#rootmode
+            rootMode: 'upward',
+            presets: [
+              [
+                '@babel/preset-env',
+                {
+                  // Do not transform ES6 modules to another format.
+                  // Webpack will take care of that.
+                  modules: false,
+                },
+              ],
+            ],
+          },
+        },
+        {
+          test: /\.css$/,
+          use: [
+            'style-loader',
+            ExtractCssChunks.loader,
+            { loader: 'css-loader', options: { importLoaders: 1 } },
+            {
+              loader: 'postcss-loader',
+              options: {
+                config: {
+                  path: './postcss.config.js',
+                },
+              },
+            },
+          ],
+        },
+      ],
+    },
+    plugins: [
+      new webpack.EnvironmentPlugin(['NODE_ENV']),
+      new ExtractCssChunks({
+        filename: '[name].css',
+        chunkFilename: '[id].css',
+        // hot: true /* only necessary if hot reloading not function*/
+      }),
+    ],
+  };
+};

extensions/cornerstone/config/webpack.prod.js

@@ -0,0 +1,64 @@
+const merge = require('webpack-merge');
+const path = require('path');
+const common = require('./webpack.common');
+const pkg = require('./../package.json');
+
+const ROOT_DIR = path.join(__dirname, './..');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+
+module.exports = (env, argv) => {
+  const commonConfig = common(env, argv);
+
+  return merge(commonConfig, {
+    mode: 'production',
+    stats: {
+      colors: false,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: true,
+      chunkModules: true,
+      modules: true,
+      children: true,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: true,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohifCornerstoneExtension',
+      libraryTarget: 'umd',
+      filename: pkg.main,
+      auxiliaryComment: 'Test Comment',
+    },
+    module: {
+      rules: [
+        {
+          test: /\.(gif|jpe?g|png|svg)$/i,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                limit: 8192,
+              },
+            },
+          ],
+        },
+        {
+          test: /\.(ttf|eot|woff|woff2)$/i,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                limit: 50000,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  });
+};

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "1.4.0",
+  "version": "0.0.39-alpha.0",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -8,9 +8,8 @@
   "main": "dist/index.umd.js",
   "module": "src/index.js",
   "engines": {
-    "node": ">=10",
-    "npm": ">=6",
-    "yarn": ">=1.16.0"
+    "node": ">=8",
+    "npm": ">=5"
   },
   "files": [
     "dist",
@@ -20,34 +19,36 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --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": "rollup -c",
+    "lerna:build": "webpack --config config/webpack.prod.js -w -d",
     "prepublishOnly": "yarn run build",
-    "start": "yarn run dev"
+    "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@ohif/core": "^0.50.0",
-    "@ohif/ui": "^0.50.0",
+    "@ohif/core": "^0.6.0",
+    "@ohif/ui": "^0.6.0",
     "cornerstone-core": "^2.2.8",
     "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^4.0.9",
-    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.6.1",
+    "cornerstone-tools": "^3.1.0",
+    "cornerstone-wado-image-loader": "^2.2.3",
+    "dcmjs": "^0.3.8",
     "dicom-parser": "^1.8.3",
     "hammerjs": "^2.0.8",
     "prop-types": "^15.6.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^15.0.0 || ^16.0.0",
+    "react-dom": "^15.0.0 || ^16.0.0",
     "react-redux": "^6.0.0",
     "react-resize-detector": "^3.4.0",
     "redux": "^4.0.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.5.5",
+    "@babel/runtime": "^7.2.0",
     "classnames": "^2.2.6",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "2.x.x"
+    "react-cornerstone-viewport": "0.1.30"
+  },
+  "devDependencies": {
+    "gh-pages": "^2.0.1",
+    "lodash.clonedeep": "^4.5.0"
   }
 }

extensions/cornerstone/rollup.config.js

@@ -0,0 +1,68 @@
+import babel from 'rollup-plugin-babel'
+import commonjs from 'rollup-plugin-commonjs'
+import external from 'rollup-plugin-peer-deps-external'
+import postcss from 'rollup-plugin-postcss'
+import resolve from 'rollup-plugin-node-resolve'
+import url from 'rollup-plugin-url'
+import pkg from './package.json'
+// Deal with https://github.com/rollup/rollup-plugin-commonjs/issues/297
+import builtins from 'rollup-plugin-node-builtins';
+
+const globals =  {
+  'react': 'React',
+  'react-dom': 'ReactDOM',
+  'react-redux': 'ReactRedux',
+  'react-resize-detector': 'ReactResizeDetector',
+  'react-viewerbase': 'reactViewerbase',
+  'prop-types': 'PropTypes',
+  'cornerstone-core': 'cornerstone',
+  'cornerstone-wado-image-loader': 'cornerstoneWADOImageLoader',
+  'cornerstone-math': 'cornerstoneMath',
+  'cornerstone-tools': 'cornerstoneTools',
+  'dcmjs': 'dcmjs',
+  'dicom-parser': 'dicomParser',
+  'ohif-core': 'OHIF',
+  'hammerjs': 'Hammer'
+};
+
+export default {
+  input: 'src/index.js',
+  output: [
+    {
+      file: pkg.main,
+      format: 'umd',
+      name: 'ohif-cornerstone-extension',
+      sourcemap: true,
+      globals
+    },
+    {
+      file: pkg.module,
+      format: 'es',
+      sourcemap: true,
+      globals
+    }
+  ],
+  plugins: [
+    builtins(),
+    external(),
+    postcss({
+      modules: false
+    }),
+    url(),
+    babel({
+      exclude: 'node_modules/**',
+      externalHelpers: true,
+      runtimeHelpers: true
+    }),
+    resolve(),
+    commonjs({
+      include: 'node_modules/**',
+      namedExports: {
+          'node_modules/react-is/index.js': [
+            'isValidElementType'
+          ]
+      }
+    })
+  ],
+  external: Object.keys(pkg.peerDependencies || {}),
+}

extensions/cornerstone/src/ConnectedCornerstoneViewport.js

@@ -1,62 +1,43 @@
 import CornerstoneViewport from 'react-cornerstone-viewport';
-import OHIF from '@ohif/core';
+import OHIF from 'ohif-core';
 import { connect } from 'react-redux';
 import throttle from 'lodash.throttle';
 
 const { setViewportActive, setViewportSpecificData } = OHIF.redux.actions;
-const {
-  onAdded,
-  onRemoved,
-  onModified,
-} = OHIF.measurements.MeasurementHandlers;
-
-// TODO: Transition to enums for the action names so that we can ensure they stay up to date
-// everywhere they're used.
-const MEASUREMENT_ACTION_MAP = {
-  added: onAdded,
-  removed: onRemoved,
-  modified: throttle(event => {
-    return onModified(event);
-  }, 300),
-};
 
 const mapStateToProps = (state, ownProps) => {
   let dataFromStore;
 
-  // TODO: This may not be updated anymore :thinking:
   if (state.extensions && state.extensions.cornerstone) {
     dataFromStore = state.extensions.cornerstone;
   }
 
+  // TODO: This should be extension configuration
+  // ...dataFromStore -->
+  // availableTools,
+  // onNewImage,
+  // onRightClick,
+  // onTouchPress,
+  // onTouchStart,
+  // onMouseClick,
+
   // If this is the active viewport, enable prefetching.
   const { viewportIndex } = ownProps; //.viewportData;
   const isActive = viewportIndex === state.viewports.activeViewportIndex;
   const viewportSpecificData =
     state.viewports.viewportSpecificData[viewportIndex] || {};
 
-  // CINE
-  let isPlaying = false;
-  let frameRate = 24;
-
-  if (viewportSpecificData && viewportSpecificData.cine) {
-    const cine = viewportSpecificData.cine;
-
-    isPlaying = cine.isPlaying === true;
-    frameRate = cine.cineFrameRate || frameRate;
-  }
-
   return {
-    // layout: state.viewports.layout,
+    layout: state.viewports.layout,
     isActive,
     // TODO: Need a cleaner and more versatile way.
     // Currently justing using escape hatch + commands
     // activeTool: activeButton && activeButton.command,
     ...dataFromStore,
-    isStackPrefetchEnabled: isActive,
-    isPlaying,
-    frameRate,
+    enableStackPrefetch: isActive,
     //stack: viewportSpecificData.stack,
-    // viewport: viewportSpecificData.viewport,
+    cineToolData: viewportSpecificData.cine,
+    viewport: viewportSpecificData.viewport,
   };
 };
 
@@ -90,7 +71,20 @@ const mapDispatchToProps = (dispatch, ownProps) => {
     },
 
     onMeasurementsChanged: (event, action) => {
-      return MEASUREMENT_ACTION_MAP[action](event);
+      const {
+        onAdded,
+        onRemoved,
+        onModified,
+      } = OHIF.measurements.MeasurementHandlers;
+      const actions = {
+        added: onAdded,
+        removed: onRemoved,
+        modified: throttle(event => {
+          return onModified(event);
+        }, 300),
+      };
+
+      return actions[action](event);
     },
   };
 };

extensions/cornerstone/src/OHIFCornerstoneViewport.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 
 import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport';
-import OHIF from '@ohif/core';
+import OHIF from 'ohif-core';
 import PropTypes from 'prop-types';
 import cornerstone from 'cornerstone-core';
 import handleSegmentationStorage from './handleSegmentationStorage.js';
@@ -132,6 +132,22 @@ class OHIFCornerstoneViewport extends Component {
     return stack;
   }
 
+  static getViewportData = (
+    studies,
+    studyInstanceUid,
+    displaySetInstanceUid,
+    sopInstanceUid,
+    frameIndex
+  ) => {
+    return OHIFCornerstoneViewport.getCornerstoneStack(
+      studies,
+      studyInstanceUid,
+      displaySetInstanceUid,
+      sopInstanceUid,
+      frameIndex
+    );
+  };
+
   getViewportData = async (
     studies,
     studyInstanceUid,
@@ -156,7 +172,7 @@ class OHIFCornerstoneViewport extends Component {
         );
         break;
       default:
-        const stack = OHIFCornerstoneViewport.getCornerstoneStack(
+        const stack = OHIFCornerstoneViewport.getViewportData(
           studies,
           studyInstanceUid,
           displaySetInstanceUid,
@@ -186,10 +202,6 @@ class OHIFCornerstoneViewport extends Component {
       frameIndex,
     } = displaySet;
 
-    if (!studyInstanceUid || !displaySetInstanceUid) {
-      return;
-    }
-
     if (sopClassUids && sopClassUids.length > 1) {
       console.warn(
         'More than one SOPClassUid in the same series is not yet supported.'
@@ -233,18 +245,6 @@ class OHIFCornerstoneViewport extends Component {
   render() {
     let childrenWithProps = null;
 
-    if (!this.state.viewportData) {
-      return null;
-    }
-    const { viewportIndex } = this.props;
-    const {
-      imageIds,
-      currentImageIdIndex,
-      // If this comes from the instance, would be a better default
-      // `FrameTime` in the instance
-      // frameRate = 0,
-    } = this.state.viewportData.stack;
-
     // TODO: Does it make more sense to use Context?
     if (this.props.children && this.props.children.length) {
       childrenWithProps = this.props.children.map((child, index) => {
@@ -257,18 +257,13 @@ class OHIFCornerstoneViewport extends Component {
 
     return (
       <>
-        <ConnectedCornerstoneViewport
-          viewportIndex={viewportIndex}
-          imageIds={imageIds}
-          imageIdIndex={currentImageIdIndex}
-          // ~~ Connected (From REDUX)
-          // frameRate={frameRate}
-          // isPlaying={false}
-          // isStackPrefetchEnabled={true}
-          // onElementEnabled={() => {}}
-          // setViewportActive{() => {}}
-          {...this.props.customProps}
-        />
+        {this.state.viewportData && (
+          <ConnectedCornerstoneViewport
+            viewportData={this.state.viewportData}
+            viewportIndex={this.props.viewportIndex}
+            {...this.props.customProps}
+          />
+        )}
         {childrenWithProps}
       </>
     );

extensions/cornerstone/src/asyncComponent.js

@@ -1,37 +0,0 @@
-/**
- * We use this component to leverage "Code Splitting"
- *
- * Link: https://serverless-stack.com/chapters/code-splitting-in-create-react-app.html
- */
-
-import React, { Component } from 'react';
-
-export default function asyncComponent(importComponent) {
-  class AsyncComponent extends Component {
-    constructor(props) {
-      super(props);
-
-      this.state = {
-        component: null,
-      };
-    }
-
-    async componentDidMount() {
-      // Add dynamically loaded component to state
-      const { default: component } = await importComponent();
-
-      this.setState({
-        component: component,
-      });
-    }
-
-    render() {
-      const C = this.state.component;
-
-      // Render the loaded component, or null
-      return C ? <C {...this.props} /> : null;
-    }
-  }
-
-  return AsyncComponent;
-}

extensions/cornerstone/src/commandsModule.js

@@ -1,7 +1,5 @@
 import cornerstone from 'cornerstone-core';
 import cornerstoneTools from 'cornerstone-tools';
-import OHIF from '@ohif/core';
-const scroll = cornerstoneTools.import('util/scroll');
 
 const actions = {
   rotateViewport: ({ viewports, rotation }) => {
@@ -91,76 +89,15 @@ const actions = {
     // TODO
     console.warn('updateDisplaySet: ', direction);
   },
-  clearAnnotations: ({ viewports }) => {
-    const element = _getActiveViewportEnabledElement(
-      viewports.viewportSpecificData,
-      viewports.activeViewportIndex
-    );
-    if (!element) {
-      return;
-    }
-
-    const enabledElement = cornerstone.getEnabledElement(element);
-    if (!enabledElement || !enabledElement.image) {
-      return;
-    }
-
-    const {
-      toolState,
-    } = cornerstoneTools.globalImageIdSpecificToolStateManager;
-    if (
-      !toolState ||
-      toolState.hasOwnProperty(enabledElement.image.imageId) === false
-    ) {
-      return;
-    }
-
-    const imageIdToolState = toolState[enabledElement.image.imageId];
-
-    const measurementsToRemove = [];
-
-    Object.keys(imageIdToolState).forEach(toolType => {
-      const { data } = imageIdToolState[toolType];
-
-      data.forEach(measurementData => {
-        const { _id, lesionNamingNumber, measurementNumber } = measurementData;
-        if (!_id) {
-          return;
-        }
-
-        measurementsToRemove.push({
-          toolType,
-          _id,
-          lesionNamingNumber,
-          measurementNumber,
-        });
-      });
-    });
-
-    measurementsToRemove.forEach(measurementData => {
-      OHIF.measurements.MeasurementHandlers.onRemoved({
-        detail: {
-          toolType: measurementData.toolType,
-          measurementData,
-        },
-      });
-    });
-  },
-  nextImage: ({ viewports }) => {
-    const enabledElement = _getActiveViewportEnabledElement(
-      viewports.viewportSpecificData,
-      viewports.activeViewportIndex
-    );
-
-    scroll(enabledElement, 1);
-  },
-  previousImage: ({ viewports }) => {
-    const enabledElement = _getActiveViewportEnabledElement(
-      viewports.viewportSpecificData,
-      viewports.activeViewportIndex
-    );
-
-    scroll(enabledElement, -1);
+  clearAnnotations: () => {
+    console.warn('clearAnnotations: not yet implemented');
+    // const toolState =
+    //   cornerstoneTools.globalImageIdSpecificToolStateManager.toolState;
+    // if (!toolState) return;
+    // Object.keys(toolState).forEach(imageId => {
+    //   if (!cornerstoneImageId || cornerstoneImageId === imageId)
+    //     delete toolState[imageId];
+    // });
   },
 };
 
@@ -210,21 +147,8 @@ const definitions = {
     storeContexts: ['viewports'],
     options: {},
   },
-  clearAnnotations: {
-    commandFn: actions.clearAnnotations,
-    storeContexts: ['viewports'],
-    options: {},
-  },
-  nextImage: {
-    commandFn: actions.nextImage,
-    storeContexts: ['viewports'],
-    options: {},
-  },
-  previousImage: {
-    commandFn: actions.previousImage,
-    storeContexts: ['viewports'],
-    options: {},
-  },
+  // TODO: Clear Annotations
+  // TODO: Next/Previous image
   // TODO: First/Last image
   // Next/Previous series/DisplaySet
   nextViewportDisplaySet: {

extensions/cornerstone/src/handleSegmentationStorage.js

@@ -1,10 +1,10 @@
 import * as dcmjs from 'dcmjs';
 
-import OHIF from '@ohif/core';
+import OHIF from 'ohif-core';
 import cornerstone from 'cornerstone-core';
 import cornerstoneTools from 'cornerstone-tools';
 
-const { StackManager, DicomLoaderService } = OHIF.utils;
+const { StackManager } = OHIF.utils;
 
 function getDisplaySet(studies, studyInstanceUid, displaySetInstanceUid) {
   const study = studies.find(
@@ -52,6 +52,14 @@ function addSegMetadataToCornerstoneToolState(
   }
 }
 
+function retrieveDicomData(wadoUri) {
+  // TODO: Authorization header depends on the server. If we ever have multiple servers
+  // we will need to figure out how / when to pass this information in.
+  return fetch(wadoUri, {
+    headers: OHIF.DICOMWeb.getAuthorizationHeader(),
+  }).then(response => response.arrayBuffer());
+}
+
 async function handleSegmentationStorage(
   studies,
   studyInstanceUid,
@@ -65,11 +73,8 @@ async function handleSegmentationStorage(
     studyInstanceUid,
     displaySetInstanceUid
   );
-
-  const arrayBuffer = await DicomLoaderService.findDicomDataPromise(
-    displaySet,
-    studies
-  );
+  const segWadoUri = displaySet.images[0].getData().wadouri;
+  const arrayBuffer = await retrieveDicomData(segWadoUri);
   const dicomData = dcmjs.data.DicomMessage.readFile(arrayBuffer);
   const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(
     dicomData.dict
@@ -98,16 +103,14 @@ async function handleSegmentationStorage(
     throw new Error('Fractional segmentations are not supported');
   }
 
-  const { labelmapBuffer, segMetadata, segmentsOnFrame } = results;
-  const { setters } = cornerstoneTools.getModule('segmentation');
+  const { segMetadata, toolState } = results;
 
-  setters.labelmap3DByFirstImageId(
-    imageIds[0],
-    labelmapBuffer,
-    0, // TODO -> Can define a color LUT based on colors in the SEG later.
+  segMetadata.seriesInstanceUid = seriesInstanceUid;
+
+  addSegMetadataToCornerstoneToolState(
     segMetadata,
-    imageIds.length,
-    segmentsOnFrame
+    toolState,
+    displaySetInstanceUid
   );
 
   const cachedStack = StackManager.findOrCreateStack(
@@ -115,7 +118,6 @@ async function handleSegmentationStorage(
     referenceDisplaySet
   );
   const stack = Object.assign({}, cachedStack);
-
   stack.currentImageIdIndex = 0;
 
   return {

extensions/cornerstone/src/index.js

@@ -1,14 +1,7 @@
-import init from './init.js';
-import asyncComponent from './asyncComponent.js';
+import OHIFCornerstoneViewport from './OHIFCornerstoneViewport.js';
 import commandsModule from './commandsModule.js';
 import toolbarModule from './toolbarModule.js';
 
-const OHIFCornerstoneViewport = asyncComponent(() =>
-  import(
-    /* webpackChunkName: "OHIFCornerstoneViewport" */ './OHIFCornerstoneViewport.js'
-  )
-);
-
 /**
  *
  */
@@ -18,15 +11,6 @@ export default {
    */
   id: 'cornerstone',
 
-  /**
-   *
-   *
-   * @param {object} [configuration={}]
-   * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
-   */
-  preRegistration(configuration = {}) {
-    init(configuration);
-  },
   getViewportModule() {
     return OHIFCornerstoneViewport;
   },

extensions/cornerstone/src/init.js

@@ -1,87 +0,0 @@
-import OHIF from '@ohif/core';
-import cornerstone from 'cornerstone-core';
-import csTools from 'cornerstone-tools';
-import initCornerstoneTools from './initCornerstoneTools.js';
-
-/**
- *
- * @param {object} configuration
- * @param {Object|Array} configuration.csToolsConfig
- */
-export default function init(configuration = {}) {
-  const { csToolsConfig } = configuration;
-  const { StackManager } = OHIF.utils;
-  const metadataProvider = new OHIF.cornerstone.MetadataProvider();
-
-  // ~~ Set our MetadataProvider
-  cornerstone.metaData.addProvider(
-    metadataProvider.provider.bind(metadataProvider)
-  );
-
-  StackManager.setMetadataProvider(metadataProvider);
-
-  // ~~
-  const defaultCsToolsConfig = csToolsConfig || {
-    globalToolSyncEnabled: true,
-    showSVGCursors: true,
-    autoResizeViewports: false,
-  };
-
-  initCornerstoneTools(defaultCsToolsConfig);
-
-  // ~~ Toooools 🙌
-  const {
-    PanTool,
-    ZoomTool,
-    WwwcTool,
-    MagnifyTool,
-    StackScrollTool,
-    StackScrollMouseWheelTool,
-    // Touch
-    PanMultiTouchTool,
-    ZoomTouchPinchTool,
-    // Annotations
-    EraserTool,
-    ArrowAnnotateTool,
-    BidirectionalTool,
-    LengthTool,
-    AngleTool,
-    FreehandRoiTool,
-    EllipticalRoiTool,
-    DragProbeTool,
-    RectangleRoiTool,
-    // Segmentation
-    BrushTool,
-  } = csTools;
-  const tools = [
-    PanTool,
-    ZoomTool,
-    WwwcTool,
-    MagnifyTool,
-    StackScrollTool,
-    StackScrollMouseWheelTool,
-    // Touch
-    PanMultiTouchTool,
-    ZoomTouchPinchTool,
-    // Annotations
-    EraserTool,
-    ArrowAnnotateTool,
-    BidirectionalTool,
-    LengthTool,
-    AngleTool,
-    FreehandRoiTool,
-    EllipticalRoiTool,
-    DragProbeTool,
-    RectangleRoiTool,
-    // Segmentation
-    BrushTool,
-  ];
-
-  tools.forEach(tool => csTools.addTool(tool));
-  csTools.setToolActive('Pan', { mouseButtonMask: 4 });
-  csTools.setToolActive('Zoom', { mouseButtonMask: 2 });
-  csTools.setToolActive('Wwwc', { mouseButtonMask: 1 });
-  csTools.setToolActive('StackScrollMouseWheel', {}); // TODO: Empty options should not be required
-  csTools.setToolActive('PanMultiTouch', { pointers: 2 }); // TODO: Better error if no options
-  csTools.setToolActive('ZoomTouchPinch', {});
-}

extensions/cornerstone/src/toolbarModule.js

@@ -3,6 +3,8 @@
 // - Include SVG Source/Inline?
 // - By URL, or own component?
 
+// TODO: `ohif-core` toolbar builder?
+
 // What KINDS of toolbar buttons do we have...
 // - One's that dispatch commands
 // - One's that set tool's active
@@ -15,7 +17,7 @@
 //  -- ACTIVE_ROUTE::VIEWER
 //  -- ACTIVE_VIEWPORT::CORNERSTONE
 // setToolActive commands should receive the button event that triggered
-// so we can do the "bind to this button" magic
+// so we can do the "bind to this butyon" magic
 
 const TOOLBAR_BUTTON_TYPES = {
   COMMAND: 'command',
@@ -69,15 +71,6 @@ const definitions = [
     commandName: 'setToolActive',
     commandOptions: { toolName: 'Length' },
   },
-  {
-    id: 'ArrowAnnotate',
-    label: 'Annotate',
-    icon: 'measure-non-target',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'ArrowAnnotate' },
-  },
   {
     id: 'Angle',
     label: 'Angle',
@@ -105,126 +98,6 @@ const definitions = [
       behavior: 'CINE',
     },
   },
-  {
-    id: 'More',
-    label: 'More',
-    icon: 'ellipse-circle',
-    buttons: [
-      {
-        id: 'Magnify',
-        label: 'Magnify',
-        icon: 'circle',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Magnify' },
-      },
-      {
-        id: 'WwwcRegion',
-        label: 'ROI Window',
-        icon: 'stop',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'WwwcRegion' },
-      },
-      {
-        id: 'DragProbe',
-        label: 'Probe',
-        icon: 'dot-circle',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'DragProbe' },
-      },
-      {
-        id: 'EllipticalRoi',
-        label: 'Ellipse',
-        icon: 'circle-o',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'EllipticalRoi' },
-      },
-      {
-        id: 'RectangleRoi',
-        label: 'Rectangle',
-        icon: 'square-o',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'RectangleRoi' },
-      },
-      {
-        id: 'Invert',
-        label: 'Invert',
-        icon: 'adjust',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'invertViewport',
-      },
-      {
-        id: 'RotateRight',
-        label: 'Rotate Right',
-        icon: 'rotate-right',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'rotateViewportCW',
-      },
-      {
-        id: 'FlipH',
-        label: 'Flip H',
-        icon: 'ellipse-h',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'flipViewportHorizontal',
-      },
-      {
-        id: 'FlipV',
-        label: 'Flip V',
-        icon: 'ellipse-v',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'flipViewportVertical',
-      },
-      {
-        id: 'Clear',
-        label: 'Clear',
-        icon: 'trash',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'clearAnnotations',
-      },
-      {
-        id: 'Bidirectional',
-        label: 'Bidirectional',
-        icon: 'measure-target',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Bidirectional' },
-      },
-      {
-        id: 'Eraser',
-        label: 'Eraser',
-        icon: 'eraser',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Eraser' },
-      },
-      {
-        id: 'Download',
-        label: 'Download',
-        icon: 'create-screen-capture',
-        //
-        type: TOOLBAR_BUTTON_TYPES.BUILT_IN,
-        options: {
-          behavior: 'DOWNLOAD_SCREEN_SHOT',
-        },
-      },
-    ],
-  },
 ];
 
 export default {

extensions/dicom-html/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

extensions/dicom-html/.eslintrc

@@ -0,0 +1,16 @@
+{
+  "extends": [
+  	"react-app",
+  	"eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "parser": "babel-eslint",
+  "env": {
+    "jest": true
+  },
+  "settings": {
+    "react": {
+      "version": "detect",
+    },
+  },
+}

extensions/dicom-html/.gitignore

@@ -0,0 +1,23 @@
+
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+
+# builds
+build
+dist
+.rpt2_cache
+
+# misc
+.DS_Store
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.idea

extensions/dicom-html/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 9
+  - 8

extensions/dicom-html/.webpack/webpack.dev.js

@@ -1,8 +0,0 @@
-const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.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 });
-};

extensions/dicom-html/.webpack/webpack.prod.js

@@ -1,44 +0,0 @@
-const webpack = require('webpack');
-const merge = require('webpack-merge');
-const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
-const pkg = require('./../package.json');
-
-const ROOT_DIR = path.join(__dirname, './..');
-const SRC_DIR = path.join(__dirname, '../src');
-const DIST_DIR = path.join(__dirname, '../dist');
-
-module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
-
-  return merge(commonConfig, {
-    devtool: 'source-map',
-    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: 'OHIFExtDicomHtml',
-      libraryTarget: 'umd',
-      libraryExport: 'default',
-      filename: pkg.main,
-    },
-    plugins: [
-      new webpack.optimize.LimitChunkCountPlugin({
-        maxChunks: 1,
-      }),
-    ],
-  });
-};

extensions/dicom-html/CHANGELOG.md

@@ -3,191 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.0.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.0.0...@ohif/extension-dicom-html@1.0.1) (2019-10-29)
-
-
-### Bug Fixes
-
-* Set SR viewport as active by interaction ([#1118](https://github.com/OHIF/Viewers/issues/1118)) ([5b33417](https://github.com/OHIF/Viewers/commit/5b334175c370afb930b4b6dbd307ddece8f850e3))
-
-
-
-
-
-# [1.0.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.8...@ohif/extension-dicom-html@1.0.0) (2019-09-27)
-
-
-### Bug Fixes
-
-* 🐛 Add DicomLoaderService & FileLoaderService to fix SR, PDF, and SEG support in local file and WADO-RS-only use cases ([#862](https://github.com/OHIF/Viewers/issues/862)) ([e7e1a8a](https://github.com/OHIF/Viewers/commit/e7e1a8a)), closes [#838](https://github.com/OHIF/Viewers/issues/838)
-
-
-### BREAKING CHANGES
-
-* DICOM Seg
-
-
-
-
-
-## [0.50.8](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.7...@ohif/extension-dicom-html@0.50.8) (2019-09-26)
-
-
-### Bug Fixes
-
-* Add some code splitting for PWA build ([#937](https://github.com/OHIF/Viewers/issues/937)) ([8938035](https://github.com/OHIF/Viewers/commit/8938035))
-
-
-
-
-
-## [0.50.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.6...@ohif/extension-dicom-html@0.50.7) (2019-09-12)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-## [0.50.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.5...@ohif/extension-dicom-html@0.50.6) (2019-09-10)
-
-
-### Bug Fixes
-
-* simplify runtime-extension usage ([ac5dbda](https://github.com/OHIF/Viewers/commit/ac5dbda))
-
-
-
-
-
-## [0.50.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.4...@ohif/extension-dicom-html@0.50.5) (2019-09-09)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.3...@ohif/extension-dicom-html@0.50.4) (2019-09-06)
-
-
-### Bug Fixes
-
-* set NODE_ENV for production build ([9120db4](https://github.com/OHIF/Viewers/commit/9120db4))
-
-
-
-
-
-## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.2...@ohif/extension-dicom-html@0.50.3) (2019-09-04)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-## [0.50.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.1...@ohif/extension-dicom-html@0.50.2) (2019-09-04)
-
-
-### Bug Fixes
-
-* measurementsAPI issue caused by production build ([#842](https://github.com/OHIF/Viewers/issues/842)) ([49d3439](https://github.com/OHIF/Viewers/commit/49d3439))
-
-
-
-
-
-## [0.50.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.0-alpha.10...@ohif/extension-dicom-html@0.50.1) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.9...@ohif/extension-dicom-html@0.50.0-alpha.10) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-## [0.0.4-alpha.9](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.8...@ohif/extension-dicom-html@0.0.4-alpha.9) (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-## 0.0.4-alpha.8 (2019-08-14)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-
-
-
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.6...@ohif/extension-dicom-html@0.0.4-alpha.7) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.5...@ohif/extension-dicom-html@0.0.4-alpha.6) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.4...@ohif/extension-dicom-html@0.0.4-alpha.5) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.3...@ohif/extension-dicom-html@0.0.4-alpha.4) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.2...@ohif/extension-dicom-html@0.0.4-alpha.3) (2019-08-08)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.0.4-alpha.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.1...@ohif/extension-dicom-html@0.0.4-alpha.2) (2019-08-07)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
-## [0.0.4-alpha.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.0...@ohif/extension-dicom-html@0.0.4-alpha.1) (2019-08-07)
-
-**Note:** Version bump only for package @ohif/extension-dicom-html
-
 ## 0.0.4-alpha.0 (2019-08-05)
 
 **Note:** Version bump only for package @ohif/extension-dicom-html

extensions/dicom-html/README.md

@@ -1 +0,0 @@
-# @ohif/extension-dicom-html

extensions/dicom-html/app.css

@@ -1 +0,0 @@
-:root{--text-color-primary:#fff}.DicomHtmlViewport{padding:20px;overflow-y:scroll;width:100%;height:100%;color:#fff;color:var(--text-color-primary)}

extensions/dicom-html/config/webpack.common.js

@@ -0,0 +1,67 @@
+const path = require('path');
+const webpack = require('webpack');
+const ExtractCssChunks = require('extract-css-chunks-webpack-plugin');
+
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+
+module.exports = (env, argv) => {
+  return {
+    entry: {
+      app: `${SRC_DIR}/index.js`,
+    },
+    context: SRC_DIR,
+    resolve: {
+      extensions: ['.js', '.jsx', '.json', '*'],
+      symlinks: true,
+    },
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          exclude: [/node_modules/],
+          loader: 'babel-loader',
+          options: {
+            // Find babel.config.js in monorepo root
+            // https://babeljs.io/docs/en/options#rootmode
+            rootMode: 'upward',
+            presets: [
+              [
+                '@babel/preset-env',
+                {
+                  // Do not transform ES6 modules to another format.
+                  // Webpack will take care of that.
+                  modules: false,
+                },
+              ],
+            ],
+          },
+        },
+        {
+          test: /\.css$/,
+          use: [
+            'style-loader',
+            ExtractCssChunks.loader,
+            { loader: 'css-loader', options: { importLoaders: 1 } },
+            {
+              loader: 'postcss-loader',
+              options: {
+                config: {
+                  path: './postcss.config.js',
+                },
+              },
+            },
+          ],
+        },
+      ],
+    },
+    plugins: [
+      new webpack.EnvironmentPlugin(['NODE_ENV']),
+      new ExtractCssChunks({
+        filename: '[name].css',
+        chunkFilename: '[id].css',
+        // hot: true /* only necessary if hot reloading not function*/
+      }),
+    ],
+  };
+};

extensions/dicom-html/config/webpack.prod.js

@@ -0,0 +1,64 @@
+const merge = require('webpack-merge');
+const path = require('path');
+const common = require('./webpack.common');
+const pkg = require('./../package.json');
+
+const ROOT_DIR = path.join(__dirname, './..');
+const SRC_DIR = path.join(__dirname, '../src');
+const DIST_DIR = path.join(__dirname, '../dist');
+
+module.exports = (env, argv) => {
+  const commonConfig = common(env, argv);
+
+  return merge(commonConfig, {
+    mode: 'production',
+    stats: {
+      colors: false,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: true,
+      chunkModules: true,
+      modules: true,
+      children: true,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: true,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohifCornerstoneExtension',
+      libraryTarget: 'umd',
+      filename: pkg.main,
+      auxiliaryComment: 'Test Comment',
+    },
+    module: {
+      rules: [
+        {
+          test: /\.(gif|jpe?g|png|svg)$/i,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                limit: 8192,
+              },
+            },
+          ],
+        },
+        {
+          test: /\.(ttf|eot|woff|woff2)$/i,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                limit: 50000,
+              },
+            },
+          ],
+        },
+      ],
+    },
+  });
+};

extensions/dicom-html/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-html",
-  "version": "1.0.1",
+  "version": "0.0.4-alpha.0",
   "description": "OHIF extension for rendering structured reports to HTML",
   "author": "OHIF",
   "license": "MIT",
@@ -8,33 +8,32 @@
   "main": "dist/index.umd.js",
   "module": "src/index.js",
   "engines": {
-    "node": ">=10",
-    "npm": ">=6",
-    "yarn": ">=1.16.0"
+    "node": ">=8",
+    "npm": ">=5"
+  },
+  "scripts": {
+    "lerna:build": "webpack --config config/webpack.prod.js -w -d",
+    "prepublishOnly": "npm run build",
+    "start": "rollup -c -w"
+  },
+  "peerDependencies": {
+    "@ohif/core": "^0.6.0",
+    "dcmjs": "^0.3.3",
+    "prop-types": "^15.6.2",
+    "react": "^15.0.0 || ^16.0.0",
+    "react-dom": "^15.0.0 || ^16.0.0"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.2.0"
+  },
+  "devDependencies": {
+    "gh-pages": "^2.0.1",
+    "lodash.clonedeep": "^4.5.0"
   },
   "files": [
-    "dist",
-    "README.md"
+    "dist"
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
-    "dev:dicom-html": "yarn run dev",
-    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
-    "prepublishOnly": "yarn run build",
-    "start": "yarn run dev"
-  },
-  "peerDependencies": {
-    "@ohif/core": "^0.50.0",
-    "dcmjs": "^0.6.1",
-    "prop-types": "^15.6.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.5.5"
   }
 }

extensions/dicom-html/rollup.config.js

@@ -0,0 +1,55 @@
+import babel from 'rollup-plugin-babel'
+import commonjs from 'rollup-plugin-commonjs'
+import external from 'rollup-plugin-peer-deps-external'
+import postcss from 'rollup-plugin-postcss'
+import resolve from 'rollup-plugin-node-resolve'
+import url from 'rollup-plugin-url'
+import svgr from '@svgr/rollup'
+import pkg from './package.json'
+// Deal with https://github.com/rollup/rollup-plugin-commonjs/issues/297
+import builtins from 'rollup-plugin-node-builtins';
+
+const globals = {
+  'react': 'React',
+  'react-dom': 'ReactDOM',
+  'prop-types': 'PropTypes',
+  'ohif-core': 'OHIF',
+  'dcmjs': 'dcmjs'
+};
+
+export default {
+  input: 'src/index.js',
+  output: [
+    {
+      file: pkg.main,
+      format: 'umd',
+      name: 'ohif-dicom-pdf-extension',
+      sourcemap: true,
+      globals
+    },
+    {
+      file: pkg.module,
+      format: 'es',
+      sourcemap: true,
+      globals
+    }
+  ],
+  plugins: [
+    builtins(),
+    external(),
+    postcss({
+      modules: false
+    }),
+    url(),
+    svgr(),
+    babel({
+      exclude: 'node_modules/**',
+      plugins: [ '@babel/external-helpers' ],
+      externalHelpers: true,
+      runtimeHelpers: true
+    }),
+    resolve(),
+    commonjs()
+  ],
+  external: Object.keys(pkg.peerDependencies || {}),
+}

extensions/dicom-html/src/ConnectedDicomHtmlViewport.js

@@ -1,33 +0,0 @@
-import OHIF from '@ohif/core';
-import { connect } from 'react-redux';
-import DicomHtmlViewport from './DicomHtmlViewport';
-
-const { setViewportActive } = OHIF.redux.actions;
-
-const mapStateToProps = (state, ownProps) => {
-  const { viewportIndex, byteArray } = ownProps;
-  const activeViewportIndex = state.viewports;
-
-  return {
-    viewportIndex,
-    activeViewportIndex,
-    byteArray,
-  };
-};
-
-const mapDispatchToProps = (dispatch, ownProps) => {
-  const { viewportIndex } = ownProps;
-
-  return {
-    setViewportActive: () => {
-      dispatch(setViewportActive(viewportIndex));
-    },
-  };
-};
-
-const ConnectedDicomHtmlViewport = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(DicomHtmlViewport);
-
-export default ConnectedDicomHtmlViewport;

extensions/dicom-html/src/DicomHtmlViewport.js

@@ -1,8 +1,6 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import * as dcmjs from 'dcmjs';
 import TypedArrayProp from './TypedArrayProp';
-
 import './DicomHtmlViewport.css';
 
 function getRelationshipString(data) {
@@ -32,7 +30,7 @@ function getValueString(data) {
       const {
         CodeMeaning,
         CodeValue,
-        CodingSchemeDesignator,
+        CodingSchemeDesignator
       } = data.ConceptNameCodeSequence;
 
       return `${CodeMeaning} (${CodeValue}, ${CodingSchemeDesignator})`;
@@ -77,7 +75,7 @@ function constructContentSequence(data, header) {
   }
 
   const result = {
-    items,
+    items
   };
 
   if (header) {
@@ -108,7 +106,9 @@ const { DicomMetaDictionary, DicomMessage } = dcmjs.data;
 function getMainData(data) {
   const root = [];
 
-  const patientValue = `${data.PatientName} (${data.PatientSex}, #${data.PatientID})`;
+  const patientValue = `${data.PatientName} (${data.PatientSex}, #${
+    data.PatientID
+  })`;
   root.push(getMainDataItem('Patient', patientValue));
 
   const studyValue = data.StudyDescription;
@@ -117,13 +117,15 @@ function getMainData(data) {
   const seriesValue = `${data.SeriesDescription} (#${data.SeriesNumber})`;
   root.push(getMainDataItem('Series', seriesValue));
 
-  const manufacturerValue = `${data.Manufacturer} (${data.ManufacturerModelName}, #${data.DeviceSerialNumber})`;
+  const manufacturerValue = `${data.Manufacturer} (${
+    data.ManufacturerModelName
+  }, #${data.DeviceSerialNumber})`;
 
   root.push(getMainDataItem('Manufacturer', manufacturerValue));
 
   const mainDataObjects = {
     CompletionFlag: 'Completion flag',
-    VerificationFlag: 'Verification flag',
+    VerificationFlag: 'Verification flag'
   };
 
   Object.keys(mainDataObjects).forEach(key => {
@@ -152,7 +154,7 @@ const getContentSequence = (data, level = 1) => {
     const {
       CodeMeaning,
       CodeValue,
-      CodingSchemeDesignator,
+      CodingSchemeDesignator
     } = data.ConceptNameCodeSequence;
 
     header = `${CodeMeaning} (${CodeValue} - ${CodingSchemeDesignator})`;
@@ -196,14 +198,11 @@ function getMainDataItem(key, value) {
 class DicomHtmlViewport extends Component {
   state = {
     content: null,
-    error: null,
+    error: null
   };
 
   static propTypes = {
-    byteArray: TypedArrayProp.uint8,
-    setViewportActive: PropTypes.func.isRequired,
-    viewportIndex: PropTypes.number.isRequired,
-    activeViewportIndex: PropTypes.number.isRequired,
+    byteArray: TypedArrayProp.uint8
   };
 
   componentDidMount() {
@@ -226,34 +225,15 @@ class DicomHtmlViewport extends Component {
     );
 
     this.setState({
-      content,
+      content
     });
   }
 
-  setViewportActiveHandler = () => {
-    const {
-      setViewportActive,
-      viewportIndex,
-      activeViewportIndex,
-    } = this.props;
-
-    if (viewportIndex !== activeViewportIndex) {
-      setViewportActive();
-    }
-  };
-
   render() {
-    const { content, error } = this.state;
-
     return (
-      <div
-        data-cy="dicom-html-viewport"
-        className="DicomHtmlViewport"
-        onClick={this.setViewportActiveHandler}
-        onScroll={this.setViewportActiveHandler}
-      >
-        {content}
-        {error && <h2>{JSON.stringify(error)}</h2>}
+      <div className={'DicomHtmlViewport'}>
+        {this.state.content}
+        {this.state.error && <h2>{JSON.stringify(this.state.error)}</h2>}
       </div>
     );
   }

extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js

@@ -1,4 +1,4 @@
-import { MODULE_TYPES, utils } from '@ohif/core';
+import { MODULE_TYPES, utils } from 'ohif-core';
 
 // TODO: Should probably use dcmjs for this
 const SOP_CLASS_UIDS = {
@@ -8,7 +8,7 @@ const SOP_CLASS_UIDS = {
   PROCEDURE_LOG_STORAGE: '1.2.840.10008.5.1.4.1.1.88.40',
   MAMMOGRAPHY_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.50',
   CHEST_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.65',
-  X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67',
+  X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67'
 };
 
 const sopClassUids = Object.values(SOP_CLASS_UIDS);
@@ -24,16 +24,15 @@ const OHIFDicomHtmlSopClassHandler = {
 
     return {
       plugin: 'html',
-      modality: 'SR',
       displaySetInstanceUid: utils.guid(),
       wadoRoot: study.getData().wadoRoot,
       wadoUri: instance.getData().wadouri,
       sopInstanceUid: instance.getSOPInstanceUID(),
       seriesInstanceUid: series.getSeriesInstanceUID(),
       studyInstanceUid: study.getStudyInstanceUID(),
-      authorizationHeaders,
+      authorizationHeaders
     };
-  },
+  }
 };
 
 export default OHIFDicomHtmlSopClassHandler;

extensions/dicom-html/src/OHIFDicomHtmlViewport.js

@@ -1,36 +1,46 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import OHIF from '@ohif/core';
-import ConnectedDicomHtmlViewport from './ConnectedDicomHtmlViewport';
-
-const { DicomLoaderService } = OHIF.utils;
+import DicomHtmlViewport from './DicomHtmlViewport';
 
 class OHIFDicomHtmlViewport extends Component {
   static propTypes = {
     studies: PropTypes.object,
     displaySet: PropTypes.object,
-    viewportIndex: PropTypes.number,
-    viewportData: PropTypes.object,
+    viewportIndex: PropTypes.number
   };
 
   state = {
     byteArray: null,
-    error: null,
+    error: null
   };
 
   componentDidMount() {
-    const { displaySet, studies } = this.props.viewportData;
+    const { displaySet } = this.props.viewportData;
+    const {
+      studyInstanceUid,
+      seriesInstanceUid,
+      sopInstanceUid,
+      wadoRoot,
+      wadoUri,
+      authorizationHeaders
+    } = displaySet;
 
-    DicomLoaderService.findDicomDataPromise(displaySet, studies).then(
-      data => {
-        const byteArray = new Uint8Array(data);
+    this.retrieveDicomData(
+      studyInstanceUid,
+      seriesInstanceUid,
+      sopInstanceUid,
+      wadoRoot,
+      wadoUri,
+      authorizationHeaders
+    ).then(
+      byteArray => {
         this.setState({
-          byteArray: byteArray,
+          byteArray
         });
       },
       error => {
         this.setState({
-          error,
+          error
         });
 
         throw new Error(error);
@@ -38,14 +48,32 @@ class OHIFDicomHtmlViewport extends Component {
     );
   }
 
+  retrieveDicomData(
+    studyInstanceUid,
+    seriesInstanceUid,
+    sopInstanceUid,
+    wadoRoot,
+    wadoUri,
+    authorizationHeaders
+  ) {
+    // TODO: Passing in a lot of data we aren't using
+
+    // TODO: Authorization header depends on the server. If we ever have multiple servers
+    // we will need to figure out how / when to pass this information in.
+    return fetch(wadoUri, {
+      headers: authorizationHeaders
+    })
+      .then(response => response.arrayBuffer())
+      .then(arraybuffer => {
+        return new Uint8Array(arraybuffer);
+      });
+  }
+
   render() {
     return (
       <>
         {this.state.byteArray && (
-          <ConnectedDicomHtmlViewport
-            byteArray={this.state.byteArray}
-            viewportIndex={this.props.viewportIndex}
-          />
+          <DicomHtmlViewport byteArray={this.state.byteArray} />
         )}
         {this.state.error && <h2>{JSON.stringify(this.state.error)}</h2>}
       </>

extensions/dicom-html/src/asyncComponent.js

@@ -1,37 +0,0 @@
-/**
- * We use this component to leverage "Code Splitting"
- *
- * Link: https://serverless-stack.com/chapters/code-splitting-in-create-react-app.html
- */
-
-import React, { Component } from 'react';
-
-export default function asyncComponent(importComponent) {
-  class AsyncComponent extends Component {
-    constructor(props) {
-      super(props);
-
-      this.state = {
-        component: null,
-      };
-    }
-
-    async componentDidMount() {
-      // Add dynamically loaded component to state
-      const { default: component } = await importComponent();
-
-      this.setState({
-        component: component,
-      });
-    }
-
-    render() {
-      const C = this.state.component;
-
-      // Render the loaded component, or null
-      return C ? <C {...this.props} /> : null;
-    }
-  }
-
-  return AsyncComponent;
-}