From d23b30023aa3c178748877aa64e5b8cad49b83fc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 15 Jun 2021 16:24:37 +0100
Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 12.0.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 bb8941b776..4e5ad7bf45 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
"highlight.js": "^10.5.0",
"jsrsasign": "^10.1.5",
"katex": "^0.12.0",
- "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+ "matrix-js-sdk": "12.0.0-rc.1",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.14",
"prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 433d599ee4..c4f15223d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7647,6 +7647,21 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
+matrix-js-sdk@12.0.0-rc.1:
+ version "12.0.0-rc.1"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6"
+ integrity sha512-bzozc4w9dF6Dl8xXXLXMpe3FqL/ncczKdB9Y8dL1mPaujVrmLWAai+BYmC9/c4SIw+1zUap9P5W16ej3z7prig==
+ dependencies:
+ "@babel/runtime" "^7.12.5"
+ another-json "^0.2.0"
+ browser-request "^0.3.3"
+ bs58 "^4.0.1"
+ content-type "^1.0.4"
+ loglevel "^1.7.1"
+ qs "^6.9.6"
+ request "^2.88.2"
+ unhomoglyph "^1.0.6"
+
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "11.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2"
From e98a1839789f3bfa81240cc31acfa6cb3d3307be Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 15 Jun 2021 17:26:25 +0100
Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.24.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 4e5ad7bf45..9cd5b7ea21 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"jsrsasign": "^10.1.5",
"katex": "^0.12.0",
"matrix-js-sdk": "12.0.0-rc.1",
- "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+ "matrix-react-sdk": "3.24.0-rc.1",
"matrix-widget-api": "^0.1.0-beta.14",
"prop-types": "^15.7.2",
"react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index c4f15223d6..ffe8fa48b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7662,20 +7662,6 @@ matrix-js-sdk@12.0.0-rc.1:
request "^2.88.2"
unhomoglyph "^1.0.6"
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "11.2.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2"
- dependencies:
- "@babel/runtime" "^7.12.5"
- another-json "^0.2.0"
- browser-request "^0.3.3"
- bs58 "^4.0.1"
- content-type "^1.0.4"
- loglevel "^1.7.1"
- qs "^6.9.6"
- request "^2.88.2"
- unhomoglyph "^1.0.6"
-
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"
@@ -7684,9 +7670,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 "3.23.0"
- resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3eca1cbec32c134869069def28fb0d85566607e7"
+matrix-react-sdk@3.24.0-rc.1:
+ version "3.24.0-rc.1"
+ resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0-rc.1.tgz#8711f3ebff35f9fb45c04215306cd56ccf5ffaf0"
+ integrity sha512-9flNCgR3qZgy1kd3x9k0n9+iz2ug9AK7omsBF3drJF8/F9b0lcgAz+ktvYynWeq/kf05tvi593KDegI7j4Bynw==
dependencies:
"@babel/runtime" "^7.12.5"
await-lock "^2.1.0"
@@ -7713,7 +7700,7 @@ matrix-mock-request@^1.2.3:
katex "^0.12.0"
linkifyjs "^2.1.9"
lodash "^4.17.20"
- matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+ matrix-js-sdk "12.0.0-rc.1"
matrix-widget-api "^0.1.0-beta.14"
minimist "^1.2.5"
opus-recorder "^8.0.3"
From 446833d931ec076737123ff20d844d2df0d473b0 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 15 Jun 2021 17:29:00 +0100
Subject: [PATCH 3/8] Prepare changelog for v1.7.31-rc.1
---
CHANGELOG.md | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7719bc65d3..d82a648545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+Changes in [1.7.31-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.31-rc.1) (2021-06-15)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30...v1.7.31-rc.1)
+
+ * Upgrade to React SDK 3.24.0-rc.1 and JS SDK 12.0.0-rc.1
+ * Translations update from Weblate
+ [\#17655](https://github.com/vector-im/element-web/pull/17655)
+ * Upgrade matrix-react-test-utils for React 17 peer deps
+ [\#17653](https://github.com/vector-im/element-web/pull/17653)
+ * Fix lint errors in Webpack config
+ [\#17626](https://github.com/vector-im/element-web/pull/17626)
+ * Preload only `woff2` fonts
+ [\#17614](https://github.com/vector-im/element-web/pull/17614)
+ * ⚛️ Upgrade to React@17
+ [\#17601](https://github.com/vector-im/element-web/pull/17601)
+
Changes in [1.7.30](https://github.com/vector-im/element-web/releases/tag/v1.7.30) (2021-06-07)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30-rc.1...v1.7.30)
From 673a5ccc9e8982c7ec38dab5b94ff26fcbe0026a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 15 Jun 2021 17:29:00 +0100
Subject: [PATCH 4/8] v1.7.31-rc.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9cd5b7ea21..2ea67a86d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "element-web",
- "version": "1.7.30",
+ "version": "1.7.31-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
From 57090243e141221e3012fc55404706141eae2928 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 21 Jun 2021 16:57:52 +0100
Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 12.0.0
---
package.json | 2 +-
yarn.lock | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2ea67a86d9..f3c578a2ac 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
"highlight.js": "^10.5.0",
"jsrsasign": "^10.1.5",
"katex": "^0.12.0",
- "matrix-js-sdk": "12.0.0-rc.1",
+ "matrix-js-sdk": "12.0.0",
"matrix-react-sdk": "3.24.0-rc.1",
"matrix-widget-api": "^0.1.0-beta.14",
"prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index ffe8fa48b8..0350660cd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7647,6 +7647,21 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
+matrix-js-sdk@12.0.0:
+ version "12.0.0"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0.tgz#8ee7cc37661476341d0c792a1a12bc78b19f9fdd"
+ integrity sha512-DHeq87Sx9Dv37FYyvZkmA1VYsQUNaVgc3QzMUkFwoHt1T4EZzgyYpdsp3uYruJzUW0ACvVJcwFdrU4e1VS97dQ==
+ dependencies:
+ "@babel/runtime" "^7.12.5"
+ another-json "^0.2.0"
+ browser-request "^0.3.3"
+ bs58 "^4.0.1"
+ content-type "^1.0.4"
+ loglevel "^1.7.1"
+ qs "^6.9.6"
+ request "^2.88.2"
+ unhomoglyph "^1.0.6"
+
matrix-js-sdk@12.0.0-rc.1:
version "12.0.0-rc.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6"
From 1b48f4857aafab46b7e2819cee61444b54c1eff0 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 21 Jun 2021 16:58:14 +0100
Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.24.0
---
package.json | 2 +-
yarn.lock | 25 +++++--------------------
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/package.json b/package.json
index f3c578a2ac..b978a43914 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"jsrsasign": "^10.1.5",
"katex": "^0.12.0",
"matrix-js-sdk": "12.0.0",
- "matrix-react-sdk": "3.24.0-rc.1",
+ "matrix-react-sdk": "3.24.0",
"matrix-widget-api": "^0.1.0-beta.14",
"prop-types": "^15.7.2",
"react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 0350660cd9..6396ba990e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7662,21 +7662,6 @@ matrix-js-sdk@12.0.0:
request "^2.88.2"
unhomoglyph "^1.0.6"
-matrix-js-sdk@12.0.0-rc.1:
- version "12.0.0-rc.1"
- resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6"
- integrity sha512-bzozc4w9dF6Dl8xXXLXMpe3FqL/ncczKdB9Y8dL1mPaujVrmLWAai+BYmC9/c4SIw+1zUap9P5W16ej3z7prig==
- dependencies:
- "@babel/runtime" "^7.12.5"
- another-json "^0.2.0"
- browser-request "^0.3.3"
- bs58 "^4.0.1"
- content-type "^1.0.4"
- loglevel "^1.7.1"
- qs "^6.9.6"
- request "^2.88.2"
- unhomoglyph "^1.0.6"
-
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"
@@ -7685,10 +7670,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
-matrix-react-sdk@3.24.0-rc.1:
- version "3.24.0-rc.1"
- resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0-rc.1.tgz#8711f3ebff35f9fb45c04215306cd56ccf5ffaf0"
- integrity sha512-9flNCgR3qZgy1kd3x9k0n9+iz2ug9AK7omsBF3drJF8/F9b0lcgAz+ktvYynWeq/kf05tvi593KDegI7j4Bynw==
+matrix-react-sdk@3.24.0:
+ version "3.24.0"
+ resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0.tgz#da312338d790c7d4d8166ac2d5df983bda2e5445"
+ integrity sha512-I53P7ArdqfSLFrXB2jpb5ne8lvmw9uVYWhhvFaWgHIE1fuiTowx0SZaAl5bDH1XddHIbLwL+y8BsX95Yo5F7zQ==
dependencies:
"@babel/runtime" "^7.12.5"
await-lock "^2.1.0"
@@ -7715,7 +7700,7 @@ matrix-react-sdk@3.24.0-rc.1:
katex "^0.12.0"
linkifyjs "^2.1.9"
lodash "^4.17.20"
- matrix-js-sdk "12.0.0-rc.1"
+ matrix-js-sdk "12.0.0"
matrix-widget-api "^0.1.0-beta.14"
minimist "^1.2.5"
opus-recorder "^8.0.3"
From 01c84212f9aa9933a4fad56f31fd7e87a9958c0c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 21 Jun 2021 17:00:59 +0100
Subject: [PATCH 7/8] Prepare changelog for v1.7.31
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d82a648545..c15c742f92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.7.31](https://github.com/vector-im/element-web/releases/tag/v1.7.31) (2021-06-21)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.31-rc.1...v1.7.31)
+
+ * Upgrade to React SDK 3.24.0 and JS SDK 12.0.0
+
Changes in [1.7.31-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.31-rc.1) (2021-06-15)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30...v1.7.31-rc.1)
From e02d17a6cc162709971c1e2194c6cc73429145de Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 21 Jun 2021 17:01:00 +0100
Subject: [PATCH 8/8] v1.7.31
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index b978a43914..2ac5ea1db7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "element-web",
- "version": "1.7.31-rc.1",
+ "version": "1.7.31",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {