From c99cd9fc58251861e83d37c88e2c7ed5dad3eab0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Dec 2019 12:05:56 +0000 Subject: [PATCH 1/9] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 711388d7..a30525aa 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "2.4.6-rc.1", + "matrix-react-sdk": "1.7.5-rc.1", "modernizr": "^3.6.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 74b9ea55..9bb14c8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6009,9 +6009,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "2.4.5" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ea8003df23d55e2b84911c3204005c42a9ffa9c" +matrix-js-sdk@2.4.6-rc.1: + version "2.4.6-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.6-rc.1.tgz#27524e3db8444f0c879aa1c532e7c8d02f31de60" + integrity sha512-0L37WWq0qqJKGt93/lS29dgKcVGZ6b7thbbcv1/5vXPfvr3BaLL3Hce/krMQfToWktaNCUvi0bzUshyRY3VWqQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -6032,9 +6033,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 "1.7.4" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/54d6b6aa73656d9c00cc047ace964bc73ce011e7" +matrix-react-sdk@1.7.5-rc.1: + version "1.7.5-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.5-rc.1.tgz#53669e830e88cd39817b23e53d0c1cb8dbc39e42" + integrity sha512-SleiL6evFZemQxb7kIjPnC4FEKYjSvYMFhQEMgBQ7EJCi2pZbRNLDYaMcumu2ReGqyg4ueaZqoGm2Asdzoo6rw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6066,7 +6068,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "2.4.6-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 577e614fa4cfe56e248ef2eb7699357536dc7285 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Dec 2019 13:52:59 +0000 Subject: [PATCH 2/9] Add transform-async-to-bluebird Add babel plugin until the js-sdk stop using bluebird, since we force-recompile the js-sdk so we need the plugin installed for that to work (and it's a devDependency on js-sdk so doesn't otherwise get installed). --- package.json | 1 + yarn.lock | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a30525aa..c0282d41 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "test-multi": "karma start" }, "dependencies": { + "babel-plugin-transform-async-to-bluebird": "^1.1.1", "babel-polyfill": "^6.26.0", "babel-runtime": "^6.26.0", "browser-request": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index 9bb14c8f..f70e875b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -919,7 +919,7 @@ babel-helper-explode-class@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helper-function-name@^6.24.1: +babel-helper-function-name@^6.24.1, babel-helper-function-name@^6.8.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= @@ -1081,6 +1081,16 @@ babel-plugin-transform-async-generator-functions@^6.24.1: babel-plugin-syntax-async-generators "^6.5.0" babel-runtime "^6.22.0" +babel-plugin-transform-async-to-bluebird@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz#46ea3e7c5af629782ac9f1ed1b7cd38f8425afd4" + integrity sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q= + dependencies: + babel-helper-function-name "^6.8.0" + babel-plugin-syntax-async-functions "^6.8.0" + babel-template "^6.9.0" + babel-traverse "^6.10.4" + babel-plugin-transform-async-to-generator@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" @@ -1503,7 +1513,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0: +babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0, babel-template@^6.9.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= @@ -1514,7 +1524,7 @@ babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@^6.24.1, babel-traverse@^6.26.0: +babel-traverse@^6.10.4, babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= From bf33f3bdce85a490ef113346f2661efde4e1a9dc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Dec 2019 13:58:43 +0000 Subject: [PATCH 3/9] v1.5.6-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 3338f615..0d975bb8 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.5", + "version": "1.5.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From aaa2960b321076a9350e53790a3ada26aa31ad9c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Dec 2019 13:59:44 +0000 Subject: [PATCH 4/9] Prepare changelog for v1.5.6-rc.1 --- CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 322f327f..400811bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,45 @@ +Changes in [1.5.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.6-rc.1) (2019-12-04) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.5...v1.5.6-rc.1) + + * Update Lithuanian language name + [\#11599](https://github.com/vector-im/riot-web/pull/11599) + * Enable more languages + [\#11592](https://github.com/vector-im/riot-web/pull/11592) + * Fix Docker build for develop and publish a /version file + [\#11588](https://github.com/vector-im/riot-web/pull/11588) + * Remove unused translations + [\#11540](https://github.com/vector-im/riot-web/pull/11540) + * Update from Weblate + [\#11591](https://github.com/vector-im/riot-web/pull/11591) + * Update riot.im enable_presence_by_hs_url for new matrix.org client URL + [\#11565](https://github.com/vector-im/riot-web/pull/11565) + * Remove mention of vector.im as default identity server on mobile guide + [\#11544](https://github.com/vector-im/riot-web/pull/11544) + * Clean up and standardise app config + [\#11549](https://github.com/vector-im/riot-web/pull/11549) + * make it clear that seshat requires electron-build-env (at least on macOS) + [\#11527](https://github.com/vector-im/riot-web/pull/11527) + * Add postcss-easings + [\#11521](https://github.com/vector-im/riot-web/pull/11521) + * ElectronPlatform: Add support for a event index using Seshat. + [\#11125](https://github.com/vector-im/riot-web/pull/11125) + * Sign all of the Windows executable files + [\#11516](https://github.com/vector-im/riot-web/pull/11516) + * Clarify that cross-signing is in development + [\#11493](https://github.com/vector-im/riot-web/pull/11493) + * get rid of bluebird + [\#11301](https://github.com/vector-im/riot-web/pull/11301) + * Update from Weblate + [\#11488](https://github.com/vector-im/riot-web/pull/11488) + * Add note in README about self-hosted riot installs requiring custom caching + headers + [\#8702](https://github.com/vector-im/riot-web/pull/8702) + * De-dup theming code + [\#11445](https://github.com/vector-im/riot-web/pull/11445) + * Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants + [\#11448](https://github.com/vector-im/riot-web/pull/11448) + Changes in [1.5.5](https://github.com/vector-im/riot-web/releases/tag/v1.5.5) (2019-11-27) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4...v1.5.5) From aaf1afaa13d6e34a282d1770b3348e2ec3efcdad Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Dec 2019 13:59:44 +0000 Subject: [PATCH 5/9] v1.5.6-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0282d41..94c791d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.5", + "version": "1.5.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 45d51f56f2236de9a4c50b6138911a04cfd9b9ff Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Dec 2019 11:38:11 +0000 Subject: [PATCH 6/9] Released js-sdk & react-sdk --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 94c791d2..6ec8285f 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.6-rc.1", - "matrix-react-sdk": "1.7.5-rc.1", + "matrix-js-sdk": "2.4.6", + "matrix-react-sdk": "1.7.5", "modernizr": "^3.6.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 f70e875b..a0600e6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6019,10 +6019,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.4.6-rc.1: - version "2.4.6-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.6-rc.1.tgz#27524e3db8444f0c879aa1c532e7c8d02f31de60" - integrity sha512-0L37WWq0qqJKGt93/lS29dgKcVGZ6b7thbbcv1/5vXPfvr3BaLL3Hce/krMQfToWktaNCUvi0bzUshyRY3VWqQ== +matrix-js-sdk@2.4.6: + version "2.4.6" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz#162e46dccc880889312b056e4a7b4b91c17a5842" + integrity sha512-ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -6043,10 +6043,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.5-rc.1: - version "1.7.5-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.5-rc.1.tgz#53669e830e88cd39817b23e53d0c1cb8dbc39e42" - integrity sha512-SleiL6evFZemQxb7kIjPnC4FEKYjSvYMFhQEMgBQ7EJCi2pZbRNLDYaMcumu2ReGqyg4ueaZqoGm2Asdzoo6rw== +matrix-react-sdk@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.5.tgz#aba571b4753c29a67f11361d0f70dbbf3dd4649a" + integrity sha512-mw/rYTTxuO8V3UjlHHBu+Cx5rX6w1C6IwscqFdlow4XtREbDyE+BZ15jCvRZzuV1ELINDMj5FJ6HvfO7aN4DVQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6078,7 +6078,7 @@ matrix-react-sdk@1.7.5-rc.1: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.6-rc.1" + matrix-js-sdk "2.4.6" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 6cf087dc82c915b026458e1ffca0c26fc49f7561 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Dec 2019 11:38:41 +0000 Subject: [PATCH 7/9] v1.5.6 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 0d975bb8..c49934b9 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.6-rc.1", + "version": "1.5.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 080725295dfd7aeef7654c2fce16944b214acee1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Dec 2019 11:39:56 +0000 Subject: [PATCH 8/9] Prepare changelog for v1.5.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 400811bb..85025c1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.6](https://github.com/vector-im/riot-web/releases/tag/v1.5.6) (2019-12-09) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.6-rc.1...v1.5.6) + + * No changes since rc.1 + Changes in [1.5.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.6-rc.1) (2019-12-04) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.5...v1.5.6-rc.1) From cfb3258c36cb87aaf25cc01ebc4884756b1559b7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Dec 2019 11:39:56 +0000 Subject: [PATCH 9/9] v1.5.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ec8285f..a4c3a6a9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.6-rc.1", + "version": "1.5.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {