Merge branch 'master' into 13797-refactoring

[arvados-workbench2.git] / package.json

diff --git a/package.json b/package.json
index 3fde318978b857db6dbe4f99cd89df02f6e9bbae..0c06a6f17a357115da8c6897f0f159de7da51084 100644 (file)
--- a/package.json
+++ b/package.json
@@ -3,15 +3,22 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "1.0.0",
-    "react": "16.3.2",
-    "react-dom": "16.3.2",
+    "@material-ui/core": "1.4.0",
+    "@material-ui/icons": "1.1.0",
+    "@types/lodash": "4.14.112",
+    "axios": "0.18.0",
+    "classnames": "2.2.6",
+    "lodash": "4.17.10",
+    "react": "16.4.1",
+    "react-dom": "16.4.1",
     "react-redux": "5.0.7",
-    "react-router": "4.2.0",
+    "react-router": "4.3.1",
+    "react-router-dom": "4.3.1",
+    "react-router-redux": "5.0.0-alpha.9",
     "react-scripts-ts": "2.16.0",
     "redux": "4.0.0",
-    "redux-devtools": "3.4.1",
-    "typesafe-actions": "2.0.3"
+    "redux-thunk": "2.3.0",
+    "unionize": "2.1.2"
   },
   "scripts": {
     "start": "react-scripts-ts start",
@@ -21,14 +28,24 @@
     "lint": "tslint src/** -t verbose"
   },
   "devDependencies": {
-    "@types/jest": "22.2.3",
-    "@types/node": "10.1.2",
-    "@types/react": "16.3.14",
-    "@types/react-dom": "16.0.5",
-    "@types/react-redux": "6.0.0",
-    "@types/react-router": "4.0.25",
+    "@types/classnames": "^2.2.4",
+    "@types/enzyme": "3.1.12",
+    "@types/enzyme-adapter-react-16": "1.0.2",
+    "@types/jest": "23.3.0",
+    "@types/node": "10.5.2",
+    "@types/react": "16.4",
+    "@types/react-dom": "16.0.6",
+    "@types/react-redux": "6.0.4",
+    "@types/react-router": "4.0.29",
+    "@types/react-router-dom": "4.2.7",
+    "@types/react-router-redux": "5.0.15",
     "@types/redux-devtools": "3.0.44",
-    "typescript": "2.8.3"
+    "axios-mock-adapter": "1.15.0",
+    "enzyme": "3.3.0",
+    "enzyme-adapter-react-16": "1.1.1",
+    "jest-localstorage-mock": "2.2.0",
+    "redux-devtools": "3.4.1",
+    "typescript": "2.9.2"
   },
   "moduleNameMapper": {
     "^~/(.*)$": "<rootDir>/src/$1"