From 4c14f691c14cd29a3f4c4feebac3244ec78fbe67 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 11 Oct 2021 10:34:35 +0000
Subject: [PATCH 1/2] fix: update dependency history to v5

---
 packages/redux/package.json |  2 +-
 yarn.lock                   | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/redux/package.json b/packages/redux/package.json
index cf05b2b53..c0b8c6edb 100644
--- a/packages/redux/package.json
+++ b/packages/redux/package.json
@@ -24,7 +24,7 @@
     "displayName": "unit"
   },
   "dependencies": {
-    "history": "^4.10.1",
+    "history": "^5.0.0",
     "hops-mixin": "15.0.1",
     "prop-types": "^15.7.2"
   },
diff --git a/yarn.lock b/yarn.lock
index 0331652d1..15b1815cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1043,10 +1043,10 @@
     core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
-  integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -6898,7 +6898,7 @@ highlight.js@^10.7.1:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-history@^4.10.1, history@^4.9.0:
+history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
   integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
@@ -6910,6 +6910,13 @@ history@^4.10.1, history@^4.9.0:
     tiny-warning "^1.0.0"
     value-equal "^1.0.1"
 
+history@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.0.1.tgz#de35025ed08bce0db62364b47ebbf9d97b5eb06a"
+  integrity sha512-5qC/tFUKfVci5kzgRxZxN5Mf1CV8NmJx9ByaPX0YTLx5Vz3Svh7NYp6eA4CpDq4iA9D0C1t8BNIfvQIrUI3mVw==
+  dependencies:
+    "@babel/runtime" "^7.7.6"
+
 hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"

From 3285c5d81fa16f144aa66db6cfb59782458e4fd9 Mon Sep 17 00:00:00 2001
From: Robert Kowalski <robert.kowalski@new-work.se>
Date: Wed, 27 Oct 2021 14:44:58 +0200
Subject: [PATCH 2/2] fix: use parsePath instead of deprecated createLocation
 method

---
 packages/redux/action-creator-dispatcher/mixin.server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/redux/action-creator-dispatcher/mixin.server.js b/packages/redux/action-creator-dispatcher/mixin.server.js
index 623edc035..c28768ca1 100644
--- a/packages/redux/action-creator-dispatcher/mixin.server.js
+++ b/packages/redux/action-creator-dispatcher/mixin.server.js
@@ -1,4 +1,4 @@
-import { createLocation } from 'history';
+import { parsePath } from 'history';
 import { strategies } from 'hops-mixin';
 import ReduxActionCreatorCommonMixin from './mixin.runtime-common';
 
@@ -22,7 +22,7 @@ class ReduxActionCreatorServerMixin extends ReduxActionCreatorCommonMixin {
 
   async fetchData(data) {
     if (this.canPrefetchOnServer().every((value) => value)) {
-      await this.dispatchAll(createLocation(this.request.originalUrl));
+      await this.dispatchAll(parsePath(this.request.originalUrl));
       this.prefetchedOnServer = true;
     }
     return data;