From 7351c722be69afb48c7e6f270cd1a3b1812ab202 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 14 Aug 2023 09:07:43 +0100 Subject: [PATCH 1/2] Fix tests for Matrix v1.1 requirement (#25898) --- test/app-tests/loading-test.tsx | 12 +++++------- test/app-tests/server-config-test.ts | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index aacdb5da4b0..58d6583ea2b 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -158,10 +158,8 @@ describe("loading:", function () { async function expectAndAwaitSync(opts?: { isGuest?: boolean }): Promise { let syncRequest: (typeof MockHttpBackend.prototype.requests)[number] | null = null; httpBackend.when("GET", "/_matrix/client/versions").respond(200, { - versions: ["r0.3.0"], - unstable_features: { - "m.lazy_load_members": true, - }, + versions: ["v1.1"], + unstable_features: {}, }); const isGuest = opts?.isGuest; if (!isGuest) { @@ -220,7 +218,7 @@ describe("loading:", function () { }); // Pass the liveliness checks - httpBackend.when("GET", "/versions").respond(200, { versions: ["r0.4.0"] }); + httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); return sleep(1) @@ -270,7 +268,7 @@ describe("loading:", function () { }); // Pass the liveliness checks - httpBackend.when("GET", "/versions").respond(200, { versions: ["r0.4.0"] }); + httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); return awaitLoginComponent(matrixChat) @@ -283,7 +281,7 @@ describe("loading:", function () { // the only outstanding request should be a GET /login // (in particular there should be no /register request for // guest registration). - const allowedRequests = ["/_matrix/client/r0/login", "/versions", "/_matrix/identity/v2"]; + const allowedRequests = ["/_matrix/client/v3/login", "/versions", "/_matrix/identity/v2"]; for (const req of httpBackend.requests) { if (req.method === "GET" && allowedRequests.find((p) => req.path.endsWith(p))) { continue; diff --git a/test/app-tests/server-config-test.ts b/test/app-tests/server-config-test.ts index 22b83044581..b469daf28d3 100644 --- a/test/app-tests/server-config-test.ts +++ b/test/app-tests/server-config-test.ts @@ -29,7 +29,7 @@ describe("Loading server config", function () { PlatformPeg.set(new WebPlatform()); fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { unstable_features: {}, - versions: [], + versions: ["v1.1"], }); fetchMock.get("https://matrix.org/.well-known/matrix/client", { "m.homeserver": { From fb984abf12ef310a664d0d3cdda17d9fe09e1221 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 09:16:12 +0100 Subject: [PATCH 2/2] Update all non-major dependencies (#25938) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 90 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/yarn.lock b/yarn.lock index e9cca421e0f..2293718c3c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1893,6 +1893,16 @@ "@sentry/utils" "7.61.1" tslib "^2.4.1 || ^1.9.3" +"@sentry-internal/tracing@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.63.0.tgz#58903b2205456034611cc5bc1b5b2479275f89c7" + integrity sha512-Fxpc53p6NGvLSURg3iRvZA0k10K9yfeVhtczvJnpX30POBuV41wxpkLHkb68fjksirjEma1K3Ut1iLOEEDpPQg== + dependencies: + "@sentry/core" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/browser@^7.0.0": version "7.61.1" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.61.1.tgz#ce5005ea76d4c2e91c09a43b218c25cc5e9c1340" @@ -1905,10 +1915,10 @@ "@sentry/utils" "7.61.1" tslib "^2.4.1 || ^1.9.3" -"@sentry/bundler-plugin-core@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.6.0.tgz#e7e5b2ab25e2650900008d594d44335e56add0df" - integrity sha512-3oYJKacxzKg4Xw5t2crsJCeE1/wsN1g3p5o2mesNm+KvP6ovgz8+cqxq5dJigNYqfR9KTSUFo+ZLhOy/pyfkmw== +"@sentry/bundler-plugin-core@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.6.2.tgz#57fb61122414adc244d79184548f330808c7b858" + integrity sha512-j2BOd8kl2NzexQaeNNc4uqteudK1lNngGP99zjTEj1BV/I5vOOR7PnrmQLXkLJOp5paGKKfelY9RHSVnvFf+Dw== dependencies: "@sentry/cli" "^2.20.1" "@sentry/node" "^7.60.0" @@ -1920,9 +1930,9 @@ unplugin "1.0.1" "@sentry/cli@^2.20.1": - version "2.20.4" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.20.4.tgz#755719aeaa58dbd3910ee23cc020decc16f5a5bf" - integrity sha512-mycBCKQmLdaJpSKpXc3IXrQwb5HLxrdjgJgLGbb8saFHIkXl/1ePH171j+REq4dIP1uetu0bdDgEYj6AQjkleQ== + version "2.20.5" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.20.5.tgz#255a5388ca24c211a0eae01dcc4ad813a7ff335a" + integrity sha512-ZvWb86eF0QXH9C5Mbi87aUmr8SH848yEpXJmlM2AoBowpE9kKDnewCAKvyXUihojUFwCSEEjoJhrRMMgmCZqXA== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -1939,15 +1949,24 @@ "@sentry/utils" "7.61.1" tslib "^2.4.1 || ^1.9.3" -"@sentry/node@^7.60.0": - version "7.61.1" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.61.1.tgz#bc49d321d0a511936f8bdd0bbd3ddc5e01b8d98c" - integrity sha512-+crVAeymXdWZcDuwU9xySf4sVv2fHOFlr13XqeXl73q4zqKJM1IX4VUO9On3+jTyGfB5SCAuBBYpzA3ehBfeYw== +"@sentry/core@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.63.0.tgz#8c38da6ef3a1de6e364463a09bc703b196ecbba4" + integrity sha512-13Ljiq8hv6ieCkO+Am99/PljYJO5ynKT/hRQrWgGy9IIEgUr8sV3fW+1W6K4/3MCeOJou0HsiGBjOD1mASItVg== dependencies: - "@sentry-internal/tracing" "7.61.1" - "@sentry/core" "7.61.1" - "@sentry/types" "7.61.1" - "@sentry/utils" "7.61.1" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" + +"@sentry/node@^7.60.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.63.0.tgz#38508a440c04c0e98d00f5a1855e5448ee70c8d6" + integrity sha512-tSMyfQNbfjX1w8vJDZtvWeaD4QQ/Z4zVW/TLXfL/JZFIIksPgDZmqLdF+NJS4bSGTU5JiHiUh4pYhME4mHgNBQ== + dependencies: + "@sentry-internal/tracing" "7.63.0" + "@sentry/core" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" @@ -1974,7 +1993,12 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.61.1.tgz#225912689459c92e62f0b6e3ff145f6dbf72ff0e" integrity sha512-CpPKL+OfwYOduRX9AT3p+Ie1fftgcCPd5WofTVVq7xeWRuerOOf2iJd0v+8yHQ25omgres1YOttDkCcvQRn4Jw== -"@sentry/utils@7.61.1", "@sentry/utils@^7.60.0": +"@sentry/types@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.63.0.tgz#8032029fee6f70e04b667646626a674b03e2f79b" + integrity sha512-pZNwJVW7RqNLGuTUAhoygt0c9zmc0js10eANAz0MstygJRhQI1tqPDuiELVdujPrbeL+IFKF+7NvRDAydR2Niw== + +"@sentry/utils@7.61.1": version "7.61.1" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.61.1.tgz#1545db778b7309d122a7f04eb0e803173c80c581" integrity sha512-pUPXoiuYrTEPcBHjRizFB6eZEGm/6cTBwdWSHUjkGKvt19zuZ1ixFJQV6LrIL/AMeiQbmfQ+kTd/8SR7E9rcTQ== @@ -1982,12 +2006,20 @@ "@sentry/types" "7.61.1" tslib "^2.4.1 || ^1.9.3" +"@sentry/utils@7.63.0", "@sentry/utils@^7.60.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.63.0.tgz#7c598553b4dbb6e3740dc96bc7f112ec32edbe69" + integrity sha512-7FQv1RYAwnuTuarruP+1+Jd6YQuN7i/Y7KltwPMVEwU7j5mzYQaexLr/Jz1XIdR2KYVdkbXQyP8jj8BmA6u9Jw== + dependencies: + "@sentry/types" "7.63.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/webpack-plugin@^2.0.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.6.0.tgz#42019c1a006ba6c9af166d74960b7d5c1f992bce" - integrity sha512-sOYcwdqD174vXzht1hifQ45REcDolMURHniEhqjXfbUAwOj4vujlQD16ikwfJKsglh4Tt6dplGDdTe2+tp598Q== + version "2.6.2" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.6.2.tgz#b2b2a43f13ca1269e29fd802facded036a599452" + integrity sha512-Zsy0RCuSdxtGSbjmlWHTL4c2ZH7B2tCcztR+tVjLfcsbYq587zqvtU422oe/Ea2gk8Y+MN9al2fYhJ4iTHFf+Q== dependencies: - "@sentry/bundler-plugin-core" "2.6.0" + "@sentry/bundler-plugin-core" "2.6.2" unplugin "1.0.1" uuid "^9.0.0" @@ -8305,9 +8337,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" "lru-cache@^9.1.1 || ^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61" - integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw== + version "10.0.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" + integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== lru-queue@^0.1.0: version "0.1.0" @@ -8855,9 +8887,9 @@ minipass@^5.0.0: integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== "minipass@^5.0.0 || ^6.0.2 || ^7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e" - integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA== + version "7.0.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974" + integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg== minizlib@^2.1.1: version "2.1.2" @@ -12030,9 +12062,9 @@ stylelint-config-standard@^34.0.0: stylelint-config-recommended "^13.0.0" stylelint-scss@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.0.1.tgz#b33a6580b5734eace083cfc2cc3021225e28547f" - integrity sha512-n87iCRZrr2J7//I/QFsDXxFLnHKw633U4qvWZ+mOW6KDAp/HLj06H+6+f9zOuTYy+MdGdTuCSDROCpQIhw5fvQ== + version "5.1.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.1.0.tgz#dd318bc5c65f7a11f3ecacc7b6e8b67e7f2f1df1" + integrity sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA== dependencies: postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1"