From b6e5faba1b1bd723e483b7bd8b72a90ca201dba9 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Thu, 30 May 2019 12:57:46 -0400 Subject: [PATCH] bumpity bump bump --- package.json | 4 ++-- src/App.js | 32 +++++++++++++++++--------------- yarn.lock | 28 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 58d58ab94..118ab4f58 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,8 @@ "dependencies": { "@babel/polyfill": "^7.2.5", "@babel/runtime": "^7.2.0", + "@ohif/extension-cornerstone": "0.0.34", + "@ohif/extension-vtk": "0.0.2", "classnames": "^2.2.6", "cornerstone-core": "^2.2.8", "cornerstone-math": "^0.1.8", @@ -78,11 +80,9 @@ "lodash.isequal": "4.5.0", "moment": "^2.24.0", "ohif-core": "0.5.5", - "ohif-cornerstone-extension": "0.0.33", "ohif-dicom-html-extension": "^0.0.2", "ohif-dicom-microscopy-extension": "^0.0.5", "ohif-dicom-pdf-extension": "^0.0.6", - "@ohif/extension-vtk": "0.0.2", "oidc-client": "1.7.x", "prop-types": "^15.6.2", "react-bootstrap-modal": "^4.2.0", diff --git a/src/App.js b/src/App.js index 9bc025631..2d73bb449 100644 --- a/src/App.js +++ b/src/App.js @@ -1,26 +1,28 @@ -import React, { Component } from 'react'; -import { BrowserRouter as Router } from 'react-router-dom'; -import { Provider } from 'react-redux'; -import { createStore, combineReducers } from 'redux'; -import PropTypes from 'prop-types'; -import OHIF from 'ohif-core'; import './config'; -import ui from './redux/ui.js'; -import OHIFStandaloneViewer from './OHIFStandaloneViewer'; -import WhiteLabellingContext from './WhiteLabellingContext'; -import OHIFCornerstoneExtension from 'ohif-cornerstone-extension'; -import OHIFVTKExtension from '@ohif/extension-vtk'; -import OHIFDicomPDFExtension from 'ohif-dicom-pdf-extension'; -import OHIFDicomHtmlExtension from 'ohif-dicom-html-extension'; -import OHIFDicomMicroscopyExtension from 'ohif-dicom-microscopy-extension'; + import { OidcProvider, reducer as oidcReducer } from 'redux-oidc'; +import React, { Component } from 'react'; +import { combineReducers, createStore } from 'redux'; import { getDefaultToolbarButtons, getUserManagerForOpenIdConnectClient, initWebWorkers, } from './utils/index.js'; -import setupTools from './setupTools'; + import ConnectedToolContextMenu from './connectedComponents/ConnectedToolContextMenu'; +import OHIF from 'ohif-core'; +import OHIFCornerstoneExtension from '@ohif/extension-cornerstone'; +import OHIFDicomHtmlExtension from 'ohif-dicom-html-extension'; +import OHIFDicomMicroscopyExtension from 'ohif-dicom-microscopy-extension'; +import OHIFDicomPDFExtension from 'ohif-dicom-pdf-extension'; +import OHIFStandaloneViewer from './OHIFStandaloneViewer'; +import OHIFVTKExtension from '@ohif/extension-vtk'; +import PropTypes from 'prop-types'; +import { Provider } from 'react-redux'; +import { BrowserRouter as Router } from 'react-router-dom'; +import WhiteLabellingContext from './WhiteLabellingContext'; +import setupTools from './setupTools'; +import ui from './redux/ui.js'; const { ExtensionManager } = OHIF.extensions; const { reducers, localStorage } = OHIF.redux; diff --git a/yarn.lock b/yarn.lock index b3a84281d..59e9d26f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1014,6 +1014,16 @@ universal-user-agent "^2.0.0" url-template "^2.0.8" +"@ohif/extension-cornerstone@0.0.34": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@ohif/extension-cornerstone/-/extension-cornerstone-0.0.34.tgz#b3e0ddd21e21f15b67ee1288dd83b833763cfa73" + integrity sha512-Q20FRXvyaeR8pgNJWPJ6oPrYgVtbO+CvAsn0TWqWvuMyuT1kGGlcmrGHjOt++dflx2Do7fVf/qCPFagHbrU9rA== + dependencies: + "@babel/runtime" "^7.2.0" + classnames "^2.2.6" + lodash.throttle "^4.1.1" + react-cornerstone-viewport "0.1.29" + "@ohif/extension-vtk@0.0.2": version "0.0.2" resolved "https://registry.yarnpkg.com/@ohif/extension-vtk/-/extension-vtk-0.0.2.tgz#99f0ea796ddae14d7e64cff958c0656b5d964f4e" @@ -9697,16 +9707,6 @@ ohif-core@0.5.5: lodash.merge "^4.6.1" validate.js "^0.12.0" -ohif-cornerstone-extension@0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.33.tgz#d93f433d21e005fc67f463730c5cdf3e2ef7ea9a" - integrity sha512-TOF1AZWlaI1/KErX8MHkvN6P6ts+Z2gC8tSn9ESF6xCEtQhZzurTpE7xrlUpaRrO3y++7Vs3kTrFu77Wroq41A== - dependencies: - "@babel/runtime" "^7.2.0" - classnames "^2.2.6" - lodash.throttle "^4.1.1" - react-cornerstone-viewport "0.1.28" - ohif-dicom-html-extension@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/ohif-dicom-html-extension/-/ohif-dicom-html-extension-0.0.2.tgz#5dd80836ee8f12f6ddf6de2b88c72af96d8c347b" @@ -11480,10 +11480,10 @@ react-bootstrap-modal@4.2.0, react-bootstrap-modal@^4.2.0: react-overlays "^0.8.0" react-transition-group "^2.0.0" -react-cornerstone-viewport@0.1.28: - version "0.1.28" - resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.28.tgz#ca1b0062c9f08868c653c11d6cdef8f5d519f90a" - integrity sha512-lGXFB1pxUJE+tozAHjQD8KcmnGuGG/nD3CGrK44cFqx8e3W/CKU9/bZM6qomy/X1fK5TlnJUaZ9NOCaDLhzJrQ== +react-cornerstone-viewport@0.1.29: + version "0.1.29" + resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.29.tgz#7ef3c2f3d7dc45339b14c17a53e05db367a28394" + integrity sha512-KUjdqjti53v4eNyFTT3tXJ4cTyb64eMW3QF1cQqd+1+Re8UXSF1+k9uku15vR/Qt/YOv9Bsh74PabBct7BxWog== dependencies: lodash.debounce "^4.0.8" moment "^2.23.0"