From 93bb526d5894fc5b90f0d848e57703e9863bb7b6 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 28 Mar 2021 13:45:12 +0200
Subject: [PATCH] Update libs

---
 webapp/package-lock.json | 43 +++++++++++++++++++++++++++++++---------
 webapp/package.json      |  2 +-
 webapp/src/index.tsx     |  6 +++---
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index c12237b..adb2144 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -7199,16 +7199,11 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "history": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.0.0.tgz",
+      "integrity": "sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
-        "loose-envify": "^1.2.0",
-        "resolve-pathname": "^3.0.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0",
-        "value-equal": "^1.0.1"
+        "@babel/runtime": "^7.7.6"
       }
     },
     "hmac-drbg": {
@@ -12797,6 +12792,21 @@
         "react-is": "^16.6.0",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "history": {
+          "version": "4.10.1",
+          "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+          "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+          "requires": {
+            "@babel/runtime": "^7.1.2",
+            "loose-envify": "^1.2.0",
+            "resolve-pathname": "^3.0.0",
+            "tiny-invariant": "^1.0.2",
+            "tiny-warning": "^1.0.0",
+            "value-equal": "^1.0.1"
+          }
+        }
       }
     },
     "react-router-dom": {
@@ -12811,6 +12821,21 @@
         "react-router": "5.2.0",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "history": {
+          "version": "4.10.1",
+          "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+          "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+          "requires": {
+            "@babel/runtime": "^7.1.2",
+            "loose-envify": "^1.2.0",
+            "resolve-pathname": "^3.0.0",
+            "tiny-invariant": "^1.0.2",
+            "tiny-warning": "^1.0.0",
+            "value-equal": "^1.0.1"
+          }
+        }
       }
     },
     "react-scripts": {
diff --git a/webapp/package.json b/webapp/package.json
index 6cf72ed..5e0bd11 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -15,7 +15,7 @@
     "@types/yup": "^0.29.11",
     "connected-react-router": "^6.9.1",
     "formik": "^2.2.6",
-    "history": "^4.10.1",
+    "history": "^5.0.0",
     "query-string": "^7.0.0",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/webapp/src/index.tsx b/webapp/src/index.tsx
index be7e13a..c035ebd 100644
--- a/webapp/src/index.tsx
+++ b/webapp/src/index.tsx
@@ -3,14 +3,14 @@ import ReactDOM from 'react-dom';
 import App from './App';
 import { Provider } from 'react-redux'
 import * as serviceWorker from './serviceWorker';
-import configureStore, { history } from './configureStore'
-import { Router } from 'react-router-dom'
+import configureStore from './configureStore'
+import { BrowserRouter as Router } from 'react-router-dom'
 
 const store = configureStore()
 
 ReactDOM.render(
     <Provider store={store}>
-        <Router history={history}>
+        <Router >
             <App application={{ mode: "", workspaces: [], memberships: [], messages: [], subscriptions: [] }} />
         </Router>
     </Provider>