From 27ff4e9488c7b1146e1058239826a3457366e95a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Oct 2020 14:36:06 +0100 Subject: [PATCH 01/10] Upgrade matrix-js-sdk to 8.5.0-rc.1 --- package.json | 2 +- yarn.lock | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 75980b1ec1..3e66ab0f7a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "8.4.1", + "matrix-js-sdk": "8.5.0-rc.1", "matrix-react-sdk": "3.5.0", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 3e186a16b2..a39fed306c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1048,6 +1048,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.11.2": + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.10.1", "@babel/template@^7.4.0": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811" @@ -3362,7 +3369,7 @@ content-disposition@0.5.3: dependencies: safe-buffer "5.1.2" -content-type@^1.0.2, content-type@~1.0.4: +content-type@^1.0.2, content-type@^1.0.4, content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== @@ -7748,6 +7755,11 @@ loglevel@^1.6.4, loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== +loglevel@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" + integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== + lolex@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" @@ -7901,6 +7913,21 @@ matrix-js-sdk@8.4.1: request "^2.88.0" unhomoglyph "^1.0.2" +matrix-js-sdk@8.5.0-rc.1: + version "8.5.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0-rc.1.tgz#7ad34d8b6a786a7d4a04173e3b17da56022cd62a" + integrity sha512-hVFYkN3/rsPiNXdFqcvRvg+Egr75qhPGMi2gp59PDr7JrZEtOACA0I3NCY1vPub9kXGTtPZqPuHGFrsF9qLXGw== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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" @@ -12383,7 +12410,7 @@ unherit@^1.0.4: inherits "^2.0.0" xtend "^4.0.0" -unhomoglyph@^1.0.2: +unhomoglyph@^1.0.2, unhomoglyph@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3" integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg== From b5f114c157b2efe2501d9bee9fa40fda9967e8df Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Oct 2020 14:39:28 +0100 Subject: [PATCH 02/10] Upgrade matrix-react-sdk to 3.6.0-rc.1 --- package.json | 2 +- yarn.lock | 38 ++++++++++++-------------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 3e66ab0f7a..0cb62d5ea3 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.5.0-rc.1", - "matrix-react-sdk": "3.5.0", + "matrix-react-sdk": "3.6.0-rc.1", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index a39fed306c..3cef671430 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1034,7 +1034,7 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg== @@ -3369,7 +3369,7 @@ content-disposition@0.5.3: dependencies: safe-buffer "5.1.2" -content-type@^1.0.2, content-type@^1.0.4, content-type@~1.0.4: +content-type@^1.0.4, content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== @@ -7750,7 +7750,7 @@ log-symbols@^3.0.0: dependencies: chalk "^2.4.2" -loglevel@^1.6.4, loglevel@^1.6.8: +loglevel@^1.6.8: version "1.6.8" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== @@ -7898,21 +7898,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@8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.4.1.tgz#4e7e8bf8d5f6d8362aef68bed8e0d2f03f262194" - integrity sha512-AfA2y/dt10ysXKzngwqzajzxTL0Xq8lW5bBr0mq21JUKndBP1f1AOOiIkX5nLA9IZGzVoe0anKV+cU2aGWcdkw== - 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@8.5.0-rc.1: version "8.5.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0-rc.1.tgz#7ad34d8b6a786a7d4a04173e3b17da56022cd62a" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.5.0.tgz#69421d447fd7d769abd01f43f03784da11d30ad4" - integrity sha512-ld+q4Ku+aCwWOFB6iVw02auI5/SIcUcu/m0XByw4TfBzSdAkMzqoKczdaWMt+HIWkyJDBhcPuH2N915gELQK0g== +matrix-react-sdk@3.6.0-rc.1: + version "3.6.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0-rc.1.tgz#fddce68a5b5fb14232236ba86587d07f2f859a38" + integrity sha512-ND0qxevqLdeb8jrrLroIusy5z0A3ILw4myEpp2SpkDtUChc6g2gcdvU7yjLOoJNySvfnWwDGio0lGxAshNI1bA== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,8 @@ matrix-react-sdk@3.5.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.4.1" + matrix-js-sdk "8.5.0-rc.1" + matrix-widget-api "^0.1.0-beta.2" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -10232,7 +10218,7 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.5.2, qs@^6.9.4: +qs@^6.9.4: version "6.9.4" resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== @@ -10786,7 +10772,7 @@ request-promise-native@^1.0.8: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.88.0, request@^2.88.2: +request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -12410,7 +12396,7 @@ unherit@^1.0.4: inherits "^2.0.0" xtend "^4.0.0" -unhomoglyph@^1.0.2, unhomoglyph@^1.0.6: +unhomoglyph@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3" integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg== From 75c9bad10dbd6182d6e124852828b714066bdb3b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Oct 2020 14:44:53 +0100 Subject: [PATCH 03/10] Prepare changelog for v1.7.9-rc.1 --- CHANGELOG.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93f39abc00..3d4df58e33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,59 @@ +Changes in [1.7.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.9-rc.1) (2020-10-07) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.8...v1.7.9-rc.1) + + * Upgrade to React SDK 3.6.0-rc.1 and JS SDK 8.5.0-rc.1 + * Update from Weblate + [\#15406](https://github.com/vector-im/element-web/pull/15406) + * Update Jest and JSDOM + [\#15402](https://github.com/vector-im/element-web/pull/15402) + * Add support for dehydration/fallback keys + [\#15398](https://github.com/vector-im/element-web/pull/15398) + * Remove riot-bot from sample config + [\#15376](https://github.com/vector-im/element-web/pull/15376) + * Switch to using the Widget API SDK for Jitsi widgets + [\#15102](https://github.com/vector-im/element-web/pull/15102) + * Remove workbox + [\#15352](https://github.com/vector-im/element-web/pull/15352) + * Disable workbox when running in webpack dev server, not in dev mode + [\#15345](https://github.com/vector-im/element-web/pull/15345) + * Update Riot -> Element in contribute.json + [\#15326](https://github.com/vector-im/element-web/pull/15326) + * Update Riot -> Element in redeploy.py + [\#15336](https://github.com/vector-im/element-web/pull/15336) + * Update Riot -> Element in docs/feature-flags.md + [\#15325](https://github.com/vector-im/element-web/pull/15325) + * Update Riot -> Element in element.io/README.md + [\#15327](https://github.com/vector-im/element-web/pull/15327) + * Update Riot -> Element in VectorAuthFooter + [\#15328](https://github.com/vector-im/element-web/pull/15328) + * Update Riot -> Element in VectorEmbeddedPage + [\#15329](https://github.com/vector-im/element-web/pull/15329) + * Update Riot -> Element in docs/review.md + [\#15330](https://github.com/vector-im/element-web/pull/15330) + * Update Riot -> Element in welcome.html + [\#15332](https://github.com/vector-im/element-web/pull/15332) + * Update Riot -> Element in issues-burndown.pl + [\#15333](https://github.com/vector-im/element-web/pull/15333) + * Update Riot -> Element in redeploy.py + [\#15334](https://github.com/vector-im/element-web/pull/15334) + * Update Riot -> Element in index.ts + [\#15335](https://github.com/vector-im/element-web/pull/15335) + * Update Riot -> Element Web in issue templates + [\#15324](https://github.com/vector-im/element-web/pull/15324) + * Give the Jitsi widget an icon to help with discovery + [\#15316](https://github.com/vector-im/element-web/pull/15316) + * Jitsi widget wrapper updates for hangup button + [\#15219](https://github.com/vector-im/element-web/pull/15219) + * Tidy up Service Worker, only run Workbox in production + [\#15271](https://github.com/vector-im/element-web/pull/15271) + * Remove conference handler + [\#15274](https://github.com/vector-im/element-web/pull/15274) + * Rebrand the webpack pipeline for Element + [\#15266](https://github.com/vector-im/element-web/pull/15266) + * Replace dummy sw.js with pre-caching and runtime-caching workbox SW + [\#15196](https://github.com/vector-im/element-web/pull/15196) + Changes in [1.7.8](https://github.com/vector-im/element-web/releases/tag/v1.7.8) (2020-09-28) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.8-rc.1...v1.7.8) From c0143e58a232a4e583251d15520ae1411452f507 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 7 Oct 2020 14:44:54 +0100 Subject: [PATCH 04/10] v1.7.9-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cb62d5ea3..a1bd07ef67 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.8", + "version": "1.7.9-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ed86341ba50595350def2cdc9ff8e850e0494301 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:40:35 +0100 Subject: [PATCH 05/10] Upgrade matrix-js-sdk to 8.5.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a1bd07ef67..50e42a8dab 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "8.5.0-rc.1", + "matrix-js-sdk": "8.5.0", "matrix-react-sdk": "3.6.0-rc.1", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 3cef671430..bad242a078 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" + integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@8.5.0-rc.1: version "8.5.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0-rc.1.tgz#7ad34d8b6a786a7d4a04173e3b17da56022cd62a" From 2d03ccfa5796cb51e03960d83e3f904e09a12981 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:40:53 +0100 Subject: [PATCH 06/10] Upgrade matrix-react-sdk to 3.6.0 --- package.json | 2 +- yarn.lock | 32 +++++++++++--------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 50e42a8dab..33ebec230b 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.5.0", - "matrix-react-sdk": "3.6.0-rc.1", + "matrix-react-sdk": "3.6.0", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index bad242a078..08dff37951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,21 +7913,6 @@ matrix-js-sdk@8.5.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@8.5.0-rc.1: - version "8.5.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0-rc.1.tgz#7ad34d8b6a786a7d4a04173e3b17da56022cd62a" - integrity sha512-hVFYkN3/rsPiNXdFqcvRvg+Egr75qhPGMi2gp59PDr7JrZEtOACA0I3NCY1vPub9kXGTtPZqPuHGFrsF9qLXGw== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.6.0-rc.1: - version "3.6.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0-rc.1.tgz#fddce68a5b5fb14232236ba86587d07f2f859a38" - integrity sha512-ND0qxevqLdeb8jrrLroIusy5z0A3ILw4myEpp2SpkDtUChc6g2gcdvU7yjLOoJNySvfnWwDGio0lGxAshNI1bA== +matrix-react-sdk@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8" + integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,8 +7951,8 @@ matrix-react-sdk@3.6.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.5.0-rc.1" - matrix-widget-api "^0.1.0-beta.2" + matrix-js-sdk "8.5.0" + matrix-widget-api "^0.1.0-beta.3" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -8002,6 +7987,11 @@ matrix-widget-api@^0.1.0-beta.2: resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.2.tgz#367da1ccd26b711f73fc5b6e02edf55ac2ea2692" integrity sha512-q5g5RZN+RRjM4HmcJ+LYoQAYrB1wzyERmoQ+LvKbTV/+9Ov36Kp0QEP8CleSXEd5WLp6bkRlt60axDaY6pWGmg== +matrix-widget-api@^0.1.0-beta.3: + version "0.1.0-beta.3" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114" + integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From 04f95cc55565c6c482d5ada94e15937c50dcd308 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:56:01 +0100 Subject: [PATCH 07/10] Prepare changelog for v1.7.9 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d4df58e33..6fd8102a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.9](https://github.com/vector-im/element-web/releases/tag/v1.7.9) (2020-10-12) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9-rc.1...v1.7.9) + + * Upgrade to React SDK 3.6.0 and JS SDK 8.5.0 + Changes in [1.7.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.9-rc.1) (2020-10-07) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.8...v1.7.9-rc.1) From d4d1b957af4bd833bc3a77e9423f491152ecc779 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:56:01 +0100 Subject: [PATCH 08/10] v1.7.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33ebec230b..b80ff39b36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.9-rc.1", + "version": "1.7.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From fd2895eb403cdddae47e33218aae36f453fa7410 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:59:47 +0100 Subject: [PATCH 09/10] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b80ff39b36..6405b1f14b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "8.5.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.6.0", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 08dff37951..d0b3b7b937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@8.5.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.5.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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" From f8e84c42ad058104567025c12e8138242ed218b8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:59:58 +0100 Subject: [PATCH 10/10] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 6405b1f14b..c030f45a53 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.6.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index d0b3b7b937..d7beb0cc88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" - integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.5.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.6.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.6.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8" - integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d007b06d7c245354c126e9ab41c8b4b3f8b85f54" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.6.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.5.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.3" minimist "^1.2.5" pako "^1.0.11"