From 45fb8adc5dd7a7bf209746ac9abf4f35c7bd36b5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 5 Jun 2020 15:52:31 +0100 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 6.2.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 361045bb..6eeb2609 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "6.2.0", + "matrix-js-sdk": "6.2.1", "matrix-react-sdk": "2.7.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index fbe577e0..22ab4c24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6976,6 +6976,21 @@ matrix-js-sdk@6.2.0: request "^2.88.0" unhomoglyph "^1.0.2" +matrix-js-sdk@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz#d5f76491a650c0a36fcdd078cff59f2da96edd7b" + integrity sha512-X12Y2SMg8MOJwE5P3VMsMV/mnQHOmyJkF+FZRida124w4B4tBJouaNxteYyYaH34w+wyaKGxuqEBXecfSpfvbw== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 21dd4c99f3aabed17ea78dd0bfff518298d98688 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 5 Jun 2020 15:53:38 +0100 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 2.7.1 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 6eeb2609..fc6fcaaf 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "6.2.1", - "matrix-react-sdk": "2.7.0", + "matrix-react-sdk": "2.7.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 22ab4c24..e39f4d64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6961,21 +6961,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0.tgz#b1aa6f23858ab3ee4b66be25d3e854f6e287d36b" - integrity sha512-dpx1EuJ98HtqE2YUeliTe9xjMOJlicJGRXa06Gr8RAL6WJM7buPgodOk0tRs461LzeilxmymqcGaB4og6o9RxA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-js-sdk@6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz#d5f76491a650c0a36fcdd078cff59f2da96edd7b" @@ -6999,10 +6984,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.7.0.tgz#b5ad66f97d7b127665578d11d3e84b6f39f5fdc9" - integrity sha512-GnH7eZt+ZQjCSqqa1lB1C1/gGKGVNeF0otlNI+7X1YKm1BFdOpUDYZ7UUxF7mT683Eum4B6YHil394eW/fLkIg== +matrix-react-sdk@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.7.1.tgz#bfde7e0d074769b209fa769d8dac6ad255c8b409" + integrity sha512-xf15VfHv/zoW1FnTdc7Dn0PITc8UuCqGlwCI2sMihp6kXrvsiUxaNkWTXzLbcwwX5Oahc3NQ7dkLaGB2AoXjIA== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7030,7 +7015,7 @@ matrix-react-sdk@2.7.0: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "6.2.0" + matrix-js-sdk "6.2.1" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From 758e2d6bfd08253f286da39fc0f415e727f97777 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 5 Jun 2020 15:57:45 +0100 Subject: [PATCH 3/4] Prepare changelog for v1.6.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e5801e5..7ce97bba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.4](https://github.com/vector-im/riot-web/releases/tag/v1.6.4) (2020-06-05) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.3...v1.6.4) + +* Upgrade to JS SDK 6.2.1 and React SDK 2.7.1 + Changes in [1.6.3](https://github.com/vector-im/riot-web/releases/tag/v1.6.3) (2020-06-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.3-rc.1...v1.6.3) From 3b28ebecefd5562df703e61f1a4009310117d0c9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 5 Jun 2020 15:57:45 +0100 Subject: [PATCH 4/4] v1.6.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc6fcaaf..9e969841 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.3", + "version": "1.6.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {