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

+11 -2
View File
@@ -1,6 +1,6 @@
{
"name": "ohif-i18n",
"version": "0.0.1",
"name": "@ohif/i18n",
"version": "0.0.2",
"description": "OHIF extension for internationalization",
"author": "OHIF",
"license": "MIT",
@@ -17,6 +17,8 @@
"prepublishOnly": "npm run build"
},
"peerDependencies": {
"react": "^16.0.0",
"react-dom": "^16.0.0",
"i18next": "^15.1.3",
"react-i18next": "^10.11.0"
},
@@ -35,8 +37,12 @@
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.11.1",
"husky": "^1.3.1",
"i18next": "^15.1.3",
"lint-staged": "^8.1.0",
"prettier": "^1.15.3",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-i18next": "^10.11.0",
"rollup": "^1.1.2",
"rollup-plugin-babel": "^4.2.0",
"rollup-plugin-commonjs": "^9.2.0",
@@ -67,6 +73,9 @@
"files": [
"dist"
],
"publishConfig": {
"access": "public"
},
"dependencies": {
"@babel/runtime": "^7.2.0",
"classnames": "^2.2.6"