From 60dbcaf47d06e047708cea81f208e8f7f835bc01 Mon Sep 17 00:00:00 2001 From: Hannu Lyytikainen Date: Thu, 5 Jul 2018 13:13:47 +0300 Subject: [PATCH 1/2] Update Redux to v4 --- package.json | 2 +- yarn.lock | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 30c7d652b0..022339078d 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "react-moment-proptypes": "^1.5.0", "react-redux": "^5.0.7", "react-router-dom": "^4.2.2", - "redux": "^3.7.2", + "redux": "^4.0.0", "redux-thunk": "^2.2.0", "sanitize.css": "^5.0.0", "sharetribe-scripts": "1.1.2", diff --git a/yarn.lock b/yarn.lock index 28d73ec4fe..329a764c67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4876,10 +4876,6 @@ lodash-es@^4.17.5: version "4.17.8" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" -lodash-es@^4.2.1: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" - lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" @@ -4957,7 +4953,7 @@ lodash@^4.1.1, lodash@^4.17.5: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" -lodash@^4.15.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: +lodash@^4.15.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -7066,14 +7062,12 @@ redux-thunk@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5" -redux@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" +redux@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03" dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" loose-envify "^1.1.0" - symbol-observable "^1.0.3" + symbol-observable "^1.2.0" referrer-policy@1.1.0: version "1.1.0" @@ -8011,11 +8005,7 @@ sw-toolbox@^3.4.0: path-to-regexp "^1.0.1" serviceworker-cache-polyfill "^4.0.0" -symbol-observable@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" - -symbol-observable@^1.0.4: +symbol-observable@^1.0.4, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" From 5b84c2d1fe2dc858b3a31866dfbe00d2f03f4f91 Mon Sep 17 00:00:00 2001 From: Hannu Lyytikainen Date: Thu, 5 Jul 2018 14:01:48 +0300 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bae4402382..8e214ea465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ way to update this template, but currently, we follow a pattern: * [fix] Fix initial message input clearing too early in checkout page. [#861](https://github.com/sharetribe/flex-template-web/pull/861) * [fix] Fix setting Topbar search input initial value. +* [change] Update Redux to v4 + [#859](https://github.com/sharetribe/flex-template-web/pull/859) +* [fix] Fix setting Topbar search input initial value [#857](https://github.com/sharetribe/flex-template-web/pull/857) ## v1.1.0