chore(release): publish [skip ci]

- @ohif/extension-lesion-tracker@0.1.0 - @ohif/viewer@3.5.0
feat: lesion-tracker extension (#1420 )
2020-02-06 19:07:34 +00:00 · 2020-02-06 14:04:18 -05:00 · 2020-02-06 02:56:29 +00:00 · 2020-02-05 21:54:57 -05:00
19 changed files with 672 additions and 125 deletions
@@ -0,0 +1,8 @@
+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 });
+};
@@ -0,0 +1,38 @@
+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: 'OHIFExtLesionTracker',
+      libraryTarget: 'umd',
+      libraryExport: 'default',
+      filename: pkg.main,
+    },
+  });
+};
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0 (2020-02-06)
+
+
+### Features
+
+* lesion-tracker extension ([#1420](https://github.com/OHIF/Viewers/issues/1420)) ([73e4409](https://github.com/OHIF/Viewers/commit/73e440968ce4699d081a9c9f2d21dd68095b3056))
@@ -0,0 +1,21 @@
+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.
@@ -0,0 +1,38 @@
+# @ohif/extension-lesion-tracker
+
+This project is an OHIF extension that can be used with the Core OHIF Platform,
+either at runtime, or as an ES6 dependency, to create a medical image viewing
+application similar to that of the [legacy Lesion
+Tracker][legacy-lesion-tracker] viewer.
+
+## About
+
+...
+
+## Scope
+
+...
+
+### Configuration
+
+...
+
+### Extensions
+
+...
+
+## Build & Deploy
+
+...
+
+## Funding/Support
+
+...
+
+<!--
+  LINKS
+  -->
+
+<!-- prettier-ignore-start -->
+[legacy-lesion-tracker]: http://lesiontracker.ohif.org/studylist
+<!-- prettier-ignore-end -->
@@ -0,0 +1,40 @@
+{
+  "name": "@ohif/extension-lesion-tracker",
+  "version": "0.1.0",
+  "description": "OHIF extension for Lesion Tracker",
+  "author": "OHIF",
+  "license": "MIT",
+  "repository": "OHIF/Viewers",
+  "main": "dist/index.umd.js",
+  "module": "src/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=10",
+    "npm": ">=6",
+    "yarn": ">=1.16.0"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev:lesion-tracker": "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",
+    "prop-types": "^15.6.2",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.5.5",
+    "classnames": "^2.2.6"
+  }
+}
@@ -0,0 +1,101 @@
+// SEE: Async imports (code-splitting)
+// import asyncComponent from './asyncComponent.js';
+// import OHIFDicomPDFSopClassHandler from './OHIFDicomPDFSopClassHandler.js';
+
+// const ConnectedOHIFDicomPDFViewer = asyncComponent(() =>
+//   import(
+//     /* webpackChunkName: "ConnectedOHIFDicomPDFViewer" */ './ConnectedOHIFDicomPDFViewer'
+//   )
+// );
+
+export default {
+  /**
+   * Only required property. Should be a unique value across all extensions.
+   */
+  id: 'lesion-tracker',
+
+  /**
+   * @param {object} params
+   * @param {ServicesManager} params.servicesManager
+   * @param {CommandsManager} params.commandsManager
+   */
+  getPanelModule({ servicesManager, commandsManager }) {
+    return undefined;
+    // {
+    // TODO:
+    // - Right, alternative StudyBrowser
+    // - Left, alternative Measurements Table
+    // menuOptions: [
+    //   {
+    //     // A suggested icon
+    //     // Available icons determined by consuming app
+    //     icon: 'list',
+    //     // A suggested label
+    //     label: 'Magic',
+    //     // 'right' or 'left'
+    //     from: 'right',
+    //     // The target component to toggle open/close
+    //     target: 'target-component-id',
+    //     // Overrides `defaultContext`, if specified
+    //     context: ['ACTIVE_VIEWPORT:MAGIC'],
+    //   },
+    // ],
+    // components: [
+    //   {
+    //     id: 'target-component-id',
+    //     component: MyComponent,
+    //   },
+    // ],
+    // defaultContext: ['ROUTE:VIEWER'],
+    // };
+  },
+
+  /**
+   * @param {object} params
+   * @param {ServicesManager} params.servicesManager
+   * @param {CommandsManager} params.commandsManager
+   * @returns Object
+   */
+  getToolbarModule({ servicesManager, commandsManager }) {
+    // TODO: Zoom, Levels, Pan, More (see lesiontracker.ohif.org)
+    // These may be driven through configuration of `cornerstone` extension instead of defined here
+    return {
+      definitions: [
+        {
+          id: 'say-hell-world',
+          label: '🎉 HELLO WORLD 🎉',
+          icon: 'exclamation-triangle',
+          type: 'command',
+          commandName: 'sayHelloWorld',
+        },
+      ],
+      defaultContext: 'VIEWER',
+    };
+  },
+
+  /**
+   * @param {object} params
+   * @param {ServicesManager} params.servicesManager
+   * @param {CommandsManager} params.commandsManager
+   * @returns Object
+   */
+  getCommandsModule({ servicesManager }) {
+    const { UINotificationService } = servicesManager.services;
+    return {
+      definitions: {
+        sayHelloWorld: {
+          commandFn: function() {
+            console.log(UINotificationService);
+            UINotificationService.show({
+              title: 'What does a nosey pepper do?',
+              message: 'Gets jalapeno business!',
+            });
+          },
+          storeContexts: [],
+          options: {},
+        },
+      },
+      defaultContext: ['VIEWER'],
+    };
+  },
+};
@@ -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.

+## [1.2.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.2.13...@ohif/extension-vtk@1.2.14) (2020-02-06)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.2.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.2.12...@ohif/extension-vtk@1.2.13) (2020-01-30)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.2.13",
+  "version": "1.2.14",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -52,7 +52,7 @@
    "react-vtkjs-viewport": "^0.8.3"
  },
  "devDependencies": {
-    "@ohif/core": "^2.3.7",
+    "@ohif/core": "^2.3.8",
    "@ohif/ui": "^1.1.9",
    "cornerstone-tools": "^4.12.0",
    "cornerstone-wado-image-loader": "^3.0.0",
@@ -13,11 +13,13 @@
  "scripts": {
    "cm": "npx git-cz",
    "build": "lerna run build:viewer --stream",
+    "build:lt": "lerna run build:viewer:lesion-tracker --stream",
    "build:ci": "lerna run build:viewer:ci --stream",
    "build:demo": "lerna run build:viewer:demo --stream",
    "build:package": "lerna run build:viewer:package --stream",
    "build:package-all": "lerna run build:package --parallel --stream",
    "dev": "lerna run dev:viewer --stream",
+    "dev:lt": "lerna run dev:viewer:lesion-tracker --stream",
    "dev:project": ".scripts/dev.sh",
    "dev:orthanc": "lerna run dev:orthanc --stream",
    "orthanc:up": "docker-compose -f .docker/Nginx-Orthanc/docker-compose.yml up",
@@ -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.

+## [2.3.8](https://github.com/OHIF/Viewers/compare/@ohif/core@2.3.7...@ohif/core@2.3.8) (2020-02-06)
+
+
+### Bug Fixes
+
+* Remove trash data from redux storage after updates ([#1358](https://github.com/OHIF/Viewers/issues/1358)) ([7b2d44f](https://github.com/OHIF/Viewers/commit/7b2d44f2c18241ea521b8d3652aee32e36eaddb8))
+
+
+
+
+
 ## [2.3.7](https://github.com/OHIF/Viewers/compare/@ohif/core@2.3.6...@ohif/core@2.3.7) (2020-01-30)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.3.7",
+  "version": "2.3.8",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -11,20 +11,63 @@ import {
  SET_VIEWPORT_LAYOUT_AND_DATA,
 } from './../constants/ActionTypes.js';

-const DEFAULT_STATE = {
+export const DEFAULT_STATE = {
  numRows: 1,
  numColumns: 1,
  activeViewportIndex: 0,
  layout: {
-    viewports: [
-      {
-        // plugin: 'cornerstone',
-      },
-    ],
+    viewports: [{}],
  },
  viewportSpecificData: {},
 };

+/**
+ *  Take the new number of rows and columns, delete all not used viewport data and also set
+ *  active viewport as default in case current one is not available anymore.
+ *
+ * @param {Number} numRows
+ * @param {Number} numColumns
+ * @param {Object} currentViewportSpecificData
+ * @returns
+ */
+const findActiveViewportSpecificData = (
+  numRows,
+  numColumns,
+  currentViewportSpecificData = {}
+) => {
+  const numberOfViewports = numRows * numColumns;
+  const viewportSpecificData = cloneDeep(currentViewportSpecificData);
+
+  if (numberOfViewports < Object.keys(viewportSpecificData).length) {
+    Object.keys(viewportSpecificData).forEach(key => {
+      if (key > numberOfViewports - 1) {
+        delete viewportSpecificData[key];
+      }
+    });
+  }
+
+  return viewportSpecificData;
+};
+/**
+ *  Take new number of rows and columns and make sure the current active viewport index is still available, if not, return the default
+ *
+ * @param {Number} numRows
+ * @param {Number} numColumns
+ * @param {Number} currentActiveViewportIndex
+ * @returns
+ */
+const getActiveViewportIndex = (
+  numRows,
+  numColumns,
+  currentActiveViewportIndex
+) => {
+  const numberOfViewports = numRows * numColumns;
+
+  return currentActiveViewportIndex > numberOfViewports - 1
+    ? DEFAULT_STATE.activeViewportIndex
+    : currentActiveViewportIndex;
+};
+
 /**
 * The definition of a viewport action.
 *
@@ -50,7 +93,12 @@ const viewports = (state = DEFAULT_STATE, action) => {
     * @return {Object} New state.
     */
    case SET_VIEWPORT_ACTIVE: {
-      return { ...state, activeViewportIndex: action.viewportIndex };
+      const activeViewportIndex = getActiveViewportIndex(
+        state.numRows,
+        state.numColumns,
+        action.viewportIndex
+      );
+      return { ...state, activeViewportIndex };
    }

    /**
@@ -59,11 +107,25 @@ const viewports = (state = DEFAULT_STATE, action) => {
     * @return {Object} New state.
     */
    case SET_VIEWPORT_LAYOUT: {
+      const { numRows, numColumns } = action;
+      const viewportSpecificData = findActiveViewportSpecificData(
+        numRows,
+        numColumns,
+        state.viewportSpecificData
+      );
+      const activeViewportIndex = getActiveViewportIndex(
+        numRows,
+        numColumns,
+        state.activeViewportIndex
+      );
+
      return {
        ...state,
        numRows: action.numRows,
        numColumns: action.numColumns,
        layout: { viewports: [...action.viewports] },
+        viewportSpecificData,
+        activeViewportIndex,
      };
    }

@@ -73,12 +135,25 @@ const viewports = (state = DEFAULT_STATE, action) => {
     * @return {Object} New state.
     */
    case SET_VIEWPORT_LAYOUT_AND_DATA: {
+      const { numRows, numColumns } = action;
+      const viewportSpecificData = findActiveViewportSpecificData(
+        numRows,
+        numColumns,
+        action.viewportSpecificData
+      );
+      const activeViewportIndex = getActiveViewportIndex(
+        numRows,
+        numColumns,
+        state.activeViewportIndex
+      );
+
      return {
        ...state,
        numRows: action.numRows,
        numColumns: action.numColumns,
        layout: { viewports: [...action.viewports] },
-        viewportSpecificData: cloneDeep(action.viewportSpecificData),
+        viewportSpecificData,
+        activeViewportIndex,
      };
    }

@@ -1,35 +1,61 @@
-// https://medium.com/@netxm/testing-redux-reducers-with-jest-6653abbfe3e1
-import reducer from './viewports.js';
+import { Reducer } from 'redux-testkit';
+
+import reducer, { DEFAULT_STATE } from './viewports.js';
 import * as types from './../constants/ActionTypes.js';

 describe('viewports reducer', () => {
  it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual({
-      activeViewportIndex: 0,
-      numRows: 1,
-      numColumns: 1,
-      layout: {
-        viewports: [{}],
-      },
-      viewportSpecificData: {},
-    });
+    expect(reducer(undefined, {})).toEqual(DEFAULT_STATE);
  });

-  it('should handle SET_VIEWPORT_ACTIVE', () => {
-    const setViewportActiveAction = {
+  it('should handle SET_VIEWPORT_ACTIVE with inexistent viewport index', () => {
+    const initialState = {
+      numRows: 4,
+      numColumns: 4,
+      activeViewportIndex: 0,
+    };
+
+    const action = {
      type: types.SET_VIEWPORT_ACTIVE,
      viewportIndex: 100,
    };

-    const updatedState = reducer({}, setViewportActiveAction);
+    const expectedToChangeInState = {
+      activeViewportIndex: 0,
+    };

-    expect(updatedState.activeViewportIndex).toEqual(
-      setViewportActiveAction.viewportIndex
-    );
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toChangeInState(expectedToChangeInState);
+  });
+
+  it('should handle SET_VIEWPORT_ACTIVE with existent viewport index', () => {
+    const initialState = {
+      numRows: 4,
+      numColumns: 4,
+      activeViewportIndex: 0,
+    };
+
+    const action = {
+      type: types.SET_VIEWPORT_ACTIVE,
+      viewportIndex: 5,
+    };
+
+    const expectedToChangeInState = {
+      activeViewportIndex: 5,
+    };
+
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toChangeInState(expectedToChangeInState);
  });

  it('should handle SET_VIEWPORT_LAYOUT', () => {
-    const setViewportLayoutAction = {
+    const initialState = DEFAULT_STATE;
+
+    const action = {
      type: types.SET_VIEWPORT_LAYOUT,
      numRows: 1,
      numColumns: 2,
@@ -43,18 +69,193 @@ describe('viewports reducer', () => {
      ],
    };

-    const updatedState = reducer({}, setViewportLayoutAction);
+    const expectedToChangeInState = {
+      numRows: 1,
+      numColumns: 2,
+      layout: {
+        viewports: [
+          {
+            plugin: 'cornerstone',
+          },
+          {
+            plugin: 'vtk',
+          },
+        ],
+      },
+    };

-    expect(updatedState.numRows).toEqual(setViewportLayoutAction.numRows);
-    expect(updatedState.numColumns).toEqual(setViewportLayoutAction.numColumns);
-    expect(updatedState.layout.viewports).toEqual(
-      setViewportLayoutAction.viewports
-    );
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toChangeInState(expectedToChangeInState);
+  });
+
+  it('should handle SET_VIEWPORT_LAYOUT when we reduce the number of viewports', () => {
+    const initialState = {
+      numRows: 1,
+      numColumns: 2,
+      viewportSpecificData: {
+        0: { viewportData0: 'viewportData0' },
+        1: { viewportData1: 'viewportData1' },
+      },
+      layout: {
+        viewports: [],
+      },
+      activeViewportIndex: 0,
+    };
+
+    const action = {
+      type: types.SET_VIEWPORT_LAYOUT,
+      numRows: 1,
+      numColumns: 1,
+      viewports: [],
+    };
+
+    const expectedState = {
+      numRows: 1,
+      numColumns: 1,
+      viewportSpecificData: {
+        0: { viewportData0: 'viewportData0' },
+      },
+      layout: {
+        viewports: [],
+      },
+      activeViewportIndex: 0,
+    };
+
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toReturnState(expectedState);
+  });
+
+  it('should handle SET_VIEWPORT_LAYOUT_AND_DATA', () => {
+    const initialState = {
+      numRows: 1,
+      numColumns: 1,
+      viewportSpecificData: {
+        0: { viewportData0: 'data0' },
+      },
+      layout: {
+        viewports: [{ plugin: 'cornerstone' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    const action = {
+      type: types.SET_VIEWPORT_LAYOUT_AND_DATA,
+      numRows: 1,
+      numColumns: 2,
+      viewports: [{ plugin: 'cornerstone' }, { plugin: 'cornerstone' }],
+      viewportSpecificData: {
+        0: { viewportData0: 'NEWdata0' },
+        1: { viewportData1: 'NEWdata1' },
+      },
+    };
+
+    const expectedState = {
+      numRows: 1,
+      numColumns: 2,
+      viewportSpecificData: {
+        0: { viewportData0: 'NEWdata0' },
+        1: { viewportData1: 'NEWdata1' },
+      },
+      layout: {
+        viewports: [{ plugin: 'cornerstone' }, { plugin: 'cornerstone' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toReturnState(expectedState);
+  });
+
+  it('should handle SET_VIEWPORT_LAYOUT_AND_DATA when we reduce the number of viewports', () => {
+    const initialState = {
+      numRows: 1,
+      numColumns: 3,
+      viewportSpecificData: {
+        0: { viewportData0: 'vtkData0' },
+        1: { viewportData1: 'vtkData1' },
+        2: { viewportData2: 'vtkData2' },
+      },
+      layout: {
+        viewports: [{ plugin: 'vtk' }, { plugin: 'vtk' }, { plugin: 'vtk' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    const action = {
+      type: types.SET_VIEWPORT_LAYOUT_AND_DATA,
+      numRows: 1,
+      numColumns: 1,
+      viewports: [{ plugin: 'cornerstone' }],
+      viewportSpecificData: {
+        0: { viewportData0: 'cornerstoneData0' },
+      },
+    };
+
+    const expectedState = {
+      numRows: 1,
+      numColumns: 1,
+      viewportSpecificData: {
+        0: { viewportData0: 'cornerstoneData0' },
+      },
+      layout: {
+        viewports: [{ plugin: 'cornerstone' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toReturnState(expectedState);
+  });
+
+  it('should handle SET_VIEWPORT when we only set one viewport specific data', () => {
+    const initialState = {
+      numRows: 1,
+      numColumns: 2,
+      viewportSpecificData: {
+        0: { viewportData0: 'data0' },
+        1: { viewportData1: 'data1' },
+      },
+      layout: {
+        viewports: [{ plugin: 'cornerstone' }, { plugin: 'cornerstone' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    const action = {
+      type: types.SET_VIEWPORT,
+      viewportIndex: 1,
+      viewportSpecificData: {
+        viewportData1: 'NEWdata1',
+      },
+    };
+
+    const expectedState = {
+      numRows: 1,
+      numColumns: 2,
+      viewportSpecificData: {
+        0: { viewportData0: 'data0' },
+        1: { viewportData1: 'NEWdata1' },
+      },
+      layout: {
+        viewports: [{ plugin: 'cornerstone' }, { plugin: 'cornerstone' }],
+      },
+      activeViewportIndex: 0,
+    };
+
+    Reducer(reducer)
+      .withState(initialState)
+      .expect(action)
+      .toReturnState(expectedState);
  });

-  // If there were previous keys, this would have
-  // "merge" behavior, not a clear & set
-  // May be worth another test?
  it('should handle SET_VIEWPORT', () => {
    const viewportToSet = 0;
    const setViewportAction = {
@@ -26,6 +26,7 @@ const PUBLIC_URL = process.env.PUBLIC_URL || '/';
 const APP_CONFIG = process.env.APP_CONFIG || 'config/default.js';
 const PROXY_TARGET = process.env.PROXY_TARGET;
 const PROXY_DOMAIN = process.env.PROXY_DOMAIN;
+const ENTRY_TARGET = process.env.ENTRY_TARGET || `${SRC_DIR}/index.js`;

 module.exports = (env, argv) => {
  const baseConfig = webpackBase(env, argv, { SRC_DIR, DIST_DIR });
@@ -33,6 +34,9 @@ module.exports = (env, argv) => {
  const hasProxy = PROXY_TARGET && PROXY_DOMAIN;

  const mergedConfig = merge(baseConfig, {
+    entry: {
+      app: ENTRY_TARGET,
+    },
    output: {
      path: DIST_DIR,
      filename: isProdBuild ? '[name].bundle.[chunkhash].js' : '[name].js',
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [3.5.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.4.14...@ohif/viewer@3.5.0) (2020-02-06)
+
+
+### Features
+
+* lesion-tracker extension ([#1420](https://github.com/OHIF/Viewers/issues/1420)) ([73e4409](https://github.com/OHIF/Viewers/commit/73e440968ce4699d081a9c9f2d21dd68095b3056))
+
+
+
+
+
+## [3.4.14](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.4.13...@ohif/viewer@3.4.14) (2020-02-06)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [3.4.13](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.4.12...@ohif/viewer@3.4.13) (2020-01-30)

 **Note:** Version bump only for package @ohif/viewer
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.4.13",
+  "version": "3.5.0",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -19,12 +19,14 @@
  "scripts": {
    "build:package": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.commonjs.js --progress",
    "build:viewer": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js --progress",
+    "build:viewer:lesion-tracker": "cross-env ENTRY_TARGET=index-lesion-tracker.js NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js --progress",
    "build:viewer:ci": "cross-env NODE_ENV=production PUBLIC_URL=/pwa/ APP_CONFIG=config/netlify.js QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
    "build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --progress --config .webpack/webpack.pwa.js",
    "build:viewer:package": "yarn run build:package",
    "dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js --watch",
    "dev:orthanc": "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 --watch",
    "dev:viewer": "yarn run dev",
+    "dev:viewer:lesion-tracker": "cross-env ENTRY_TARGET=index-lesion-tracker.js NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js --watch",
    "start": "yarn run dev",
    "test:e2e": "cypress open",
    "test:e2e:ci": "percy exec -- cypress run --config video=false --record --browser chrome --spec 'cypress/integration/visual-regression/**/*'",
@@ -45,12 +47,13 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.3.7",
+    "@ohif/core": "^2.3.8",
    "@ohif/extension-cornerstone": "^2.2.2",
    "@ohif/extension-dicom-html": "^1.1.0",
    "@ohif/extension-dicom-microscopy": "^0.50.6",
    "@ohif/extension-dicom-pdf": "^1.0.1",
-    "@ohif/extension-vtk": "^1.2.13",
+    "@ohif/extension-lesion-tracker": "^0.1.0",
+    "@ohif/extension-vtk": "^1.2.14",
    "@ohif/i18n": "^0.52.5",
    "@ohif/ui": "^1.1.9",
    "@tanem/react-nprogress": "^1.1.25",
@@ -0,0 +1,46 @@
+/**
+ * Entry point for development and production PWA builds.
+ * Packaged (NPM) builds go through `index-umd.js`
+ */
+
+import 'regenerator-runtime/runtime';
+
+import App from './App.js';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+/**
+ * EXTENSIONS
+ * =================
+ *
+ * Importing and modifying the extensions our app uses HERE allows us to leverage
+ * tree shaking and a few other niceties. However, by including them here they become
+ * "baked in" to the published application.
+ *
+ * Depending on your use case/needs, you may want to consider not adding any extensions
+ * by default HERE, and instead provide them via the extensions configuration key or
+ * by using the exported `App` component, and passing in your extensions as props using
+ * the defaultExtensions property.
+ */
+import OHIFLesionTrackerExtension from '@ohif/extension-lesion-tracker';
+import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
+
+/*
+ * Default Settings
+ */
+let config = {};
+
+if (window) {
+  config = window.config || {};
+}
+
+const appProps = {
+  config,
+  defaultExtensions: [OHIFLesionTrackerExtension, OHIFDicomPDFExtension],
+};
+
+/** Create App */
+const app = React.createElement(App, appProps, null);
+
+/** Render */
+ReactDOM.render(app, document.getElementById('root'));
@@ -1100,34 +1100,13 @@
    pirates "^4.0.0"
    source-map-support "^0.5.9"

-"@babel/runtime@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
-  integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205"
-  integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5":
+"@babel/runtime@7.1.2", "@babel/runtime@7.5.5", "@babel/runtime@7.6.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3":
  version "7.5.5"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
  integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
  dependencies:
    regenerator-runtime "^0.13.2"

-"@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
-  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
  version "7.6.0"
  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
@@ -1283,54 +1262,6 @@
    unique-filename "^1.1.1"
    which "^1.3.1"

-"@ffmpeg-installer/darwin-x64@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/darwin-x64/-/darwin-x64-4.1.0.tgz#48e1706c690e628148482bfb64acb67472089aaa"
-  integrity sha512-Z4EyG3cIFjdhlY8wI9aLUXuH8nVt7E9SlMVZtWvSPnm2sm37/yC2CwjUzyCQbJbySnef1tQwGG2Sx+uWhd9IAw==
-
-"@ffmpeg-installer/ffmpeg@1.0.20":
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/ffmpeg/-/ffmpeg-1.0.20.tgz#d3c9c2bbcd76149468fb0886c2b3fe9e4795490b"
-  integrity sha512-wbgd//6OdwbFXYgV68ZyKrIcozEQpUKlvV66XHaqO2h3sFbX0jYLzx62Q0v8UcFWN21LoxT98NU2P+K0OWsKNA==
-  optionalDependencies:
-    "@ffmpeg-installer/darwin-x64" "4.1.0"
-    "@ffmpeg-installer/linux-arm" "4.1.3"
-    "@ffmpeg-installer/linux-arm64" "4.1.4"
-    "@ffmpeg-installer/linux-ia32" "4.1.0"
-    "@ffmpeg-installer/linux-x64" "4.1.0"
-    "@ffmpeg-installer/win32-ia32" "4.1.0"
-    "@ffmpeg-installer/win32-x64" "4.1.0"
-
-"@ffmpeg-installer/linux-arm64@4.1.4":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/linux-arm64/-/linux-arm64-4.1.4.tgz#7219f3f901bb67f7926cb060b56b6974a6cad29f"
-  integrity sha512-dljEqAOD0oIM6O6DxBW9US/FkvqvQwgJ2lGHOwHDDwu/pX8+V0YsDL1xqHbj1DMX/+nP9rxw7G7gcUvGspSoKg==
-
-"@ffmpeg-installer/linux-arm@4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/linux-arm/-/linux-arm-4.1.3.tgz#c554f105ed5f10475ec25d7bec94926ce18db4c1"
-  integrity sha512-NDf5V6l8AfzZ8WzUGZ5mV8O/xMzRag2ETR6+TlGIsMHp81agx51cqpPItXPib/nAZYmo55Bl2L6/WOMI3A5YRg==
-
-"@ffmpeg-installer/linux-ia32@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/linux-ia32/-/linux-ia32-4.1.0.tgz#adad70b0d0d9d8d813983d6e683c5a338a75e442"
-  integrity sha512-0LWyFQnPf+Ij9GQGD034hS6A90URNu9HCtQ5cTqo5MxOEc7Rd8gLXrJvn++UmxhU0J5RyRE9KRYstdCVUjkNOQ==
-
-"@ffmpeg-installer/linux-x64@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/linux-x64/-/linux-x64-4.1.0.tgz#b4a5d89c4e12e6d9306dbcdc573df716ec1c4323"
-  integrity sha512-Y5BWhGLU/WpQjOArNIgXD3z5mxxdV8c41C+U15nsE5yF8tVcdCGet5zPs5Zy3Ta6bU7haGpIzryutqCGQA/W8A==
-
-"@ffmpeg-installer/win32-ia32@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/win32-ia32/-/win32-ia32-4.1.0.tgz#6eac4fb691b64c02e7a116c1e2d167f3e9b40638"
-  integrity sha512-FV2D7RlaZv/lrtdhaQ4oETwoFUsUjlUiasiZLDxhEUPdNDWcH1OU9K1xTvqz+OXLdsmYelUDuBS/zkMOTtlUAw==
-
-"@ffmpeg-installer/win32-x64@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@ffmpeg-installer/win32-x64/-/win32-x64-4.1.0.tgz#17e8699b5798d4c60e36e2d6326a8ebe5e95a2c5"
-  integrity sha512-Drt5u2vzDnIONf4ZEkKtFlbvwj6rI3kxw1Ck9fpudmtgaZIHD4ucsWB2lCZBXRxJgXR+2IMSti+4rtM4C4rXgg==
-
 "@hapi/address@2.x.x":
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
@@ -11845,11 +11776,6 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=

-lodash@4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
 lodash@4.17.15, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.1.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
  version "4.17.15"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -15681,10 +15607,10 @@ react-transition-group@^4.1.1:
    loose-envify "^1.4.0"
    prop-types "^15.6.2"

-react-vtkjs-viewport@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.8.2.tgz#cdccf156cb089d32b935ebc3dc5f31213ba17bef"
-  integrity sha512-2OPbU5y4ay+E6qfZw4sW19uqfBnNw9kAF1PaZ/Sk5XMEEKnebplEof9ZZtE6nhPImFqMCfu4TXzYVHIAPmwFYA==
+react-vtkjs-viewport@^0.8.3:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.8.4.tgz#6bd9837d7762b845e77f053fb8fbf4469428d594"
+  integrity sha512-b90ENJzmStiahxVox+7mMwZij3NVUu//jE07PV2Qtp6E7q/eLXn6ZUwcEt9w5YHN36xLZVcx9b53ztLcXVgh/Q==
  dependencies:
    date-fns "^2.2.1"
    gl-matrix "^3.1.0"
@@ -16059,11 +15985,6 @@ regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==

-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
 regenerator-runtime@^0.13.1, regenerator-runtime@^0.13.2:
  version "0.13.3"
  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
Author	SHA1	Message	Date
ohif-bot	a4c9a86772	chore(release): publish [skip ci] - @ohif/extension-lesion-tracker@0.1.0 - @ohif/viewer@3.5.0	2020-02-06 19:07:34 +00:00
Danny Brown	73e440968c	feat: lesion-tracker extension (#1420 ) * chore: init lesion-tracker extension * chore: dev build for lesion-tracker extension * fix: a more appropriate library name * chore: fix script naming	2020-02-06 14:04:18 -05:00
ohif-bot	3f7eb8a5d3	chore(release): publish [skip ci] - @ohif/extension-vtk@1.2.14 - @ohif/core@2.3.8 - @ohif/viewer@3.4.14	2020-02-06 02:56:29 +00:00
Gustavo André LelisandDanny Brown	7b2d44f2c1	fix: Remove trash data from redux storage after updates (#1358 ) * Remove tash data from redux storage after updates * Imprelemnted more unit tests * Remove missing comment Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>	2020-02-05 21:54:57 -05:00