Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: updated our redux version #1374

Merged
merged 40 commits into from
Nov 21, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
26db979
Merge pull request #1 from pattern-lab/dev
mfranzke Apr 24, 2020
7812878
Merge pull request #2 from pattern-lab/dev
mfranzke Apr 25, 2020
271dc8d
chore(docs): some typos
Apr 25, 2020
ccdf238
Revert "Merge pull request #2 from pattern-lab/dev"
Apr 25, 2020
4c2070f
Revert "Merge pull request #1 from pattern-lab/dev"
Apr 25, 2020
117ca22
Revert "chore(docs): some typos"
Apr 25, 2020
4f5bff6
Merge remote-tracking branch 'upstream/dev' into dev
Apr 28, 2020
73df9d3
Merge remote-tracking branch 'upstream/dev' into dev
Apr 30, 2020
9115c17
Merge remote-tracking branch 'upstream/dev' into dev
May 2, 2020
e86272f
Merge remote-tracking branch 'upstream/dev' into dev
May 8, 2020
a243f5d
Merge remote-tracking branch 'upstream/dev' into dev
May 11, 2020
3238ac7
Merge remote-tracking branch 'upstream/dev' into dev
May 23, 2020
7f4ba39
Merge remote-tracking branch 'upstream/dev' into dev
Jun 11, 2020
f7b514b
Merge remote-tracking branch 'upstream/dev' into dev
Jun 13, 2020
37f9749
Merge remote-tracking branch 'upstream/dev' into dev
Jun 28, 2020
572afec
Merge branch 'dev' of https://github.com/mfranzke/patternlab-node int…
Jun 28, 2020
e4a5245
Merge remote-tracking branch 'upstream/dev' into dev
Sep 6, 2020
4aa9366
Merge remote-tracking branch 'upstream/dev' into dev
Sep 11, 2020
155c253
Merge remote-tracking branch 'upstream/dev' into dev
Oct 11, 2020
3b95604
Merge remote-tracking branch 'upstream/dev' into dev
Jan 12, 2021
6b4a6fb
Merge remote-tracking branch 'upstream/dev' into dev
Feb 5, 2021
6431987
Merge remote-tracking branch 'upstream/dev' into dev
Feb 20, 2021
d486051
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 23, 2021
be17657
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 24, 2021
6c18bdc
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 26, 2021
46eb7dc
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 29, 2021
ce0dedd
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Apr 18, 2021
e536cb2
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke May 17, 2021
9b60cf2
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Aug 30, 2021
51c1d00
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 3, 2021
4617540
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 5, 2021
e3524db
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 6, 2021
20d3573
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Oct 16, 2021
47d0fad
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 3, 2021
fbf5f46
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 10, 2021
760eacd
refactor: updated our redux version, as redux-thunk introduced redux …
mfranzke Nov 13, 2021
da469b9
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Nov 21, 2021
aa64967
Merge branch 'dev' into refactor/updated-redux
mfranzke Nov 21, 2021
86baa4c
Merge branch 'dev' into refactor/updated-redux
mfranzke Nov 21, 2021
1b71d76
Revert "Merge branch 'dev' into refactor/updated-redux"
mfranzke Nov 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/uikit-workshop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,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-loader": "^10.1.1",
"scriptjs": "^2.5.9",
"scroll-js": "^2.2.0",
Expand Down
38 changes: 16 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -10388,11 +10395,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"
Expand Down Expand Up @@ -14071,20 +14073,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"
Expand Down Expand Up @@ -15912,11 +15911,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"
Expand Down