From 710dc18f2c29a40c7be255a088d4d017c99b8478 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:33:28 +0100 Subject: [PATCH 1/9] Upgrade matrix-js-sdk to 6.1.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 11e7a31d9a..f3467e8603 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "favico.js": "^0.3.10", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "6.1.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "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 b27bdebbd9..d5dd1bf435 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6941,6 +6941,21 @@ 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.1.0-rc.1: + version "6.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3" + integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw== + 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@github:matrix-org/matrix-js-sdk#develop": version "6.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f120533fadb309ac5dc8b2bcb6882e784ba93f18" From fe32590e3052290b28d42772e4fff855c8a85449 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:35:02 +0100 Subject: [PATCH 2/9] Upgrade matrix-react-sdk to 2.6.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f3467e8603..babd0dd359 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "6.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "2.6.0-rc.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 d5dd1bf435..943e652940 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6956,20 +6956,6 @@ matrix-js-sdk@6.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "6.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f120533fadb309ac5dc8b2bcb6882e784ba93f18" - 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" @@ -6978,9 +6964,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "2.5.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/aa0c6f1f71a6122579c74f3cba3a7925f35131ac" +matrix-react-sdk@2.6.0-rc.1: + version "2.6.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.0-rc.1.tgz#391b3972741871ab11d9e3491686d3af9e57e255" + integrity sha512-FPqZRx3aKrw0X2dGujBylGIk2mGvnBvbY+iuK7HigiOE0zrPZwj2fvgNnv535Q/9vvmD9w+ppjnY5cakG7o+KA== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7007,7 +6994,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "6.1.0-rc.1" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From 8bf9635fc8b8e0271eb0c2bd1d72502ba20dee1f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:40:25 +0100 Subject: [PATCH 3/9] Remove Electron steps from release script --- release.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/release.sh b/release.sh index fada07f728..c5b4c164c8 100755 --- a/release.sh +++ b/release.sh @@ -45,6 +45,8 @@ do fi done +./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args" + release="${1#v}" tag="v${release}" prerelease=0 @@ -54,16 +56,6 @@ prerelease=0 # with a hyphen is a prerelease. echo $release | grep -q '-' && prerelease=1 -# bump Electron's package.json first -echo "electron yarn version" -cd electron_app -yarn version --no-git-tag-version --new-version "$release" -git commit package.json -m "$tag" - -cd .. - -./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args" - if [ $prerelease -eq 0 ] then # For a release, reset SDK deps back to the `develop` branch. From 475e7d0f3160c772efc34886fd55ce52ffa5264a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:53:00 +0100 Subject: [PATCH 4/9] Prepare changelog for v1.6.1-rc.1 --- CHANGELOG.md | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0871d5f8e..9fc5d7322d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,75 @@ +Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.1-rc.1) (2020-05-14) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0...v1.6.1-rc.1) + + * Upgrade to React SDK 2.6.0-rc.1 and JS SDK 6.1.0-rc.1 + * Update from Weblate + [\#13673](https://github.com/vector-im/riot-web/pull/13673) + * Add notranslate class to matrixchat to prevent translation by Google + Translate + [\#13669](https://github.com/vector-im/riot-web/pull/13669) + * Added Anchor Link to the development of matrix sdk + [\#13638](https://github.com/vector-im/riot-web/pull/13638) + * Prefetch the formatting button mask svg images + [\#13631](https://github.com/vector-im/riot-web/pull/13631) + * use a different image in previews + [\#13488](https://github.com/vector-im/riot-web/pull/13488) + * Update from Weblate + [\#13625](https://github.com/vector-im/riot-web/pull/13625) + * Remove electron_app as we now have riot-desktop repo + [\#13544](https://github.com/vector-im/riot-web/pull/13544) + * add new images for PWA icons + [\#13556](https://github.com/vector-im/riot-web/pull/13556) + * Remove unused feature flag from config + [\#13504](https://github.com/vector-im/riot-web/pull/13504) + * Update from Weblate + [\#13486](https://github.com/vector-im/riot-web/pull/13486) + * Developer tool: convert rageshake error locations back to sourcecode + locations + [\#13357](https://github.com/vector-im/riot-web/pull/13357) + * App load tweaks, improve error pages + [\#13329](https://github.com/vector-im/riot-web/pull/13329) + * Tweak default device name to be more compact + [\#13465](https://github.com/vector-im/riot-web/pull/13465) + * Tweak default device name on macOS + [\#13460](https://github.com/vector-im/riot-web/pull/13460) + * Update docs with custom theming changes + [\#13406](https://github.com/vector-im/riot-web/pull/13406) + * Update from Weblate + [\#13395](https://github.com/vector-im/riot-web/pull/13395) + * Remove docs and config for invite only padlocks + [\#13374](https://github.com/vector-im/riot-web/pull/13374) + * Revert "Add font scaling labs setting." + [\#13351](https://github.com/vector-im/riot-web/pull/13351) + * Expand feature flag docs to cover additional release channels + [\#13341](https://github.com/vector-im/riot-web/pull/13341) + * Optimized image assets by recompressing without affecting quality. + [\#13034](https://github.com/vector-im/riot-web/pull/13034) + * Add font scaling labs setting. + [\#13199](https://github.com/vector-im/riot-web/pull/13199) + * Remove encrypted message search feature flag + [\#13325](https://github.com/vector-im/riot-web/pull/13325) + * Fix `default_federate` settting description + [\#13312](https://github.com/vector-im/riot-web/pull/13312) + * Clarify that the .well-known method for Jitsi isn't available yet + [\#13314](https://github.com/vector-im/riot-web/pull/13314) + * add config option to tsc resolveJsonModule + [\#13296](https://github.com/vector-im/riot-web/pull/13296) + * Fix dispatcher import to be extension agnostic + [\#13297](https://github.com/vector-im/riot-web/pull/13297) + * Document more config options in config.md (fixes #13089) + [\#13260](https://github.com/vector-im/riot-web/pull/13260) + * Fix tests post-js-sdk-filters change + [\#13295](https://github.com/vector-im/riot-web/pull/13295) + * Make Jitsi download script a JS script + [\#13227](https://github.com/vector-im/riot-web/pull/13227) + * Use matrix-react-sdk type extensions as a base + [\#13271](https://github.com/vector-im/riot-web/pull/13271) + * Allow Riot Web to randomly pick welcome backgrounds + [\#13235](https://github.com/vector-im/riot-web/pull/13235) + * Update cross-signing feature docs and document fallback procedures + [\#13224](https://github.com/vector-im/riot-web/pull/13224) + Changes in [1.6.0](https://github.com/vector-im/riot-web/releases/tag/v1.6.0) (2020-05-05) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.6...v1.6.0) From f56ee6df34f3fb34a1e1daba9ea48b27dc58c122 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:53:00 +0100 Subject: [PATCH 5/9] v1.6.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index babd0dd359..4a3f4e077f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.0", + "version": "1.6.1-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From f35ec09b549894b32b6a4d77059d910a6ce0ad5b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:27:41 +0100 Subject: [PATCH 6/9] Upgrade matrix-js-sdk to 6.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a3f4e077f..74fb6339c8 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "favico.js": "^0.3.10", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "6.1.0-rc.1", + "matrix-js-sdk": "6.1.0", "matrix-react-sdk": "2.6.0-rc.1", "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 943e652940..fe0d514bea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6941,6 +6941,21 @@ 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.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee" + integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw== + 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.1.0-rc.1: version "6.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3" From a9fbc190bf5bdfb5165a07c5b64f2cb58810742a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:28:08 +0100 Subject: [PATCH 7/9] Upgrade matrix-react-sdk to 2.6.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 74fb6339c8..811777ad1c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "6.1.0", - "matrix-react-sdk": "2.6.0-rc.1", + "matrix-react-sdk": "2.6.0", "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 fe0d514bea..6f0c945a61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6956,21 +6956,6 @@ matrix-js-sdk@6.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@6.1.0-rc.1: - version "6.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3" - integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw== - 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" @@ -6979,10 +6964,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.6.0-rc.1: - version "2.6.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.0-rc.1.tgz#391b3972741871ab11d9e3491686d3af9e57e255" - integrity sha512-FPqZRx3aKrw0X2dGujBylGIk2mGvnBvbY+iuK7HigiOE0zrPZwj2fvgNnv535Q/9vvmD9w+ppjnY5cakG7o+KA== +matrix-react-sdk@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.0.tgz#8266aa32271565e0a2b475f6e65d7cb49bcb59b2" + integrity sha512-j4OOFRKrSoQqiePGwmy5sF6QhPADIqJX8ZOazim3szlXbsvP/SHxe1MHVqCFbikDpikIPBUKL2aradMavAziBw== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7009,7 +6994,7 @@ matrix-react-sdk@2.6.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "6.1.0-rc.1" + matrix-js-sdk "6.1.0" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From 02784379f85d37cea23728d53d2a1d0d07b4f414 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:31:35 +0100 Subject: [PATCH 8/9] Prepare changelog for v1.6.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fc5d7322d..90d1b826dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.1) (2020-05-19) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.1-rc.1...v1.6.1) + + * Upgrade to React SDK 2.6.0 and JS SDK 6.1.0 + Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.1-rc.1) (2020-05-14) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0...v1.6.1-rc.1) From 482d6a7fb379a982c184f970abc08290b28225de Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:31:35 +0100 Subject: [PATCH 9/9] v1.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 811777ad1c..931a1065be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.1-rc.1", + "version": "1.6.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {