From ad8bd62ae66582ebf962cfb1449dc37bb5615fa3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 14:15:40 +0000 Subject: [PATCH 01/19] bump electron version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c8785572b..8af4ee312e 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "7.1.7", + "electronVersion": "7.1.9", "files": [ "node_modules/**", "src/**" From c3a5e2e5d39d347fe7bc8bc9577f5ad9b130b57d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 14:36:12 +0000 Subject: [PATCH 02/19] react-sdk & js-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 65 +++++++++++----------------------------------------- 2 files changed, 15 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 8af4ee312e..f2be192673 100644 --- a/package.json +++ b/package.json @@ -65,8 +65,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "3.0.0", - "matrix-react-sdk": "1.7.6", + "matrix-js-sdk": "4.0.0-rc.1", + "matrix-react-sdk": "2.0.0-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 4ad9edec33..97ecab3abf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2117,11 +2117,6 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" -babel-plugin-syntax-dynamic-import@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" - integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo= - babel-preset-jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" @@ -5218,17 +5213,6 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" -glob@^5.0.14: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -5736,11 +5720,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -humanize@^0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4" - integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ= - iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6479,7 +6458,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= @@ -7395,11 +7374,6 @@ loglevel@^1.6.4, loglevel@^1.6.6: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== -lolex@4.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7" - integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg== - longest-streak@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105" @@ -7561,10 +7535,10 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== -matrix-js-sdk@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0.tgz#97908f9eda9eeb3ba0333b7e474c45f2b258e50c" - integrity sha512-lzUMwJAZHw7Dk0K+rubqe6kEpy4+pJ+qCp8n6lisfdKfMDJXdNCkjiiXRnakM1ZD4PFYK8ju89+NfxlyhAAd4A== +matrix-js-sdk@4.0.0-rc.1: + version "4.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e" + integrity sha512-1tP9fUCU5I4bXQQHuVlKHbpySh71aM6sugVC6L8ikG1ebZuKkAc2tXf1tiHizp3hZadHoTZ1PGH19ZFlKDZ8Qw== dependencies: another-json "^0.2.0" browser-request "^0.3.3" @@ -7583,13 +7557,11 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.6.tgz#cbd0a2e615290dcc2e134835bb93d626a0f8ced8" - integrity sha512-HVHJaetJ+8+eQvJNUJU5WMcMqwM8ZigzYauivo2SFlPieoRR2SXBso8oJx27FpKL5ZJT/slOygTHkFLtHiEQfw== +matrix-react-sdk@2.0.0-rc.1: + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.0.0-rc.1.tgz#fc20d6ddb7f41d0be1ccbf2cdeb0f46df1260cf5" + integrity sha512-UsocaDt4y3pwKziXMpGkiIjGqG5x2DAXvqbMnH5M3vd/jrICawYOcRjPWTJldjuq45raH993lmx3BVou3oNDRQ== dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - babel-runtime "^6.26.0" blueimp-canvas-to-blob "^3.5.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" @@ -7609,23 +7581,18 @@ matrix-react-sdk@1.7.6: fuse.js "^2.2.0" gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" - glob "^5.0.14" glob-to-regexp "^0.4.1" highlight.js "^9.15.8" - humanize "^0.0.9" + html-entities "^1.2.1" is-ip "^2.0.0" - isomorphic-fetch "^2.2.1" linkifyjs "^2.1.6" lodash "^4.17.14" - lolex "4.2" - matrix-js-sdk "3.0.0" - optimist "^0.6.1" + matrix-js-sdk "4.0.0-rc.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" - querystring "^0.2.0" react "^16.9.0" react-addons-css-transition-group "15.6.2" react-beautiful-dnd "^4.0.1" @@ -7638,7 +7605,6 @@ matrix-react-sdk@1.7.6: url "^0.11.0" velocity-animate "^1.5.2" what-input "^5.2.6" - whatwg-fetch "^1.1.1" zxcvbn "^4.4.2" matrix-react-test-utils@^0.2.2: @@ -7858,7 +7824,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -9876,7 +9842,7 @@ querystring-es3@^0.2.0: resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= @@ -12491,11 +12457,6 @@ whatwg-fetch@^0.9.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0" integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA= -whatwg-fetch@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319" - integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk= - whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" From db030d9733ef138e4bde781431bf2bda0b9a05b6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 16:55:07 +0000 Subject: [PATCH 03/19] Fix webpack to babel js-sdk & react-sdk but no other deps This was happening implicitly in our dev setups and the CI build because of the comment on the last line. --- webpack.config.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 255f0ce255..f0dd47f791 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -109,7 +109,23 @@ module.exports = (env, argv) => { rules: [ { test: /\.(ts|js)x?$/, - exclude: /node_modules/, + include: (f) => { + // we use the original source files of react-sdk and js-sdk, so we need to + // run them through babel. + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk'))) return true; + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk'))) return true; + // but we can't run all of our dependencies through babel (many of them still + // use module.exports which breaks if babel injects an 'include' for its + // polyfills: probably fixable but babeling all our dependencies is probably + // not necessary anyway). + if (f.startsWith(path.resolve(__dirname, 'node_modules'))) return false; + // anything else gets babeled (our own source files, and also modules that + // are yarn linked from somewhere else because this tests the absolute, + // resolved path, so react-sdk and js-sdk fall under this case in a standard + // dev setup. This will presumably start running any other module through + // babel if yarn linked... caveat emptor. + return true; + }, loader: 'babel-loader', options: { cacheDirectory: true From 2e2e09ed2b40ff241e85aa85e11ac8a646a10def Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 18:00:38 +0000 Subject: [PATCH 04/19] Fix build to not babel modules inside js/react sdk Adds 'src' to react-sdk & js-sdk babel test path so we don't run node modules inside js & react sdk through babel --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index f0dd47f791..01d3833973 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -112,8 +112,8 @@ module.exports = (env, argv) => { include: (f) => { // we use the original source files of react-sdk and js-sdk, so we need to // run them through babel. - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk'))) return true; - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk'))) return true; + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk', 'src'))) return true; + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk', 'src'))) return true; // but we can't run all of our dependencies through babel (many of them still // use module.exports which breaks if babel injects an 'include' for its // polyfills: probably fixable but babeling all our dependencies is probably From c197c2f4fd32ba6755459a5a49164d8583b4992c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 18:20:41 +0000 Subject: [PATCH 05/19] Third try at fixing build --- webpack.config.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 01d3833973..95087f7df6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -110,21 +110,21 @@ module.exports = (env, argv) => { { test: /\.(ts|js)x?$/, include: (f) => { + // our own source needs babel-ing + if (f.startsWith(path.resolve(__dirname, 'src'))) return true; + // we use the original source files of react-sdk and js-sdk, so we need to - // run them through babel. - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk', 'src'))) return true; - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk', 'src'))) return true; + // run them through babel. Because the path tested is the resolved, absolute + // path, these could be anywhere thanks to yarn link. We must also not + // include node modules inside these modules, so we add 'src'. + if (f.includes(path.join('matrix-js-sdk', 'src'))) return true; + if (f.includes(path.join('matrix-react-sdk', 'src'))) return true; + // but we can't run all of our dependencies through babel (many of them still // use module.exports which breaks if babel injects an 'include' for its // polyfills: probably fixable but babeling all our dependencies is probably - // not necessary anyway). - if (f.startsWith(path.resolve(__dirname, 'node_modules'))) return false; - // anything else gets babeled (our own source files, and also modules that - // are yarn linked from somewhere else because this tests the absolute, - // resolved path, so react-sdk and js-sdk fall under this case in a standard - // dev setup. This will presumably start running any other module through - // babel if yarn linked... caveat emptor. - return true; + // not necessary anyway). So, for anything else, don't babel. + return false; }, loader: 'babel-loader', options: { From 8c103b50af0eed1cf94a6d3536554d4aa4b6a765 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 20 Jan 2020 18:09:48 -0700 Subject: [PATCH 06/19] Fix webpack config (by stealing Dave's config) Without doing something like this it's hard to use `yarn link`ed resources. --- webpack.config.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 95087f7df6..ae92e8154f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,6 +21,12 @@ module.exports = (env, argv) => { development['devtool'] = 'eval-source-map'; } + // Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we + // don't have to call them over and over. We also resolve to the package.json instead of the src + // directory so we don't have to rely on a index.js or similar file existing. + const reactSdkSrcDir = path.resolve(path.join(require.resolve("matrix-react-sdk/package.json"), '..', 'src')); + const jsSdkSrcDir = path.resolve(path.join(require.resolve("matrix-js-sdk/package.json"), '..', 'src')); + return { ...development, @@ -117,8 +123,8 @@ module.exports = (env, argv) => { // run them through babel. Because the path tested is the resolved, absolute // path, these could be anywhere thanks to yarn link. We must also not // include node modules inside these modules, so we add 'src'. - if (f.includes(path.join('matrix-js-sdk', 'src'))) return true; - if (f.includes(path.join('matrix-react-sdk', 'src'))) return true; + if (f.startsWith(reactSdkSrcDir)) return true; + if (f.startsWith(jsSdkSrcDir)) return true; // but we can't run all of our dependencies through babel (many of them still // use module.exports which breaks if babel injects an 'include' for its From d4e46108c46b74e07babbf1fe247fa80f91f9e34 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 21 Jan 2020 10:16:32 +0000 Subject: [PATCH 07/19] path.resolve does joining too so path.join is redundant --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index ae92e8154f..40e902b111 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -24,8 +24,8 @@ module.exports = (env, argv) => { // Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we // don't have to call them over and over. We also resolve to the package.json instead of the src // directory so we don't have to rely on a index.js or similar file existing. - const reactSdkSrcDir = path.resolve(path.join(require.resolve("matrix-react-sdk/package.json"), '..', 'src')); - const jsSdkSrcDir = path.resolve(path.join(require.resolve("matrix-js-sdk/package.json"), '..', 'src')); + const reactSdkSrcDir = path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src'); + const jsSdkSrcDir = path.resolve(require.resolve("matrix-js-sdk/package.json"), '..', 'src'); return { ...development, From 8913eba60d786a45682bc345988c6c104c53e8f1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 22 Jan 2020 13:06:37 +0000 Subject: [PATCH 08/19] react-sdk rc.2 --- package.json | 2 +- yarn.lock | 71 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f2be192673..e74e02281c 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "4.0.0-rc.1", - "matrix-react-sdk": "2.0.0-rc.1", + "matrix-react-sdk": "1.7.6", "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 97ecab3abf..910055985d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2117,6 +2117,11 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-syntax-dynamic-import@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" + integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo= + babel-preset-jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" @@ -5213,6 +5218,17 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" +glob@^5.0.14: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -5720,6 +5736,11 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +humanize@^0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4" + integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ= + iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6458,7 +6479,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@^2.1.1: +isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= @@ -7374,6 +7395,11 @@ loglevel@^1.6.4, loglevel@^1.6.6: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== +lolex@4.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7" + integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg== + longest-streak@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105" @@ -7535,6 +7561,20 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== +matrix-js-sdk@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0.tgz#97908f9eda9eeb3ba0333b7e474c45f2b258e50c" + integrity sha512-lzUMwJAZHw7Dk0K+rubqe6kEpy4+pJ+qCp8n6lisfdKfMDJXdNCkjiiXRnakM1ZD4PFYK8ju89+NfxlyhAAd4A== + dependencies: + 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@4.0.0-rc.1: version "4.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e" @@ -7557,11 +7597,13 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.0.0-rc.1: - version "2.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.0.0-rc.1.tgz#fc20d6ddb7f41d0be1ccbf2cdeb0f46df1260cf5" - integrity sha512-UsocaDt4y3pwKziXMpGkiIjGqG5x2DAXvqbMnH5M3vd/jrICawYOcRjPWTJldjuq45raH993lmx3BVou3oNDRQ== +matrix-react-sdk@1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.6.tgz#cbd0a2e615290dcc2e134835bb93d626a0f8ced8" + integrity sha512-HVHJaetJ+8+eQvJNUJU5WMcMqwM8ZigzYauivo2SFlPieoRR2SXBso8oJx27FpKL5ZJT/slOygTHkFLtHiEQfw== dependencies: + babel-plugin-syntax-dynamic-import "^6.18.0" + babel-runtime "^6.26.0" blueimp-canvas-to-blob "^3.5.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" @@ -7581,18 +7623,23 @@ matrix-react-sdk@2.0.0-rc.1: fuse.js "^2.2.0" gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" + glob "^5.0.14" glob-to-regexp "^0.4.1" highlight.js "^9.15.8" - html-entities "^1.2.1" + humanize "^0.0.9" is-ip "^2.0.0" + isomorphic-fetch "^2.2.1" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "4.0.0-rc.1" + lolex "4.2" + matrix-js-sdk "3.0.0" + 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" + querystring "^0.2.0" react "^16.9.0" react-addons-css-transition-group "15.6.2" react-beautiful-dnd "^4.0.1" @@ -7605,6 +7652,7 @@ matrix-react-sdk@2.0.0-rc.1: url "^0.11.0" velocity-animate "^1.5.2" what-input "^5.2.6" + whatwg-fetch "^1.1.1" zxcvbn "^4.4.2" matrix-react-test-utils@^0.2.2: @@ -7824,7 +7872,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.2, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -9842,7 +9890,7 @@ querystring-es3@^0.2.0: resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0: +querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= @@ -12457,6 +12505,11 @@ whatwg-fetch@^0.9.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0" integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA= +whatwg-fetch@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319" + integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk= + whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" From 323762ffa7670ccb64cbb1b253b0302e8a4b4a61 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 13:16:19 +0000 Subject: [PATCH 09/19] v1.5.8-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 b22b2851b9..c282dc0cd7 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.7", + "version": "1.5.8-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 5673d51cecadd1c41a410f126d06eba42460323b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 13:22:18 +0000 Subject: [PATCH 10/19] Prepare changelog for v1.5.8-rc.1 --- CHANGELOG.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4265124e6..084b07f0f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,64 @@ +Changes in [1.5.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.8-rc.1) (2020-01-22) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.7...v1.5.8-rc.1) + +This version contains an upgrade to the cryptography database +version. Once users run this version, their session's indexeddb +store will be upgraded and older version of Riot will no longer +be able to read it. Users will have to log out and log in if +the version of Riot is downgraded back to a previous version. + + * Fix webpack config (by stealing Dave's config) + [\#11994](https://github.com/vector-im/riot-web/pull/11994) + * Fix webpack to babel js-sdk & react-sdk but no other deps + [\#11947](https://github.com/vector-im/riot-web/pull/11947) + * Update from Weblate + [\#11934](https://github.com/vector-im/riot-web/pull/11934) + * Fix rageshake post-sourcemaps + [\#11926](https://github.com/vector-im/riot-web/pull/11926) + * Fix yarn start concurrent commands + [\#11895](https://github.com/vector-im/riot-web/pull/11895) + * Run the react-sdk reskindexer for developers + [\#11894](https://github.com/vector-im/riot-web/pull/11894) + * Update labs documentation for feature_ftue_dms given new scope + [\#11893](https://github.com/vector-im/riot-web/pull/11893) + * Fix indentation on webpack config and make sourcemapped files legible + [\#11892](https://github.com/vector-im/riot-web/pull/11892) + * Remove spinner check + [\#11891](https://github.com/vector-im/riot-web/pull/11891) + * Don't minifiy builds of develop through CI packaging + [\#11867](https://github.com/vector-im/riot-web/pull/11867) + * Use Jest for tests + [\#11869](https://github.com/vector-im/riot-web/pull/11869) + * Support application/wasm in Docker image + [\#11858](https://github.com/vector-im/riot-web/pull/11858) + * Fix sourcemaps by refactoring the build system + [\#11843](https://github.com/vector-im/riot-web/pull/11843) + * Disable event indexing on develop + [\#11850](https://github.com/vector-im/riot-web/pull/11850) + * Updated blog url + [\#11792](https://github.com/vector-im/riot-web/pull/11792) + * Enable and document presence in room list feature flag + [\#11829](https://github.com/vector-im/riot-web/pull/11829) + * Add stub service worker so users can install on desktop with Chrome + [\#11774](https://github.com/vector-im/riot-web/pull/11774) + * Update from Weblate + [\#11826](https://github.com/vector-im/riot-web/pull/11826) + * Sourcemaps: develop -> feature branch + [\#11802](https://github.com/vector-im/riot-web/pull/11802) + * Update build scripts for new process + [\#11801](https://github.com/vector-im/riot-web/pull/11801) + * Make the webpack config work for us + [\#11712](https://github.com/vector-im/riot-web/pull/11712) + * Updates URL for Electron Command Line Switches + [\#11810](https://github.com/vector-im/riot-web/pull/11810) + * Import from src/ for the react-sdk and js-sdk + [\#11714](https://github.com/vector-im/riot-web/pull/11714) + * Convert components to ES6 exports + [\#11713](https://github.com/vector-im/riot-web/pull/11713) + * Remove now-retired package.json property + [\#11660](https://github.com/vector-im/riot-web/pull/11660) + Changes in [1.5.7](https://github.com/vector-im/riot-web/releases/tag/v1.5.7) (2020-01-13) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.7-rc.2...v1.5.7) From ebd3f0e4e1175c1e73ecf7a1e410e50acc9edfcf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 13:22:19 +0000 Subject: [PATCH 11/19] v1.5.8-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e74e02281c..ae3635f940 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.7", + "version": "1.5.8-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From eb5e14661d1a44456b63019461e5d2721b671ba6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 22 Jan 2020 14:20:46 +0000 Subject: [PATCH 12/19] Actually pull in react-sdk rc.2 --- package.json | 2 +- yarn.lock | 71 +++++++--------------------------------------------- 2 files changed, 10 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index ae3635f940..e032b68455 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "4.0.0-rc.1", - "matrix-react-sdk": "1.7.6", + "matrix-react-sdk": "2.0.0-rc.2", "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 910055985d..e7a0a21113 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2117,11 +2117,6 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" -babel-plugin-syntax-dynamic-import@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" - integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo= - babel-preset-jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" @@ -5218,17 +5213,6 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" -glob@^5.0.14: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -5736,11 +5720,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -humanize@^0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4" - integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ= - iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6479,7 +6458,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= @@ -7395,11 +7374,6 @@ loglevel@^1.6.4, loglevel@^1.6.6: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== -lolex@4.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7" - integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg== - longest-streak@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105" @@ -7561,20 +7535,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== -matrix-js-sdk@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0.tgz#97908f9eda9eeb3ba0333b7e474c45f2b258e50c" - integrity sha512-lzUMwJAZHw7Dk0K+rubqe6kEpy4+pJ+qCp8n6lisfdKfMDJXdNCkjiiXRnakM1ZD4PFYK8ju89+NfxlyhAAd4A== - dependencies: - 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@4.0.0-rc.1: version "4.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e" @@ -7597,13 +7557,11 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.6.tgz#cbd0a2e615290dcc2e134835bb93d626a0f8ced8" - integrity sha512-HVHJaetJ+8+eQvJNUJU5WMcMqwM8ZigzYauivo2SFlPieoRR2SXBso8oJx27FpKL5ZJT/slOygTHkFLtHiEQfw== +matrix-react-sdk@2.0.0-rc.2: + version "2.0.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.0.0-rc.2.tgz#e6d547221374b94f0e47b5f4736cac3877cc1eff" + integrity sha512-5rVoaO4bsaUoYavWS6TnUrXYMv9FV0n4534zEFtFOK/du9zjqGt101oNZaiWMJUGmEv5HRzT8tvlQMREjpRLfg== dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - babel-runtime "^6.26.0" blueimp-canvas-to-blob "^3.5.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" @@ -7623,23 +7581,18 @@ matrix-react-sdk@1.7.6: fuse.js "^2.2.0" gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" - glob "^5.0.14" glob-to-regexp "^0.4.1" highlight.js "^9.15.8" - humanize "^0.0.9" + html-entities "^1.2.1" is-ip "^2.0.0" - isomorphic-fetch "^2.2.1" linkifyjs "^2.1.6" lodash "^4.17.14" - lolex "4.2" - matrix-js-sdk "3.0.0" - optimist "^0.6.1" + matrix-js-sdk "4.0.0-rc.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" - querystring "^0.2.0" react "^16.9.0" react-addons-css-transition-group "15.6.2" react-beautiful-dnd "^4.0.1" @@ -7652,7 +7605,6 @@ matrix-react-sdk@1.7.6: url "^0.11.0" velocity-animate "^1.5.2" what-input "^5.2.6" - whatwg-fetch "^1.1.1" zxcvbn "^4.4.2" matrix-react-test-utils@^0.2.2: @@ -7872,7 +7824,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -9890,7 +9842,7 @@ querystring-es3@^0.2.0: resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= @@ -12505,11 +12457,6 @@ whatwg-fetch@^0.9.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0" integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA= -whatwg-fetch@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319" - integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk= - whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" From cd3fafb2b0dc09bc5852131b991c6b39ebc67895 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 14:22:40 +0000 Subject: [PATCH 13/19] v1.5.8-rc.2 --- 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 c282dc0cd7..02ed9b6ca2 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.8-rc.1", + "version": "1.5.8-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 43c35a760bdf262e29e4fd47d7f3c836a3726273 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 14:24:49 +0000 Subject: [PATCH 14/19] Prepare changelog for v1.5.8-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 084b07f0f1..1f42611bc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.8-rc.2) (2020-01-22) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.8-rc.1...v1.5.8-rc.2) + + * Fix incorrect version of react-sdk + Changes in [1.5.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.8-rc.1) (2020-01-22) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.7...v1.5.8-rc.1) From 902252ad935ab0298b6e6ab73cffc7e610986809 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 22 Jan 2020 14:24:50 +0000 Subject: [PATCH 15/19] v1.5.8-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e032b68455..62ad69a9a7 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.8-rc.1", + "version": "1.5.8-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From dd26d43173cbf9e89da0f3169f1a25440d2f4f12 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jan 2020 11:52:18 +0000 Subject: [PATCH 16/19] js-sdk 4.0.0 & react-sdk 2.0.0 --- package.json | 4 ++-- yarn.lock | 27 ++++++++++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 62ad69a9a7..5acf84242f 100644 --- a/package.json +++ b/package.json @@ -65,8 +65,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "4.0.0-rc.1", - "matrix-react-sdk": "2.0.0-rc.2", + "matrix-js-sdk": "4.0.0", + "matrix-react-sdk": "2.0.0", "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 e7a0a21113..9501fb60e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1010,6 +1010,13 @@ dependencies: regenerator-runtime "^0.13.2" +"@babel/runtime@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1" + integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/template@^7.4.0", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" @@ -7535,11 +7542,12 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== -matrix-js-sdk@4.0.0-rc.1: - version "4.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e" - integrity sha512-1tP9fUCU5I4bXQQHuVlKHbpySh71aM6sugVC6L8ikG1ebZuKkAc2tXf1tiHizp3hZadHoTZ1PGH19ZFlKDZ8Qw== +matrix-js-sdk@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0.tgz#c81bdc905af2ab1634527e5f542f2f15977d31cf" + integrity sha512-Xbe36xL443qtEBH4xk0k39JabolqZfloK7fwYGMb/PgWO26VOzvw94XWahnIr5w83oxBAF9nFmP+7EnPG6IHnA== dependencies: + "@babel/runtime" "^7.8.3" another-json "^0.2.0" browser-request "^0.3.3" bs58 "^4.0.1" @@ -7557,11 +7565,12 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.0.0-rc.2: - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.0.0-rc.2.tgz#e6d547221374b94f0e47b5f4736cac3877cc1eff" - integrity sha512-5rVoaO4bsaUoYavWS6TnUrXYMv9FV0n4534zEFtFOK/du9zjqGt101oNZaiWMJUGmEv5HRzT8tvlQMREjpRLfg== +matrix-react-sdk@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.0.0.tgz#43f90a2b5346bcf288867f40ee83de9e1fa67b6d" + integrity sha512-/ucs950t+Q2O+/QTej7aXA36hi8lVBM12T8NciSmMFYIuKn8+1yL/tQjomZGTxmsVq2U8188X6CGCuwPrZzmGg== dependencies: + "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" @@ -7587,7 +7596,7 @@ matrix-react-sdk@2.0.0-rc.2: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "4.0.0-rc.1" + matrix-js-sdk "4.0.0" pako "^1.0.5" png-chunks-extract "^1.0.0" prop-types "^15.5.8" From 15a77e88262dde248c964418b96c99c28b406f8c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jan 2020 11:52:56 +0000 Subject: [PATCH 17/19] v1.5.8 --- 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 02ed9b6ca2..4af708ae33 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.8-rc.2", + "version": "1.5.8", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 5d01384af216609a5b863a6ca7878d3c6005fbe4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jan 2020 11:57:49 +0000 Subject: [PATCH 18/19] Prepare changelog for v1.5.8 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f42611bc8..ec6d178454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.8](https://github.com/vector-im/riot-web/releases/tag/v1.5.8) (2020-01-27) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.8-rc.2...v1.5.8) + + * Fixes for alias display and copy / paste on composer + Changes in [1.5.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.8-rc.2) (2020-01-22) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.8-rc.1...v1.5.8-rc.2) From 768cabe4bb051b03b0798b8600ee2788c67e3ecd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jan 2020 11:57:49 +0000 Subject: [PATCH 19/19] v1.5.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5acf84242f..d4409c470d 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.8-rc.2", + "version": "1.5.8", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {