From a26818ee3b882a5186805cb660a75174bd1a23e3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 25 Jun 2024 12:51:49 +0000 Subject: [PATCH 001/167] Upgrade dependency to matrix-js-sdk@34.0.0-rc.0 --- package.json | 2 +- yarn.lock | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ee2ab2e537b..2d546181123 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "34.0.0-rc.0", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 4a0d7b5caf8..6eb82ca1494 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2157,6 +2157,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-5.0.0.tgz#f45a7bccaad218c05bcf9e7c8ca783c9d9a07af4" integrity sha512-37ASjCKSTU5ycGfkP+LUXG4Ok6OAf6vE+1qU6uwWhe6FwadCS3vVWzJYd/3d9BQFwsx4GhFTIAXrW4iLG85rmQ== +"@matrix-org/matrix-sdk-crypto-wasm@^6.0.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-6.1.0.tgz#1cedf2bcbd6795e297fd45ea4a33f2c8c5204fdd" + integrity sha512-8Wn4TT9PEJswfE8+6mA60JHrxyiWYXfM4EM5800tLz+Rl9QRGk9JDF0o0cTb26v6bfXTa3/pCGWAkUVk0ROPEw== + "@matrix-org/matrix-wysiwyg@2.37.3": version "2.37.3" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.3.tgz#3f068252948f036b3d233828aecf856f74f9d7f1" @@ -8329,6 +8334,26 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@34.0.0-rc.0: + version "34.0.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.0.tgz#18582d596733f2025d34a851f5f4f3ea4a0c86b9" + integrity sha512-00jqXL4vaoG1T9LpufDo8VccWjKjVRTL4bPgzrN6UkCZNFS0TT9AO8UTNRtZiGx0KvfBnrZoKc11jonuaWbPuw== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "33.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/987ec1e62fcdbd626d5abcba5e9dcdaa9eaaa758" From 039b2d421f3c9231c77396f4b6922e936c5dd55f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 25 Jun 2024 12:57:33 +0000 Subject: [PATCH 002/167] Upgrade dependency to matrix-react-sdk@3.102.0-rc.0 --- package.json | 2 +- yarn.lock | 73 ++++++++++++++++++---------------------------------- 2 files changed, 26 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 2d546181123..ea188a4d4f5 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.0.0-rc.0", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.102.0-rc.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 6eb82ca1494..09ae8146375 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2152,11 +2152,6 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-5.0.0.tgz#f45a7bccaad218c05bcf9e7c8ca783c9d9a07af4" - integrity sha512-37ASjCKSTU5ycGfkP+LUXG4Ok6OAf6vE+1qU6uwWhe6FwadCS3vVWzJYd/3d9BQFwsx4GhFTIAXrW4iLG85rmQ== - "@matrix-org/matrix-sdk-crypto-wasm@^6.0.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-6.1.0.tgz#1cedf2bcbd6795e297fd45ea4a33f2c8c5204fdd" @@ -3518,10 +3513,10 @@ dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^4.6.0": - version "4.6.1" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.6.1.tgz#9f6af394a1df6a5092a5780d9b9d161b79de8229" - integrity sha512-0MGBTS1NiIL1wQsGLulRHnq9rxckpBT+7aiEnJvnbplUYAIQkSYpETO7eUAOmRu6Awhy5EP+OJ/urZLKdPLQtw== +"@vector-im/compound-web@^4.9.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.10.0.tgz#5403c9933af91d432b5fb5f92a305acadc810893" + integrity sha512-SPeol6FK/h/q8ChHyuCCncUIVoIGNdPODBf7UqvaohRjt8EzyAAHKP89l1YhWKqEaOtG67+28IXoFvdS46tbUA== dependencies: "@floating-ui/react" "^0.26.9" "@floating-ui/react-dom" "^2.0.8" @@ -5474,10 +5469,10 @@ emojibase-data@^15.0.0: resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-15.2.0.tgz#475a786c091a101ef4bcf57227771c6260ee39b2" integrity sha512-hDiw4ugxnI4pcVQO+73NlKx6aZP/A+BAPfDgK/3A83RVbHZa0Ut6GHpd5r5XUV9G7BZhKejlIRuxhXialpbt6Q== -emojibase-regex@15.3.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.3.0.tgz#98c9683a481ccb1fe6aefddb495b2d692bbf5368" - integrity sha512-EBz/292VBF9naBPBsGzkZUccgIv1xJibTXIINl8SezgVRnTCpKJx7MgZcR+UAd2RwjGkRJJZ/lhP7riOFZLicA== +emojibase-regex@15.3.2: + version "15.3.2" + resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.3.2.tgz#5175231715b86d4b437754527288844a6c29318f" + integrity sha512-ue6BVeb2qu33l97MkxcOoyMJlg6Tug3eTv2z1at+M9TjvlWKvdmAPvZIDG1JbT2RH3FSyJNLucO5K5H/yxT03w== emojibase@^15.0.0: version "15.2.0" @@ -7877,10 +7872,10 @@ jiti@^1.20.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-xxhash@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-3.0.1.tgz#e093b53d02cd80a830d61f58290c206aaa877b24" - integrity sha512-Y2NSC77RIxJrvi2NoXjMi2LYsVDTlVqBoQRi8PXQg4PtP29wdtIOhsp8Ujw4EjEkBFheCPx8bMOmI9zoxx/3jQ== +js-xxhash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-4.0.0.tgz#866b003c06ba39bebc9e4a47d2756abfef06606c" + integrity sha512-3Q2eIqG6s1KEBBmkj9tGM9lef8LJbuRyTVBdI3GpTnrvtytunjLPO0wqABp5qhtMzfA32jYn1FlnIV7GH1RAHQ== js-yaml@^3.13.1: version "3.14.1" @@ -8354,25 +8349,6 @@ matrix-js-sdk@34.0.0-rc.0: unhomoglyph "^1.0.6" uuid "10" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "33.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/987ec1e62fcdbd626d5abcba5e9dcdaa9eaaa758" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^5.0.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" @@ -8380,9 +8356,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.101.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1c59fb534c125d3ef94cc5a1ea7225ea3d2bbd78" +matrix-react-sdk@3.102.0-rc.0: + version "3.102.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0-rc.0.tgz#f3369cb460d9902a986a856ff04ff1102e863ca6" + integrity sha512-BmvvQin3cFOCO5b4NBSFsy59hhG50eNuII0pA8IImQG3M1zRn9pvyUlZAAQ+D6Ugsz76EtfgBrv6qvGsbVgaug== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.23.0" @@ -8394,7 +8371,7 @@ matrix-mock-request@^2.5.0: "@sentry/browser" "^8.0.0" "@testing-library/react-hooks" "^8.0.1" "@vector-im/compound-design-tokens" "^1.2.0" - "@vector-im/compound-web" "^4.6.0" + "@vector-im/compound-web" "^4.9.0" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -8406,7 +8383,7 @@ matrix-mock-request@^2.5.0: counterpart "^0.18.6" diff-dom "^5.0.0" diff-match-patch "^1.0.5" - emojibase-regex "15.3.0" + emojibase-regex "15.3.2" escape-html "^1.0.3" file-saver "^2.0.5" filesize "10.1.2" @@ -8416,7 +8393,7 @@ matrix-mock-request@^2.5.0: highlight.js "^11.3.1" html-entities "^2.0.0" is-ip "^3.1.0" - js-xxhash "^3.0.1" + js-xxhash "^4.0.0" jszip "^3.7.0" katex "^0.16.0" linkify-element "4.1.3" @@ -8427,7 +8404,7 @@ matrix-mock-request@^2.5.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "34.0.0-rc.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8435,7 +8412,7 @@ matrix-mock-request@^2.5.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.138.1" + posthog-js "1.139.2" proposal-temporal "^0.9.0" qrcode "1.5.3" re-resizable "^6.9.0" @@ -9857,10 +9834,10 @@ postcss@^8.4.33, postcss@^8.4.38: picocolors "^1.0.0" source-map-js "^1.2.0" -posthog-js@1.138.1: - version "1.138.1" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.138.1.tgz#02052cdff5087edfa782ac3bb593d48802d0f932" - integrity sha512-hLahTznM0/iSM3vl6QGcmdG/zgCcW2DaQqPf7OtXCoqxNdYCWTNp6/sqepd6CxtDmJfm1S5Cbu1tD9TSksOYcA== +posthog-js@1.139.2: + version "1.139.2" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.139.2.tgz#f8de29edf2770da47fcccb7838902d1e89d6b43d" + integrity sha512-myyuOADqZvYwgqmriwlKDEUDwLhscivFLh67UWBj4Wt9kOlmklvJb36W0ES2GAS6IdojbnGZGH5lF3heqreLWQ== dependencies: fflate "^0.4.8" preact "^10.19.3" From b02a418cbbe8274d609506e00ad9cf8e3e9e1982 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 25 Jun 2024 13:02:46 +0000 Subject: [PATCH 003/167] v1.11.70-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea188a4d4f5..8a4fe0dac38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.69", + "version": "1.11.70-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 944516c2f72bd50d6893e815648490a666555922 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jul 2024 12:51:20 +0000 Subject: [PATCH 004/167] Upgrade dependency to matrix-js-sdk@34.0.0-rc.1 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a4fe0dac38..9bc95209607 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.0.0-rc.0", + "matrix-js-sdk": "34.0.0-rc.1", "matrix-react-sdk": "3.102.0-rc.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 09ae8146375..f66d60d454e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8349,6 +8349,26 @@ matrix-js-sdk@34.0.0-rc.0: unhomoglyph "^1.0.6" uuid "10" +matrix-js-sdk@34.0.0-rc.1: + version "34.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.1.tgz#1b538dfa8a128cd8dc83fd72e2e319a57ff0ce90" + integrity sha512-QkUBm8+1pkuOBBLfUlqj0cl2fI5JlkgFai6Bl9UBy8ZjJqylzXimuAz8E+8tvYdhYC0STJ6CkpZyWTPjCxP8kg== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" From 60b3b956031e6c6e089e467a4e61bd31356be927 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jul 2024 13:01:06 +0000 Subject: [PATCH 005/167] Upgrade dependency to matrix-react-sdk@3.102.0-rc.1 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 9bc95209607..97273f0fd42 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.0.0-rc.1", - "matrix-react-sdk": "3.102.0-rc.0", + "matrix-react-sdk": "3.102.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index f66d60d454e..30b329f44e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8329,26 +8329,6 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@34.0.0-rc.0: - version "34.0.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.0.tgz#18582d596733f2025d34a851f5f4f3ea4a0c86b9" - integrity sha512-00jqXL4vaoG1T9LpufDo8VccWjKjVRTL4bPgzrN6UkCZNFS0TT9AO8UTNRtZiGx0KvfBnrZoKc11jonuaWbPuw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-js-sdk@34.0.0-rc.1: version "34.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.1.tgz#1b538dfa8a128cd8dc83fd72e2e319a57ff0ce90" @@ -8376,10 +8356,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.102.0-rc.0: - version "3.102.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0-rc.0.tgz#f3369cb460d9902a986a856ff04ff1102e863ca6" - integrity sha512-BmvvQin3cFOCO5b4NBSFsy59hhG50eNuII0pA8IImQG3M1zRn9pvyUlZAAQ+D6Ugsz76EtfgBrv6qvGsbVgaug== +matrix-react-sdk@3.102.0-rc.1: + version "3.102.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0-rc.1.tgz#a80ba72655d82251e6a5c9ba16af698ddb59298e" + integrity sha512-1qXFRuf788fyTxMmu6c4TgA6MW70FNhFvtMLXrDDpi5UseJXYKh74epjTa6hwrI0smwqapYTIRH1cs0+zuKwsw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.23.0" @@ -8424,7 +8404,7 @@ matrix-react-sdk@3.102.0-rc.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.0.0-rc.0" + matrix-js-sdk "34.0.0-rc.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 9353b27ce719bfeb0be37d899ec8b133f0b94739 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jul 2024 13:04:06 +0000 Subject: [PATCH 006/167] v1.11.70-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97273f0fd42..94029c1fb7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.70-rc.0", + "version": "1.11.70-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4f718cb7d361f3b77997fe45fa466f4640641a33 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2024 12:20:06 +0000 Subject: [PATCH 007/167] Upgrade dependency to matrix-js-sdk@34.0.0 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 94029c1fb7a..40c862cc342 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.0.0-rc.1", + "matrix-js-sdk": "34.0.0", "matrix-react-sdk": "3.102.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 30b329f44e0..c95712ab2ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8329,6 +8329,26 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@34.0.0: + version "34.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0.tgz#a888a9bb9d2814115063545789931d3f094fb131" + integrity sha512-gCOb+fsp2fziE13k64e4IF/FxVKXkSooQF96742CtKsPATqOEoVugnbdTqYiqgiy7skqJxg4Ggh1LsYkf2gykQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + matrix-js-sdk@34.0.0-rc.1: version "34.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.1.tgz#1b538dfa8a128cd8dc83fd72e2e319a57ff0ce90" From 5722f074d188b5cbeeb9df032fb315d360adcbe2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2024 12:26:31 +0000 Subject: [PATCH 008/167] Upgrade dependency to matrix-react-sdk@3.102.0 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 40c862cc342..26f2e6e633e 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.0.0", - "matrix-react-sdk": "3.102.0-rc.1", + "matrix-react-sdk": "3.102.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index c95712ab2ce..63023d0145e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8349,26 +8349,6 @@ matrix-js-sdk@34.0.0: unhomoglyph "^1.0.6" uuid "10" -matrix-js-sdk@34.0.0-rc.1: - version "34.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0-rc.1.tgz#1b538dfa8a128cd8dc83fd72e2e319a57ff0ce90" - integrity sha512-QkUBm8+1pkuOBBLfUlqj0cl2fI5JlkgFai6Bl9UBy8ZjJqylzXimuAz8E+8tvYdhYC0STJ6CkpZyWTPjCxP8kg== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" @@ -8376,10 +8356,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.102.0-rc.1: - version "3.102.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0-rc.1.tgz#a80ba72655d82251e6a5c9ba16af698ddb59298e" - integrity sha512-1qXFRuf788fyTxMmu6c4TgA6MW70FNhFvtMLXrDDpi5UseJXYKh74epjTa6hwrI0smwqapYTIRH1cs0+zuKwsw== +matrix-react-sdk@3.102.0: + version "3.102.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0.tgz#750e6d8d7acee6ad2d8ba18e7b2a53695b8c8d72" + integrity sha512-rsv0Lt+DXf+VTcKh8HKkxIT8VbGM7btAHqg+fW04nEU9BCQsMgg26iSwmdenu3vv0oouj40RPMZaWp4/YMTqjA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.23.0" @@ -8424,7 +8404,7 @@ matrix-react-sdk@3.102.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.0.0-rc.1" + matrix-js-sdk "34.0.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 8fc13ba4b69d2cf4289338d0c2bdd4838c356227 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2024 12:31:17 +0000 Subject: [PATCH 009/167] v1.11.70 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c113a4434..0c847520785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,37 @@ +Changes in [1.11.70](https://github.com/element-hq/element-web/releases/tag/v1.11.70) (2024-07-08) +================================================================================================== +## ✨ Features + +* Add SSO redirect option for login page ([#27576](https://github.com/element-hq/element-web/pull/27576)). Contributed by @bartvdbraak. +* Use stable endpoints for MSC3916 ([#27558](https://github.com/element-hq/element-web/pull/27558)). Contributed by @turt2live. +* Switch to Rust crypto stack for all logins ([#12630](https://github.com/matrix-org/matrix-react-sdk/pull/12630)). Contributed by @richvdh. +* Hide voip buttons in group rooms in environments with widgets disabled ([#12664](https://github.com/matrix-org/matrix-react-sdk/pull/12664)). Contributed by @t3chguy. +* Minor tweaks to UserSettings dialog ([#12651](https://github.com/matrix-org/matrix-react-sdk/pull/12651)). Contributed by @florianduros. +* Hide voice call button when redundant ([#12639](https://github.com/matrix-org/matrix-react-sdk/pull/12639)). Contributed by @t3chguy. +* Improve accessibility of the room summary card ([#12586](https://github.com/matrix-org/matrix-react-sdk/pull/12586)). Contributed by @t3chguy. +* Show tooltips on narrow tabbed views ([#12624](https://github.com/matrix-org/matrix-react-sdk/pull/12624)). Contributed by @dbkr. +* Update gfm.css to github-markdown-css ([#12613](https://github.com/matrix-org/matrix-react-sdk/pull/12613)). Contributed by @t3chguy. +* Cache e2eStatus to avoid concerning unencrypted flicker when changing rooms ([#12606](https://github.com/matrix-org/matrix-react-sdk/pull/12606)). Contributed by @t3chguy. +* Tweak copy for user verification toast ([#12605](https://github.com/matrix-org/matrix-react-sdk/pull/12605)). Contributed by @t3chguy. +* Support s tags for strikethrough for Matrix v1.10 ([#12604](https://github.com/matrix-org/matrix-react-sdk/pull/12604)). Contributed by @t3chguy. + +## 🐛 Bug Fixes + +* Fix "Unable to restore session" error ([#4299](https://github.com/matrix-org/matrix-js-sdk/pull/4299)). +* Fix error when sending encrypted messages in large rooms ([#4297](https://github.com/matrix-org/matrix-js-sdk/pull/4297)). +* Remove redundant copy in deactive uia modal ([#12668](https://github.com/matrix-org/matrix-react-sdk/pull/12668)). Contributed by @t3chguy. +* Fix high contrast theme in settings ([#12649](https://github.com/matrix-org/matrix-react-sdk/pull/12649)). Contributed by @florianduros. +* Fix background on live location sharing footer ([#12629](https://github.com/matrix-org/matrix-react-sdk/pull/12629)). Contributed by @t3chguy. +* Remove outdated iframe sandbox attribute ([#12633](https://github.com/matrix-org/matrix-react-sdk/pull/12633)). Contributed by @t3chguy. +* Remove stray setState which caused encryption state shields to flicker ([#12632](https://github.com/matrix-org/matrix-react-sdk/pull/12632)). Contributed by @t3chguy. +* Fix stray background colour on markdown body ([#12628](https://github.com/matrix-org/matrix-react-sdk/pull/12628)). Contributed by @t3chguy. +* Fix widgets not being cleaned up correctly. ([#12616](https://github.com/matrix-org/matrix-react-sdk/pull/12616)). Contributed by @toger5. +* Add in-progress view to display name EditInPlace ([#12609](https://github.com/matrix-org/matrix-react-sdk/pull/12609)). Contributed by @dbkr. +* Fix config override of other settings levels ([#12593](https://github.com/matrix-org/matrix-react-sdk/pull/12593)). Contributed by @langleyd. +* Don't show 'saved' on display name save error ([#12600](https://github.com/matrix-org/matrix-react-sdk/pull/12600)). Contributed by @dbkr. + + + Changes in [1.11.69](https://github.com/element-hq/element-web/releases/tag/v1.11.69) (2024-06-18) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 26f2e6e633e..5a360a48d61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.70-rc.1", + "version": "1.11.70", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 42f1ae1ddea1f8aaf03c075d8cfe0357097cb3b9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jul 2024 12:19:41 +0000 Subject: [PATCH 010/167] Upgrade dependency to matrix-js-sdk@34.1.0-rc.2 --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c068bd7789f..dfd3a61053c 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.0.0", + "matrix-js-sdk": "34.1.0-rc.2", "matrix-react-sdk": "3.102.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 0b737888748..af4788b4e91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4174,6 +4174,11 @@ base-x@^4.0.0: resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a" integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw== +base-x@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.0.tgz#6d835ceae379130e1a4cb846a70ac4746f28ea9b" + integrity sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ== + base64-arraybuffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc" @@ -4314,6 +4319,13 @@ bs58@^5.0.0: dependencies: base-x "^4.0.0" +bs58@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/bs58/-/bs58-6.0.0.tgz#a2cda0130558535dd281a2f8697df79caaf425d8" + integrity sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw== + dependencies: + base-x "^5.0.0" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -8351,6 +8363,26 @@ matrix-js-sdk@34.0.0: unhomoglyph "^1.0.6" uuid "10" +matrix-js-sdk@34.1.0-rc.2: + version "34.1.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.2.tgz#d8e015eb5baaa77b870fd69f27c31d7edc1098e1" + integrity sha512-OsmOc3C5mlnsdM9Bpm1jBgdUZBAAL3/ZMaZNOD3OzA9yxhw893NOX7Rx1Azm96cYGYdBJRJ9qQMAaQbkXz5NDA== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + another-json "^0.2.0" + bs58 "^6.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" From 31032525c93bf1f811627ff890197d392f79c660 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jul 2024 13:16:51 +0000 Subject: [PATCH 011/167] Upgrade dependency to matrix-js-sdk@34.1.0-rc.3 --- package.json | 2 +- yarn.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dfd3a61053c..f35d2a43f04 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.1.0-rc.2", + "matrix-js-sdk": "34.1.0-rc.3", "matrix-react-sdk": "3.102.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index af4788b4e91..bd6b6dd4c24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8363,13 +8363,14 @@ matrix-js-sdk@34.0.0: unhomoglyph "^1.0.6" uuid "10" -matrix-js-sdk@34.1.0-rc.2: - version "34.1.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.2.tgz#d8e015eb5baaa77b870fd69f27c31d7edc1098e1" - integrity sha512-OsmOc3C5mlnsdM9Bpm1jBgdUZBAAL3/ZMaZNOD3OzA9yxhw893NOX7Rx1Azm96cYGYdBJRJ9qQMAaQbkXz5NDA== +matrix-js-sdk@34.1.0-rc.3: + version "34.1.0-rc.3" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.3.tgz#355586355a3a8d29de79f0be8246eab6f585adea" + integrity sha512-Xd2ER9f95rWssKCOwCXERtgvmmyYGmC/EsM0qdI2qwi2yDhp0Kp/VZHebhUJYJlxOQSUMEf3Jujm6UNCOW1Zyw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + "@matrix-org/olm" "3.2.15" another-json "^0.2.0" bs58 "^6.0.0" content-type "^1.0.4" From e6a60e0770bf0af375eae7aece6b6f81376c4f2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jul 2024 13:21:56 +0000 Subject: [PATCH 012/167] Upgrade dependency to matrix-react-sdk@3.103.0-rc.1 --- package.json | 2 +- yarn.lock | 181 +++++++++++++++------------------------------------ 2 files changed, 55 insertions(+), 128 deletions(-) diff --git a/package.json b/package.json index f35d2a43f04..09a1579fe13 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.1.0-rc.3", - "matrix-react-sdk": "3.102.0", + "matrix-react-sdk": "3.103.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index bd6b6dd4c24..7d6a15530aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2157,10 +2157,10 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-6.1.0.tgz#1cedf2bcbd6795e297fd45ea4a33f2c8c5204fdd" integrity sha512-8Wn4TT9PEJswfE8+6mA60JHrxyiWYXfM4EM5800tLz+Rl9QRGk9JDF0o0cTb26v6bfXTa3/pCGWAkUVk0ROPEw== -"@matrix-org/matrix-wysiwyg@2.37.3": - version "2.37.3" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.3.tgz#3f068252948f036b3d233828aecf856f74f9d7f1" - integrity sha512-WGDZi9ksgkEXS2WlOqGloc9vbgLYVNN/gBhXihAjFtPwix0qEhDSIfzplyQO24WrPpq//PSnXlEFShWhJH0OIg== +"@matrix-org/matrix-wysiwyg@2.37.4": + version "2.37.4" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.4.tgz#bd9b46051a21c9986477e3a83a1417b1ee926d81" + integrity sha512-4OtBWAHNAOu9P5C6jOIeHlu4ChwV2YusxnbGuN20IceC4bT2h38flZQgm0x9/jgHfF0LwnKUwKXsxtRoq8xW0g== "@matrix-org/olm@3.2.15": version "3.2.15" @@ -3513,10 +3513,10 @@ dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^4.9.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.10.0.tgz#5403c9933af91d432b5fb5f92a305acadc810893" - integrity sha512-SPeol6FK/h/q8ChHyuCCncUIVoIGNdPODBf7UqvaohRjt8EzyAAHKP89l1YhWKqEaOtG67+28IXoFvdS46tbUA== +"@vector-im/compound-web@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.2.3.tgz#feab8ae7623cfaa243b9be69325e1696bfa1a09c" + integrity sha512-KU5vAgNIFBzRHfCRK5dGAhxjrfkrUXeOYzDUNc2QjEnqGaUR3RM4c53sw0Ga1oHbOeAWoUGId+ptH3ewPdUTAQ== dependencies: "@floating-ui/react" "^0.26.9" "@floating-ui/react-dom" "^2.0.8" @@ -3527,6 +3527,7 @@ "@radix-ui/react-slot" "^1.0.2" "@radix-ui/react-tooltip" "^1.0.6" classnames "^2.3.2" + ts-xor "^1.3.0" vaul "^0.7.0" "@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": @@ -4014,7 +4015,7 @@ array.prototype.tosorted@^1.1.4: es-errors "^1.3.0" es-shim-unscopables "^1.0.2" -arraybuffer.prototype.slice@^1.0.2, arraybuffer.prototype.slice@^1.0.3: +arraybuffer.prototype.slice@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== @@ -4169,11 +4170,6 @@ balanced-match@^2.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== -base-x@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a" - integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw== - base-x@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.0.tgz#6d835ceae379130e1a4cb846a70ac4746f28ea9b" @@ -4194,11 +4190,6 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== -big-integer@^1.6.48: - version "1.6.51" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" - integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -4312,13 +4303,6 @@ browserslist@^4.22.3, browserslist@^4.23.0: node-releases "^2.0.14" update-browserslist-db "^1.0.13" -bs58@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279" - integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ== - dependencies: - base-x "^4.0.0" - bs58@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/bs58/-/bs58-6.0.0.tgz#a2cda0130558535dd281a2f8697df79caaf425d8" @@ -5588,51 +5572,6 @@ es-abstract@^1.17.5: unbox-primitive "^1.0.2" which-typed-array "^1.1.14" -es-abstract@^1.18.3: - version "1.22.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a" - integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.1" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.12" - is-weakref "^1.0.2" - object-inspect "^1.12.3" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.8" - string.prototype.trimend "^1.0.7" - string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.11" - es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: version "1.23.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" @@ -5744,7 +5683,7 @@ es-object-atoms@^1.0.0: dependencies: es-errors "^1.3.0" -es-set-tostringtag@^2.0.1, es-set-tostringtag@^2.0.2, es-set-tostringtag@^2.0.3: +es-set-tostringtag@^2.0.2, es-set-tostringtag@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== @@ -6503,7 +6442,7 @@ get-stream@^6.0.0, get-stream@^6.0.1: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -get-symbol-description@^1.0.0, get-symbol-description@^1.0.2: +get-symbol-description@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== @@ -6997,7 +6936,7 @@ internal-slot@^1.0.4: has "^1.0.3" side-channel "^1.0.4" -internal-slot@^1.0.5, internal-slot@^1.0.7: +internal-slot@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== @@ -7296,7 +7235,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.12, is-typed-array@^1.1.13: +is-typed-array@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== @@ -8343,26 +8282,6 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@34.0.0: - version "34.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.0.0.tgz#a888a9bb9d2814115063545789931d3f094fb131" - integrity sha512-gCOb+fsp2fziE13k64e4IF/FxVKXkSooQF96742CtKsPATqOEoVugnbdTqYiqgiy7skqJxg4Ggh1LsYkf2gykQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-js-sdk@34.1.0-rc.3: version "34.1.0-rc.3" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.3.tgz#355586355a3a8d29de79f0be8246eab6f585adea" @@ -8391,22 +8310,21 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.102.0: - version "3.102.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.102.0.tgz#750e6d8d7acee6ad2d8ba18e7b2a53695b8c8d72" - integrity sha512-rsv0Lt+DXf+VTcKh8HKkxIT8VbGM7btAHqg+fW04nEU9BCQsMgg26iSwmdenu3vv0oouj40RPMZaWp4/YMTqjA== +matrix-react-sdk@3.103.0-rc.1: + version "3.103.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.103.0-rc.1.tgz#7fd4a36f3cecfb73127d55b21eecb28894e281dc" + integrity sha512-kwD8qCqn8ddmFtln1i0W4AbDfpdcqH3iyk2XizyDADpRftnrXhIMXlTtvgo2aSsJU5zInyzkA/PHKZQYwthDdA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.23.0" "@matrix-org/emojibase-bindings" "^1.1.2" - "@matrix-org/matrix-wysiwyg" "2.37.3" - "@matrix-org/olm" "3.2.15" + "@matrix-org/matrix-wysiwyg" "2.37.4" "@matrix-org/react-sdk-module-api" "^2.4.0" "@matrix-org/spec" "^1.7.0" "@sentry/browser" "^8.0.0" "@testing-library/react-hooks" "^8.0.1" "@vector-im/compound-design-tokens" "^1.2.0" - "@vector-im/compound-web" "^4.9.0" + "@vector-im/compound-web" "^5.2.3" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -8424,7 +8342,6 @@ matrix-react-sdk@3.102.0: filesize "10.1.2" github-markdown-css "^5.5.1" glob-to-regexp "^0.4.1" - graphemer "^1.4.0" highlight.js "^11.3.1" html-entities "^2.0.0" is-ip "^3.1.0" @@ -8439,7 +8356,7 @@ matrix-react-sdk@3.102.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.0.0" + matrix-js-sdk "34.1.0-rc.3" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8447,8 +8364,7 @@ matrix-react-sdk@3.102.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.139.2" - proposal-temporal "^0.9.0" + posthog-js "1.141.3" qrcode "1.5.3" re-resizable "^6.9.0" react "17.0.2" @@ -8461,6 +8377,7 @@ matrix-react-sdk@3.102.0: sanitize-filename "^1.6.3" sanitize-html "2.13.0" tar-js "^0.3.0" + temporal-polyfill "^0.2.5" ua-parser-js "^1.0.2" uuid "^10.0.0" what-input "^5.2.10" @@ -8819,11 +8736,6 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.12.3: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== - object-inspect@^1.13.1: version "1.13.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" @@ -9874,13 +9786,14 @@ postcss@^8.4.33, postcss@^8.4.38: picocolors "^1.0.0" source-map-js "^1.2.0" -posthog-js@1.139.2: - version "1.139.2" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.139.2.tgz#f8de29edf2770da47fcccb7838902d1e89d6b43d" - integrity sha512-myyuOADqZvYwgqmriwlKDEUDwLhscivFLh67UWBj4Wt9kOlmklvJb36W0ES2GAS6IdojbnGZGH5lF3heqreLWQ== +posthog-js@1.141.3: + version "1.141.3" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.141.3.tgz#c0b78e62567b5de15e400254905d2b72544e3618" + integrity sha512-LZ+I6wJS82yX/SZVaK20V2WV4MEfB2G9fT2ZJoWlzwN5L3wsbpmjD9F2dVW818deBV3ms1w0Ho7rnlJtBGHx2g== dependencies: fflate "^0.4.8" preact "^10.19.3" + web-vitals "^4.0.1" potpack@^1.0.2: version "1.0.2" @@ -9970,14 +9883,6 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" -proposal-temporal@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/proposal-temporal/-/proposal-temporal-0.9.0.tgz#4841cf83cf270f85a829e9283843ea8796d3d86f" - integrity sha512-AyNg3NmmBDCDbABQDmsnsY1B8VciwO9wZm+C3rClAgkPre+SpZDcIGje0WLZwroyqUFDySqW7VV6vcvAv8Bi+Q== - dependencies: - big-integer "^1.6.48" - es-abstract "^1.18.3" - protocol-buffers-schema@^3.3.1: version "3.6.0" resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" @@ -10340,7 +10245,7 @@ regexp-tree@^0.1.27: resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd" integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA== -regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: +regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== @@ -10512,7 +10417,7 @@ rxjs@^7.8.1: dependencies: tslib "^2.1.0" -safe-array-concat@^1.0.1, safe-array-concat@^1.1.0, safe-array-concat@^1.1.2: +safe-array-concat@^1.1.0, safe-array-concat@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== @@ -10532,7 +10437,7 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0, safe-regex-test@^1.0.3: +safe-regex-test@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== @@ -11325,6 +11230,18 @@ tar-js@^0.3.0: resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17" integrity sha512-9uqP2hJUZNKRkwPDe5nXxXdzo6w+BFBPq9x/tyi5/U/DneuSesO/HMb0y5TeWpfcv49YDJTs7SrrZeeu8ZHWDA== +temporal-polyfill@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz#0796c40a50754c69ec0f9a2db3f6c582b9721aaf" + integrity sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA== + dependencies: + temporal-spec "^0.2.4" + +temporal-spec@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/temporal-spec/-/temporal-spec-0.2.4.tgz#7eb10447a62429ffaaa80b42b869b138ae306a75" + integrity sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ== + terser-webpack-plugin@^5.3.10, terser-webpack-plugin@^5.3.9: version "5.3.10" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" @@ -11502,6 +11419,11 @@ ts-prune@^0.10.3: "true-myth" "^4.1.0" ts-morph "^13.0.1" +ts-xor@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ts-xor/-/ts-xor-1.3.0.tgz#3e59f24f0321f9f10f350e0cee3b534b89a2c70b" + integrity sha512-RLXVjliCzc1gfKQFLRpfeD0rrWmjnSTgj7+RFhoq3KRkUYa8LE/TIidYOzM5h+IdFBDSjjSgk9Lto9sdMfDFEA== + tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -11557,7 +11479,7 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typed-array-buffer@^1.0.0, typed-array-buffer@^1.0.1, typed-array-buffer@^1.0.2: +typed-array-buffer@^1.0.1, typed-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== @@ -11864,6 +11786,11 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" +web-vitals@^4.0.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.1.tgz#67eec387ddd0ef4c25574a01ab9dae723eee2b97" + integrity sha512-U6bAxeudnhDqcXNl50JC4hLlqox9DZnngxfISZm3DMZnonW35xtJOVUc091L+DOY+6hVZVpKXoiCP0RiT6339Q== + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" From d584dc0d5273a47ef1f3e92edab8e8bea8352464 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 9 Jul 2024 14:34:52 +0100 Subject: [PATCH 013/167] Specify node version in package.json Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index dfd3a61053c..acda6e1198d 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,9 @@ "package.json", "contribute.json" ], + "engines": { + "node": ">=20.0.0" + }, "style": "bundle.css", "matrix_i18n_extra_translation_funcs": [ "UserFriendlyError" From bc27c1dcc3914203dc1acc05a2ce416521b2ecf2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jul 2024 13:39:19 +0000 Subject: [PATCH 014/167] v1.11.71-rc.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bcfb169f357..61139462ef1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.70", + "version": "1.11.71-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -213,4 +213,4 @@ "engines": { "node": ">=20.0.0" } -} \ No newline at end of file +} From 41d6fe3b23c5dc53cfab736f24cfd728f9905954 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Jul 2024 12:22:12 +0000 Subject: [PATCH 015/167] Upgrade dependency to matrix-js-sdk@34.1.0 --- package.json | 2 +- yarn.lock | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 61139462ef1..59ba75d22fa 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.1.0-rc.3", + "matrix-js-sdk": "34.1.0", "matrix-react-sdk": "3.103.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 7d6a15530aa..500cbb8b198 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8282,6 +8282,27 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@34.1.0: + version "34.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0.tgz#6ac76be1a91721f1ba3c4b0dedce7761735c4084" + integrity sha512-jJrnlNRBncsK98fkied+G3Y1QcUEcq18D+NwVsyOqFAlOs1Vsbrii3W5xzpuFytJnx4CD7UM7NLXCNGiFPl7jQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + "@matrix-org/olm" "3.2.15" + another-json "^0.2.0" + bs58 "^6.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + matrix-js-sdk@34.1.0-rc.3: version "34.1.0-rc.3" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.3.tgz#355586355a3a8d29de79f0be8246eab6f585adea" From 655a1ae0652a5f304e265c46e44602286dd0d19a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Jul 2024 12:32:46 +0000 Subject: [PATCH 016/167] Upgrade dependency to matrix-react-sdk@3.103.0 --- package.json | 2 +- yarn.lock | 31 +++++-------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 59ba75d22fa..f801c68141a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.1.0", - "matrix-react-sdk": "3.103.0-rc.1", + "matrix-react-sdk": "3.103.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 500cbb8b198..4008980739f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8303,27 +8303,6 @@ matrix-js-sdk@34.1.0: unhomoglyph "^1.0.6" uuid "10" -matrix-js-sdk@34.1.0-rc.3: - version "34.1.0-rc.3" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0-rc.3.tgz#355586355a3a8d29de79f0be8246eab6f585adea" - integrity sha512-Xd2ER9f95rWssKCOwCXERtgvmmyYGmC/EsM0qdI2qwi2yDhp0Kp/VZHebhUJYJlxOQSUMEf3Jujm6UNCOW1Zyw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - "@matrix-org/olm" "3.2.15" - another-json "^0.2.0" - bs58 "^6.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" @@ -8331,10 +8310,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.103.0-rc.1: - version "3.103.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.103.0-rc.1.tgz#7fd4a36f3cecfb73127d55b21eecb28894e281dc" - integrity sha512-kwD8qCqn8ddmFtln1i0W4AbDfpdcqH3iyk2XizyDADpRftnrXhIMXlTtvgo2aSsJU5zInyzkA/PHKZQYwthDdA== +matrix-react-sdk@3.103.0: + version "3.103.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.103.0.tgz#e0a6939b495289700006e75c02c8658c49257bef" + integrity sha512-vUJnUwxnqcXVp2hiOsgwoDLaMoLDTZlJlL1AY3HGeidHpTkjaftBebTq/57ys29tT782g8frDhQq3Rxlo/uzgg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.23.0" @@ -8377,7 +8356,7 @@ matrix-react-sdk@3.103.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.1.0-rc.3" + matrix-js-sdk "34.1.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From a238990c256d255ae85579ee3baae65588b9521e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Jul 2024 12:48:11 +0000 Subject: [PATCH 017/167] v1.11.71 --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c847520785..d957336c96b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +Changes in [1.11.71](https://github.com/element-hq/element-web/releases/tag/v1.11.71) (2024-07-16) +================================================================================================== +## ✨ Features + +* Add Modernizr rule for Intl.Segmenter ([#27677](https://github.com/element-hq/element-web/pull/27677)). Contributed by @t3chguy. +* Add tabs to the right panel ([#12672](https://github.com/matrix-org/matrix-react-sdk/pull/12672)). Contributed by @MidhunSureshR. +* Promote new room header from labs to Beta ([#12739](https://github.com/matrix-org/matrix-react-sdk/pull/12739)). Contributed by @t3chguy. +* Redesign room search interface ([#12677](https://github.com/matrix-org/matrix-react-sdk/pull/12677)). Contributed by @t3chguy. +* Move language settings to 'preferences' ([#12723](https://github.com/matrix-org/matrix-react-sdk/pull/12723)). Contributed by @dbkr. +* New layout selector ui in user settings ([#12676](https://github.com/matrix-org/matrix-react-sdk/pull/12676)). Contributed by @florianduros. +* Prevent Element appearing in system media controls ([#10995](https://github.com/matrix-org/matrix-react-sdk/pull/10995)). Contributed by @SuperKenVery. +* Move the account management button ([#12663](https://github.com/matrix-org/matrix-react-sdk/pull/12663)). Contributed by @dbkr. +* Disable profile controls if the HS doesn't allow them to be set ([#12652](https://github.com/matrix-org/matrix-react-sdk/pull/12652)). Contributed by @dbkr. +* New theme ui in user settings ([#12576](https://github.com/matrix-org/matrix-react-sdk/pull/12576)). Contributed by @florianduros. +* Adjust room header hover transition from 300ms to 200ms ([#12703](https://github.com/matrix-org/matrix-react-sdk/pull/12703)). Contributed by @t3chguy. +* Split out email \& phone number settings to separate components \& move discovery to privacy tab ([#12670](https://github.com/matrix-org/matrix-react-sdk/pull/12670)). Contributed by @dbkr. + +## 🐛 Bug Fixes + +* Ensure we do not load matrix-react-sdk is a manner which can white-screen ([#27685](https://github.com/element-hq/element-web/pull/27685)). Contributed by @t3chguy. +* Fix incoming call toast crash due to audio refactor ([#12737](https://github.com/matrix-org/matrix-react-sdk/pull/12737)). Contributed by @t3chguy. +* Improve new room header accessibility ([#12725](https://github.com/matrix-org/matrix-react-sdk/pull/12725)). Contributed by @t3chguy. +* Fix closing all modals ([#12728](https://github.com/matrix-org/matrix-react-sdk/pull/12728)). Contributed by @dbkr. +* Fix close button on forgot password flow ([#12732](https://github.com/matrix-org/matrix-react-sdk/pull/12732)). Contributed by @dbkr. +* Don't consider textual characters to be emoji ([#12582](https://github.com/matrix-org/matrix-react-sdk/pull/12582)). Contributed by @robintown. +* Clear autocomplete input on selection accept ([#12709](https://github.com/matrix-org/matrix-react-sdk/pull/12709)). Contributed by @dbkr. +* Fix `Match system theme` toggle ([#12719](https://github.com/matrix-org/matrix-react-sdk/pull/12719)). Contributed by @florianduros. + + + Changes in [1.11.70](https://github.com/element-hq/element-web/releases/tag/v1.11.70) (2024-07-08) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index f801c68141a..47501036da7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.71-rc.0", + "version": "1.11.71", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9f27685a54301e076292c04262a8b064a9c558d8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 23 Jul 2024 11:57:12 +0200 Subject: [PATCH 018/167] Polyfill Intl.Segmenter This fixes Element on older versions of Firefox by adding a Polyfill for Intl.Segmenter. The Polyfill is conditionally imported so it only inflates the initial bundle size by about 100 bytes. On browsers that need it, the polyfill is quite large at 317Kb. Users on these browser will still see the 'unsupported browser' screen, but will be able to click through to use the app anyway. This keeps the Intl.Segmenter modernizr check but this would also happen due to https://github.com/element-hq/element-web/pull/27674 --- package.json | 1 + src/vector/index.ts | 9 +++++++ yarn.lock | 59 +++++++++++++++++++++------------------------ 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index c08fc93a7f8..4f469c5bffc 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "@types/react": "17.0.80" }, "dependencies": { + "@formatjs/intl-segmenter": "^11.5.7", "@matrix-org/react-sdk-module-api": "^2.3.0", "jsrsasign": "^11.0.0", "katex": "^0.16.0", diff --git a/src/vector/index.ts b/src/vector/index.ts index 025cb361ef8..7a2f3e2b59f 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -19,6 +19,7 @@ limitations under the License. */ import { logger } from "matrix-js-sdk/src/logger"; +import { shouldPolyfill as shouldPolyFillIntlSegmenter } from "@formatjs/intl-segmenter/should-polyfill"; // These are things that can run before the skin loads - be careful not to reference the react-sdk though. import { parseQsFromFragment } from "./url_utils"; @@ -77,6 +78,8 @@ function checkBrowserFeatures(): boolean { // ES2024: https://402.ecma-international.org/9.0/#sec-intl.segmenter // The built-in modernizer 'intl' check only checks for the presence of the Intl object, not the Segmenter, // and older Firefox has the former but not the latter, so we add our own. + // This is polyfilled now, but we still want to show the warning because we want to remove the polyfill + // at some point. window.Modernizr.addTest("intlsegmenter", () => typeof window.Intl?.Segmenter === "function"); // Basic test for WebAssembly support. We could also try instantiating a simple module, @@ -112,6 +115,10 @@ const supportedBrowser = checkBrowserFeatures(); // the browser to use as much parallelism as it can. // Load parallelism is based on research in https://github.com/element-hq/element-web/issues/12253 async function start(): Promise { + if (shouldPolyFillIntlSegmenter()) { + await import(/* webpackChunkName: "intl-segmenter-polyfill" */ "@formatjs/intl-segmenter/polyfill-force"); + } + // load init.ts async so that its code is not executed immediately and we can catch any exceptions const { rageshakePromise, @@ -132,6 +139,8 @@ async function start(): Promise { "./init" ); + // Now perform the next stage of initialisation. This has its own try/catch in which we render + // a react error page on failure. try { // give rageshake a chance to load/fail, we don't actually assert rageshake loads, we allow it to fail if no IDB await settled(rageshakePromise); diff --git a/yarn.lock b/yarn.lock index cd65b702ead..11f1fa2f7f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,6 +1536,30 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.4.tgz#1d459cee5031893a08a0e064c406ad2130cced7c" integrity sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA== +"@formatjs/ecma402-abstract@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz#39197ab90b1c78b7342b129a56a7acdb8f512e17" + integrity sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g== + dependencies: + "@formatjs/intl-localematcher" "0.5.4" + tslib "^2.4.0" + +"@formatjs/intl-localematcher@0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz#caa71f2e40d93e37d58be35cfffe57865f2b366f" + integrity sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g== + dependencies: + tslib "^2.4.0" + +"@formatjs/intl-segmenter@^11.5.7": + version "11.5.7" + resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.5.7.tgz#c9fcb94d4690372d3ccd609ce1490910b582af78" + integrity sha512-MPvUKOURPY1aHc/d3YtLKp4hamrJtdBRc/AZVt9zRitrNeRszSwpIIYDHka9chQJTRIJlIfS4S9FGMdA1PE3Xw== + dependencies: + "@formatjs/ecma402-abstract" "2.0.0" + "@formatjs/intl-localematcher" "0.5.4" + tslib "^2.4.0" + "@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" @@ -7915,7 +7939,6 @@ matrix-events-sdk@0.0.1: "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "34.0.0" - uid "94e393c9a619b5d7427ff4103128521229ad4f6c" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/94e393c9a619b5d7427ff4103128521229ad4f6c" dependencies: "@babel/runtime" "^7.12.5" @@ -7942,7 +7965,6 @@ matrix-mock-request@^2.5.0: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.101.0" - uid "19f9f9856451a8e4cce6d313d19ca8aed4b5d6b4" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/19f9f9856451a8e4cce6d313d19ca8aed4b5d6b4" dependencies: "@babel/runtime" "^7.12.5" @@ -10474,16 +10496,7 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10569,14 +10582,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11046,7 +11052,7 @@ tsconfig-paths@^3.15.0: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: version "2.6.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== @@ -11675,7 +11681,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11693,15 +11699,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 03e6280b6add5647a889bc7f2c0400c5297c7e97 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 23 Jul 2024 13:03:26 +0100 Subject: [PATCH 019/167] Upgrade dependency to matrix-js-sdk@34.2.0-rc.0 --- package.json | 2 +- yarn.lock | 104 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 80 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 66bd5a64a99..4444535c5cf 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.1.0", + "matrix-js-sdk": "34.2.0-rc.0", "matrix-react-sdk": "3.103.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..041b46b9719 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1943,10 +1943,10 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@matrix-org/analytics-events@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.24.0.tgz#21a64537ac975b18e1eb13d9fd0bdc7d448a6039" - integrity sha512-3FDdtqZ+5cMqVffWjFNOIQ7RDFN6XS11kqdtN2ps8uvq5ce8gT0yXQvK37WeKWKZZ5QAKeoMzGhud+lsVcb1xg== +"@matrix-org/analytics-events@^0.23.0": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.23.1.tgz#206224f63e64b8cd892f704964204bce433bd189" + integrity sha512-+DuK5F313bZfO0jCsP7X3u0FQ09IM9Ujc9Zf//XoxzGThG9pvSYsEyNXQO7kUeQHwXlOobtVg1QcP172kN+h/g== "@matrix-org/emojibase-bindings@^1.1.2": version "1.1.3" @@ -1966,6 +1966,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.4.tgz#bd9b46051a21c9986477e3a83a1417b1ee926d81" integrity sha512-4OtBWAHNAOu9P5C6jOIeHlu4ChwV2YusxnbGuN20IceC4bT2h38flZQgm0x9/jgHfF0LwnKUwKXsxtRoq8xW0g== +"@matrix-org/olm@3.2.15": + version "3.2.15" + resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec" + integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q== + "@matrix-org/react-sdk-module-api@^2.3.0", "@matrix-org/react-sdk-module-api@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.4.0.tgz#5e4552acbe728141f42c1d54d75dcb4efea9301c" @@ -5876,10 +5881,10 @@ file@^0.2.2: resolved "https://registry.yarnpkg.com/file/-/file-0.2.2.tgz#c3dfd8f8cf3535ae455c2b423c2e52635d76b4d3" integrity sha512-gwabMtChzdnpDJdPEpz8Vr/PX0pU85KailuPV71Zw/un5yJVKvzukhB3qf6O3lnTwIe5CxlMYLh3jOK3w5xrLA== -filesize@10.1.4: - version "10.1.4" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.4.tgz#184f256063a201f08b6e6b3cc47d21b60f5b8d89" - integrity sha512-ryBwPIIeErmxgPnm6cbESAzXjuEFubs+yKYLBZvg3CaiNcmkJChoOGcBSrZ6IwkMwPABwPpVXE6IlNdGJJrvEg== +filesize@10.1.2: + version "10.1.2" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.2.tgz#33bb71c5c134102499f1bc36e6f2863137f6cb0c" + integrity sha512-Dx770ai81ohflojxhU+oG+Z2QGvKdYxgEr9OSA8UVrqhwNHjfH9A8f5NKfg83fEH8ZFA5N5llJo5T3PIoZ4CRA== fill-range@^7.1.1: version "7.1.1" @@ -7937,12 +7942,35 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "34.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/94e393c9a619b5d7427ff4103128521229ad4f6c" +matrix-js-sdk@34.1.0: + version "34.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0.tgz#6ac76be1a91721f1ba3c4b0dedce7761735c4084" + integrity sha512-jJrnlNRBncsK98fkied+G3Y1QcUEcq18D+NwVsyOqFAlOs1Vsbrii3W5xzpuFytJnx4CD7UM7NLXCNGiFPl7jQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + "@matrix-org/olm" "3.2.15" + another-json "^0.2.0" + bs58 "^6.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + +matrix-js-sdk@34.2.0-rc.0: + version "34.2.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.2.0-rc.0.tgz#3a02bdf295ec538a03a34aae00d9389ff18076ee" + integrity sha512-C6KUnBE0o8CjNJKkR9ISErRSCc2AUdeN8xh8MkquuwsqoaUdOiTMbjDKd1YroAx2PMjOxo+W2U8JCiURquMC6A== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + "@matrix-org/olm" "3.2.15" another-json "^0.2.0" bs58 "^6.0.0" content-type "^1.0.4" @@ -7963,12 +7991,13 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.101.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/19f9f9856451a8e4cce6d313d19ca8aed4b5d6b4" +matrix-react-sdk@3.103.0: + version "3.103.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.103.0.tgz#e0a6939b495289700006e75c02c8658c49257bef" + integrity sha512-vUJnUwxnqcXVp2hiOsgwoDLaMoLDTZlJlL1AY3HGeidHpTkjaftBebTq/57ys29tT782g8frDhQq3Rxlo/uzgg== dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/analytics-events" "^0.24.0" + "@matrix-org/analytics-events" "^0.23.0" "@matrix-org/emojibase-bindings" "^1.1.2" "@matrix-org/matrix-wysiwyg" "2.37.4" "@matrix-org/react-sdk-module-api" "^2.4.0" @@ -7991,7 +8020,7 @@ matrix-mock-request@^2.5.0: emojibase-regex "15.3.2" escape-html "^1.0.3" file-saver "^2.0.5" - filesize "10.1.4" + filesize "10.1.2" github-markdown-css "^5.5.1" glob-to-regexp "^0.4.1" highlight.js "^11.3.1" @@ -8008,7 +8037,7 @@ matrix-mock-request@^2.5.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "34.1.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8016,7 +8045,7 @@ matrix-mock-request@^2.5.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.145.0" + posthog-js "1.141.3" qrcode "1.5.3" re-resizable "^6.9.0" react "17.0.2" @@ -9418,10 +9447,10 @@ postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38: picocolors "^1.0.1" source-map-js "^1.2.0" -posthog-js@1.145.0: - version "1.145.0" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.145.0.tgz#5159459f02988b74407a1dd2b19469c422b31feb" - integrity sha512-LQdH6S2Ks3mnCI0q9aD5SZS0Uujc/90nuJuEeGDeGkWkVkYOSQJt4n0UHrIWEsZdmIKZf0a6OIBhTmO+yUiY3w== +posthog-js@1.141.3: + version "1.141.3" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.141.3.tgz#c0b78e62567b5de15e400254905d2b72544e3618" + integrity sha512-LZ+I6wJS82yX/SZVaK20V2WV4MEfB2G9fT2ZJoWlzwN5L3wsbpmjD9F2dVW818deBV3ms1w0Ho7rnlJtBGHx2g== dependencies: fflate "^0.4.8" preact "^10.19.3" @@ -10496,7 +10525,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10620,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11726,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11744,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 7f66d6579655cff1ecfd3ee9d5c365fd6c9ef2a4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 23 Jul 2024 12:09:34 +0000 Subject: [PATCH 020/167] Upgrade dependency to matrix-react-sdk@3.104.0-rc.0 --- package.json | 2 +- yarn.lock | 84 ++++++++++++++++++++++------------------------------ 2 files changed, 37 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 4444535c5cf..f3e30ecd755 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.2.0-rc.0", - "matrix-react-sdk": "3.103.0", + "matrix-react-sdk": "3.104.0-rc.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 041b46b9719..cde3a5ae2c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1515,7 +1515,7 @@ "@floating-ui/core" "^1.6.0" "@floating-ui/utils" "^0.2.4" -"@floating-ui/react-dom@^2.0.0", "@floating-ui/react-dom@^2.0.8", "@floating-ui/react-dom@^2.1.1": +"@floating-ui/react-dom@^2.0.0", "@floating-ui/react-dom@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.1.tgz#cca58b6b04fc92b4c39288252e285e0422291fb0" integrity sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg== @@ -1943,10 +1943,10 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@matrix-org/analytics-events@^0.23.0": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.23.1.tgz#206224f63e64b8cd892f704964204bce433bd189" - integrity sha512-+DuK5F313bZfO0jCsP7X3u0FQ09IM9Ujc9Zf//XoxzGThG9pvSYsEyNXQO7kUeQHwXlOobtVg1QcP172kN+h/g== +"@matrix-org/analytics-events@^0.24.0": + version "0.24.0" + resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.24.0.tgz#21a64537ac975b18e1eb13d9fd0bdc7d448a6039" + integrity sha512-3FDdtqZ+5cMqVffWjFNOIQ7RDFN6XS11kqdtN2ps8uvq5ce8gT0yXQvK37WeKWKZZ5QAKeoMzGhud+lsVcb1xg== "@matrix-org/emojibase-bindings@^1.1.2": version "1.1.3" @@ -2261,6 +2261,14 @@ dependencies: "@radix-ui/react-slot" "1.1.0" +"@radix-ui/react-progress@^1.0.3": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@radix-ui/react-progress/-/react-progress-1.1.0.tgz#28c267885ec154fc557ec7a66cb462787312f7e2" + integrity sha512-aSzvnYpP725CROcxAOEBVZZSIQVQdHgBr2QQFKySsaD14u8dNT0batuXI+AAGDdAHfXH8rbnHmjYFqVJ21KkRg== + dependencies: + "@radix-ui/react-context" "1.1.0" + "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-roving-focus@1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz#b30c59daf7e714c748805bfe11c76f96caaac35e" @@ -3327,16 +3335,16 @@ dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.2.3.tgz#feab8ae7623cfaa243b9be69325e1696bfa1a09c" - integrity sha512-KU5vAgNIFBzRHfCRK5dGAhxjrfkrUXeOYzDUNc2QjEnqGaUR3RM4c53sw0Ga1oHbOeAWoUGId+ptH3ewPdUTAQ== +"@vector-im/compound-web@^5.4.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.5.0.tgz#c646cd8c59aa7e5df527d843ad3b7b7c064d5224" + integrity sha512-Z+QSXOkJE4/LYk9j9FMVE2m5noz3gEA4yRxetjSJyXB5mDpyIJ1OYAweuZJXS3foxqygVDeB82YgTw1JgDtUvg== dependencies: "@floating-ui/react" "^0.26.9" - "@floating-ui/react-dom" "^2.0.8" "@radix-ui/react-context-menu" "^2.1.5" "@radix-ui/react-dropdown-menu" "^2.0.6" "@radix-ui/react-form" "^0.0.3" + "@radix-ui/react-progress" "^1.0.3" "@radix-ui/react-separator" "^1.0.3" "@radix-ui/react-slot" "^1.0.2" "@radix-ui/react-tooltip" "^1.0.6" @@ -5881,10 +5889,10 @@ file@^0.2.2: resolved "https://registry.yarnpkg.com/file/-/file-0.2.2.tgz#c3dfd8f8cf3535ae455c2b423c2e52635d76b4d3" integrity sha512-gwabMtChzdnpDJdPEpz8Vr/PX0pU85KailuPV71Zw/un5yJVKvzukhB3qf6O3lnTwIe5CxlMYLh3jOK3w5xrLA== -filesize@10.1.2: - version "10.1.2" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.2.tgz#33bb71c5c134102499f1bc36e6f2863137f6cb0c" - integrity sha512-Dx770ai81ohflojxhU+oG+Z2QGvKdYxgEr9OSA8UVrqhwNHjfH9A8f5NKfg83fEH8ZFA5N5llJo5T3PIoZ4CRA== +filesize@10.1.4: + version "10.1.4" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.4.tgz#184f256063a201f08b6e6b3cc47d21b60f5b8d89" + integrity sha512-ryBwPIIeErmxgPnm6cbESAzXjuEFubs+yKYLBZvg3CaiNcmkJChoOGcBSrZ6IwkMwPABwPpVXE6IlNdGJJrvEg== fill-range@^7.1.1: version "7.1.1" @@ -7942,27 +7950,6 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@34.1.0: - version "34.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.1.0.tgz#6ac76be1a91721f1ba3c4b0dedce7761735c4084" - integrity sha512-jJrnlNRBncsK98fkied+G3Y1QcUEcq18D+NwVsyOqFAlOs1Vsbrii3W5xzpuFytJnx4CD7UM7NLXCNGiFPl7jQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - "@matrix-org/olm" "3.2.15" - another-json "^0.2.0" - bs58 "^6.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-js-sdk@34.2.0-rc.0: version "34.2.0-rc.0" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.2.0-rc.0.tgz#3a02bdf295ec538a03a34aae00d9389ff18076ee" @@ -7991,13 +7978,13 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.103.0: - version "3.103.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.103.0.tgz#e0a6939b495289700006e75c02c8658c49257bef" - integrity sha512-vUJnUwxnqcXVp2hiOsgwoDLaMoLDTZlJlL1AY3HGeidHpTkjaftBebTq/57ys29tT782g8frDhQq3Rxlo/uzgg== +matrix-react-sdk@3.104.0-rc.0: + version "3.104.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0-rc.0.tgz#da3d14816101ad7cce25d7c3c586ab1c405e763f" + integrity sha512-ENY0z6oljeW0QFlX8MDZ+z6PZFmf7ii6b/qpL0AU6zpMIAIk9X9xH2IvKEbqbPlH210PEmQ2drFXcyxR1CnFng== dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/analytics-events" "^0.23.0" + "@matrix-org/analytics-events" "^0.24.0" "@matrix-org/emojibase-bindings" "^1.1.2" "@matrix-org/matrix-wysiwyg" "2.37.4" "@matrix-org/react-sdk-module-api" "^2.4.0" @@ -8005,7 +7992,7 @@ matrix-react-sdk@3.103.0: "@sentry/browser" "^8.0.0" "@testing-library/react-hooks" "^8.0.1" "@vector-im/compound-design-tokens" "^1.2.0" - "@vector-im/compound-web" "^5.2.3" + "@vector-im/compound-web" "^5.4.0" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -8015,12 +8002,13 @@ matrix-react-sdk@3.103.0: classnames "^2.2.6" commonmark "^0.31.0" counterpart "^0.18.6" + css-tree "^2.3.1" diff-dom "^5.0.0" diff-match-patch "^1.0.5" emojibase-regex "15.3.2" escape-html "^1.0.3" file-saver "^2.0.5" - filesize "10.1.2" + filesize "10.1.4" github-markdown-css "^5.5.1" glob-to-regexp "^0.4.1" highlight.js "^11.3.1" @@ -8037,7 +8025,7 @@ matrix-react-sdk@3.103.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.1.0" + matrix-js-sdk "34.2.0-rc.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8045,7 +8033,7 @@ matrix-react-sdk@3.103.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.141.3" + posthog-js "1.145.0" qrcode "1.5.3" re-resizable "^6.9.0" react "17.0.2" @@ -9447,10 +9435,10 @@ postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38: picocolors "^1.0.1" source-map-js "^1.2.0" -posthog-js@1.141.3: - version "1.141.3" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.141.3.tgz#c0b78e62567b5de15e400254905d2b72544e3618" - integrity sha512-LZ+I6wJS82yX/SZVaK20V2WV4MEfB2G9fT2ZJoWlzwN5L3wsbpmjD9F2dVW818deBV3ms1w0Ho7rnlJtBGHx2g== +posthog-js@1.145.0: + version "1.145.0" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.145.0.tgz#5159459f02988b74407a1dd2b19469c422b31feb" + integrity sha512-LQdH6S2Ks3mnCI0q9aD5SZS0Uujc/90nuJuEeGDeGkWkVkYOSQJt4n0UHrIWEsZdmIKZf0a6OIBhTmO+yUiY3w== dependencies: fflate "^0.4.8" preact "^10.19.3" From df53ba6d3a19bc5c3263dfa61173a7a9c91d3156 Mon Sep 17 00:00:00 2001 From: David Langley Date: Tue, 23 Jul 2024 18:40:14 +0100 Subject: [PATCH 021/167] Update Supported Environments --- README.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 60755b62b7c..53533c06b48 100644 --- a/README.md +++ b/README.md @@ -17,20 +17,30 @@ React SDK](https://github.com/matrix-org/matrix-react-sdk). Element has several tiers of support for different environments: - Supported - - Definition: Issues **actively triaged**, regressions **block** the release + - Definition: + - Issues **actively triaged**, regressions **block** the release - Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes - Last 2 versions of Safari - Latest release of official Element Desktop app on desktop OSes - Desktop OSes means macOS, Windows, and Linux versions for desktop devices that are actively supported by the OS vendor and receive security updates -- Experimental - - Definition: Issues **accepted**, regressions **do not block** the release - - Element as an installed PWA via current stable version of Chrome +- Best effort + - Definition: + - Issues **accepted**, regressions **do not block** the release + - The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers. + - The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function. + - Last major release of Firefox ESR and Chrome/Edge Extended Stable +- Community Supported + - Definition: + - Issues **accepted**, regressions **do not block** the release + - Community contributions are welcome to support these issues - Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS - Not supported - Definition: Issues only affecting unsupported environments are **closed** - Everything else +The period of support for these tiers should last until the releases specified above, plus 1 app release cycle(2 weeks). In the case of Firefox ESR this is extended further to allow it land in Debian Stable. + For accessing Element on an Android or iOS device, we currently recommend the native apps [element-android](https://github.com/element-hq/element-android) and [element-ios](https://github.com/element-hq/element-ios). From f22d719d388719079c581c3caadb69ea2b2c52da Mon Sep 17 00:00:00 2001 From: David Langley Date: Tue, 23 Jul 2024 18:47:11 +0100 Subject: [PATCH 022/167] lint --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 53533c06b48..19875e083d8 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,15 @@ Element has several tiers of support for different environments: - Desktop OSes means macOS, Windows, and Linux versions for desktop devices that are actively supported by the OS vendor and receive security updates - Best effort - - Definition: - - Issues **accepted**, regressions **do not block** the release + - Definition: + - Issues **accepted**, regressions **do not block** the release - The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers. - The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function. - - Last major release of Firefox ESR and Chrome/Edge Extended Stable + - Last major release of Firefox ESR and Chrome/Edge Extended Stable - Community Supported - - Definition: - - Issues **accepted**, regressions **do not block** the release - - Community contributions are welcome to support these issues + - Definition: + - Issues **accepted**, regressions **do not block** the release + - Community contributions are welcome to support these issues - Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS - Not supported - Definition: Issues only affecting unsupported environments are **closed** From 630be696b15e72a82336419b869673716f2585f1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 24 Jul 2024 11:34:34 +0000 Subject: [PATCH 023/167] Upgrade dependency to matrix-react-sdk@3.104.0-rc.1 --- package.json | 2 +- yarn.lock | 132 ++++----------------------------------------------- 2 files changed, 11 insertions(+), 123 deletions(-) diff --git a/package.json b/package.json index f3e30ecd755..79f2157e9d4 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.2.0-rc.0", - "matrix-react-sdk": "3.104.0-rc.0", + "matrix-react-sdk": "3.104.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index cde3a5ae2c6..607c8b37c2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3073,11 +3073,6 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== -"@types/q@^1.5.1": - version "1.5.8" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.8.tgz#95f6c6a08f2ad868ba230ead1d2d7f7be3db3837" - integrity sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw== - "@types/qrcode@^1.5.5": version "1.5.5" resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.5.tgz#993ff7c6b584277eee7aac0a20861eab682f9dac" @@ -3328,12 +3323,10 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vector-im/compound-design-tokens@^1.2.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.5.0.tgz#6c8ed8eb0ddbb1fd8f8e6025d66b856dee8b5677" - integrity sha512-G1EvLJ2lyWjd2esKqlJjQl7KXrCfQNKZUdtW68y2aQi8EvVMOpVvCNXGf0HwRmdXGGy2FhBIOufVTgx39I7juw== - dependencies: - svg2vectordrawable "^2.9.1" +"@vector-im/compound-design-tokens@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.6.1.tgz#3f1bb5b2b9f8aff10144aab19dfa11165c3c927b" + integrity sha512-u5xG/8AN7QkPPWhugj0ZrQtWsAjuKHzuOoP0s3bbDg7ZkKTE9l5tM29bdOHnSv9mEYKO+KVMMfsl0W1rlaTmAw== "@vector-im/compound-web@^5.4.0": version "5.5.0" @@ -3520,11 +3513,6 @@ abab@^2.0.6: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -abs-svg-path@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf" - integrity sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA== - accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -4170,7 +4158,7 @@ chalk@5.2.0: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== -chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -4278,15 +4266,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - code-block-writer@^11.0.0: version "11.0.3" resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76" @@ -4649,14 +4628,6 @@ css-select@^5.1.0: domutils "^3.0.1" nth-check "^2.0.1" -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - css-tree@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" @@ -4747,13 +4718,6 @@ cssnano@^7.0.1: cssnano-preset-default "^7.0.4" lilconfig "^3.1.2" -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - csso@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" @@ -6879,11 +6843,6 @@ is-subset@^0.1.1: resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== -is-svg-path@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-svg-path/-/is-svg-path-1.0.2.tgz#77ab590c12b3d20348e5c7a13d0040c87784dda0" - integrity sha512-Lj4vePmqpPR1ZnRctHv8ltSh1OrSxHkhUkd7wi+VQdcdP15/KvQFyk7LhNuM7ZW0EVbJz8kZLVmL9quLrfq4Kg== - is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" @@ -7978,10 +7937,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.104.0-rc.0: - version "3.104.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0-rc.0.tgz#da3d14816101ad7cce25d7c3c586ab1c405e763f" - integrity sha512-ENY0z6oljeW0QFlX8MDZ+z6PZFmf7ii6b/qpL0AU6zpMIAIk9X9xH2IvKEbqbPlH210PEmQ2drFXcyxR1CnFng== +matrix-react-sdk@3.104.0-rc.1: + version "3.104.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0-rc.1.tgz#1cb2ed45d87e5ae1faf07616ebee1e3b637fa885" + integrity sha512-5hut4s3wqKP6BhDq3OtgR4JrzyK/z/y+3gPmfJ0OtwOy/vTwDNDCIzfz3kwVZURXVeDOXTkeBd38WI4G8MZ7IA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.24.0" @@ -7991,7 +7950,7 @@ matrix-react-sdk@3.104.0-rc.0: "@matrix-org/spec" "^1.7.0" "@sentry/browser" "^8.0.0" "@testing-library/react-hooks" "^8.0.1" - "@vector-im/compound-design-tokens" "^1.2.0" + "@vector-im/compound-design-tokens" "^1.6.1" "@vector-im/compound-web" "^5.4.0" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" @@ -8070,11 +8029,6 @@ matrix-widget-api@^1.3.1, matrix-widget-api@^1.5.0, matrix-widget-api@^1.6.0: "@types/events" "^3.0.0" events "^3.2.0" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - mdn-data@2.0.28: version "2.0.28" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba" @@ -8371,13 +8325,6 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== -normalize-svg-path@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz#0e614eca23c39f0cffe821d6be6cd17e569a766c" - integrity sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg== - dependencies: - svg-arc-to-cubic-bezier "^3.0.0" - npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -8662,11 +8609,6 @@ parse-srcset@^1.0.2: resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== -parse-svg-path@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb" - integrity sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ== - parse5@^7.0.0, parse5@^7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" @@ -9565,11 +9507,6 @@ pure-rand@^6.0.0: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2" integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA== -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== - qrcode@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170" @@ -10468,11 +10405,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - stack-utils@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" @@ -10783,55 +10715,16 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svg-arc-to-cubic-bezier@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6" - integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g== - svg-parser@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svg-path-bounds@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz#00312f672b08afc432a66ddfbd06db40cec8d0d0" - integrity sha512-H4/uAgLWrppIC0kHsb2/dWUYSmb4GE5UqH06uqWBcg6LBjX2fu0A8+JrO2/FJPZiSsNOKZAhyFFgsLTdYUvSqQ== - dependencies: - abs-svg-path "^0.1.1" - is-svg-path "^1.0.1" - normalize-svg-path "^1.0.0" - parse-svg-path "^0.1.2" - svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== -svg2vectordrawable@^2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/svg2vectordrawable/-/svg2vectordrawable-2.9.1.tgz#23186ff7ace7038d09c031176dbca04063a97e5d" - integrity sha512-7WJIh4SzZLyEJtn45y+f8rREkgBiQMWfb0FoYkXuioywESjDWfbSuP0FQEmIiHP2zOi0oOO8pTG4VkeWJyidWw== - dependencies: - coa "^2.0.2" - mkdirp "^1.0.4" - svg-path-bounds "^1.0.1" - svgo "^2.8.0" - svgpath "^2.5.0" - -svgo@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - svgo@^3.0.2, svgo@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8" @@ -10845,11 +10738,6 @@ svgo@^3.0.2, svgo@^3.3.2: csso "^5.0.5" picocolors "^1.0.0" -svgpath@^2.5.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.6.0.tgz#5b160ef3d742b7dfd2d721bf90588d3450d7a90d" - integrity sha512-OIWR6bKzXvdXYyO4DK/UWa1VA1JeKq8E+0ug2DG98Y/vOmMpfZNj+TIG988HjfYSqtcy/hFOtZq/n/j5GSESNg== - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" From 5bd9529d379b08da79757a673338691440bfadb4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 24 Jul 2024 11:38:07 +0000 Subject: [PATCH 024/167] v1.11.72-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79f2157e9d4..d9c00ea611a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.71", + "version": "1.11.72-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 0b21ba0a27c79a88d82e3335a6f1b342cede3255 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:40:31 +0000 Subject: [PATCH 025/167] Update docker --- .github/workflows/dockerhub.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index aba8fd43352..a8f93b42ef5 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -37,15 +37,15 @@ jobs: run: ${{ matrix.prepare }} - name: Set up QEMU - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3 + uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3 with: install: true - name: Login to Docker Hub - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -65,7 +65,7 @@ jobs: - name: Build and push id: build-and-push - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6 + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6 with: context: . push: true From 45410dc883e3baa1c78aba244075a4321f2f0b8b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:41:25 +0000 Subject: [PATCH 026/167] Update babel monorepo --- yarn.lock | 306 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 196 insertions(+), 110 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..a365b1124a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,26 +30,26 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" -"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed" - integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw== +"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.8": + version "7.24.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.9.tgz#53eee4e68f1c1d0282aa0eb05ddb02d033fc43a0" + integrity sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng== "@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.18.5", "@babel/core@^7.21.3", "@babel/core@^7.23.9": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4" - integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g== + version "7.24.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.9.tgz#dc07c9d307162c97fa9484ea997ade65841c7c82" + integrity sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.24.7" - "@babel/helper-compilation-targets" "^7.24.7" - "@babel/helper-module-transforms" "^7.24.7" - "@babel/helpers" "^7.24.7" - "@babel/parser" "^7.24.7" + "@babel/generator" "^7.24.9" + "@babel/helper-compilation-targets" "^7.24.8" + "@babel/helper-module-transforms" "^7.24.9" + "@babel/helpers" "^7.24.8" + "@babel/parser" "^7.24.8" "@babel/template" "^7.24.7" - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.24.8" + "@babel/types" "^7.24.9" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -57,9 +57,9 @@ semver "^6.3.1" "@babel/eslint-parser@^7.12.10": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz#27ebab1a1ec21f48ae191a8aaac5b82baf80d9c7" - integrity sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA== + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz#bc655255fa4ded3694cc10ef3dbea6d69639c831" + integrity sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" @@ -72,7 +72,17 @@ dependencies: eslint-rule-composer "^0.3.0" -"@babel/generator@^7.24.7", "@babel/generator@^7.7.2": +"@babel/generator@^7.24.7", "@babel/generator@^7.24.8", "@babel/generator@^7.24.9": + version "7.24.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.10.tgz#a4ab681ec2a78bbb9ba22a3941195e28a81d8e76" + integrity sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg== + dependencies: + "@babel/types" "^7.24.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^2.5.1" + +"@babel/generator@^7.7.2": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d" integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA== @@ -97,26 +107,26 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9" - integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg== +"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz#b607c3161cd9d1744977d4f97139572fe778c271" + integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw== dependencies: - "@babel/compat-data" "^7.24.7" - "@babel/helper-validator-option" "^7.24.7" - browserslist "^4.22.2" + "@babel/compat-data" "^7.24.8" + "@babel/helper-validator-option" "^7.24.8" + browserslist "^4.23.1" lru-cache "^5.1.1" semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b" - integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg== + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz#47f546408d13c200c0867f9d935184eaa0851b09" + integrity sha512-4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-function-name" "^7.24.7" - "@babel/helper-member-expression-to-functions" "^7.24.7" + "@babel/helper-member-expression-to-functions" "^7.24.8" "@babel/helper-optimise-call-expression" "^7.24.7" "@babel/helper-replace-supers" "^7.24.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" @@ -165,13 +175,13 @@ dependencies: "@babel/types" "^7.24.7" -"@babel/helper-member-expression-to-functions@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f" - integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w== +"@babel/helper-member-expression-to-functions@^7.24.7", "@babel/helper-member-expression-to-functions@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6" + integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.24.8" + "@babel/types" "^7.24.8" "@babel/helper-module-imports@^7.24.7": version "7.24.7" @@ -181,10 +191,10 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-transforms@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8" - integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ== +"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.24.9": + version "7.24.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz#e13d26306b89eea569180868e652e7f514de9d29" + integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw== dependencies: "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-module-imports" "^7.24.7" @@ -199,10 +209,10 @@ dependencies: "@babel/types" "^7.24.7" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0" - integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" + integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== "@babel/helper-remap-async-to-generator@^7.24.7": version "7.24.7" @@ -245,20 +255,20 @@ dependencies: "@babel/types" "^7.24.7" -"@babel/helper-string-parser@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2" - integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg== +"@babel/helper-string-parser@^7.24.7", "@babel/helper-string-parser@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" + integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== "@babel/helper-validator-identifier@^7.24.5", "@babel/helper-validator-identifier@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== -"@babel/helper-validator-option@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6" - integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw== +"@babel/helper-validator-option@^7.24.7", "@babel/helper-validator-option@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" + integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== "@babel/helper-wrap-function@^7.24.7": version "7.24.7" @@ -270,13 +280,13 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helpers@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416" - integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg== +"@babel/helpers@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.8.tgz#2820d64d5d6686cca8789dd15b074cd862795873" + integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ== dependencies: "@babel/template" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/types" "^7.24.8" "@babel/highlight@^7.24.7": version "7.24.7" @@ -288,11 +298,16 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.7": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85" integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw== +"@babel/parser@^7.24.7", "@babel/parser@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.8.tgz#58a4dbbcad7eb1d48930524a3fd93d93e9084c6f" + integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w== + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz#fd059fd27b184ea2b4c7e646868a9a381bbc3055" @@ -550,16 +565,16 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf" - integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw== +"@babel/plugin-transform-classes@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz#ad23301fe5bc153ca4cf7fb572a9bc8b0b711cf7" + integrity sha512-VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.8" "@babel/helper-environment-visitor" "^7.24.7" "@babel/helper-function-name" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-replace-supers" "^7.24.7" "@babel/helper-split-export-declaration" "^7.24.7" globals "^11.1.0" @@ -572,12 +587,12 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/template" "^7.24.7" -"@babel/plugin-transform-destructuring@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e" - integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw== +"@babel/plugin-transform-destructuring@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550" + integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-dotall-regex@^7.24.7": version "7.24.7" @@ -682,6 +697,15 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-simple-access" "^7.24.7" +"@babel/plugin-transform-modules-commonjs@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c" + integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA== + dependencies: + "@babel/helper-module-transforms" "^7.24.8" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-simple-access" "^7.24.7" + "@babel/plugin-transform-modules-systemjs@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz#f8012316c5098f6e8dee6ecd58e2bc6f003d0ce7" @@ -757,12 +781,12 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.12.7", "@babel/plugin-transform-optional-chaining@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454" - integrity sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ== +"@babel/plugin-transform-optional-chaining@^7.12.7", "@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d" + integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" "@babel/plugin-syntax-optional-chaining" "^7.8.3" @@ -894,12 +918,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typeof-symbol@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz#f074be466580d47d6e6b27473a840c9f9ca08fb0" - integrity sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg== +"@babel/plugin-transform-typeof-symbol@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c" + integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-typescript@^7.24.7": version "7.24.7" @@ -943,14 +967,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.20.2": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37" - integrity sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ== - dependencies: - "@babel/compat-data" "^7.24.7" - "@babel/helper-compilation-targets" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-validator-option" "^7.24.7" + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.8.tgz#e0db94d7f17d6f0e2564e8d29190bc8cdacec2d1" + integrity sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ== + dependencies: + "@babel/compat-data" "^7.24.8" + "@babel/helper-compilation-targets" "^7.24.8" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-validator-option" "^7.24.8" "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.7" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" @@ -981,9 +1005,9 @@ "@babel/plugin-transform-block-scoping" "^7.24.7" "@babel/plugin-transform-class-properties" "^7.24.7" "@babel/plugin-transform-class-static-block" "^7.24.7" - "@babel/plugin-transform-classes" "^7.24.7" + "@babel/plugin-transform-classes" "^7.24.8" "@babel/plugin-transform-computed-properties" "^7.24.7" - "@babel/plugin-transform-destructuring" "^7.24.7" + "@babel/plugin-transform-destructuring" "^7.24.8" "@babel/plugin-transform-dotall-regex" "^7.24.7" "@babel/plugin-transform-duplicate-keys" "^7.24.7" "@babel/plugin-transform-dynamic-import" "^7.24.7" @@ -996,7 +1020,7 @@ "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" "@babel/plugin-transform-member-expression-literals" "^7.24.7" "@babel/plugin-transform-modules-amd" "^7.24.7" - "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.8" "@babel/plugin-transform-modules-systemjs" "^7.24.7" "@babel/plugin-transform-modules-umd" "^7.24.7" "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" @@ -1006,7 +1030,7 @@ "@babel/plugin-transform-object-rest-spread" "^7.24.7" "@babel/plugin-transform-object-super" "^7.24.7" "@babel/plugin-transform-optional-catch-binding" "^7.24.7" - "@babel/plugin-transform-optional-chaining" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.8" "@babel/plugin-transform-parameters" "^7.24.7" "@babel/plugin-transform-private-methods" "^7.24.7" "@babel/plugin-transform-private-property-in-object" "^7.24.7" @@ -1017,7 +1041,7 @@ "@babel/plugin-transform-spread" "^7.24.7" "@babel/plugin-transform-sticky-regex" "^7.24.7" "@babel/plugin-transform-template-literals" "^7.24.7" - "@babel/plugin-transform-typeof-symbol" "^7.24.7" + "@babel/plugin-transform-typeof-symbol" "^7.24.8" "@babel/plugin-transform-unicode-escapes" "^7.24.7" "@babel/plugin-transform-unicode-property-regex" "^7.24.7" "@babel/plugin-transform-unicode-regex" "^7.24.7" @@ -1026,7 +1050,7 @@ babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.4" babel-plugin-polyfill-regenerator "^0.6.1" - core-js-compat "^3.31.0" + core-js-compat "^3.37.1" semver "^6.3.1" "@babel/preset-modules@0.1.6-no-external-plugins": @@ -1078,9 +1102,9 @@ integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.9", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" - integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e" + integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA== dependencies: regenerator-runtime "^0.14.0" @@ -1093,7 +1117,7 @@ "@babel/parser" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/traverse@^7.18.5", "@babel/traverse@^7.24.7": +"@babel/traverse@^7.18.5": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5" integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA== @@ -1109,7 +1133,23 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.8.tgz#6c14ed5232b7549df3371d820fbd9abfcd7dfab7" + integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.8" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/parser" "^7.24.8" + "@babel/types" "^7.24.8" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.3.3": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== @@ -1118,6 +1158,15 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" +"@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9", "@babel/types@^7.4.4": + version "7.24.9" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.9.tgz#228ce953d7b0d16646e755acf204f4cf3d08cc73" + integrity sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ== + dependencies: + "@babel/helper-string-parser" "^7.24.8" + "@babel/helper-validator-identifier" "^7.24.7" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -4039,7 +4088,7 @@ braces@^3.0.3, braces@~3.0.2: dependencies: fill-range "^7.1.1" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.0, browserslist@^4.23.1: +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.23.0, browserslist@^4.23.1: version "4.23.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed" integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA== @@ -4147,11 +4196,16 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001599: version "1.0.30001641" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz#3572862cd18befae3f637f2a1101cc033c6782ac" integrity sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA== +caniuse-lite@^1.0.30001640: + version "1.0.30001643" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd" + integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== + chalk@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" @@ -4454,7 +4508,7 @@ copy-webpack-plugin@^12.0.0: schema-utils "^4.2.0" serialize-javascript "^6.0.2" -core-js-compat@^3.31.0, core-js-compat@^3.36.1, core-js-compat@^3.37.0: +core-js-compat@^3.36.1, core-js-compat@^3.37.0, core-js-compat@^3.37.1: version "3.37.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== @@ -5150,9 +5204,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.820: - version "1.4.823" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.823.tgz#38587f7aa55bed14930f04091dfc65c39a3d8bd7" - integrity sha512-4h+oPeAiGQOHFyUJOqpoEcPj/xxlicxBzOErVeYVMMmAiXUXsGpsFd0QXBMaUUbnD8hhSfLf9uw+MlsoIA7j5w== + version "1.5.0" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.0.tgz#0d3123a9f09189b9c7ab4b5d6848d71b3c1fd0e8" + integrity sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA== emittery@^0.13.1: version "0.13.1" @@ -6699,7 +6753,14 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.13.0, is-core-module@^2.13.1: +is-core-module@^2.13.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" + integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + dependencies: + hasown "^2.0.2" + +is-core-module@^2.13.1: version "2.14.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1" integrity sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A== @@ -8330,9 +8391,9 @@ node-int64@^0.4.0: integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== node-releases@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" - integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== normalize-package-data@^2.5.0: version "2.5.0" @@ -10496,7 +10557,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10652,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11758,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11776,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 916b883de16f67db403ebb4076c16552445fd688 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:41:47 +0000 Subject: [PATCH 027/167] Update definitelyTyped --- yarn.lock | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..c7f396a9333 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2975,9 +2975,9 @@ integrity sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ== "@types/lodash@^4.14.197": - version "4.17.6" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.6.tgz#193ced6a40c8006cfc1ca3f4553444fb38f0e543" - integrity sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA== + version "4.17.7" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.7.tgz#2f776bcb53adc9e13b2c0dfd493dfcbd7de43612" + integrity sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA== "@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.2": version "0.1.4" @@ -3031,9 +3031,9 @@ undici-types "~5.26.4" "@types/node@^16": - version "16.18.101" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.101.tgz#1e3065490c9ea01a05baf23eb4ac5be985eedc19" - integrity sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA== + version "16.18.104" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.104.tgz#33d5f4886c54133af0ff02445e57c5254025ee53" + integrity sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ== "@types/normalize-package-data@^2.4.0": version "2.4.4" @@ -10496,7 +10496,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10591,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11697,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11715,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From cffdaa628107886cf0b6fa72471f49a65ec26373 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:42:01 +0000 Subject: [PATCH 028/167] Update dependency typescript to v5.5.4 --- package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4f469c5bffc..f3a62da7749 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "terser-webpack-plugin": "^5.3.9", "ts-node": "^10.9.1", "ts-prune": "^0.10.3", - "typescript": "5.5.3", + "typescript": "5.5.4", "util": "^0.12.5", "webpack": "^5.89.0", "webpack-bundle-analyzer": "^4.8.0", diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..114027543af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10496,7 +10496,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10591,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11141,10 +11157,10 @@ typed-array-length@^1.0.6: is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" -typescript@5.5.3: - version "5.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa" - integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ== +typescript@5.5.4: + version "5.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" + integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== ua-parser-js@^1.0.0, ua-parser-js@^1.0.2: version "1.0.38" @@ -11681,7 +11697,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11715,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 2f88b3d1fd8e3910d6ace8c4c2e8e56a9de28898 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:42:17 +0000 Subject: [PATCH 029/167] Update typescript-eslint monorepo to v7.16.1 --- yarn.lock | 136 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 53 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..535d8f0d163 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3230,61 +3230,61 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^7.0.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.0.tgz#b3563927341eca15124a18c6f94215f779f5c02a" - integrity sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw== + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz#c8ed1af1ad2928ede5cdd207f7e3090499e1f77b" + integrity sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "7.16.0" - "@typescript-eslint/type-utils" "7.16.0" - "@typescript-eslint/utils" "7.16.0" - "@typescript-eslint/visitor-keys" "7.16.0" + "@typescript-eslint/scope-manager" "7.17.0" + "@typescript-eslint/type-utils" "7.17.0" + "@typescript-eslint/utils" "7.17.0" + "@typescript-eslint/visitor-keys" "7.17.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" ts-api-utils "^1.3.0" "@typescript-eslint/parser@^7.0.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.16.0.tgz#53fae8112f8c912024aea7b499cf7374487af6d8" - integrity sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw== - dependencies: - "@typescript-eslint/scope-manager" "7.16.0" - "@typescript-eslint/types" "7.16.0" - "@typescript-eslint/typescript-estree" "7.16.0" - "@typescript-eslint/visitor-keys" "7.16.0" + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.17.0.tgz#be8e32c159190cd40a305a2121220eadea5a88e7" + integrity sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A== + dependencies: + "@typescript-eslint/scope-manager" "7.17.0" + "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/typescript-estree" "7.17.0" + "@typescript-eslint/visitor-keys" "7.17.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz#eb0757af5720c9c53c8010d7a0355ae27e17b7e5" - integrity sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw== +"@typescript-eslint/scope-manager@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz#e072d0f914662a7bfd6c058165e3c2b35ea26b9d" + integrity sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA== dependencies: - "@typescript-eslint/types" "7.16.0" - "@typescript-eslint/visitor-keys" "7.16.0" + "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/visitor-keys" "7.17.0" -"@typescript-eslint/type-utils@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.16.0.tgz#ec52b1932b8fb44a15a3e20208e0bd49d0b6bd00" - integrity sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg== +"@typescript-eslint/type-utils@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz#c5da78feb134c9c9978cbe89e2b1a589ed22091a" + integrity sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA== dependencies: - "@typescript-eslint/typescript-estree" "7.16.0" - "@typescript-eslint/utils" "7.16.0" + "@typescript-eslint/typescript-estree" "7.17.0" + "@typescript-eslint/utils" "7.17.0" debug "^4.3.4" ts-api-utils "^1.3.0" -"@typescript-eslint/types@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2" - integrity sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw== +"@typescript-eslint/types@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.17.0.tgz#7ce8185bdf06bc3494e73d143dbf3293111b9cff" + integrity sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A== -"@typescript-eslint/typescript-estree@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz#98ac779d526fab2a781e5619c9250f3e33867c09" - integrity sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw== +"@typescript-eslint/typescript-estree@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz#dcab3fea4c07482329dd6107d3c6480e228e4130" + integrity sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw== dependencies: - "@typescript-eslint/types" "7.16.0" - "@typescript-eslint/visitor-keys" "7.16.0" + "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/visitor-keys" "7.17.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3292,22 +3292,22 @@ semver "^7.6.0" ts-api-utils "^1.3.0" -"@typescript-eslint/utils@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.16.0.tgz#b38dc0ce1778e8182e227c98d91d3418449aa17f" - integrity sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA== +"@typescript-eslint/utils@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.17.0.tgz#815cd85b9001845d41b699b0ce4f92d6dfb84902" + integrity sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "7.16.0" - "@typescript-eslint/types" "7.16.0" - "@typescript-eslint/typescript-estree" "7.16.0" + "@typescript-eslint/scope-manager" "7.17.0" + "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/typescript-estree" "7.17.0" -"@typescript-eslint/visitor-keys@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz#a1d99fa7a3787962d6e0efd436575ef840e23b06" - integrity sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg== +"@typescript-eslint/visitor-keys@7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz#680465c734be30969e564b4647f38d6cdf49bfb0" + integrity sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A== dependencies: - "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/types" "7.17.0" eslint-visitor-keys "^3.4.3" "@ungap/structured-clone@^1.2.0": @@ -10171,11 +10171,16 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.1: +semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.1: version "7.6.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== +semver@^7.6.0: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -10496,7 +10501,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10596,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11702,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11720,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 75e7fd5e87fd9f3bda446328562c5fe0d40be80d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:42:53 +0000 Subject: [PATCH 030/167] Update dependency stylelint to v16.7.0 --- yarn.lock | 97 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..aaaff267a16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1162,17 +1162,17 @@ "@csstools/color-helpers" "^4.2.1" "@csstools/css-calc" "^1.2.4" -"@csstools/css-parser-algorithms@^2.6.3", "@csstools/css-parser-algorithms@^2.7.1": +"@csstools/css-parser-algorithms@^2.7.1": version "2.7.1" resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz#6d93a8f7d8aeb7cd9ed0868f946e46f021b6aa70" integrity sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw== -"@csstools/css-tokenizer@^2.3.1", "@csstools/css-tokenizer@^2.4.1": +"@csstools/css-tokenizer@^2.4.1": version "2.4.1" resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz#1d8b2e200197cf5f35ceb07ca2dade31f3a00ae8" integrity sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg== -"@csstools/media-query-list-parser@^2.1.11", "@csstools/media-query-list-parser@^2.1.13": +"@csstools/media-query-list-parser@^2.1.13": version "2.1.13" resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz#f00be93f6bede07c14ddf51a168ad2748e4fe9e5" integrity sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA== @@ -3586,7 +3586,7 @@ ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.9.0: version "8.16.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== @@ -3596,6 +3596,16 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0: require-from-string "^2.0.2" uri-js "^4.4.1" +ajv@^8.0.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" + integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== + dependencies: + fast-deep-equal "^3.1.3" + fast-uri "^3.0.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + another-json@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc" @@ -4835,7 +4845,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== @@ -5790,6 +5800,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== +fast-uri@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" + integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + fastest-levenshtein@1.0.16, fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" @@ -7633,11 +7648,6 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -known-css-properties@^0.31.0: - version "0.31.0" - resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.31.0.tgz#5c8d9d8777b3ca09482b2397f6a241e5d69a1023" - integrity sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ== - known-css-properties@^0.34.0: version "0.34.0" resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.34.0.tgz#ccd7e9f4388302231b3f174a8b1d5b1f7b576cea" @@ -9346,9 +9356,9 @@ postcss-replace-overflow-wrap@^4.0.0: integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== postcss-resolve-nested-selector@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" - integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== + version "0.1.4" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz#0068767902fb40f0e6cd7b24faee4fa4bc14a5da" + integrity sha512-R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw== postcss-safe-parser@^7.0.0: version "7.0.0" @@ -9367,7 +9377,7 @@ postcss-selector-not@^7.0.2: dependencies: postcss-selector-parser "^6.0.13" -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.1.0: +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.1.0" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== @@ -9375,6 +9385,14 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-select cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.1.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz#5be94b277b8955904476a2400260002ce6c56e38" + integrity sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-simple-vars@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-7.0.1.tgz#836b3097a54dcd13dbd3c36a5dbdd512fad2954c" @@ -9409,7 +9427,7 @@ postcss@8.4.33: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38: +postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== @@ -10496,7 +10514,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10609,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -10660,13 +10694,13 @@ stylelint-scss@^6.0.0: postcss-value-parser "^4.2.0" stylelint@^16.1.0: - version "16.6.1" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.6.1.tgz#84735aca2bb5cde535572b7a9b878d2ec983a570" - integrity sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q== + version "16.7.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.7.0.tgz#5f6acf516aedecba7a6472ba0cc1ffc20e2be86b" + integrity sha512-Q1ATiXlz+wYr37a7TGsfvqYn2nSR3T/isw3IWlZQzFzCNoACHuGBb6xBplZXz56/uDRJHIygxjh7jbV/8isewA== dependencies: - "@csstools/css-parser-algorithms" "^2.6.3" - "@csstools/css-tokenizer" "^2.3.1" - "@csstools/media-query-list-parser" "^2.1.11" + "@csstools/css-parser-algorithms" "^2.7.1" + "@csstools/css-tokenizer" "^2.4.1" + "@csstools/media-query-list-parser" "^2.1.13" "@csstools/selector-specificity" "^3.1.1" "@dual-bundle/import-meta-resolve" "^4.1.0" balanced-match "^2.0.0" @@ -10674,7 +10708,7 @@ stylelint@^16.1.0: cosmiconfig "^9.0.0" css-functions-list "^3.2.2" css-tree "^2.3.1" - debug "^4.3.4" + debug "^4.3.5" fast-glob "^3.3.2" fastest-levenshtein "^1.0.16" file-entry-cache "^9.0.0" @@ -10685,13 +10719,13 @@ stylelint@^16.1.0: ignore "^5.3.1" imurmurhash "^0.1.4" is-plain-object "^5.0.0" - known-css-properties "^0.31.0" + known-css-properties "^0.34.0" mathml-tag-names "^2.1.3" meow "^13.2.0" micromatch "^4.0.7" normalize-path "^3.0.0" picocolors "^1.0.1" - postcss "^8.4.38" + postcss "^8.4.39" postcss-resolve-nested-selector "^0.1.1" postcss-safe-parser "^7.0.0" postcss-selector-parser "^6.1.0" @@ -11681,7 +11715,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11733,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 939ddbbee3cc741b6abc8010cb296db5ca4e3170 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:12:26 +0000 Subject: [PATCH 031/167] Update dependency @casualbot/jest-sonar-reporter to v2.3.1 --- package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4f469c5bffc..ddeff0958d9 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "@babel/preset-typescript": "^7.12.7", "@babel/register": "^7.12.10", "@babel/runtime": "^7.12.5", - "@casualbot/jest-sonar-reporter": "2.2.7", + "@casualbot/jest-sonar-reporter": "2.3.1", "@principalstudio/html-webpack-inject-preload": "^1.2.7", "@sentry/webpack-plugin": "^2.7.1", "@svgr/webpack": "^8.0.0", diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..a71475c0ebe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1123,10 +1123,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@casualbot/jest-sonar-reporter@2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@casualbot/jest-sonar-reporter/-/jest-sonar-reporter-2.2.7.tgz#3cc14c64f5d8ab5e9163b03b9cd2e07456432ed0" - integrity sha512-iswhPNodtcOQzfXR3TkD0A/8yHr5fnC86Ryt5UAqrJWfMI8mPZ9mpjykHnibbf91SjNtELv7ApZtha0bdWOmoQ== +"@casualbot/jest-sonar-reporter@2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@casualbot/jest-sonar-reporter/-/jest-sonar-reporter-2.3.1.tgz#20133634ecdd8775ca8fe9692599126c1b8dfaac" + integrity sha512-gND9elyG+0024l9g1nebd/9rdLyR6K28tycLiVOgWYaML/X7rSFjvzdbO693CKsV+M8c+6Rl9EocmPasNJukXg== dependencies: mkdirp "1.0.4" uuid "8.3.2" @@ -10496,7 +10496,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10591,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11697,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11715,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 260eec2fb7b58d230c0626d1a4e3fe6b0028de4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:12:45 +0000 Subject: [PATCH 032/167] Update dependency matrix-widget-api to v1.7.0 --- yarn.lock | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11f1fa2f7f4..00a0bf64874 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8046,9 +8046,9 @@ matrix-web-i18n@^3.2.1: walk "^2.3.15" matrix-widget-api@^1.3.1, matrix-widget-api@^1.5.0, matrix-widget-api@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.6.0.tgz#f0075411edffc6de339580ade7e6e6e6edb01af4" - integrity sha512-VXIJyAZ/WnBmT4C7ePqevgMYGneKMCP/0JuCOqntSsaNlCRHJvwvTxmqUU+ufOpzIF5gYNyIrAjbgrEbK3iqJQ== + version "1.7.0" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.7.0.tgz#ae3b44380f11bb03519d0bf0373dfc3341634667" + integrity sha512-dzSnA5Va6CeIkyWs89xZty/uv38HLyfjOrHGbbEikCa2ZV0HTkUNtrBMKlrn4CRYyDJ6yoO/3ssRwiR0jJvOkQ== dependencies: "@types/events" "^3.0.0" events "^3.2.0" @@ -10496,7 +10496,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10582,7 +10591,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11681,7 +11697,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -11699,6 +11715,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 85685780951177defc5643c6c68e7de09e856e5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:22:43 +0000 Subject: [PATCH 033/167] Update css --- package.json | 8 ++++---- yarn.lock | 49 ++++++++++++++++++++----------------------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 4f469c5bffc..603e6d85a08 100644 --- a/package.json +++ b/package.json @@ -170,16 +170,16 @@ "jest-raw-loader": "^1.0.1", "matrix-mock-request": "^2.5.0", "matrix-web-i18n": "^3.2.1", - "mini-css-extract-plugin": "2.8.0", + "mini-css-extract-plugin": "2.9.0", "minimist": "^1.2.6", "mkdirp": "^3.0.0", "modernizr": "^3.12.0", "node-fetch": "^2.6.7", - "postcss": "8.4.33", + "postcss": "8.4.39", "postcss-easings": "^4.0.0", "postcss-hexrgba": "2.1.0", - "postcss-import": "16.0.0", - "postcss-loader": "8.1.0", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", "postcss-mixins": "^10.0.0", "postcss-nested": "^6.0.0", "postcss-preset-env": "^9.5.14", diff --git a/yarn.lock b/yarn.lock index aaaff267a16..2485b8bae18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8168,10 +8168,10 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz#1aeae2a90a954b6426c9e8311eab36b450f553a0" - integrity sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg== +mini-css-extract-plugin@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz#c73a1327ccf466f69026ac22a8e8fd707b78a235" + integrity sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA== dependencies: schema-utils "^4.0.0" tapable "^2.2.1" @@ -9014,10 +9014,10 @@ postcss-image-set-function@^6.0.3: "@csstools/utilities" "^1.0.0" postcss-value-parser "^4.2.0" -postcss-import@16.0.0: - version "16.0.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-16.0.0.tgz#2be1c78391b3f43f129fccfe5cc0cc1a11baef54" - integrity sha512-e77lhVvrD1I2y7dYmBv0k9ULTdArgEYZt97T4w6sFIU5uxIHvDFQlKgUUyY7v7Barj0Yf/zm5A4OquZN7jKm5Q== +postcss-import@16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-16.1.0.tgz#258732175518129667fe1e2e2a05b19b5654b96a" + integrity sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg== dependencies: postcss-value-parser "^4.0.0" read-cache "^1.0.0" @@ -9041,10 +9041,10 @@ postcss-lab-function@^6.0.19: "@csstools/postcss-progressive-custom-properties" "^3.3.0" "@csstools/utilities" "^1.0.0" -postcss-loader@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-8.1.0.tgz#590e8bd872d7cdf53c486cbcd40c4c94789f1216" - integrity sha512-AbperNcX3rlob7Ay7A/HQcrofug1caABBkopoFeOQMspZBqcqj6giYn1Bwey/0uiOPAcR+NQD0I2HC7rXzk91w== +postcss-loader@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-8.1.1.tgz#2822589e7522927344954acb55bbf26e8b195dfe" + integrity sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ== dependencies: cosmiconfig "^9.0.0" jiti "^1.20.0" @@ -9152,11 +9152,11 @@ postcss-modules-values@^4.0.0: icss-utils "^5.0.0" postcss-nested@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" - integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131" + integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ== dependencies: - postcss-selector-parser "^6.0.11" + postcss-selector-parser "^6.1.1" postcss-nesting@^12.1.5: version "12.1.5" @@ -9377,7 +9377,7 @@ postcss-selector-not@^7.0.2: dependencies: postcss-selector-parser "^6.0.13" -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: +postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.1.0" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== @@ -9385,7 +9385,7 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-select cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.1.0: +postcss-selector-parser@^6.1.0, postcss-selector-parser@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz#5be94b277b8955904476a2400260002ce6c56e38" integrity sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg== @@ -9418,16 +9418,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.33: - version "8.4.33" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" - integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: +postcss@8.4.39, postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== @@ -10379,7 +10370,7 @@ sockjs@^0.3.24: uuid "^8.3.2" websocket-driver "^0.7.4" -source-map-js@^1.0.1, source-map-js@^1.0.2, source-map-js@^1.2.0: +source-map-js@^1.0.1, source-map-js@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== From 6af3afa6fb92a210745b912b8dec1e5cdf404258 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:57:44 +0000 Subject: [PATCH 034/167] Update all non-major dependencies --- .github/workflows/triage-labelled.yml | 4 +- package.json | 2 +- yarn.lock | 201 ++++++++++++-------------- 3 files changed, 97 insertions(+), 110 deletions(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index 3e0dc3df35f..fe7b275cad8 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -60,7 +60,7 @@ jobs: contains(github.event.issue.labels.*.name, 'X-Needs-Info') steps: - id: add_to_project - uses: actions/add-to-project@v1.0.1 + uses: actions/add-to-project@v1.0.2 with: project-url: ${{ env.PROJECT_URL }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} @@ -83,7 +83,7 @@ jobs: contains(github.event.issue.labels.*.name, 'Z-Flaky-Test') steps: - id: add_to_project - uses: actions/add-to-project@v1.0.1 + uses: actions/add-to-project@v1.0.2 with: project-url: ${{ env.PROJECT_URL }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/package.json b/package.json index f3a62da7749..3a62d35c782 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "postcss-preset-env": "^9.5.14", "postcss-scss": "^4.0.4", "postcss-simple-vars": "^7.0.1", - "prettier": "3.3.2", + "prettier": "3.3.3", "process": "^0.11.10", "raw-loader": "^4.0.2", "rimraf": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index c5d41b25612..9424bc123dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2455,10 +2455,10 @@ "@sentry/types" "8.17.0" "@sentry/utils" "8.17.0" -"@sentry/babel-plugin-component-annotate@2.21.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.21.0.tgz#ba9284a4a8049d2b7c60479b1f4f93eda7e8e93b" - integrity sha512-/AVhanRMM7GcCHfqmLPwT6e15hpVsvCZ38I9XYgvECiPFVQLQ1tY8f+5XZ/tV3Lpjv9x0TrebibGd9PZqM4Q/g== +"@sentry/babel-plugin-component-annotate@2.21.1": + version "2.21.1" + resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.21.1.tgz#1fbf7ceca62fdc44957e37b60312808588c87350" + integrity sha512-u1L8gZ4He0WdyiIsohYkA/YOY1b6Oa5yIMRtfZZ9U5TiWYLgOfMWyb88X0GotZeghSbgxrse/yI4WeHnhAUQDQ== "@sentry/browser@^8.0.0": version "8.17.0" @@ -2473,13 +2473,13 @@ "@sentry/types" "8.17.0" "@sentry/utils" "8.17.0" -"@sentry/bundler-plugin-core@2.21.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.21.0.tgz#e68a7394462489e29682ea06ee7e428fe1985ad2" - integrity sha512-qEi6LuVJV0ucNhPHI6qMYGrjlc9yS8CThS6mQ3K/1nWXNxiKRfxukSbjPfdT4iOUUO/RqX0hKIAv0Nc5M98b0w== +"@sentry/bundler-plugin-core@2.21.1": + version "2.21.1" + resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.21.1.tgz#fa50e83742d23962dd647d2dc8faeb2a86799751" + integrity sha512-F8FdL/bS8cy1SY1Gw0Mfo3ROTqlrq9Lvt5QGvhXi22dpVcDkWmoTWE2k+sMEnXOa8SdThMc/gyC8lMwHGd3kFQ== dependencies: "@babel/core" "^7.18.5" - "@sentry/babel-plugin-component-annotate" "2.21.0" + "@sentry/babel-plugin-component-annotate" "2.21.1" "@sentry/cli" "^2.22.3" dotenv "^16.3.1" find-up "^5.0.0" @@ -2487,45 +2487,45 @@ magic-string "0.30.8" unplugin "1.0.1" -"@sentry/cli-darwin@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.32.1.tgz#9cb3b8cfb7068d40979514dee72e2bb3ad2c6d0a" - integrity sha512-z/lEwANTYPCzbWTZ2+eeeNYxRLllC8knd0h+vtAKlhmGw/fyc/N39cznIFyFu+dLJ6tTdjOWOeikHtKuS/7onw== - -"@sentry/cli-linux-arm64@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.32.1.tgz#785a5d5d3d2919c581bf5b4efc638c3695d8c3bf" - integrity sha512-hsGqHYuecUl1Yhq4MhiRejfh1gNlmhyNPcQEoO/DDRBnGnJyEAdiDpKXJcc2e/lT9k40B55Ob2CP1SeY040T2w== - -"@sentry/cli-linux-arm@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.32.1.tgz#7f9e8292850311bab263e7b84800eb407ff37998" - integrity sha512-m0lHkn+o4YKBq8KptGZvpT64FAwSl9mYvHZO9/ChnEGIJ/WyJwiN1X1r9JHVaW4iT5lD0Y5FAyq3JLkk0m0XHg== - -"@sentry/cli-linux-i686@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.32.1.tgz#8e85fa58dee042e6a4642e960d226788f8e7288b" - integrity sha512-SuMLN1/ceFd3Q/B0DVyh5igjetTAF423txiABAHASenEev0lG0vZkRDXFclfgDtDUKRPmOXW7VDMirM3yZWQHQ== - -"@sentry/cli-linux-x64@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.32.1.tgz#b68ed9c4ba163b6730d386dbeca828114f1c979b" - integrity sha512-x4FGd6xgvFddz8V/dh6jii4wy9qjWyvYLBTz8Fhi9rIP+b8wQ3oxwHIdzntareetZP7C1ggx+hZheiYocNYVwA== - -"@sentry/cli-win32-i686@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.32.1.tgz#e2532893f87f5d180f6e56f49904d4ac141c8788" - integrity sha512-i6aZma9mFzR+hqMY5VliQZEX6ypP/zUjPK0VtIMYWs5cC6PsQLRmuoeJmy3Z7d4nlh0CdK5NPC813Ej6RY6/vg== - -"@sentry/cli-win32-x64@2.32.1": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.32.1.tgz#6b60607cbba243f3708779443cd3f16e09d4289c" - integrity sha512-B58w/lRHLb4MUSjJNfMMw2cQykfimDCMLMmeK+1EiT2RmSeNQliwhhBxYcKk82a8kszH6zg3wT2vCea7LyPUyA== +"@sentry/cli-darwin@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.33.0.tgz#c0f3352a9e58e4f02deca52f0d5a9bd14b3e4a32" + integrity sha512-LQFvD7uCOQ2P/vYru7IBKqJDHwJ9Rr2vqqkdjbxe2YCQS/N3NPXvi3eVM9hDJ284oyV/BMZ5lrmVTuIicf/hhw== + +"@sentry/cli-linux-arm64@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.33.0.tgz#14bc2556aa1011b96e7964756f84c4215a087ea7" + integrity sha512-mR2ZhqpU8RBVGLF5Ji19iOmVznk1B7Bzg5VhA8bVPuKsQmFN/3SyqE87IPMhwKoAsSRXyctwmbAkKs4240fxGA== + +"@sentry/cli-linux-arm@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.33.0.tgz#e00f9698b6c79e064490a32d11ad7d1909a15314" + integrity sha512-gY1bFE7wjDJc7WiNq1AS0WrILqLLJUw6Ou4pFQS45KjaH3/XJ1eohHhGJNy/UBHJ/Gq32b/BA9vsnWTXClZJ7g== + +"@sentry/cli-linux-i686@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.33.0.tgz#f2475caa9897067f25114aa368e6b3ac11c86652" + integrity sha512-XPIy0XpqgAposHtWsy58qsX85QnZ8q0ktBuT4skrsCrLMzfhoQg4Ua+YbUr3RvE814Rt8Hzowx2ar2Rl3pyCyw== + +"@sentry/cli-linux-x64@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.33.0.tgz#181936a6f37dd237a2f867c11244b26e2d58d5fa" + integrity sha512-qe1DdCUv4tmqS03s8RtCkEX9vCW2G+NgOxX6jZ5jN/sKDwjUlquljqo7JHUGSupkoXmymnNPm5By3rNr6VyNHg== + +"@sentry/cli-win32-i686@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.33.0.tgz#3ab02ea0ef159a801701d41e0a16f52d4e751cdb" + integrity sha512-VEXWtJ69C3b+kuSmXQJRwdQ0ypPGH88hpqyQuosbAOIqh/sv4g9B/u1ETHZc+whLdFDpPcTLVMbLDbXTGug0Yg== + +"@sentry/cli-win32-x64@2.33.0": + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.33.0.tgz#fc9ec9b7cbec80d7cd39aaa570b7682399a0b1de" + integrity sha512-GIUKysZ1xbSklY9h1aVaLMSYLsnMSd+JuwQLR+0wKw2wJC4O5kNCPFSGikhiOZM/kvh3GO1WnXNyazFp8nLAzw== "@sentry/cli@^2.22.3": - version "2.32.1" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.32.1.tgz#80932d3d58e6d3b52e2bd705673e08deeb9cb5b0" - integrity sha512-MWkbkzZfnlE7s2pPbg4VozRSAeMlIObfZlTIou9ye6XnPt6ZmmxCLOuOgSKMv4sXg6aeqKNzMNiadThxCWyvPg== + version "2.33.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.33.0.tgz#5de59f829070ab20d360fae25924f39c55afd8ba" + integrity sha512-9MOzQy1UunVBhPOfEuO0JH2ofWAMmZVavTTR/Bo2CkJwI1qjyVF0UKLTXE3l4ujiJnFufOoBsVyKmYWXFerbCw== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -2533,13 +2533,13 @@ proxy-from-env "^1.1.0" which "^2.0.2" optionalDependencies: - "@sentry/cli-darwin" "2.32.1" - "@sentry/cli-linux-arm" "2.32.1" - "@sentry/cli-linux-arm64" "2.32.1" - "@sentry/cli-linux-i686" "2.32.1" - "@sentry/cli-linux-x64" "2.32.1" - "@sentry/cli-win32-i686" "2.32.1" - "@sentry/cli-win32-x64" "2.32.1" + "@sentry/cli-darwin" "2.33.0" + "@sentry/cli-linux-arm" "2.33.0" + "@sentry/cli-linux-arm64" "2.33.0" + "@sentry/cli-linux-i686" "2.33.0" + "@sentry/cli-linux-x64" "2.33.0" + "@sentry/cli-win32-i686" "2.33.0" + "@sentry/cli-win32-x64" "2.33.0" "@sentry/core@8.17.0": version "8.17.0" @@ -2562,11 +2562,11 @@ "@sentry/types" "8.17.0" "@sentry/webpack-plugin@^2.7.1": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.21.0.tgz#b88445749d394ae6c23281f4077c83d2014494cc" - integrity sha512-XJQ2lt0T6tFq2s89CFtkInjqIaw/lHm4Mkvsc9CxYLeAW+OH+lvdj8EV+uRAeP3c6O/sBMa3iaafY+EfSX/pNg== + version "2.21.1" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.21.1.tgz#ea0fa50508b4bb3d7cbdb25379edbf7b251e7fdc" + integrity sha512-mhKWQq7/eC35qrhhD8oXm/37vZ1BQqmCD8dUngFIr4D24rc7dwlGwPGOYv59yiBqjTS0fGJ+o0xC5PTRKljGQQ== dependencies: - "@sentry/bundler-plugin-core" "2.21.0" + "@sentry/bundler-plugin-core" "2.21.1" unplugin "1.0.1" uuid "^9.0.0" @@ -2878,9 +2878,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.56.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" - integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== + version "9.6.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.0.tgz#51d4fe4d0316da9e9f2c80884f2c20ed5fb022ff" + integrity sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -3073,9 +3073,9 @@ "@types/node" "*" "@types/node@*": - version "20.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.10.tgz#a1a218290f1b6428682e3af044785e5874db469a" - integrity sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ== + version "20.14.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.12.tgz#129d7c3a822cb49fc7ff661235f19cfefd422b49" + integrity sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ== dependencies: undici-types "~5.26.4" @@ -3819,16 +3819,6 @@ array.prototype.flatmap@^1.3.2: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.toreversed@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz#b989a6bf35c4c5051e1dc0325151bf8088954eba" - integrity sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - array.prototype.tosorted@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc" @@ -5264,9 +5254,9 @@ encodeurl@~1.0.2: integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== enhanced-resolve@^5.17.0: - version "5.17.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" - integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5540,28 +5530,28 @@ eslint-plugin-react-hooks@^4.3.0: integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== eslint-plugin-react@^7.28.0: - version "7.34.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b" - integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA== + version "7.35.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41" + integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA== dependencies: array-includes "^3.1.8" array.prototype.findlast "^1.2.5" array.prototype.flatmap "^1.3.2" - array.prototype.toreversed "^1.1.2" array.prototype.tosorted "^1.1.4" doctrine "^2.1.0" es-iterator-helpers "^1.0.19" estraverse "^5.3.0" + hasown "^2.0.2" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" object.entries "^1.1.8" object.fromentries "^2.0.8" - object.hasown "^1.1.4" object.values "^1.2.0" prop-types "^15.8.1" resolve "^2.0.0-next.5" semver "^6.3.1" string.prototype.matchall "^4.0.11" + string.prototype.repeat "^1.0.0" eslint-plugin-unicorn@^54.0.0: version "54.0.0" @@ -8512,15 +8502,6 @@ object.groupby@^1.0.1: define-properties "^1.2.1" es-abstract "^1.23.2" -object.hasown@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc" - integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg== - dependencies: - define-properties "^1.2.1" - es-abstract "^1.23.2" - es-object-atoms "^1.0.0" - object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" @@ -9521,10 +9502,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a" - integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA== +prettier@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105" + integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew== pretty-error@^4.0.0: version "4.0.0" @@ -10105,11 +10086,12 @@ rimraf@^5.0.5: glob "^10.3.7" rimraf@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.0.0.tgz#503bb3d9283272384c121792d40e7ee3ab763cde" - integrity sha512-u+yqhM92LW+89cxUQK0SRyvXYQmyuKHx0jkx4W7KfwLGLqJnQM5031Uv1trE4gB9XEXBM/s6MxKlfW95IidqaA== + version "6.0.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.0.1.tgz#ffb8ad8844dd60332ab15f52bc104bc3ed71ea4e" + integrity sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A== dependencies: glob "^11.0.0" + package-json-from-dist "^1.0.0" run-applescript@^7.0.0: version "7.0.0" @@ -10250,12 +10232,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.1: - version "7.6.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" - integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== - -semver@^7.6.0: +semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.1: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -10971,7 +10948,7 @@ terser-webpack-plugin@^5.3.10, terser-webpack-plugin@^5.3.9: serialize-javascript "^6.0.1" terser "^5.26.0" -terser@^5.10.0, terser@^5.26.0: +terser@^5.10.0: version "5.31.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.2.tgz#b5ca188107b706084dca82f988089fa6102eba11" integrity sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw== @@ -10981,6 +10958,16 @@ terser@^5.10.0, terser@^5.26.0: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.26.0: + version "5.31.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.3.tgz#b24b7beb46062f4653f049eea4f0cd165d0f0c38" + integrity sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -11617,9 +11604,9 @@ webpack-virtual-modules@^0.5.0: integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw== webpack@^5.89.0: - version "5.92.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788" - integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA== + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" From 95f3d3c2b72c978252a5b66ec6c1032f6d565c67 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Jul 2024 13:59:48 +0100 Subject: [PATCH 035/167] Hold back postcss Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- yarn.lock | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 603e6d85a08..5fdd82bb249 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "mkdirp": "^3.0.0", "modernizr": "^3.12.0", "node-fetch": "^2.6.7", - "postcss": "8.4.39", + "postcss": "8.4.38", "postcss-easings": "^4.0.0", "postcss-hexrgba": "2.1.0", "postcss-import": "16.1.0", diff --git a/yarn.lock b/yarn.lock index 2485b8bae18..ea563b8d90a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7978,15 +7978,16 @@ matrix-mock-request@^2.5.0: resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/19f9f9856451a8e4cce6d313d19ca8aed4b5d6b4" dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/analytics-events" "^0.24.0" + "@matrix-org/analytics-events" "^0.23.0" "@matrix-org/emojibase-bindings" "^1.1.2" - "@matrix-org/matrix-wysiwyg" "2.37.4" + "@matrix-org/matrix-wysiwyg" "2.37.3" + "@matrix-org/olm" "3.2.15" "@matrix-org/react-sdk-module-api" "^2.4.0" "@matrix-org/spec" "^1.7.0" "@sentry/browser" "^8.0.0" "@testing-library/react-hooks" "^8.0.1" "@vector-im/compound-design-tokens" "^1.2.0" - "@vector-im/compound-web" "^5.2.3" + "@vector-im/compound-web" "^4.6.0" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -7998,16 +7999,17 @@ matrix-mock-request@^2.5.0: counterpart "^0.18.6" diff-dom "^5.0.0" diff-match-patch "^1.0.5" - emojibase-regex "15.3.2" + emojibase-regex "15.3.0" escape-html "^1.0.3" file-saver "^2.0.5" - filesize "10.1.4" + filesize "10.1.2" github-markdown-css "^5.5.1" glob-to-regexp "^0.4.1" + graphemer "^1.4.0" highlight.js "^11.3.1" html-entities "^2.0.0" is-ip "^3.1.0" - js-xxhash "^4.0.0" + js-xxhash "^3.0.1" jszip "^3.7.0" katex "^0.16.0" linkify-element "4.1.3" @@ -8026,7 +8028,8 @@ matrix-mock-request@^2.5.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.145.0" + posthog-js "1.138.1" + proposal-temporal "^0.9.0" qrcode "1.5.3" re-resizable "^6.9.0" react "17.0.2" @@ -8039,7 +8042,6 @@ matrix-mock-request@^2.5.0: sanitize-filename "^1.6.3" sanitize-html "2.13.0" tar-js "^0.3.0" - temporal-polyfill "^0.2.5" ua-parser-js "^1.0.2" uuid "^10.0.0" what-input "^5.2.10" @@ -9418,7 +9420,16 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.39, postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: +postcss@8.4.38: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + +postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== From d6e3be31d805b191b79583b0f81ed66ed5ead6c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:45:43 +0000 Subject: [PATCH 036/167] Update dependency yaml to v2.5.0 --- yarn.lock | 106 ++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 56 deletions(-) diff --git a/yarn.lock b/yarn.lock index ab221a690f4..247a2e7c557 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1992,10 +1992,10 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@matrix-org/analytics-events@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.24.0.tgz#21a64537ac975b18e1eb13d9fd0bdc7d448a6039" - integrity sha512-3FDdtqZ+5cMqVffWjFNOIQ7RDFN6XS11kqdtN2ps8uvq5ce8gT0yXQvK37WeKWKZZ5QAKeoMzGhud+lsVcb1xg== +"@matrix-org/analytics-events@^0.23.0": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.23.1.tgz#206224f63e64b8cd892f704964204bce433bd189" + integrity sha512-+DuK5F313bZfO0jCsP7X3u0FQ09IM9Ujc9Zf//XoxzGThG9pvSYsEyNXQO7kUeQHwXlOobtVg1QcP172kN+h/g== "@matrix-org/emojibase-bindings@^1.1.2": version "1.1.3" @@ -2010,10 +2010,15 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-6.2.1.tgz#94cd1263656e2b4f3b1dc6f728856efab8920aca" integrity sha512-5mav0EKog0w9NWRRxFzZ+ZcT5Il/KlLh1bsQXgxfhzfJq1RgWLLu+OsvHSZau5NSbPxfOd4ZTWc2ZLAf+V/8mg== -"@matrix-org/matrix-wysiwyg@2.37.4": - version "2.37.4" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.4.tgz#bd9b46051a21c9986477e3a83a1417b1ee926d81" - integrity sha512-4OtBWAHNAOu9P5C6jOIeHlu4ChwV2YusxnbGuN20IceC4bT2h38flZQgm0x9/jgHfF0LwnKUwKXsxtRoq8xW0g== +"@matrix-org/matrix-wysiwyg@2.37.3": + version "2.37.3" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.37.3.tgz#3f068252948f036b3d233828aecf856f74f9d7f1" + integrity sha512-WGDZi9ksgkEXS2WlOqGloc9vbgLYVNN/gBhXihAjFtPwix0qEhDSIfzplyQO24WrPpq//PSnXlEFShWhJH0OIg== + +"@matrix-org/olm@3.2.15": + version "3.2.15" + resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec" + integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q== "@matrix-org/react-sdk-module-api@^2.3.0", "@matrix-org/react-sdk-module-api@^2.4.0": version "2.4.0" @@ -3371,10 +3376,10 @@ dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.2.3.tgz#feab8ae7623cfaa243b9be69325e1696bfa1a09c" - integrity sha512-KU5vAgNIFBzRHfCRK5dGAhxjrfkrUXeOYzDUNc2QjEnqGaUR3RM4c53sw0Ga1oHbOeAWoUGId+ptH3ewPdUTAQ== +"@vector-im/compound-web@^4.6.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.10.0.tgz#5403c9933af91d432b5fb5f92a305acadc810893" + integrity sha512-SPeol6FK/h/q8ChHyuCCncUIVoIGNdPODBf7UqvaohRjt8EzyAAHKP89l1YhWKqEaOtG67+28IXoFvdS46tbUA== dependencies: "@floating-ui/react" "^0.26.9" "@floating-ui/react-dom" "^2.0.8" @@ -3385,7 +3390,6 @@ "@radix-ui/react-slot" "^1.0.2" "@radix-ui/react-tooltip" "^1.0.6" classnames "^2.3.2" - ts-xor "^1.3.0" vaul "^0.7.0" "@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": @@ -4005,6 +4009,11 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== +big-integer@^1.6.48: + version "1.6.52" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85" + integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -5228,10 +5237,10 @@ emojibase-data@^15.0.0: resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-15.3.2.tgz#2742246bfe14f16a7829b42ca156dec09934cf85" integrity sha512-TpDyTDDTdqWIJixV5sTA6OQ0P0JfIIeK2tFRR3q56G9LK65ylAZ7z3KyBXokpvTTJ+mLUXQXbLNyVkjvnTLE+A== -emojibase-regex@15.3.2: - version "15.3.2" - resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.3.2.tgz#5175231715b86d4b437754527288844a6c29318f" - integrity sha512-ue6BVeb2qu33l97MkxcOoyMJlg6Tug3eTv2z1at+M9TjvlWKvdmAPvZIDG1JbT2RH3FSyJNLucO5K5H/yxT03w== +emojibase-regex@15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.3.0.tgz#98c9683a481ccb1fe6aefddb495b2d692bbf5368" + integrity sha512-EBz/292VBF9naBPBsGzkZUccgIv1xJibTXIINl8SezgVRnTCpKJx7MgZcR+UAd2RwjGkRJJZ/lhP7riOFZLicA== emojibase@^15.0.0: version "15.3.1" @@ -5293,7 +5302,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: +es-abstract@^1.17.5, es-abstract@^1.18.3, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: version "1.23.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== @@ -5935,10 +5944,10 @@ file@^0.2.2: resolved "https://registry.yarnpkg.com/file/-/file-0.2.2.tgz#c3dfd8f8cf3535ae455c2b423c2e52635d76b4d3" integrity sha512-gwabMtChzdnpDJdPEpz8Vr/PX0pU85KailuPV71Zw/un5yJVKvzukhB3qf6O3lnTwIe5CxlMYLh3jOK3w5xrLA== -filesize@10.1.4: - version "10.1.4" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.4.tgz#184f256063a201f08b6e6b3cc47d21b60f5b8d89" - integrity sha512-ryBwPIIeErmxgPnm6cbESAzXjuEFubs+yKYLBZvg3CaiNcmkJChoOGcBSrZ6IwkMwPABwPpVXE6IlNdGJJrvEg== +filesize@10.1.2: + version "10.1.2" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.2.tgz#33bb71c5c134102499f1bc36e6f2863137f6cb0c" + integrity sha512-Dx770ai81ohflojxhU+oG+Z2QGvKdYxgEr9OSA8UVrqhwNHjfH9A8f5NKfg83fEH8ZFA5N5llJo5T3PIoZ4CRA== fill-range@^7.1.1: version "7.1.1" @@ -7536,10 +7545,10 @@ jiti@^1.20.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-xxhash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-4.0.0.tgz#866b003c06ba39bebc9e4a47d2756abfef06606c" - integrity sha512-3Q2eIqG6s1KEBBmkj9tGM9lef8LJbuRyTVBdI3GpTnrvtytunjLPO0wqABp5qhtMzfA32jYn1FlnIV7GH1RAHQ== +js-xxhash@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-xxhash/-/js-xxhash-3.0.1.tgz#e093b53d02cd80a830d61f58290c206aaa877b24" + integrity sha512-Y2NSC77RIxJrvi2NoXjMi2LYsVDTlVqBoQRi8PXQg4PtP29wdtIOhsp8Ujw4EjEkBFheCPx8bMOmI9zoxx/3jQ== js-yaml@^3.13.1: version "3.14.1" @@ -9480,14 +9489,13 @@ postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.39: picocolors "^1.0.1" source-map-js "^1.2.0" -posthog-js@1.145.0: - version "1.145.0" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.145.0.tgz#5159459f02988b74407a1dd2b19469c422b31feb" - integrity sha512-LQdH6S2Ks3mnCI0q9aD5SZS0Uujc/90nuJuEeGDeGkWkVkYOSQJt4n0UHrIWEsZdmIKZf0a6OIBhTmO+yUiY3w== +posthog-js@1.138.1: + version "1.138.1" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.138.1.tgz#02052cdff5087edfa782ac3bb593d48802d0f932" + integrity sha512-hLahTznM0/iSM3vl6QGcmdG/zgCcW2DaQqPf7OtXCoqxNdYCWTNp6/sqepd6CxtDmJfm1S5Cbu1tD9TSksOYcA== dependencies: fflate "^0.4.8" preact "^10.19.3" - web-vitals "^4.0.1" potpack@^1.0.2: version "1.0.2" @@ -9577,6 +9585,14 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" +proposal-temporal@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/proposal-temporal/-/proposal-temporal-0.9.0.tgz#4841cf83cf270f85a829e9283843ea8796d3d86f" + integrity sha512-AyNg3NmmBDCDbABQDmsnsY1B8VciwO9wZm+C3rClAgkPre+SpZDcIGje0WLZwroyqUFDySqW7VV6vcvAv8Bi+Q== + dependencies: + big-integer "^1.6.48" + es-abstract "^1.18.3" + protocol-buffers-schema@^3.3.1: version "3.6.0" resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" @@ -10927,18 +10943,6 @@ tar-js@^0.3.0: resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17" integrity sha512-9uqP2hJUZNKRkwPDe5nXxXdzo6w+BFBPq9x/tyi5/U/DneuSesO/HMb0y5TeWpfcv49YDJTs7SrrZeeu8ZHWDA== -temporal-polyfill@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz#0796c40a50754c69ec0f9a2db3f6c582b9721aaf" - integrity sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA== - dependencies: - temporal-spec "^0.2.4" - -temporal-spec@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/temporal-spec/-/temporal-spec-0.2.4.tgz#7eb10447a62429ffaaa80b42b869b138ae306a75" - integrity sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ== - terser-webpack-plugin@^5.3.10, terser-webpack-plugin@^5.3.9: version "5.3.10" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" @@ -11126,11 +11130,6 @@ ts-prune@^0.10.3: "true-myth" "^4.1.0" ts-morph "^13.0.1" -ts-xor@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ts-xor/-/ts-xor-1.3.0.tgz#3e59f24f0321f9f10f350e0cee3b534b89a2c70b" - integrity sha512-RLXVjliCzc1gfKQFLRpfeD0rrWmjnSTgj7+RFhoq3KRkUYa8LE/TIidYOzM5h+IdFBDSjjSgk9Lto9sdMfDFEA== - tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -11481,11 +11480,6 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-vitals@^4.0.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.1.tgz#67eec387ddd0ef4c25574a01ab9dae723eee2b97" - integrity sha512-U6bAxeudnhDqcXNl50JC4hLlqox9DZnngxfISZm3DMZnonW35xtJOVUc091L+DOY+6hVZVpKXoiCP0RiT6339Q== - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -11880,9 +11874,9 @@ yaml@^1.10.0: integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yaml@^2.3.3: - version "2.4.5" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e" - integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg== + version "2.5.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.0.tgz#c6165a721cf8000e91c36490a41d7be25176cf5d" + integrity sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw== yargs-parser@^18.1.2: version "18.1.3" From dd17436eb056382772cb8b4c0a5fb540bc36467a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 25 Jul 2024 19:59:02 +0100 Subject: [PATCH 037/167] Fix Jitsi by updating device mute updates over postMessage API Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/jitsi/index.ts | 50 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index b30ee666a88..81747df5153 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -34,7 +34,6 @@ import type { JitsiMeetExternalAPIConstructor, ExternalAPIEventCallbacks, JitsiMeetExternalAPI as _JitsiMeetExternalAPI, - AudioMuteStatusChangedEvent, LogEvent, VideoMuteStatusChangedEvent, ExternalAPIOptions as _ExternalAPIOptions, @@ -159,7 +158,7 @@ const setupCompleted = (async (): Promise => { const handleAction = ( action: WidgetApiAction, - handler: (request: IWidgetApiRequestData) => Promise, + handler: (request: IWidgetApiRequestData) => Promise, ): void => { widgetApi!.on(`action:${action}`, async (ev: CustomEvent) => { ev.preventDefault(); @@ -167,8 +166,7 @@ const setupCompleted = (async (): Promise => { let response: IWidgetApiResponseData; try { - await handler(ev.detail.data); - response = {}; + response = (await handler(ev.detail.data)) ?? {}; } catch (e) { if (e instanceof Error) { response = { error: { message: e.message } }; @@ -194,25 +192,24 @@ const setupCompleted = (async (): Promise => { meetApi?.executeCommand("hangup"); } }); - handleAction(ElementWidgetActions.MuteAudio, async () => { - if (meetApi && !(await meetApi.isAudioMuted())) { - meetApi.executeCommand("toggleAudio"); + handleAction(ElementWidgetActions.DeviceMute, async (params) => { + if (!meetApi) return; + + if (Object.keys(params).length === 0) { + // Handle query + return { + audio_enabled: !(await meetApi.isAudioMuted()), + video_enabled: !(await meetApi.isVideoMuted()), + }; } - }); - handleAction(ElementWidgetActions.UnmuteAudio, async () => { - if (meetApi && (await meetApi.isAudioMuted())) { + + if (params.audio_enabled !== !(await meetApi.isAudioMuted())) { meetApi.executeCommand("toggleAudio"); } - }); - handleAction(ElementWidgetActions.MuteVideo, async () => { - if (meetApi && !(await meetApi.isVideoMuted())) { - meetApi.executeCommand("toggleVideo"); - } - }); - handleAction(ElementWidgetActions.UnmuteVideo, async () => { - if (meetApi && (await meetApi.isVideoMuted())) { + if (params.video_enabled !== !(await meetApi.isVideoMuted())) { meetApi.executeCommand("toggleVideo"); } + return params; }); handleAction(ElementWidgetActions.TileLayout, async () => { meetApi?.executeCommand("setTileView", true); @@ -473,7 +470,7 @@ async function joinConference(audioInput?: string | null, videoInput?: string | meetApi.on("videoConferenceLeft", onVideoConferenceLeft); meetApi.on("readyToClose", closeConference as ExternalAPIEventCallbacks["readyToClose"]); meetApi.on("errorOccurred", onErrorOccurred); - meetApi.on("audioMuteStatusChanged", onAudioMuteStatusChanged); + meetApi.on("audioMuteStatusChanged", onMuteStatusChanged); meetApi.on("videoMuteStatusChanged", onVideoMuteStatusChanged); (["videoConferenceJoined", "participantJoined", "participantLeft"] as const).forEach((event) => { @@ -523,9 +520,12 @@ const onErrorOccurred = ({ error }: Parameters { - const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio; - void widgetApi?.transport.send(action, {}); +const onMuteStatusChanged = async (): Promise => { + if (!meetApi) return; + void widgetApi?.transport.send(ElementWidgetActions.DeviceMute, { + audio_enabled: !(await meetApi.isAudioMuted()), + video_enabled: !(await meetApi.isVideoMuted()), + }); }; const onVideoMuteStatusChanged = ({ muted }: VideoMuteStatusChangedEvent): void => { @@ -534,11 +534,9 @@ const onVideoMuteStatusChanged = ({ muted }: VideoMuteStatusChangedEvent): void // hanging up, which we need to ignore by padding the timeout here, // otherwise the React SDK will mistakenly think the user turned off // their video by hand - setTimeout(() => { - if (meetApi) void widgetApi?.transport.send(ElementWidgetActions.MuteVideo, {}); - }, 200); + setTimeout(() => onMuteStatusChanged, 200); } else { - void widgetApi?.transport.send(ElementWidgetActions.UnmuteVideo, {}); + void onMuteStatusChanged(); } }; From 5a1b38cd7424b2d144425f47bf62cb4dd4c01ae8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 25 Jul 2024 20:07:00 +0100 Subject: [PATCH 038/167] Tidy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/jitsi/index.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 81747df5153..ff962362aba 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -195,18 +195,22 @@ const setupCompleted = (async (): Promise => { handleAction(ElementWidgetActions.DeviceMute, async (params) => { if (!meetApi) return; + const [audioEnabled, videoEnabled] = ( + await Promise.all([meetApi.isAudioMuted(), meetApi.isVideoMuted()]) + ).map((muted) => !muted); + if (Object.keys(params).length === 0) { // Handle query return { - audio_enabled: !(await meetApi.isAudioMuted()), - video_enabled: !(await meetApi.isVideoMuted()), + audio_enabled: audioEnabled, + video_enabled: videoEnabled, }; } - if (params.audio_enabled !== !(await meetApi.isAudioMuted())) { + if (params.audio_enabled !== audioEnabled) { meetApi.executeCommand("toggleAudio"); } - if (params.video_enabled !== !(await meetApi.isVideoMuted())) { + if (params.video_enabled !== videoEnabled) { meetApi.executeCommand("toggleVideo"); } return params; From 88ddf05930985b43362e58398efabbe8d51d0a22 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 25 Jul 2024 20:10:11 +0100 Subject: [PATCH 039/167] DRY Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/jitsi/index.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index ff962362aba..a62bef19873 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -102,6 +102,14 @@ let widgetApi: WidgetApi | undefined; let meetApi: _JitsiMeetExternalAPI | undefined; let skipOurWelcomeScreen = false; +async function checkAudioVideoEnabled(): Promise<[audioEnabled: boolean, videoEnabled: boolean]> { + if (!meetApi) return [false, false]; + const [audioEnabled, videoEnabled] = (await Promise.all([meetApi.isAudioMuted(), meetApi.isVideoMuted()])).map( + (muted) => !muted, + ); + return [audioEnabled, videoEnabled]; +} + const setupCompleted = (async (): Promise => { try { // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with @@ -195,9 +203,7 @@ const setupCompleted = (async (): Promise => { handleAction(ElementWidgetActions.DeviceMute, async (params) => { if (!meetApi) return; - const [audioEnabled, videoEnabled] = ( - await Promise.all([meetApi.isAudioMuted(), meetApi.isVideoMuted()]) - ).map((muted) => !muted); + const [audioEnabled, videoEnabled] = await checkAudioVideoEnabled(); if (Object.keys(params).length === 0) { // Handle query @@ -526,9 +532,10 @@ const onErrorOccurred = ({ error }: Parameters => { if (!meetApi) return; + const [audioEnabled, videoEnabled] = await checkAudioVideoEnabled(); void widgetApi?.transport.send(ElementWidgetActions.DeviceMute, { - audio_enabled: !(await meetApi.isAudioMuted()), - video_enabled: !(await meetApi.isVideoMuted()), + audio_enabled: audioEnabled, + video_enabled: videoEnabled, }); }; From 9a3f00a62135e81e9abb3bfa410b259aa500161a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 30 Jul 2024 12:39:59 +0000 Subject: [PATCH 040/167] Upgrade dependency to matrix-js-sdk@34.2.0 --- package.json | 2 +- yarn.lock | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d9c00ea611a..39ff93cadc6 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "34.2.0-rc.0", + "matrix-js-sdk": "34.2.0", "matrix-react-sdk": "3.104.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 607c8b37c2f..db8131d8594 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7909,6 +7909,27 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@34.2.0: + version "34.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.2.0.tgz#5e7eff9b4c15689d7f07ad3686373f821e2f06bf" + integrity sha512-dygfH/a0C/Q+a5dSfudxxwA0g9peLsBbalC6LaxPa7AEFb4Gg9d8kiGnlqaFb1U9bGUapk8duBsAC526BjXbdA== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" + "@matrix-org/olm" "3.2.15" + another-json "^0.2.0" + bs58 "^6.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "10" + matrix-js-sdk@34.2.0-rc.0: version "34.2.0-rc.0" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.2.0-rc.0.tgz#3a02bdf295ec538a03a34aae00d9389ff18076ee" From 181f91a7e87b8f5f4cbe9b19a879e72d94ba0816 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 30 Jul 2024 12:48:59 +0000 Subject: [PATCH 041/167] Upgrade dependency to matrix-react-sdk@3.104.0 --- package.json | 2 +- yarn.lock | 31 +++++-------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 39ff93cadc6..827a154f9f2 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "34.2.0", - "matrix-react-sdk": "3.104.0-rc.1", + "matrix-react-sdk": "3.104.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index db8131d8594..6d6cdbf4038 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7930,27 +7930,6 @@ matrix-js-sdk@34.2.0: unhomoglyph "^1.0.6" uuid "10" -matrix-js-sdk@34.2.0-rc.0: - version "34.2.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.2.0-rc.0.tgz#3a02bdf295ec538a03a34aae00d9389ff18076ee" - integrity sha512-C6KUnBE0o8CjNJKkR9ISErRSCc2AUdeN8xh8MkquuwsqoaUdOiTMbjDKd1YroAx2PMjOxo+W2U8JCiURquMC6A== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^6.0.0" - "@matrix-org/olm" "3.2.15" - another-json "^0.2.0" - bs58 "^6.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "10" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" @@ -7958,10 +7937,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.104.0-rc.1: - version "3.104.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0-rc.1.tgz#1cb2ed45d87e5ae1faf07616ebee1e3b637fa885" - integrity sha512-5hut4s3wqKP6BhDq3OtgR4JrzyK/z/y+3gPmfJ0OtwOy/vTwDNDCIzfz3kwVZURXVeDOXTkeBd38WI4G8MZ7IA== +matrix-react-sdk@3.104.0: + version "3.104.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0.tgz#148b9fd0c2afb7532c3bd2c7b1b5446c13c5097a" + integrity sha512-YQqYYKFaBTM8NORDMFV2gKS6qQpGw6Yj/r/MCcGc3GqUFDOHAwwd+gIR76nkJcoYHQ+JDBu7RQjsTgGqbeUSTg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.24.0" @@ -8005,7 +7984,7 @@ matrix-react-sdk@3.104.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "34.2.0-rc.0" + matrix-js-sdk "34.2.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 79b6a6fb6935c82aa0f2e51bb5c525e52fb78b0b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 30 Jul 2024 12:52:44 +0000 Subject: [PATCH 042/167] v1.11.72 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d957336c96b..3bd677eacf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +Changes in [1.11.72](https://github.com/element-hq/element-web/releases/tag/v1.11.72) (2024-07-30) +================================================================================================== +## ✨ Features + +* Polyfill Intl.Segmenter for wider web browser compatibility ([#27803](https://github.com/element-hq/element-web/pull/27803)). Contributed by @dbkr. +* Enable audio/webaudio Modernizr rule ([#27772](https://github.com/element-hq/element-web/pull/27772)). Contributed by @t3chguy. +* Add release announcement for the new room header ([#12802](https://github.com/matrix-org/matrix-react-sdk/pull/12802)). Contributed by @MidhunSureshR. +* Default the room header to on ([#12803](https://github.com/matrix-org/matrix-react-sdk/pull/12803)). Contributed by @MidhunSureshR. +* Update Thread Panel to match latest designs ([#12797](https://github.com/matrix-org/matrix-react-sdk/pull/12797)). Contributed by @t3chguy. +* Close any open modals on logout ([#12777](https://github.com/matrix-org/matrix-react-sdk/pull/12777)). Contributed by @dbkr. +* Iterate design of right panel empty state ([#12796](https://github.com/matrix-org/matrix-react-sdk/pull/12796)). Contributed by @t3chguy. +* Update styling of UserInfo right panel card ([#12788](https://github.com/matrix-org/matrix-react-sdk/pull/12788)). Contributed by @t3chguy. +* Accessibility: Add Landmark navigation ([#12190](https://github.com/matrix-org/matrix-react-sdk/pull/12190)). Contributed by @akirk. +* Let Element Call widget receive m.room.create ([#12710](https://github.com/matrix-org/matrix-react-sdk/pull/12710)). Contributed by @AndrewFerr. +* Let Element Call widget set session memberships ([#12713](https://github.com/matrix-org/matrix-react-sdk/pull/12713)). Contributed by @AndrewFerr. +* Update right panel base card styling to match Compound ([#12768](https://github.com/matrix-org/matrix-react-sdk/pull/12768)). Contributed by @t3chguy. +* Align `widget_build_url_ignore_dm` with call behaviour switch between 1:1 and Widget ([#12760](https://github.com/matrix-org/matrix-react-sdk/pull/12760)). Contributed by @t3chguy. +* Move integrations switch ([#12733](https://github.com/matrix-org/matrix-react-sdk/pull/12733)). Contributed by @dbkr. +* Element-R: Report events with withheld keys separately to Posthog. ([#12755](https://github.com/matrix-org/matrix-react-sdk/pull/12755)). Contributed by @richvdh. + +## 🐛 Bug Fixes + +* Add a modernizr check for WebAssembly support ([#27776](https://github.com/element-hq/element-web/pull/27776)). Contributed by @dbkr. +* Test for lack of WebAssembly support ([#12792](https://github.com/matrix-org/matrix-react-sdk/pull/12792)). Contributed by @dbkr. +* Fix stray 'account' heading ([#12791](https://github.com/matrix-org/matrix-react-sdk/pull/12791)). Contributed by @dbkr. +* Add test for the unsupported browser screen ([#12787](https://github.com/matrix-org/matrix-react-sdk/pull/12787)). Contributed by @dbkr. +* Fix HTML export test ([#12778](https://github.com/matrix-org/matrix-react-sdk/pull/12778)). Contributed by @dbkr. +* Fix HTML export missing a bunch of Compound variables ([#12774](https://github.com/matrix-org/matrix-react-sdk/pull/12774)). Contributed by @t3chguy. +* Fix inability to change accent colour consistently in custom theming ([#12772](https://github.com/matrix-org/matrix-react-sdk/pull/12772)). Contributed by @t3chguy. +* Fix edge case of landing on 3pid email link with registration disabled ([#12771](https://github.com/matrix-org/matrix-react-sdk/pull/12771)). Contributed by @t3chguy. + + + Changes in [1.11.71](https://github.com/element-hq/element-web/releases/tag/v1.11.71) (2024-07-16) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 827a154f9f2..a6fe0d0618f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.72-rc.0", + "version": "1.11.72", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 59e526e318049f31df5430fdb8be6facb1ea5c13 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 30 Jul 2024 14:16:19 +0100 Subject: [PATCH 043/167] Update unsupported browser react component to new designs (#27857) --- docs/config.md | 4 + package.json | 8 +- res/css/structures/ErrorView.pcss | 101 +++---- res/themes/element/img/compound/apple.svg | 3 + .../element/img/compound/fade-arc-light.png | Bin 0 -> 6105 bytes res/themes/element/img/compound/linux.svg | 15 + res/themes/element/img/compound/microsoft.svg | 6 + .../element/img/logos/element-app-logo.png | Bin 0 -> 134672 bytes .../structures/CompatibilityView.tsx | 149 ---------- src/async-components/structures/ErrorView.tsx | 205 +++++++++++-- src/i18n/strings/en_EN.json | 22 +- src/vector/init.tsx | 22 +- .../structures/ErrorView-test.tsx | 15 +- .../__snapshots__/ErrorView-test.tsx.snap | 275 +++++++++++++++--- tsconfig.json | 1 + yarn.lock | 182 +++--------- 16 files changed, 553 insertions(+), 455 deletions(-) create mode 100644 res/themes/element/img/compound/apple.svg create mode 100644 res/themes/element/img/compound/fade-arc-light.png create mode 100644 res/themes/element/img/compound/linux.svg create mode 100644 res/themes/element/img/compound/microsoft.svg create mode 100644 res/themes/element/img/logos/element-app-logo.png delete mode 100644 src/async-components/structures/CompatibilityView.tsx diff --git a/docs/config.md b/docs/config.md index 4745ddd07f6..fa6ee5b07cf 100644 --- a/docs/config.md +++ b/docs/config.md @@ -167,6 +167,10 @@ Starting with `desktop_builds`, the following subproperties are available: 1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere. 2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels. 3. `url`: Required. The download URL for the app. This is used as a hyperlink. +4. `url_macos`: Optional. Direct link to download macOS desktop app. +5. `url_win32`: Optional. Direct link to download Windows 32-bit desktop app. +6. `url_win64`: Optional. Direct link to download Windows 64-bit desktop app. +7. `url_linux`: Optional. Direct link to download Linux desktop app. When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io diff --git a/package.json b/package.json index 6dfb7e54754..cf8908e6238 100644 --- a/package.json +++ b/package.json @@ -68,11 +68,17 @@ }, "resolutions": { "@types/react-dom": "17.0.25", - "@types/react": "17.0.80" + "@types/react": "17.0.80", + "@vector-im/compound-design-tokens": "1.7.0", + "@vector-im/compound-web": "5.5.0", + "@floating-ui/react": "0.26.11", + "@radix-ui/react-id": "1.1.0" }, "dependencies": { "@formatjs/intl-segmenter": "^11.5.7", "@matrix-org/react-sdk-module-api": "^2.3.0", + "@vector-im/compound-design-tokens": "^1.6.1", + "@vector-im/compound-web": "^5.5.0", "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", diff --git a/res/css/structures/ErrorView.pcss b/res/css/structures/ErrorView.pcss index 704c68c1e96..e76932356a0 100644 --- a/res/css/structures/ErrorView.pcss +++ b/res/css/structures/ErrorView.pcss @@ -14,94 +14,61 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* import font-size variables manually, - ideally this file would get loaded by the theme which has all variables in context */ -@import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss"; - .mx_ErrorView { - background: #c5e0f7; - background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%); - background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%); - background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%); - /* stylelint-disable-next-line function-no-unknown */ - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0); + --width: 520px; + --cpd-separator-inset: calc(50% - (var(--width) / 2)); + --cpd-separator-spacing: var(--cpd-space-8x); + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - color: #000; + text-align: center; + color: var(--cpd-color-text-primary); width: 100%; height: 100%; - overflow: auto; - padding: 0 20px; box-sizing: border-box; + overflow: auto; + padding: var(--cpd-space-20x); - .mx_ErrorView_container { - max-width: 680px; - margin: auto; - } + background-color: var(--cpd-color-theme-bg); + background-image: url("../../themes/element/img/compound/fade-arc-light.png"); + background-repeat: no-repeat; + background-size: 100% 100%; - .mx_Button { - border: 0; - border-radius: 4px; - font-size: $font-18px; - margin-left: 4px; - margin-right: 4px; - min-width: 80px; - background-color: #03b381; - color: #fff; - cursor: pointer; - padding: 12px 22px; - word-break: break-word; - text-decoration: none; + .mx_ErrorView_logo { + display: block; + margin: 0 auto; } - .mx_Center { - justify-content: center; + .mx_ErrorView_container { + max-width: var(--width); + margin: 0 auto var(--cpd-space-8x); } - .mx_HomePage_header { - color: #2e2f32; - display: flex; - align-items: center; - justify-content: center; + h1, + h2 { + color: var(--cpd-color-text-primary); } - font-size: $font-16px; - h1 { - font-size: $font-32px; - } h2 { - font-size: $font-24px; - color: #000; + margin: var(--cpd-space-8x) 0; + /* Workaround for heading sm being broken in Compound design tokens */ + font-size: var(--cpd-font-size-heading-sm); + line-height: var(--cpd-font-line-height-tight); + font-weight: var(--cpd-font-weight-semibold); } - .mx_HomePage_col { - display: flex; - flex-direction: row; + p { + color: var(--cpd-color-text-secondary); } - .mx_HomePage_row { - flex: 1 1 0; - display: flex; - flex-direction: row; + .mx_Flex { + margin: 0 auto; + max-width: max-content; flex-wrap: wrap; + justify-content: space-evenly; } - .mx_HomePage_logo { - margin: auto 20px auto 0; - } - - h1, - h2 { - font-weight: 600; - margin-bottom: 32px; - } - - .mx_Spacer { - margin-top: 24px; - } - - .mx_FooterLink { - color: #368bd6; - text-decoration: none; + .mx_ErrorView_buttons { + margin-top: var(--cpd-space-6x); } } diff --git a/res/themes/element/img/compound/apple.svg b/res/themes/element/img/compound/apple.svg new file mode 100644 index 00000000000..5e9c996e1c1 --- /dev/null +++ b/res/themes/element/img/compound/apple.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/themes/element/img/compound/fade-arc-light.png b/res/themes/element/img/compound/fade-arc-light.png new file mode 100644 index 0000000000000000000000000000000000000000..901ba8ae374d38a6b1dbc4880f9c239fef1ca809 GIT binary patch literal 6105 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 literal 0 HcmV?d00001 diff --git a/res/themes/element/img/compound/linux.svg b/res/themes/element/img/compound/linux.svg new file mode 100644 index 00000000000..6df5e6f959d --- /dev/null +++ b/res/themes/element/img/compound/linux.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/res/themes/element/img/compound/microsoft.svg b/res/themes/element/img/compound/microsoft.svg new file mode 100644 index 00000000000..221dcba7160 --- /dev/null +++ b/res/themes/element/img/compound/microsoft.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/themes/element/img/logos/element-app-logo.png b/res/themes/element/img/logos/element-app-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..54205a09faa4dc75ce926c325e77e40508e38ad4 GIT binary patch literal 134672 zcma%Btu@|pkulK!7zqW_1CB^Lku&tW+$>A3;`8SDQH zq^!wu_8$mx)l`%Psu48%{{^U4GHNmaP?v!7Xo?1a@rsq@WwgCOM^9M!7PH=TQPoZ3 ze!B)F?>>HFkRA^D9>&0;r{tpidAaUFNz_G-Mk8rEo^*@RCHG>bIc4{+3cF3)gS#*B zNut}7%kuaWTzyJS^z#=z1;+v`qSUk?%n!=aJfxr8cYRBIuZ^Dq|J7bEJ>(jY64xgh zQac{|UyD~>Rh{NRJNS*V-m0aSs7x2{Pr2E&|35<^#GlpTeLK-`LUA>a>ti(+`@^1D z6p~|AX!Rd!eBE)!3EFaPK+VNcm%2eUl$~YS->2%;IB890bq&2%pvH8y`M5svU-8;% z<4xL{))OU{8~rqF*Z6eUC=0eT%?dnHY52O~=DA6moV0f|Ec0C9@BKsyqJ^{~-s*L; zrU!k-llNFv#Cv(vvb?2tNE^7+@Chy^(hUCM?yPo=bU*!d{aeHcFUO&KNyO7=I+s;s zCuBZTuywZD8wTy*CrULwg>QS9?2YzV>jeF@ztZsvfDEzG zw)M^=*vkZqyT!`o%`-nzCZJZ zSZQG}$u^`!Pd&bpht$<>IhO{?`h7=cy@ufS+O?k(xlfHxwSCRa_vZ5ZPJD#cT!-5# zE8)}M5*4oFZMBcP-w)jFi=xG@`4*AQViIhQEmyw#WA=skq3R?Fef7^C?KJk?dH?S6 z2z+R@){BQOM9!#j7Up&0i2P!sJ=!HCJmy6oVO#NH_0&$CJPYlYGzsE=qq=X_eC3V< z-i+LKJY6qKAdL zkW#BPk{RlYuo0z*a23Go{6Aj%QBJD_8T%v4@g6KxUxl98VDxLBF1WLW`=7M!=Jv*y zH&nYhraZ?plpbp4_qE-0Zp28it&U6gR%f1w9qXcqpqQd4FQ)<5Gp;8C_|u;HCWBw# z`WSK#4Z$pW>G<;M7&S5AlJq4{eFN-{s_S&=Go})$NkG`5|59L*sS|f@NDJD-s&#}r zJ*Osyn46{4?{ZygN4;f8{+vNkLb||RydI=iA6-g4o_jTJcX?#+AfDF-JgG=uRl9KcwCsZ` zSb|=AxO~Ge&9^>}|GgZ6f9T*vQ2s}Q|HE@M2E1LpxLJji)o!TG zrX7l-$~N~&KCks-LQ6d4VV3>Stz+&cu=NCMy;ht;-` zL!X0yo$T!F=YvSP*9c{r1Obt zDSj~PI(8Z|gF2|(^wfj7R{tGS8g+03syF^oJM1dl9;i!1{h*NRmA`LCZenz-$K`gd zfFIjO2(eRKLEVXm*!3v$gH8Wq>WIsZS;`&K&)tX1CLDISs}2S6bJYqSZf{qUGkg&yx|my4V=$)rvFx{+bz@5&vfk059N+ z^M#;0Gba87CLJ0dbE=26mu`A?-|ZZhx#q1S6){OEq%rx`C!B(i%&7c8?d3iC zm#>|`inH*g?msvR!P!-<-`+$4ZnxGMGkUo1Z@>q62SsKQiMb13b2@peL_D2iIQPL? z$?f|De7cNLMuf>mJm{~}!8?qigpC>kP!64UgT+K8eO9C)x%)9Rp zgq4%iLWHO6xMw%XoS7;?N^qXqUZ>R4w3JcjssHH+K;?!ALHwfqyf8P0Dhjq;J^2bO zFRpYV%vXCtAyya-itVM~AS)%{>*3$8kN`z^@CB%`xw-jqT0@G~ezDsBXrT_AAL{Pv z>e|!Xb-NjZ1|PfbtIMF53Rsak?{kJ(J z`5BWB&CcjbsFm6#Pm$(Y_}zG{)$tUcnb`3lL}fg8)z>Kt#*7j0*I`agdSF-Ktq1}ck@1c4ppN#`iP_~6Q zP;jGNt$8;G5=7K~45V_mN(?M(TZOj8&9qB345paHjgqc+3fPh)OyPsza_q^7uTH4^ z#3Q_0UJ$+;G3ztKFCGwnh&v$uIC<~Y;HEK}40r)jqvsfam|I!OtIxt5C}-UCw8+1@ z=-eynm9|Pp4)Q^l8&Kvi%*>o}?(xor>a38Gx@Baj+hwz9I~tLzg5Q^4p^ zcvR8tq3V(I#p{u-UpjYC70JRTY<@oP7tLwln$#wp zd%~a{y=8>YR$Q<4`LpwF(|olRpk8auJ)k{0_%OIa@j57etqOy1Gh13p*Xa#+^SZ%o zPmQE?@iAiMTV<7LHrEq+SDl;@{?(QdmTgD#v1v|B{EG5F%6I}@6_}|X6yTox#8D7H0cx~_CNLTweke>4x(daetcFDq!X9l+#4&VLu7%#f1CmQVopSmeg|4rTvq6J69SWu5uXOLZGQ>0mz>Lp%oax<-f0T z^0T7)s|OuT%vLQP+HI;3Kd<;=L+E6iM|8(WbO%dh`21;vz-K2r>U_+yR3i^7 zCZ<NY9@)}ev%TUal1=lps_Ar=4jR{`D1HgsS5QgswM$5 z5??jXun2;~%40i6+CA+go0S0WfIN(-U{mS^3|%reQ;tH-Qqs?!FB>e}bltRrfB@^9eE?QCzBJld zZrTCIRk7&{mp(<1Y$ko4_3Mo2Z*xTng@E^U&yh8nqgmdyUFIPw?$(nr`2@ zgu_Jd-=`ZKa|~bACFNoVR#@_j)dDqlS{GUxl5}dmKWeiWZ0(M_6kGI*FQ&~_R;kp4I4K0Np<@68TS=v=4AB;-ZQ zsUvk_5ZIy;-%S|JByZP4(L`TgTIr@!(QwOX^ACQ(#U?=sb$x5$0>sUCKVK1IWWJ+> znEE{5?cV7EBybFdD0hfw%C9h)$?FD(40>Vbp!qy8&$on$(u%{oDAtqi^&TCxwFK2R zyK3Vp0Wp^uZekKB8D=@9H?jVz{e!8zDyE&x|K?g?0wErvlv)Gz`;=NxtKU9%&?%(a zC2cHYukOX=v}-}dy>>(Da%wAv+Er%oCYW9Od6= zSkGlJ@&k|oMxq&_USIyu7zl6ATl*!Elgu;Q*F9P=m&PN64!ntIgRY#upC>V=cr_gq zwX{EqwpU^7cW#c>Ot}E!V3gc!ahIPSG0k437WIKz=vfJ+eFrC~p$jU;(`+EeC2n%W z0-yboPB5gI&ldu(8}c}>Pmy^<>#ZCk;7fNaL=G0vQJU-X+Z;;U;Dm%7oo)09lh^d| zxFLjxTs*{^so|Tg-@ktc@6sd;b-+Nq59dgg!%C#emXW=q%6d(`|B+Q@WDr z&?b|wo@-s~%UGe#4ZOJ2eVHR3bil)7YmqwUq1qQAHcOKE_E*0q3cuS=eD~KBOuDhm zB~wNC=?4p=A-4AdswLwM7NdB;0bm)6yKc$=&PU0oq*#0w6BDCT#UFt<04!NdBYiWr zO(Dm2-42vP;6G<#>J+AcdQ~Q9JYmpz}kWdJ|(9#(d5A2arzO*vj2 zJ!_RjdxAYMAp;)veI2dWOLliY8j^P`hn$~ghJuJsNq`KP-2=X0X45hZCs1yd^Eae< zyDkA_=06d-=hp}2_3AakB0CtO&m$=3YrbQhTh3+8;fA`Ev3W0~u;z9KZMW|5L!X}` zGGLSP>*ZuCOBf2wzcfp9=wE1j<||zgF@wWE5C>n}>G$k=zCZw>)mSff1i+Xk@b&fQ zV38k=OnWSlpovMS8tKDa-Dqpj)u17FX4E$Pi<+PcjvgDIWuHuzG|JL?WoVIFHv7(eqRPSEr_`P7Fx?peC+d(Q*Vr;VfK4s=t>slTM zsj&xa2P-OZj|vAs%UU}PWLQ{S?vL2-Jzt}*8YPNc^R=u{34xdeEN2H4jO-2^RpDG+ zDlY28EsA#X6`d7=8(9T1kD>er%N->$2N?Y$I)fP{Jo*({FR3%0()n_3B#b;r>c=Q4 ziVQ8yRX~i558{%V;!s`B%(iXt3z;hi-$PLkAwz2!%9w~RZVmNiV_y)vN$D4RSkAh zDK`nbp+*~hFbKDiSSgSohM~NWibOgw!#LJgARP<$2;yHd9$G_-T2gA-m>+jm;rqtD z6~hjQ`jwIM>M!2yfhs-|OedsFasFt=H)IYdhirHE7;+og>Nq)zuy`+uPngR#tD8 zH78ftd`nBV_~mfjq9=k&BIu7yFyv5VA7GU_s<+-)$#2@6SbSeyng4a^juK?*=|T2S^V`ZF-Dh34``k)a zae%+y&X>0pG@;Q^4C ziz3}19b^GC%LYEw0&I#5kw}aeWt#cfVm|!L+M!pe?hzi6X6a`dUp%sce@%$kchF|% zV$8pax>^@HIp;94vT>OtNfx0&epv7KC*x=5#|2M-gC1_^^Hp-Tmd9K{f3B{o3h~dp zxc*jS=Y9K=vDJQ^3;HH_OL5qYyfw~%4?CRIJ5gs!)b(H)hUWmA*VjEq_lLeRzY0SG zncM~^CzrnmKmi$*B?uOKtHqRbtjvA9*oiZGR3puR8A+s8=-RJUmwjIap;@<}4sG>c zFcWfyTlXyt-I(=trI;96_all&S6=0Jf8PINH@2FjveBjL#|7A_D6eHkUk2ebpUvvj ze9f2WH@L{`6TyAtum$;uTldwC3+h=HaEZ!5*I%=@7tgm(IS02z*F#8d;}B?bGV}J* zGEReln>w}_;7A~!(z_ZLy^u9VNU z8Xq~ZU77PiWtE^k-G0Fx&{#WDi_8!NcZCTQEJ_k=#vf(GV&263!*A#yX=l7-j4N3(9^| ze<1#E!#_x5a}kg9{6sTCb;uGu%1hFaIutiJ1LF{VArqfy$1IqPq3gj<|`Y$u?6sGU#n(y6sl`C!9 zUtFvSb*(+2`mt{+btp62yh>vL0#CxpHw6kVo7IDV#gaQyHSa~vyhDScLhZ9+BGmxN zhSU;s=@Co_6i9e%>8aVGdhtF$0#aCDE=lFcxu?L)En8L%CM`W>AJje<3Ev zTti%KSw4ya+C*=d`-Q9P^QG(f3*EuyMPsgI)CN8MuM5p>O|0V@M>QFFH;X$Zb>twP zrASfXlVu@mbrc-=;Uhf>{N0?=2i8Q>9VO{MF!^03Y>Lxz$*SVz`7;`7P)lcPt8}4r zq&i>0*jP}T_n`2VxPnpzGN0$( z$_qe=LK|XJedy1_kX4~Zl^G&vrRUjS+dP`|nq57W4oyiSt%QRwuuuQ*g2b#eyNM_g zVyH7+8fdf+>ONtTv32R_F#fvwu&QPi;KDz%J$zjm>>OJaLQh3aMJV3BZay?3l>Qbs z5+Ca}_?YnvZs1;{bz{jz4<^9~CzW{GB*-2=iEI$tUQ6Z8_&G)zD2-j!DU*`g?UBJ_ z!ii@hX%dc0lA&4mViY3~VhG`4(yYdC^9srX>DSEL0vwpKnE78V-`^UbhBANXL4FZO z>|iZ~Rx_W^E_&FTJF_~!`TW^WJ&>;v-`?KRlI_jsB)|M+_?79ZVX2*?#DjfCfo~y+ z2uXHb93@TFA$}y@k0X4oT<=)AZt^L6A^W_8befrIXv;(Da-pX2ZxlJ&^#^HyXA z^wl&3r>h~<-D~fpL*xOAidd(pw4o^(iANElpu@Rwrd4D=#=Ihtf+LBXZE+cz~-i zG%8vuC{>L~a|c!F7~PbiGz*-e#@5hyic851RGa(2+}Awg<1xy7?|o%m zIZ%cvj;s+ur8nH{Z+R(o>E=MF-g+RShstT6c1e_Nwx`^Jr~S;^Cthhsdtv*ni>bOc z@Ih9|{?f!T3s;DY5RkiIOjuC0sNr{-biTT(N}_!;GgUGJYr{|Z)RA5ra+RD1c&;zvSn zeKa}Sb77B+eN{v;XQW(Y?#9#Pt#uw74_rKMl%mWO<>5zsOL<2)B^R7x{YMPGdEqB) z9|pQXZT+e$u&5YE!ydXq=^&7;tD}&Q0ol8GIJ!11WG`tCM$MP!NL?ENca69&32Hpx z=xSoT(_ARSUCvL{D5Afj zxScz?PndXv!<()@b8FL{>GF>~aM>tSxTVUk43eqdq%}L}$VT+*k4jzLc5w_&8tu&5 zlX}mBAQ{96kFN>1oYQV0q8iiV7v;_esr!1L(@3)Z(iRo6cJm9RDcYOp+}ktu?_bpf z`ZLd-E`E`@1XQ#<%-=)fV>WpSh<-IwuFK@eV)VSsJ4l_IqXOB!q+pfzbf3#s$GLB_ zP&DIsYAFlSc{!ZEoQOp=7R*LYV_WCdxG@4sIH_`IyP{jzUl6cR8Y1dmuy! zr&dqgTBF?DQ}0%CNY0oT(%j>(iq?WuyIqx9Cc9_qT5P(G%zcVMMl}mBwQof7A5d_R z95rh5Jv8(67OE81d)a@yEFT5Cn7d0^RLAF1K8B_Dke&O6HgirtphSkzxfU&Qq|FG2 z^;ntmraRc%znCaLK{^F^??U~>F1#C00e_~-5pLD!?`=fu=$=!eHlmjM~2WnHhfPA0^EQ9~r8>LL9sjetW(+?w-dlReM^Z8dt&WDVhL# zg$(*D8}HfR^$KF(5POEZxbhGGdcy|+quu1m*ryv!WZANS7OT}}zLvp9IxVKP4&ldwpnIjEV=*!7r;p&fl$y z9%jw!a=^vVJW&B;cFp!rX80idlWz9nT8S@|b2%mGh9h{Z86SKG9kq_+lpNpai=@nO zfH35nl6AZr`fp0rRpVcgnJFQPDz^2Dxw^vhNob%0XRDiEao)h2M+UQ7pF``M}#v`(e>dlsB(4jjNcPZS%{tj*Q4QQpgc~yQ+)X z`krG+i&TKY4CW|@JRZ!44AY6x+Oj|{w1G(E>R#xdxLvDdQ&R-=8z zawY%=SO;R$W1WWtT&k40oI8i|1DMM1!0zK><^F5M{!HbmzSr>04*qL90Hp0~A>)T(Ril>~=e_{%thZmydOE?;7Ip zBndp<%kp!x))q<1ThB&gy|i}?<(nkT2MFOFQCY0ge-;I|<|=v5CCC1FRZ{au48T0H z0d-NYyyhF{t{!O$D<>(V?z1guQ|H2wrDFtz;w0J|oB(y{L?mM!Kh17~%rN_i*^x64 zZz`;~d*ZRQ=-jA38kUO@8e*+XAS+!8|49N+tlI`fJ%~%+)YjLh;W*<=Y-Yl}zL`yL zd8^Jxx!OCSIG?}$(+Nm&8;O+~*^OY;Qu3jFH8ZI(x9<4 zn!Wxc@&2fm6q3lNmBb@0-CyC#C%N4CM5gj6&;-U%Gob%{d3CM%+5+t`C__}PbiZ7E zjz*j_x$o;K=m?0og%9^w-QCe`+%Sk-JBIayQejAst`GuW0ZHBMGio1-n6Yq+@y=({ zF}^|c3AxJhh$5bc1}O^u{AoTDe&HkVBb;m<7gvG~KE5J%)>2<@9$#uN5k5PU2FjS2 zm!ZcX%Fe)!af1ZTB($ zW7N8L(AImL@&nI*-=0-UbXqM1rY)n@J)-Y;dD`#wTuePQAr1OR!A~X4vv6H=#FBIN z;*!tj46*(%G%fYLpLYv`#1J8oJUHW>wY4cd=i*n({cbzBrT;cB3j8zwG2&YAPt?C5 zom+k;ki5+=KE^)d>-rrnxwKR}`$1+@#Nb;~A>EXNj4X(#mZkGE87axtcU%U{S{1qd z4=9wb4P<$hX;+oE$R)#WIa|(vPr8xaB|t_zIKW3~x$(OTY0rqd+Vy@a8TEUqpR?nw zdN-lV@S;Y7uP1ttd!?t_i73F&+Bq!>uK7L~Ez2NA@Nsx5qVMkLT^k0OJLlKl6TBi= zRBZ*m0^TSOlrK+kN?@$~AB~~r(ZbbLZ?-Ae^)Yy?K(3HyLug^-M?=D@%J6&XN{_&z zd9g$+2C7^4yOtn0nNg|YVT|gEHd~xHMk0|l(J%*B3pEg{UaGdcfA7aPE}G(DKDA~O zRF1|Z<6WA<*@Q179VH7|T^1Z?7Xxb_@Ax(3dzZfJ-q2`SBugi*d?VT@?wk@w2CYeP z_eDK$qoqL}|8cJRWly?oLP)|IGa&9L|j!I7XblUs)j8Muf z{Lew$I!Jk8&xX*JmZAq@ z%(FeK_R4VzjZWk%s`{*<2S~u8azXqaA2)PIbf@30x0I!5hl1j86Y{>8KatdAgtKfY zvPJ+ifD^=hf5*zjj@N``>Z7EluQ5AIl6nwDI(DNgIMF~HlR=lLef||hMV91D8WZ&^ zJRA?oqQ>$~!EzmA5TiMAuoTJ_l6Si%ak?5)JM*@lenInX{BS+qs8bRph|L`TtS5VV z7!w3@mnaqH3grPZjwk^7HTu*?Kp3Q4pF0%@`O-V8#Nh@J5rz%XLWBFTT0s*OGi9zL zPC;fB!TxD!WYh};vG~$Nz0HVyLnDB63>a}i?mZDiGRIV)n7S8qt5w#{0u}x3 zpr;r8kJ#WUb;n)Vy)2sX<=X`K+hK1P0??6m%Qhs?CoW_G0)N^zpv;Ser-pfGzT*)5 zCY#%^d`tvyr0SJ!ro;?|(F07+XH{ZuZ#z+v8PI5=KRH4d|8o3(vpc42g|(j2gF2`4 zk=@?jSzTWDJTrWYE8=uAulzNnHN=D|&B}7nS%1zcFoL$B07cN~j8YkVIBxgArvb7{ zfH*c+-dj43WRw!I8e#`6@ud}z^aD=s@*y1zPRw3-X8fob znBD96%rMH)*KYFqSLPRTylfK{!pE#ar;J?XkkVI!1OYDWDN*s-yH;)YZrv1%rWmFB zVe7okTyY`nSimVOdd9&WcMC4O{0$B+eN^AT*MsgzBp?!2ptq2@ca5<73+U%nVX)u@ zh4MzmC27(G_z=deFJza~Vd3{Q9Eb_kz&xgc`#=0It%7?kqnz*7wqjw52Z@*JR+TbI zYn2}+CmukTS-&CjT#B0w7%#7UDwlt7N*Je|PEE7Z3)>%@kJC9(PqkM&(odPp*UjdP z4=EB#6R{Q`CG-g@IGYK$8N809^yx7w`vQzammYYa%~j*v5zFXZLvQZq1x z;oVqVR%;zdw9-mYrO57iP!x73K4|o?L-FSH|br4xC&E7&5Zo{ z;L!S~+|hWx+XT~oAtZ05#=z#xr-8?#TKhQ_T>-|Q-^y^-sp?(ev8cSrzmV5mCz6&t zghXQfr0Ba3GsCsrKq@dBRD)9scLG8H#%en};t{Y5Sod;FA-8fpCd}!uHsZn^OTK)X zWAYk=g52D+5T-}@oY`;I|9}%^ikRQ7nD8ZN#Sa*9_4E#0!I_JrP<4@v&|fO;JFL@K zl*j#M(c4_G+7W!^Ebwxvh>mylK%eonFrDT@{A{Q!Cdm1m&#CnTSzn17PJgK1cRJTe; znrS&I!y%NF8Nn_#5}rY&qG=+F($~m_&8D?|*=S~*l{Z;(7tQW9$RUPOX4DB>o1>W=%v*Xa@vz26F^!$QA6e z1cRt9cXllQs_$g%XG-F{_m;qjflRDsx)f^oa1%v7hz~ta?AGBY^y@?=LJ^u|NRts9$rvp=vvi5iO4tX2uFS|v9vdnbDIo*^N;}yzW|bZ?Xp(u zbye0a^~Zj)4`b6JpZy~TG>EnKbHM>51_t>K$AXtJ4pIA;j!TAbGVWR2_t>DW(nlW6 zJVGtqllBNfIBKNa-Yw<@i1&pC-i2?>k%Bl-lu)8$-X=(|Wz!C4t+Z z;2gSOJcG%Wg?@Fuh4e3owW#bgfxa#@m_85#3}a801bBfiVR7cfn2Gxjnb_)YtDdG< znyd-SqhXQ)mTXUf2ZrhYbd?wBmj`-NaqF8q=ToD4K0ZP%LxyNxESz+blsxbPoujcE z!n!N2=;zakakvg zm)$XsK$voT=wEQK41^HuafkM_fwAxS+38XrSx&sq^FphuhN{^i&ZB2Oe3gNHFr%mn zx$_2+v{JLOdOkunLBa{}f@WmKi)-3f4Vo3^KvJ*Ag^htV*DcXptb*H@$TWqXW) z?&SOZMT}f6%U{(c9ShWGr!e#s757b{@mt&Kr7EHEh6dOB!X%y+CL-+5M)}9oTX8{$ zVr`XnBn@GwhNY|5hi($)8RGP!7O_Up^yA1E8&Je?lIpBELgSmi^6V~y@w6Cg5pESV z+L^p%Qa?oxsnvScbh@3K8<|3z2GTo^5^sUwk-cY)I?fdIMtsiTY!ouVA-k|{zsd#w z_CqqIR+rIFqn9Gxi#t4zk#|#x+O^uI$gX4 zlK%JNVremwb+5n@++3C(4(;R3y8Qe80t#WMkQ6% zuM@1ylVS+0DopUixR#4`ghN^a|8Y<=DScyZZW!dScEpcWr})@0Hkwc^F8b;|J*kr>QKi_Oe zl=GZb^^p2XxR`>)j?~yFiDiT>zNL+V9h7n^)4dpa&ak`wA}+>V*A(m`qh5Re{Y4=( z`u1a*5$5c}e?$DP^=YCYD38%pJM!B7r9^Z*7zc8#^uN|Q{-iB1l{t%N}J zUMPj^a5rNfCs}R(U&q3xj_>_XK6pE#CjQa%y+?FP6LISFilOFu$}m2vmx`v6UuT8D zOF!YxrM?>*m99+@kWJOMtl6w4Bq6ogURG$3%$xwYjUUgqd{@rZ&|^RrF^KmE#E)UU z_b^4s?`pvFuFZpj9lrxY6kL@AAw>5Bd+kj)7!&LSt4Fy{bY1x@c=DJ-=Rb(T?E4KLPNJr+xWdnOzqkRgLs<5(y}n89T;0 zczON>7X*fUhrSs#b=;J^%=0ilDmu;11_x{z@2_6m)#WMUL*@-GeLLR`HE-uG#Zweh z8-#9dxzOWtxUR*%mVB!I>t~P>l1bk%5>FyGif;7&D{gXC6tcKZgJ%#k6g4wUUDGW? zBHcJNlb*-9Oy?YGFOgA5p$EajpvGNui?HbbO(te%FomH?!BOyr{}iY^l*>!}(ixE? zpJR1x=V7PH_1X3ZJS0bjf?c?7~>L>VF>NgFMH#V=GDr;HLbq9UZsmhagN^NfwWjAd+b{gm2 z%oR65J}%3+{uNOPbo@wD+n&kyv#lLM$)U0HhDO?{a-!M5Euu~gMKZ?ydl`-^=Bc-? z)ub}STmIT|?`T1IL>eb|B1MHi;R;pBG(b zQ)si?pu6~aw%E_gu_q!rBQY;2wn^5^!;jKW>7mkJ=q4!}`bI6G=6P)3hIQ~vrf^%r^n z2eTKKALu~GciG){*hH|JydH(kwHm$(Zw}&NVS7Y}20*V^liRM5=c>~3&ka}h z6jbbep=)0jzFaekJ9G1369E8s7QTD$-YSVfrp^|wtJx)!we&k+IUvJ8m>QRE5ZG9Z zzxvx-}qvn-b{+;onJ8NC2@OWiB0KxM&{z6PVsz^nFv+gdS9kU(+YrDL~FyCqqHkZXf9$Sg6YvgtGT|i+l>C z?Kt||=Nehvx`|EPLuRnLCR?#+y#CbAr`R*%-8L<0d!shqB>g$syYXF(h1S`Na{>u| z!Y_;tjq);b!AS;^qL*Z3pakTLU9RVTwC0g4c@dg~iV<01bat+9+UfR)M)5s{^o0_m zfn~W#{>4mtBHLO%Ite^ZGV05?=Gqa6uooFS&1vj>WKqxH9p7$laj9qCzm?tGr@X)? z9rZ1VkR;w2S{3jW)T(D!!Wyy`QuF#c%Gg;SDWFG}E5o)cY;+$A4Dp_;^4oSviEjy*SwC^gk+pxEPM=FP|=oZzzO1OCXjr|md!pEvIA^g6p&XsDBhM(>U(Tztbi{0JT2&yz(u zGaee|>aKt7d2O6Tj#!2n2V>DkyX6GKW4le1j~RiEEE!%`iC96t`o0w>hr9x8D8DJI*kQnSM!+u5KTxl8~EsUF2V^A;`;>k9e4La!AKJ$klx- z3*(_W5!e5dGIo4CHiYPQKAF6FJ{TN-8cqmEhT0E1Zw&#vJTU{eY(KQQfx1{DGWw4wVr6<^j3)%cYM7sbzfUzTnDNEx zc3D;sW2RFEvHYNaRB#s?E!b+{e|*L4cRpZFlo4(nRkQ9sFELcCFr5?P&a+U`WoVK7 z{BH<7AS3Ifg8zF^H}x0)WJL~^?bk*EII2IT*4@))f(D^SGp|^9GT0fyrUQgfZt+C+ zx3&hHz0xxBwh}zACl$@xlwXDr31RI-5+t;~?=Y(Pp3U}F`tF@olYq6G6uy;J{iqG7 zFe3+^Oth{CM-@Q9K{0)`kcO!_~qiG%Cr z6n0S>58FR>@|_M2jYRVEEqCNnU0;d4+sI$cBDCFht}EC!!(~|BP|-$q6E>`(eBAt} zBO<$CQr?YKj{qsf{AIon!K>}$izxxKqfplr?GCK$`x7!@F>5C_QU59Sif1unkpJ?Q z)2h)oH_XgNj3ma^txa<^d8LS3O<_W|`i1)pxMCq)az>Wf4wlKm=VJ#W4~W3dr6<0?|`E$z-yOysep7{d?DN zQI$ISWO&#@9yA6m-48niJ0RRFqGli5WZ~~#Qu7n@sPv0_k2aUSwvZ3xJ#99Ro+b7h z?J)QJ&0EYegynaXLm#PHSfj3xByTJo#YUw<-~RLzMOrmsUqFi9C-=3nvyK2{}o{aGi=^S?%odi@61eGeneCZg<}>Y$nTSnb6g zlM2;6z`qugNA~XL!HSx;=VkI6uCA0uq+%pVJt6Tzu-y?w#nP&(tSCAq{8nBvHR7|< zE*EJ&F)M%WJN1Hg?%R&GuY?V$M!5rqB08PzQw>vk%NXf@2KkL%wUE3kN`93#S~G(= zuUCM~7MN?!+w~zjA zh@-rjgPn23LQpW*GUohQp5NHuko3$<>79jZR&za``;bl4O=3xHrHGD0ZuUrK@ps={ zF{EB1h}AOF1MJhWX7?MlbRQ_CQ0sopaQkT<^!J_Z=e7223@zJpHIs!Crftu}fK7SB zA)A9HXQCj&Lr4#=UCp*iUzw$kP}+T8x#Bc*M-BTz-o(USu+gw2s9~lzmG`cz^AL8 z`*^*m0+|ChR7@HEDGij*n6#a&pP^>0m1PawMwqB_Wo(*H?I`fBYQ6y)%#uWnW0$?1_EV#fYe|2bnRk5rl5kHV}k8@iJZhSG8R{YRP@ zn}mY;LwfqjE548b%nWK{jSX3D0%h*;JyZIKuJ3-k@*pI(TL3=D623u0Qb)OpUIwqUzvH1q0i zzHOi*%*HpTTk`7ZyHedbMo(i7?~ z$~PW8To+;~L-No=e+gBW@Mx1@lO3H&p8FSQ@DEpaI9%?uXmSQ?O|+A=7CSo+C>bW1 z^>k>38x<_{AQCf9Pyi%|Y&H1T6l(Fi=+Uv_m-t?>5yPcO!vpFxxejt zw#+%~akJkO1*WDyY&CSc4F}H4alDG|8uklWm@Y2vTReE}yXT977UtB(B6!{XFYkFs z=xIOu`4Z_kdbzehpYoA~z`pW>Hr5Li=}d#Tq2zqY(y6=(WIihY6GakZ8hjwG@;Z|u zXL#vY#p<(ZwWDV#!8GxrsD)2BK-o^Q7smInF$25te;L`PV%vNEi z6^5Sc9#naxHufQoYC=jOaGfB3S0BAx870`npB8nk5H=ReJ-faU!8z6uC;S9 zK$b$8(4Wa=4BZ~+GmbUL4R=9}=4gM25|77eeD%vVuFHy6nlN@k{>uez*sl&{GV>sY z_u));gM-rs19rxtsxz7xOONPW-JLzJ?yGJ!ZE4j>UgbOWv|JzPdMV?^za&K8AAu96 zyt6Rs0Hfza3e&XZ%{R3gYnG_hA2s)vYG~abb}lPM-51~MC?H{4rH%*| z-wQu@RA@RrpTz415H2Xd=7bODwz<=vFpyJ=4}sy2=6C!d!IVF1gqxR1=GCSAn^Hsr ziEF|BHx42C_y&G$CUkP#0EoZDh~oUa5Ot7JkjaM@GTTOcQOOJBA^DT4nbmGX;A4en z*B!xg-%#MgxZg;2UzsxoD#rN1sb5t>e#B%a4|IK{WEX&1%>!9)}2~U%x8~q;uV?dn00$m6(A+M{0pK~SX(n00x&4jtiY0Z*d z4m#<*49Gfju0L^G6L<8gYp?sok9_W-Kl(@SfB%~x0dPc48__I%iSv%}*h`!%G3VIl z<*YwA&zXHR-yq*F9I7R)*G^-7J?y zR*TwV;4Rw``jBQxf-^pR4!OUf?}^TR6%kk*YmYz#%ti}u zmfwtC9^MoyzM4E$+tw>e+Fr?%O{1zwd)zJK$DLFRwn^iCqmQ3CUsfHQujZ3k)Q3fS zSOym^5<|*d#IwT61<_aBT*QYDtnc~fN7=r8`<-NFHun}Wc!2Q{U_xX@-G|K5$-}an zio3AtqOr0s-%Q^jK`8R&q47$prhp)P4~oFMi+$f3el; zy=k44d!pN`zPJkxdl4DEOAi!Fr>k0I_b^bzZ{tdxUBv)m%uK$MFw#UUE%L&fiV&X^ zOwFW9Yqa`}%Wv*gGpJ%FgI8h@2@yil<7&QyHL=$A<@?s>v3-~k;@%UNrN}f>(b|=4 z(Da`%HaFYD1&5!Z5t4T;hLW1WB>fFWI7f_dYklo^|IP3G_Amd&`~S&l+YNEpJ>Lru zf#C-_lzW1Yltz}!u%kSj<{OPs0rqFA1j4#t)$p({EVZZ?v#gOx1h&P-hUfuNVGwEf zVIju8unwnnNb2deEZ<}Rdl@Nb&jeA-mcVD? zE2CZNdxU^=r>2U#~_ zm^V%Bd;&1>JazFW*;jRkAr)oi92y!HQqZ1a73OEQ->%B^+#bf9MD&gCz5>9`2A!Ib zBvC<3d!AV`mdw!KxffpemB0R1Z~K*v4FkW8fN(q*N=BMj5rz^-5+Hx@BZN+nwiT(h z7?xq27w$4v)o&Zdki-fMBT2J)Ss~$bGGQC-?<}j4?OS)6PV3-^PEd62))%Ed@zo|0 z7im7u)LGgLBoK`;)xAPqVhXP$2)?2K7*CqW>nA0ZRibmQ)Dh)%Cu{lqY+7DEl|BA= zQo)LJ4$$@uVeO^S2cTzF+RWDv`&w2Pv-)C0L#+m+4g%!|0M5@38XUu0Af*-D1F)w= zbXdV5iQkplv#fh0!qR9Y=Ax|gWoLUd%MQNk+6l_RY5VF9ti@1;#K zrp87Lh<7G_C-;(Ca_w4KG@xh$^~R*6HTVR`GX_Z$k(I&eeV1VGT}20=55d*(ME9l- z72lgiq!hw=#p)YH*etOsMq`T;|HPD8M%N#g=mBd65d+F-Y4(0CLKT9 z^1kiE=?6dlv7i3gAG`At$ch7tF+%ka#wcKDc@yDG?E@l&XuPKF4K1}fh|CWFsD-om zTIM{B!uIp?Fa~Y~w0WymhkX%7M~pDa_~tBaAZTSd({h|Q-E>p1+?rS?fOy!yY4F+n zxy|eRI|&5ecWOBU7+Oi%leOaO_BN-yx~Y2QWc@1wfUlSi(5s%veww^~G6{9j{dktv z@;IqkUa)MV2Ic_2>*z&pUUwZQH6?qKTPM8(GFE8bG9HnTwhH<`vs|HI4D^1c)5!A! z&;xSmL3qmNi=#~9c*WI49Ggo$-?Ps?8x0*>ThEIqN3BjuFLJ&-q8gG$9{a;#8IG+G zg&{6mY_73C{C?{@-nQ_+fA|mo{w;4i@tf8*{#2V}#C>Fe}QIjD;1;zy_e7c`oqQ~<)a(7;a^ncNdUliX(+$F0jDL=}MP zAXD(O_ZdM^&xMbaf?vuU>m4*2qkJt=#=&vD@EhYIZ0G)pH@@|4zxg|V@P~g7gXQ}A zi%7wR*6b|TAyRf>fJG)6Sc_3u3MCAXB26R^jweT5PoI<2B6%gtIx=wMLXJTU^ld(3N;%NXG1qJ7$Pt#&_UnMiG@k^WKmX6Jn^Kv@BU4{N+jidr%q+J z%|9M2S7$nzDD0}>$KO81icn?b!MRtl5yYwDGWijg75VJ}A?;TPha4lqg(wXbhUC z6eA)x64sq)ad0>|bMgXFE;Hy2wAO?q70oj?aCF+7SQMdZlBBbhNoBQG_MX4>w~qh( zfA@>`%`WYG*ZJWD&db%e7N&F#12yfap|p&-YQ11#P^Fbu^nHpsc21D7yI`apa~7z*)c z&tgTu(D#r$!IopV+zsj{c=OHi`R;eSv&L9)B}@u-DK1P+o0aVMib<_}e)kGZHG03- zK9K?13#f~}R+AJj{>bBxhet@v_vTaS#oFnUbp zMudOJ%6#5y=$h2z&{C6TWy3K5zasBuGd=O?lTIP}J~Tqn_rYI_)^`S+f!NYb;T-?; zo`3b-uet7;pX*awhEE?qd`+i^&Xk+7K2-Io_RcE5T@sxT&%vT&N}8NnP+1}Gl{xA6 zQ9YmlSLIxxG-U8Ss(5Jk77akI{MTGvvcymj5y?BG#1sqF5qkIuVqK~W#P8@VeeJdGi6@_Q9ZsqW|J>yOe_a?b zO$TUVuVs0%>+Izlc(PhpDXJ6PD>S|009XgVX`qKGHF}s*^qza}3GaRHdm9L+x$CYw zXau`iL|QFZ`6N;869kB9aTja{z}e^o|3AzvNddN50dn~G!6QDXYs8YPM|X&!12tjU zuaAH)5b$mH3F6q@pp%IO4w+pfb$luA0`x`>x%JvC_742--2aiETi(C_T`R=;@{qpt z(t$a$s07$dCQd;n1rLcSEnHc{H|cOrRc?xFc=dTvMuHebt21g?~YW^dkOY#=sb0Ctr{kn03G(TvIu?;gAWoh?4N0d zv(G>Ot3Pntcm100_QKBAW+DE9&=2ku=1ZvGmGyxDz>JI}NXUxf@^gA!+zTA?VHklf zkZ1y}-Ec(l0)rov;G`G?F<4&a*xww!fiRAI@rz%~k+Iq)=mTxp`XG!Vm>>>YB30ct zAaoUBtL7kWDeW|)Q`|Q(j#ge|3WA}u_`kYzfS76`ZwiQ&53Fb(Y&0+y`1ZHIJwqrB znb$qc=Ww*dggU0kSbO^oH}DI$8U`?epf-n9z5@7(-Xix1^RbLBn7IBfjc^N-x$N@p zWsL=De3Qhn*~FdBzI_e$yytk{Z7t+&qL7q{v_eAA&j9>Tqk_Q?9hipXH^2E?7w`Mn zCw_fldEdLvCE%9{6HDoqL}~;Vfh*O?dHv1DX11q#P2D}98|01#5UGGud44&@ zDP2?%HCKa%S!NZ(60t7&_#tFpm#b=-5JaD(nmgXcdP8DM03YZd^L*mfU}GRDE-DIs zqEqy8oC_6TG2NciYZrPA8!SwHXksh_tR!B56^WxN^1SqmWb3i27SeWHl!AW=Uhx_A z9VCOkcV+fti_s0C8V{eczzSoY(wXsQAQCShI{Xv==KlZl{onGYZ&~1PiY(Rv8NH1(FW3kL$#ef~*MxWJhUDs0zz4 zq%r8#p-+cS5D``8V+-H|1BCeem>MCWuLo%{*R{Lveu&d%!KW7zUef<7&y1IKa!NVe zlS#q#y`;-8clv5Dz+HYkX>LDEbtZ^8!rd?zzvoSFY6MfVBJvu>k2I4r?@1p6a|>~U z&gA*$cYL$C7S5PR%xS|{rA7xv-jx*&X|tGK^Wj3SzD;@#Fh4XF7(CEqP-rM1St;t> zlE{l%8{*>9;o?3x9yKhGZ1ivZ_)i@D?jL;DuTPrI>o>=F)bCZ?SZbs$T4kMzQk*M~ z6MsYiOs8D+ehr_*y4opy)tF)Ny3y8PVr8&M3W;QhalKB$-x3{G!cZ6v?3nVR1Z40l z%ZrJR@xIO__pYh4n9=3Fw5$qKEFwtzc+X&w!4fYx=hB1ec$vs}EBYR(tS@_QI86=J0 zv%mR2{nPLN?SJ-br^n+S%JXp;9U@7v-0RIqNF68HpmnqI?i=hXBRL0W^?tlxAb{Qu zM9$d3 z0zd;ii2_L&9e3&oXm%Z_4}w^2m7x`S?cn0RysmJDr;}XbNx|weu{ehbB5UYx!b}eP zO!#^R_5e&6G73JIJSkWo-W%q^5S8f#{4S$L*pT9~puU6johK0v<@rh@M%i)1cw*<^ zV&uvOLkQ7`A#7BhmkmZL5^KW_L8C3~-J5|VGIC#9q0JH7fH=+WY;)|J>0jC|Y%JN{ z31Jxg72p5Ef8#g5@7;GEL(&W}vJGg!pUV(Ugz^YrfL+x~chOGzT6V$3_U1SF9&@fh zxb^%dJiJgZ*<0H~KS3P)3jbd8Us!{)v>cDVg-9yRo5`7DAdx-x*ke406h;K3ag{^l zmINyp_@Q5e5#E0L!GMD60JbSQz+Iqb##4PyE>$PI64O`207KXn`&$=vO?G$b98;1h z!l%`ykln=qa5#Lx!?ZLSZTX`|OXg?pE|}8#9hgk_cjn9lW_^F2MBhct=z;)oH13(5 zovfa&9tlhNnP#?7kjo>M7vcnB)6KsRtj{cR?Lvz0fcZh+_wFD6iDTdQ!$15Rw9C=0 zokCx3spE^w&P5i&B5!1TNrn_T))_cOJyxd15*35v3pYcB*K8+hDV6h~)2UG-)j0`B zXot;AVdtaR=(A{?Fk^}N``Pwg`n{-U6hH_XB9G(pT>tqb!_Y2mUC9N}ZU8nz7j4oNpjCq9sSdeSi^r3ZE7h51bdk~{oDWS?!W%e-v4V)Th%-v9~mMyxZ!~fa)ueAgYXp` zcoF^k)PPCo4THw82uXE1#16xE5b?v1kebBatT=ndal;UW#ZS=E>%%C5Xpx5>ewb71 zr4j#HxhdqtVxm(2iE&`Up32-EMU zE&^K(-y3eYfe)}G2bd(&%LD5AQZhdPpJjNlLggv=!GsUpALhvH0`>t%mqP0II*7jc zihv({qj(f_0)E>Z)4S#KjZU_2X^C|y7)=X^zugdHH2cH==d}_U3J1Xr<_CY|P6fa0 z=(d4h6t$A~m8BLx?XcSUQ!A~#M*}Pa9b+BbL7Zw6^>yPzmOgZP5+6laxhB8_t}k?8 zu8fLxd4;$N1*2iA$Ac&*#|pD!rp2sJjTovoRLf{khQ@%P?lm~jDZ7q-f4uCQ$T9KQ)lqvsLvq|)v!8a>^@|K)rB zB?es4JC}8drDk$R-DKdP-}PI$#G`L-ZFym?Ik)Wt2li#iT?uzD^amINagR_9K~;1` zuh%HF{tYssqsB;1{emnb-V&|?{4fXjfek|E4pCTq0-s=?KtzgI>MVdC<^Vr{VCo;3 zio*5s7xncuaQuo$+?Nf2iB(H~?zWUAPS8>GRpw{O65WSB^dY_nOLK)v^b$@3OVX1L z>33502k=7*Z-nMN_0&_G)dlO>e~FLpu?r07JFHp8Dj@pe<06M2m|sYJ&fxk&e>oQo zCqu`%ZPD{#BeB0wbTSKEUue&BSSA`D>HPfn|M1^D`q$t4-rt~A1b)awu7(a1cYIcQ znS`h+2&qVHot$5ccCiUDufHbmV> z1S9xu$yB+osqS6LptJaW7%io==4O=otpBG~9_<~czJfJlQYs3E@D=z5enkw>Df@GA zK=knj?Z(ZiQA1zi@#gPmMU0LdIilGl&Sr=uyg6~Egnj{)tL!&w7k~kx%9V+{$Yy~# z0=zLtnacC%0Q2)AKF~*opC6RIMKLSqnqzjT?62oJkwLG=-u3`L)Yt{%v#5@O8DBq> zk#{cp)^GjuOW*sRAO2rTvDZS_Oz$L?%&5f+b?4kNa>2ROy~BPBtBLH+g`}eg+n2kj zfJksjh?itw0sCU>Yo3U+E`n*IY7+eyv1XN**$`8HUvZ03KnrOt6qkTlo|lmv3}no9 z?7_T3ld?4DEM7R6HN2SMoHg&54`7Epht*NbdXPPN4nP)>Sp zyu(>Ur4*cP1_iz>K2#(q{T@4WbFp*;=Fq#_WMOguLbD7@nN2ZfKB{_r^m&u`tiV!| zB!Sl(+fyJ6sWHS)@tyo~r!V^iq2~8jb6BkWKB?)g@Q}#yhxPCcg3AjjOEbI>0Hg`K z$CJ!1R;mw*RvTeV{Ds9Aidl>}tnWK7#i^0iWlSP&LrXVuYAZH+%w(|iN(N`r@9pnq zevpMNuG1l5Z2>h2X}RZ7nsT9m_+2idt%eRa+Te<7sO#c$F zxf0#hu1w6XZei7t&6U1!(Lj>K^~!n|)4A)3A`2;8swW9i2WEik>>4F1ITry*Km~fK zJQ25J))(jE{R#BQwdLMR zw5T6PKS{^{ARCLGIC8OpA-Xfc1o~Dq<;!sW|OQ^`X8qw#2)-mARTMB3go3 zBJdIT&1xKTKBnKUv??>`=|&sCc$)7tTp08}^q1fM#vdJzI|>dvh3Nz_N3KEm48mC& zgL>8&6{NDpOJseZ9Mg}9RiO*C>T~dqMJ`MP3b1Z)Ys*Sw<_Md^G72rBxDu(dGL+ne zWJcRiY^ee1Y-3}C3pAk*OR@w>VvO3uG;vCO)D@{GLcuFC!-z4yx`bIQb)WD{dhD^4VAkFz zo;Y9G4)8hTEZh(w zZnU!h-@pIhPqb$jBKQS0EQr2H|5$IAM94T-G6oUjA{{8-r-D(CW1~nVo8o!ocZeWk ztV2$2I;~LZt&EjvMYmGd#%(%y&AW%=bJIPB@?J1yCK9WdY4;|q!f60_ltA%rz3wIq zD~|(3(C0HTR;$eAtdGNSa(_HfnYOdkzXdb;lzx>#L}8A%!yNZI$)S5>qmeK$zL7$n zqfo}@(-1^e3FtcsQKuN9Ueg$;cbfPi$Tc&yM!Wc-0&Xxk7fPQ$J_kRPekNhRnS!^s zXp@*!B9GlYxZP}JbCkQ*%7`|`1`CAo&qC)=upLYgoUp6q8NdQ@ zEEpN)@PyD}OB@;s@LR+WI?qJeA1uA+)iexA0Aet)JAQbO6YH-AegHe@1(CK6sx9jO z#q#p081gEmF79OqY1IWrk{lAiPbJJ04Es&`nl zii>MQrq)$^L2$&i1O-kYiqliMvcx3L$gI(lkp}7L<{&M=QO5mRQ;|Ub+?#&TD{KVq zMBYc;q_a*bMvG91H@3fA9h3QYE=GXTG1-7YMMfA)P?b)_Ux1ddtVYn}3954wP%O;% zkhZ}MCTFqR62J<#||v9e#bB zho$`o|N7m({hQxC9Kt&S2^2;SAP8sapmn1m@eu5JHtdl>k9FO}mRH|shuoGi%rS5{ zDALJrf?%#QLPkU|K=d)V$iP1kR$oY7=#O^n87)DJ{%QRfNfXG@i~t9c#tuPh%b@u( zF<61nBu1xmlajnoEWf4?Ox{6ALGtBJUy&c+UbGW8l$x?nCh4w>0p3Qy2R$EN!aC^( z;5ojoalTf}2)e&i?6q(l=pU?nB|gI9;wVE6qh@mpF^@C?&U4i(8^KV!1En*e-+&)f zpC~^ZojGm&3~2lkySu>052L1xreJy~ED|3MGd{WNsy>YQtjC3Az0a21LT5f{APvR>I5&*U9r8$v>#nuuzMs{$lCY z`wAK`1BB0?nr{*oTSPHbE-A*B$z;b*RBu_RTEH^a2<8P}sGE@joT&1$GRcG2W1I^W z)c}E@Jiom&XQ6*`f9k6kJAsArnK8(z_ECDbIe&YLeRKwd^7_QtS_X@nt~d@LzC6H5 z3&OLl4sv(x4LAJEyMN@)E2y71R1q`_F%l}keM{PP-;2Ls6koGmuVA+?IQ?TCyd&_( zrCrH74Ba_u;>@c>czt~%>~s6|-A_P7;%&ks!+;R_K&Y@Ra6w}DZ{TDJR>K>N(2li| zn)pkTCD@c!j4Yc=h(zqmoxV~LIA!Q@!p)}Omri(4{GGi2evS_W@V(>Mv4X?h5JdgN z6AXSxw}brwbOwTw+A59lm5;DOL(-L39%lw9+t=B-6U+}I8R`DOCIiye?Ih-T;_lYgW&rr%Wxwl3f9yBo#WtgjBWRze}*W%nTwH`3a&p1^FQ$3 zANh?x_m1yamI1t#nREjXM7v&C5Q84{fyf}!4F-BH<-1E5s5=WB0uLn05WOpGD z97v&};c(5tl13shiwUh3yzCw8RR{?E|N8qM`I$-9xT3#fY^0hXGgt=}Sug5&#HyIQ zbY$pNolq2sv_okR&{I})MI{697KTJmdTv%?Wr9IzBhDmlCn18H!cH)2YzoZg>H;yhP!U(25BjW-3#|7>}7Ht?iPKSEFmVJ?mgx`(>z_|#f% zkw*e%vCKd)r}#9wL>Q<>{ge*X=|CD8E|v$A5O#dy$WQ$2|NF;AqcN(=Igwgg8QiwO z#D-jRdgxlM`3CX{B9jcaf7g%qw!Qr#oc=kNAp8SC1noT)#frDO!!qq>pGEXXsH2d5 z2~rw~$E+7bLSl%)=*O?+er>@GH4d7GuUhv?hU!pq3|ax_VGWlomR|6%)hJm2uX zNtc??h&GqO*N@m9*Yj9eF^ArDUybsBVpklV2G4HSZfO) zc!<7i@!ay9_2;N(Wi}Qjk632DVGxbcC2s0u1B7P_X(L*SV-_8+ZwA{<#h}M#K8s+J z*6`qE&3Y}B=TvX!UBxn+&XY{om3zWHG-6HT5OGnFF0y(az!EF4#W|-cl(;U*x}EA5 zD^WvsU-Y-H*K{BM!#{Y}&;Qil`6Qlqi>!3>^BsP6WSGvfog&L-iXj(j9~U;LHk)fC z5bW1bJ*3u0{o!-41Pl1mdID2UjRo%*sGE?W6^RoXjmv1=lSsqQswY^5QD4|+Z;F@c$L1q|Ol%POm zN=`4Qv9#2ttMnb%8TPYL4Z6CS8ESrw37n*(GIunBWek6y_sHQlhD9uM6YR0$yUiW? zJ&V?ri8p=2BgT?=rf<)68^z8JohQqF`XBzIf4NPf?@k`QA$(F$$H(_jjz*EaW#ZY- z#uU$(5Yt#yd#OuUv;bfkY%eN)Z(^0WnJ7D?j#y@3v3n?U?Wyj}Gsz5TimO--Gdf8J zwO&U|cEn(vrmoUV%$mtsMO{f~kb-X+(IUWSFGoSy$P0s%7zbRmdRE?n4G^XN&Y3ke z-Y2ZOjS@K0Y}VyqBw)+$T<$CSOokHV_5DWC+N+ovK}MXO`F^+`M!&sGO9H@mkUyJ# zG8=%LrTh}9JA$K~TT-K$ib5NgY!5ERiI@83_*;zuCf?KiPiSzy<~3K{^7+p{`ftuY z|J1nIB);Is0Ye_?%bnzO@C0CxY;uyO2K2k-ApUv}RZ!FS`x7D*4btB=$jC8+;~)mZ z`pZm``W`XcK2qd!zyXpa96B^-?U%_1j3HNEd1VIB#cz`00{SrY@>gFy4-uJ|=4SZ# z$3O1h`qsBv(pIRnII;vfdPt1G4PXhF;YU955yKb8A1r?*;&1!_FK4ob<;nrsCChw1 zh`yEq*5r9Cg8|wDV1fv2=Y^>pmEEwMy1if&v5Ibp_K<=`qJxkQqt2S@>LRRfi+|(A zW1IQ?Nez!YGbM1lovYCU=h{|12drlt>46W=V)H-$*Z=OvmJeTX=f*hS{Q{>jywua* zC%#-hVQSt_%eay-wxshIdy8z#rAZT931EtV3W8C(RY1`1r`A~#2bKNox}T_?k9tHp z28>IR8AP30*#gS@E+Z%k7qh+O8dt0PCHEbly&TQuy~RpyVt|mnebg|N3@K|w%4m@) z6$+{TesYWt37}YUcN1;V-ryq zet;3UPEIL!WPU$p{)QFk;fDcwPsD_Zm<#}+`$MA^C2I~xN_>C}v5D-R?gaj3#;AF) z&hd;m4uFSRsdheyzo_E@tJeT2t>`%((oeFBbn%G$8*OoMET7Y<=9D`>X9@}lPJMdoSrbF zG~E&#CKAx(R$!Lo;HqM^xzXf#WUsLig=lkCa#uvOi4hhdg=9ImC2DZy2$X`qR~H|= zvqD5v!B0!V;FCf{F0!&Blzww2QkSW;GBp+`h$(Xm&M2#A=B#dwysip>;uQME#>w6m*B=4anSV*0uOE50en3dvpnFK=G zSR>SnUfG0qy1&xy%q2=m zoUKoQucjBQ#C!Ur_>Whec%lom0Dsew<%w?2t{2Mp%?`$va>*4MS>Q{tR;s88fT`Xr zxzEbAqr%u^NrYvF&}0Vx7D1u5zU7giCH8>V?J!;3`|(o zYgc55PTp{>&~Od9wPwg%r^sA4Z@Rfj%Qb2En9tkJ270xqR(NVk5-4IbY%OqSbDrA;~F}rSNhr2=aMSed{Yc(EcTlA9W z#2tptJ5M@}wFrLu_jj{?U%;;4AHYAVF&rYbRnJ*IwFrLjavz})jq%|)3gl=1oB!`E zZ+qu={EKsgiFb)u=u;zrigCP2nNVahnnbgR)GdCd`?)To+m{8m05IuX9m-Ob`79>5GErK$M}wECDD*rH8>S*dV~GA8izBY44NK|l~p za7^NF&%s>=fap17ZkyJ(a)gqC1)|`3h7h@IUqE4{WwA!OO|m#HlBx3Ax4OCfXllN;od3Kp zY5@QQ!2ppW`#tZu*?suK&t%B-lGgUX9F!U0hge^PyDcq^*uQU`UMgNLLUK5jIq4yg z)_zXiT}0O>3Uc~@oC2IcugPvN-L7PK30kOp2zP*HBS7Cba=a|=1BmvRX~2Ep-+ug) z9~`*s$Z%4oxZ0JuBQJyD^;N`Nc_vbFXHUS(059t0)PXkwtP?jEj>*ldhJj#uIngae z9UrD5*@ruXvbhpCjXj2#E{d<4!_c9?qyT6cSjy)XX=6;*_pQdnz1ZrzbDg0B+e@bk zhJ{q*FG0_Y4k^=&;OLWE^==PEbE!w1ClCZE9vRKKrAfPFd`=BPnTYT#ZtHp$Ng)cC zESQ0_k;EpOP7ph2{IvjRLuwK?vr4W-QD4Mo%}Q`(dT-gV)qdqlw%0I5SJ^*QR4G1T zl_nKLJ)!1HEMJ?cGzfS|h26=S1-_ezL;>*eB=Br)Z|5**002ERz?}k_rI(he?Qw&Fm|%2EQBzX#4L4g1ij|5d5%0M`^-S zQ*fI2Te3i5fadaomxao1@Bu{bF>`u`!!yeF6{_o7K&F@Vb$m>$>t6q-{_FFDJhF$B|AtUDM03Xo zCMJqF6ou6gLKI!26}2XM+CFwnt+06nAc+Vmvy)V_vV?>c2G!*WkXhw9W}jYMYDB+R zXs5|oyc1Db{NK1(j$UJ>Idm^{`tHT{z~#OKQm+goSJss&+u161-0EcLcIf=uw2Z%T zk&_mxa69xjE~*A48gimj>KrZ4WG&Ys=C$1D(C@aJrQacb1Oq`Ap%B-m?&c2d^xT1Q z&mA0fRfH@JB_V{;^&}If*oX|90kV{nUCFxm88ZPk3uQF@T`*9~Vx)%?)+xT)0-hQ+ z=Oi7LI>0-p-@l>2913Ht$}SUN%vF@O^VZvA*@m3uFyu{3-KP84hyMM$|KZR5%!9N~ z0a2LxQ|{D(cr-2(Cs4!ZN^`tkS>Ouk1uba;^nim#1I~g1L}U=*dxa>>Mv;t}AY5a> z0Ognl+-HKZz_hTs7(|Q#-s~QF=x$Dn2li*#q6|wgKRG31bnJ^&k@%uPu<2gjl)Q48 z>RDj!x#ylDtpS2;EqC6@H2^#iUBC~SAReWc@iZqpc;bobMc_aQvpcax&h{dzzcm`6 z7P8siY__RYth&V8XUSLrqXi};IPD#v#?0}J+fGPOPP)8)!RhR&p<9vZ`Sv_Vdl>jJ z5RMQ&G@=hS(|GOmH~t7xkw-&>J-*0?B~ghiKwdm|h7fga6>6?3KWC%7FD;-^iO+`(=rQnx!tFh!mSCB14m%rUyVLD0{_FM{Zh5EUuN^Ig&O~rU-I3%Oxo(GmyD%(yFd17)F*3T! zh_?|ZQFY8B8>SPHu`Px#imxH{e11QOS`oTiaN{tQhUHqsgn@}c(2M04bNRNyH?Z8$ zdnyuF8EcX$Yc$C~mc8p!8-C+k-}X1DKYeP)?*Nz>BRiqxx5ks4e)%ymzD}p>d))=} z0b+k+9w&=pJ8;qjq6K{}L4cdhvw5ijQc#D3|1Fn}wN(G>noAHWEAKB0h+efCA^^c8 zn|siRFZbx9z=TzRAKy4g53xeF7iiLykVb;kGfve3@8y8tMKi!qwSMk8F3HzrH<=mp zvts9+~~lJ%vEJTvGcv7`Nav7)a4{@*n?qZzSE{ zKSxD3YvlI2eB!cV>@Ul*%G_91w2p=ne9SSJ&roRWs4}!&mg7+B9aSEbzMD%H=DgyJ z9HR9$B=;Obh$67CI%ayJLu7qk5kb!kCFhCleWADRR-2<;@&qn8p<`AiBlp~R%RNhf z056xmCg)1=bxLcA1A#(tJaOglv=nAlT(fA_=h`+I*6AXxYvWPIy} z?VYV+ETXX+?=;9D0_L|4Js{D783Yisfdrv)V1$U9ACAZQoV>%3T7+>=+Yp5vj38M+ z{cYst1QUcLXU`1>X{#%27GW`nNXmT7Ef?tBci(MMBJePA>B~;=rrNY#CIfs~0O%6~ zuiZeXDI$&ir5Ro=>kBH;OM=8392^`|@Uwkk`2}T$@nbZa*Fi^$>##_;RJy&usWOB) zvgC`XD^_22cy_S*0th>Ko|(H#(Jr!f(Pris8DBeOt)dy@Ch0G`@1qa=vY%ae`(RRt zN53<}NASB;3>IG+onkfG!s_-W2@H5HKV;d9NNf(t`lch0MHdw2eWkyg>F+Ej9)lb@ zkcr54Jq6JsG0FtJyy+ypxvEg-0q{N9U1tDH4Hmfmg!W&{NA8KisyjOwkO-S(Qm!jT zLbZXFPgW%^oai-KS3h>@F&0f)T*9;cj(VaO3RyA0J zC~7Lf_Yow68a7<159Gn7DVFt;J$fI{sRLlV-E><7Ky{eVZzC%d$k@W%uv#JB`TF3H z7}^pwiVn^^s#I#a%(h4cFz$c)FTDNDKSbci(H}cIlcF=<=JqQQB3Z%NXh!(GQMm51 zLr%;gMB~PM0k;?wS&}FbNpFAd+^|?!5ax%ZBLGC=ZycGmfB(S%-$3{UqK-(KGZ1x! zq3*i=`s?F|v=n%l%q<2kF_^=Cpq?agpJ{bNY%;ZyyNKzcMPOh0*z8)bVCWKb=4cQs zn;Z}JN0b&XFMF8ub+0{s+*xsRC`MuQKz3OaVlI;&oO6(V3(_zxInGMvij~}N6zjzN z1T+l%unjIRQmmXleXq?$jZn}C6C9oi{2=nW)|`N!1&lXa5C=A0v(?PL=Lg<(barv^ z9p?uVYsf(YC`$0N#-|}|-X+?oLbEc(k-g$z9ABFJgh=Cr&FOi4lzM}9b!7rv3@Nej zNzOdUOk%8MQfM~e(!Wp6TS!d~K3}2fl?W~Q9n<}uYYyC#a{_!e70OK43G|*CZn~$& z8?4VW0P^-6${OPol4p!MO!Zax?=B#RAa;VF#~P9khlcNBj2 zD#j+;3U#Bgfi7B}U8?K#T+H5@N!9t;rHtJhC9eCPmeDw5@5_VRKRb8J8{hEe#ZP_g z6YC`9gqhZipNxnNcJ!1anRQTUy#=<{3Ed#sdSoL>QCl9-SZ;MZbn|pA7#Qc~8eC5V z1{F9+i+}HV5@GlAagwU;0G|T)hLW1NArKz8$DnVTF0h_36)X_;f`=Y@$daX+*z1z! z6cW-UDcQqClfQV9i<&MZ0^3bs*)l&9+Ix%qAoPxY3RX~+e15}rmBBp|pQ>h~}4$t!< zhL-i+j{D5)Ik(yxm6E95)Y(bj{U>63=SZKIf=>P8m%n$@H)BHvbafH+;-@LpFaoIg zDNk?s2T4T!rrt8^4t;taI{q*jOKuqKbMvkfb-nBXRh03-4P|<;Xquao_lY}AP?1-- zV60+ihKPn5MNDGNbb-H>z6L8+&k}?$ov+I*;&Q)ePcViwYG4-)BYIvuVhVtG=J`%D ztek%8fBfF>{;pqVwnqk$Hi^Cy5`lNfD8l`E1oj1Xh%CQdX`{p{#ygw24W^^jaSkbK zI2`3*e@LE+ZO{ec-9ZBgtFSR$6OYXzyq7@)%jkp18;EsjNet)#jRmS_NeYJX!@nHn z7n{+=?pPCntqoW5b{Y7k)?bVIzym$-zysc#ov{vjfK>NaC{wXqf6~eKJ2+Y9J3HCD z>iRHECfx?Ken@qNWCzG#G2jf(8!FC9eN-NGImtncef4mCnQhKCkl>WJHw*UrYmzAZ zd!Ksn_cn{hqSb)A7O4w+a&f}$+VDeqA-Fas#zr+2Ee;U4dxK0hSjqj~CX zvUl?dwWXIcl>+f}AgwPu=XP<*^4L1a$}TcGfeF5@x6d8x%*P{5{C*v=!E45gp~?Q{ z-Zj}+;(XKzCgLn7Rfv|_ER>o*y&Q?N915p;Kz3(Jl!Tdq6rVeDWqwG$9=Ee7dK*J@ z(W}7wL<&fsFOI~!-mrYbb|Z6(WH0=#Z@J}dgM65G=sXh!zD__IedqxJe25ew{U9%o zXrG=J|3E)88=5=oY`Px~n>>d%%wW(cFz=K2yFlxn9}aVrp=A#O5{2=Opa(SYgKi&U zaOxb56#A(MjLF1ch}tlsYMLzWY))TR+8|EW3aDQ!5PrGou<93&&WZ+zu=rw*s1Htj zsKt*=0cvh9V1EEVY(tTw^dijg7AOAlg9n>d~G$3_tR{oFtL$8X4*ts@i7mB$Y%dYY1zB_pc> zPfQUcVw42Si&#{WCr&=#73?H&rniyW9HK*F*)3#9clm@YglMds8mcUQWUt?JeMMd* zkQ}2{)ZGPhX&dJo19$)Yv+l9ZYRmzM^ML6+u=$+(*yi&Le(~d8pb4b?t;YTKJSyz^ z753P}*Ul2AT%`ox^vKFy`Xc(p#67(IqWjR=Q~Z3E4I5kWEnc8`zhbXgbvM}pZ}>}_y;#5#(m6^Pcv&aIn^7hgi!YeaqyB0Gx#o_zRma2 zBYDB1sUT5F>a6X6eu#DO#buqm_M3%#o~0yst{ItuYD>jnHin@80}q~1HxP)ygd-9B zAPz%6!EaiFy5RKkBoS9K!8F~~$y(A=c7mq)*%K$21;RJ* z6jzELMuUfm!2mzJ3`=(<;xFp@E|HaJ;#bM)3*VxZ^XEPM{x|}Jn4pEcSy6L%zI55| zZ<{mT;yw}e0mDZpbRzqM{tpo!Fko#_D}dPBY&K|l+x_bg-v3{B7WeMn8xT5?% zQj1r>n$LxM8igJISZB?Bp|erBpCJLmXSUChRd-lrPAM&Xnf%U|%A+V#+k2XN&N|6+ zQ})?){!qQokenu^g7!GU3Y5!UN6Aof9WlaQ)~H6ox1kC)s>-AD{XFIv0yqIahmi-d6?% zJ9dUtnH%R`_^t2%e|*<3!XFR@k#-vn&3WGKb~rv5$8@`h6&|q#7;Z82TpTOB2H!wG z8-|V5;y`b|N74j{!eD?F9n$Rg`5f!;2_%Ea+S)ql_%919D{G|Y5~2V#7mBK583YK% z5J{6&Mv1^s3e12GP!p(xleIFtx;$+Jz32u2gFt-0`?5q}r!Uivt&6{Asj=`k`14rV z%hLU2J*zuCtKT0VW4bM?^J`gOig^M)%}fi$D_9`vn)Wlv^qhB=p^%_!V04v{3fA9+ zh52ky415@hI6ON`DsnP*fB_a#?3}?8>pt+{L;r4@#NV;y-K&NzmCnf8C{09F9h`<$ zB;uUq(TgeBH78XP24{4Al9w(mHZ#T$OdlBH0A~i6*a4J1@^&luWBST%KXD(Kea`i3 zQ5#Q~})v-FcFMy>l z-*IU{c0MM75UX@Tu7w6VGjx@yzhsYw`I08j8{?Us4a}ljY!XJ#H{G)*-uU{z&~|Nz zzy(6#AqsPt+$1YpM|6O2kLi*gQ1pd#-^dm-9v7}JA##mI(;S@(I7p*C0t7ia#1gpf z-yg+b$s^b)$RG?43>JY?ml*6Xx|wU$rNqt`Rk;vFPi;1Sn^X8J9^~lr`?I8Zzap`M-dhS5ZncRsPYEu5wblmEC}Gi z^(9-|41{`?<_h~7C54J7CXckgKwiwYB6BZcayBW?NJM+e~en3 z@(RcOrN8!9kCHraWM`O1aW<&asaSVoW)|@?QsuM-&^zhR+;yYQ(C$wS9)&g3q8hUq zYm3BnVnMX?g+7F&8q9rAGKrj=Jf9FexA_!i3}`l*mQ`2ZIq)-m#(=B*EZ1sr+wjmN1tPUKJioDwj#oC5`t5`@{Y{gudlnPU{`@ zbM%oG7NoM<2+3060)rw)ts-lO7C^6|fBO8vpLplD-&};Mf;lTilu*|7U}_d~@9EnJ zwfCfbI_Adnsd^%)-iK|7r3*}wmrsiNSj`TDhAe(yO&_nIsMc_)?NLZy!kl3lCYUG=!&b~Cw(_R3bJ@~kW0 zqpOg~^1gia4nlf9Up@DL)Bqn@Kh10y>k<4o^11s==e+xD`@H&Bs()r-Rq(W|XOTRB zsvAuGpijwzp*fk$cV;gnqw>CN7lpV$Y1_cM(&AgT9b7JRJ|yo!!O|+#`HFv0T8VH( z>XH-h__jB|?Mx-2OzK?k1n9v>^yFB7;J{o)=32r;WJsUSR#!&>@$_~*Q8&$a%fE@- zn;f2!upG( zsCW!3oP_l!cUOsfS<^)Wpx4;Jnsud8sKh3V{D33l17rY!5d^93E#n{Z{pko0kAbtK zO|bf|xbvLrZ=OWo!-soZsU9F?O4p1;U(xGP=ik!0r@a}+gMPQ$#tJETy2~y=7}D_X(9}cM2pata(>mlfETaIj-EV{I|T5;8I{sPf~@( z(g~)1#dNJotmPR)*e%i1-xr7tes23517ePMP5*t4*z-r|UG9(?!OC>v9XHtBq$ood z3t{KHoU657tH$9VRi~IPG31(6TXQ!$lM+G=?AZTPizVs%=bJC{1AfWy=SQ#+~=|@Pr-bKGc`7mO2Mb~G9kK1nB zNg<`nz=uKX-V)(;CVm2l!4?vm`U7H)kT~1V++grG z&Hj)|s24N6Tm~3>L#U0~ruV}Hs*0PYbs0zf5~saMYkr{W8|W@jA36Yx1U5lAig|H1 z_e-SvTi@8=--tW3B1htN?p&EV2nCM1e$XE{DQq-|Ops`_gYK{6Iy|y8C6`N5-&EZ=GQf zRE2{(-P(4)H~Wm+_G4wzTt-uMtX5Z4#yNJD$7&l}5O4=qvHsKEzR5n4z^ZVt{^bZsB#jD_CGl`T_a`=J-vFu7H0u zye5z`4prp>>C?MisVfW*3l2vOJtiPVO03Tm#VYN4s4+9s%K(DnH`@#dYY4|92Hqdery!1-Zu{Fv0CkBpC#L|u;+y=8qM}I(beBPuE z`k|R;UEhnb1MAN0Y^$LoxGIPwz~{nCeC|+NS7mK`opm>?c~^zF>hE+P5nIF5V}c7c z@G7rr`chw8U%lJvlldv(B zTJG<>`-e_^>QkRs!>MPNW=Uuo!naQiBk-H(l1*_X7ym%S155gRvQ0u!$VpS@<{HJy z%4#t?dyvjQ2r!1=xk^KbL~o&DBZkjR^)3TpL(1r-TXQDfJ1g z8$-+)I#hMS(;D>D>E$rMV4e14wc;CFgYUWLo}drGIzV%RhWML4&__S|(Ew`?#NYGh z&vS1_&M$b1V;K$zSw;^@^6zG2E6nU5?sr3Ppv?O>7_9LANO+29Hw$^Q39-Kz!JyR; z9mkl!b04R=;t>yE*%Zt0-~Ri5|0WK(_0FY#(w9Qi;ic@!$DHdXs^p@F5xr21$JNZg z26n+}*2+hcR758Buo!E>6Kq@wmJmQj^bpkQ%K&RP!`}tq_xrum4h+zs?(}HWJ-WT3 z;Kz4evK8Gan9j@&lFf0ybl-BFoXbZomyhS*wdpx@Rt6z!r=9ZKnyn2GWol{{uW47V z-c$K3d?(3y%4gPRtvuuIbJ%ahK0mU3-kl6x|%6_d*}XI?!DL=woo&r+xR@_YD-YBp5LWx8ZJ(?qy7fE#q8 zaMI1UzV%46*KM?BT7J9Vmt#;=UFTym7D_qTHj@g=o{nfaFu>W_ApvB;c{d@2K_z7+ zG%?wLzDO8I5?@^Z_~UBxWHkb>HVFiHCew!x=roBYq6zD4|fR~tFR#i9y zzPG>q?eRB!bZ`@h{6N(vtUp12oBQ{B+%`QOO6PG}EJT68Su&l|!=nH*7hmq6o-7$J z@)lWtyNLT;@gw5ma|BqNYJFJHNVz|Q{=%`@x95@KzSZi}DCLMn?qK8vyCYLpk?jOJ zPu}pIg>J(atqhSL)F`qR{nu`G8pTe|IRL-?w!ipImmk0C+lP4(lTx}VFENh4($Tzg zRS~ezSX{*SVvU3~t0(IV|E%y3x&&-y^5|KQI~9n*i1 zzz^;&W;B6|%NK_m6-#L<;@UN*F*joxL6?2<^c804%W$-kt=W0}F5XzV4qx9VtS;ec z-n*)3y_?So^YQVVKDlnR66-yt_w8%<=WBOZHQ{)-o{xEHq1oo&FpfaIfP@N2znaA) z8Sy;!;`F;&G)a87!uTZZzLY(ZkK|lzRxyUyEWzGtnM8%Zxx&bcDTyGKGavnAyd;FR z2qbQUZNxr@{E_?q&A<9jqtPUE8*SHZbuySWsJ}R5cO=7yLs~3Uk}J?C3Fq=r9`Au* zl=@DKB&r3E%5o$yL%l?scBn5Rj1GUBB%*;Dem#nASN38OQFEaq=va|m!uxXp zj?YqmV#vS%{lwy8htGq!--XTs>;9PikwO>XhsY0X2MZ*%YygBJ@8A{3j$gN9&c`lc zaLKcHF)=tBaanQgw4FP3-13O>$bBhpNCJbH>_GkWESafwUkd?Lo2E0-S%H#w%B5ih zb&?K2S;rbFu79t4+HKN+P$((o{C5#`XSgMJD4gl_>e?2*;|AZaoJ^;Uq?b$)*~`Oe2)mogsi|4BOjm( zWEGNARTAj}2Xx<^;K?N7LWk8%0e!Cz5sbuP^heXrqk3GJD>!DqnA4=b`!lW`5;U$F zMi8vGxlOv^>%{#9vvAMt&b{wL z%h{o4p2=X%d79{~JqQ6BtiQY;s4uKR_yI}`w-+QnKq{S8?6A4Xsa0lCAc^LP^+jG_#r%XeT2C5x2UIr}tXbsRoY(GGr)bDAw=eBm%R7JKR55di`KY!prU9Aj=2 zOZ%3t%R{vjpwTrn=U(QMa5!gDo41N=I_#IdR4RW77+DoD69-+;DstKxV%=U#yr8{5 zgb?+6c5PWM(1Q6xjA#`8z1}mV^ULL)X}71TqdraSuVgq?W~MjqoJ-hGrO8w|nTeIM zPQlap1T?&2PVGAO9z)`yU?j&Sy1j}pSAtZi+)qfZUpv2T4<&1yb}v=v3za8L;!2#c zDtm6bzo%(X!Sb<=SURC{_;Bwz_g%wd)Z`i(^DAAD%QZA5sY1w9Gg6fGof}OpgPC*i zNLl-t|AkoXy;ZjJ5_`-i7K^evIcvKLR(Ay7HFH*1gqOV_vA6df)FFBThwDyjK8%B( zhhx$NG9$qmPQXUl#L-0V3WoC-4L9-J<_64~Y4tk!NM}Y=O`>oC6~g zzz^|@qoJmCA|MC4yAYpm^yh z>Xs0qKFeH&e9Sr=*!L?FcLZ^4RacwDLZ~h+(Q3$(j&8XoLNx~TN1Zd&5!GcQNMy$| z1b`)AmCUK+Q{@y~RZJ~;Un(4WSF)ih6LXd0eR6cDGOmbd-tFSm$$xcVwKY{Js~%n6 z{gms*wYJZ+zY=&$H<|JrKDo{_Jh*H|>-yPj=6dyF$Vbi-|D$Tz>QS%=BSm zWRT=Uh^}R-7cTEXEx_U=?V~==^o0^lWc!Lcj=0;zYwk)9CGJ#Nn4e#`4!>axgcQUK zkj2;*TZN^cw2hLpKW&GA5~?YwC5%2N{)PFZooy2VnJIeF+N>oi{7kQxZGg?B0wtFMCVUL;@Lt{+#~vSdx@MG+Q3lr%WIq^ZH^KEw0#Ieoh4C@J@FYNCO+|10}Yx5Ys zbq%U_|*^N|6T@{JjT4J`%;in)YGrg{6 zUJ`E%_ylh1y)9@EL;7Y4didb`{cXK} z(nkaUVK$!^+EoJF(1If zm6|k3dY~PK8Q_FPtuZ|+G2=dcv8%~TS|%Pitj zPlK7DAhM56_%i6m8YQvK>=y6Da1@g5K0b)qS1ghUR^U#za~KtZNgPG&FRw>XfT@b` zyFDlVfrNBIDn``FhQa_P@$itu)O{X)xPEXxxLJ5*NS{G{p0KgOA}yYOL;KQs?c<0F zfdRxOh{2X91z2&@O*hf+Ee}6HFu+r%o(n(y)2oHK*I`0999Uowu&Ri`CV?3!?lrxn z2#k|hxCy3u?Zrk1sd)x{Se7_74=Vl*ha-F^1;RFgpHO)Ez(G;~u{g}n4EBfl zU-_Qzyo9Cl}gx&^Od)G@{T5wZADI~xa60is%RG3@P4ilM!D>Z+z zzC3Tm-6T>GR#v&g#25bVkw4=;{HOnl`{h(hTAm*NAe?~#0>H+hlGo+0x)PXudxR3&|FV|I`EfKXK3gg`? zgLe=9;zJX-1fwC5LzqmI$MK zh>5-?F)<_D+6gW8r5&+j^uoeC zyTjnRaEBpPlIs?{f5Z3BhF))9hJKnY;F=2o-X6#exS(NiNIS8@ukxv{sA+zrol%Hpxb=tA(r8>$HNal%=d+dQzHmJG;{!({FGyNVf;8oFKRW<-PUtk zA*dC2yJ&=->ro@v$YAtvU~t_o=lxq94Ba9vgF#BJzmDfhT-=0V{gsMutkakwad^y) z0HroL8_cygeAAJ_Nyu7R&qJOp(~*;v$JocaQiKi8Cu#9DgiQrRu@Z}am*bOru>yK$ zr7m@Z7Zy;6Q9~?)vF~Z$-qY^8`&YV|tj$j9>f0*B7EG=wS!IM3LJXA$ z1%Nd&Ezn-r2Kk`PMY5T8+QN33(s_~i?r6{S%`UIC8rvEK%kHlivE*SzfLQ5J)7 z!6AIih*OZth)&bU(O<|4>~~5@&`Z5w`3?Xoths26x zMrZvWB)hFmXMx^XwgT%Aj2I4)i3rnK8?HfzkXdXnVtre!IX`9>E}`{E_cPw!apwGN z4I$HK6^ogRBd20Q>}`cw+swIC^f6V2=&fdKZc!Z}x;lt{WTM6mJ!cS~KBY3s62%C@ zr_TX??4ZvL_G9fA-I^aOISTH%(Y70LNS02Ks>QEZO6|!zFF&l0;&G^LFV7I6ptfG2 zGCe;%+kP5Tf8g+I9lF(^*l~k=tbe3N$8Y)@7Gq{l0C3drc=O`r?w4MB!hQ0V?_-Ae z=NFH&*c@`vr+Qb_F2?JH-S_K^vD!92?YY9P<&d1+$FsPEL8p7jGVcG2WO&Mzqp#Ap z`E>gn83l50wU={^AJ&0R2DfBD^Ex~gQGF7rZw!INIM6UKJ#V z21!$3B@t-e#NfKC-i4+;0WgXXQ>dj`e}(-$62SiMz4wvI1#i9e)?k@l&8h<>C#*eK zhcFl$1~_U`2%+aoAgk zzECZ{y|Wz<t4aCpx81`H5gl;E^8|h?c`c($a5W(FI#1V4 zCq|X^zC3Q4{zTYU=AzZrOA^#%K`{sx7BBY<&C z3<}ol@7RBp`xiHShx^nUzSrHp|60)>7OByudLQZiyQ#kuw;Er*7aK%udwu`le=a~K7Fz+itZJ|gF)Or4B@mCZGFF^< zx4d_eJYtyz5i3~l#)E8;lvmLBbbW#_H#0kLBJjkM6`15)8+2_^ zD?to~stILfVG-{4#n>m;K}IIY$_}4h_yo>}IZybxI|wfZ0?Q6k$soS$#M{ZW1#6Ngj%Z&Eexf{xJ_Vt_oGX7$A!7rp=f6PeWez0Tip z2jugcx%S7|vj?-))l~*O$nzRT6JP*ANj#hbNf6GR6Epa}eRc(8eA(i4$SelGzpx1x zmRa698m-ZL-seYa>jmie66qk2w9%%yxdRzSsj){=$8j9VzyNoI4ifC`a06;OPK)I` zGc)r{gc8=qjYU2DRRq=NcH*{R5T==#6P6G`OZN}ail^B)SfOpKLlKJ|p%Zv1Gh$h>yth&R{)X0aLiyh%u66V+L?2|{JM9zPrl)=k*;vDrYCf} z?!EeKl^c!Vm8cdY%S%XpmHE}ClK<7O;obA}E$~e&&He}5&$*$`qvN}NXV&eRekGqs z$}{YcsTu@3i7Lg?MuylfvWAZ)Yt8JEAf{&re8xY?M(!n}w0vYyJEZ=GqSop3X6D%n z9OMti5biTA=`&^#hBU=(+tTHep|P{j7G0o)N{3#2InV>jl4Na12KNoUzLk$as=$>M zVSuSKH0%S$3}Flbi9#(QI7Y*@4iYBv38GHO9d}eomlbA94I&rP|6zJbBZw)=b&3lx zex!lPm=Lq~zyqsnxdC;Bj9$0?(gW}{ue*RxgG7(h{q%_izEa6#d=!Ul{a#4ocOB~@fQy;NM~m+^b(j%}w*vyRK3E|A zZ2|=IfdXOQtr25d-N9VeZSo%hVKHLyctnhFN24o_br;<4zu^w|OV@m>n=cvygmy0> zy)R#RPWyD}@AP@n7M*TO!9P9Lo;Nbl(K)dQo9J7JB|Xz;E38mfJkD-X2I9<>kvL9)xYSpd4=AkO!N5oT3l*Y*H&TEs z>-uPZ97beBY?1UO@d6TJXx4Rr5vxB-?Kr<%j|KR$9WyJkH_Sj?eEf4tf zngV8HgLML&QoATh5G3|UO4R`=OS`o13YMLO-wa64xSHfEV|^m-(zjiQL*K?uELs3R z4*2HSH-gRiE*n8G`W2z9c83SnY`j(RPaA%bTduw$z7MYr7yGcNlNa9H7|I4}%&+Wc z$Sqe`xk_bN!`YfJ1?Z+8 zlWa@>%Ke=)uSR37&u(t;y@JK<5SwGYAA{kJu);|RhG2vM!d04YC~WAzpR4?Qr4FnPc&?m6@;+?8YGMU>$zcl6f&reR zXAsvU=RVdv=hmUGm5|AhM}JZsG}JJmAQ(#jJ~74_-P3yy>9y=3eY6zw7Z6Vbeb7vu z@bN1XySu#HNFupSiCE&%jJhHCu5L2-T_Roowf_ls14 z)5(;XnDB6E{=Y+q5Cwu4g1R5)J<@06vr2(4XVotP&Ic3?JLOyN?eP(%!H5hLnAP?$T7_cT%XBh5413(>J)X*`Q^mD7OA zS;rQntAJKzd$PZ)Hk7Io%I$fb_}jpcS9p$$x&N7`+zXqVTt3o{VlbpULNl)xKF+5``v$e*^LB(g{!dKDN_VHy<_kFZf57J z&y-+boM-7y!A-p;U>dr>5r0Dgqz`tU=Q$Uz4{}514kNaA0Y_tWp@=R}#tfO)amfT9 zGex@yq)x6=*Z{1K_p)y&GvftghH~qcoONz~;qqp)OMN0B7MRsT$l-@R(sB|J0uKu4 z@8MDgogkN$K%UO7U_=MZae3K;kU$rRnmi~{1|YbR0MaAwNNV0e2cZK2-_@vr;&#?k1^-SgF#G5FYh& zbvn#M7Zz#Ay1!G8d}VEA!_@tYA`ZntKadUig{D!$c|Pmc{1c5$ZS1}*R~hP&4pk;& z(G=-=Tdx1M=k?A-;B>WZu68X~yPli?p`;DxJ1zH5{==u-&wk4ZcW`z-?u+coh-S$# zSC)${07_IQZD*waqi#3KCd?cs8T~cd!hF#k;Y#DAAkqKl+FME2*mD2F>CZUdYQ*QQ zJXif$!yY7{J|LuzWcMCIMNgQXH=W>MjD)Jk+jG3}DZk~OroZFGoI~j?loR2iMlM*W z0_*&^7`qd|@=0NIv+#O#zsjuGdP8y!S~2(f6EJZo2WejF!Y_4t=LHPt0$J)Jg6*1A2k56+0c{csFzSCi5(t$!VJRjkD>)55J&09+yXvZ|fc_b> zzW}%p|Lc@5007%-q9(ZZ-X zMEyr7bNSvu>tS`q$D~n>mAt$z>~J!Kf`7N?T})A=pci|BWNwj^ej)nIxe_S7nn0bX zY=rGi@-ly*ft?(0?^O&fQFP7=0bjB5SvG3-vDO*o3F1<+M&e-|>|E`)5RFhSyE^dI z1H+PI!`}PYxu$_CCUnk%3?Q!CCZO)Szw`U|xf>SuyKg>tSPQZj?uzAQ*CvoWytIh# z!9d6&8oihi>GuGBV*nqmpELw4C8d85U3&t8fA=+S(q&pb@>TVoeno%Vz;_3m~b z;1i}beX6gAsJ~6$YKFiYcmA=~S$AwS>m>Xv<23nvuM=2bTihr(fDw#0D1yEXXb=)l`9g8#p8m{r4O| zj~T4i2?^-0#PD)>fE+wnmdo6?Zyzuq0~TmpFssy{|2uT(Ep)#91d8_uWSl3iMdv$7 z1`&wCx5wnn^(t`}{KR{02o(oN*-bM*^KzO28oI#uy>FRW)o}O#J1AO_ay$eq!JxT# zK%l(E0D|sHtpJP?xfM^&tk4QR!saH79tS+k>v`VJkpB;Kn^c1yHGhNp^ud91wmI7% zD;1~pCLrW&(46L5;v6kIG|9CEyXMlj%s%kRkNsNFnY(Exj}_OPDWh48$Sfc|M4v4F z*jhT%IW3M8N|zO5%a#N|3LGH?TW)|Bw~Oc!U=?&?RR$RP@E_ed|ABU?F8I=LlbKQ4 z@iaqRh5gvJX&|;2i+Sm0vU^`Y?b|Gc?b0UGMc7e5uxGHE7Lf`{8$f%Nu_T>4AN#P1+ci zwTqcn3rrNTx;Zkps2zakI~o7xWt7hB`CfoeV9(DWl#NShqEx08XBrI7p_~Ql0BL(} z2@n8&_I}JKFwGKeJ?bFQ9XYuIw!T+wGcF zO9HRmP=I=#MiY!EWB380wn1pc^KkZ}hxR$3O1=n}7EK_sLVI*jTcyE;KNRu&Ycit}^}TFQ|r* zAma1?^XgmNcOSS$b%K@KtvtJr&rt3Z_Mn44S+)VO{28ihg8FezYOvtX++rRe78o;o zJFl)zq7vW%loKg%J#h_=zGnE)zoI6U5yPEHBF0&h8Le($Jt?!9}uo+#QKzVbz|a#kOUlXo6&YJ z^?erk59M!dd)oiaM-Y?c2t0lqr0Pbux%nJ#d-PEW!~KO{aG4P@*eUAF@5{0R>l9C> z;c%5R!xaX4Kv;p{3rH`4eRaV8%!*?o@Mk~!*#h4h#^Z6~NLNV#;S1eZk5XD|$jbE;y?qiw6F5M#cchB;qFKRwl!wllcgE zwkA#?N^SA_cKQl>?WS_&Lj_mfYxG{VRxY|@1(Z-a?k9JVaimluR2qW|yS}klgiS9-TEL+s7jc>t z0iG8CL&+A?h(QHA+moV=#0XCM9$aBiJ!CjU-(6Sdi^*(;)c!E?R2;hV0d)Hm4{c#;Lz~S&9*8oAP8=}08#~ynu#zRUR zFhpda{8_hu{{dQkj-!L16g2=8&vz+g1ZxtkN?ThfxH2wUt!@MC3n4hLLUo$r}N zq&sMmVpamUM`OM3z#p-prd$F&GNU&#d}n-M)(N(ob7R&2u|nD`wowPD?kP^(402_E zsty!&Na1408)7>1B;Gf&LoqoT1q77Wj@+^F{Z@YrcS++7=_FL63eE$ z`e;|3Pn#;@@dftN?@``=dJlU2kQh-?kmqVYnW%ZqGg7ozs!xU50G)n^{zyk#3`cH_ zMCRZ9>}TBMo2Deoh7NvXV>w0EQzq#aRwe$d!qksZ@VNuPV=cvcJ<{GEx_ zQHSR&^juFy;(IZQ;M;SdB^M3XQ5_}f8E2MZ7h9H-ICF^Ca$EW^(T7zW_zPD?GEv`{ zqy5>l0|pLAzBr+PU&~ph7=)2RlIqNNpqneYoep$)ZhM8ZDv^YTRQChwTRnQdPPV>& zdNMO}ociqy-H+7$L19ohYm{$qDF!_N1lQNM*vLp^gF~Z$7qAM0Ez<8C*5D_ecqY5? z#;XB-0lt91o!f6;EgpUJ#(=;KEtX!<0jA&Fur2+DbpZ6H;7otpG)?@)Wa2L-as3-2 z5khPpiT|HR^v8h%(DzOJ%1Z8D^BRc8xi>M8o|COYusl)!AjK%y7nH~oHa2y;L*xw; z-5Hxn{li&>%MvJ058us z#fl5Q_KCIU-GiGiy3kP9UL1(}6DT3uA=3s~k3)CN%<Go;Vq5e)o zsI3cS@_|)ST^w#V`O|>apCQTR@-QQbP@_yLeuJ50hDMv@fmZd;0?z7<$jLV(aib;b z^;(C6g+zrkycf~gplVp=Hkn(}p< z<%cX&$J9S^Izh>(6cfms!6yffi3bm!$jBP(fPcrgBmpYeACMeMO@z4Y?CkRZKb!|6 z6*p+u92=Yf6()1Mz&wY61(v84x~)Yt6}BXcE&`$ko9lfsEMoFg zyflc$ur}HxdC$ZhrfFF@%I6p9AaK~Pmj^)i%{A>%hy!kjz~}TFh1Q5I z5;mAy#%DfOvp}nB#2=CF&#nRHH!Sjaf83e9ORT(JaZka>RVn)}U5Kl(zjRyLsr4_b zcXnGqkEMG%)|q$Tx&JEnElZcXw=5lT3ypT%&vF&Qq6@404;}d?_Zb4fpLycr?hFbI zu_oU$TXV1;H=8iqI~vhggkB>f$}fH7Bkp_t%uVi=qgOKUwFodV2j>NZe5Utbnlb9{#MdZXc!@z|+WVNIbK*IC9`XI!Y_xIi^NkI6 zdC?2{4MY#f9xIvCL>iLz$`@QTskGK|j(pV43_i9qr;gAry3}~3wHT-~QFKs&i!QWJVWIFBo2GI2EzKVsR11&@H|tI6rI6aNaJ)kX}G~EP@f*?-=igFkHC8 zzy)U7WS%T3rtQf96StR;f?@3gGx!P0awJG1L_EUm51!gi{Qz;}aD~wa@t0l320)(X z=6XbxmuTcTPe6EC6MBJl36}}I-T?x`ZF+%VYX==d-|`%}$8yd@G1QdzolaNMOLazW zOvjVX(IXh7#l@Ys>37$wKOi>)d{ju}^nC%q@Q3!^SM&RE%5KfKrjN{zC-p&M9zOxB z^!-@DBWFy*i6|X}9T{MT$RZQ5kxwWh@t2z0k)UnlrAvMUu9EWc^{Rc(x_R}ttC&nK z?ADR`5LVU)(Mc`%miwN=*SSA`;57_LWlqeechOWVB(H-XWfq-y}|wc zFMJwumgHx0DlRi!p|^xO_1H$BILrp_UwryO2DdjJyOKe#oi|;FRQBznDIl0hz}&;!B>eBc1Hz~ZW_u8Qvw@f34& zSF?8rasxVdu&@%mhzll_T#N>>TER3&#^{iOUtJ8IY6S67Z{VX-p+1u|t@R*q*WDUfaoACq zjxhGe_b^pw=acPwcV<`9*oQqfrPtwS)8ZE-S8)j1FI@Fz_u!kp*ZsmZZ{ZYHNU(|I z1&G~+l@^8z%(pe$%N8uS8s4_8A#PXC&b#Yc;@MtimJTMH2@~v)0cDO1DDz}MS(tIZ z^_hp=Dbfp$ER_};L&%7Q#0i?F$3XDS`>t@e%pY{npNJ7jbq^lY7Bz5C)FeCASO=F8Uf{Esw}Uc#4N!$uSI#-Z_^92 z{ygN~T0;@aBpxF*=4g{VhCqB6+Y|wdh%k)D#Ad7xM3^A2m(?(}>qyBTE)*4v=WA;_(EsEGxCU))EfvvjmzB@Cqk zoEEULkS7&WVp1kO=0EujwG4Z9sLhM2Ye$95>9veW*3-I|`?#2;+D+TX#iyuj51QOy zAv6T|-u!*;Jx5>f=1I(jSj!0y6!0v)703B=-N`W5fh zYq%QG1&?ZeGaUlL88;&R;N744xLX_b*$Rw5xWicH7_$h2nZQTz&MR+n#b^R~vV2bl zVext{{tn4I(N9smFE#U5EXpcc$4{P~SO2^hgT^S7IUpa-Ry6AmTtX!F+dKs<(=${e zqNmG!Sy)}#T$%k@++|o7s2Pk*|Ln@w=_)DF%JvxnQ}_1L9mERU>&4pIQIW$?N7jNJFoIUaD989@t^Lb;YzYB*_J0+vN0Y2TY%$WlS&s9Nd=QicLtzw z5|fEwhYqP!>v@{aQw|}7PRb+{33NSB38HWk44$x!08e<5ZCRFVNwziL`QCp#uC?Cvu9?;1t1KJ5GdzQ>0n7sNVq}8x-h~UA z3_)=NRHC8yTva;^Se^sIHGl5{Av^|=l(JkFSzsVR04fM2pe*inuX|mEWUH6Jp)A+i za$GG>akZtB1aa5bj9$m^g#s?)89$Env-#m-d^BDC+zL&Lu^zI(K!1-s@(8ui`dX;; z&1|+2F409gDJNvoF4w7QceY6DWcT@`Xi|hvpwtwuaWHjXCW(u2KwAXv(R6#t=&mPH z-Fr~J;_TGg+FGpz-utmP9#;}WS!i}&!%Qyu1Ax%LFxS!Qf32%q0t()}N)s7s^)NU^ zCciLB30H(P5tC=@f+kbs;}oZ>DEgqz1Zw@_LnwQ*S$bMzeh(SJVk!4Ixp*s?TP66c ze7Q)P6bK@{*K+pxCvLoh-toNG&{lt#1P;(OQR;fx0C{~c++2CIjiR#HrpMAm5$1&} zEH@e`D}x?sLL^n#=-?6~$c`sIkJ5;TF7NEquYdMa^i!|^^J@s5EbU;~T4wd_?Mk8&jZ% zQEczI=bl7=IRg2uT$*Qhfun7tD!$-E=vWYLa3aLF zw>{izujLb_4N@*!s#|7-fMzOsJ=cPYNsgrVFM~f)2`nXG4mSH0C`q_D>x=-MoaqYC z3l6%f;!8B-x1a*r%Y{OTPrvSMWWse;ly!1J%(S4GjbyaIa?$IffYpA2-GCZTMv$h^ z7knFzEBW=KaVJ3cuQ83mX`{0DD_8D_zYpJnZd8jmXf;sZv4vzeR8;pIvQxiy`X*UPCgf92-eO*N*a((Uu>yYhp2ttq>=u{cG= zg{AKK4u?)@GL^Ixr}G*97suZkA==9?y?(dtbQ5e-8-><6t0s0T z*R^pKXstg_U?s*RdJufq_4?|z_`kZxu?S6mM2nLPQv+ieib;z6bUzq@)lgRwkrC4h zEEh9=vJHr&=1&m5+PC=MdQg7vnO2Xd4d?>C@tm>Pnv)zygg_pWrd|*1o+NAw!fR*F zoDoq3xWN7kKz{}Ik5)X`)f=R95m%ES^75!`NooAB0CrjsQtI;X9{h8-!GNv49(r20`85h4Yv~JsMT>{kio%or~+Mv!BpE(FB^;tvA}~GELZy6x^UmBk6XTJP035 zrvGQzf%Ika3+rx_J6`w_VxJOcbj<{cNi_5G)s=Ju0bO;87&Z~c5`v8` zStY_rK6K~rXk}`*kB-x?-TD3W-0?AY)p_b@1-+>OT!;~KnJet8lamFJx!8d^Y4*Am zEknG%aIjCGJ#$7YLTD9i`SIpxniR3i$)Nqm2R={VcKuC)H1(l%#!*rLl=_am z=EM!O$r<8ZZ6``WJB1&f2q^vJpN;0LgRX{y3^uO!gVi?Oy4*;p zFN#n^PRJE*t6V%+a;_9A2A`~wD1xNSz``!c*vHbm`}eC&+yuQ|b_8MYKto$h zmbOvw1Q+ms<9dHx?k}gv;0{CrWO!^Oo)%*BIL~Y>(acP~4(iL=8Y(|{VyZ9lK5d3$ z$A*N2XYbl;+f&=yagPzF5TY+!h}ZYDe!nz=*snq@x^n?bO;S&O6n}@ZX9#t!wl1qN zKs`a>Xc~;8J~x8+aW{TgRJKNYfFN+muCE*be0s0K7_vp1J^5sH{Ma#`)W_A5V*#5= zfQ&GHkb>UdXG<5L1Blt}xNVk~rQwmGNXjH2* zb_L0qu<7C;DLwD_qfyCwPlAZ-edB#Vmb5dUazf+tLUReVnyc>OvDV^9g)U?6@MuU+ z&L)Bam*!qO0&EMTkF4>r{)oPZ6CyaS7gaTJP+#XF%pWrX64#Yl&fP1zuppZSsC z)2T^%;qM374Yp9SPL{1E;Zhrf*2ag82V)Bc5ddBAFp-h80Dx?6ZiP7;K4=5tJtdYYxZn$PjIJLH>g9%N0n}HnM5tr2O%WQ5ukS+2pZ@fxTL)ODPoGXQ`Q9e8$N(Rj zhrFqqUcRokR=T+z3t70m!M{kw$N}pb*%u^1Ac2Ji&=l&ej{d;qffa{O4jlv~4M@v8o()7S5lvKRcULMv+IDFBcEH)CebxVK2i5e-RG|KV;WpF^aAEfLbXJ;6 z?fn9=!JuSkyI=@8;klQ|kPX_D`-$+tva2;KJj<>Xxm)3r0~ul{6r8Es(A;}K)Dom_ z-5~0q_l&oZs4vASJyT6|8>DoSu7UD@@+{t^ab$xQRt#kq$CRJh_oDXf{o!k0Ajt1{ zf0W{VKz%S?UXqrR9BS-#n~51bO@>S)6TA=ueuWLy+1(v_oU^wNpFKw(e()js#XtOG zI*WiT5**-XR^bo=JZzd|W-_U*0sCS@diPfzNU_G&&}MRR?ExV4%H!8d2HX3yP{*_$ zH6a{5$+QJ}D)CttBZT7La!p+cT8>^De3?zhrB-_2f_0!qPQoRcJgZV@rD(}2V>D*- zYoB$@w~a*^d-(lOt?ZMs8DwnBSjQ`!Y!ME^0@=8!@Bo)I?v14)q|YD%G-&mtuoD0n z{0_7M=Q~kdF}<&jnMSAl+89O^Qu!RkuP?R;Yaz@fV5ezB5)1b~^zj#F2rqFA5D86) zrg%x5oIkcBkj8=$gd2?a0Khm7m_Qjg%8vLfVVfGb70i~-RqGI;ixtK2mC6d{W0x_& z3Iu3h&;tYrkh8!I8?@@qJMXMv^l%VBf6)7C*vgZZwutLHIB}wF`Jm7->hk5M8ortH}&sISyBwB|N0 zaN6eHtPGweev#?Qn{TZ{QMMrA=GBXfb_)-BBK{o1+n^x#v^(3$OBer(f(jjFg~ zaA8Fxfn#~d>aLB%h)Gt;55o`14%8?fX+n{6ARIxyjvNzw=*nd}bFfQWTVpw2iU9Gi zB@N7web05zrJsA~lcG_m9~G!MlqkAuhN(FB;(B&GqDUSu=^7RfkA!TDiuyV+ezo>= z!M46$?a}dOfHn=Jl$gpAW>OBP4UeQW&RpMOzd@nGxs}$MJ#~X~pAfZcl?-KdfyI!j zQO#D`_Mh(q<@}*w1wXWm1hJ6b825|<3ihCo=%^YV5Qw!4pLV@pE%z5K{zmF)Q7>eJ z+uJ~IV>)r-SaoH#Xh)+u%=k82pRP$pxM|jc@qJ;yTG#=8LF2u>X5;vAfF}Vi8! z55IZK^At7sOxc~wkUJK}N=edD0NB^UoW>n?<-|uI3MJ|Y9jg&6)0@Fid3zSP zCdQ0^*!aD4c%1Hj(d)!*#DbeJar;_VX3-?Zt|_y?5W=-R!wBz#4}6(^?swluzxMG@ z(Uz@=qrt7Joj5_!XibM0U@3v`3oJG`fG&6KZZG-(BP)CvmY+!a zg}OTIhCSk16#c(yikO@B9fcw$vP`G}*|HXW0=*fEqkKm)Q(f74wzQ8l@Y{4Vm946ppI-?V{3bPRvk(+}vBE|MlhHPbd3h-64tlDaA!y zU&Qg$=sDL9uI@8z_p{S9OzTGoU|r zf8FS;7?)TWsB}i%NL5xP!tuaQoqbC772$$qn<+P|alz-WTSvJLd@qJ8-fOf;kzBJ_ zAj9H}hH^jr{3nCEVnhv{Cu11(t;RTicw}ck_o1z(!`btG=y<~Y&0@WV8R840Ti%uaSytE zVYsy=ObiqwK%+CCvoZgDDUODNYInD(IIu7G_L`N(feQ$m00C4+gt9*XMx_iEz>|uo z+#nTY&N4xlIJY@S#@=(!J;7UJy31RNA~-QRUGgFZ*vSIxEE19tv>P^U%>M=nntxDy zaJIrCVPz^X(dF=Av9Z(W(NU|rBUT=+DqyT3z(X2<;6S(ge4@tVFl>%j%Rc`R_X%=i z9B7Rkc}VLIq)lH8&;i7dN2E5^Q7>AQT1Ki{&Ri@sd?&M9ls+G_Lj!)H8MaK1F?lQ{ zDr-MrDPMCvw`jp)SKqKfsDqQp6g*7o%J_a-Q(Vay#0AZA`V5*mSp3HyJ|8=;e|AZ(s3!bnDu&l=ND<>)R}{>$}Xx4{q&jh1LDWp;a0W{Knp{ z8f$O@tEC7e_^@6GM^Sr;Tss_7+-p<)bUN|;*yQ2=qc`17f9{%FqEJD!~=UK36`0-zgPfTLRhP2VJcj~JwCqcIXeuJG>#84S$<*75JM6#A_j=# zMjH*VN3eY)Qc+yNMpLME@HCBj7Z^yzx4h*ovMq1{-Nh}9Ux@|_KC=$Z@&XmETslFx zNapsEZxGLAOFCb?49@>X{Lfk4Z1e~Rm=Yki;O{MK8gNh@#I^A?K?>jwNM;bcKbegA zgpNgf41dFjV#Y!LUyd-wSSmgAi&~LxR>}qnIejH+k5xm1 z$<0V-PY*+dRCStn9##@Q$ZRe#md5m_4CPvSl9BF|ED#=58N}BK1$Il9rEsrSYfn=( z%Cjx_nB#MQ_qng2JGZV)?xiMQ8q?x)^fyll4kR_+b?=|h@AHHwh|ka+!L8j`)2a=W zup!(Xpp z3D-zGoEnU*v3i@vH&FZyVMPDOEB+h$2e-VEUcPy)Jbw7}i|7Nd{vrB_(=QQ$)l@-~ z_K-TLG)pYxeb2Zxf9CI$^dRs7FY}BYtQ<~>{{^ayRv8jiB}QVi&Q~pvr^oob;wb%M zkp(V8FQuF8-iX)AM+pz<(xbj4MEu_BSyM6fv?PH;{XqsJLy<)tiI+AUT1Q9xbKw81 zlQuUyh-J4pEC5m$IT6C&Z5a^;_Zq+Sr7y|;flUJ7fPxDzg+tB(E-*faEy7ZA0exAG z0mc|Rf~lnebmSL{FNY#~l70Zj|0L3t}hN0Mi0mj z8i0_!$Hha5%*nyYn)c7pKJCj%^AfnVwW(|isuO&QaiYj6FnAwrFo6saFkKuhTTX!Z zMH93p8i00jn+B|RWPlfGFkuWOMQEG7E32fhsGBu%Ag^^i}8>3V-fmCV#hk&AYV;q4SBmdpFi2`ui_@VTvAXJW=`Spe*7-5SeAgJ^S_-xKF<;Ox-|@Y4^LSGdKUK#N2l}y_Z>Lv` zk4didW%y~pY$}?F-L8ZRK)xW5_EQFJqDP+Yd3GC^nQ+W z<zphSvJM=3P3e(10DB+MlJf&0+ioTa+pIkLgB?ts0rN`#9g zWW@LIcyuzLtaabdO3+@xV1J+p0>;hc@O!Wki2vblZGaTx3}i2L}tRGvMi-GMAI2H3*Gf+>GUxTW(1` zLC_$DQ`)V!z+?p3N&&DeYXa2)s3$4_Eo}3))sFPI2>7iH^!#1!xBH8Ibdtqk1jH=Z zSi&O}mOJlC#Eh0MI*zI7motN)Gf{1+lys^^<=MTp70GymV&#mvFA%bf-H^Rjne#Sh zC&&^h7Tm_n{&Y2qKJhn>D(pGO6-&hNEQ`2Q+4VjAIf?80cW(VQshO?J(6*^<zWD%pq0CA!j*?src^>ou{Q_!y%zcPuX?jn8P z$(u+5VolpQg?y_X1~DZtF@j5C?nCh}w?x)XQD^~t~NRUiosbZ<{=hh1MNrTnFv zUM%He#`}?*QcK-(BXeYdf&Bi>M?XfFk*wU%B!-9-)KwB3rPAIOyQyHUOwQ!}HKtX8 z2q~?X<7&lm7DhB3X+XQ@RtzAF2|CL4Exy=TEYlHfGN5?yIk;`S1u6+uMwm(0t@!U{ zTPG6J!?T}=gOZFoG0XEYK8@hq$ zXBuh>ljT7>=nLADm>@F83r=1FjCiNG#bPbzmn7bI8CqI;wX121Oz;H;IaSoAO}PJY z??NoK%mo1XK~x35k1!geKNvsx%sfuv9$SYw55);Mvz{OdOpai&tnvV>?q?y=;iYtm z)0@Zu`)h}!Fn%al_V+=A1_Feo#sRYNldKoWl5l_hpm&Y_g3!PkE?PB>hyh~en+A7( z$DAb^nfk<3U^t)B3K`^mepmu0g8b}OUV9q!(nM%wKhhLQ%YSNlKM9*AB6QB6>0jhr zg97R4s>-iYH=05=eqM*^JV0xLlSL71II;muH=PrD^~Tp<_TYNXO=Sa_E?n_1Q8s?~ zM-7PG{5&DNP0(L$jms4nCBXvgxd8!FsJ;BFKlu|eepQM3Jf>%RlbqSr{m~DpjP$ut z^DlRk23oEbyzIi)xA@heq0H;mo{+$Fa3gyyc#LQZ0{OGV@C%Z<`cRbj!IuMT82KzZX;HgIp45Zl1^N>$9Ua7m> zMiEC1q7MOlmu$;4dNZ* z@E*!*@4D+Q$Y@3H4-8|7_#r}Zo(1;hsOCsS$pcKk^{g&1mQobK(VzdVy*afC#M9Cs zK_mN%*N;8+nAG*TFYm4IkoJc4Mux|vagaP|ujR}y;snidP>n@f3~>Y#KoB8R7{Zwt zKfrFB{yxtjeeG1Gh1!e*xQP!|J zU3GzH<^}^jz2|{1agd%3zy=TH@kkRKb-ZwLQbn= z+59-DKvYzq?wFBmnvDGCeWK{k^k-nH5bT1rBL=~8Mnha@?5bvG{VJkTlzh@9CH@0}CQVKL0U{_>Ep6kN{~ce1?RGtkX{|CphOD<$;9c*49us ziV~+EVOzssz01@Nia?-JVUPsDJrD2#8-Sibun8Mh4dPtD;kGUIK>&$POLa!OL;03`>3d`0*ATK#unTx(1H{ z;s7P)VUj<*o&-T zZDJ}lF3Kw1;@*hNtRwqSSsfr1QUrRX%pi^l-Xh6U&9 zl0w_G-HzmyoU7t)^1*TURrIxBc>zP=uS29zJ2yQ{MK?HsvoL}SGaM1 zO+^usL31jMyGCl)JX$ge%L4;`GmVwB6@ zKfFuHUF)nCJ6}n36Y8QYc@GFs2+@6d_m{p*kDNazh8u3XBiJW6#PTbD`YD>?ix5~1 zn(~36xOweZa)JFf6#2QPVN1I}fL85sRA#;0uX4Y;$8hvD^F`IeTTQ0fc$3(3o5L@f z*i}lFD~)H@x0o`FyBb|BhNu(oDvhAWR&}XyQ^-b?HKFoxe(xZRlwD(81OY- z*brUI36Lpo7vh}5z;HIZ=EB%a$xe{b#e7Ii3ZOHkT8Dg6V_FevBxHrL{0@H_^=n^7rCqLVY5#*#LCr zqzdub;xs~#>=a0r{Xs9HGaToBA$4U9UZTGiKOe5L7intTW^PWo}>rKai5o*Ch*8SzIEc+NtB|Z)y#mr@?gI2T9M(~Bvy`x*yheH{ldI*QN43SI z?&3yuEWBLte+xCSG5V zQYJNSP94HT*@OHtk~CG743!wkp!a2E$}yECPJ$B6gT;!YZ9XMMl8w~Q)1?yH3*wNo zrmd_ECXWx{{F`{N><1Lr`F>s&H3+mYZY<6qc)20$M92Xyq#rV)K7_D%LnC-hYkX{b zW0A=}xHMs}aZN5Uj34e}kiM-NOn!jh6P7iOpI<}kGdit~Jc#B#Il%ht zil*1WC=pdEZ>yrC!YT!+^Squy1~RB!>RtzU5=S6Sb_faDjDMSqsghqkwxfmOe$_QA1sz_k@tcA@a!6ZaDTlL zJxbaJ>6r5X%IYxD+zuZpsfS3LZ;|9y1kV_@ zX7F0KsPa3tRgRR1pe_1Z=x>B0a8$k`$>8M8+P3`rg^`0C6eHhnKY4vZ0lpm%$T#+k z*x!TOmo(d32o{v~hgM#vn|pN~n+!5K?4n0IRmCx9!@v4^bsbrNdcZ?uV_kuieOyHs zP?Jm$U_j;?E<7Jc>pVrCaK7*K^A!DA7Cd?gKoq8zN#g(f^njAId~r;^@8v#)m4o-m zAib9k+_-=-=KdnBmP&fU0+VHyz|wz=9%JV^q@;EHX^{+-4C3?-lIZ#Ooe) zW9E3COr+gJIvi_}DY95={k7n=`$OIal99M~fCA_98QZ&|WP*oqX?bp{X7hHu20@BZ z*a!!LT#*F9Hndl_Qdt0sU=QFqvYRU&BPeuer)$#qskp+m0r47&RG{M_FHso3a@aiE zdspoX?8vVwYk;v>0wmx^-}9dLNG8`e4hxOuB`|{b-+zA#QX_nMpg&lAC_li;!`kCu zQTGQF1oVf`_eel~91lm;gp(k{;eqmrCJ+l9ai)pUN`o0_Q@T*WvLO~R7cIbf7_W`2 zVS03fC(o0Ks6xx^2l|V>NESnScUZNC_X758uZ~;J%#p@|w2yB}uBCw-+ycceE6@jJ zV|R~tox_%D>-AuxGv93HM#p&g3P$Q0f)XvQX1K)E@^)|InAb*sK&7d|9;gd!WmtTN zed?JfL~crw9=)34s#{td=PD?3md=WIn9&kl-Egih-RI%ylYx}_g|2~*D+dyvO%Rv?}B z2^T~XAPYV)b%CS1zW4);Ui9yNg6^Sd(ty$e^U5eLYLJRJsBX|upsDZ{$T*{&BGn$t z8^Ld13{IufXb7??dOM`;5v{n9-R*P?5v>@-*v+ac+-T|g!AOmksgX2A><@15(jI?$ z<|!dMi}4GgyDeYZd=qzR23^Bd8pze{gdz!3B0i$S1|_bXhz`mOwk_;05DP*eY`|d* zf&3txAi&8w+m-*g2Gy{MAQk>$otA-h*o{Iw6Uy>kvI+1EQP6n zdqt@*(kobZrH_6e2W?_s%x3A3c6aA-X9pa>A!&=uu?QkaA;b7&7^6cRCqH)icl{oR z_Xk@5ZxEmeNmZx9cs(#)!<&5ND_>b5#DD1&2znEZZNdz7>w3F7`dW(H)4s%jdi z5J(wo1{kx6H$%4*SHTFP8G0x4DOHe;FNzO|2*peGSUgt|5I8R7W zeK&m_LYHf)Q*UaXB%@qc(7E5Zf}u%0LlmWz!K2d9Wy28;xtVbVX|AH9Xix<~|L1KS zQ`smZJbRb69P`qC9uHi;piLp_93PVyB4TG7*V0ct=jHSdZhpDE2CW9~ukPpS5>}2N z^LQ6Xw&TO1iGIEc6;i6WS__ zcyx5C?=;qeq1J4$?3OYmVy7&wWLreL?`BpH3_LO%j$}P=jx>>d&_V{$_FRj>8$V$m zA&iRq_{JM=tl$D8sR^bCP$1l3wj;7Gyh-#PLWm7H1~5*Xc83Kv2nf(YnI&sG?S0GZ zRbI10F0j5#vRH`+h?5MWAt0s&9HY}jad3!Hv{N;(9LH#R2CCH% zMu{cj0!8nZ%{X9bGFS<@k$4_F%0loc3T9%s-DJEyQnyluj}Js`bVL~{L^5R*Ei)x2f9J#unBs5&Wj$q4_~=R zQC#0j%Cg)r-_RSrf)nkh*2fey(C|1^~hs5=LPJc{)`IeWZ3Yc#BpQ691l>mPJ{8?$t9xV$S zzsbojC!WyRmyoVqx-LHH@p6iBREGkEWLsUimjZGYr5pySOq>6(o(pjKMEhBPDj8Ab z_{rGRc)CR#^aPt`pvb*R46yDA`g3E4_+QXPV(1`43oL0b5M822!K9DZui z<|Bk{evFL@b3D*=hj*G$;o3S)rqg&mBbl%z-IEG6hp>IMS=8mB3W7#7N+w9LrHv}N6h606?B37IEI zDKX;75J!Y!_)J2J3U|h^pxyZT6|LtCTJM=GWlKl;kt>f-eD2;Hwzz%% z9hHoln{vuL$z7>@)IyY1Le2AGRr_F|IA7Agx&3?SHOH^Fp1YN}k024>Jldpxd&l?E zMjOc09DE-_paSoOBT3_p`L4exu|F?kljiO& z{vhW?n>YROV_zrf&eBuvpl&yGuK{)UgI1n%9JC9)a=cb+!AD}JszjVetS=FvL%vZx zZWTh6&ZK)F{u8Y!K!?I8xoiNmcsZ^vA{rn z^rIgYx*fbuSB3tWpZOUvejfiTzvF1o565Xj{`paQfbj^6nUrDhBiNv~qr*-hBf~zr zaCJOojix3pYl8!V2r3R1WiLR4P=SE|4+Df50USX8y?s-HiKYat7h)jkbr8;RQDjEK zMc~)C7@Q3z^!gAXN2^urds9=wOs2-rS?`E-;G&CrVFOdjkoX}|<(}xMauQdoKVs7K z6xnehv1UWLau<@fP%JzS?GFr@qgD~1a0gf6-y!f`Y;x5=6ow(+WHA{49C4P6Qh9q+ zIzZxHI=8VAeCA-+TwnV>PY!Q7c_W?XSk6%>3x@Ef(FXl_MutIZX8psEJ^Iq!h=l?3 zNhEe{UvVg%?<50s)OiS9bk$i840hhPpL*W6)2-{rQ<7*IJ?_`l5yamgfAWcxSV>Kr zR!(>-BrFVDx&P&al&)%|l+Xz_VT?gSZZ-bw<3`4zQm|xvsSB)$5~<#ZerQJBvbZv7 zGAkADI+D(@#Jum(cN9pF?}1@Y>VVUF3?kBN+(YQGBQCLsYNGtKANIU2@O+*OHRAJN zYG4^c5oT)lj@9;qNt>bLqzm7b zf%QGnj&=+B(z!GA2#-fmyy+c|{{`RwLk2PLm!6+=Ae1uu!7Dm4QXWgsFO|11v2GycdoGH= zAu}0ZurY6Z;~N8#u0Ve-#KH!!y}RgJ?&okd=66*d;L5c;WJRsE&g+4Nd*cg?pK}0R z5EX7Ob{r{f91I?(PMu1mVx+ze5lR;L;DC)Egi-kv+*1aUxQm^21B zmrSq+VqFM9T4G|F>g&vf*o7NGznGfo(isi`&|oD+#qo+Oq3XIekgO+28S_iYj>-}o zF@_`0BvBFI_5tlyfKfm!B$-+bV>}D^%lmo6>$s9gk$+o~7#BnWysae^Q``^&1;PLz z8?3xH+fhy$w9?DgdRfE*=6A&y5^`Gkz13?`qVRN0 zI$;h)fP(%DkqsRdQIcd1^#mw%ENq%wgL3~Y`B4z1t12tWbS4}rv$K{CcJizY4wV(A zkQAb_CK6zf`v{Me5J})~o{A7=k`W#eC~ErY2s0ROmyd-Ln)?R_Buel6ul4}nkYfWA z1jrLU~LTpd!U^ zt8htnwHRCa2J~aUn#URS7QMJ=7vwy^T1t0&fY_)5 z7B?8*k(sYmBPLWB%knOP(4uALDno>3_(X^;#*~>WU1(BrsTH>;0MK!ftUO7+!JbAq zA%Sp1SfLD?f9p#oPP-Y&77xyQaDgSqPOxu1k^ukMHh~@ho&p>UIf7 zPRY`yVQ9!$5TL~b;Vw)6T@f9KSKUV+T3%~?_2W5g)XL?kGZcz%VSjG!uhF|-{eyHf zBUDX3X}7zn^*JsTq=5uK`i*Ze`rB6SpJ)JPRqJrXesuTm>R0WMk&OBI6b+P2A6nrn zCgPy|TX*7B`hKcZB2kT@SdjT0&S0B8=mB;xtV!$#MV+qYfr)~{F>?Q-&j;>zMx@ch zM-Cu(|5|7SHqAte4gx27Ppq$_+_lALki*jWJWwHrO@_Fi7VY%%8da!pIADWV&m!Xd zm4>@ouLfZ-BzwR(w z;>zU^4W^X8N*A%q4J4DEk-uFI3n&mf=m-!C{C2=v5TUWay1N!2)FVs|M?M1z^zW_H z0f7di-QW-e9PX>$MK_7=u(-!ub({@(lW zS1F(b(8M2BPxs+#pZDP?;}<)h7w@+*g+^|SLmxYuv9&IO?h3c5KHbrvQeY$=7*!Y{ zmu}|$ig88#ne2Rr9AotT(FBO#AVGi{BUk2xucL9m1w@IJXFJf!E4aY$zJUHVH&w3A z5#TtiMbrd?27?SRX{7%G3xp}-pB4Pth~6t zb`bKuLt^`#2<@=Zcoe3>2Lzi4ousy^kE7ZX+~4x|^Uqr!aOfK^d?3# zuiLziKK%M0X5+UhhG1dYUSxUqOgC_EY5k2Y3;z3GevqypV-7N#5vXJFJ2|P7fA3Ic zxU)|y<}zKwpp%?TFi3**I>xgkE^Bp&j!8+%6|-pK`B@l7Uu$RyD>7oRz|b{#rl90HNdz;|JiOyxe(&R_D$RD#J2omqS+!^M>+k zFKQQ`g~34++4m)?3mA~%E{qVwvtbo!sg+vrH* z7hJ#+G9LOi5FjT(I`07i0{ua^3k%#|WP+jV#Rm)0v|?{PNT~t=kvv~Ki7ONfVEDEke(?_&I`OZtgg4IqvBbnjzN(0$){g1+~K&!f}F zHT(9Jr_a(SAAgGGsGJy%yUohk2%Meli+k*Pfzr&!ZX^&&U;s}H*XYLa20as%6y2I3 z^H5?a1E55mtZ?4p?sI3nuEr43+jg$-2SiRopWc4kx6@DD`f~XVhzUXIM2-F;A>X~^ z`YQVS`lUr0}{^TXJJdUsW8Vy@sYx}b-S*WfDV7PUbbu;Wo>oG$DODO%2#FCUc*1>F7SN#;v&Xh}G316DDJgI5Dbg9B@nkd1_ zPB6>K14(<21ivTjCJN#PKNTB2?`@{ptlnBgA=!gSM^)+;Ynl<25;3@TeADghPw96b z_^NW_uui|$&s^@_5unC|7&&gIYLTQDh&ZA_i<-|uKh*TvYi^|fa`ACRa|!mEA?RAO zL;Lyc?^8A=_DI`JounH2%Qw7;-u{AD({tDmyTsQrHU-bGZ1Xvjj5v}XXE^Tp>!10Y z9sf|PKdSJoh{5;CjSF=WHQ88)L!VJb^8DSKcwj3`S9i6?D5$amW%ojQbuX%;p!+0o zze=e}Nz+jh9Z^t}Wj2EQ!yZyZ10(uyEzXF0?J zEKA>fDJ*FUB6{o(3j&gWrN{(>t&M=CYxx7hR@x0p4iv9}0AU232P8rWdn7!eNu}v- zWR8RfI3aO)IRs#1N|PZd!d~YY0?3bVU6sN@c50FOoVuDV#x?F1m-!Ylw3q$J@7GoG zy#&QbKUO23R$d=W5-)VQBBc{ZRxKIG*gBmdtPFax8>>AEu+a;{W^!kvHJtX*x#~{E zXot{sJ9KYbsM!m(G`|8y9c8JQ+2TqQ_|@o#Oh8Ggqt-$tLg>#xwi zy5kMPNnEt8^fj5Z8SM$@vC(YzZlk?IVEnF359rrE`5C$dn7*d+UsC(KvLD%;9dRAf zJrb^Z9OdUx^(f_WlT=LP(Grbe;Im`-o+`xX-$vxNdqKyc>jUZ#YL%vB_2x#GQIFlo z``x{)B?gGGt{#)e|Ma11NV+c~RfvdbJI^ZqJSMZF|G;jc6?O_Dj zaMlQd!Uc}f6p7v7(KXfH&ay%bFz(|bpc`Djh8z|LSlOjMBPUoy8cD?VykT?IPMg|d zbUfKr^?bhISp|Rh%0~5LW)6E&km*Hcs*5B>lPT zo=2}cd4sH5_VHMnqKhOvnq{tjX|r6u$3FklXYQlVapDK9KFO4?OZl&>9>P_Q%l7`z z`=wEg2h+s${PFNSdPRMl(CrP$B#5Bmgw&>94I$HhPwMDFloq8J#KJ1ShbttZdNQ#C zDHTQ~hRTc9hb}i@bnvEfS*SFpA{p@=;00n$cU~s}EMaGxkT#CRsJ{*X3 z3kXa?1)y3(A#^^Qwl5vHratq`GS~I>~R%8GKAzw7>*#VguS> zU-1B_@xlolBs@nLL>P0t2Vez$F+MZxfs}6m8Z43^-oY}Rd^dphoZj!yVB84$i7Gd8 zcOf^;mR5eyYk}DSiW&?XKNvQVvwr&Nr^(&^pGc5HEoMk$_2AuK~|Yvw0ZxMt%@DME)oB zS&#t(^yieApe02irkjwmtLju3i<@Y!L=a&@a|xN~Sx!WTE-z5s3y;IV0829>YuWfh z@B|t)RH4zNK@1);eKw>NC>F-!@H*zE$z7pIj@a{zt-c?ft7C!kM4v%TFt7i>#dGxH z6W5B-z+>3*jTl;Sf1L|>isOLaapE+6>fn+Phy#_4(ZivArW7O0f(~kUBW*IG{J-4v zVtW0F8+p59I@uqw@g1@O9Hyg_b;EdJJX^ zB%UDzdYp3+c-7D05?jJV6CvhByG$05%iLLf(N3c8QxHxpB=FmG|AT#j*dIJ8er`=! zi5j#C9r`W@DMHv(E^gGsBwh{~ovl$d-=!&UXT(7F%9S~zl+bbvFkZI~?Y~Kj;s@Lh z06;hf948|_iRHua;WO9|WT2fz0)tnoK%wLoq6kG8&MVfA%w5=icm6&~3?ZzpRBqUI zM4nv|zwFe6okaUfSZj2JgMng$nCkjq{7e!b+(3Dcjbhwxn(E;E9=pmT+TUwM41rAm ze?Wl05d)XTVt`lpWI!HYHOc_J5o>6H0QqDNcu?@Qs^)t$No^r>6$>MT@*WI=+SGxy z_`4REAIK>za(jic(=VQ-*FvktuyOU>XxTXMrs7iOl-3Pqt1+5V@mJ7FR_btrtnBy2 zAc!bJoT&@W11-cVFwRU|HT^`x+=GC&+FybFW2DucpsE z{S5t|p8p~?9(@|2T_zhqpue8zLx}6dgQ%vTdhu)NfB5w8i_T)KV+w~IqL2zw} zNs*1(709(8v5lEzu&TOeS5!Bqloo5vAg-?S1mz3C5j4X{SNOGLpSDJj=wCC-Y2lT{ zjUu`>t{q?1%T;()W+Zkz=OnZOC=#3p+NGrr%~*sD8# zaH-ug{ZF*fFnv(a;Dii~JOOxrs2uZs0H+u^1QzxEc)X4~jDGz4u1F&98#L1qijNCw9dy3OMx2aqk%6e&$Zwjc|In8ZYCir2z2sDecZUIQ!%5HF8Q z#|k4D3*aQpj$~~cH}+A?Z*zaXq5waZEVoC3~?M?=eQ4ky4)%{lEb^A+> z=PgU}vbMnV$`-F~k;g*+-jOO7YmwP3B;oPz{^*n0_(4kF6F+{g(s|6+FIhjL;yn7g zAswN|^ZcBr@7jAjKy_360QD)x*ohZgH3(@K026L5mnkAya_lQtpq%jg`Fff9?PY4=;3+RYUpf^Cm=Wu_$GaPIYRH5N{l_83-DPua2xu+0w3D96h?xQV@om^UGSTomT zoWOth;@9w

@H*}=b$cS#;Gzv|0@k*P=+Arno;Wu{at`fyP4C}OT94`c$TDskm~YrHJZ zMN`#Pu01WLwvQ+2X1UmxD1<6PBY{!FtHL^Z|LFP9SxB;^?O$aKHq z;h~R@>^EsGu#Wq&7(Ns|IF}J#Aj(>i6YxGkUJ8f!IgB6>pf^!Ns11}mJOIADBOI2p zXL%`ywK}$si~-sQc3KZF9w0DHKo~*z?9r83VFYm!Kvslh$97zf%F!QA3}CJ^zP%g{ z3K7`JadVBV2dX5JAmf7xwWD-`qsHAZw~3tv~jWhF#bxR)WFL-K9QyWSif zf8X5Oh~pWWf+__iBHl7k{kM(2o zKgYB2n{Im{_1hi|-~u;w>Z>8~8|yRt-HZZ%{FXcD-#_(`wyvzI!U}YM%dn1~6gGf2 z^6Um9i+6!82ki3pT5sc|ThInh`gvmn?UJXc8S5tX_}H7z=)(_ul|K2{liK4LsE;$g zGHE8`mr-!ZQOwvbmRGQIjuW?xitWVmy4(AXsMz?8Ic)F(p5kMgtke)zMtwozBN|Pm z78XKf!W0f+#DrUg?CJw0GAP(blt*G)%BSk9=R~7_CXg0yL!Ry0Y zgTLo=7n~q3jNo`+Wh@afdZ59Wm`V~ucC#v5-0LKJ@TJ@?#$VvaP{ zJ(p3yzECDYj#7i^l#=*sucLFA2_y$942+=r<1l_8D|)=|(xpqSJ&Vc%#{}hX5FWje zvKdQRCiMkq`_Y(B&V-F$gkTyY!0B`%v!R{SG}DL}0%Uo3KqH9)5rp2ju3TCxtJ!KP zoXLKBe}SNdKsF$(fL!7)rt+fomQ~7Z)b^RoW>S`<$SzVQq?YszqQY&mr`mhK>bOUl zoosx_-@YRpC(qh)dblta*=XoR%Ksg{ITPk9)+s*eSU=xWeXsmASp$g^MrBY)dEngH z+8A^oF=9;Tmv-yhN^pL&M3xx zXE$_kVknG#NbAV!c~;B0gO0g<%5JkQwa{4_89{Y{*gS5Ue$5b}m%+Kfhz=dq`V0PA zp1tr_w^Ld8Muk%w34xjm?EO9Dhj5!9l!WczUV_lb;$SK3pb}(e9wUsJ-jldNX9=t* z2^wXsQz=roc=3rAOpmPmULh%(O5u?41u#LF42cjJKiCp@lL)Qddh4yiG{J)0f{P(A z@{{ub&lEcZTjhq&&#m8^I0@g32Ge=JTzrGpd?dW}t#1`0=qM1p98`m_K@KmET=L+|>=6iuR0VI<(*E-geQE{-tP z6}9MuA~!AGYg-G@x5{#8qflwE5fGy_|lGn9lQRzLOQ zA<9!mNbiNTj!=rW_tN)%w0<7FqIZ&QunI09DTlV5pu$)-RQ3;47G!oSr?iNdtJzZR z1FZGfcwKqgSo?)=990`ARk}@i?fsw~HR3ztYI*j%U-RvMmHiC3B}ga=4F)yypupfg zMuKQZftfy{!m4WOX1FonOEzhSsu(TnY3OXs#&oTP`^#fm5aoQn+rSG3ueYvy?E$a1 zDGiXOEp$L(02x(^QMEQ1FuDy4AOsQcK7f=9rGjP$HyCliG7(~ViCA2q?!_wKcoqam zlw*B|Mut&fg3Do*l_2oRQLGGkd~k;DxZ{pP-^YRZf#QK$K*R$O1H?0fKRVz*>2Nrx zCYU*E2r3X0M*rACBBFDWtK~C7DSIOx(R> zS%l~;vttvCR*ypgJE*(Gq9AeeLC22%%a#%&6I1E5~dTcrgl6$Vrh* zzIQLhFD=G>UCgQ09WEeYI2w)9`#^zxYn;B|^vAx48l+gDEkhGT)jHsz_3-v8)@q}Q zPf8G{Bm!GgkGNf9?H{F6D05Xxw=hUI2bOJ!mZ2S z2XP{eRMxDkR4KAJi_im932x~{Knp&Bb5o~?vj={*8OiNs1}Q9z-; zm^|0cY)W5z;wdqD|Kj&PLjU2TpP^4Yd4^`=q4os!3Kuqh$n*w7Rry>+@kP9vMd+{QUV?FB$KMX!`#088|^~vE@r}g{=xC)dJ%n(GAY} z0gECGzm}?r7}u&b40T>-G)65jkeOA+@x-Csrn1t6Nb&Ig4lrx+>^0k)M~(s3y*R8y z!B)6{GHPX3!;Izqf;*{j{=Eh0JHZ>7$5cur{Jy49;nP+LfI@*m0)&bI6_g5#&tUB9 zO683FruTbGg4P8kK@6?R2+B=*HJi*iqE=PV2bt)H*CH} zFk2L3LOLly;tN(ljIysN@bYwze(%c<(ht1sWmGk)E9eF`p-sMI!r$Xh@8HbthhP7f z=r4ZiztR&NzXK7wjU^H!r4_+VW&?YHUG1Ow;Ctzg6Q}59*PYhN8D4RhW5B!Y-af$y z;Uc@sQ)J0S=%FVu$}rv#7gwaLQ1=K|x99FIQKGH{L(vYpin&BtA@=tnZQD@T?vMR; zkvif!dhAc#Uqy#x*C{1{NI0_UI`?|P7Z3pWU+klxORHc?T7ZbV_xXc8PKIo$AOi9= zEhO=w2S}qGzE#&Et%1v?O_4TGL(ltla4?ZL9OD1r0D37Lb`ha6xVjcTlbheF%H(r+ znMineQzXwJASZ#wNUl|YgDW$^L>XasudT10)FC?MaEIWAyTOpd0s=%91_li-FjjDg z$_G~42@6PTgB*=S2zC@n5YGbRf$9;|1zuS!>h*QF(~P#3gIW;a!G3_cY-9k9Qn(l= z3j6zQg&JVQ0$V7;pv;Y5*R9gzTPu;PYs3oixyB4N_E+or9BBFQ$3O9|rayiGdMSCV z$xm9aUJFvrX6UH3hBi_Ito>O<00AE(j;Q05vy*twO6M?mqLt0H%9G>!Vi}s{GL^@n zG_Gm%^)D|Tp-0+1y(@8pAKRdOn^6bJtzMwjzsoC~Zt`zw$-g9xn`R4YcR5C}y-WY_ zyI)7oKY5DQIR3X$4>&HUvA}hH4FdD1Vw?c7w2+u9+Fs1)e|qp^^jl{hQKMAZY~Ty5 zA|r|jw1jH;$y{B>woRr*%k`9;EpqiP--S9=7`vV}a~H$thA&z9@*EV$Rh~^-Zv~uo z&P9&>6@Qi6Up<3}{oy!*qQAEdUZ^oYi~adS;&_PvNxZKIBSC8Wc)eb&Rq0ib&#=1| zR*{&XAj6)P#396;;)B}HBzO!E`y(OnmW0D9r*kp++V_3e>;5*ve~9CuIt@&&}g$HO#-de;haSQ(5Br!n>9-x!~ zalm%pGqNc@X9K&nEE=+Ab?Ui5E?-32!7J5S3i@+5xy&YZ|J6`K&_B3H(Ae8G&fcE&7x9`~p`>tJ9d*3F^zt{-FWvqP0Ln9L+mc27$f_S`ZbixHz zF@&`kM|iH{MB95yd>{KaonCBQ0NDjn5FRt}WC2VteqI6xN(?H?VEnu>lJ^q#)*MF7 zb7LpZF6YOOwu}jetF^`SG_n6(Dk_}H;=Gp-O11YAbe2#g{q!XT@J*ed8koLZMUU~C`85B0$N zJo8}t3(ZK${&VsJ8DLyaz9>CO@muV#GscBxm8SHphv}3g=w^{l`CT^71M!stuPiffhz-uf5H1D%zU8JD z)2F}pudpHfZhG1HxEewgR#aD5+*vke=%B;K4MGJ{wSfoJY&O=lyACQ0*ceCNpC}EC z)bPbBB%B-%9fSQH3r^&rGa8TlyMwr62`a;p=Tg?=YvwUkBtLGeHf24Gne_V_|Fvu9 z$gPeZico5nO?$yzS#^!0B+qK)`6Yo=?Qhdsb1xk}(l>;>7TD=BX?Q{wjuaSljf2L` z{WZV@;_Lm`Plwp&IQ+tT1FI?w4h=kAfR)QB1Ay3dCz+!1~dPScNncy3WxgNs!$(BnN7ndhR+a#j6nrC zZB7j%nZY)YgR2OsPGRSULW0ID7{-Y2iRBzHzAu;`lK9dE&d0Ue z19k+AE+ERLtp}33M=#^R=nxS?lc2bu8BJ?9Q}oQG1+V;1?Wnvl%Qd<=;;UX`qGx|E1a&!qwAcuKo!z^4 z-*-R#g;(C0;(u-3O4b&Mie-)G0WFZw;9E?R8gS|OH4Nd8@Z(Fnm*}3S9-@z3K0^=e zUZgZTKu{sNG?$IP5>1E0#{1chxrD}DW8ZP~DI7BX1-?!YI;P*x^Jacet|hM7)SBJ% z8gJrjSz8US7$kFf{VP5+^nNhKmO3Xkl(rJoeUtj$Omen;^02P#lW|(}*wT1*aQt7HF2F$8~aRZ!4V%3`n@GO_c8M5&;ADdc2?WR~U?DIG zClDMdc~9v9NP_gN^`%~DozYP9r~|Nx2fO=cha1OU?gyUEmSv25%wuuQHJxSKq*AXl zw+&cGrG_TEIyReIR#|>S45%{flhQP#jT*+ZZa8nNH|hDyHF^}WKzs>^;+O_}%bT~e z1nRhShi>#xmRkx*b`6Fh$pr`cgIUK)`<#?ItvuctA=BO zeaY$$`E{R-U*9T7@Oa6_3A+2m-zCSp!-(;LoePX27xegKm*a+0+1|&loS{!&Ij0jt z2ptQi#)tg+b`rJWsFPH>xuHBy@zDC^_Q<`^bRAbuOrXN#P`kaag01}b$uOYT)+aUl zUsp+{3g4<#@RTIcK+Yj_!!HIBbTPX(H4|I~jsHbcg)UKD!I%hc()EzCexTobunUX% zVvpxw1}7?rTIgg-7T8Nmu}H;7!|}ebjO)kOpzS9yJd$>p!pLZc!{fX!jQVE)D{~s1 z7zapVO(%6+=bL-&+O<&gy*)9+iUg<|K2(!CSl0Zb}ZMcgkB0ljz$>6UU>L>+XLzgS4jNbC=g(`xW!Bk0bAEBEP7e_9k9 zUi#9P#{2KTzv4&B$gcL@z@`Kvnt&Jxe9|h+1h8Lx5-U`Jpf51k;#V$TX@}HQ(%yrA z2fYQR(<_o{_kGr)xRqt$7YwtR*8^))7obK{gt2UHkK9ru^hO#B6cI{$_M5`HSo!(# zOrXShOf*${v39}?h605Ms*2GtB#nw9$PHsIG+g9pYRowGZ|&Xp)x3K)N<|XvV{uO%L7ygLO zHj8v5tH)Xz@KF3+P69;P9)`k*9y(^~P7DbThVJjimGxwDL97Pj&a&%os;|@JO+xyv z_7Y0dn&N_f&&eQyTQ7pUm1mrjY@4qyu|}KKL@6d}qokG;@o88^6=TT8n#A3B3yb-D zzc;J{d?PCYk$VMnGi?f|gV^GOdc$#4X+Iq3-;5TAyl;E#>9LQ-_uDz?2&YDNOtULj zTJ*jftxsiFaer@wjlfYZ?3<`RBl!v5Fv4RHFowZr7nmM-op}X zZj&!)2IDBr-C!G3A;(_4%t+T$R(|)~NTcfP28UcEm4>&?&e}r+Z>c*Xjg*2j_kCXk z6;y}?Zg4D6>qcQ1+wDDCP2(F{&HF=iIQ|uUJvxN!5>Bws{PS4+fEomgh+*G^9NiZo z(XhG3M(}a^^^bmvE+aA0Y9eHJsWCw>Tgzev2O?}BIXON#y zvb*(jFMBnuwKCCkXY}%T3lx_AUU|KGAH?Dq%cYz|l2MA?@2!3(TD;cJ>C37u`p&_% znE0fMK{B&;&E5WX?=z*V)T!D-e@RN@GMpo;3)aiwy+K@i$3q2jF>`Xnch)@>vTf8P z&Az-615$GcIaSMLp24v`?x`N)e*=Y&EnN{b78-4i6AsCBT&@SUn328w78(OweMvJFD0i*Dqe(1*UW_<&(Se znWTKY$uRV{PzDDmill}$Dgh0~XN}5Es(cp%0NEWACGe9_7+^TSP!|~oB|x|OvtvaX z)FQBolDL^nrD(D=Vgvt+zE?fPoW^0{Aua+TEg>2flXC0cY8_WVp7%C_V*(Di*Yl@_b#1%t!qoIV! z9(!Dfba@XLDE#H&E%E<(@Fn$@Q8T;8nQ>%F%Zp}9xXLpXM(xl%7zw_PqpLoM}&^7Guh&prZ(HsH_)gqCbfdc#Tx)$1ppg{^L6YB9e zRFy2OuLtUmxA^zobnOlFU(P&<{A99Zht5On9tW+yE`2wBSeu^*;!-2I(&*TV-ugCd9+OJ)mk@hANWLSOa*a)y$?ubt}r1x z+*5gc&}TfX6-@6p#}zf+c!kIQ44vQ@{aMk1$YM>Wv!*l@aE)1YUg9IHC zkERKT7@*Vzvl}c3Q2PWkP-#b@-l*EO$r>B9G5^-Qwe6xmxO-L6-U}w4BJ02f2G6v^!j2T?T|)o=i1uRX^XjcBhMbqBmqTu}Lv< zm1Wq(h}Gi4L{;99#!11^9%6aYlfm5-C$5T}(3{-1FNm_rgV+phP!5+$7@df{@aF#M zl)V&$VWoVlNH0FiYofw!)6vkqiK%NS^0?@J?k>O7DuWs${YJ)Ol&|o6KmWczq7U5v zWkzsnxU^ctL=BpWqQONWW3||)OG(R5AD0)Z@3*~hUB9Uy#M4N?h{!^l-1S5rtJhE^LUS;_q#CAR+&}%O zHu<#VB2$*NS0j}g9GQVrROulZEY259J!>kTmRp{1d#(WE=OXHTqe(-5je9H#&s-89 zQo@RLA&0N`qsH}=26IflJH`F81`6qRqlgbxUoq^MBo>FmqV)!r?;=5pcpoQCTNhMu zSv_Qd5eI}J1lWSj@xDah7F%QV(ghB8=jKSkuZtgJd40PV^jUg?lwt^_Dl}Nx*dgo~ z++TNvQ4)tVHc+3J!eQ3JYoJEN0C8eq0FfHUZ#T_|^W><<$T>;eC5oVe zochI*6FQA<0}n9t@!d&m;x8OL7%sI|8V6dbMqk+(hZm+ZYWJs-usP2A_~U=(JL%NMdP;iqM7wBCNepPsXu~)WzTt&kA&XM~|n#1vgP^P-9oR34_4V^8P=M1l#bC<+86fj|u=tgqXATgBS?fpA)&g(6I)a#~P; zQZQ1fcrd^dp7EOyRk`JsTi{+tj{$;u2b)vM;U7hWzRGem5ju7YLyw#=-MYFMf-l$+ z)aQAc8rIrM;?g>>=&{-lXNiI-*a-Z)lO21zF1c-W!UFJ@}9Eu zle??jE#0JL^(-*1eIE30U0?ZxG1YYn-%Dm})oW8KKpnGNR6!si{7COPW^m*{D55GO zX7{voW!=4th0#tA%FlkGR}%=Oi|DSr@)Rk%g_Ji?A(;duxHi@r++!Pp27lrGe@yp$ z@;*AZyCdt+`&yL}bNOC*&}rXeyvqA_zKit& zb!>-)K32DzO=2j{E!nwgcMnwZ-nRK8{afNjZ;;}`+OH!d(yz6^l=bbsWW=%(PBd*l z9Um%W)aF4Ke0+Lcx^n;IJ0Ts1(6wZ1t-3E}OvM=PAMhX&0R&15=wf}NTe%vvBS6s0 zVn2pd|67P50B_(Kl_27+vHMG?h%+P#X2*evAiwa}#MQ1A?mE+_B9UZ9Wy9;6#S z0IaeO7{<>zfLK9Ec6xpE%ma72Jtua!PXGq<#sC57+5HvQ7qb$0hP5>WF~}bfa@^V8-Y?uAJNy_tNuf!NHf8x> zhmC(IHNASTm<$om&{E!qayi6fENd)=E*UhPu|b8YjWCTQoAiK?pN7~%Ds0DuFNo!~ z-WJ`}Ttk1dIIp+j?j(s6!~(XgPJv~X*Kh26Wdn5*DC$XNSAn|5k_sO>mSY1SnZT%Y zmqU^Sy*Ah=e*XL=`uzL;gl;{#MX$W&Ci?alJlDbi77j4Cuu2n(O+KWCyP-Dq`u)(u zUlW(RL~W%JJQS;>t|2e?_waWN(}%91%QHmYPKgjvzK6-kCQkz*4;q~ON?Os*g=dK5q*jO^ zPBo?x|2l{4X|k3pt5M{@aV$9jMSmPwkQ@a~4$3e9O85++GPuCE-FBN)fuPW0b#YG= zpbQdyMt|w7Q}6-hxio@h7T6I^EQ5u2AJG#S&p?3X4*>XAGsq0tBfFv|Sz*LDghODU**`xlYnWl)kO?{T7d*kWhvjH8+C6 zg!iFxwt z7{1OMR2)g4U)xdn)bE$n*pU$$n^bvl}J7pX?e|*2&EcU36F0bo(f|^Eoao6&)55sI9Ff z5e1L)k@fT|4xLhxBZO3$6inT`ym&(CBCTCF1Q^WymBTaCC!s0H0K;Fcp#4Bx zj96oU=-5c)qQyXf=oX0@5V*d04x~} z3$nl^6~@j%XSCm)m919pf|W{;bOJ+89ov^z$5=4pq3l2@iV8OtJe>z0d=P)Ppu)H! z4B~cJ2k6k1U}21Kut02}!NBb8OEm~zyaV)x;Y=|UYNsM`g;Oh#8Aeflk1s^u4p>t2 zQ7I+(8)A*B3mDA}ZiO6OvkTquOoV}V;p~~cPHlelVVLip5|u~{CRpzumB^C8$&Ls$ z%O-SgxRCP2<_0$uT?3EQb(VO(h~Bj63JL3{rE9-(KhJ>E9mT7XRhJLt%=~ zu}2rLP<7qO4l+4}fT(m?y9m#&c^B2JCIZaFA64^uXpxzr79-_~(&8SE_(qv7=*pZQ z954IA(`Tg=?s_(o$Jtokz=rbli7guQ%{FB8IN}5ge&ZXw?&qI8LyxloMWRK@-l{{j zIuz+J>RsK>*g2jq5=^EpbTfs)RthWI!Z>NqU*_x9$dDQHHT#?W7YI_TjJzyyKSOL7 zBhXb5S2xBK7I6z4d~yw5EyC+74=|JlQ^$v*7wIjR^*ZhIDCT>(Mc50+gE(K(^&}NNFfmk=zzJ87V}KRh;DDx)tjfQ6cGoR zmkXg(d}?-q?wLKVW*WehXIh8_917BtoAT}rylNnh8U(8YAs+dDkwjQAtm%8O@NHD2 z3Ir$O4hxBy;UTIoNCq*|liU%A;L+Vt)d>s`G+k5C19D0GBlgu_9deNmt(URlQO9+) z@0RPem$tRhxh+31xQX5{IxPdCr}00Lq{82&0*uLCsq%I0nvk`}2tB!BhO^4_AbH=` zx6iPLJu9)Jkh}}?J1F7Y%37hOd7eK%vDT;8zU+=S6J)QNR#jj^h3uoL!pPJQ<0MHC zPkJB;GT0bU0|Cf^811&=H{qSZOIt2E??2;IZve|;jZo%4tJx58n6%ogTX=cF+H9f} z&fVafZn~-AxStq6#Q(gc7KRo%1&!jwA?tc#rcT2I#M`VAeo`WEj7;T@T|%r0Y4Bt|~H| zp-2VQNUb}(#xge*=>1EVgrfvP^zuMD)<;d{_pO_ixxUg7j$?mh@r|Ce50(?b$ntD$ zEi28c1us&!0Vpaj62obgrV@y9e5I<==h&y#R69~9IU9a5Xnp3_8&zKRgeIYGk8f83 z<5D^$L~M-vCJ!Z1|%< zgz+k4u2ShLC^Cy7+c4Momn$*SzaR~%B> z&!bUlHhjVMJd0t4Bi4^sJsTu$uM(bhdDHNQ_}%^M?o<_51b4n(=~-buCPRmz zh=uBFQm!E7?>I49&>uO_&U(%wvS48$ajaKRKK4e#I6?Z*G>fIw9W+bf;YA_AbUG$GDbnN<@*qADo{P*_oTYQ?6vVFyEK{d9H>1;)*{4EHFl4E#XXC% zR+PlDk*i=I00=;U253SC7)%l@t^xx)gFFI^pSiz+R`1UJirfwETsut$I<4{uHJH-q z70C{=jYt0xe=btalBGdv+Nm(`*-gMue0X0EF+c=35eKxa54j!~s(>X$ZX$@2DK6+l zGD%pV2*cq*%q+59aB$}$l{F-bT*v-;Ka`SKPhLiJ6*{$TLit7Gg_Rjbf}}lOZ}4YprtA#Y(vv!Vx`-KH z7cdy=(`|<6$suP2RPLK-*TR4?Sjgn78?MwNHKKO>&PT=fcXoEard#PDBvffn;J)fB zYRXO|va(E;+6M?B;DPtNIhh+igs0H90=gz!ct2gGUcHW}-fmEU5 zS=wP5ACOU1{qEm?@7qt__?$P-myP>w5|?!2;b?)PHs8?>UwSIkz13UG`mk!|m$Zpe z+q%%I2FhFI4T_+uh^x9#YNKwj3_Q5M*7~uv&u~hXO9>^&cd<8ni&^-$2M^QJ?Ih3i zmUy6eq$x1h(h!2ZaVYK;!qpL7XM<+t!;wFiwodS%Y1mo_ni80Ijs~kWVL|7Rzeq9eEz^e`V^1T%*40$^`l%(L<`+|J*qaRKF zJB$LXxih<=4G4?x2GO}ux(^5O+O=_57umNp0e{+BZ=#uCL4O=;KppTvo34QSH`HeC z)*D1K!6JydhWbThgZY_Zp#X=a8hdC23LS=LzUgebpHBqkfuu$2q6?VIq4a&95sOK~ z!UrkymIko9wjS(OcZE_AycPne^9-Zi6vp5;*V%&P9!nB83tY1wU4KD@;z%+Qs29Gn zOGhm+U&!toMdmlVOpg5ggoHFs(pL>Nxe@X7=^=C&V}a7_;l@P|luYU*DLq5oS^70v z*nrCYFn2K)#}Ufcp~%|CQanI^yUdK2$8%Kh+|$Bw$Ih!xKAes3)8AUVEsiUxq)_rM zI+t1U!moR+V<@@0j)tY0$P8O;hR~&2@sqW)4Rk-GH;sE1etuhVu~kG@kzz>PLEC>p zYL)W|jmZF__4$kE9!0!wKATD04^RO2Nk6BA<8(P`)tgdJ3gIQBD*!OqBSR*)wfoNQ z-yLCUT)qtS$CEO9am4N~giuihvSIr*nVf5#^z3|KEO^b~v0#+K!tHN7@$7{I-LXP zs?bsOVT&2Na>iqkPxC1}p?s(~}Nx3)mI(PDZge_k1ZmT$!H*6|DI1ftm{!4$W5)m1yR z6vnH2;Y*J%q27?OZ~9UEYqZ5) zweBJp+xKIl)fnN*Zzm*~PY$&(eB1kJKTfhiz&YoMr?BXhI<=8pCyWo3tg0*qIN)p7 z@6|dclGa8>xLRJRvi2B1J)0==#Hl567BkE-t4PW9mO5Y_gD}JzXQUL~a)onz^=l75 z@--MeRAMXtFNi7v)zyri zu)dTrKq|k8rG$`%5N*uFq`u%Z82IHtfUeen7@$3|`Z*ZwcN)PZZG4NI#hAaA8qW zkN3X#`OiHHtkrrPG?b??rtpC04qA)7lxU+$hObR2xK>@{5JEXX&1E4|_VwD%Di3tL zl6ugPwcflx1bkssil{cB)*xR~kLV{xFA!9cZeAEcew2nFbfR+k5Y=v#pB1QR70q=P zA9J)4Nu;BL(CIt*8+pAzKBI&~zmipv$)3w~@~AJ28GZ95ndHvC`cWJDy1cCuilNw( z?Dqb|==pSAe=S;H-{?x;D0}PmRmny6Qjx2Q?!twYoV}7!RT!bNy?MAzX?8F;Yc!Fp200CuC?+L+uTb;Qk^k2HW6> z5JnK8GsFM^sPKS&fe~~O1V)1`!f;q0fXpVk_)S82ouScjfr*OQvKSP1cQy7?k_0Sl z_rU>8@4N3lP*I}mbs-ZB1PBNVE+DKt5Fmn`I8Y=(FblY(Ra|SrI3ORnvPO@-D=-^g1ST2MQkUoVI15~AI$^+3A2JsPAU>+luRjf0`w zvpQ1E7T56<8^O1(-Ij>bat#@^wC6983E*^)m1Ci!21}Rk=jNp|xw?6v(rNB~vs^FG zs#)!RuJ4CK?@?!8v+H`8zH-!GM;pOx`d5FabcZEgd+|y}(j1dL5qk7io@h?iL(SCN z^>r5*8`R_mYFP`Kiy?SJZZ`R)$^;`ySIMCH{(zR{9!PB};^JXY!THmD)~$x_`Svjr z()JWJ!eIZ>&%g5v;_b>mDumD*Thh?h@9RTk=k%R{bYdKsBoL!`_-$}9Yu2A5b|_?MJUa;*rLiDE3nh$!5o`r$FldN`EHI?7JP86f7=R1t z5B6sTq=j-kmoBjX9ak7G<%c0$MFgSTz)FU=Dw801gAb}gHHeEMAQ6K1R|OHy^Xuob z)%VVDo(S35Y1xQ26{9~(lq87ZAx85N;*W!oM?L zq|cYuan639F1Pde@Ae-KmuZ<%9mmtE>rWYf&JaT3#0Co4(3MGrqfAISLJHfccQdUz zAwF;pjVebc{@ZyUuJT*u_P*JE(du{N5$lvYzOoI7P@KJ}JxkQTq#LR+{k65{(J3~5 z!rKeN0D$_B)NXr1!?L(aS+baIPh(x0CC=zizGt^>5h=f|! zE;;eR<}X55_~4*vP@N&J^SDA)S6gYfxHz_${B*hwEku5Q)|PR8=Kul$?qcGH@BxFQ z9w%NdJoun!0b*fSx%CPV7(gUf5qI?3VB`Nmol1ldicIj;9DqabS9G;C4+ji`BS3%P zhf#)t9ddns5EUOTL=o@|2u-@jv<*Roq?3ij0i6zGrEvPZ)B(SJ<;o+q z`lLb7pSui*21R-(vj<;ps{kq;PA!BbZiz=nYc) zjbI3&S6h2Ti5uxn)svuml~5oimQ%eE{r&Y9$J?t-hfO?w`G$Vx0;i30qn?cN!{OMM zLoUP3v3PB$wDUP7moyZ9CFSjdS7gpT3ytX+6Xu>70<}6gpP_M#5 zZy+g&W4E=>al3)s%d+i=TMx@T%;S7#Cay1Op%#GwGnuSOKc6+D!FXvKj2|jE;PusJ z{3>LC*)wEALe>vBp+D;bjQAo{=7qWDULyaRn&C46P@@CdVS+{&Fm^CCa5W66*t|UwErbp0NS)E!zdVf*J3TuYTqJ zTCG|1u39#wY79Q!yx7{WJ2Kt;crw&tk4<#4qsqRS2Mw05d!pwokAuUSsEZf!~tQoT^0+x zq6aTsikJ9CzrqLk_>)hzS4fJYTZkg;?NtJeb*6wU{>0qG1M3VYhJrI79B56F+e5M> zRMgmn8@{>BUVQzclA(nlE&G5^C9`D$sqk8158wZL@B2c}ih|4Rlb?;Cs4!+Sa-Gl~ z2DlTV6Q&48eK66~a;8t8E1XM&Ssm1VGpV7&;I4b>3YjYvE8~*kM(KIu>=2UMSs@)e?FY$S@h4;?>oc!mv_d6w4T1Tp4QVH_G=r zP_Og-^m(}y2)6tr7LWX4@!KfPd*-~x`)nH{{`|im+(iHF@J2H>wZ!y#N!7Vh>3RdL z?gINnhJ;9MXfc?fbg@%2eB^E`b+0>OC&8ueb6iie%;b}3WidXB`G*_~ltnYjA!c;x z^}~Ta_}=$@5kK98+$7Ad8^A))B;i6lx84|D6W=?Qxm{O5RKh(bK!g!sm{)=T#WTa{ zup*hs1R!PJvR6lt!hhx&PRa!pK{$BknHJt(k7J0J7!U~wnjb``y*^l4Y`85!^25Vy zzBmHJa`#FvkmPoCmuE+SrDZHN_3iJZ6@|aSzJ}%X^|5ov1VgW@l&wJkGgXD~!J*;Z zDen_ZN@+nk%+?kk`ssCXf6+eg;NZLjN+ESG@q~iBI8|i?dEYrmo}GdlO!@|YzO`9$0Z$VJ^HRgnpxxX{IO-Q?G46u6_ zpFG>;3&xT@QXsG+gKMGu+M(A4c_#f`Obv&(Rl2EZOIF znmn9kfn~N93Jku3_eEarV5y2OOD#7gF&Bg2D(y3?&;t5nkC}}Z>U^hhpTW#zatX>N zacc|OpKa>n1MiOmf#D>b;{UFpmvM;f!i6uzC$$Vtw&#>O7{aLuu9Sul{Xpo5Mc8T$I` z*V!OW0D~)bXVE5D`h5tg(qwKL2#7t5OgjsFc6>yWBs5N+K0jrs@%5> z1hyVeJn{I)p<`n8zA=eQ24lqGeS5Dq_d{%$QCr$3TCav6E^mqniVj@9C{B9LMeQUC zB5njdu2l70EHh^hHQT6!SGl_2$TV7e(AZ&gC4P~f3*IR_`2RnjcYlw zy0S+t4B?(P@+l2o=%T^GxWrp2&aIHh3^-5&s(wRU(fO9o=!q9pU+GCGWiR&dQA-5~>7HWvw@` z>~b6s&(@t%79hYFSK+;lg#rVD#5AOA#O+oDR3qeOMEo*<^DO04R#FvmrAVb#SJ4R!qb5_r ze>=K~ew^c3!WWcl+KL)x1XbqDMe8-W+3zA*C&r;5a*{@eu0k z8so#LH1Aj5_A2@;9A6_sb9Rj)yStL;0NgRdhja4d95?;*gBxkB>Wh56OisqT^oosI z6Hb8PN^`Mu-!tj^%DjZ!LI`{waDVLW?P8PpUIAWMpcTk~6jq0bIHSy-?6!R4MAIr=Ak# z2ofR4A>cg`L$xc4I3U2*W}yUwXV|KkxIxshTY4VS4cQr}N4dby3MoAk>`h3pfRu~Ak53l=TkvOKnrrixzA(>yKjHdftibTex$>Bx#6Uv)#drSv7dSDtKajYZd9og0 zN%y7xp^SZLE24qvDzzz$UghBf*9UYh@6~RsqT{97jGSErMWD%5viOiI#2ETZ1@q)R zV<{zIus$dSbufNeowLR-=x@?bj&GwkdV<7;b$c+S_VF{4D2b8*EsRVoT*{PC2;Es# zKJ!DcgU+KTkFm5uH?A0BIAY|jBt+8h+rTaoI3Cv%>@9y=#@W(OP;REDITMa-_+*xM zh97U_Fu_l<%X?dI6NVs_vRNbZa`*?JJQy*n^A&^*-k&DB4Dn(7NCls{utD}Ilt#_f zolChZjHejVFiXvh0(Cipj`&>UN-b~h_$KQWp&SwK;AgnMzwpoB`Ncp|{~Kk(V+4r! z9daR?n`2sS9u|U%pRO7X{aY2-35)|rY(QZ<0r5`;M89qOf9ub~GYeBeK8>86b# zI|3VgN|7NYC|JwGP!+C8>E;rJ)ceEVcUFIJBxf_UCqV2*AdcZh4~$#vCsl)#*+vzW zLBJ8MslG5>vX~g+VNa=^;0GI-}<4bAtHr zIvG!1o>#5WPxCqWvxDm;%PS3w+(1c!BRG#wk+w`yBIPdETa8%e`x$>Ps6DEE)=UYK zm`c&~wNGX~!+KUY(_y@hnOqhv8uyQkAx-XKM3ZKt$_!ozDHe^-MvQ3BpF8(OtXlVK zJwZL;Lnsq$=?}R_(tYD<>vN8+r-w~P_SsYwg1>+SVZj+C^6}roCu>+Q zm(K*KUmriN-QliWL7WdYfjfNC*F+u02+a~Z0NH$f{eVx>W^X#Z%pVQW1+GGDfKgr* z*%gL9?KDOaNkwfiPU3hx>fsrx&?tL^@vCbiN6VuXf0L8*;+rfN%j(51yM5z7{?5C9 zXOCUOHud`T?r%z8&_1tf7o^NDgcMhE@^j1z&k?b~);MLd9qCY`+eCcSFA#JoRS|}S zIGu!4W0c>Ct%)6hR4pQ@(R+?yec3KZ)D&}Pxg^5c;Jf}_oAv?EpP63@ADNz|Dc7o!H1l3=Y{IazeBEzrl>%YHaa{C8Q0cZPV(!U1XKr5ntV6B2?oT*^o<{ z%GqM&w<*)FQdRApIV^Tu}g^a8mit@vLU$dxn?&_w9TLnq0Vv zT}BOL;&&zvCls24B+E!k+sGShd9x(hzmypc$xx^1AY?+hy3|24zjlf?1~vVYx4+}B zBLM<(bFU|4eDuza72`p~{NVZm7zFDC2LlK+hHw(^X9EH>RAE9`mljCQ%#U;i0s@@t zz=(s*O(AP~uVACU;M2|t$U0{-1402>T*OBn`pW+H<;!0f^?HdyAjVj;xg@c=Iuo8# z1~-IsizXs9k;enwO;#7#5P-@X)sd2WlVUz06yo^L6O5w?##Epb9=0A!UXT?qw4Yh)NaJ<**#$7dX6IRD_z{q#?R*dTN&~F=FvRTZ&3=i1Xcsm^%#gu_Tf9wQgdp8xp!-}`%Kka#r; zERAqnjk>&U{QTZV^XWhLMJ%Q2F6PC2b2O_mhG4*9pcC*U8&?KER!g3K2FTj3)5_91~6;GXVqqlbG006z`+LwTVARE2CxsWwA@gcPJXkFqY zxI3LrR2c>{dff{>JMNxppGh|O_uu_rf3uh3cOjoB4-15hXoLh!hMviVQS*0||F7?O z9JXW3)U7U%h+UXqO3^jiD4P3Y@uHp?F(FCEoG&V@C zNB64XNpXvRbbM=svB>Vf{sQ{_iZT59Q)UbgI`oml4ru7uJS92n`>RQlbhEF#TW)vt zUGdqF$$siAwcmJ}+H)6GrrzCk`_iq9^nPsp`SHib&!gw}Hb~{_rO$0@OR3?3Bw?i! znVmaFTb_-lkiXaK6*b@Hj{0`7s~+F2dfE=t4qi=~NMHr!l#(M@O2*Fcn?CO_DdY!OP+ z1TY$*zeUq!(+#)$>q!J0&j{74CJ}dU)NgTUR!~u3Dw)YDi%i*_wx#Qw_! z?l9b7ZMRiL4jmH2QlVSSe}CxXpZw>8&0{ZbaOstX5Pg5dbu@7VN6d!kijY}qpQ&zg zBo#o7xmMUev$-a@z2vpU%cUDvIft_TQtO0u8?E#tX_H85)E*@!ysBWddk?Ol@gOX`lbGU9SOr$1brr*Aa-bU7|9*^+{M31vv9HdA><+sc5{pd(;% z$MxvJ7U`Qz(Y_vz4-t1pbpk~YpF~fQGFBZew8$?TMH`e0<(OFHcG;Sho z&sk|*Z+1)TG(ovgffzKQ_Nmd+7@lkS8R0o`1v$Tlb<8ymg^O*q!iM52SNm~zDEscl zlPI|0MResK7|~KusEZ7Pfo^qurSe1it}f2r^~!Jm>rH_CTL1yNsc`X;$O*Y82n-*G zl*I5s2(|J?=xR{g!RAop@PqXSVPn{ilNRST$7G&kAZjW#zzSl{%jc;5MF|{^h40k{ z2oOmS7(q^KuseJMgQk8mUc7GWqAFmN00DXouWbF3x!H^`HHL4uwQUR#DX1FA(Wt~fV$KX(y9OPr_%S)Y&0&xJ=p!Hgg`fI6KlwraBJ?lg+=LGhcMG}U z5ktj6Q~?By{{<085DFOnZukVpY7yEw#{eblWS-WVi6DRljmnSd6ew_mJvmK$ghV6L z2fRHXLGXb4eQ*G;plKD~s_uId%4UslCznYq&TQ3k= zz{RT>zC321<+GJcaA#fjyS*F*nPAXic6UKg{49YJ=m+40Xh2(ZjB|ZJ7(p0AyoSL8 zHwXw2e**=ozrO*bQh^gV93HRs_wjoZj`M9P+Uqxh7D0t!7nl*~j1w#CFmyEx9tQKCy6)M4znd7D-B;ZJ<*okK=}i&l-0B0A;hrKE@s zRxx^dd!|H(8bNc%O2cS3tRx_$*w&`p$p=TH+lHYzHhbQA>=9% z|6TclBS2UD(|?n&E*auYfZPl#mH|+0vpoB{Z+qq62tle$8$tg)sTyfS0F@06ZpbCa z{{|XXHW_@8v`U6hjM%6GvjWY8#{{=qhbj19x_Ci zE?vTBolG#++uK`XSJn|=Q%(4@K|81%1#WUS8SOFU3QmQ*s;H0M;a*$UmiblVCZkZ> zW%h*dT-7-<9652r8DRz-fA{S_^@_jxLCo|URbUmb7!kA9>MzZg<)=hi%Q+akoxza}YnjyKN6jE;uY`-=l zb8S60)OZ>nu*!{!f^#w5C>m-5qI889&mbo>r&JniC>=wnvVoNdf@YQlvDFsWbwj4d zkd2<635mHVLNu`ryITc>W4joun}Z(x#(((LpZTSK@$+BMI(}sfc$$6&>v#%{G;stjx`p@S>QE}{XzaJqrFyi8~g)5@B zgS6}8%fo}Oh7RGlH|7{%L_29{1ct?2<9$MhG2_P=At*BjMnzHJcjGk&Ya{g$H%A(uNh|YTux2j1fzw6DImS*tq zdI97{N~=*CjK%p3ahfe8M|`at>(+G$GdlE0o1j~ZVJ>r=Qum*qVF+jZ-DlV+ZnL|5 zCC=sV3IG0#@ORU7Wo;xL7e#ADb;lXW4LN9kf}gh-vfNOQP@WcBFaB4*y86Lt}y7lUH3yEg__k4Oz$}^t3HEuAVp{PoTI+E{Frl^D{Trs)s7y z9@%eX>93CWViJ-rhg-h;isQpN#+0*z*ul%P?K=IGB#;i8`> zqW?d|09Re%yHj)Y-;NJFpsp~2l6Wo&(IpCG<0iFzD2>y)UZ zO0#qjSnH}ag9qL;`^x6}*4B8v>dj_Lss>g4eQ)~nr{DRn{>88D^516pgj&!V!P0#b zkLU4FLs&hUF(?uYqz0mOeO3L;-OknwiXvY{Z%apLSam;KT6s0d%r zW6pwyGIM7}Om1?%M3`_8x07Q|#!SK!WO1hSO?Oihy~Lh9lOC#)sbbzB3v92?a(BU?UJe#2o(v8e}6lQ6mUr2$Y9DJHz1! zOuJEm z9N(9^r+l{o%I(x;3@#O=v>IJRK)`r&gZ@AYKa?ux0X6zH6f5oi(dGW&0qgd|M6cpRsZ_dn#49X*c$5}OvP*y&9$v8@!`Szs-V4?8{0v6;xaeJ zUblGN(u%}mtB6l%FM_-r(V0wsquE+2P@xRE#xu;?f0$CT!{did@Wc(ds~nvU(`bUH zF;r?5(vA`p&BYWJu$BRup^j9zx!OiRTvn^5p&~J&i5}0=DpwHeHf^Ga6Lk?eQ!eei_*Fcw36CbG0 z_xRri1D2T#KBzh&`LWN=8YnQ}6YlQzI2j^gi`M!Ap^Ib({UJ|q|NZy3aD&S@pvz!6 z6$S}d&jdRS#*-j!##U_Eq2;Owurz*FWb6`IW^JJgO=kSgODqr#l18Hw5#8Id4e#ZN z*PhLR3tavVVr`m9K0({tJ96{v?LEyW%mb%Nri41o`ue^|V>uyOgb~mrX~+7K&V$wk z5Ab{1zZB{)QW3(zbIfc~8N&ZTB7Zq;EK>lmCz;kP5-HBC+-U7rAAD%{w|?_CesR>- z%$~a;t=& zO60}_J>r2~t-O@1=Z(NcSTynP@C;;$9|bb0jl?Y-*Gx*D*9m>Zs`wAAD-EJ}TR=0u ze^w1+`yj#o;PE@nv-^bPPZhW=G2G#hLLZ?CPS}->@tA7VKsN_UvMRb< zp3fTQ`(`n~t9>qnxVOCJEpnn@1m95Ta$x~2hM{Z)^am!l%VuFg;2bUQo_VGTK!11- zi4d8v_}nbfD|Bav7(a)&qe+qR_+-V#km2@L%`S0FC~(9FdC-cRjhJHF9#le!;Xq!~ zaAX}DWtrs~Nf0DO_UHSI4o4D~)H>l-U;%$Y8Yb09A7UhOR`@^t?tlK9 zx4!Vj|J`(H9XM^|wF&7IoWG2I6cPF7hO}_d32jk9jBYKFVV~7TLGj;l^ySD*GrJ`h zQS{fm6=}}iwkz3QT|XvHV~i;|mma`^l|tGkIigDCf*z+1n#8~&MocbdH!%`I5+Mkt@Gb8- z$yiI`JSJDA7-D7H>zk4EB#VDnw^zxf)SO5%U@7@xaWKPpiXf>99`Z|Wuj@aCG9IYM z;@eVMR*@|p4|?%yUwP(caTf zOX6c2i4YF%vlj@OTfNAdtY+Y(F_22_|thcT<1dIf_L10#sfkOaZA`}Z(_xFM7feTufWl>g@>=xu(z zv9^Y*9LCM4^4))ovNcz_e(bHbH{(VNYp@C%(2SdWw*GpvSe zNGGI%2x!_M`bm|ECE)w$Py~b|QYtV)FM82SHvhNZzUN=pgW+|vru87doM5dG(HmZ= zENUQId-g18;ch0*9d0^LG`MT5&uUm=kty~}vKpS$s#De_@~m?ZBc&-`6Ksej-%kxF z++W*I`>n!|7A~=O!E?7dyT7duI(bWCJwd2#u&jWkZY1Tr;Gooa)={~*g(qy|OkLk5 zDK3OgY>Z0khn+8@gIM$qiy=F$dFJ;TM%3C`R1IAb50x!w-<6y&k@qkRh!QQOO4(eK zqLOu^niH?!NQTjLBOXlgHMgWulcG^FARfxCA#CtG;m=Uh<$=L!2kP{iwEQL{E+g{Hj^%-_)Z>|vsgnI~a z)cyS^&j$xlC^4c66DL8-<)Ttx__t8`0V4>52$vWJ&nrUk`e4q;PiQe1L23XY5GkbS zC2oqgt_DMXZy_k~jo<&K8~*2i`HR2AIhS>eZfkEz9`jPl3MJw+j;}R@rM?p=gezrq zQcs-FqZ%VJW4P4qdwee&DXRwQ#Plj7S2rE?89|g*B9{%EBeyp70CF_x20Pd>B*Hb3 z8Ba=xRX%sPS00m<24Z1HEF!po{dDR|83&9W@Q=|&NIN&Ulh3KZLMc`jQVYq#c-0;l zOL0KavgldTz~gTrH5#b6r;&`Z`T zH|Dh~H>cxG&vtSs*}YDTP>O+MzlNdR|JirE{qKJG{U12XpSr6WQ3OdA_tO|)WpTiz zRC&Mv2G!S0F+fIzlHmo>SruTGN{j~id3Tq;KNbX-3?QSxS+C!0i1yz)O?wv`+S_1I z1K0O#%P(ZYV91v;!FWcWa2P*`C8JChNf5;Suz2zVi4SCrkwb8KEG&@1cUyE+{jZNh zDuCNj%T;55D;uGseh4VgQ_mcPl=nXS*-fbiff0oDh7rWUAf;XQ2PxCuz8p7$v11bX zIB{sAf@%;I*hYc=gfG^HUbLcl5!z+qfs2E`FSsUlfe)U!_ah(v)iE^HoC=eaugGW?`iEq(d2rXk_A}qU>E^OG z(%=?^5`u{@ttE+I%j$ngE?Z- z7+XZ<)#G+#F+^)E5OtltWLrJUTvu5>s;7O4B@XE8OLaw+#Ya8!tCboSdkYG^da~_0 z#Sb;6X<2FM#anCBB8m0YN$o{{Q)7Id@vT#ay|(Ok-(1U@N|Y$)-3iZ5aJK)P4kJd= z)PwArhym`^DuCc|V>h&9xUc{jV(PssoUI_nFSTBE*I2dw%&k^2g^ghyKl7)b{NL61 zf#aga4^s{`8vAQZ?8605>(Qw4`+$v1>*`1@AOgw@V&_m<_j_!Nf}o@*wWfu7t6q{RQ9CK!0F0S0QxO?XR{xYZAm~a*tb4;R2K29k#sdUGEBScmsU$YvX4>`&G`+Tw8&? z{rKY>5f7{b8jLGFVBv$4lM6V^sdS;m>~Nd_LDF6JcQ@LNK%3ACY^7c1wD&}#beMzW zGU)6z5k(3t4C_T52I+eIy;x|^Vd#%RA)2$p{`;x%OE5lEudl9yln9Y_j6>}tWWz}T zkQl^w{GGq|p+~>+(0?7*o&gN$1i8^OR2TeN<;n$kbx{maGHgjK)ew8iph=Ij#l2U6x)ft$fO$ikwbTX@xdb6L$o|Uq}2u1JYRuzVkG?69e zIb^jMx%ySgjTo9!!2|CR;?yaMN!wG@U{X-u4CmUg7eD{m&;6&jz4a%4S9*L9_6@#r zBV!k3ZxDP7Lhb4^vg&F0#Cm?XL3H`6VDuNf9&iE?$;7!C#F=$u1osxLDYOHUandX? zS#4bq<#?&j!aFQRF_JOWR#Ww zwl99XI)~`Qpe+Ja5=)Js#sYh(b~p1N-Qdf0ElAd6Xj_zIoK_PpxhvPKiaEBIuDFa1 zSAur8SKA(ACUir#bMvwoINnv^Q$Fs9l{MHt{1I@Dq_#Mt>7t_nPskP;FH4(qw7}JqpkzLvI80Ca z(XQc0Df2;r9H~Rg&xz$#=v?cZ98p(LjjYA~3R;qkFVdS9WaoB1JNNhg)=&P@pdJLs zT=7xrM@RpwK#fy5d?CF{7Ev2wXg1{4W&k);(t$_CkxA*qj!8cY4%-xKz-u5;T zJ_tuteS~8FWBL4S%eRC8ZAq}QNQ@)|Xc-xK4Hp>C*lB13!U!UeiT8j4oz@{pf=>`5 zzoZZ&#MT|n5>~1hAtw`z@?-1zPk5+|Jk4Y zXU%MSepq`&fF_WPE10unRAl;MZdDj`#!rEFvY@%!Opo_<(4p|lTFWe&3NVF2mfdI> z!DD!J%22w*lE(iWLFM>hZ7#C+A$HWLTst#PhTf_KH{E?!PoO}A z%pov5pK13G01JQ&nz}g{6FR_EputSE1Kfsv0xArd_FsFM@8eyZ`|Gt!Bgf{Wlppp| z9FV=ex->N22>tc1KOyAjyYJSd>OE}yKsZ7DFV?$Tn;(5kvA(M<-?9OWo!VCgIYkz@ zSo00!C=k;4d~hvX;Id!vZMWU#ouA}yWP`T1x1mnaYI)pc+Nn4Zvb~MiV00M0v$LM9 z{Ny5^c)qw+exq<)`A8r}4>eXHpRp?ia;{jAVHk=#++QEivYE8rHd8tV^G!P*Yv(u} zELDTX>14>arvf8#lOed=%;(KVKJflC|MVU2_$NGS&JOh^HzIBB(iIfO$!>b3Ku9>z z_CGr6D;g|SRZ&|Sa@Nv}TM?tCYyCu`rb+@>rg@euhr!!cbL4 zXbx4iVyF~ZS-)IGYijI*Bg+sH_f1ZKAj(R~*x=gr3WTVg)|9xd+o*GlQDcDWQkzlp z1de~#&TTU2VnlnnZK#&IY003FvMGrokh{)R7-=X1m@KDlLTY_&CI(}u$qyLCQAF>Lp*%|nDR}uC?lnB0 z9FK&7abQMv-;`h^YrnfoDpYaMwwp-DEYo0T&rinQS(Shm{vTq0Fuor90}aNhbnkhO z%HY4{E$5~348&(oz*^uV0kRx6_|}$hdF{BO4&&d)U5-i-mB#;VvKfd>o$p{f+91U&8fG>XPpzpbJ9jh>^yCGaLYAyBN9{0(n<^9}#(U;NKMR}F^O&6`XIF+}Li(=#>3xO93#joMOh z`cv}BX)gLMWlD@IOzRg~D{~XC%NianRUIbr^(-tzDo963iYq3rVry=E>eDPVi?+~1 zY%@pD#{zlUQ3iw`V^jgz#^k`{vq}Y7CE#xoV!oN67F&cGaC1n#wb5dN2NZN0q}$e{ zfq&xsK&+Dq$2o3h0lO5As8pCCQ&Akj=@*nVZG3H_kYu*Xb^KW^UJ2356e7Vi>KSK9U zYx)_q@cT$=_V%>-xg&8@jiCuT$NxJTfOuxR5I^#fkH~A}5ukza*0;WjN&>VS!SY-c zw&`1jgWoa&wD^{e20A2<9}>t^K(P%IvC4R9QSF7v}V)eKI%rrgapc)wm^Y(A(Y^mVO1DbnnZ~#{d=xK zr${f;Vw~Q=*vk?Eo*C|0`Xq$Z5GbKJMMHgy`zZoa7q};JxVlWnr0jD-ZMC|{LnJ^F zMWsqvX+fBwvh1w8<({doqsJ&UBw%iNt*&wsJ*Yg>tH`&Pvc$Pxve9RfumjGPCO$wN z(jLBb2Nn*5`8$$QVa=QT5D z_TK${eviG^%$ZA*A|+AQUF5lYX3u`_wZ7~3{Qge+GO}9w5`J6EMB+`nbjik11SiwB zU?SOy5}4bH3-JEoU?jqVoZm=h02HsJD{5At{?Wk!F@Hni`x5!Szy9mL-hm$s&@9Og z5r;?};V(#l^1rf75&KtikcRYE!c>gA^cLIOu>r0a6&-!Gqqz!PfzD#Qgf3ry6EM`{ zBl+RZPU#24%=Tb+aUcBP2X*;9-}5~|?XJ1O)C=aX5;ge9ogp;5OE$Bgm_)jJ+MdWu zI8D@i7-(t^Gt^>n-rPJsu31hdm($|-+?Z^W+2eT8W8{9B0mowd(;BF*Cgkx%wj0qo zR8`P@06%lwsEs9S7KWDMXia$?h-xyVu+vo8oe!oatI4jj&qa=|F|?#mLzBe{y4}##Q}sG``NUz9 zG;@PFDhy0};Eu_|i;!mzn`vE&bXDD-MyS#1^>$~8N_@tQr4zJP`%B%kaMjoyAU(;d z4u*lLys1!i-S(T!ew$bAdkz>qn5GogN7UZg@zK}*@_+v6zx)sX{y%uNY0m3PxeQbq zV-D6nnKiysq%?JeFqw&JJfhfn-I1O~&0jJ3AhFeWe?9D_CG~Bg;Ky%OlXri+Inl5*#^$zoeoriF!}ETr@guM&4v;z%{DPm8;zyXe*pBcQ+Jg^1 z*f~iNn7;n?tpQ6w@PP+ryDD&7?$@>}-21sKPe+Q}Q%^mW zgCdJ{WM%+@H*Q#3T+|7{6^=IuMwn~YJ|cMYs+P>Va^@dl_tf^p+No$NNq4K64sQQ@9Zi-3{oZY@QN%{4;x81TV zEzHG88;!d#4?KRfv28W&Exf%R|0im1di9mx{(t_$pZW9u%|CnL`Qu?Wk`7gUmF{I| z1P4RS_a*4LvEoO4&ac}4ve*7tn)J7%$dUc7(jT-}XhoHB0E)06_H)eu5$6XIpaI~b zq3RowpVj?!uP6I8A!!HGHnb)p!G=GO}}QU4>j|5!)398S~e6z1o>_LWyY zk{@{Bfil*wtN_>b<)XFio20(2w{OG-7~i|j2?(+-ilv8}TEth)2q7q%U>-a>U;gr0 z{@(938z5>hAc!-hq{_c}6Ox4MDM(T;UrsR1bmDCQ;E~(Y2)eBA+;QSmYzgD)^b|Jf zS%NisJgO@|7}|XG(9W8k9)BpG(@4~%X3z>4QZNZKiRJ_^S_L<@BQ?&K(Oy&E3MT1z5kAh1f~tz#-V{Uy zIa0{nCg?9gLB|c3(kfMjA zwD?XP%p27rC)d09m86cS8ay=45eR>2kH6e zzWljA{>T2<&xf540kvs@%oG(@lfN}2h}jJ3%CbJ1dgQ<-2Eb-ys%Bf&TKiX~?Mf53 z$F2^;{JgunmzI^){Kys%-2i}9wP+wc&3U^`TiZzqP`71t$x`m6!TU=n8^Q_ZD((Xy z1OSJ_6^}4og*KC04 z?Ev80vH_MSFJ|V>CWvUtA8u+9SCzH(3tu==clNW-rY^dh8)X@}eTc%$29(Q$^wg5& z&1=MGaRyUJSySU8$dX#4E_`bt^|XCo$~(%0B90b7QgaQ%peAzSRAU3FYnsEW#WI`W zRl@;9B^G;@ytJ)sGbO2T<~gJDp$cnGrFhfko?AK8j##&Y@kE2BnPpXtlCA&rzx${D z_W$*d{_)R`+xB!+nk#bd)ZuQWtGo8yvIin)x>t>CAO`?rK%BqvW~w^rKL=%dF6@RO z5kYurDsJ)&gWLt~=A8O;yTT^tAuXvZu%7#rxZZX)EbW166O1sEs_I2DQ?pIYj2J(U z-!uE4+VckMLCt>LGKSG84`6D!zx#F_{Ip-lyPt})V^XD)|MM6A zkDmto>bmx^S8JsLwbiOgM*8&xTi}R+2u-%rUe%45V6?`s^k%`V?X>jT*c?aAJ;`GH z%!YRg0YW~{Mk~iSIdZ3khQ3Uv^8eMWkruOAOBCQhz;9Rf-HyrJikiXV;u#)SbnJ47 z(P-LW+PZb?pu-O(JUKknB09nPJej;KQs!|E_7}7J+4d1;wq1~`GHN5|7iUK^ zpWXaRKlz{hXaB`t{0pDgxYHp%1+qK_@R6zGZJ>QGYp!oMKymYXsLNdEX(K)r`;ErA zX7~P{qw*>sT3$SynOVS3Y~@<(ml2}{kK}!_B)(S15{?f~eIxXR?EHvrMIedKzXj>R z^|9p<#&d=R`X=STO<(%Won;V@NP zNM5r6q6UBNbDzr;Fp-<72!$cG2Rj@(Kjkq|ful|c`(O*Cco9H?Dr}`7FY7Uz=8YT$ zleXkor>|lQjG{@ks=qz;wuQx@3b)D{eFkx6H5Pe~?_2}1fwJE~93sjWNPQ7lqKzfS zI0MhsR6LY@7RnqwRE{LI1Lj2C4U3%#7U?9?qIA)*sm&AyA;S)Vs8$ua`d|O<-}zG? zdE}8lG8a4HvI*N?{}NVIO%G>rwa;s3#B-10MG-23I<4cUQ=NmlDu?&JO{wYgx_et; zc7~UfSGWwj(3sTQCfhh>)fa|WmArKuSnT8MHYypk&WPQ%-C&9LM5|1N&wermEldL) zLrPl|`!StbLq|G$TY!J}5PN2rkf`r~t1fEzYP%j0gkW9L#O50(}eAKfq2 z0cdxRMugjj-N7cXHg#&UpFii`V~NLlOTh0po_+4`{a63xU;5i$`)4nnG+E>O8ngK+ z=;3@5^+3(K8tS5xvIaJ5G=;J}^I2_vlvWl1lsQ~g-;qt`ZuhHeR9q4ajP6P+!#17j z>tQZgLthS6{f%`HpQ8FA{Xu$45hTi31naXH^7TDeckZ-z?wG^l`@jE6j`|;{zpTRv z%J@eZ3J^p|ynOjJXOy-8XsW=WRfh8;VgdQQi2?fUw6_%qomK&}s}B-3z=9XBedLj6 zTeJV&R8bac8*G3Fdh8Et1`q41Ci=yhQMnl7a2Kq3ilP4m*L zXJuDOYEc7}V68D~aghmaJtS<6G4CebR>>%vKmKq2(VzdDKlihLMUehAQFB7=>fT)d zgojU9O%xAA>n%)ecFfe+F&lU$WHhO#a;iKGCZ*6PP2w23`pkL5NI&dqwGye=pB)PNr^eaLR7YPD5!d;0gQZA?(>i<57dsZ8Pnb?OWVVA&<3-#sj^iUf)f&M zeD8=0+PF5$=QWS7sl1jQlR^#8sShQpqP~aUgP8!@-aEWPUf?(7BfzD$L4Pd8{wl;n zGwvw}qB5KGU3CLBes4WLoB~GG`TVv2;cxuxU-`HG*dP7*uRi~kW2LdG9sKY<)k&QQ zfL~IQj;y)Pwc6&)JcWceBur(ftmi5TQfDtxJ@NXg$_w~qqq-vG#r}-&K*!7^#!&V# zw3Rq)sFs+Xwwo_aeFM5r9d{z}rKkZM;~((D6ox$z0SPs@ zEPhlrcZ94|fs1FlzgDi}t+sa}0d~h=dW>LbuhE&GD7XQGAQeXhwLQP|r7vales(s` zaPJYOg(O&}$5BV+a&t-S12gr#vTnKDs*aD35|SXbLo7hrq{8v|@_^dG?b)f8%~UB* zrN5aLb}=VN(=$X{dQQc4An9>mjS6_@ePpPY*%xu_#3+HLSTBrIRo23xcfttMkh_7~#9S?l$O zgQqW~sVecQnG$ZJRpzQFT%LMwaxUz8osHGYytFZ>Jmt{tsgQP~dYx@bKChTX+F$$C|NFCl z?XUi|U-;@*zH&@di&$P;w2LT5$Q;A|w_g7PTq&HaouucW=x@`#dTslb z?SOAL6>c5;l6Qoa3*(~D+k?ZO2<`}lA;~$aJw@erSfY6#NP>|bci?1+Dg|D>nm%-i z0!s(_fFsI$d%KodsLh&tsBMRpY3tfG0lI@G%ir8*NIL!^n=OMFr^RBfFPwYY-KBz6 zZlaTDRjiSR5iE1FJsP($qh^%?n>rr20+TbwEYuD-Kn3sA7OTW1-n%jN8HO6d07(AH zKk+9%`yc&>pZasZ{k7lx!tQvejJ{?xwyY6*uKmC>d@_kd? z1EC`bJDYUYv9s8|JrhmPNOgJ6y+r5VjRHS+aepS!b&eg6#Vd#;a%ZRWSiML;j9A0g z%?;sT49T|xKR;e_Njkud*bDf9K!(%vZni z8^?qIKxlxo10Zw~1GO)sb>QetPI8b(E2IMoEDA1!FeKAlkp8wu+X<~k!OyiDO9!>g z3uAsx0(!>{eJA)SRs}2tpr~~}ihU*A6 zDAeDNIu5+Ny9z^L*G#8gR+KeNY;E)UY# zsjKd1vVQC}ghhfGvpm!AmPs1Z>6!ksNq-^*wsS$rB-c9`3RGrngB)|wVkgw+07EpO z5ES~A+W$00&_ZQQ0t6=!P3mMdhs833|3d=^tEfJg|IAPR*+>86zyGH{HQC<2F*{%8 zbCnv6VMZsOrnILimU*q-LJCYi{dHj`9tQ~HbKS+jtVow_5pS46;%hpCa&MDNB~8Bd zH@}R8SupB@czRlATe z+Oa(CtS}zXqAo}kF^4NQ#NHztw#gMweKLDqF7BYS@5O#Oim!KsoSl0am09M&ba3m| zvw!z*f9A74^V2{5>ufS0${=fSr%qM^Zsg=@ET2Xi;Ol8}(C!*YQQvpbM6q-2N>Sx) zsT23P2lX5Hsg!6%SqOM;dlH26#tI&t)Z*+-P~ID{Fon+vd)Z2h^E-7lllu}cL-oc2!^#>gDE9c|-j4o>Wrg zQ>HFQR)}mn;Ks_jo~Xi*B_IiY`O9Bcuw%B67he$*$Tk#B0yN+WjIbEMZ*Q-52Z^QJ zK)_hnTh-Qm(@G43iRkpn_8oQyrQTsR_3ApU+NYXIyv536=1vh&B+e_b|78lP*Yl;`A4N4yOk8T<1Zr=qh0Z-r zP)&RT1H^$cT~>enr~d0d_%HqVk3Tuyn%<9Eya+O0Lz~Vi;Q6F&;|`Ai$F}XWiE|Ne z7w;^mRF?5H!LlH^C_9ds9|ENMSiwL(?R>UJ+pc)u+SD}t=auI88LD@z%bj9hU~C-S zcQfXcY;J{cQnCL)l##tS>nNn~CcaQ4dWedx=XJo?R7A1UsMAXR6uMXSH@o0-nVls2w#=_9Uo(OtID}%%H{;IRK?FkaxCWvPk`yeW@s9;st1?M6KLYBa_AZfA$q_Fpy0ox=& zY71izRB5msxKw8W)JT8>D;kkKVA_9QS|#*ai52vC3W9izMOu97&;R)!`q%!AfBj#1 z;K2t!zLaq?S0MB%Y^j&_%(L61&erBOI|D=}dsAV&P|}K*x!r%9=!3d=dK0ArkQr3|VcI5gc-5HaVKxX$2Gl-GOnwb!2eyZ`%VKl|VP zw?Bi#Cl<+wsdWcO>YW&tW3J~jfUG-eHf(;P+Kw7xP)#}{SKU0m#QO#KCHDv;{blms zcgO1NJ6)dElRWV-FtvrM<6}DA(v&w%6I~eD0rft%<@%{)S7y5{3fFc3@*att@gaZT#5Yri- zJ*2J)r|Tx{DOyZqZwUm4=`FVC5Svus*d%#BEHXn{)L%XWeu3-+M?dzM6+971km_t* zIXoT^fO1XjcmzgYxnhjbSFc`9hliEs1``{&bRgsfXdY#f0hv#v^W87==uw(1m!eth zw3F$yIuliRhTb%rie5XDb6wJEGGZsxt6s>%-5F1+S###zGucx-!zU+V&>d?CZ`jvB zl>y#j14EH6YVAy!j!0E4Rf(4-$9PDMdUOQ=Gv$W{%H1?n>y_9At+>np=ZTo|8j{*` ze)?yA?$@9Gxu1LPU-%dP#T$R&Fa5;;7*4e87WFH?Fdn@v?%cLsja#f+qA)CVlbrjjZFpC?Wuz1l3k?S701*Q z=y6K*QYAQp8r@te-dcH#=J5UwX@_gxA#0n}Jw ze#!EFl`C^$T$%RSzz@dfd_GtEJW&)gQG0g=b9q-|B%`GuYRm$&K=UcZX&HeWusFdxJA0{S!xMYEa7x>15pQyfm{Azpowbz>4FYo5P zXTR78;sJgsm|wsU`J8_b;OlVet%9HRnzz`B19$uE_vJA=U<@fRJT_MJ+=>}L_0(he zfd}?9wM8ECz!O8n4tSO$H4Xrb6uD9g6lZ$6bbemp5FzS>(#m37b&9M$JxbLbggQ4H5!i7x5?8bGnA7s+gl z%ly=z{nR7>^1u3r|KJBc@Zcj`0)~XzL11%^eY|NxK69ZarBDsqR7hflt*~_fO(7W; zHob7DbzqqaJ7Bk0a>^<{bf<>)9=N9IrKvWpN`qC=Nh4*g=xb@+#uN6y?g+j<2q!pK zS#eH5wDUCEIRgw?JMg+Ko$WA}N_Ps|VWHMK$7AFotEW1rQDuSOf?0WXHoN)N7hd?a zfAoc4`qig@?!SL7Th3w^rowR-a)Co9j94rPZpO14LBquO0eH)V>th(}Jp3xTl$bQ@ ztx^v!?9KpR1okg2%c({BThoL|DpSSRPhF-fEs+EfGM3#147eg*?|&V&RQdB0`q+x(&9 z{DRp39u-mW#i0wGDvjP zBNpd~a|a4YBk5_dbnD<~AvNL@;pJ0W6LhI8XnK(S8D?LnnqXz&GwhwK(YQib&;aUW zMda;0;TRbypnl@RU}Uf1W1skj6#6A@sltO6IWcu;FFb3)=XC+RPz><3h7M z+#ar-B2--%UX~v8Og)?7bSOGWMO~W~nkziO1f}BO*dB?U&z&AQ!dk@lR~hN4F@`L- z&M83LkUa(2fj=7q#qF&$TpZS0Th~cr)7aabFNv+M(o|Hmui*PTymP0$E`SB0G1@Pl zU%(KXUwC~ZtCG&(9Yzh(-DzhIe>?8qfI@443L5cJRX?lHA@0fx;kc zn%O+V0*2;T@bxY+wlG)LI+g^n6)*`Vsnx@rs;Bm_vN#}DEByU?&cO$+pt%05HuNs-#>{4<7>hnUo z4i;G~ZKO@LUDxY@vQTHU)w;DUigR|yE4!Y3?y@hci`_DN4zQ>5S^%>Hp-yT6aGk9$ z6mXMXq%Xa3zFeNX{_1NlpPrtb{^oCf?WOsKo`!Bh%a`Gi7v6RwQnN^uteqW)86h>U!w2RSJ~PmjtXx5CH)Bt!eh8Q{1XxjRySG5hBuHPn$Jy z_7@wpeTv*^9yfaxsd9S)Do2Z>cC5C&ZC8KkE1fOR08cE2LwAlK4YE$IzcR0|NP>e# z!4GLKK+FQCE$z0G{FWvO62c}Ecm<(CFwU4JTe(D;6etISvE0W(r9h(N6!;=c$ls%= z>oUqjEp8U=sG36cin;|Cx4=zVPS!4G}kjorQ7?VTOz;SJTguIc(MLHf~n zylsc7(|EkKJ)VrVSA|0p*~S8@!_jEF{Kc=;926!|6(KLFbGq~@b>B3#txp?sv#IY_ zdW_3s`G?qkd47I6Ux=+DT?~ylm-X_#PLuc1!^49&Ogyd9t=n(B4&c02;Pu93GgIkowTfBJY<8 z;z<5f`m03x8yvKQ$)vfj?!E75Zy)){N170BXsEzOd-bxCq(lL=i2Ey9pNr&*&H>`# zb{BwX4TIiY39vXxXA3M&q{rD`s}bTC+_6NH6YS}66=5*Xx%-=#K$fV%5f%do5-$|0 zFrhIT7ISS04N1FqHXT@8U_-V^hAs=n7|Re@dWHw|SY``cF2^3qGL>_jrc=UR&crl4 z0T{=*88y{dV*!s^=|O|5BKaZW1BQ!*E!m&Y7n$VMTMU&x-^D4CTurW^9B(~NP-feK zOMv>UP384Wk{Xay@N?;~tqkmBBn?J3IfxL3!~igkMMM#spbW5ac#*Ymak3B^1xJ9f zd#@@E;aRaz8$X^&Ty#*)g>KZCAMbWh4P3nH8Sl%h8 z;{Ie^eJfcG_jP~WUg=R|{ty&od^Ta@7fr2>@eTk+7YPXv?f{kuP62WOe(^c2&Yzu1 z(S8GAFmKrl9PMu4M+=9DpmtU2?S3<)x2QLmn|<-c&&o|dmde;bJj8&btHBC>Za>g% zKJt+(B0V06R49)B>QFk})oe3!9eK2*-w|S?h0sqWrEFDkq!Fc!W7GDhN8DOM)6s z+|_0^F@?N1z_C%rUTO|!0Fzs5R9K|8;UGNQC{CL%|QJCI`E=VA|%!6XA$t>1Y0 zs`HFj20(5YOnN>Ku*TY0VQXqgIi^O5CcU->T4bhl4w|MhYU_de2e{X4Mu2smVPyv3@a1RD!@cLpV$->+*H@ksDuDhuIxA?^@hVz=rEyhMI8#Rje&~Y zRbB!2B4fT;LKu@Y7SZ}i0E~auI=I<*>{X5A+Q>E`ABRj5XG%2cuG$4vE7XQ*R_^7z z2{0a1W9(>DHfkOG6g&moRGsCzmG%o?)nKfuD)(g+Xa;&3v#bwt2#_{}G+Wq;d2ol$ zB3^=@7BROh4|2?{${XNTN9>FY>-v)Qc{#u;pZ#Q6pIg*3&IFdO+3@OwxkxmOyhTwW9D@9@@fd!Vs@NrjaF zG{!Gc94`H7wYPQP3k>-5r$5~gJ52P5Q(tYe<#pdf+YBtq`EAQ{Z;ujx(?!qvsC0-I;{3DOu(tXkN$ZC&!%;&-NgdtTOSP-1))fvW4CfBi_Qll&*qxPsj*zy65JV##+P6;=Q4yzsT*4MlrsN< zL=2J!zCq}_)YN2>M>gq18GW;n0RUtTlGDIOD(ApG+L(u8U^$^m(m>?0UUQ>BK*DKl z*MgbO)E_u;hJJ5@hFi+Udk6@E)L=kkQiEPmGm!21&Co!c;sgQ8y13pPxQiT|l(x!$ z8_FcoxMX9?wzczN=vRA~N`!iqwe7>c%UbWzBr&mFp4+u&h3AHQZtCO%*|uxibFi)k z^b}OmP`B3d0^bPOPDSsJzm_lv{(oqmReZIGd%WwuQaViW`Mz7?n51iuSRwjZeOdhb^F5CrJo`1jrHqLFo(`&oJWvCx~Dm zys5kdxh4yY=30-A8c}_xVy}ZLKY4I;txgdfVx-D3vx!H)YLzz293w|Z3*A;U;(>)R z^)^A&UVj$BFsA^I=fxGeMPh@&(b7!X=xpV8P(`K-`rK*OZ?xsN;zf)s&o6=&6HL@@)&r(vG2=VmO;RH8&;{EsRzBc~!k;!Wj%SLwaSx z!|N%N8t=6>Lfy6_G&NFPO=06mqkcd~j(Ls5C(zPvdyq5rd>sh2o=2#|$kt!RL0HM4me$WU~06>HyK+cmU^x17teOKtO+P9hZ zwyAxi5@0m#+<;zQ3ES6;>OK?46U9upLG=9RpSNUZfRDe2ABOV&2U64r1q2YKu^+^7 zf=L3pti!`e1JNRt-gu{FjoI1)ShCaTN^-u+O7}x+|W88J|aLCoyTT(wVyR)~WPlM65YxcqLM$oS_%9 zwpm@nB5d&Sd?(2gig5$9B}vPYtw>7DrG9ARjraEvLq6} z({-tw9TMP3gPJ{iV>nVe`#c(}B*+cQTdOt0Be|_G8zHcPpVjmY?L-TjqX}p{;3xxr zXf_t^vT(BCxobQK5+WsU8~9aP78BDC(wKJsyAjaRootfDJf6!eYHmmV(YEb3EXaMs z09e}p!uFR8wd1c`uZ{JQ+|11y+2QjY|CiMRFv$;_0W(UOA{WJzcoB%)0YERm?DXA< z$iT~9j{v?vt5U^_Wa5KC`ZRYnPz#1>yj_P1YT^WGEG5V)$whrs84NW^&EwzRhjIj08mhY(-;W1K{9_1`D4WS9_PG+Nl7PSpsJ&yl3(CtzGhL(_z-D@z$m{S_!~# zsYZb5hW~-7u<|hL01Jyw=URA%b4}WINU8KEb@mdYwF% zN@-<%DYXGmVe>P|PbXsa^jiNgH8`ucw^C_OKueZ)T61<}2SK%I7qnOO;q8uD3BZNm zwCV~Rsh2jx$V4OG_u4hDmM21pReQVLMA%CdJ7Qbk;ey~cbOn9;W2XkgvsC? zM%8uB!E_#Kv6&I_Fh!uWskzJ6)GFcyQE?abyw%DXgJo9d@&Lz)I15l2m3?O5dB&QG zqV>4cdprnLc*M0e9+#-skE11w^16Q-8z3;;s6;_JpLviqqawQo7kaNbTC{FY z7dewsp%~ji8{^uGb^3iZkPmOHT`S3F0~JbB?Vje;wB_*z?x{B0XDZeYRBcZt9cQnv zp||euveo!XacJOt5lIukv%yuX$rP2p@)$pr&}}lZ(nO{Wr?!j9OSOA@zNGesvR)dlC>lK~qWYsB2Mu*{00$ zK=V;MxS%0YU{rVu8z7WdWPDg8#84fAP~BhgN^fG4@O%(GXu;w3WD#N4e(92D?w0~9^jbY4nYDTF=9Ne$U&5c zsp@giWzi_987w1>OLiI#v%8yB(i1(nX|{6`X>hun3{J(!yVXp^GkNS_Hw7%|))g}) zHbK(ms4Rzlc{Up<=#lcXvorLNm|=y(mYk*X2 z+k1L@+o9Uf`rqngHZ_@B^g1*IMx{GF=Agfiwme4m+IbFS*}`HRz-#lw#yM0Q?+Owb zz#u%#2XTA-+|_02+2W$AOZ5f^Boa#Zu-NIm9ca@08&*%rBpZREYka@3w_AtU$l zZf#L{O>BJ_i&1w+KF~)A0TnJkbJXGJFnb@8A7&HNUKRp!X739Xc{<(F7{7TX_CA&D zESz&TThw7P3Z|FSp)tT*m76B20&4byN+iG3gB@C!_&wzN>z$fhro6E%J-<=#=+Q@S zHlO>P5hk-fRNu1j`Fikk8UI(<|5ADzVK3|L9oYcOpy>S#l+>&Xc9__O8^93)P1YB@ zdsH&Ya3JJ)j{YVIcCG9qZGs)U-Op$*B@;ogfJDlWWlSt<6h3z{@xVn4P&^(xj2&k-HO zKy5AF44b0)bd#&MW;4Tvhk7R#^5$GCeJ+>E;pKL{p?ZVEyQ$ZqDs@OO(6ig0o@23a z+nT76Lp;U9&gK^ONmDNwoWnNkYXJaZud;P+s|%Z*76LLAwOC)Py00vuUXeiW(XL0X zk>l%qxP8!%ZTDSAfU?K+shyP2cDA?5dCJ1<;D_@971vVPhN|K(%{-B_d;Ya3umPe;! z0@DoYDyEvnVyfXSNPTA4o_M{DS!?NTsJ&L%&HDM722$fJ40YJ;jfip@-$$^s3Ko~@ z{C$@%=b*S^6TH3=`a;@UIZl!O0{j5J@cc&m;unqWIZ9rJqZFS(Nv_(ehi`no@(gv>)zl}4MrSB4GywY)?rBfm748-!8{f$Uf zjLSi#A6{VM12YAdhN#EeeYzZVmBMRGk)=qbQ>k+ylHk@*&G*SwWB2Zc2&U2>h1nqw z8EC+>d5rl{Hmhtv7ZRRIQAkK89WR}XRk^naux@M3DiPqsgO22hFJBiI2*HLAc>~aw>?9!r1fCE)~;h7t`R2SZ2 z&4ST&Rn)00)E;m!)bWrWiKkJzF^$iQfl_z&BbDBe%j<}9BP*kqOtr>~dvDd&rq7~o zJn%6G*BRUg!ipT7r%qj#ag`19 zhJ`)QK(nwB>hmq~j8z?8hB+?w({&8%TBF{L)D;jrl}@{*tks&Gps9L;{#acoisc(e z!@ftB1i)foQ*|LYMzNGq4-QKO;~os_?znR9Tmoc#W^fC@w*C1BYpQZ?U5(Esndi=) zY4*5&yFnUN8iZXNsQY%UpQ})7s~k4X2yp>WmL6U*^lgX3)PbSx+tugLJb#%|Z;i*=vcEv+87W zDWQ50>`Orz{#4EJSzo=x%-|X}qXQt*p_8hdb*RlPjJ|LX>R_S<1gf&mD-QLSk@|!>A7_3 zMAaQ-V`*+GbDl#;(3vQTuonKb4o8F_4Tt807?~QZYVIg&CWn|oZ2x73j@Q)P*}SHH zN4#q?9!Jnvoi5#>;Y0_^stNEz+B=cXWSJh7W_cK;m4$R|R|{o%sdg*N>yWJD06#then@^Wy&(M|gkbaIFLHfpR_NTo&usgTtPma)p)Xo4 zqbzwzLwnp`WtUp#A?Uum6EE;P34pAY~21YK1IRhtbUfJ?MBQ{JW z2?i&^2!os7=L-!_Q()k~VKyptb7q=tkil=@P}fegu0UF8WhV_+(HXrd!f&)b1tB;V z--x!Sn!19dfKTngzA0P0qN;f&jMoE=BRpSPsEu96Fxz$1^?7X>gccu29fagzF&_V? zVL-9YZHx-y=Nh}{F@csJV)1w*1tv0UL_%BCZU=45hwIPIGB@zNS_aP0%1-LDV^TZE z?&m-^>_RWX0NL3g>zJ(6o-4b`dyOy_o8+?Efz8{Ry@v1DYk62vE|vPm#_6Yhpt7tF z3%#mzc`UE&T)-8Mzi~@wO62nbd{+{ncjpcTzovPHWOuqPn$GofhMk;no1Jb9YyTB( zh=6CkE;#;BcUgX293PCEJ5ij>#-NTfY<`TrsPP+4kB@)+<2i^9h~_}@lVi!geW9Ze zei;9J_RzR?&FPW+a|v|u=fG{!-#du|d{@F?{NnCv52Tf7UY5@cdtm(5dxalU5QHzx zD6{5TN;7H}1YrUN)_DoqeS#}ml$b_#biK1XAux{ zrwU^uoMJaTrKVE4G6^P`X{Q3uL?;%BuVa{DJm4wj`&{gR@T`gYFg!UqZlTu4ZZ;5E z1tu982o~-#B;-PA_EBT$VAMxZzCmg{q;o5`8FoQ?-X0ob6#OcIv(yrugP_mq(z}_V ztOjJw@rSG4V&R=K=rx2F*wpCW z6N|!X{bCrQC>|bz9dJC^vTdZad%8yd9QEeRSX zzcxI-T=QgAtyZPIAT`osVEyboZoQ-Jfls?-%BDqD9u&EoIYrO@CTJRD1Gf~UsKEm0MW!E z?Hzf6dn0R~!jtZD zG2sbji4^Ej-mPbcU<_4zfVssjFK{|Fl0Q-ywMK&Y*j-Wm(O$VMpuZ0ltG~HeA#*PYv2aUBGU#v!g2UTs_5ekC!ra!`O7q zJBOEenx`6$AS%PsRON{pt*dE8O$9u}qC=pPoOP-cu~;I!p{CU2yP_85F~x3jTdG^d zXAg4K>S3y`ngn8MSg6PDsU@AN_YmjY1?7g9R=^--_W%>%no~_05 zs@GEmA62bu_3Spo$xywj*|SVcVlvfwl+{bzh9@+u6gO;?6}dJYy1O6lMT3W3A~pS4 zuVVr)q$%oR)HAgl%7N?>Z5q1QwNceouL&ZF>{4-K*Cn9RbkAR(hskb!zDlLadcH78 zQ@!qlJv%EiUVN1|m93=%KYQ-#-E}j?QfEiJsz~>d%Z$Tg*36gc^Z+EQTHmK2pOcoF zO%F}N#=(}Ty{2(Yl9H*amsjtjIue!l4s0%>-Yzt7-U9oxdV043y}B*P~&_t59z z^#goK7C1iU`y~Se85>6ew09i*@cOcz0!O6LL3qmk;rIajO0O@HUr%;`HfLj*3U7qH zeCku?^+o8}FAAL(QeWr&?N+pXZR_?T9p5($e){gxyVTk>7T&xeSaB^Vdc`SHN`gqp z&pvyj`s|A@wvWyp&d&-EKKk&(nZhYz5YE&R4G@e#X*|PGQy59`%9Xu}f-ILW&nrsP z!&P?aT#O-*sN%*G5r0=J%2k94s3b^nb$**p$q_zl+b!b~)PtUebA<4jaRq-Gk|2%P zLA(FCc-kf!H)vAfSYZ=MY=kt1lVo9m)H;qd@bXDb~Pfaf;wD0a93p zM98_sbExr!Dz7Ay3YU17)6gWt36kM3f~r^EaY&BgI8o_t$xJ=yCqj29h)Jp?MsW}l zpBH^EWA*G|D-WJJUxq~rubwX%4})cE^l~KIwJL$uZ6~pYRI8eEE~HMlwTG*;MFWfZ z9=eE0AhHE|3kWsyro2W4=gv7qF0O6MeGiAdBgA7bbs`9(dTj~9`W*FIbt3T>Q}@(V z7T{jXL^hN@u?*Xw8Rj*HPaOGa+19g~3T_HKXLrt;@s4;-&%=y@$JegqM5Mc&(M~=% zh0Z>-D+_F9+eKwWrcB6Ng#ZEwR@GsRwxR{I&t@%YZo2|lv)Qf2DD7=q0Pyq_Rkz8% zBSOJdkD;xqYwclWP7mt(s#!_Yshr=Z*&ck4Y^;d)i)W1u@R!9Qf(-cbg%X!0{h8#) zIPbi^-TtN5xAgSpcQNpJy}fNZth=>BFYibZ%9|-KIP&{k=kM;0hhrf4M0)YX&$Um8 zG(23mtnR|vK%KV3a_=l^1`cMBUqImV{tJqFnlvyb?^1{TMJZY|7 zJIH_^L7Z0v4EOdH`B08?Dzn|COS}2botrh8A}1%OqCSYFXi?SF51DRV!{ymls4vsY z15mJOq;uulGDE6+Up>Omgd-WsSI&zX+>Qm@lB>g16drG19f&a69?QDQ8F9|H=7CgO$7{x$_o#9W@Q1v zL$P=*+d<(mPOj1tN-{E5>Fl0OvJuRgl#O}{wJn(~lHyOvY=hZ&<=fN&ijt_n=O^0( znqo2NfHG=Y*g3GP89D}8lXYxIOch6sfNL>k?>AM3AQ7MOOnb5x&Ax>ylrx$6$Hb;n`I&FT9KdB`qsaRp%Bjs233zg&?{89txjq*s(Lp6hXR3lY2v!hun;Fs0G0qC6@h{2)Zl3#mzE&%B7 zy_o_=9A8?TVCKiQY>F6miak!y2LKo_vNF1n|4o zlHztGQv7AC$p=*{VNdLkY)D76w!8-i8$ zWQIR!l&oRd8@0VWp^{dj?x-gib!cg7+~w`d>M#j=lCc2`B8^e6P^U%Z-5P1WD0;Bf zhIKEc7}-g%_k2@Ty)f;S`KNr(=4Q2hQ0o>rBg9KQ3g_0SaW8E<)bm^3Zm7?qUdsa< ziNj@4kMOoC!AYe~9Qyk3#uA&oz)_+>%k1m$sP|(*%;srzu+wJ}6jWhaFi@--tIKQ8r`A~YrF(ow zntid%W{wzbk0ZpzoEHL$cy$Hr)X}j#!>OeP=oSwzK#00K$>!M01yeJ912YPQk0S2Z zRPFBs&1`>odrgzMs_X8w zSFT*nHy}8@ZZ&B_>WguN-4D=1C63S+rMWM#U@F?1#`em80&*+qi9vR{=IrP^y}4kO zTEmqtB<$U4@8-eob}VkR3WH{>+%JkImFX|I#e)(%0Fm&Qt1n({f9w89_43P~?*b{y z7(qT`6O7uU26rCVst#Y4S*|*2EpND1hsM^{vIuV0xTWf* zfFpn?#*&N#h{|g&;w@!@Hc1e6=`mif)Q-=x*b&p-2s*7J4IbtXJi$pa@|q*W3+hdi zXS_427RR1K$BJ`0)iyOpQp6AT>afKOo}HfoN}VHRD6Ry8Ybo6BsaNKF0B1x*JVPat zYXH#IanhO^YEGG9D5>h`&_G~W=LD~*OV3jQ6;RQoG%$Gwzj2# zL>rC^KYw|@MD&TF}a^l5BI>_K)Dz!!jroeyURk{`zpvJiiV zn&Jlb4~NIZ{>fNC(mPgg0|2ED*TL>wk{p!rxq77@@Qk=JC8SLN@Y4@J-2AMJ<4y5? z`$mqE@1_QKFS57)<@`1&?|-lMu1SDls9ay2EHq}tu(>HSBwAk&p!Woz8=pshV2d5lQa#T2tr5hI3h@Ktg3uTPQr;Z7bGy zqW8~nh@5)Wu8Ag}*W3fr!#HbtQ%Ad{FZ(>Ld?!>UX#g!$=_2h7x0IFocs{Q~vg?U6 z#qd6xchVmf#Spj5*=tf{tqzB}nfIX`>J)IPb0tNObyEYLT0?PUpp0@zg!Wle#xR&h ztV@Vpe*B@ip~<{xo%X5rT-iD#(g-VIJHm3}FS}!+aspBMnTSTqIKE54ZAfukBaR?l z*Zqb74Kt4jr6cF`OW9*I<9@5U4^gQ#tuf_sJ3pSOw9T^@yB^U;n#IBS=r{hJlvSDY ztK%!1b7OC^*Y1vY+X#{3-Lt*L%#rD_&_YHL)Qq&ZSV(`HXR*s|X_yP(2WvC2ebz@S zjqjrwDeY-{>fmSIUhCI@E;MgQeFQlVJ=b?<2cnMS4iv?X7oo59^$>d2QvT&mmr-2Z!E_N5Yz`H9qFu^HIY2Ny}f13 zx>`H+P`#IgH(261Aa~T@p|cJ=mrj170jp_pDdh>gC-AgQT33Tb1+Fx&SnIc{x7hNF zPfyQOEmJBa@gAc}VMu2H?u>UjwrK%1^`c(dx)d1)TCddydk20R7bk!>%5J+FoBvbu zjtR=m*;HKRUQ|`B?syDc-OHxtHdC@00NkFPS-ia#Fgl$oKdyd+>1X1HLVH z7eI3m*P!9iI8;lejEeK2o*F31e4xR_RpAA9=CQ?msV0I(@3Dbkdg#}olgB7&MJmJR zj%hhmVJ$ZqK)gNL674lBeLV4cOe7K9PVP5hEO_|UY?1BV1vzQXHpxZqI2GD>=I18{ zg6HQasQL}6@X--rEtb=ZW5f9S%-*+HyjBNOvn_4HzI}TEMHprl{l4c84|05w{*e0U z+j33Hq7J#ia=B9>{r&cDpSdCSdV1-lmo(0=EMXbkeyF|xwT7Yz;0h2)LxA>&Z|);@3_625@4y`w(Fn63+y+s z@elxCWQ#=O0q*TR-vWXUKl~H6<8wx<4fyeu*@r(=U;d8hK~|)>4f?EjsSoe&R?ue= z(m`oWc+IG7Ac9~rT79ln3qCiYHrN9{PL@AuvnexhQ0y}UqgGlKEsWGxliCL71Wp59 z1EnI@Bz0o9#6CENRUw(d8_58h51A#`_pYFyFw}g} zQ8!RKTc1iT2IgJhEtw|(!cvWH7N()+kYC0lwY{}9z^LFyny^b@3JeZtoU3wDdj}KE zc2PST8&@J_iXE=7T`DlDyYWrkB|^2R@LhtYcTq#yIu`ap1EXrrc4~R zK2J3BM;u#xR<*N~oBE{!A*s@zfFqx0;;8%>0ndVe(`R37ANwLTd_-{Zj1L+BSgO0U zHKLTjjI<%^Bfs0yAMIV20Pg~B`un;a(48Y4?G3<(SZubxFQ_^kk>dnKU%mQDOKjjn z4;|-7tY$xIj6z?JVU|B$Sg5iQsU9!%#TSno2pr#dpI6K3A^}+QGF^ zv-`jUIcz7i=vc68!Ja`UB$0gJ0j5eZG#_-?A@dbm&767+H60pB5UKF|T(+GmO<-d) zKO~o@%iFgPsJ{w*c}whIB)+TjLx6IJ3=_{T(fh0ip{BLjvk6k_>yv1$h_S282rB@l zJ5#nqZ_>e!WQ8|VmRs8bRwg+rXe_nn>`3cdP?tgtsSvvglGvbE4=eGD;=ED7)yxZX zER2zUm$lciFlo@h&aOFiv5nzq=!iqD-i1C(xd)Zb^c=2^_HmJ&njWfgO2u)vB& zm8!0a$+RZpLY@~)D}zau2%R5Q-VI*sOw^2Ny$ko3yJiM`9f!-v70Xr&kmPU zrJvVwl=lAed1t;L2KD6RxH(bKGpS$gdq{)QH%#KIG^>MiShY6dMnmc$y6;r_#6fLT z_DLCCm}HUodO)-oKl&^tfMbn;rM8Dk)5_`Blbyby0)j|-Y9H5m^#QPMI!WR&B~q(BI<`P+^CWNC_7k&toQT&L4Q$QtzBmxURjJ57Hq6bK6QTHUwbLXKb4Q!FF7sW($B+ zrur_`p0zaECRraqMEFMl($aW}%fTy7D>Tpt^8@0x(C&%U5?V=trKUXw*y{VaCKIMuUgX$!mP^IYvw9-ZoiVrAM2DoWv})212x#7tcfaMuxsdei zZy^2X&`mIAZov;n;J5+bPGa&M4#`YGH#zAB8vW5I!E!4KjoP^FmjnO(dK;=Uzz67& zN*en!RtR$m>5nWdsOiwM;KPh4j2A=z3F4ARWh{P4gc4MD#wn7YGd(ro%#4f=K8Nt* zo{b2V>%ropAl2UG^E+zqss!i=9e*jM3)SPwz(xhXk~W|3kt=L@g7M1}8XS!}Y*nPL zwlDX#!0N`0lLnQTnF^-}>yZTcj^y|L_rJfB1n;}A&Xz5bD74-sc3Yi;V#TX}Y3|C*U2p)v{0j;9ksmyM*=_!6F4mo{A*HgK;r z8$*GP;}l^)$+9)N%n+nG1-dbL+42m>QD|u5j*?|(qut%zi9qVw)*<~lVFvHX>f7kE zM5;d*AS0|r!Ej1Hko%vmW>w)-Gc|a-H6T1_Y;v^_Et_!9nwWg)hl9bD24w}{J32}$ zRQBrVBd-?|&k*}JboSSi1v#5`#AZl-G2)2nqfbCQ5?&4|{6SE*o=`c+=NGKpO-gm=qXif z575hXX&l@WElvzIBaF@FiY<@l81*kid=jIj>{tXF%Hqn za8k-rt36`-1N46OXMc7@-KDJwJQqIiuMsQ11T7gCjhv#ITaW-telk461a8I)MkZs6AanRz3CdN=P<MaTr_RB!R}RFthVWo4P{2?%EO zHfpE^e|R7<)+62UhwboO!DS+b{AFzsC05)i27BbHnpCE0VJcMHDVO`RYa%CCu0#6Fj!4Kn3!F&7<8howOANQbZ+^2hKIPRx`uwA5EVS+hKyWT33y&zA>skK3aQX1Y&Pj z1|AyfQ(-tCjfN`|CBI|IK+V>@7U#(-idhJTY)>uZHkLfA<L;0J_5V}F3u6h`{6q+3Wj&j!up*utMHxbe&?Qc#xogPSy67L zg?w}u=4&K8c|NT?9~>Dwqg`1pY#;fKimQ)vaUPUVYH!27M>f#W`H`!XQ{`<@Td;h< zK0K3mxg{#DzGt2AWTHGf^TCftcix3unZxZ=ZO)W&;64Dpi0uRTBDlG#uBx4TZ?9&3 zL-)O2_4Yo(z^)1U9~?{?G@;1rMMDZ!XT}Q4sN>5x!r?I~Y<|%f5J)Ui!)kjV{b2)) zz~{TLyy$KE=L>|V*@K$JhQ>r)VR*w{dF3N| z0CTZF--gWr@C)`B8lK^Z4@8tN$r|}CFR5nMW41yCz&6NC_de+$B!43bR!RbSJ6V$W zzz3am#DwiZc!$u?X^e=laMnKb~(2 z@Po|2Jk3XFEfALA(s9F?l?-SEK2{<_-R@&3g!eUsWZRRW|HDM~AOer1LC z@_P0+RD-95L>L~Wm~{ZcXP&v;9S9JN5}P0Y_{XbX6*oPZBD}nCqlzOOE0~o zRpuBY6kWgn{`(UpH&GK| zlqd4vbP^0Rr%8HU1q7a{BnWA*J~bs;z&Qd@HJ{^Ik{Si;%$Xc_GM4os4UYF3rHAKt zq>$awi2F@%0E{Lnx+I*Osb*YCP_pklg_INxNlD2!#qq-u@`P+*9KE!p`%`>-;Z*h} zT_KH#L|DaAR7bKO^qfdin)>J4>3KPvujBV%$zdJG)&0&*%Hy1VJvqL|b;Ni7+*tjR zMH@?gQ?IvN6Q8ZVhSktOl~sXmVa3H=TGW2a3gR}IAUPJxiNZOi4!+ z(Wgqab&3?IImV_2-)^BZBG*_9%oZ8(@GX<|SFSw&XWddc8OK4EXJh_wrl@ zBEwNecGh7zxAQWHTdj2reHY+0(n+c`I4hX#jB>9^_n@dC)f(`rin-Ho(>L9gdde%E zSJ&CbpqjGM05FSV10Xw3x4(WyU2VNK^LTe0TD@M!IQ3wxsyS4Oz7B9($TK)U5%qOv zHxpVk*6RlNMlmt#cE@slk%Z-vjtPL*@~7&E5}>o?W#u1*CvWQD$K+$-O9FTz*-hHZ zxhp`#(qs4fAo-bt;k9hFdBx@@sxSR#;Gr#QMv%EOpH>QbG3j7;j{8LIl|EV{^+kva zp)K({eKaWSX{!1P0G2g8HmST3>ldV^FT2Y7^6qYTEaLqra2`zV!Qdogv00Dti-xch z)gjCAzCQlfa(=&QpjWnUDF8+?^Sa*ezo~&VnRi&PD;^x5-HC##P?eb?R$b0MV;e*= z#5ha32rm!E2nJhJVqPrEpwR*}zVxLpbveXHgm4PhQAkN8y!++aObU#d_3~vHr|~J= zX_q@<8*~s%PAUn{AT^02bOsw3%kAwOau3Jd%MFh?;Kz5FaPz724$3IW$OsISHY7%x zSF6JwC|H*!mnSQf;O&`!s4OQU>CII-5fE&HjA1Uv-V*@m2^s)FS_h8e!&w{y7&{e! z;f0-?-bbSZC+pxZ`X!bM>5^Ju9R-<#m*) z12e;9d`UK)_ma?L3fL+AnOgRAP7)`^{7}PJcqbGgN)SNIoS1aWB>afI6a2zvm+9^c+9L`8n{yT?2QjM7>LQN2f!h3x%wWjOjO#0M`SbR~)79 zcKenA;JQ1z0JaMT(BgA!vmyzG6bL9{7lb(Bkw4iEjIF~Uk&*d;vxlh7J1m*}{pWjiyo2hHc0S^_? z-vjSwc6%0HOAi?-Sz2&toH_;7w%Lb~_yD=VS##g?J|*ETC7+1tgT1PXVnyCieGg?x zeBZ-}dkEWajf;3-dkS)QaD>SI69c$Od#RHyiOI8x z#hxbWt(hLmR8IixOeY*NHm1`nFoVar8zgt#&P!18zS7yYOo+oKq6PFlp3THIy~QNe z#>A+O5OHcSY4R5i4u2M!-GP1^rCuTOAeY^8d9n0ePsI0Ot|7An(4+qXQkZyx$|`F0 z2B~nw_5}d)8KL3D7q4oF3;&be7Oc+B*xm+{QwezMQ60tdg4cHw7PJ@1Prs?{Tdo4@ zNmoVNyIw=g82f!q;Wn164-gESAfLl4#Z1+!!vNp0)f#@-zTa@0U~~ed_Yt7O0|p54 zo7e+aBr*fTE15iEFz`cSD|$%=sTN`hN&b9v&XUfUY)cVoBp! ztcSTUIS?73p)Jzqdu_;6Uo*U`P45>5%k%(Wc^i88F=iNSEm}!5+gdkw5(K!w)xZlklycQ`<#Xs0CG6 zY=XReW;;4S%z6#tJ|&Fo@h~X0xp%hP;|^jCn`Ukd4(IH|ebt8#vV&1C|Td(TQL zx*!-`gU=`W-YxrLs--07YOj;yZq0SSd3C1|DbZ@}Y7qN1ktPo#kGi$bJMs>!@*1Tl z2LgyYmAy0Te+GfZ2xQ=AgL^0XSRJGR(!9l2p~TQaV4NU}xoKSz1A(06(@sh5YsJPDl6u(DEODgucF#hv5G3a?y`<8owOI27epm&NyF`D)5)0*QXhaE6xpThg3 zOOmi785?O3FE7QJUv^hMVKLY^=B^Gi_l0vL)Pq=tql8XWdWq?5ugZRVr>6td4n#sa zqDhIn6}A|NCI?<#@G^y%s81}C5DpUPiAXG=E`t_nY9OmLH90)TETK6fc*fa1w78e8 z6H(9uWvx~TsxNftd>2)?@kxf-o;*ia&8BWY#85x=b+g%73blE9#bm^pZX|y*lY-h# z&E_D}kv`u#dwQ~Hgd4Kii^et-N768-}zl9NFLVzbPzVLuCLq^6(H0bsN1k3f|F(!Txk8xekD{_ii zciYlP)EuKyNefaYwNyh9SF$`IPr3a_uY4$xH{S5 zH0_A@!~jtS^XZv^p8z2PxUEhe(|>J5Hx|&RamY55Ji?NSYIZePdfuJ-cmFp_Rtf7;DN@<0aX4 zq80mQo^hckYp1TJ+P&Imi@7wQ0{D0?w`X=A>Vb#*abT+MOh9kP`5$RyWLRc~*=@0z zv5tUv*5!=EWJX@V59yxwN(>(p8(e+IT9oUO+V>)!FB}_W5~&@L^fl+LWKxYu*86oG z&W+%`3=YIHuCJ`zhSY0LL4S54?HS3i#rVZ`qDf_|d|&F~0m|GXzIeJo`k`@I712rEk?|Djwic+s5kr*$W z)*o*BJY+Hrs2j1ZW0$Oh#o>F#XWUXrD9@GTv@v4N!v>H# zJiMcsAdAIOO)+j5Z}@CX#m0Vvr_`iMk!TL*1>;H8FSk%n2lC7Y%8kdmJ9m!iZd*An zBoUB^fJ|{Lr>j%J`Yp$E~zTxS0z0Z1qYOwdH4TE5-cb zxm>#}cLzp3Iy^tGDQG^IXSGA-MK;Pa{sR1%kajg(Z@H?3;FFxd!giy0eG~i$|sJ1A>eTv?az0;75!h;|d}0kw-p-V4;7X{N!glyI+L36amlreLeR- zek+$g?sMrE_*R3To;Q7)+Fium{AMC^=`m&*#@5nPT;>qp^m+uU5@XEu^{Bwlc~rYe zgpcU|4>`khgvx}WIBJeW4dP89Gtm+GKA-PaM!IT7X*_fU*S_qAd6NbKzS~F#6|r1| z)KH*lse#m(zV9T>qL9Jyevu%e<}m|~0Yk_P-ovdeY8W$!rxns5cEeT+IC-@@8LZpd z$t(;bB$x=ru|_cVHIZD-{2VF;%Qa0ZV;#n8d72^whx9#-Pi&_-R7aCCk(x}6%({+T zXU}{{$(=Q#o=?GDJlba_gtFbNkC#LI%3kjx_Cq?G&(E8*b!x|1>mN}c!>+NH_S7*k zxl*Zz7Hg*$4&r{TNR&MjWB2w>$OJ9w>M5)~vd>xdh6X9`#M3%8@V@W9sXTi=pLWiS zQx9M!N1Sa5VL`&PfxhS8D=oiZv3w88q}TMJWL32Rv! z%NJt&z8#@2W&4&(fYCNcfu(Akd|kQy%IrZ4DX{cFdH%4j|J0{!=2Cm0yi{H+5+SqO z;~LGL(&LXmt}N4(@naum$TAoddkHfspQB3F`n}KzQAO~K@dw?0kggsb{bpTKZ+)Mr zXT#%(8_2IJp(_E^(32B#f>glZKpj@ch}e8iyrdzWJ_^|YdPowHE=8WG<%`OIgrjh8 z24#Pou$XM`RF>GU&Y7LI+O^MVi+x418XPtN*-RO;brczy{*UGU>QsWP25RzR;mFkdC>G`@btSE5+Y{{4OesAACtRp7R@@jiNK8y+? z`RTJ03~Kj8s@rp09e=2~T6g@+!db$BWyHBraqY;!&i5gJ8K!Y7&~(~VT8o#0T*oaz z1K9fLBiQ&30lguf-9y(3jIxP-MYoUSJS}(ArJzT zs6p4R;VE98%3#1=7^*M;cI;UIIiIwa4|>*7Aw~U?`TSOW_WGG_kLo;|y-|BfL?_R@ zj043+xKbUZm86#b_N(Q43DU{ThH(e&jwA9a{{CQ-D%{w$`T-*!Hj)= zSO*}@MV*8YLeC56x|i8L3!us|lrl{B1>EfTtbthm*n2@u@n8s&NM+$ek$eKeji>v%@;oR{$) z$kd2;BNL`bY}c#~H0$JjUL9O(vF%yr#`V@n3+#^!j;gw$;D&>PI<7Fb;NYruVQ_|Ov{(|H;!ds$d2QjS?-Vy=LQA39bo{1lIm*p1(@UZpS82Dmanv0PBKKaQ{ zZW@o}as|AK2#&mY$mb%a^4p{KmhIaLfSXzo3X_W&q-pzVb2`)bcl|w7V7EVX@kuO^ z28~_%3Efsy-wabNlHmUS7sRFi6D_&K4?lc6Q+m@V_g}^+t+OV};230oylJlsNHWWY zn!)`-rGd-GGn*LO^vh}-pAHbP1QfAd&1Scn2-oOqpPcHFKL7%706b1} zWG$Se!O$c!?2g0HQgnIQMkK@?0aTq~YmOt_*d*HHtTKVtiIiHBDvjL>8(o8x6=iy^dy zN{UZE{Y8z8xPANKX8$Ml(2_3TfU_{A7)zzpSJv<-$Du!u(AG-3VA~JxZ@<)6wr`sa zaJ{t!Ys}jEH;oP2-;iFjX&e4z7S!lIxGj-{u3lAO*$1%VtQs?01muEFuCYEM*y8}QAlD?#LT+8L6 zibC#(hYT>;lHNWZ`~Gch?->B3t%2aWk@Uj$`#r6ej?yB@`fjvZ6*fUW zP^6ic&5QobXP!*FZ`L6xmS9+h1`td575|KtFjQk&WR#SS5|*2Q@Kpi`lQ~VW>s+}q z@6ztHPD4svy3;j3zBu;u`}ONL1PJF^AN-Dh;T3|euUPiUrM*479@6j-;XIV$k{^Rm z8&7ZRo}q=^^n-sDc$>~X%V%@8)Ky5J0h)0vfK?9O?z9%enD^wh$g^ay^7~Dk3gVvy zkO~R64aW|E%I~L@IVyJjdbH#KLhV}dAHaQQ=Y9ufBM%5*s~sSz-}3tFCanQ>r>C!W z=Ogy=?Cdo!ZLrtff8^b2e{}Kzo+p8u*!h++vEZ$(I_Fit4BkjfQR|Nv*NiEIiH;?c zUo;D{ue)I8(zy|hP^?nx2(C-barbQq>%y-6^fS-oN0UW8paq%AYca8aAE~21^;0ia z*vCVa#ooslK;v4^=?$r`WOdmP%hz4&Ixv2#Q{3Kadrzsrxo1hyufFcC;8%*)A$CVp z`TkmZj=zv5jJo1I?p_40eP+O?o_Z=<`rJ$n!H>I_7|zv00l#0A&PC|V$DDp2bvRVx z$f+!eS80SKu#6hTEI<0uYsx=po&8lOs7xJcCGCcMzR`WZuD~aTY0dSdq~UnHU0;I& ziF(Ge9YBZ5MG!56^eSN$7~DOZK?a2PR*Qjq z_CnA#spG)xU@f3^BHsmz+sfnNtjwgSnK?U^dw;H75Bbp&qzRkft(xuhI34Gm*!pDK zlatrF>lzq6yn0~m8csW@kN7)mqd1A=`PVomEcC>jN!VAp@A25|d(g;-gG1hh5{Y_< z3U*3;u4HE%$?v43QD?)74Bb({!<=z^j5EtV^T#m`4hDk%TlIA(BqekODbL>bYaKTq zOM;kh-=1nHOH^YE@WTm*W`Wryq7kApTLdo?&cdYp(2xC?77l~5isIzRfB+xu>8GF8 z&q#XodBBg)j0Fcjo?#P=F6*jo2pH=Q$$hWr7Mhl?YaKM>@2=r)-_G`)k^sxrwkzsb zth+GF>~EmeqQy@8eRO(kuj?XQW>fIARhqj&4Uvq8j825t3^0uKe2#1p_93u3Nyh{P zzbumB$DLdu0;)^ZIQZCNS!S4^PG9sk->3hQgKS|n)|%#K#(3UbUS?{TY@MDCwBU{Z zPC_1G6-Xhd&0Y*AMSe2dD65DPH;4sox5=gCXZ#IEDjkI+1L3PaUjZM@SAF$WB^a$N zWv;@`gv$Ls`FqU)lmi8IyQ$OL8EH@Kgc)xuYOsiA3W!MAugZ4pcFC^=u$EQ@5h%ZL zJeH`YJB2D={?2dN@6!lc@zR>KM*Zh7Bao+T)Ka#DO1|t>mp`OH)`xn`XB;Ga2K;Ww zpg|?U7BiG3Aq}CT@F!A01qdP$hCL_37ibVx3J}$FdW_yN00^fM1xZvdV;mvA5N8UK z;Ar##E%Ht-GQ{!>++&e07@Qd1BlN~4zcxr3Fz92e!a#rI662*ymy=gbQ%T73QcYrH zT}X^bT^ei+JBb6_tL%pq=iwfLH0psysm#V(r_LNeiG5XqlXK2QI@9YB@A8?~vDJ_t zq%n8?oXYyvLV~og635W(s%oWVX({1y4eXbzKHzvZGs%wdBEZkQu}2PE#;eC?d1oE? zSsfP7-{o9l)4L@30L)#A)JnqiUDe?=@wx=e zb}dY%+bAkkMJ_Q?Ae{p*@$*kVt;dLv89tXG0>Lu#xM!6hCDK9Zv@9dHIPx#)@L?Au zR*R+9qmVylbOr(gfB_=ltA(13#>fh}Vu1*e4wU-SX&u+}yH*uWtN3BJ)1}a&G}8yMgYi1ADtX(E30jPo zl+ubvcfFMwSg~Cxu)Jr1FWP%r0xYG!GJa^iZFoU>?KmlIh+~S+(HSD@oluz@;vm6B z!mLThdGg_hnR^ijuv3} z!V53d447E|&_h#^^j`12%ki79eQj0`4h|F$@f>QsWBFW(G=dZqb|(RwY|`SW3Dq`o zl?lQ%mg|A0USYf9GvL7Q00iqJ`1(|AX8__@JRyJ`e`<5|)WvM}VIO zGOJnUVeNm>zapKD&tFK%K+ns`h6Avmu*zXHF9n2<>h?Fp@~zqa*0%}AWhb<}7h?V1 zti9(EI$Gf&-bk+cR$5`8z3@jz_~a))S(P@ysB0RI6H$jNkB}dfsdP_D2mC^EI(}C} z=$Q1?FMa7t8J{s!Lt!&K5!L0RZY%uWWZt}Bs3}8i!d@5zt$<_D_L~PeyvnZYK{;#Y(I3v`=j)kd~C z8H@D?B8gsENwe#JyZz#en%_!JG)yO#UB#sFoxJJg?ryaw$3`{R{bU=|`Pe76HDXJ>h2v{m_<4Y92w|iznh|gs0)HToO4Ru<8Z~VqKfEc#fIA^4y z@tNlhu*JJTvSWflsteCQ?=JQW=|7wp!OlY5-q0fmB50ZIpy;E|@R@$5w&>?p2@Ar$ z_i5>q|KRG?D%hFC9wK>}Un-?tFXqRulO@yZJw0$Q7U>7daUL;!W zT8QawL9503aO?Za>bx!c1>$NJbT zfKID!IW@lmqkvot6haaQ=ItG^2$z4E+l&Niu5&d_6_jkJ(!|*ObS+2BQMV>OM zG>kPE=OYf0C7{TXL z>MPrK3;=Fu5i58hkGKT6O<3~p?;|gg}tEA*7T&L-Z(w?3TkkiHUi1zY)UX`Ic98>ONP*x;6D1KJ}b?J-!05a6j z2>7KKeWjG{*Yz`CS00~MBb|NqtGxvGzW24aWFM}D{gj(g91sUDywHS{Y@o$GK>a_f z@4K(3G>c~u--An!=N4uIzBAc~1lGV34)F1v+S2m;E8aQ#mFA3)!h=Y|-$fUKD8g$&Y*v8#4T-pEAIR?PjLyHY7}PwsC7_y z$RedKM<&S^k_MXUGV+a|e)?&zjx`k<;-08B6sUfzyME(dvpTCW079+7Rv6(93>MU+ z7(8JZXONZlL!2wI4N@Wl6B|>sANi3V(E*K3@q51Kdpa8Spkx9-LS1Cw;|b*$EWcm2M+$qNOH_aqJa+7->1D=jqbm7F1l{`TU}&y?9?wUV3TC{iw*wA)bscpj+!`bueuwt#QmN=5e4kaWBsqYM=NsyA#A^QV5C3o_-dY9pco#8=-MH~_vFrY76H+_Q4Bjuc;fUKS z+hg({#uPLN`U|zL0XLD7yCUQ=!M2gER`kQJpGJIZm~YDB?akEV;&WQJ3C8;URSN!2Rfdkg@UrD#&W!-;qoa@HpV)g|X}Q!sD5}x47zAcB zyioymR=?ztu8@<``Fl+hwH7PGurdn0TZ?F~ zzJ^2DO2auV;t>Pqja*QE` zmCl^9#j(nD>|c6S%WWes_NA9z>O8LjMqvjfyd(fE04%;EQN^UOPI?PqhF5-l8%z;h zfvuv6+FSikqSlgs8(v%1!@c*#FFuo>dTQD}^UNyng}oR@hB?>FoD2X4Nk@Pl{YoU) z99l=2#liQo2zi+ozb@r%%G}u0O0ZkY%4$o8-7!lh>avBskmBvk==&I}<@iK zsu}x*)EaeJ*6UrYpF1SE62Ks2_|liY)RdBP*;1ZH zck$@1lM$DpFTZc3KicnS04!SvhTljGp>MmQPQ)zxW;9#@iV;(YoiMy};YsHA7zlKF zBts+s1_93sF!fL{_VOLB!be>a{IMVVF~VNRRLH@3M++6Jj2ZjUAN|ql7k}{=SJb-_ z3>n}d?I^2=(<-floyMzq*iK})1OY@GgY8(4@t+Kakf!1ou^;D0JufBF_&p?5&8hZn z;y7iVG=PUR7O|8xRqf^4`Tm>oH}vD8nwnbLOK#zeu&@(b7ZXD%MThDN@RcAKlT7){ z;oN(g$tn?y{CwL72s{x$Hjux%%sXFKYokS9c@vOZX|X=~W69XEDQ1s$H?8Qsp1=EU zw(k}I{Jm_1D>f0IEgSi(N@>uS7b4^%j35Pz>Mvd(N!zZ77PSop*746Cv z`N?IN4c|kRipF3B9AmJq0$U%K7`CeU{7cFp9NV*v9_R;(lY6`x-pe?i0-6BEgHF31 zAXrLUH=GnAK#ubSzz_z*Z$Xzu<9i${K$c90kY>vo7oggMF2#O5Sb6x(fjUA?)`8FN z)1+tT6zFPWhFnz6h1OjrY_CB^wAvi!iEq?_nk>*VD@S z*ZUjlZR{7h?FC<7r>&He^SZs;TWKnaW%~Up>D{e;*8t#pTYJ$ZNnl*aY@e0u(X%h)eKBEay_jd7d1giO3pSvVTd(x^uY%tbdcKGZfP>F@CsPT6k+D(K z+EqY`VEp~f+?FdGeH$Dfn@l$sz%KfBx|mS#UD3X)0C1BrcYT|;q87Jrp>o|i0N!Or z?<7Q834-BF@y~fvk?JxdrEKv%eqUv~ek2iIp=z~`d*8zaRQ1e_t+Z4Z*>-daX|M|~RD|`j{YsJ1->aF5T?YpKgBYr+%vP zZ9BVN338j(mG3m(vD|Mw2aeZ~kCq`U(LYMN-lnjX{ku@Yl}Q1G4X`Oe?>jkzl41ZxHUQum z87fF7Aq`@$vhN>paJ((Ye3ZdhnbgSoFKS$xI$%5&Ey8zL{{-M563pe$o>BC!iEpA7B#O%e88u9zadJzFMe= zYbXf-*p6dGfN_9adCs4Z>)`iKyL9$hS6>d4;6?xpQ%jlMw7+J9Zmlp;n^v=<%08A;AwjNd zKJ9y$ukV}P?n!_bTW14Ig>A6iz))SZmG$k0x~S`_Oh}2P{bubNE;w8E*GL-H)h3eO z`HYHHGG2=WI3U*SGoN{~T@zHg#<+zhz4t!ixwhY)kUu`&5HPsucF1U@Ju1zR9*1ZN-t%ZYV~i zAHK`f+&63Y0I+E72F987*>OG4y4^qxw7(&ly!6tgHI<|^T$jPv`>XL=dH*h?uImF& z&c`uQ1Z0ys#dVeT#u(UTU@gU=?DMLjp0*yk!Twy=69piaF>LFB-$+hzt~gex>H%!= zy{t}lH?MeXOG8R~>ZzxykZOIMdSD-Uq(3jW6B9rwy{)UUE=@PrOI(jtyc-RAv{+XHCM_f>`D;qMq;DJBC>XmfvI%f6ZI_u=Ve@PYz*#xw`gLxy!R;6IU^X!!m(GZF?`!FiT|ZuYj&~A(=j+?{?lGs`J8th1 zqt|V?=Gcg1uN~`Ndz8n{EI%{I!v+=W{QTXL-^2FE(t)UTP)nsIrEVARa-ESV z?$_(Je{@x6>ci~&=4 z30Ler`j*=54ANYzk9{rx##?D|t;Eh1`?oIXZQQwf`A zx?KrsskfW0oU^?C!ufE)W9rW$tyezVFYLAZ#e{@OVJ+h)7t-GPE#?x?;utAippMFG z`^2_gKgz4=m+hKq=5BWBd(z;&_N{5{-92i#?YRrn+A`L!tc%Ywpeq0V4gbZt*Uy_w z>R;J*-!fkGuh^&iE%qyai}kTA@2mV=Znu8#<+}BA_BPO#59#HgK=qYj3&T zMSWhESk~3STGG z_4OO>v%I%W&aDgYX8qi0!}EQU^WAIjfp+huyocH*32(ivNfsB#Ue~vID+6yWj`8>0 zr;L?czpl5k?S|j;rfXl{ws<}l?r)RibvKFmZqIhpHQ()7-tE3h33`(RneI6#?zMaE zUc1-swR`PeyVvfud+lDk*Y34@?Owar?zMaEUc1-swR`PeyVvfud+lDk*Y34@?VHs8 Ye|nA$9+m-T+5i9m07*qoM6N<$f?Gw4o&W#< literal 0 HcmV?d00001 diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx deleted file mode 100644 index a9f1cce51af..00000000000 --- a/src/async-components/structures/CompatibilityView.tsx +++ /dev/null @@ -1,149 +0,0 @@ -/* -Copyright 2020 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import React, { ReactNode } from "react"; -import SdkConfig from "matrix-react-sdk/src/SdkConfig"; - -import { _t } from "../../languageHandler"; - -// directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk -// PostCSS variables will be accessible. -import "../../../res/css/structures/ErrorView.pcss"; - -interface IProps { - onAccept(): void; -} - -const CompatibilityView: React.FC = ({ onAccept }) => { - const brand = SdkConfig.get("brand"); - const mobileBuilds = SdkConfig.get("mobile_builds"); - - let ios: JSX.Element | undefined; - const iosCustomUrl = mobileBuilds?.ios; - if (iosCustomUrl !== null) { - // could be undefined or a string - ios = ( - <> -

- iOS (iPhone or iPad) -

- - Apple App Store - - - ); - } - - let android = [ -

- Android -

, - ]; - const andCustomUrl = mobileBuilds?.android; - const fdroidCustomUrl = mobileBuilds?.fdroid; - if (andCustomUrl !== null) { - // undefined or string - android.push( - - Google Play Store - , - ); - } - if (fdroidCustomUrl !== null) { - // undefined or string - android.push( - - F-Droid - , - ); - } - if (android.length === 1) { - // just a header, meaning no links - android = []; - } - - let mobileHeader: ReactNode =

{_t("use_brand_on_mobile", { brand })}

; - if (!android.length && !ios) { - mobileHeader = null; - } - - return ( -
-
-
- - Element - -

{_t("incompatible_browser|title")}

-
- -
-
-
-

{_t("incompatible_browser|summary", { brand })}

-

{_t("incompatible_browser|features", { brand })}

-

- {_t( - "incompatible_browser|browser_links", - {}, - { - chromeLink: (sub) => {sub}, - firefoxLink: (sub) => {sub}, - safariLink: (sub) => {sub}, - }, - )} -

-

{_t("incompatible_browser|feature_warning")}

- -
-
-
- -
-
-
- {mobileHeader} - {ios} - {android} -
-
-
- - -
-
- ); -}; - -export default CompatibilityView; diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index 25ce1465c08..775e123b3fb 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -14,9 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -import * as React from "react"; +import React, { ReactNode } from "react"; +import { Text, Heading, Button, Separator } from "@vector-im/compound-web"; +import SdkConfig from "matrix-react-sdk/src/SdkConfig"; +import { Flex } from "matrix-react-sdk/src/components/utils/Flex"; +import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out"; import { _t } from "../../languageHandler"; +import { Icon as AppleIcon } from "../../../res/themes/element/img/compound/apple.svg"; +import { Icon as MicrosoftIcon } from "../../../res/themes/element/img/compound/microsoft.svg"; +import { Icon as LinuxIcon } from "../../../res/themes/element/img/compound/linux.svg"; // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk // PostCSS variables will be accessible. @@ -26,36 +33,184 @@ interface IProps { // both of these should already be internationalised title: string; messages?: string[]; + footer?: ReactNode; } -const ErrorView: React.FC = ({ title, messages }) => { +export const ErrorView: React.FC = ({ title, messages, footer, children }) => { return ( -
+
+ Element
-
- - Element - -

{_t("failed_to_start")}

-
-
-
-
-

{title}

- {messages && messages.map((msg) =>

{msg}

)} -
-
-
- + + {title} + + {messages?.map((message) => ( + + {message} + + ))} + {children}
+ {footer}
); }; -export default ErrorView; +const MobileAppLinks: React.FC<{ + appleAppStoreUrl?: string; + googlePlayUrl?: string; + fdroidUrl?: string; +}> = ({ appleAppStoreUrl, googlePlayUrl, fdroidUrl }) => ( + + {appleAppStoreUrl && ( + + Apple App Store + + )} + {googlePlayUrl && ( + + Google Play Store + + )} + {fdroidUrl && ( + + F-Droid + + )} + +); + +const DesktopAppLinks: React.FC<{ + macOsUrl?: string; + win64Url?: string; + win32Url?: string; + linuxUrl?: string; +}> = ({ macOsUrl, win64Url, win32Url, linuxUrl }) => { + return ( + + {macOsUrl && ( + + )} + {win64Url && ( + + )} + {win32Url && ( + + )} + {linuxUrl && ( + + )} + + ); +}; + +const linkFactory = + (link: string) => + (text: string): JSX.Element => ( + + {text} + + ); + +export const UnsupportedBrowserView: React.FC<{ + onAccept?(): void; +}> = ({ onAccept }) => { + const config = SdkConfig.get(); + const brand = config.brand ?? "Element"; + + const hasDesktopBuilds = + config.desktop_builds?.available && + (config.desktop_builds?.url_macos || + config.desktop_builds?.url_win64 || + config.desktop_builds?.url_win32 || + config.desktop_builds?.url_linux); + const hasMobileBuilds = Boolean( + config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid, + ); + + return ( + + {/* We render the apps in the footer as they are wider than the 520px container */} + {(hasDesktopBuilds || hasMobileBuilds) && } + + {hasDesktopBuilds && ( + <> + + {_t("incompatible_browser|use_desktop_heading", { brand })} + + + + )} + + {hasMobileBuilds && ( + <> + + {hasDesktopBuilds + ? _t("incompatible_browser|use_mobile_heading_after_desktop") + : _t("incompatible_browser|use_mobile_heading", { brand })} + + + + )} + + } + > + + {_t( + "incompatible_browser|supported_browsers", + {}, + { + Chrome: linkFactory("https://google.com/chrome"), + Firefox: linkFactory("https://firefox.com"), + Edge: linkFactory("https://microsoft.com/edge"), + Safari: linkFactory("https://apple.com/safari"), + }, + )} + + + + + {onAccept && ( + + )} + + + ); +}; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 39725bfee71..03b38fe3738 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -21,20 +21,24 @@ "invalid_json_generic": "Invalid JSON", "misconfigured": "Your Element is misconfigured" }, - "failed_to_start": "Failed to start", - "go_to_element_io": "Go to element.io", "incompatible_browser": { - "browser_links": "Please install Chrome, Firefox, or Safari for the best experience.", - "continue_warning": "I understand the risks and wish to continue", - "feature_warning": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.", - "features": "%(brand)s uses advanced browser features which aren't supported by your current browser.", - "summary": "Your browser can't run %(brand)s", - "title": "Unsupported browser" + "continue": "Continue anyway", + "description": "%(brand)s uses some browser features which are not available in your current browser. %(detail)s", + "detail_can_continue": "If you continue, some features may stop working and there is a risk that you may lose data in the future.", + "detail_no_continue": "Try updating this browser if you're not using the latest version and try again.", + "learn_more": "Learn more", + "linux": "Linux", + "macos": "Mac", + "supported_browsers": "For the best experience, use Chrome, Firefox, Edge, or Safari.", + "title": "%(brand)s does not support this browser", + "use_desktop_heading": "Use %(brand)s Desktop instead", + "use_mobile_heading": "Use %(brand)s on mobile instead", + "use_mobile_heading_after_desktop": "Or use our mobile app", + "windows": "Windows (%(bits)s-bit)" }, "powered_by_matrix": "Powered by Matrix", "powered_by_matrix_with_logo": "Decentralised, encrypted chat & collaboration powered by $matrixLogo", "unknown_device": "Unknown device", - "use_brand_on_mobile": "Use %(brand)s on mobile", "web_default_device_name": "%(appName)s: %(browserName)s on %(osName)s", "welcome_to_element": "Welcome to Element" } diff --git a/src/vector/init.tsx b/src/vector/init.tsx index 76c238d0e44..277321eba4c 100644 --- a/src/vector/init.tsx +++ b/src/vector/init.tsx @@ -109,12 +109,10 @@ export async function loadApp(fragParams: {}): Promise { } export async function showError(title: string, messages?: string[]): Promise { - const ErrorView = ( - await import( - /* webpackChunkName: "error-view" */ - "../async-components/structures/ErrorView" - ) - ).default; + const { ErrorView } = await import( + /* webpackChunkName: "error-view" */ + "../async-components/structures/ErrorView" + ); window.matrixChat = ReactDOM.render( , document.getElementById("matrixchat"), @@ -122,14 +120,12 @@ export async function showError(title: string, messages?: string[]): Promise void): Promise { - const CompatibilityView = ( - await import( - /* webpackChunkName: "compatibility-view" */ - "../async-components/structures/CompatibilityView" - ) - ).default; + const { UnsupportedBrowserView } = await import( + /* webpackChunkName: "error-view" */ + "../async-components/structures/ErrorView" + ); window.matrixChat = ReactDOM.render( - , + , document.getElementById("matrixchat"), ); } diff --git a/test/unit-tests/async-components/structures/ErrorView-test.tsx b/test/unit-tests/async-components/structures/ErrorView-test.tsx index 773c8106fd8..266511dba7a 100644 --- a/test/unit-tests/async-components/structures/ErrorView-test.tsx +++ b/test/unit-tests/async-components/structures/ErrorView-test.tsx @@ -16,8 +16,9 @@ limitations under the License. import * as React from "react"; import { render } from "@testing-library/react"; +import SdkConfig from "matrix-react-sdk/src/SdkConfig"; -import ErrorView from "../../../../src/async-components/structures/ErrorView"; +import { ErrorView, UnsupportedBrowserView } from "../../../../src/async-components/structures/ErrorView"; import { setupLanguageMock } from "../../../setup/setupLanguage"; describe("", () => { @@ -30,3 +31,15 @@ describe("", () => { expect(asFragment()).toMatchSnapshot(); }); }); + +describe("", () => { + beforeEach(() => { + setupLanguageMock(); + SdkConfig.put({}); + }); + + it("should match snapshot", () => { + const { asFragment } = render(); + expect(asFragment()).toMatchSnapshot(); + }); +}); diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap index 9af471f05bc..0bb96dc929b 100644 --- a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap +++ b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap @@ -3,64 +3,249 @@ exports[` should match snapshot 1`] = `
+
-
- -

- Failed to start -

-
-
+

-

-
-

- TITLE -

-

- MSG1 -

-

- MSG2 -

-
-
-
-
+

-

+ MSG2 +

+
+
+ +`; + +exports[` should match snapshot 1`] = ` + +
+ +
+

+ Element does not support this browser +

+

+ Element uses some browser features which are not available in your current browser. Try updating this browser if you're not using the latest version and try again. +

+

+ + For the best experience, use - Go to element.io + Chrome -

+ , + + Firefox + + , + + Edge + + , or + + Safari + + . + +

+
+
+