othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into chore/core-cleanup

Browse Source
This commit is contained in:
Danny Brown 2019-08-16 14:04:12 -04:00 committed by GitHub
commit d0c0690e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 281 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
babel.config.js
View File

@ -22,6 +22,7 @@ module.exports = {
// https://babeljs.io/docs/en/options#babelrcroots
babelrcRoots: ['./platform/*', './extensions/*'],
plugins: [
'react-hot-loader/babel',
'inline-react-svg',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-object-rest-spread',

8
extensions/cornerstone/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.50.0-alpha.10...@ohif/extension-cornerstone@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-cornerstone
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@0.0.39-alpha.9...@ohif/extension-cornerstone@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-cornerstone

11
extensions/cornerstone/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "OHIF extension for Cornerstone",
"author": "OHIF",
"license": "MIT",
@ -8,8 +8,9 @@
"main": "dist/index.umd.js",
"module": "src/index.js",
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"files": [
"dist",
@ -27,8 +28,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "^0.50.0-alpha.0",
"@ohif/ui": "^0.50.0-alpha.0",
"@ohif/core": "^0.50.0",
"@ohif/ui": "^0.50.0",
"cornerstone-core": "^2.2.8",
"cornerstone-math": "^0.1.8",
"cornerstone-tools": "^3.1.0",

8
extensions/dicom-html/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.50.0-alpha.10...@ohif/extension-dicom-html@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-html
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@0.0.4-alpha.9...@ohif/extension-dicom-html@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-html

9
extensions/dicom-html/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-html",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "OHIF extension for rendering structured reports to HTML",
"author": "OHIF",
"license": "MIT",
@ -8,8 +8,9 @@
"main": "dist/index.umd.js",
"module": "src/index.js",
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"files": [
"dist",
@ -27,7 +28,7 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "^0.50.0-alpha.0",
"@ohif/core": "^0.50.0",
"dcmjs": "^0.3.3",
"prop-types": "^15.6.2",
"react": "^15.0.0 || ^16.0.0",

8
extensions/dicom-microscopy/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-microscopy@0.50.0-alpha.10...@ohif/extension-dicom-microscopy@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-microscopy
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-microscopy@0.0.9-alpha.9...@ohif/extension-dicom-microscopy@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-microscopy

9
extensions/dicom-microscopy/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-microscopy",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "OHIF extension for Dicom Microscopy",
"author": "OHIF",
"license": "MIT",
@ -15,8 +15,9 @@
"README.md"
],
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"scripts": {
"dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
@ -27,7 +28,7 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "^0.50.0-alpha.0",
"@ohif/core": "^0.50.0",
"react": "^15.0.0 || ^16.0.0",
"react-dom": "^15.0.0 || ^16.0.0"
},

8
extensions/dicom-pdf/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@0.50.0-alpha.10...@ohif/extension-dicom-pdf@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-pdf
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@0.0.8-alpha.9...@ohif/extension-dicom-pdf@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-dicom-pdf

9
extensions/dicom-pdf/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-pdf",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "OHIF extension for Dicom PDF",
"author": "OHIF",
"license": "MIT",
@ -11,8 +11,9 @@
"access": "public"
},
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"files": [
"dist",
@ -27,7 +28,7 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "^0.50.0-alpha.0",
"@ohif/core": "^0.50.0",
"dicom-parser": "^1.8.3",
"prop-types": "^15.6.2",
"react": "^15.0.0 || ^16.0.0",

19
extensions/vtk/CHANGELOG.md
View File

@ -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.
## [0.50.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.1...@ohif/extension-vtk@0.50.2) (2019-08-15)
### Bug Fixes
* Update vtk and viewport dependencies ([98c40bc](https://github.com/OHIF/Viewers/commit/98c40bc))
## [0.50.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.50.0-alpha.10...@ohif/extension-vtk@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-vtk
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.1.4-alpha.9...@ohif/extension-vtk@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/extension-vtk

23
extensions/vtk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/extension-vtk",
"version": "0.50.0-alpha.10",
"version": "0.50.2",
"description": "OHIF extension for VTK.js",
"author": "OHIF",
"license": "MIT",
@ -16,8 +16,9 @@
"README.md"
],
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"scripts": {
"dev": "webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
@ -28,9 +29,9 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "^0.50.0-alpha.0",
"@ohif/i18n": "^0.50.0-alpha.0",
"@ohif/ui": "^0.50.0-alpha.0",
"@ohif/core": "^0.50.0",
"@ohif/i18n": "^0.50.0",
"@ohif/ui": "^0.50.0",
"cornerstone-core": "^2.2.8",
"cornerstone-wado-image-loader": "^3.0.0",
"dcmjs": "^0.4.7",
@ -47,15 +48,15 @@
},
"dependencies": {
"@babel/runtime": "^7.5.5",
"react-vtkjs-viewport": "0.0.9",
"vtk.js": "^8.11.0"
"react-vtkjs-viewport": "0.0.11",
"vtk.js": "^9.5.0"
},
"devDependencies": {
"@ohif/core": "^0.50.0-alpha.10",
"@ohif/ui": "^0.50.0-alpha.10",
"@ohif/core": "^0.50.1",
"@ohif/ui": "^0.50.1",
"cornerstone-tools": "^3.13.0",
"cornerstone-wado-image-loader": "^3.0.0",
"dcmjs": "^0.4.7",
"dcmjs": "^0.5.1",
"dicom-parser": "^1.8.3",
"gh-pages": "^2.0.1",
"i18next": "^17.0.3",

8
package.json
View File

@ -6,9 +6,9 @@
"extensions/*"
],
"engines": {
"node": "^10.0.0",
"npm": "^6.0.0",
"yarn": "^1.16.0"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"scripts": {
"cm": "npx git-cz",
@ -70,7 +70,7 @@
"prettier": "^1.18.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-scripts": "^3.0.1",
"react-hot-loader": "^4.12.11",
"redux-testkit": "^1.0.6",
"shader-loader": "^1.3.1",
"style-loader": "^1.0.0",

8
platform/core/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/core@0.50.0-alpha.10...@ohif/core@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/core
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/core@0.11.1-alpha.9...@ohif/core@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/core

7
platform/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/core",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "Generic business logic for web-based medical imaging applications",
"author": "OHIF Core Team",
"license": "MIT",
@ -16,8 +16,9 @@
"README.md"
],
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"scripts": {
"dev": "jest --watchAll",

8
platform/i18n/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.50.0-alpha.11...@ohif/i18n@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/i18n
# [0.50.0-alpha.11](https://github.com/OHIF/Viewers/compare/@ohif/i18n@0.50.0-alpha.10...@ohif/i18n@0.50.0-alpha.11) (2019-08-14)

7
platform/i18n/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/i18n",
"version": "0.50.0-alpha.11",
"version": "0.50.1",
"description": "Internationalization library for The OHIF Viewer",
"author": "OHIF",
"license": "MIT",
@ -8,8 +8,9 @@
"main": "dist/index.umd.js",
"module": "src/index.js",
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"files": [
"dist",

8
platform/ui/CHANGELOG.md
View File

@ -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.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.50.0-alpha.10...@ohif/ui@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/ui
# [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.2.18-alpha.9...@ohif/ui@0.50.0-alpha.10) (2019-08-14)
**Note:** Version bump only for package @ohif/ui

7
platform/ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/ui",
"version": "0.50.0-alpha.10",
"version": "0.50.1",
"description": "A set of React components for Medical Imaging Viewers",
"author": "OHIF Contributors",
"license": "MIT",
@ -11,8 +11,9 @@
"access": "public"
},
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"files": [
"dist",

1
platform/viewer/.webpack/all.dev.js
View File

@ -57,6 +57,7 @@ module.exports = (env, argv) => {
],
// https://webpack.js.org/configuration/dev-server/
devServer: {
hot: true,
open: true,
port: 3000,
historyApiFallback: {

32
platform/viewer/CHANGELOG.md
View File

@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [0.50.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.2...@ohif/viewer@0.50.3) (2019-08-15)
**Note:** Version bump only for package @ohif/viewer
## [0.50.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.1...@ohif/viewer@0.50.2) (2019-08-15)
**Note:** Version bump only for package @ohif/viewer
## [0.50.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.0-alpha.13...@ohif/viewer@0.50.1) (2019-08-14)
**Note:** Version bump only for package @ohif/viewer
# [0.50.0-alpha.13](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.0-alpha.12...@ohif/viewer@0.50.0-alpha.13) (2019-08-14)
**Note:** Version bump only for package @ohif/viewer
# [0.50.0-alpha.12](https://github.com/OHIF/Viewers/compare/@ohif/viewer@0.50.0-alpha.11...@ohif/viewer@0.50.0-alpha.12) (2019-08-14)
**Note:** Version bump only for package @ohif/viewer

23
platform/viewer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ohif/viewer",
"version": "0.50.0-alpha.12",
"version": "0.50.3",
"description": "OHIF Viewer",
"author": "OHIF Contributors",
"license": "MIT",
@ -11,8 +11,9 @@
"access": "public"
},
"engines": {
"node": ">=8",
"npm": ">=5"
"node": ">=10",
"npm": ">=6",
"yarn": ">=1.16.0"
},
"proxy": "http://localhost:8042",
"scripts": {
@ -43,14 +44,14 @@
},
"dependencies": {
"@babel/runtime": "^7.5.5",
"@ohif/core": "^0.50.0-alpha.10",
"@ohif/extension-cornerstone": "^0.50.0-alpha.10",
"@ohif/extension-dicom-html": "^0.50.0-alpha.10",
"@ohif/extension-dicom-microscopy": "^0.50.0-alpha.10",
"@ohif/extension-dicom-pdf": "^0.50.0-alpha.10",
"@ohif/extension-vtk": "^0.50.0-alpha.10",
"@ohif/i18n": "^0.50.0-alpha.11",
"@ohif/ui": "^0.50.0-alpha.10",
"@ohif/core": "^0.50.1",
"@ohif/extension-cornerstone": "^0.50.1",
"@ohif/extension-dicom-html": "^0.50.1",
"@ohif/extension-dicom-microscopy": "^0.50.1",
"@ohif/extension-dicom-pdf": "^0.50.1",
"@ohif/extension-vtk": "^0.50.2",
"@ohif/i18n": "^0.50.1",
"@ohif/ui": "^0.50.1",
"@tanem/react-nprogress": "^1.1.25",
"classnames": "^2.2.6",
"core-js": "^3.1.4",

5
platform/viewer/src/App.js
View File

@ -1,4 +1,7 @@
import { hot } from 'react-hot-loader/root';
import './config';
// Polyfills
// PWA Only?
import 'core-js/features/array/flat';
@ -194,5 +197,5 @@ function _makeAbsoluteIfNecessary(url, base_url) {
return base_url + url;
}
export default App;
export default hot(App);
export { commandsManager, extensionManager, hotkeysManager };

2
platform/viewer/src/version.js
View File

@ -1 +1 @@
export default '0.0.50-alpha.0';
export default '0.0.50';

922
yarn.lock
View File

File diff suppressed because it is too large Load Diff