From d4638f88259765d654a8eb816ace8af463bb4b3a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 14 Jul 2021 17:20:15 +0100 Subject: [PATCH 1/7] Bump to RC versions of js-sdk and react-sdk --- package.json | 4 ++-- yarn.lock | 32 +++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index e9e5660b79..55a896dbd9 100644 --- a/package.json +++ b/package.json @@ -60,8 +60,8 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "12.1.0-rc.1", + "matrix-react-sdk": "3.26.0-rc.1", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 3e5cba0398..6f5a18b1bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2407,6 +2407,11 @@ bluebird@^3.5.0, bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +blurhash@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e" + integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw== + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" @@ -7274,9 +7279,10 @@ 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, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "12.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/284e2bb911d2dffeff4c819436d1fde20d56646b" +matrix-js-sdk@12.1.0-rc.1: + version "12.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0-rc.1.tgz#4bc4e2342525c622e1a87b264e6f55560632b90c" + integrity sha512-F7d1e1Bm8zZqXkTKIyNeT4uA85u65nfrW2b8NwDMV+gtKNF0DOzUfUzOGD7CnjJKpyKNTQluUiwka+bXiGAVkw== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" @@ -7297,12 +7303,14 @@ 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.24.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e290fdaabcb0259b26412b34b3ec4cd11e76164a" +matrix-react-sdk@3.26.0-rc.1: + version "3.26.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.26.0-rc.1.tgz#d4f14eeba572eafb03fa3d2904d56029e3a3f241" + integrity sha512-S/FGXAPJpaY/EUkQS27FhXKQ4NPR2YBSLYEyxeGywHzQlkvieYzK9eNPpLOrXVMCYbCm/SLV4r3nwWV3tJ5m7w== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" + blurhash "^1.1.3" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" cheerio "^1.0.0-rc.9" @@ -7326,8 +7334,8 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "12.0.0" - matrix-widget-api "^0.1.0-beta.14" + matrix-js-sdk "12.1.0-rc.1" + matrix-widget-api "^0.1.0-beta.15" minimist "^1.2.5" opus-recorder "^8.0.3" pako "^2.0.3" @@ -7337,7 +7345,8 @@ matrix-mock-request@^1.2.3: qrcode "^1.4.4" re-resizable "^6.9.0" react "^17.0.2" - react-beautiful-dnd "^4.0.1" + react-beautiful-dnd "^13.1.0" + react-blurhash "^0.1.3" react-dom "^17.0.2" react-focus-lock "^2.5.0" react-transition-group "^4.4.1" @@ -9559,6 +9568,11 @@ react-beautiful-dnd@^13.1.0: redux "^4.0.4" use-memo-one "^1.1.1" +react-blurhash@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/react-blurhash/-/react-blurhash-0.1.3.tgz#735f28f8f07fb358d7efe7e7e6dc65a7272bf89e" + integrity sha512-Q9lqbXg92NU6/2DoIl/cBM8YWL+Z4X66OiG4aT9ozOgjBwx104LHFCH5stf6aF+s0Q9Wf310Ul+dG+VXJltmPg== + react-clientside-effect@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.3.tgz#95c95f520addfb71743608b990bfe01eb002012b" From 280e6528f1b056e31dcac01d89cd0e1a4e11402f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 14 Jul 2021 17:25:04 +0100 Subject: [PATCH 2/7] Prepare changelog for v1.7.33-rc.1 --- CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91f28127e8..5fbca27558 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,42 @@ +Changes in [1.7.33-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1) (2021-07-14) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.32...v1.7.33-rc.1) + + * Translations update from Weblate + [\#17991](https://github.com/vector-im/element-web/pull/17991) + * Revert "Don't run nginx as root in docker" + [\#17990](https://github.com/vector-im/element-web/pull/17990) + * Don't run nginx as root in docker + [\#17927](https://github.com/vector-im/element-web/pull/17927) + * Add VS Code to gitignore + [\#17982](https://github.com/vector-im/element-web/pull/17982) + * Remove canvas native dependencies from Dockerfile + [\#17973](https://github.com/vector-im/element-web/pull/17973) + * Remove node-canvas devDependency + [\#17967](https://github.com/vector-im/element-web/pull/17967) + * Add `reskindex` to development steps + [\#17926](https://github.com/vector-im/element-web/pull/17926) + * Update Modernizr and stop it from polluting classes on the html tag + [\#17921](https://github.com/vector-im/element-web/pull/17921) + * Convert a few files to TS + [\#17895](https://github.com/vector-im/element-web/pull/17895) + * Do not generate a lockfile when running in CI + [\#17902](https://github.com/vector-im/element-web/pull/17902) + * Fix lockfile to match listed dependencies + [\#17888](https://github.com/vector-im/element-web/pull/17888) + * Remove PostCSS calc() processing + [\#17856](https://github.com/vector-im/element-web/pull/17856) + * Make issue template styling more consistent and improve PR template + [\#17691](https://github.com/vector-im/element-web/pull/17691) + * Update jsrsasign to ^10.2.0 (Includes fix for CVE-2021-30246) + [\#17170](https://github.com/vector-im/element-web/pull/17170) + * Migrate to `eslint-plugin-matrix-org` + [\#17847](https://github.com/vector-im/element-web/pull/17847) + * Remove spurious overflow: auto on #matrixchat element + [\#17647](https://github.com/vector-im/element-web/pull/17647) + * Enhance security by disallowing CSP object-src rule + [\#17818](https://github.com/vector-im/element-web/pull/17818) + Changes in [1.7.32](https://github.com/vector-im/element-web/releases/tag/v1.7.32) (2021-07-05) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.32-rc.1...v1.7.32) From d58c4deebb63519906406fcc7cc98a14de416e7d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 14 Jul 2021 17:25:04 +0100 Subject: [PATCH 3/7] v1.7.33-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55a896dbd9..b051800be9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.32", + "version": "1.7.33-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 183cf150e8d3720df51c14e1fa2f5bdc76fe8a49 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 19 Jul 2021 16:19:11 +0100 Subject: [PATCH 4/7] Upgrade matrix-js-sdk to 12.1.0 --- package.json | 2 +- yarn.lock | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b051800be9..6073438b87 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "12.1.0-rc.1", + "matrix-js-sdk": "12.1.0", "matrix-react-sdk": "3.26.0-rc.1", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 6f5a18b1bf..f88d90717d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7279,6 +7279,22 @@ 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.1.0: + version "12.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0.tgz#7d159dd9bc03701e45a6b2777f1fa582a7e8b970" + integrity sha512-/fSqOjD+mTlMD+/B3s3Ja6BfI46FnTDl43ojzGDUOsHRRmSYUmoONb83qkH5Fjm8cI2q5ZBJMsBfjuZwLVeiZw== + 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" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@12.1.0-rc.1: version "12.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0-rc.1.tgz#4bc4e2342525c622e1a87b264e6f55560632b90c" From bc07d91810d51a69cdad9e473acf7292b931dc26 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 19 Jul 2021 16:19:36 +0100 Subject: [PATCH 5/7] Upgrade matrix-react-sdk to 3.26.0 --- package.json | 2 +- yarn.lock | 26 +++++--------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 6073438b87..119d7160ed 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "12.1.0", - "matrix-react-sdk": "3.26.0-rc.1", + "matrix-react-sdk": "3.26.0", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index f88d90717d..2056dab056 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7295,22 +7295,6 @@ matrix-js-sdk@12.1.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@12.1.0-rc.1: - version "12.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0-rc.1.tgz#4bc4e2342525c622e1a87b264e6f55560632b90c" - integrity sha512-F7d1e1Bm8zZqXkTKIyNeT4uA85u65nfrW2b8NwDMV+gtKNF0DOzUfUzOGD7CnjJKpyKNTQluUiwka+bXiGAVkw== - 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" - p-retry "^4.5.0" - 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" @@ -7319,10 +7303,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.26.0-rc.1: - version "3.26.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.26.0-rc.1.tgz#d4f14eeba572eafb03fa3d2904d56029e3a3f241" - integrity sha512-S/FGXAPJpaY/EUkQS27FhXKQ4NPR2YBSLYEyxeGywHzQlkvieYzK9eNPpLOrXVMCYbCm/SLV4r3nwWV3tJ5m7w== +matrix-react-sdk@3.26.0: + version "3.26.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.26.0.tgz#c6e9471acaaeba5852f5b836612e5ad6eae5d0d8" + integrity sha512-HM2RnPP8Ad6MOMveJUXN3u2+itsYzp8pCLz/9CNEmSCSpbNXqAoDCHadgGeJbfcyC1swjbD9N3wzF6Or68MNjg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7350,7 +7334,7 @@ matrix-react-sdk@3.26.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "12.1.0-rc.1" + matrix-js-sdk "12.1.0" matrix-widget-api "^0.1.0-beta.15" minimist "^1.2.5" opus-recorder "^8.0.3" From 85e1225a2caaccf7fd5a4a3971d5dc2d8cd18cc9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 19 Jul 2021 16:22:36 +0100 Subject: [PATCH 6/7] Prepare changelog for v1.7.33 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fbca27558..f5a708b6e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33-rc.1...v1.7.33) + + * No changes from rc.1 + Changes in [1.7.33-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1) (2021-07-14) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.32...v1.7.33-rc.1) From d75b0b4ee87057de74e09798b72e65a73707248d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 19 Jul 2021 16:22:37 +0100 Subject: [PATCH 7/7] v1.7.33 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 119d7160ed..2f5b590b27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.33-rc.1", + "version": "1.7.33", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {