Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics
# Conflicts: # extensions/ohif-vtk-extension/package.json # extensions/ohif-vtk-extension/rollup.config.js # extensions/ohif-vtk-extension/yarn.lock # package.json # src/App.js # src/components/Header/Header.js # yarn.lock
This commit is contained in:
commit
0753e9ec3c
47 files changed
+740
-6555
No files matched your search
+8
-7
@@ -21,6 +21,7 @@
|
||||
"build:package:ci": "yarn run preBuild && node --max-old-space-size=4096 node_modules/rollup/bin/rollup -c",
|
||||
"build:web": "yarn run preBuild && react-scripts --max_old_space_size=4096 build",
|
||||
"build:web:ci": "yarn run preBuild && cross-env PUBLIC_URL=/demo REACT_APP_CONFIG=config/netlify.js react-scripts --max_old_space_size=4096 build && cpx 'build/**/*' docs/latest/_book/demo --verbose",
|
||||
"build:demo:ci": "yarn run preBuild && cross-env PUBLIC_URL=/ REACT_APP_CONFIG=config/public_dicomweb.js react-scripts --max_old_space_size=4096 build",
|
||||
"lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}",
|
||||
"test": "jest",
|
||||
"test:ci": "jest --ci --runInBand --collectCoverage --reporters=default --reporters=jest-junit && codecov",
|
||||
@@ -66,6 +67,10 @@
|
||||
"dependencies": {
|
||||
"@babel/polyfill": "^7.2.5",
|
||||
"@babel/runtime": "^7.2.0",
|
||||
"@ohif/extension-cornerstone": "0.0.34",
|
||||
"@ohif/extension-dicom-microscopy": "0.0.6",
|
||||
"@ohif/extension-vtk": "0.0.2",
|
||||
"@ohif/i18n": "file:.yalc/@ohif/i18n",
|
||||
"classnames": "^2.2.6",
|
||||
"cornerstone-core": "^2.2.8",
|
||||
"cornerstone-math": "^0.1.8",
|
||||
@@ -75,16 +80,12 @@
|
||||
"dicom-parser": "^1.8.3",
|
||||
"dicomweb-client": "^0.4.2",
|
||||
"hammerjs": "^2.0.8",
|
||||
"i18next": "^15.1.3",
|
||||
"i18next": "^17.0.3",
|
||||
"lodash.isequal": "4.5.0",
|
||||
"moment": "^2.24.0",
|
||||
"ohif-core": "0.5.5",
|
||||
"ohif-cornerstone-extension": "0.0.32",
|
||||
"ohif-core": "0.5.6",
|
||||
"ohif-dicom-html-extension": "^0.0.2",
|
||||
"ohif-dicom-microscopy-extension": "^0.0.5",
|
||||
"ohif-dicom-pdf-extension": "^0.0.6",
|
||||
"ohif-i18n": "file:.yalc/ohif-i18n",
|
||||
"ohif-vtk-extension": "file:.yalc/ohif-vtk-extension",
|
||||
"oidc-client": "1.7.x",
|
||||
"prop-types": "^15.6.2",
|
||||
"react-bootstrap-modal": "^4.2.0",
|
||||
@@ -95,7 +96,7 @@
|
||||
"react-resize-detector": "^3.4.0",
|
||||
"react-router": "^4.3.1",
|
||||
"react-router-dom": "^4.3.1",
|
||||
"react-viewerbase": "file:.yalc/react-viewerbase",
|
||||
"react-viewerbase": "0.7.0",
|
||||
"react-vtkjs-viewport": "^0.0.7",
|
||||
"redux": "^4.0.1",
|
||||
"redux-oidc": "3.1.x"
|
||||
|
||||
Reference in new issue
Block a user