From e73628d5dc8387c8f818465e0a7efcd2f908b9a6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:30:45 +0000 Subject: [PATCH 1/3] Update actions/checkout action to v4 (#11569) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/cypress.yaml | 2 +- .github/workflows/element-web.yaml | 2 +- .github/workflows/i18n_check.yml | 2 +- .github/workflows/static_analysis.yaml | 10 +++++----- .github/workflows/tests.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml index b782266288..d2df5a26ca 100644 --- a/.github/workflows/cypress.yaml +++ b/.github/workflows/cypress.yaml @@ -142,7 +142,7 @@ jobs: run: | echo "sha=$(cat webapp/sha)" >> $GITHUB_OUTPUT - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # XXX: We're checking out untrusted code in a secure context # We need to be careful to not trust anything this code outputs/may do diff --git a/.github/workflows/element-web.yaml b/.github/workflows/element-web.yaml index d369641f17..9f8b098147 100644 --- a/.github/workflows/element-web.yaml +++ b/.github/workflows/element-web.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ inputs.react-sdk-repository || github.repository }} diff --git a/.github/workflows/i18n_check.yml b/.github/workflows/i18n_check.yml index e72f8ca7b6..a9ff110c27 100644 --- a/.github/workflows/i18n_check.yml +++ b/.github/workflows/i18n_check.yml @@ -7,7 +7,7 @@ jobs: permissions: pull-requests: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Get modified files" id: changed_files diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 13893058ac..32c69a8fed 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -20,7 +20,7 @@ jobs: name: "Typescript Syntax Check" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: @@ -61,7 +61,7 @@ jobs: name: "Rethemendex Check" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./res/css/rethemendex.sh @@ -71,7 +71,7 @@ jobs: name: "ESLint" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: @@ -88,7 +88,7 @@ jobs: name: "Style Lint" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: @@ -105,7 +105,7 @@ jobs: name: "Analyse Dead Code" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ad8fdab8c7..8dc9928e22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }} @@ -93,7 +93,7 @@ jobs: name: Element Web Integration Tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }} From f4dc264508d09ef6e4e4b9ce0ca9bc018ef44dfb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:38:17 +0000 Subject: [PATCH 2/3] Update dependency @percy/cli to v1.27.1 (#11567) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 240 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 143 insertions(+), 97 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8b39fb9820..bcc748cf32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -61,12 +61,12 @@ "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" chokidar "^3.4.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5": - version "7.22.10" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3" - integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA== +"@babel/code-frame@^7.0.0": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== dependencies: - "@babel/highlight" "^7.22.10" + "@babel/highlight" "^7.22.13" chalk "^2.4.2" "@babel/code-frame@^7.10.4": @@ -83,6 +83,14 @@ dependencies: "@babel/highlight" "^7.22.5" +"@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3" + integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA== + dependencies: + "@babel/highlight" "^7.22.10" + chalk "^2.4.2" + "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5": version "7.21.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" @@ -395,11 +403,16 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5": +"@babel/helper-validator-identifier@^7.19.1": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== +"@babel/helper-validator-identifier@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" + integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== + "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -428,7 +441,7 @@ "@babel/traverse" "^7.22.10" "@babel/types" "^7.22.10" -"@babel/highlight@^7.18.6", "@babel/highlight@^7.22.10", "@babel/highlight@^7.22.5": +"@babel/highlight@^7.18.6", "@babel/highlight@^7.22.5": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7" integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ== @@ -437,6 +450,15 @@ chalk "^2.4.2" js-tokens "^4.0.0" +"@babel/highlight@^7.22.10", "@babel/highlight@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" + integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.22.10", "@babel/parser@^7.22.5": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55" @@ -2078,105 +2100,106 @@ tslib "^2.5.0" webcrypto-core "^1.7.7" -"@percy/cli-app@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-app/-/cli-app-1.26.3.tgz#c45dea7b98461d68fc730edb96784dcb32fe2bab" - integrity sha512-+bHN0sXf0Q5FdXkgGKUBogSnvKytfx+lALMQ+4e+JTirSKrO4WbAnSOfvapAe1N/wMYMxhUY6z/iZsWhVDcWEg== +"@percy/cli-app@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-app/-/cli-app-1.27.1.tgz#615d42ab220082a388e4d6c6a266de1b7d28f8f9" + integrity sha512-Pat2BogPUmyciURUWbI1PQtUdPlhUrnS6aEVO1gNrulDeYF6j4LgD4SycCTj5L/xJijMXa3qFkZwW1VSdx97Yg== dependencies: - "@percy/cli-command" "1.26.3" - "@percy/cli-exec" "1.26.3" + "@percy/cli-command" "1.27.1" + "@percy/cli-exec" "1.27.1" -"@percy/cli-build@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-build/-/cli-build-1.26.3.tgz#fcaa02ff2c205a893c1db49358435a69f0fa0622" - integrity sha512-RwXrnT7j1yahtQXndyPCB0kTZ1rGmBCg6B2V/pysin+2AbGPc+CNjsqTpg7FXnSJ1QMnwhedMhJzbqrGgdKTZg== +"@percy/cli-build@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-build/-/cli-build-1.27.1.tgz#579e258539a97eee6feb41cfb797ee944fdc2d46" + integrity sha512-EtktlYj4kzsBkrBSOVLKrvZWew/nq9mw/Z2m8mU4Jf7Pc779rQGUVCuI8PBhOI59c3JTjnY8KVaaj4Y+z9X+fg== dependencies: - "@percy/cli-command" "1.26.3" + "@percy/cli-command" "1.27.1" -"@percy/cli-command@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-command/-/cli-command-1.26.3.tgz#2ff1e7235d6a2ea3eff1f83a4cc8fb14404a20ef" - integrity sha512-mIUgyO1q2XzDGt4IXxLbs0Qu54F0fvgl2j3o6C1WKHa90yLYDQ7SN/MY34n8iUem/tdNkBgk0Gzm4tODghzlNw== +"@percy/cli-command@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-command/-/cli-command-1.27.1.tgz#f8b18733930f316ac3a208956d62fac285a2c3b7" + integrity sha512-LK9YwE7qr67EtShVVjc20aJaRF8BFjZ8VWneLVoN73IYgpwBq96J4AUomoqfRpPNkpKvv6wDZFpr30xFokbrHA== dependencies: - "@percy/config" "1.26.3" - "@percy/core" "1.26.3" - "@percy/logger" "1.26.3" + "@percy/config" "1.27.1" + "@percy/core" "1.27.1" + "@percy/logger" "1.27.1" -"@percy/cli-config@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-config/-/cli-config-1.26.3.tgz#a1feb94bf8e83d12bbf7d1c27719d26a05085e79" - integrity sha512-pyH7HBXZFqAqBS6a1ltPirJG1PMjiBazD4dgzfAldKFREjBubhsLg1oZz6yUsbCJdnnVri0IfeJoVXfJ8l5Crw== +"@percy/cli-config@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-config/-/cli-config-1.27.1.tgz#ac2f73680559c9377ff238789b28bd9f19e54451" + integrity sha512-bEzXfdP+RRxHekZ5pULsuuKHL0K9E81IFcEqZ8DcE3gnrpWQnIFPP2fTHF6WgWuXYHzJnsoIIm90LaWYc4+BJQ== dependencies: - "@percy/cli-command" "1.26.3" + "@percy/cli-command" "1.27.1" -"@percy/cli-exec@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-exec/-/cli-exec-1.26.3.tgz#a0c3dc4315badfc2bccffe8eb452f334a3753053" - integrity sha512-8LTJMXGdsW+abnF2WdcRD5/xu8DQnPHiMYUkUMHHFt5TePEoAhgI0vokFtqJhJ6ZGpAJida77HppE1ncFkRakA== +"@percy/cli-exec@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-exec/-/cli-exec-1.27.1.tgz#4225a836a9bd8923102bab173000a752e13e0d50" + integrity sha512-8xB7Iq3fh+QfuViUeZQXZeJNoFzDf0IhYUhhlEDXPcL2sgjrLiy9QHBdq6Yn3/8gHlDJyzpkej6hzFqERYZs1g== dependencies: - "@percy/cli-command" "1.26.3" + "@percy/cli-command" "1.27.1" cross-spawn "^7.0.3" which "^2.0.2" -"@percy/cli-snapshot@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-snapshot/-/cli-snapshot-1.26.3.tgz#094569ce831075d1419e0f8d083bd62b32028bad" - integrity sha512-UQgvcMdL/XBBUmmGeUUmyB8TWu67rcOa2H8JAAsqNMaPqnrrKhNY5LMA7JIyxxLqtCIEa2ve9K5mD2DlPeXw4g== +"@percy/cli-snapshot@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-snapshot/-/cli-snapshot-1.27.1.tgz#d0a60ffa2d4be7e5a70a0ef8295a70a306017c2b" + integrity sha512-hVYATkHSN6Mz67LuP5QqRvdblg+kLb9dqGlaMJZI0CtuQYRtkbrlPz5yII9SJGMyUYMQHbZKsc68eT7+LZHKbA== dependencies: - "@percy/cli-command" "1.26.3" + "@percy/cli-command" "1.27.1" yaml "^2.0.0" -"@percy/cli-upload@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli-upload/-/cli-upload-1.26.3.tgz#8b4aa767fd0bff01c26138b48446aab31fdcdf61" - integrity sha512-1J9A5LKxg4nCM+t1mt1UcNWGvoA+2z6wnNdPTOpOIr/NBcSdrVi37mAcKpCmkr8herLI8c1XfLVWK48GPpDB1Q== +"@percy/cli-upload@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli-upload/-/cli-upload-1.27.1.tgz#30331f6a3aa4c66e79ad448853c5a60b3758af5f" + integrity sha512-4Kcft6ceuWy+Q5T4PKJXI63/QxCRFtCJUoU0QYrWo6TKKsescdE7/zWy6YESqHIm+XzBhZFYHwdYRsIbnjqUqQ== dependencies: - "@percy/cli-command" "1.26.3" + "@percy/cli-command" "1.27.1" fast-glob "^3.2.11" image-size "^1.0.0" "@percy/cli@^1.11.0": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/cli/-/cli-1.26.3.tgz#6503d48c635b627cad85b6abb5260e3d419f26ef" - integrity sha512-nhf8sP60pHCP+4S50bd1Vd0EkHeAXdh/lffek+wk732ItPlmhPZZ4gKzU1/oiC0xTVUFYw844Hmbw6hlRHZi4A== + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/cli/-/cli-1.27.1.tgz#e1943e3f29e0b8351e6e4f807ddf0c840f55680c" + integrity sha512-2rU4NFe8TshV2sF+fs8bseGNohpLuRILW4t/Is7PCFYAitla1nvO0mndy0INct5VWc2KKewnq+2ZQONx3iNXLw== dependencies: - "@percy/cli-app" "1.26.3" - "@percy/cli-build" "1.26.3" - "@percy/cli-command" "1.26.3" - "@percy/cli-config" "1.26.3" - "@percy/cli-exec" "1.26.3" - "@percy/cli-snapshot" "1.26.3" - "@percy/cli-upload" "1.26.3" - "@percy/client" "1.26.3" - "@percy/logger" "1.26.3" + "@percy/cli-app" "1.27.1" + "@percy/cli-build" "1.27.1" + "@percy/cli-command" "1.27.1" + "@percy/cli-config" "1.27.1" + "@percy/cli-exec" "1.27.1" + "@percy/cli-snapshot" "1.27.1" + "@percy/cli-upload" "1.27.1" + "@percy/client" "1.27.1" + "@percy/logger" "1.27.1" -"@percy/client@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/client/-/client-1.26.3.tgz#3c73878f02f963478b0ad3e6d78ec2669db0a695" - integrity sha512-A1D5MPKiGjLVynHO1VIA62jigC+KM/STjNkxj+oOBtBrSVynO+WvpqJckNHya/xtKaGPgJKxEYfaEbjy/iw2Dg== +"@percy/client@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/client/-/client-1.27.1.tgz#50c6ef4a9326263ad5241be1799f335c00d54c15" + integrity sha512-GvjrGUaVdjMwx8ODDja3Kdb6tXYxRxv4PLXfXg0Wbn5jIfcjicojOc0mSGxcLvRGu5tmKrE3fusMhYYtKlLihg== dependencies: - "@percy/env" "1.26.3" - "@percy/logger" "1.26.3" + "@percy/env" "1.27.1" + "@percy/logger" "1.27.1" -"@percy/config@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/config/-/config-1.26.3.tgz#17d4c00368e7d4f8e95f05dfdf7b8580b9b6072c" - integrity sha512-f2echEEP4JDwX+PxDwmVLiuhp9mjkPTyLjkPltgAEllembqsB7NYgS6HXRT9h7welTPNEof2j5fQCk1nthvGfQ== +"@percy/config@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/config/-/config-1.27.1.tgz#ac702cb49512de1057e41b74b0d50d76f6d7a8f7" + integrity sha512-O7GgSrpjPeRmUmPWpFrg7368lWTJj8BtKY18Ztpq2j7bef5HCFi0AxvuOjwIH/GEwzGm/cI7ZK2kA/XGTOtpsg== dependencies: - "@percy/logger" "1.26.3" + "@percy/logger" "1.27.1" ajv "^8.6.2" cosmiconfig "^8.0.0" yaml "^2.0.0" -"@percy/core@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/core/-/core-1.26.3.tgz#29260164bb77a5a8d277ff0481449b9e66a9b1d2" - integrity sha512-MtkcHEiG6CT5dOThYKXg8L7RVALCRYJjA2gP4O4qBg77FpTebHolHg04Z5IWQ3Uji5VYQCYiO5R0Bbose0G1/g== +"@percy/core@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/core/-/core-1.27.1.tgz#f2f3041fa89982e0e432e5b871c6985bb2e6a34e" + integrity sha512-/XsOCk/XHYf9MAqcituMGrYeITiav9BW1oGM0LfmU1Gne/YnEvur4JwpJ4uJ0OrNennwIqMuAVM9Y5y/xfZ39w== dependencies: - "@percy/client" "1.26.3" - "@percy/config" "1.26.3" - "@percy/dom" "1.26.3" - "@percy/logger" "1.26.3" + "@percy/client" "1.27.1" + "@percy/config" "1.27.1" + "@percy/dom" "1.27.1" + "@percy/logger" "1.27.1" + "@percy/webdriver-utils" "1.27.1" content-disposition "^0.5.4" cross-spawn "^7.0.3" extract-zip "^2.0.1" @@ -2194,28 +2217,41 @@ dependencies: "@percy/sdk-utils" "^1.3.1" -"@percy/dom@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/dom/-/dom-1.26.3.tgz#1821d000763abe7dfe36a3811ee8b18be7df88a9" - integrity sha512-BlYBn6zbq2icx0mjIFKUFUdgZmoP3md11UXNfLGzaIeIxWXQ0gn+nJqEm8SKxdValJ59eOiL4Hq8tRV2M8y+Gw== +"@percy/dom@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/dom/-/dom-1.27.1.tgz#96f3814265d8d4937db9e69854ce9ac6d8bab66a" + integrity sha512-duYA3ATjADtn05VuGIfezgdCq+8ASwcY6Mzk857DzFIlJd/6T2P8v1dy66RRp78efzmIMtRroGy9SqWonlaAEA== -"@percy/env@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/env/-/env-1.26.3.tgz#ed55436b0ae11e23159ee3677083c957e3e111e2" - integrity sha512-8IIX2byb9Q8WZkVw9MfnwVh6GCebbTgfxffTjoE9yVpK7/1BAPJ0HVPF2WR3Y9xi/eJirnO70Y5J913OQ5hsIQ== +"@percy/env@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/env/-/env-1.27.1.tgz#e1e6bedcecd97c5c9fec48a5c49e6bc860003c0c" + integrity sha512-Og0vQfV9zJftYYOY3PVtu+r7Ut/xr72BP3jH3rkeQJHnFKLkwemGbJpgSpMz7IbzWXSxYONkNfUtLvXwEsRpAw== dependencies: - "@percy/logger" "1.26.3" + "@percy/logger" "1.27.1" -"@percy/logger@1.26.3": - version "1.26.3" - resolved "https://registry.yarnpkg.com/@percy/logger/-/logger-1.26.3.tgz#26cb2a12102e5827b12f01a77f71eb87fd4919de" - integrity sha512-a4GpCFnI0RrDwxLWYgJxIFFUUgrvu1EAWgP+147qsTZp9F7NTdkNUeVLZmtXXY8L0Znk7qyKJzX9McBJgl8kEA== +"@percy/logger@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/logger/-/logger-1.27.1.tgz#3695738c39ac0f31d4348b0d615ddc059e18fa31" + integrity sha512-jH++paKzIY94fQYQBEedVTfO36I8WBqm2RNl/xzsnLuAwNEX5+JUsaPcbLrwRzhn/tCv+8h9xEBuE9nj23krIA== + +"@percy/sdk-utils@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.27.1.tgz#e1e382630739bc6f0d3b5731d2086350e2df54dc" + integrity sha512-I12rBQYySyt8VILgYnI19obYtkaIPuFR07HVBrHLsRHiLUf92XzAtTI482qrnYwybCgU9mb9o3Kb7KtMJ0nalA== "@percy/sdk-utils@^1.3.1": version "1.23.0" resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.23.0.tgz#7e3eb8a128952c548b3cc7213c65f620e3d09ec7" integrity sha512-FPXMOsK7SIh6NuK+wnr/O35bPN8cyYDGsXqkE5EWwf7Frs+QXFIejlYM9t1SckoxlDpS1YsPYJABv+CUsuJIlQ== +"@percy/webdriver-utils@1.27.1": + version "1.27.1" + resolved "https://registry.yarnpkg.com/@percy/webdriver-utils/-/webdriver-utils-1.27.1.tgz#ebf13f72a7a341f6e5a6bc32b1f5903c4f93fe5c" + integrity sha512-bPj16YmvV84egtMHyYEhlGYjwJTk0f6vopcbCYWgMgvQp78Y/RKwRm8ZpWZfW2rTqElNRudrhKdqcEeaG6qd9g== + dependencies: + "@percy/config" "1.27.1" + "@percy/sdk-utils" "1.27.1" + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -2800,9 +2836,9 @@ form-data "^3.0.0" "@types/node@*": - version "20.5.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.3.tgz#fa52c147f405d56b2f1dd8780d840aa87ddff629" - integrity sha512-ITI7rbWczR8a/S6qjAW7DMqxqFMjjTo61qZVWJ1ubPvbIQsL5D/TvwjYEalM8Kthpe3hTzOGrF2TGbAu2uyqeA== + version "20.5.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.9.tgz#a70ec9d8fa0180a314c3ede0e20ea56ff71aed9a" + integrity sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ== "@types/node@^16", "@types/node@^16.18.39": version "16.18.43" @@ -4074,7 +4110,17 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^8.0.0, cosmiconfig@^8.2.0: +cosmiconfig@^8.0.0: + version "8.3.4" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.4.tgz#ee1356e7f24e248a6bb34ec5d438c3dcebeb410c" + integrity sha512-SF+2P8+o/PTV05rgsAjDzL4OFdVXAulSfC/L19VaeVT7+tpOOSscCt2QLxDZ+CLxF2WOiq6y1K5asvs8qUJT/Q== + dependencies: + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + path-type "^4.0.0" + +cosmiconfig@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== @@ -6020,7 +6066,7 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -import-fresh@^3.2.1: +import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -10237,9 +10283,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^2.0.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" - integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== + version "2.3.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.2.tgz#f522db4313c671a0ca963a75670f1c12ea909144" + integrity sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg== yargs-parser@^18.1.2: version "18.1.3" From c825e34f16fa7becdbbf14b98b7bdfc879dbc7a5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 6 Sep 2023 20:55:24 +0100 Subject: [PATCH 3/3] Fix EventTile avatars being rendered with a size of 0 instead of hidden (#11558) --- src/components/views/rooms/EventTile.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 986eafcca9..77fb270768 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -1003,7 +1003,7 @@ export class UnwrappedEventTile extends React.Component let avatar: JSX.Element | null = null; let sender: JSX.Element | null = null; - let avatarSize: string; + let avatarSize: string | null; let needsSenderProfile: boolean; if (isRenderingNotification) { @@ -1021,7 +1021,7 @@ export class UnwrappedEventTile extends React.Component avatarSize = "32px"; needsSenderProfile = true; } else if (eventType === EventType.RoomCreate || isBubbleMessage) { - avatarSize = "0"; + avatarSize = null; needsSenderProfile = false; } else if (this.props.layout == Layout.IRC) { avatarSize = "14px"; @@ -1032,14 +1032,14 @@ export class UnwrappedEventTile extends React.Component ElementCall.CALL_EVENT_TYPE.matches(eventType) ) { // no avatar or sender profile for continuation messages and call tiles - avatarSize = "0"; + avatarSize = null; needsSenderProfile = false; } else { avatarSize = "30px"; needsSenderProfile = true; } - if (this.props.mxEvent.sender && avatarSize) { + if (this.props.mxEvent.sender && avatarSize !== null) { let member: RoomMember | null = null; // set member to receiver (target) if it is a 3PID invite // so that the correct avatar is shown as the text is