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:
romulo bordezani committed 2019-06-07 17:55:53 -03:00
commit 0753e9ec3c
47 files changed
+740 -6555

No files matched your search

+8 -7
View File
@@ -1,6 +1,6 @@
{
"name": "ohif-vtk-extension",
"version": "0.0.1",
"name": "@ohif/extension-vtk",
"version": "0.0.2",
"description": "OHIF extension for VTK.js",
"author": "OHIF",
"license": "MIT",
@@ -24,16 +24,14 @@
"dcmjs": "^0.3.6",
"dicom-parser": "^1.8.3",
"hammerjs": "^2.0.8",
"i18next": "^15.1.3",
"ohif-core": "^0.3.3",
"ohif-i18n": "file:.yalc/ohif-i18n",
"prop-types": "^15.6.2",
"react": "^15.0.0 || ^16.0.0",
"react-dom": "^15.0.0 || ^16.0.0",
"react-i18next": "^10.11.0",
"react-redux": "^6.0.0",
"react-resize-detector": "^3.4.0",
"react-viewerbase": "^0.6.1",
"react-viewerbase": "^0.6.0",
"redux": "^4.0.1"
},
"devDependencies": {
@@ -59,7 +57,6 @@
"rollup": "^1.1.2",
"rollup-plugin-babel": "^4.2.0",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-copy": "^2.0.1",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-peer-deps-external": "^2.2.0",
@@ -87,8 +84,12 @@
"not op_mini all"
],
"files": [
"dist"
"dist",
"README.md"
],
"publishConfig": {
"access": "public"
},
"dependencies": {
"@babel/runtime": "^7.2.0",
"classnames": "^2.2.6",