Update packages

.gitignore

@@ -13,4 +13,5 @@ build
 .DS_Store
 .env
 npm-debug.log
-.idea
+.idea
+.eslintcache

package.json

@@ -3,29 +3,41 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "cross-env": "^5.1.4",
-    "react-scripts": "1.1.1"
+    "cross-env": "^7.0.3",
+    "react-scripts": "^4.0.1"
   },
   "dependencies": {
-    "history": "^4.6.3",
-    "marked": "^0.3.6",
+    "connected-react-router": "^6.8.0",
+    "history": "^4.10.1",
+    "marked": "^1.2.7",
     "prop-types": "^15.5.10",
-    "react": "^16.3.0",
-    "react-dom": "^16.3.0",
-    "react-redux": "^5.0.7",
-    "react-router": "^4.1.2",
-    "react-router-dom": "^4.1.2",
-    "react-router-redux": "^5.0.0-alpha.6",
-    "redux": "^3.6.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-redux": "^7.2.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
+    "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.2",
     "redux-logger": "^3.0.1",
-    "superagent": "^3.8.2",
+    "superagent": "^6.1.0",
     "superagent-promise": "^1.1.0"
   },
   "scripts": {
     "start": "cross-env PORT=4100 react-scripts start",
     "build": "react-scripts build",
     "test": "cross-env PORT=4100 react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   }
 }

src/components/App.js

@@ -13,7 +13,7 @@ import ProfileFavorites from '../components/ProfileFavorites';
 import Register from '../components/Register';
 import Settings from '../components/Settings';
 import { store } from '../store';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
 
 const mapStateToProps = state => {
   return {

src/index.js

@@ -4,7 +4,7 @@ import React from 'react';
 import { store, history} from './store';
 
 import { Route, Switch } from 'react-router-dom';
-import { ConnectedRouter } from 'react-router-redux';
+import { ConnectedRouter } from 'connected-react-router';
 
 import App from './components/App';
 

src/reducer.js

@@ -7,9 +7,9 @@ import editor from './reducers/editor';
 import home from './reducers/home';
 import profile from './reducers/profile';
 import settings from './reducers/settings';
-import { routerReducer } from 'react-router-redux';
+import { connectRouter } from 'connected-react-router'
 
-export default combineReducers({
+export default (history) => combineReducers({
   article,
   articleList,
   auth,
@@ -18,5 +18,5 @@ export default combineReducers({
   home,
   profile,
   settings,
-  router: routerReducer
+  router: connectRouter(history)
 });

src/store.js

@@ -2,12 +2,12 @@ import { applyMiddleware, createStore } from 'redux';
 import { createLogger } from 'redux-logger'
 import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
 import { promiseMiddleware, localStorageMiddleware } from './middleware';
-import reducer from './reducer';
+import createRootReducer from './reducer';
 
-import { routerMiddleware } from 'react-router-redux'
-import createHistory from 'history/createBrowserHistory';
+import { routerMiddleware } from 'connected-react-router'
+import { createBrowserHistory } from 'history';
 
-export const history = createHistory();
+export const history = createBrowserHistory();
 
 // Build the middleware for intercepting and dispatching navigation actions
 const myRouterMiddleware = routerMiddleware(history);
@@ -22,4 +22,4 @@ const getMiddleware = () => {
 };
 
 export const store = createStore(
-  reducer, composeWithDevTools(getMiddleware()));
+  createRootReducer(history), composeWithDevTools(getMiddleware()));