merge dashboard into dev

[bytom/bytom-electron.git] / package.json

diff --git a/package.json b/package.json
index 7bff20f..718a73a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -97,8 +97,8 @@
     "glob": "~7.1.2",
     "i18next": "^11.9.1",
     "i18next-browser-languagedetector": "^2.2.3",
-    "lodash": "~4.17.11",
     "log4js": "^3.0.5",
+    "lodash": "~4.17.14",
     "moment": "^2.22.1",
     "moment-timezone": "^0.5.17",
     "pluralize": "~3.0.0",
@@ -116,7 +116,7 @@
     "react-router": "~2.6.0",
     "react-router-redux": "~4.0.5",
     "react-router-scroll": "~0.3.2",
-    "redux": "~3.5.2",
+    "redux": "~4.0.4",
     "redux-form": "~5.3.6",
     "redux-thunk": "~2.1.0",
     "reselect": "^3.0.0",
@@ -135,26 +135,28 @@
     "babel-preset-react": "~6.5.0",
     "babel-preset-react-hmre": "~1.1.1",
     "bootstrap-loader": "~1.0.10",
-    "extend": "~3.0.2",
+    "braces": "^3.0.2",
     "chai": "~3.5.0",
     "chai-as-promised": "~6.0.0",
     "command-line-args": "~3.0.1",
     "command-line-commands": "~1.0.4",
-    "css-loader": "0.14.5",
+    "css-loader": "0.26.1",
     "electron": "~1.8.8",
     "electron-builder": "^20.10.0",
-    "eslint": "~3.7.0",
-    "eslint-plugin-react": "~6.4.0",
+    "eslint": "~4.18.2",
+    "eslint-plugin-react": "~7.14.2",
+    "extend": "~3.0.2",
     "file-loader": "~0.9.0",
-    "hjs-webpack": "~8.4.0",
+    "hjs-webpack": "~8.4.3",
+    "js-yaml": "^3.13.1",
     "json-loader": "~0.5.4",
     "nock": "~4.0.0",
-    "node-sass": "~3.8.0",
     "npm-run-all": "^4.1.2",
+    "node-sass": "~4.12.0",
     "postcss-loader": "~1.1.0",
     "react-hot-loader": "~1.3.0",
     "resolve-url-loader": "~1.6.0",
-    "sass-loader": "~4.0.0",
+    "sass-loader": "~7.1.0",
     "sass-resources-loader": "~1.1.0",
     "shelljs": "~0.7.4",
     "style-loader": "~0.13.1",