Merge branch 'master' into fix-search-issue-unicode

# Conflicts:
#	browser/main/TopBar/index.js
#	yarn.lock

package.json

@@ -8,11 +8,11 @@
   "scripts": {
     "start": "electron ./index.js",
     "compile": "grunt compile",
-    "test": "PWD=$(pwd) NODE_ENV=test ava --serial",
+    "test": "cross-env NODE_ENV=test ava --serial",
     "jest": "jest",
     "fix": "eslint . --fix",
     "lint": "eslint .",
-    "dev": "node dev-scripts/dev.js",
+    "dev": "cross-env NODE_ENV=development node dev-scripts/dev.js",
     "watch": "webpack-dev-server --hot"
   },
   "config": {
@@ -59,6 +59,7 @@
     "chart.js": "^2.7.2",
     "codemirror": "^5.40.2",
     "codemirror-mode-elixir": "^1.1.1",
+    "connected-react-router": "^6.4.0",
     "electron-config": "^1.0.0",
     "electron-gh-releases": "^2.0.4",
     "escape-string-regexp": "^1.0.5",
@@ -97,16 +98,19 @@
     "mousetrap": "^1.6.2",
     "mousetrap-global-bind": "^1.1.0",
     "node-ipc": "^8.1.0",
+    "prop-types": "^15.7.2",
+    "query-string": "^6.5.0",
     "raphael": "^2.2.7",
-    "react": "^15.5.4",
+    "react": "^16.8.6",
     "react-autosuggest": "^9.4.0",
-    "react-codemirror": "^0.3.0",
+    "react-codemirror": "^1.0.0",
     "react-color": "^2.2.2",
     "react-composition-input": "^1.1.1",
     "react-debounce-render": "^4.0.1",
-    "react-dom": "^15.0.2",
+    "react-dom": "^16.8.6",
     "react-image-carousel": "^2.0.18",
-    "react-redux": "^4.4.5",
+    "react-redux": "^7.0.3",
+    "react-router-dom": "^5.0.0",
     "react-sortable-hoc": "^0.6.7",
     "react-transition-group": "^2.5.0",
     "redux": "^3.5.2",
@@ -135,11 +139,14 @@
     "color": "^3.0.0",
     "concurrently": "^3.4.0",
     "copy-to-clipboard": "^3.0.6",
+    "cross-env": "^5.2.0",
     "css": "^2.2.4",
     "css-loader": "^0.19.0",
     "devtron": "^1.1.0",
     "dom-storage": "^2.0.2",
     "electron": "3.0.8",
+    "electron-debug": "^2.2.0",
+    "electron-devtools-installer": "^2.2.4",
     "electron-packager": "^12.2.0",
     "eslint": "^3.13.1",
     "eslint-config-standard": "^6.2.1",
@@ -149,7 +156,7 @@
     "faker": "^3.1.0",
     "grunt": "^0.4.5",
     "grunt-electron-installer": "2.1.0",
-    "history": "^1.17.0",
+    "history": "^4.9.0",
     "husky": "^1.1.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^22.4.3",
@@ -160,11 +167,12 @@
     "merge-stream": "^1.0.0",
     "mock-require": "^3.0.1",
     "nib": "^1.1.0",
-    "react-css-modules": "^3.7.6",
+    "react-css-modules": "^4.7.9",
     "react-input-autosize": "^1.1.0",
-    "react-router": "^2.4.0",
-    "react-router-redux": "^4.0.4",
-    "react-test-renderer": "^15.6.2",
+    "react-test-renderer": "^16.8.6",
+    "redux-devtools": "^3.5.0",
+    "redux-devtools-dock-monitor": "^1.1.3",
+    "redux-devtools-log-monitor": "^1.4.0",
     "signale": "^1.2.1",
     "standard": "^8.4.0",
     "style-loader": "^0.12.4",