From 59fa3744911b2974f201451a7dfe2893385d4d7b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 23 May 2019 17:39:03 +0100 Subject: [PATCH 1/8] Upgrade SDKs to 1.2.0-rc.1 --- package.json | 4 ++-- yarn.lock | 42 ++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 1d20819db..0f30c94b0 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.1.0", - "matrix-react-sdk": "1.1.2", + "matrix-js-sdk": "1.2.0-rc.1", + "matrix-react-sdk": "1.2.0-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 4165d55ae..dc3b04841 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1524,13 +1524,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base-x@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.4.tgz#94c1788736da065edb1d68808869e357c977fa77" - integrity sha512-UYOadoSIkEI/VrRGSG6qp93rp2WdokiAiNYDfGW5qURAY8GiAQkvMbwNNSDYiVJopqv4gCna7xqf4rrNGp+5AA== - dependencies: - safe-buffer "^5.0.1" - base-x@^3.0.2: version "3.0.5" resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.5.tgz#d3ada59afed05b921ab581ec3112e6444ba0795a" @@ -3144,10 +3137,15 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== -emojione@2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96" - integrity sha1-RkV89rmy+NoTroouTlR94G7hXpY= +emojibase-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.0.0.tgz#3feb3e5bb5e5f2b6373b183b0f038c60889a9e29" + integrity sha512-Yi4A1IxB7iZ+09Wqr2BEpHSQfugc5I8G+wckDOhCia0F7oOdErf/85jCwbpRQy7xtBbvlyS3xQrYedSeQot5Og== + +emojibase-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.0.0.tgz#fc7a17aa20584df5a73619f06ac236b8a5bb452d" + integrity sha512-iNDkbtn8UxKTxjIlvHLqfXovZaIulnuuyo2/emU+ZlPr2OmzxGfiDI+iIQ3WWqdlA6lgjrPNWgpbytt4lnJYrg== emojis-list@^2.0.0: version "2.1.0" @@ -5744,14 +5742,13 @@ 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@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0.tgz#f0db49de2aa0b0d50c1fe49da538beb4926ce59c" - integrity sha512-ECoMN6DkwPdKiMa/jSoMkSDngFCo6x7oH84rLd1NtD7lBPl3Ejj6ARa0iIELE7u0OUO6J0FzdWh7Hd0ZnVTmww== +matrix-js-sdk@1.2.0-rc.1: + version "1.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0-rc.1.tgz#3bb495fc5dce9372e420455cd6378ddd85844026" + integrity sha512-2/lcL4QP077Du22G1W+k5KAgSreFxKbZW2dmtI5wr9icPACHHxxN/pEvWLiKkW7Q3+uulb05uTilM6zip9ux/g== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" - base-x "3.0.4" bluebird "^3.5.0" browser-request "^0.3.3" bs58 "^4.0.1" @@ -5769,10 +5766,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542" - integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ== +matrix-react-sdk@1.2.0-rc.1: + version "1.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0-rc.1.tgz#839608feb5454361b8ed7652da933ef5d0cbef9a" + integrity sha512-ljO3IDwvcXsqyVH+/srCRCaMJrbLkdfRYotzw9GG7AY7SVtaNfgqP0uGeXi71Ly12Lo3Wd3elLDULUmm4q9OLQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5783,7 +5780,8 @@ matrix-react-sdk@1.1.2: classnames "^2.1.2" commonmark "^0.28.1" counterpart "^0.18.0" - emojione "2.2.7" + emojibase-data "^4.0.0" + emojibase-regex "^3.0.0" file-saver "^1.3.3" filesize "3.5.6" flux "2.1.1" @@ -5798,7 +5796,7 @@ matrix-react-sdk@1.1.2: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "1.1.0" + matrix-js-sdk "1.2.0-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 7f7b3e747cc406599c461cbe1620ed3d1276e2ed Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 23 May 2019 17:40:08 +0100 Subject: [PATCH 2/8] v1.2.0-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 ad426ee10..9932b11b0 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.1.2", + "version": "1.2.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From aa10d7aeedc589f4657c92a6a1626bc603701375 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 23 May 2019 17:41:20 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.2.0-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90bd05d12..808b3b168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1) + + * Update from Weblate + [\#9802](https://github.com/vector-im/riot-web/pull/9802) + * remove emojione + [\#9766](https://github.com/vector-im/riot-web/pull/9766) + * Make Dockerfile work for develop and other branches + [\#9736](https://github.com/vector-im/riot-web/pull/9736) + * add description of new labs feature for message editing + [\#9728](https://github.com/vector-im/riot-web/pull/9728) + * Remove karma junit output + [\#9628](https://github.com/vector-im/riot-web/pull/9628) + * yarn upgrade + [\#9626](https://github.com/vector-im/riot-web/pull/9626) + * Respond quickly to buildkite pokes + [\#9617](https://github.com/vector-im/riot-web/pull/9617) + * Delay creating the `Favico` instance + [\#9616](https://github.com/vector-im/riot-web/pull/9616) + * Add reactions feature to config sample + [\#9598](https://github.com/vector-im/riot-web/pull/9598) + Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2) From 52b2dbec8557dc1d3f98306d45dcb52dc0da8b1c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 23 May 2019 17:41:20 +0100 Subject: [PATCH 4/8] v1.2.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f30c94b0..4b0538f4b 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.1.2", + "version": "1.2.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From f4b1e3307d91d0c5f97c1d129138e32fc84ec25d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 29 May 2019 16:14:25 +0100 Subject: [PATCH 5/8] Upgrade SDKs to 1.2.0 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4b0538f4b..bfde41100 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.2.0-rc.1", - "matrix-react-sdk": "1.2.0-rc.1", + "matrix-js-sdk": "1.2.0", + "matrix-react-sdk": "1.2.0", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index dc3b04841..e17c9d295 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5742,10 +5742,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@1.2.0-rc.1: - version "1.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0-rc.1.tgz#3bb495fc5dce9372e420455cd6378ddd85844026" - integrity sha512-2/lcL4QP077Du22G1W+k5KAgSreFxKbZW2dmtI5wr9icPACHHxxN/pEvWLiKkW7Q3+uulb05uTilM6zip9ux/g== +matrix-js-sdk@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0.tgz#1e18f7bead2b31f1b6886299f3198f545eb7d19e" + integrity sha512-XqxIm30/ePPQxMpoSZ6560nVZN296E7DI4twGKspII+Pvc0u7p+UHTh3OXwTtPOj3eVo0ptKv3kn/a5SmYzXmQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5766,10 +5766,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.2.0-rc.1: - version "1.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0-rc.1.tgz#839608feb5454361b8ed7652da933ef5d0cbef9a" - integrity sha512-ljO3IDwvcXsqyVH+/srCRCaMJrbLkdfRYotzw9GG7AY7SVtaNfgqP0uGeXi71Ly12Lo3Wd3elLDULUmm4q9OLQ== +matrix-react-sdk@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0.tgz#8c8c204607763932c99851b2f24b27d3e27b66a5" + integrity sha512-FXUluS8gNUjHEeTFNOkpD5LgQTZM/UBxNPBYiqyVzEOWpJBVy49kJaVvEU/uzLCpHk3mde30PmTl9khAf2yVNQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5796,7 +5796,7 @@ matrix-react-sdk@1.2.0-rc.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "1.2.0-rc.1" + matrix-js-sdk "1.2.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From d6fb0bc24fa654bfe735a13860ae5e9423fc9afe Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 29 May 2019 16:19:59 +0100 Subject: [PATCH 6/8] v1.2.0 --- 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 9932b11b0..ee8aa7903 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.2.0-rc.1", + "version": "1.2.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From fde9a7a7ba06661423af430baf18e4b72e35c970 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 29 May 2019 16:23:52 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.2.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 808b3b168..1efb2c347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0) + + * Upgrade to JS SDK v1.2.0 and React SDK v1.2.0 to fix some regressions + Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1) From 2af3d20a712da8673ac9e0d11ac566b3fd6d01ff Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 29 May 2019 16:23:52 +0100 Subject: [PATCH 8/8] v1.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bfde41100..879fbf7a0 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.2.0-rc.1", + "version": "1.2.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {