From a75ee0dd587b558651400a4bfd6134ae174b10de Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com>
Date: Sun, 21 Nov 2021 16:03:59 +0100
Subject: [PATCH] refactor: updated our redux version (#1374)

* chore(docs): some typos

missed to replace mustache initially and incorrect handlebars two times (both in package name and URL)

* Revert "Merge pull request #2 from pattern-lab/dev"

This reverts commit 78128780bcffee78c1bc63368b91d429500a928c, reversing
changes made to 26db9797d9fb0ddf1530c938a3225ac26b0a5e61.

* Revert "Merge pull request #1 from pattern-lab/dev"

This reverts commit 26db9797d9fb0ddf1530c938a3225ac26b0a5e61, reversing
changes made to fc90750635eac88ece724b97ae74949ebd98aec9.

* Revert "chore(docs): some typos"

This reverts commit 271dc8d5eeea53b78651333e97ad171c305a2eaa.

* refactor: updated our redux version, as redux-thunk introduced redux 4 as a peerDependency with a minor update

* Revert "Merge branch 'dev' into refactor/updated-redux"

This reverts commit 86baa4cda8aab3a683e394f45b91500b88072b5e, reversing
changes made to aa6496734ab0c55d7e6f809f1b5ad54cfda80c3c.

Co-authored-by: Maximilian <mfr@nzke.net>
---
 packages/uikit-workshop/package.json |  4 +--
 yarn.lock                            | 38 ++++++++++++----------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json
index c4d659db1..482951623 100644
--- a/packages/uikit-workshop/package.json
+++ b/packages/uikit-workshop/package.json
@@ -90,8 +90,8 @@
     "react-autosuggest": "^9.4.2",
     "react-dom": "^16.8.6",
     "react-html-parser": "^2.0.2",
-    "redux": "3.7.2",
-    "redux-thunk": "^2.3.0",
+    "redux": "4.1.2",
+    "redux-thunk": "^2.4.0",
     "sass": "1.43.4",
     "sass-loader": "^10.1.1",
     "scriptjs": "^2.5.9",
diff --git a/yarn.lock b/yarn.lock
index 17203c476..a7f8fb92f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1020,6 +1020,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.9.2":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
+  integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.12.13", "@babel/template@^7.4.0":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
@@ -10297,11 +10304,6 @@ locutus@^2.0.11:
   dependencies:
     es6-promise "^4.2.5"
 
-lodash-es@^4.2.1:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
@@ -13881,20 +13883,17 @@ reduce-without@^1.0.1:
   dependencies:
     test-value "^2.0.0"
 
-redux-thunk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
-  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
+redux-thunk@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.0.tgz#ac89e1d6b9bdb9ee49ce69a69071be41bbd82d67"
+  integrity sha512-/y6ZKQNU/0u8Bm7ROLq9Pt/7lU93cT0IucYMrubo89ENjxPa7i8pqLKu6V4X7/TvYovQ6x01unTeyeZ9lgXiTA==
 
-redux@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
-  integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
+redux@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
+  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
   dependencies:
-    lodash "^4.2.1"
-    lodash-es "^4.2.1"
-    loose-envify "^1.1.0"
-    symbol-observable "^1.0.3"
+    "@babel/runtime" "^7.9.2"
 
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
@@ -15674,11 +15673,6 @@ symbol-observable@1.0.1:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
   integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
-symbol-observable@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"