From cc8eaea5a7556de110d64629010590153092aa23 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:10:06 +0100 Subject: [PATCH 01/12] js-sdk & react-sdk rc.1, electron 4.1.5 --- package.json | 6 +++--- yarn.lock | 31 ++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 1412527e9..ab32ffcff 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.0.4", - "matrix-react-sdk": "1.0.7", + "matrix-js-sdk": "^1.1.0-rc.1", + "matrix-react-sdk": "^1.1.0-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", @@ -153,7 +153,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "4.1.3", + "electronVersion": "4.1.5", "files": [ "node_modules/**", "src/**", diff --git a/yarn.lock b/yarn.lock index 04f32b718..3d00872b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2504,6 +2504,11 @@ cpx@^1.3.2: shell-quote "^1.6.1" subarg "^1.0.0" +crc-32@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-0.3.0.tgz#6a3d3687f5baec41f7e9b99fe1953a2e5d19775e" + integrity sha1-aj02h/W67EH36bmf4ZU6Ll0Zd14= + crc32-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4" @@ -5732,10 +5737,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w= -matrix-js-sdk@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.4.tgz#dbfa8399f750a23b020c1ec8f037a2f5c36d4672" - integrity sha512-FPx7U1a0SmLbDXhXlR4XHlC+FVKTnK2/+ZBtyOWGLi3nxw4x8hCSSzJ82gzStya1qvhHvbf/y7eblYFVE1l7SQ== +matrix-js-sdk@^1.1.0-rc.1: + version "1.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0-rc.1.tgz#11a9e9215e766274d99f44eff0a8c4d33d34f870" + integrity sha512-I87gvaMKKmFGDU8q4YUiEP0RVr0ni+v64TYaqllKV2zMGgl2serz+O9pvgfyGgzwFUQ77nPG7NGH4ku+S5I2LA== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5757,10 +5762,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.7.tgz#4dc6db50f9bf3c6dd5c1fdea8fa3d4eec2e58125" - integrity sha512-sJpu87itcAbMFaWeLEfpfNbQ4uJ+MIvmHw6RfbgHvBw4VtFAOgg/SypIoMjEEzk1KCgAUSV9k0CodwKsXHo0Jw== +matrix-react-sdk@^1.1.0-rc.1: + version "1.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0-rc.1.tgz#40a41c230001a29e1ae81618225b1607752ac529" + integrity sha512-0Mw0qYckD1Ft4HLkH5/PU4+rHbaYKvQDub+39prRh6uX7iM7Y91NObrzdAKnjMR59+aZKbUWvt8Tev7E3lDm5g== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5786,9 +5791,10 @@ matrix-react-sdk@1.0.7: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "1.0.4" + matrix-js-sdk "^1.1.0-rc.1" optimist "^0.6.1" pako "^1.0.5" + png-chunks-extract "^1.0.0" prop-types "^15.5.8" qrcode-react "^0.1.16" qs "^6.6.0" @@ -6783,6 +6789,13 @@ pluralizers@^0.1.7: resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142" integrity sha512-mw6AejUiCaMQ6uPN9ObjJDTnR5AnBSmnHHy3uVTbxrSFSxO5scfwpTs8Dxyb6T2v7GSulhvOq+pm9y+hXUvtOA== +png-chunks-extract@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d" + integrity sha1-+tSpBeZmUhlzUcZeNbksZDEeRy0= + dependencies: + crc-32 "^0.3.0" + portfinder@^1.0.9: version "1.0.19" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f" From d6d4d95b2042aad838abb1b29bdbc00a34cdd241 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:42:04 +0100 Subject: [PATCH 02/12] Fix .babelrc to be the same as react-sdk it was missing some plugins which firstly means we're using inconsistent js between projects, but also causes builds to fail due to our unique build system. --- .babelrc | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.babelrc b/.babelrc index 6ba0e0dae..3fb847ad1 100644 --- a/.babelrc +++ b/.babelrc @@ -1,4 +1,21 @@ { - "presets": ["react", "es2015", "es2016"], - "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports"] + "presets": [ + "react", + "es2015", + "es2016" + ], + "plugins": [ + [ + "transform-builtin-extend", + { + "globals": ["Error"] + } + ], + "transform-class-properties", + "transform-object-rest-spread", + "transform-async-to-bluebird", + "transform-runtime", + "add-module-exports", + "syntax-dynamic-import" + ] } From 846797be764b59892b271b882627c9558e6fe3ce Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:48:18 +0100 Subject: [PATCH 03/12] add new babel plugins to deps --- package.json | 2 ++ yarn.lock | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ab32ffcff..e0c1244cf 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,9 @@ "babel-eslint": "^8.1.1", "babel-loader": "^7.1.5", "babel-plugin-add-module-exports": "^0.2.1", + "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-async-to-bluebird": "^1.1.1", + "babel-plugin-transform-builtin-extend": "^1.1.2", "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-runtime": "^6.23.0", diff --git a/yarn.lock b/yarn.lock index 3d00872b2..19f0c63f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1045,6 +1045,14 @@ babel-plugin-transform-async-to-generator@^6.24.1: babel-plugin-syntax-async-functions "^6.8.0" babel-runtime "^6.22.0" +babel-plugin-transform-builtin-extend@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-builtin-extend/-/babel-plugin-transform-builtin-extend-1.1.2.tgz#5e96fecf58b8fa1ed74efcad88475b2af3c9116e" + integrity sha1-Xpb+z1i4+h7XTvytiEdbKvPJEW4= + dependencies: + babel-runtime "^6.2.0" + babel-template "^6.3.0" + babel-plugin-transform-class-properties@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" @@ -1442,7 +1450,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: +babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -1450,7 +1458,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtim core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.9.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= From 49efece6c6929e9985b44cc63ecb299fa597ab2f Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:48:52 +0100 Subject: [PATCH 04/12] v1.1.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 f195a0cb9..6454ca09d 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.0.8", + "version": "1.1.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From cb155769d56a4c7264f0bc82340db5f36c640a84 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:49:39 +0100 Subject: [PATCH 05/12] Prepare changelog for v1.1.0-rc.1 --- CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41399ae90..1dd8410db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,52 @@ +Changes in [1.1.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.0-rc.1) (2019-04-30) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.8...v1.1.0-rc.1) + + * Convert redeploy.py to buildkite + [\#9577](https://github.com/vector-im/riot-web/pull/9577) + * Add package step to buildkite pipeline + [\#9568](https://github.com/vector-im/riot-web/pull/9568) + * Don't fail if there's no local config to remove + [\#9571](https://github.com/vector-im/riot-web/pull/9571) + * Change jenkins script to package script + [\#9567](https://github.com/vector-im/riot-web/pull/9567) + * Remove config.json from package dir + [\#9555](https://github.com/vector-im/riot-web/pull/9555) + * use the release version of olm 3.1.0 + [\#9550](https://github.com/vector-im/riot-web/pull/9550) + * Fix default for --include arg + [\#9517](https://github.com/vector-im/riot-web/pull/9517) + * update installation instructions with new repo + [\#9500](https://github.com/vector-im/riot-web/pull/9500) + * Use packages.matrix.org for Olm + [\#9498](https://github.com/vector-im/riot-web/pull/9498) + * Add separate platform electron build commands + [\#9412](https://github.com/vector-im/riot-web/pull/9412) + * Add support for custom profile directory + [\#9408](https://github.com/vector-im/riot-web/pull/9408) + * Improved mobile install guide + [\#9410](https://github.com/vector-im/riot-web/pull/9410) + * Remove vector-electron-desktop from README + [\#9404](https://github.com/vector-im/riot-web/pull/9404) + * Update from Weblate + [\#9398](https://github.com/vector-im/riot-web/pull/9398) + * bump olm version to 3.1.0-pre3 + [\#9392](https://github.com/vector-im/riot-web/pull/9392) + * Add expiration to mobile guide cookie + [\#9383](https://github.com/vector-im/riot-web/pull/9383) + * Fix autolaunch setting appearing toggled off + [\#9368](https://github.com/vector-im/riot-web/pull/9368) + * Don't try to save files the user didn't want to save + [\#9352](https://github.com/vector-im/riot-web/pull/9352) + * Setup crypto store for restore session tests + [\#9325](https://github.com/vector-im/riot-web/pull/9325) + * Update from Weblate + [\#9333](https://github.com/vector-im/riot-web/pull/9333) + * Add "Save image as..." button to context menu on images + [\#9326](https://github.com/vector-im/riot-web/pull/9326) + * Configure auth footer links through Riot config + [\#9297](https://github.com/vector-im/riot-web/pull/9297) + Changes in [1.0.8](https://github.com/vector-im/riot-web/releases/tag/v1.0.8) (2019-04-16) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.7...v1.0.8) From e4f997113d2b67e6a126d69c3549511760237ab1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 30 Apr 2019 12:49:40 +0100 Subject: [PATCH 06/12] v1.1.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0c1244cf..1c6db71b2 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.0.8", + "version": "1.1.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 7c5e39e1705a89fc5f667a5e75ad0cee8ccea0c8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 1 May 2019 11:45:11 +0100 Subject: [PATCH 07/12] Add new scalar staging url --- electron_app/riot.im/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index de3699891..cb60794c2 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -6,6 +6,7 @@ "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ + "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/api" ], From ee0b7e9c82ea522a1dbbc7cb09bc058575502115 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 4 May 2019 17:28:02 +0100 Subject: [PATCH 08/12] use right android app id --- src/vector/mobile_guide/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index e5efc7211..b2b14df38 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -235,7 +235,7 @@ body {

Android

If you have an Android device, install the Android Riot app from Google Play or F-droid.

- + Created with Sketch. From c81b9bab790b2bf8a26bb0141adba620d081903f Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 7 May 2019 15:52:50 +0100 Subject: [PATCH 09/12] Released react-sdk and js-sdk --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 1c6db71b2..0c830b923 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-rc.1", - "matrix-react-sdk": "^1.1.0-rc.1", + "matrix-js-sdk": "1.1.0", + "matrix-react-sdk": "1.1.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 19f0c63f9..8e64312e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5745,10 +5745,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w= -matrix-js-sdk@^1.1.0-rc.1: - version "1.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0-rc.1.tgz#11a9e9215e766274d99f44eff0a8c4d33d34f870" - integrity sha512-I87gvaMKKmFGDU8q4YUiEP0RVr0ni+v64TYaqllKV2zMGgl2serz+O9pvgfyGgzwFUQ77nPG7NGH4ku+S5I2LA== +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== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5770,10 +5770,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@^1.1.0-rc.1: - version "1.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0-rc.1.tgz#40a41c230001a29e1ae81618225b1607752ac529" - integrity sha512-0Mw0qYckD1Ft4HLkH5/PU4+rHbaYKvQDub+39prRh6uX7iM7Y91NObrzdAKnjMR59+aZKbUWvt8Tev7E3lDm5g== +matrix-react-sdk@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0.tgz#3f1c139cb4c33190b9dcb36a6e776d3ad53334f6" + integrity sha512-3JjyzbrmokzCl5Ss/0dWjUyc8EuO3uWvD3LBHZhTkFHe1uSiHjC2+Oy8hiJha8tubJtCWnQPE7tXIffkYmvdAQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5799,7 +5799,7 @@ matrix-react-sdk@^1.1.0-rc.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "^1.1.0-rc.1" + matrix-js-sdk "1.1.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 5c46bd37e81df80b14cca814059a4c5af049f4cd Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 7 May 2019 15:54:38 +0100 Subject: [PATCH 10/12] v1.1.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 6454ca09d..e4c024bbc 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.0-rc.1", + "version": "1.1.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 94979f7ff52457ef7ab0f86ddd83ab8786626881 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 7 May 2019 15:55:55 +0100 Subject: [PATCH 11/12] Prepare changelog for v1.1.0 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dd8410db..1ad302892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0) + + * Add Dockerfile + [\#9632](https://github.com/vector-im/riot-web/pull/9632) + * Add Dockerfile (part 2) + [\#9426](https://github.com/vector-im/riot-web/pull/9426) + * Add new scalar staging url + [\#9601](https://github.com/vector-im/riot-web/pull/9601) + Changes in [1.1.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.0-rc.1) (2019-04-30) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.8...v1.1.0-rc.1) From 2ab8db3c0c00eaa0f9ec18b84822bf62b6214d00 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 7 May 2019 15:55:56 +0100 Subject: [PATCH 12/12] v1.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c830b923..8f954f417 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.0-rc.1", + "version": "1.1.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {