chore(release): publish [skip ci]

- @ohif/extension-cornerstone@1.2.0 - @ohif/viewer@1.1.2
feat(Annotate): Add annotate tool back to toolbar
2019-09-12 19:34:57 +00:00 · 2019-09-12 15:22:09 -04:00 · 2019-09-12 10:40:45 +00:00 · 2019-09-12 12:24:36 +02:00 · 2019-09-12 11:26:36 +02:00 · 2019-09-12 11:22:46 +02:00
67 changed files with 2294 additions and 1758 deletions
@@ -9,9 +9,11 @@ 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.8.0
+  cypress: cypress-io/cypress@1.10.0

 defaults: &defaults
  docker:
@@ -21,13 +23,11 @@ defaults: &defaults
  working_directory: ~/repo

 jobs:
-  PR_UNIT_TESTS:
+  CHECKOUT:
    <<: *defaults
-
    steps:
      # Enable yarn workspaces
      - run: yarn config set workspaces-experimental true
-
      # Checkout code and ALL Git Tags
      - checkout:
          post:
@@ -47,6 +47,16 @@ jobs:
          paths:
            - ~/.cache ## Cache yarn and Cypress
          key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      # Persist :+1:
+      - persist_to_workspace:
+          root: ~/repo
+          paths: .
+
+  UNIT_TESTS:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo

      # RUN TESTS
      - run:
@@ -86,72 +96,7 @@ jobs:
          root: ~/repo
          paths: .

-  MERGE_UNIT_TESTS:
-    <<: *defaults
-
-    steps:
-      # Enable yarn workspaces
-      - run: yarn config set workspaces-experimental true
-
-      # Checkout code and ALL Git Tags
-      - 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-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-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
-
-      # RUN TESTS
-      - run:
-          name: 'JavaScript Test Suite'
-          command: yarn run test:unit:ci
-
-      # PLATFORM/VIEWER
-      - run:
-          name: 'VIEWER: Combine report output'
-          command: |
-            viewerCov="/home/circleci/repo/platform/viewer/coverage"
-            touch "${viewerCov}/reports"
-            cat "${viewerCov}/clover.xml" >> "${viewerCov}/reports"
-            echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
-            cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
-            echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
-      - codecov/upload:
-          file: '/home/circleci/repo/platform/viewer/coverage/reports'
-          flags: 'viewer'
-
-      # PLATFORM/CORE
-      - run:
-          name: 'CORE: Combine report output'
-          command: |
-            coreCov="/home/circleci/repo/platform/core/coverage"
-            touch "${coreCov}/reports"
-            cat "${coreCov}/clover.xml" >> "${coreCov}/reports"
-            echo "\<<\<<\<< EOF" >> "${coreCov}/reports"
-            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:
-          root: ~/repo
-          paths: .
-
-  npm_publish:
+  NPM_PUBLISH:
    <<: *defaults
    steps:
      - attach_workspace:
@@ -175,7 +120,7 @@ jobs:
          root: ~/repo
          paths: .

-  docs_publish:
+  DOCS_PUBLISH:
    <<: *defaults
    steps:
      - attach_workspace:
@@ -192,7 +137,7 @@ jobs:
      - run: chmod +x ~/repo/.circleci/build-and-publish-docs.sh
      - run: ~/repo/.circleci/build-and-publish-docs.sh

-  docker_publish:
+  DOCKER_PUBLISH:
    <<: *defaults
    steps:
      - attach_workspace:
@@ -221,7 +166,7 @@ jobs:
              docker push ohif/$IMAGE_NAME:latest
            fi

-  viewer_demo_build:
+  VIEWER_DEMO_BUILD:
    <<: *defaults
    steps:
      - attach_workspace:
@@ -246,7 +191,7 @@ jobs:
          root: ~/repo
          paths: .

-  viewer_demo_publish:
+  VIEWER_DEMO_PUBLISH:
    working_directory: ~/repo
    docker:
      - image: google/cloud-sdk
@@ -272,71 +217,117 @@ workflows:
  # PULL REQUESTS
  PR_CHECKS:
    jobs:
-      - PR_UNIT_TESTS:
+      - CHECKOUT:
          filters:
            branches:
              ignore:
                - master
                - feature/*
                - hotfix/*
-      # Cypress job added by `cypress-io` orb
+      - UNIT_TESTS:
+          requires:
+            - CHECKOUT
+      # E2E: PWA
      - cypress/run:
+          name: 'E2E: PWA'
          pre-steps:
            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
                add wait-on' # Use yarn latest
          yarn: true
          store_artifacts: true
-          start: yarn run dev
-          wait-on: 'http://localhost:3000'
-          no-workspace: true # Don't persist workspace
          working_directory: platform/viewer
+          build: yarn run build
+          start: yarn run test:e2e:dist
+          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
-          post-steps:
-            - store_test_results:
-                path: cypress/results
+          no-workspace: true # Don't persist workspace
          requires:
-            - PR_UNIT_TESTS
+            - UNIT_TESTS
+      # E2E: script-tag
+      - cypress/run:
+          name: 'E2E: Script Tag'
+          pre-steps:
+            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
+                add wait-on' # Use yarn latest
+          yarn: true
+          store_artifacts: true
+          working_directory: platform/viewer
+          build: yarn run build:package
+          start: yarn run test:e2e:dist
+          wait-on: 'http://localhost:3000'
+          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+          no-workspace: true # Don't persist workspace
+          requires:
+            - UNIT_TESTS

  # MERGE TO MASTER
  RELEASE:
    jobs:
-      - MERGE_UNIT_TESTS:
+      - CHECKOUT:
          filters:
            branches:
              only: master
-      # Cypress job added by `cypress-io` orb
+      - UNIT_TESTS:
+          requires:
+            - CHECKOUT
+      # E2E: PWA + Persist
      - cypress/run:
+          name: 'E2E: PWA'
          pre-steps:
            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
                add wait-on' # Use yarn latest
          yarn: true
          record: true
          store_artifacts: true
-          start: yarn run dev
-          wait-on: 'http://localhost:3000'
          working_directory: platform/viewer
+          build: yarn run build
+          start: yarn run test:e2e:dist
+          wait-on: 'http://localhost:3000'
          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+          no-workspace: true # Don't persist workspace
          post-steps:
            - store_test_results:
                path: cypress/results
          requires:
-            - MERGE_UNIT_TESTS
+            - UNIT_TESTS
+      # E2E: script-tag
+      - cypress/run:
+          name: 'E2E: Script Tag'
+          pre-steps:
+            - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
+                add wait-on' # Use yarn latest
+          yarn: true
+          store_artifacts: true
+          working_directory: platform/viewer
+          build: yarn run build:package
+          start: yarn run test:e2e:dist
+          wait-on: 'http://localhost:3000'
+          cache-key: 'yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+          no-workspace: true # Don't persist workspace
+          post-steps:
+            - store_test_results:
+                path: cypress/results
+          requires:
+            - UNIT_TESTS
      # Update NPM
-      - npm_publish:
+      - NPM_PUBLISH:
          requires:
-            - cypress/run
-      # Update docs.ohif.org
-      - docs_publish:
+            - 'E2E: Script Tag'
+            - 'E2E: PWA'
+      - DOCS_PUBLISH:
          requires:
-            - cypress/run
+            - 'E2E: Script Tag'
+            - 'E2E: PWA'
+      - VIEWER_DEMO_BUILD:
+          requires:
+            - 'E2E: Script Tag'
+            - 'E2E: PWA'
+      - VIEWER_DEMO_PUBLISH:
+          requires:
+            - VIEWER_DEMO_BUILD
      # Update hub.docker.org
-      # - docker_publish:
+      # - DOCKER_PUBLISH:
      #     requires:
-      #       - npm_publish
+      #       - NPM_PUBLISH
      # Update viewer.ohif.org
-      - viewer_demo_build:
-          requires:
-            - cypress/run
-      - viewer_demo_publish:
-          requires:
-            - viewer_demo_build
+      # Update docs.ohif.org
@@ -28,7 +28,7 @@ example/deps/
 docker/dcm4che/dcm4che-arc

 # Cypress test results
-cypress/videos/
+videos/

 # Locize settings
-.locize
+.locize
@@ -0,0 +1,6 @@
+# Specific to our deploy-preview
+# Our docs are published using CircleCI + GitBook
+# Confgure redirects using netlify.toml
+
+# PWA Demo
+/pwa/* /pwa/index.html 200
@@ -0,0 +1,3 @@
+# Netlify redirects
+# SPA rules for our docs
+/*    /index.html   200
@@ -10,7 +10,15 @@ 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
+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
@@ -22,7 +30,7 @@ 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`
+### `cornerstone-tools`

 On your local file system:

@@ -47,7 +55,12 @@ On your local file system:
 As you make changed to `cornerstone-tools`, and it's output is rebuilt, you
 should see the following behavior:

-<!-- Insert GIF here -->
+<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:
@@ -55,9 +68,27 @@ If you wish to stop using your local package, run the following commands in the
 - `yarn unlink cornerstone-tools`
 - `yarn install --force`

-#### `react-vtkjs-viewport`
+### `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

@@ -19,9 +19,6 @@ _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),
@@ -29,7 +26,7 @@ More on: _[`git clone`](https://git-scm.com/docs/git-clone),

 _From .zip:_

-[OHIF/Viewers: react.zip](https://github.com/OHIF/Viewers/archive/react.zip)
+[OHIF/Viewers: react.zip](https://github.com/OHIF/Viewers/archive/master.zip)

 ### Restore Dependencies & Build

@@ -37,20 +34,24 @@ 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:web
+yarn run build
 ```

-If everything worked as expected, you should have a new `build/` directory in
-the project's folder. It should roughly resemble the following:
+If everything worked as expected, you should have a new `dist/` directory in the
+project's folder. It should roughly resemble the following:

 ```bash
-build
-├── config/
-├── static/
+dist/
+├── app-config.js
+├── app.bundle.js
+├── app.css
 ├── index.html
 ├── manifest.json
 ├── service-worker.js
@@ -64,60 +65,15 @@ how to configure the project for your own imaging archive below.

 ### Configuration

-> 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 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.

-#### 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 `APP_CONFIG`
-environment variable. By default, its value is
-[`default.js`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/config/default.js).
-When we build, the `%APP_CONFIG%` value in
-our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/index.html)
-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: '/',
-  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 `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 APP_CONFIG=config/my-config.js react-scripts build"`
-
-After updating the configuration, `yarn run build:web` to generate updated build
-output.
+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).

 ## Next Steps

@@ -141,7 +97,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 `build/` output
+You can do this by running the following commands in the `dist/` output
 directory:

 ```js
@@ -162,8 +118,7 @@ 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] |
-  [generateStaticSite.sh][generatestaticsite.sh]
- [Semantic-Release][semantic-release]: [.releaserc][releaserc]
+  [build-deploy-preview.sh][build-deploy-preview.sh]

 ## Troubleshooting

@@ -173,10 +128,8 @@ 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/react/.circleci/config.yml
+[circleci-config]: https://github.com/OHIF/Viewers/blob/master/.circleci/config.yml
 [netlify]: https://app.netlify.com/sites/ohif/deploys
-[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
+[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
 <!-- prettier-ignore-end -->
@@ -16,16 +16,6 @@ include tags. Here's how it works:
      <code>Google Font: 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">
      <code>@ohif/viewer@latest</code>
@@ -53,28 +43,64 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
 };
 ```

-<ol start="5"><li>
+<ol start="3"><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 Viewer = window.OHIFStandaloneViewer.App;
-var app = React.createElement(Viewer, window.config, null);
-
-ReactDOM.render(app, document.getElementById('ohif-viewer-target'));
+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
+);
 ```

-#### Tips & Tricks
+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

 > I'm having trouble getting this to work. Where can I go for help?

@@ -94,8 +120,22 @@ Good. Now `embed` that new page using an
 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
  -->

-[code-sandbox]: https://codesandbox.io/s/ohif-viewer-script-tag-usage-b3st9
+<!-- prettier-ignore-start -->
+[code-sandbox]: https://codesandbox.io/s/ohif-script-tag-v103-iniiu
+[whole-slide-base-demo]: https://iniiu.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2020.1519719354.757
+[ext-code-sandbox]: https://codesandbox.io/s/ohif-script-tag-v103-runtime-extensions-34bw5
+[whole-slide-ext-demo]: https://34bw5.csb.app/viewer/1.2.392.200140.2.1.1.1.2.799008771.2448.1519719572.518
+<!-- prettier-ignore-end -->
@@ -121,11 +121,7 @@ likely want to update:

 #### OHIF Viewer

-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:
-`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. 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:

 `ENV APP_CONFIG=config/docker_openresty-orthanc.js`

@@ -122,11 +122,7 @@ likely want to update:

 #### OHIF Viewer

-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:
-`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. 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:

 `ENV APP_CONFIG=config/docker_openresty-orthanc-keycloak.js`

@@ -59,9 +59,6 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
@@ -29,8 +29,9 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'ohifExtensionCornerstone',
+      library: 'OHIFExtCornerstone',
      libraryTarget: 'umd',
+      libraryExport: 'default',
      filename: pkg.main,
    },
  });
@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "0.50.5",
+  "version": "1.2.0",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -32,14 +32,14 @@
    "@ohif/ui": "^0.50.0",
    "cornerstone-core": "^2.2.8",
    "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^3.1.0",
+    "cornerstone-tools": "^4.0.1",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.3.8",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "hammerjs": "^2.0.8",
    "prop-types": "^15.6.2",
-    "react": "^15.0.0 || ^16.0.0",
-    "react-dom": "^15.0.0 || ^16.0.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
    "react-redux": "^6.0.0",
    "react-resize-detector": "^3.4.0",
    "redux": "^4.0.1"
@@ -1,8 +1,8 @@
-import * as dcmjs from "dcmjs";
+import * as dcmjs from 'dcmjs';

-import OHIF from "@ohif/core";
-import cornerstone from "cornerstone-core";
-import cornerstoneTools from "cornerstone-tools";
+import OHIF from '@ohif/core';
+import cornerstone from 'cornerstone-core';
+import cornerstoneTools from 'cornerstone-tools';

 const { StackManager } = OHIF.utils;

@@ -56,7 +56,7 @@ 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()
+    headers: OHIF.DICOMWeb.getAuthorizationHeader(),
  }).then(response => response.arrayBuffer());
 }

@@ -91,7 +91,7 @@ async function handleSegmentationStorage(

  if (displaySets.length > 1) {
    console.warn(
-      "More than one display set with the same seriesInstanceUid. This is not supported yet..."
+      'More than one display set with the same seriesInstanceUid. This is not supported yet...'
    );
  }

@@ -100,17 +100,19 @@ async function handleSegmentationStorage(
  const results = parseSeg(arrayBuffer, imageIds);

  if (!results) {
-    throw new Error("Fractional segmentations are not supported");
+    throw new Error('Fractional segmentations are not supported');
  }

-  const { segMetadata, toolState } = results;
+  const { labelmapBuffer, segMetadata, segmentsOnFrame } = results;
+  const { setters } = cornerstoneTools.getModule('segmentation');

-  segMetadata.seriesInstanceUid = seriesInstanceUid;
-
-  addSegMetadataToCornerstoneToolState(
+  setters.labelmap3DByFirstImageId(
+    imageIds[0],
+    labelmapBuffer,
+    0, // TODO -> Can define a color LUT based on colors in the SEG later.
    segMetadata,
-    toolState,
-    displaySetInstanceUid
+    imageIds.length,
+    segmentsOnFrame
  );

  const cachedStack = StackManager.findOrCreateStack(
@@ -118,12 +120,13 @@ async function handleSegmentationStorage(
    referenceDisplaySet
  );
  const stack = Object.assign({}, cachedStack);
+
  stack.currentImageIdIndex = 0;

  return {
    studyInstanceUid,
    displaySetInstanceUid,
-    stack
+    stack,
  };
 }

@@ -69,6 +69,15 @@ const definitions = [
    commandName: 'setToolActive',
    commandOptions: { toolName: 'Length' },
  },
+  {
+    id: 'ArrowAnnotate',
+    label: 'Annotate',
+    icon: 'measure-non-target',
+    //
+    type: TOOLBAR_BUTTON_TYPES.COMMAND,
+    commandName: 'setToolActive',
+    commandOptions: { toolName: 'ArrowAnnotate' },
+  },
  {
    id: 'Angle',
    label: 'Angle',
@@ -186,6 +195,24 @@ const definitions = [
        type: TOOLBAR_BUTTON_TYPES.COMMAND,
        commandName: 'clearAnnotations',
      },
+      {
+        id: 'Bidirectional',
+        label: 'Bidirectional',
+        icon: 'measure-target',
+        //
+        type: TOOLBAR_BUTTON_TYPES.COMMAND,
+        commandName: 'setToolActive',
+        commandOptions: { toolName: 'Bidirectional' },
+      },
+      {
+        id: 'Eraser',
+        label: 'Eraser',
+        icon: 'eraser',
+        //
+        type: TOOLBAR_BUTTON_TYPES.COMMAND,
+        commandName: 'setToolActive',
+        commandOptions: { toolName: 'Eraser' },
+      },
    ],
  },
 ];
@@ -29,8 +29,9 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'ohifExtensionDicomHtml',
+      library: 'OHIFExtDicomHtml',
      libraryTarget: 'umd',
+      libraryExport: 'default',
      filename: pkg.main,
    },
  });
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-html",
-  "version": "0.50.4",
+  "version": "0.50.7",
  "description": "OHIF extension for rendering structured reports to HTML",
  "author": "OHIF",
  "license": "MIT",
@@ -29,10 +29,10 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "dcmjs": "^0.3.3",
+    "dcmjs": "^0.6.1",
    "prop-types": "^15.6.2",
-    "react": "^15.0.0 || ^16.0.0",
-    "react-dom": "^15.0.0 || ^16.0.0"
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5"
@@ -29,8 +29,9 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'ohifExtensionDicomMicroscopy',
+      library: 'OHIFExtDicomMicroscopy',
      libraryTarget: 'umd',
+      libraryExport: 'default',
      filename: pkg.main,
    },
  });
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-microscopy@0.50.4...@ohif/extension-dicom-microscopy@0.50.5) (2019-09-10)
+
+
+### Bug Fixes
+
+* simplify runtime-extension usage ([ac5dbda](https://github.com/OHIF/Viewers/commit/ac5dbda))
+
+
+
+
+
 ## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-microscopy@0.50.3...@ohif/extension-dicom-microscopy@0.50.4) (2019-09-04)

 **Note:** Version bump only for package @ohif/extension-dicom-microscopy
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-microscopy",
-  "version": "0.50.4",
+  "version": "0.50.5",
  "description": "OHIF extension for Dicom Microscopy",
  "author": "OHIF",
  "license": "MIT",
@@ -29,8 +29,8 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "react": "^15.0.0 || ^16.0.0",
-    "react-dom": "^15.0.0 || ^16.0.0"
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
@@ -29,8 +29,9 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'ohifExtensionDicomPdf',
+      library: 'OHIFExtDicomPdf',
      libraryTarget: 'umd',
+      libraryExport: 'default',
      filename: pkg.main,
    },
  });
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@0.50.3...@ohif/extension-dicom-pdf@0.50.4) (2019-09-10)
+
+
+### Bug Fixes
+
+* simplify runtime-extension usage ([ac5dbda](https://github.com/OHIF/Viewers/commit/ac5dbda))
+
+
+
+
+
 ## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@0.50.2...@ohif/extension-dicom-pdf@0.50.3) (2019-09-04)

 **Note:** Version bump only for package @ohif/extension-dicom-pdf
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-pdf",
-  "version": "0.50.3",
+  "version": "0.50.4",
  "description": "OHIF extension for Dicom PDF",
  "author": "OHIF",
  "license": "MIT",
@@ -31,8 +31,8 @@
    "@ohif/core": "^0.50.0",
    "dicom-parser": "^1.8.3",
    "prop-types": "^15.6.2",
-    "react": "^15.0.0 || ^16.0.0",
-    "react-dom": "^15.0.0 || ^16.0.0"
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
@@ -29,8 +29,9 @@ module.exports = (env, argv) => {
    },
    output: {
      path: ROOT_DIR,
-      library: 'ohifExtensionVtk',
+      library: 'OHIFExtVtk',
      libraryTarget: 'umd',
+      libraryExport: 'default',
      filename: pkg.main,
    },
  });
@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.12...@ohif/extension-vtk@0.50.13) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [0.50.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.11...@ohif/extension-vtk@0.50.12) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [0.50.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.10...@ohif/extension-vtk@0.50.11) (2019-09-10)
+
+
+### Bug Fixes
+
+* simplify runtime-extension usage ([ac5dbda](https://github.com/OHIF/Viewers/commit/ac5dbda))
+
+
+
+
+
+## [0.50.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.9...@ohif/extension-vtk@0.50.10) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [0.50.9](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.8...@ohif/extension-vtk@0.50.9) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [0.50.8](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.7...@ohif/extension-vtk@0.50.8) (2019-09-09)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [0.50.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.6...@ohif/extension-vtk@0.50.7) (2019-09-06)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "0.50.7",
+  "version": "0.50.13",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -34,7 +34,7 @@
    "@ohif/ui": "^0.50.0",
    "cornerstone-core": "^2.2.8",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.4.7",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -51,11 +51,11 @@
    "react-vtkjs-viewport": "0.0.11"
  },
  "devDependencies": {
-    "@ohif/core": "^0.50.5",
-    "@ohif/ui": "^0.50.4",
-    "cornerstone-tools": "^3.13.0",
+    "@ohif/core": "^0.50.8",
+    "@ohif/ui": "^0.51.0",
+    "cornerstone-tools": "^4.0.0",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.5.1",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "gh-pages": "^2.0.1",
    "i18next": "^17.0.3",
@@ -3,7 +3,7 @@
 # TOML Reference:
 # https://www.netlify.com/docs/netlify-toml-reference/
 #
-# We use Netlify for deploy previews and deploy previews only.
+# We use Netlify for deploy previews and for publishing docs (gh-pages branch).
 # https://viewer.ohif.org is created using a different process that is
 # managed by CircleCI and deployed to our Google Hosting
 #
@@ -40,25 +40,6 @@
  publish = ".netlify/www/"
  command = "yarn config set workspaces-experimental true && chmod +x .netlify/build-deploy-preview.sh && .netlify/build-deploy-preview.sh"

-# Redirects and headers are GLOBAL for all builds – they do not get scoped to
-# contexts no matter where you define them in the file.
-# For context-specific rules, use _headers or _redirects files, which are
-# PER-DEPLOY.
-# The following redirect is intended for use with most SPAs that handle
-# routing internally.
-# By default, redirects won't be applied if there's a file with the same
-# path as the one defined in the `from` property. Setting `force` to `true`
-# will make the redirect rule take precedence over any existing files.
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200
-
-[[redirects]]
-  from = "/pwa/*"
-  to = "/pwa/index.html"
-  status = 200
-
 [[headers]]
  # Define which paths this specific [[headers]] block will cover.
  for = "/*"
@@ -24,11 +24,14 @@
    "test": "yarn run test:unit",
    "test:unit": "jest --collectCoverage",
    "test:unit:ci": "lerna run test:unit:ci --parallel --stream",
+    "test:e2e": "lerna run test:e2e --stream",
+    "test:e2e:dist": "lerna run test:e2e:dist --stream",
    "see-changed": "lerna changed",
    "docs:publish": "chmod +x ./build-and-publish-docs.sh && ./build-and-publish-docs.sh",
    "release": "yarn run lerna:version && yarn run lerna:publish",
    "lerna:version": "npx lerna version prerelease --force-publish",
-    "lerna:publish": "lerna publish from-package --canary --dist-tag canary"
+    "lerna:publish": "lerna publish from-package --canary --dist-tag canary",
+    "link-list": "npm ls --depth=0 --link=true"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
@@ -78,7 +81,9 @@
    "react-dom": "^16.8.6",
    "react-hot-loader": "^4.12.11",
    "redux-testkit": "^1.0.6",
+    "serve": "^11.1.0",
    "shader-loader": "^1.3.1",
+    "start-server-and-test": "^1.10.0",
    "style-loader": "^1.0.0",
    "stylelint": "^10.1.0",
    "stylelint-config-recommended": "^2.2.0",
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.8](https://github.com/OHIF/Viewers/compare/@ohif/core@0.50.7...@ohif/core@0.50.8) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [0.50.7](https://github.com/OHIF/Viewers/compare/@ohif/core@0.50.6...@ohif/core@0.50.7) (2019-09-10)
+
+
+### Bug Fixes
+
+* remove requestOptions when key is not needed ([32bc47d](https://github.com/OHIF/Viewers/commit/32bc47d))
+
+
+
+
+
+## [0.50.6](https://github.com/OHIF/Viewers/compare/@ohif/core@0.50.5...@ohif/core@0.50.6) (2019-09-09)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
 ## [0.50.5](https://github.com/OHIF/Viewers/compare/@ohif/core@0.50.4...@ohif/core@0.50.5) (2019-09-04)

 **Note:** Version bump only for package @ohif/core
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "0.50.5",
+  "version": "0.50.8",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -32,7 +32,7 @@
  },
  "peerDependencies": {
    "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "^3.9.0",
+    "cornerstone-tools": "^4.0.0",
    "cornerstone-wado-image-loader": "^3.0.0",
    "dicom-parser": "^1.8.3"
  },
@@ -6,17 +6,21 @@ import user from '../user';
 /**
 * Returns the Authorization header as part of an Object.
 *
- * @returns {Object}
+ * @export
+ * @param {Object} [server={}]
+ * @param {Object} [server.requestOptions]
+ * @param {string} [server.requestOptions.auth]
+ * @returns {Object} { Authorization }
 */
-export default function getAuthorizationHeader(server) {
+export default function getAuthorizationHeader({ requestOptions } = {}) {
  const headers = {};

  // Check for OHIF.user since this can also be run on the server
  const accessToken = user && user.getAccessToken && user.getAccessToken();

-  if (server && server.requestOptions && server.requestOptions.auth) {
+  if (requestOptions && requestOptions.auth) {
    // HTTP Basic Auth (user:password)
-    headers.Authorization = `Basic ${btoa(server.requestOptions.auth)}`;
+    headers.Authorization = `Basic ${btoa(requestOptions.auth)}`;
  } else if (accessToken) {
    headers.Authorization = `Bearer ${accessToken}`;
  }
@@ -11,9 +11,6 @@ describe('addServers', () => {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
    oidc: [
@@ -52,7 +49,6 @@ describe('addServers', () => {
        name: 'DCM4CHEE',
        qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
        qidoSupportsIncludeField: true,
-        requestOptions: { requestFromBrowser: true },
        thumbnailRendering: 'wadors',
        type: 'dicomWeb',
        wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.50.3...@ohif/i18n@0.50.4) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/i18n
+
+
+
+
+
 ## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.50.2...@ohif/i18n@0.50.3) (2019-09-04)

 **Note:** Version bump only for package @ohif/i18n
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/i18n",
-  "version": "0.50.3",
+  "version": "0.50.4",
  "description": "Internationalization library for The OHIF Viewer",
  "author": "OHIF",
  "license": "MIT",
@@ -32,8 +32,8 @@
  "peerDependencies": {
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
    "react-i18next": "^10.11.0"
  },
  "dependencies": {
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [0.51.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.50.4...@ohif/ui@0.51.0) (2019-09-12)
+
+
+### Features
+
+* **EraserTool:** add eraserTool to @ohif/extension-cornerstone ([#912](https://github.com/OHIF/Viewers/issues/912)) ([698d274](https://github.com/OHIF/Viewers/commit/698d274))
+
+
+
+
+
 ## [0.50.4](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.50.3...@ohif/ui@0.50.4) (2019-09-06)

 **Note:** Version bump only for package @ohif/ui
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "0.50.4",
+  "version": "0.51.0",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -30,6 +30,7 @@ import edit from './icons/edit.svg';
 import ellipseCircle from './icons/ellipse-circle.svg';
 import ellipseH from './icons/ellipse-h.svg';
 import ellipseV from './icons/ellipse-v.svg';
+import eraser from './icons/eraser.svg';
 import exclamationCircle from './icons/exclamation-circle.svg';
 import exclamationTriangle from './icons/exclamation-triangle.svg';
 import fastBackward from './icons/fast-backward.svg';
@@ -110,6 +111,7 @@ const ICONS = {
  'create-comment': createComment,
  'create-screen-capture': createScreenCapture,
  edit,
+  eraser,
  'fast-backward': fastBackward,
  'fast-forward': fastForward,
  'object-group': objectGroup,
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 2048 1792"
+  aria-labelledby="eraser"
+  width="1em"
+  height="1em"
+  fill="currentColor"
+>
+  <title id="title">Eraser</title>
+  <path transform="translate(0,1792) scale(1,-1)" fill="ACTIVE_COLOR" d="M960 1408l336-384h-768l-336 384h768zm1013-1077q15
+      34 9.5 71.5t-30.5 65.5l-896 1024q-38 44-96 44h-768q-38
+      0-69.5-20.5t-47.5-54.5q-15-34-9.5-71.5t30.5-65.5l896-1024q38-44 96-44h768q38
+      0 69.5 20.5t47.5 54.5z"
+  />
+</svg>
@@ -4,9 +4,14 @@ const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
 //
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const fontsToJavaScriptRule = require('./rules/fontsToJavaScript.js');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 // const
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
+const PUBLIC_DIR = path.join(__dirname, '../public');
+// ~~ Env Vars
+const HTML_TEMPLATE = process.env.HTML_TEMPLATE || 'script-tag.html';
+const PUBLIC_URL = process.env.PUBLIC_URL || '/';

 module.exports = (env, argv) => {
  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
@@ -33,7 +38,7 @@ module.exports = (env, argv) => {
    },
    output: {
      path: DIST_DIR,
-      library: 'ohifViewer',
+      library: 'OHIFViewer',
      libraryTarget: 'umd',
      filename: 'index.umd.js',
    },
@@ -43,6 +48,12 @@ module.exports = (env, argv) => {
    plugins: [
      // Clean output.path
      new CleanWebpackPlugin(),
+      // Generate "index.html" w/ correct includes/imports
+      new HtmlWebpackPlugin({
+        inject: false,
+        template: `${PUBLIC_DIR}/html-templates/${HTML_TEMPLATE}`,
+        filename: 'index.html',
+      }),
    ],
  });
 };
@@ -3,6 +3,107 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.1...@ohif/viewer@1.1.2) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.1.0...@ohif/viewer@1.1.1) (2019-09-12)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+# [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.5...@ohif/viewer@1.1.0) (2019-09-12)
+
+
+### Features
+
+* 🎸 Load local file or folder using native dialog ([#870](https://github.com/OHIF/Viewers/issues/870)) ([c221dd8](https://github.com/OHIF/Viewers/commit/c221dd8))
+
+
+
+
+
+## [1.0.5](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.4...@ohif/viewer@1.0.5) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [1.0.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.3...@ohif/viewer@1.0.4) (2019-09-10)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [1.0.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.2...@ohif/viewer@1.0.3) (2019-09-10)
+
+
+### Bug Fixes
+
+* on-brand library global name ([ababe63](https://github.com/OHIF/Viewers/commit/ababe63))
+* remove requestOptions when key is not needed ([32bc47d](https://github.com/OHIF/Viewers/commit/32bc47d))
+
+
+
+
+
+## [1.0.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.1...@ohif/viewer@1.0.2) (2019-09-09)
+
+
+### Bug Fixes
+
+* import regenerator-runtime for umd build ([bad987a](https://github.com/OHIF/Viewers/commit/bad987a))
+
+
+
+
+
+## [1.0.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@1.0.0...@ohif/viewer@1.0.1) (2019-09-09)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+# [1.0.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.21...@ohif/viewer@1.0.0) (2019-09-06)
+
+
+### Code Refactoring
+
+* 💡 React components to consume appConfig using Context ([#852](https://github.com/OHIF/Viewers/issues/852)) ([7c4ee73](https://github.com/OHIF/Viewers/commit/7c4ee73)), closes [#725](https://github.com/OHIF/Viewers/issues/725) [#725](https://github.com/OHIF/Viewers/issues/725)
+
+
+### BREAKING CHANGES
+
+* #725
+
+
+
+
+
+## [0.50.21](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.20...@ohif/viewer@0.50.21) (2019-09-06)
+
+
+### Bug Fixes
+
+* viewer project should build output before publish ([94b625d](https://github.com/OHIF/Viewers/commit/94b625d))
+
+
+
+
+
 ## [0.50.20](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.19...@ohif/viewer@0.50.20) (2019-09-06)

 **Note:** Version bump only for package @ohif/viewer
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-
-  <meta name="description" content="Open Health Imaging Foundation DICOM Viewer" />
-  <meta name="viewport"
-    content="width=device-width,initial-scale=1.0,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-  <meta name="theme-color" content="#000000" />
-  <meta http-equiv="cleartype" content="on" />
-  <meta name="MobileOptimized" content="320" />
-  <meta name="HandheldFriendly" content="True" />
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-
-  <!-- Latest compiled and minified CSS -->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
-    integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous" />
-
-  <title>OHIF Standalone Viewer</title>
-</head>
-
-<body>
-  <noscript> You need to enable JavaScript to run this app. </noscript>
-
-  <div id="root"></div>
-
-  <!-- Load React. -->
-  <script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
-  <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
-
-  <script src="/index.umd.js" crossorigin></script>
-  <script>
-    window.config = {
-      // default: '/'
-      routerBasename: '/',
-      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',
-          },
-        ],
-      },
-    }
-
-    window.OHIFStandaloneViewer.installViewer(window.config);
-  </script>
-</body>
-
-</html>
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "0.50.20",
+  "version": "1.1.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -27,8 +27,12 @@
    "dev:viewer": "yarn run dev",
    "start": "yarn run dev",
    "test:e2e": "cypress open",
+    "test:e2e:ci": "cypress run",
+    "test:e2e:dist": "start-server-and-test test:e2e:serve http://localhost:3000 test:e2e:ci",
+    "test:e2e:serve": "serve -l 3000 -s dist",
    "test:unit": "jest --watchAll",
-    "test:unit:ci": "jest --ci --runInBand --collectCoverage"
+    "test:unit:ci": "jest --ci --runInBand --collectCoverage",
+    "prepublishOnly": "yarn run build:package"
  },
  "files": [
    "dist",
@@ -40,22 +44,22 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^0.50.5",
-    "@ohif/extension-cornerstone": "^0.50.5",
-    "@ohif/extension-dicom-html": "^0.50.4",
-    "@ohif/extension-dicom-microscopy": "^0.50.4",
-    "@ohif/extension-dicom-pdf": "^0.50.3",
-    "@ohif/extension-vtk": "^0.50.7",
-    "@ohif/i18n": "^0.50.3",
-    "@ohif/ui": "^0.50.4",
+    "@ohif/core": "^0.50.8",
+    "@ohif/extension-cornerstone": "^1.2.0",
+    "@ohif/extension-dicom-html": "^0.50.7",
+    "@ohif/extension-dicom-microscopy": "^0.50.5",
+    "@ohif/extension-dicom-pdf": "^0.50.4",
+    "@ohif/extension-vtk": "^0.50.13",
+    "@ohif/i18n": "^0.50.4",
+    "@ohif/ui": "^0.51.0",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
    "cornerstone-core": "^2.2.8",
    "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^3.19.2",
+    "cornerstone-tools": "^4.0.0",
    "cornerstone-wado-image-loader": "^3.0.0",
-    "dcmjs": "^0.4.7",
+    "dcmjs": "^0.6.1",
    "dicom-parser": "^1.8.3",
    "dicomweb-client": "^0.4.4",
    "hammerjs": "^2.0.8",
@@ -13,9 +13,6 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
@@ -12,9 +12,6 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
@@ -11,9 +11,6 @@ window.config = {
        qidoSupportsIncludeField: false,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
@@ -14,11 +14,10 @@ window.config = {
        thumbnailRendering: 'wadors',
        // REQUIRED TAG:
        // TODO: Remove tag after https://github.com/OHIF/ohif-core/pull/19 is merged and we bump version
-        requestOptions: {
-          // undefined to use JWT + Bearer auth
-          // auth: 'orthanc:orthanc',
-          requestFromBrowser: true,
-        },
+        // requestOptions: {
+        // undefined to use JWT + Bearer auth
+        // auth: 'orthanc:orthanc',
+        // },
      },
    ],
  },
@@ -12,15 +12,11 @@ window.config = {
        qidoSupportsIncludeField: false,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        // REQUIRED TAG:
-        // https://github.com/OHIF/ohif-core/blob/59e1e04b92be24aee5d4402445cb3dcedb746995/src/studies/retrieveStudyMetadata.js#L54
-        // TODO: Remove tag after https://github.com/OHIF/ohif-core/pull/19 is merged and we bump version
-        requestOptions: {
-          // undefined to use JWT + Bearer auth
-          // auth: 'orthanc:orthanc',
-          requestFromBrowser: true,
-        },
+        // requestOptions: {
+        // undefined to use JWT + Bearer auth
+        // auth: 'orthanc:orthanc',
+        // },
      },
    ],
  },
-}
+};
@@ -14,11 +14,10 @@ window.config = {
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
        requestOptions: {
-          requestFromBrowser: true,
          auth: 'admin:admin',
        },
      },
    ],
  },
  studyListFunctionsEnabled: true,
-}
+};
@@ -11,9 +11,6 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
@@ -11,15 +11,12 @@ window.config = {
        qidoSupportsIncludeField: true,
        imageRendering: 'wadors',
        thumbnailRendering: 'wadors',
-        requestOptions: {
-          requestFromBrowser: true,
-        },
      },
    ],
  },
  i18n: {
    LOCIZE_PROJECTID: 'a8da3f9a-e467-4dd6-af33-474d582a0294',
    LOCIZE_API_KEY: null, // Developers can use this to do in-context editing. DO NOT COMMIT THIS KEY!
-    USE_LOCIZE: false
-  }
-}
+    USE_LOCIZE: false,
+  },
+};
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+
+    <meta
+      name="description"
+      content="Open Health Imaging Foundation DICOM Viewer"
+    />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1,maximum-scale=1,user-scalable=no"
+    />
+    <meta name="theme-color" content="#000000" />
+    <meta http-equiv="cleartype" content="on" />
+    <meta name="MobileOptimized" content="320" />
+    <meta name="HandheldFriendly" content="True" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+    <!-- WEB FONTS -->
+    <link
+      href="https://fonts.googleapis.com/css?family=Sanchez"
+      rel="stylesheet"
+    />
+
+    <title>OHIF Standalone Viewer</title>
+  </head>
+
+  <body>
+    <noscript> You need to enable JavaScript to run this app. </noscript>
+
+    <div id="root"></div>
+
+    <script src="/index.umd.js" crossorigin></script>
+    <script>
+      var containerId = 'root';
+      var componentRenderedOrUpdatedCallback = function() {
+        console.log('OHIF Viewer rendered/updated');
+      };
+      window.OHIFViewer.installViewer(
+        {
+          // routerBasename: '/',
+          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',
+              },
+            ],
+          },
+        },
+        containerId,
+        componentRenderedOrUpdatedCallback
+      );
+    </script>
+  </body>
+</html>
@@ -25,12 +25,15 @@ import { OidcProvider } from 'redux-oidc';
 import PropTypes from 'prop-types';
 import { Provider } from 'react-redux';
 import { BrowserRouter as Router } from 'react-router-dom';
-import WhiteLabellingContext from './WhiteLabellingContext';
 import { getActiveContexts } from './store/layout/selectors.js';
 import i18n from '@ohif/i18n';
 import setupTools from './setupTools.js';
 import store from './store';
-import UserManagerContext from './UserManagerContext';
+
+// Contexts
+import WhiteLabellingContext from './context/WhiteLabellingContext';
+import UserManagerContext from './context/UserManagerContext';
+import AppContext from './context/AppContext';

 // ~~~~ APP SETUP
 initCornerstoneTools({
@@ -74,10 +77,66 @@ class App extends Component {
    extensions: [],
  };

+  _appConfig;
+  _userManager;
+
  constructor(props) {
    super(props);

-    if (this.props.oidc.length) {
+    this.appConfig = props;
+    const { servers, extensions, hotkeys, oidc } = props;
+
+    this.initUserManager(oidc);
+    _initExtensions(extensions, hotkeys);
+    _initServers(servers);
+    initWebWorkers();
+  }
+
+  render() {
+    const userManager = this._userManager;
+    const config = {
+      appConfig: this._appConfig,
+    };
+
+    if (userManager) {
+      return (
+        <AppContext.Provider value={config}>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18n}>
+              <OidcProvider store={store} userManager={userManager}>
+                <UserManagerContext.Provider value={userManager}>
+                  <Router basename={this.props.routerBasename}>
+                    <WhiteLabellingContext.Provider
+                      value={this.props.whiteLabelling}
+                    >
+                      <OHIFStandaloneViewer userManager={userManager} />
+                    </WhiteLabellingContext.Provider>
+                  </Router>
+                </UserManagerContext.Provider>
+              </OidcProvider>
+            </I18nextProvider>
+          </Provider>
+        </AppContext.Provider>
+      );
+    }
+
+    return (
+      <AppContext.Provider value={config}>
+        <Provider store={store}>
+          <I18nextProvider i18n={i18n}>
+            <Router basename={this.props.routerBasename}>
+              <WhiteLabellingContext.Provider value={this.props.whiteLabelling}>
+                <OHIFStandaloneViewer />
+              </WhiteLabellingContext.Provider>
+            </Router>
+          </I18nextProvider>
+        </Provider>
+      </AppContext.Provider>
+    );
+  }
+
+  initUserManager(oidc) {
+    if (oidc && !!oidc.length) {
      const firstOpenIdClient = this.props.oidc[0];

      const { protocol, host } = window.location;
@@ -102,58 +161,18 @@ class App extends Component {
        ),
      });

-      this.userManager = getUserManagerForOpenIdConnectClient(
+      this._userManager = getUserManagerForOpenIdConnectClient(
        store,
        openIdConnectConfiguration
      );
    }
-
-    _initExtensions(this.props.extensions);
-    _initServers(this.props.servers);
-    initWebWorkers();
-  }
-
-  render() {
-    const userManager = this.userManager;
-
-    if (userManager) {
-      return (
-        <Provider store={store}>
-          <I18nextProvider i18n={i18n}>
-            <OidcProvider store={store} userManager={userManager}>
-              <UserManagerContext.Provider value={userManager}>
-                <Router basename={this.props.routerBasename}>
-                  <WhiteLabellingContext.Provider
-                    value={this.props.whiteLabelling}
-                  >
-                    <OHIFStandaloneViewer userManager={userManager} />
-                  </WhiteLabellingContext.Provider>
-                </Router>
-              </UserManagerContext.Provider>
-            </OidcProvider>
-          </I18nextProvider>
-        </Provider>
-      );
-    }
-
-    return (
-      <Provider store={store}>
-        <I18nextProvider i18n={i18n}>
-          <Router basename={this.props.routerBasename}>
-            <WhiteLabellingContext.Provider value={this.props.whiteLabelling}>
-              <OHIFStandaloneViewer />
-            </WhiteLabellingContext.Provider>
-          </Router>
-        </I18nextProvider>
-      </Provider>
-    );
  }
 }

 /**
 * @param
 */
-function _initExtensions(extensions) {
+function _initExtensions(extensions, hotkeys) {
  const defaultExtensions = [
    GenericViewerCommands,
    MeasurementsPanel,
@@ -163,8 +182,8 @@ function _initExtensions(extensions) {
  extensionManager.registerExtensions(mergedExtensions);

  // Must run after extension commands are registered
-  if (window.config.hotkeys) {
-    hotkeysManager.setHotkeys(window.config.hotkeys, true);
+  if (hotkeys) {
+    hotkeysManager.setHotkeys(hotkeys, true);
  }
 }

@@ -20,6 +20,9 @@ import './OHIFStandaloneViewer.css';
 import './variables.css';
 import './theme-tide.css';

+// Contexts
+import AppContext from './context/AppContext';
+
 // Dynamic Import Routes (CodeSplitting)
 // const IHEInvokeImageDisplay = asyncComponent(() =>
 //   import('./routes/IHEInvokeImageDisplay.js')
@@ -37,6 +40,7 @@ import './theme-tide.css';
 const reload = () => window.location.reload();

 class OHIFStandaloneViewer extends Component {
+  static contextType = AppContext;
  state = {
    isLoading: false,
  };
@@ -63,7 +67,7 @@ class OHIFStandaloneViewer extends Component {

  render() {
    const { user, userManager } = this.props;
-
+    const { appConfig = {} } = this.context;
    const userNotLoggedIn = userManager && (!user || user.expired);
    if (userNotLoggedIn) {
      const pathname = this.props.location.pathname;
@@ -140,9 +144,7 @@ class OHIFStandaloneViewer extends Component {
    ];

    const showStudyList =
-      window.config && window.config.showStudyList !== undefined
-        ? window.config.showStudyList
-        : true;
+      appConfig.showStudyList !== undefined ? appConfig.showStudyList : true;
    if (showStudyList) {
      routes.push({
        path: '/studylist',
@@ -11,13 +11,17 @@ import { AboutModal } from '@ohif/ui';
 import { hotkeysManager } from './../../App.js';
 import { withTranslation } from 'react-i18next';

+// Context
+import AppContext from './../../context/AppContext';
+
 class Header extends Component {
+  static contextType = AppContext;
  static propTypes = {
    home: PropTypes.bool.isRequired,
    location: PropTypes.object.isRequired,
    children: PropTypes.node,
    t: PropTypes.func.isRequired,
-    userManager: PropTypes.object
+    userManager: PropTypes.object,
  };

  static defaultProps = {
@@ -63,10 +67,10 @@ class Header extends Component {
    if (this.props.user && this.props.userManager) {
      this.options.push({
        title: t('Logout'),
-          icon: { name: 'power-off' },
-          onClick: () => {
-            this.props.userManager.signoutRedirect();
-          },
+        icon: { name: 'power-off' },
+        onClick: () => {
+          this.props.userManager.signoutRedirect();
+        },
      });
    }

@@ -82,10 +86,9 @@ class Header extends Component {

  render() {
    const { t } = this.props;
+    const { appConfig = {} } = this.context;
    const showStudyList =
-      window.config.showStudyList !== undefined
-        ? window.config.showStudyList
-        : true;
+      appConfig.showStudyList !== undefined ? appConfig.showStudyList : true;
    return (
      <div className={`entry-header ${this.props.home ? 'header-big' : ''}`}>
        <div className="header-left-box">
@@ -5,7 +5,6 @@ import classNames from 'classnames';
 import { MODULE_TYPES } from '@ohif/core';
 import OHIF from '@ohif/core';
 import moment from 'moment';
-import WhiteLabellingContext from '../WhiteLabellingContext.js';
 import ConnectedHeader from './ConnectedHeader.js';
 import ConnectedToolbarRow from './ConnectedToolbarRow.js';
 import ConnectedLabellingOverlay from './ConnectedLabellingOverlay';
@@ -13,7 +12,11 @@ import ConnectedStudyBrowser from './ConnectedStudyBrowser.js';
 import ConnectedViewerMain from './ConnectedViewerMain.js';
 import SidePanel from './../components/SidePanel.js';
 import { extensionManager } from './../App.js';
-import UserManagerContext from '../UserManagerContext';
+
+// Contexts
+import WhiteLabellingContext from '../context/WhiteLabellingContext.js';
+import UserManagerContext from '../context/UserManagerContext';
+
 import './Viewer.css';
 /**
 * Inits OHIF Hanging Protocol's onReady.
@@ -13,3 +13,8 @@
 .drag-drop-instructions h4 {
  color: var(--text-secondary-color);
 }
+
+.link-dialog {
+  color: var(--active-color);
+  cursor: pointer;
+}
@@ -12,6 +12,44 @@ import { withTranslation } from 'react-i18next';
 const { OHIFStudyMetadata } = metadata;
 const { studyMetadataManager, updateMetaDataManager } = utils;

+const dropZoneLinkDialog = (onDrop, i18n, dir) => {
+  return (
+    <Dropzone onDrop={onDrop} noDrag>
+      {({ getRootProps, getInputProps }) => (
+        <span {...getRootProps()} className="link-dialog">
+          {dir ? (
+            <span>
+              {i18n('Load folders')}
+              <input
+                {...getInputProps()}
+                webkitdirectory="true"
+                mozdirectory="true"
+              />
+            </span>
+          ) : (
+            <span>
+              {i18n('Load files')}
+              <input {...getInputProps()} />
+            </span>
+          )}
+        </span>
+      )}
+    </Dropzone>
+  );
+};
+
+const linksDialogMessage = (onDrop, i18n) => {
+  return (
+    <>
+      {i18n('Or click to ')}
+      {dropZoneLinkDialog(onDrop, i18n)}
+      {i18n(' or ')}
+      {dropZoneLinkDialog(onDrop, i18n, true)}
+      {i18n(' from dialog')}
+    </>
+  );
+};
+
 class ViewerLocalFileData extends Component {
  static propTypes = {
    studies: PropTypes.array,
@@ -73,7 +111,7 @@ class ViewerLocalFileData extends Component {
    }

    return (
-      <Dropzone onDrop={onDrop}>
+      <Dropzone onDrop={onDrop} noClick>
        {({ getRootProps, getInputProps }) => (
          <div {...getRootProps()} style={{ width: '100%', height: '100%' }}>
            {this.state.studies ? (
@@ -96,15 +134,10 @@ class ViewerLocalFileData extends Component {
                          'Drag and Drop DICOM files here to load them in the Viewer'
                        )}
                      </h3>
-                      <h4>
-                        {this.props.t(
-                          "Or click to load the browser's file selector"
-                        )}
-                      </h4>
+                      <h4>{linksDialogMessage(onDrop, this.props.t)}</h4>
                    </>
                  )}
                </div>
-                <input {...getInputProps()} style={{ display: 'none' }} />
              </div>
            )}
          </div>
@@ -0,0 +1,5 @@
+import React from 'react';
+
+let AppContext = React.createContext({});
+
+export default AppContext;
@@ -1,4 +1,4 @@
-import OHIFLogo from './components/OHIFLogo/OHIFLogo.js';
+import OHIFLogo from '../components/OHIFLogo/OHIFLogo.js';
 import React from 'react';

 const defaultContextValues = {
@@ -1,6 +1,8 @@
 /**
 * Entry point index.js for UMD packaging
 */
+import 'regenerator-runtime/runtime';
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App.js';
@@ -31,7 +31,6 @@ import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
 let config = {};
 const appDefaults = {
  routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
 };

 if (window) {
@@ -177,7 +177,7 @@ export default function setupTools(store) {
    { name: 'StackScroll', mouseButtonMasks: [1] },
    { name: 'Brush', mouseButtonMasks: [1] },
    {
-      name: 'FreehandMouse',
+      name: 'FreehandRoi',
      props: {
        configuration: {
          getMeasurementLocationCallback: toolLabellingFlowCallback,
@@ -1,9 +1,12 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 import queryString from 'query-string';
 import ConnectedStudyList from './ConnectedStudyList';

+// Contexts
+import AppContext from '../context/AppContext';
+
 // TODO: Move to @ohif/ui

 function toLowerCaseFirstLetter(word) {
@@ -22,16 +25,20 @@ function getFilters({ search }) {
 }

 function StudyListRouting({ location }) {
+  const { appConfig = {} } = useContext(AppContext);
+
  const filters = location ? getFilters(location) : undefined;

  let studyListFunctionsEnabled = false;
-  if (window.config && window.config.studyListFunctionsEnabled) {
-    studyListFunctionsEnabled = window.config.studyListFunctionsEnabled;
+  if (appConfig.studyListFunctionsEnabled) {
+    studyListFunctionsEnabled = appConfig.studyListFunctionsEnabled;
  }
-  return <ConnectedStudyList
-    filters={filters}
-    studyListFunctionsEnabled={studyListFunctionsEnabled}
-  />;
+  return (
+    <ConnectedStudyList
+      filters={filters}
+      studyListFunctionsEnabled={studyListFunctionsEnabled}
+    />
+  );
 }

 StudyListRouting.propTypes = {
@@ -10,10 +10,14 @@ import moment from 'moment';
 import ConnectedDicomFilesUploader from '../googleCloud/ConnectedDicomFilesUploader';
 import ConnectedDicomStorePicker from '../googleCloud/ConnectedDicomStorePicker';
 import filesToStudies from '../lib/filesToStudies.js';
-import UserManagerContext from '../UserManagerContext';
-import WhiteLabellingContext from '../WhiteLabellingContext';
+
+// Contexts
+import UserManagerContext from '../context/UserManagerContext';
+import WhiteLabellingContext from '../context/WhiteLabellingContext';
+import AppContext from '../context/AppContext';

 class StudyListWithData extends Component {
+  static contextType = AppContext;
  state = {
    searchData: {},
    studies: [],
@@ -51,9 +55,10 @@ class StudyListWithData extends Component {
  };

  componentDidMount() {
+    const { appConfig = {} } = this.context;
    // TODO: Avoid using timepoints here
    //const params = { studyInstanceUids, seriesInstanceUids, timepointId, timepointsFilter={} };
-    if (!this.props.server && window.config.enableGoogleCloudAdapter) {
+    if (!this.props.server && appConfig.enableGoogleCloudAdapter) {
      this.setState({
        modalComponentId: 'DicomStorePicker',
      });
@@ -184,6 +189,7 @@ class StudyListWithData extends Component {
  };

  render() {
+    const { appConfig = {} } = this.context;
    const onDrop = async acceptedFiles => {
      try {
        const studies = await filesToStudies(acceptedFiles);
@@ -203,8 +209,7 @@ class StudyListWithData extends Component {
    let healthCareApiButtons = null;
    let healthCareApiWindows = null;

-    // TODO: This should probably be a prop
-    if (window.config.enableGoogleCloudAdapter) {
+    if (appConfig.enableGoogleCloudAdapter) {
      healthCareApiWindows = (
        <ConnectedDicomStorePicker
          isOpen={this.state.modalComponentId === 'DicomStorePicker'}
Author	SHA1	Message	Date
ohif-bot	26e037dee7	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.2.0 - @ohif/viewer@1.1.2	2019-09-12 19:34:57 +00:00
Romulo Bordezani	26be96783d	feat(Annotate): Add annotate tool back to toolbar * feat(Arrow Annotate Tool) * feat(Arrow Annotate Tool) * refactor: label "Arrow Annotate" to "Annotate" to match viewer-legacy	2019-09-12 15:22:09 -04:00
ohif-bot	029ba1fb4a	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.1.1 - @ohif/extension-dicom-html@0.50.7 - @ohif/extension-vtk@0.50.13 - @ohif/viewer@1.1.1	2019-09-12 10:40:45 +00:00
James Petts	56d658f02d	Merge pull request #913 from JamesAPetts/dcmjs0.6.1 chore: 🤖 Upgrade dcmjs to 0.6.1	2019-09-12 12:24:36 +02:00
James A. Petts	64921b905f	Cosmetic change to trigger netlify rebuild.	2019-09-12 11:26:36 +02:00
James A. Petts	d00d7daf41	chore: 🤖 Upgrade dcmjs to 0.6.1	2019-09-12 11:22:46 +02:00
ohif-bot	144a173306	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.1.0 - @ohif/extension-vtk@0.50.12 - @ohif/ui@0.51.0 - @ohif/viewer@1.1.0	2019-09-12 03:07:49 +00:00
Romulo Bordezani	e40cbae113	feat(BidirectionalTool): Add BidrectionalTool to "more" menu (#911 ) * feat(Bidirectional Tool) * feat(Bidirectional Tool)	2019-09-11 22:53:06 -04:00
Romulo Bordezani	698d274c64	feat(EraserTool): add eraserTool to @ohif/extension-cornerstone (#912 ) This includes `ui` changes in the same commit, so it will see a feature bump as well	2019-09-11 16:28:14 -04:00
ladeirarodolfo	c221dd86d2	feat: 🎸 Load local file or folder using native dialog (#870 ) Created to specialized dropzone elements to take care of loading local file/folder from dialog Closes: 847	2019-09-10 23:30:53 -04:00
Danny Brown	a8c3d1b9a2	docs: runtime extensions (#908 ) * docs: runtime extensions * docs: small readability changes * docs: clarity	2019-09-10 22:50:13 -04:00
ohif-bot	6cce8e6720	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.0.1 - @ohif/extension-dicom-html@0.50.6 - @ohif/extension-dicom-microscopy@0.50.5 - @ohif/extension-dicom-pdf@0.50.4 - @ohif/extension-vtk@0.50.11 - @ohif/i18n@0.50.4 - @ohif/viewer@1.0.5	2019-09-10 20:38:26 +00:00
Danny Brown	e8dbe3e1b6	Merge pull request #907 from dannyrb/publish/react-ohif-org fix: runtime extension usage	2019-09-10 16:03:50 -04:00
dannyrb	ac5dbda3b2	fix: simplify runtime-extension usage	2019-09-10 16:02:08 -04:00
dannyrb	bf77b3959a	chore: bump react peer deps	2019-09-10 15:12:59 -04:00
ohif-bot	c6a6bce0b8	chore(release): publish [skip ci] - @ohif/extension-vtk@0.50.10 - @ohif/core@0.50.8 - @ohif/viewer@1.0.4	2019-09-10 02:48:31 +00:00
dannyrb	3f9decc6d5	Merge branch 'master' of github.com:OHIF/Viewers into upstream-master	2019-09-09 22:33:39 -04:00
dannyrb	1b1ff8068d	docs: updated embedded-viewer recipe	2019-09-09 22:33:33 -04:00
ohif-bot	eb1a900b13	chore(release): publish [skip ci] - @ohif/extension-vtk@0.50.9 - @ohif/core@0.50.7 - @ohif/viewer@1.0.3	2019-09-10 02:13:05 +00:00
dannyrb	e8938111d5	ci: add checkout and restore persist	2019-09-09 21:57:01 -04:00
Danny Brown	73122e717c	Merge pull request #905 from dannyrb/fix/regenerator-runtime-issue-for-umd-build Misc. small script tag and config clean-up items	2019-09-09 21:47:21 -04:00
dannyrb	300fe06b60	chore: remove unused template	2019-09-09 21:46:38 -04:00
dannyrb	37e5387cf0	ci: update all of release to use cypress job names	2019-09-09 21:43:10 -04:00
dannyrb	7c2860789d	without numbers	2019-09-09 21:41:50 -04:00
dannyrb	df35b1bc06	ci: try using new names	2019-09-09 21:41:14 -04:00
dannyrb	0460a487ec	Testing w/ no release steps	2019-09-09 21:39:31 -04:00
dannyrb	0195a3d860	ci: See if we can wait for dynamic job names	2019-09-09 21:37:39 -04:00
dannyrb	2740e34ad3	ignore video output	2019-09-09 21:34:34 -04:00
dannyrb	61d2caef96	ci: update RELEASE to use new cypress tests	2019-09-09 21:34:23 -04:00
dannyrb	a88f37595d	ci: upgrade cypress orb	2019-09-09 21:33:38 -04:00
Danny Brown	42d80a3e60	re-add working directory key	2019-09-09 18:05:03 -04:00
dannyrb	51143ffe35	Merge branch 'fix/regenerator-runtime-issue-for-umd-build' of github.com:dannyrb/Viewers into fix/regenerator-runtime-issue-for-umd-build	2019-09-09 16:40:21 -04:00
dannyrb	76f7b00b65	ci: script tag e2e tests	2019-09-09 16:40:07 -04:00
Danny Brown	64ca61745b	Merge branch 'master' into fix/regenerator-runtime-issue-for-umd-build	2019-09-09 15:52:13 -04:00
dannyrb	ababe63a55	fix: on-brand library global name	2019-09-09 15:50:45 -04:00
dannyrb	6c2217f2e5	chore: remove unused relativeWebWorkerScriptsPath config key	2019-09-09 15:50:10 -04:00
dannyrb	cf9bec3ffa	Merge branch 'fix/regenerator-runtime-issue-for-umd-build' of github.com:dannyrb/Viewers into fix/regenerator-runtime-issue-for-umd-build	2019-09-09 15:49:28 -04:00
dannyrb	32bc47d315	fix: remove requestOptions when key is not needed	2019-09-09 15:49:12 -04:00
ohif-bot	1fb98884d2	chore(release): publish [skip ci] - @ohif/viewer@1.0.2	2019-09-09 16:35:06 +00:00
Danny Brown	7f8f9dc073	Merge pull request #902 from dannyrb/fix/regenerator-runtime-issue-for-umd-build fix: import regenerator-runtime for umd build	2019-09-09 12:26:33 -04:00
Danny Brown	c6f89495b2	Merge branch 'master' into fix/regenerator-runtime-issue-for-umd-build	2019-09-09 12:26:20 -04:00
dannyrb	bad987a06b	fix: import regenerator-runtime for umd build	2019-09-09 12:25:37 -04:00
ohif-bot	c73abb518f	chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.0.0 - @ohif/extension-dicom-html@0.50.5 - @ohif/extension-vtk@0.50.8 - @ohif/core@0.50.6 - @ohif/viewer@1.0.1	2019-09-09 15:17:11 +00:00
James Petts	d12d01215e	Merge pull request #900 from JamesAPetts/cst4 Upgrade to cornerstoneTools 4.0.1 and dcmjs 0.6.0	2019-09-09 17:03:10 +02:00
James A. Petts	86adb5113a	feat: 🎸 Upgraded to cornerstoneTools 4.0 Upgraded OHIF to run on cornerstone-tools 4.0.1 and dcmjs 0.6.0. BREAKING CHANGE: n	2019-09-09 16:43:48 +02:00
James A. Petts	5220cd371c	Upgrade to cornerstoneTools 4.0.1 and dcmjs 0.6.0	2019-09-09 16:32:52 +02:00
Danny Brown	16b063a504	ci: fix docs deploy-preview redirect (#878 ) * docs: filling in missing readme sections * ci: fix docs deploy-preview redirect	2019-09-06 15:09:20 -04:00
ohif-bot	d0d75987f7	chore(release): publish [skip ci] - @ohif/viewer@1.0.0	2019-09-06 18:40:55 +00:00
ladeirarodolfo	7c4ee734fa	refactor: 💡 React components to consume appConfig using Context (#852 ) * refactor: 💡 React components to consume appConfig using Context React components to consume app configuration using React Context and React Hooks. Non React components to continue using global variable window.config. Related documentation also changed. Closes: #725 * refactor: 💡 Removing unecessary code On current React component there is no need to import useContext method from React, so, removing it. * refactor: 💡 Code review Code review. Minor changes based on review inputs and moving userManager to an init method BREAKING CHANGE: #725 Closes: #725 * docs: don't include implementation detail in docs * docs: don't include implementation detail in docs * docs: no need to specify implementation details in employment recipe * docs: no need to specify implementation details in deployment recipe	2019-09-06 14:31:26 -04:00
ohif-bot	a187783e0d	chore(release): publish [skip ci] - @ohif/viewer@0.50.21	2019-09-06 18:23:46 +00:00
Danny Brown	ada05b01a7	Merge pull request #874 from dannyrb/docs/monorepo-updates-3 docs: contributing, tests, react-vtkjs-viewport link	2019-09-06 14:13:35 -04:00
Danny Brown	1a44d78277	Merge branch 'master' into docs/monorepo-updates-3	2019-09-06 14:13:22 -04:00
dannyrb	691a073b86	docs(build-pwa): updated commands, file locations, point to configs instead of duplicating	2019-09-06 10:27:02 -04:00
dannyrb	5a54564bff	A way to list linked packages	2019-09-06 10:05:02 -04:00
dannyrb	94b625d4e6	fix: viewer project should build output before publish	2019-09-06 09:51:45 -04:00
dannyrb	8f730a5124	Merge branch 'docs/monorepo-updates-3' of github.com:dannyrb/Viewers into docs/monorepo-updates-3	2019-09-06 09:45:26 -04:00
dannyrb	0ff4d90878	docs(contributing): react-vtkjs-viewport, tests	2019-09-06 09:45:13 -04:00
Danny Brown	a047994e3d	Merge branch 'master' into docs/monorepo-updates-3	2019-09-05 22:38:24 -04:00
dannyrb	672ad2d0e7	docs(contributing): example gif	2019-09-05 22:37:17 -04:00