Skip to content

Commit

Permalink
Squashed 'linked-dependencies/matrix-react-sdk/' changes from f4b8458…
Browse files Browse the repository at this point in the history
…b1ab..225d19f9d90

225d19f9d90 Merge pull request #10 from tchapgouv/upgrade-v3.108.0
7f1435aa8e5 fix(conflict): merge conflict on roomheader and onboardingcontext
6cc5a1ffe7a Merge tag 'v3.108.0' into upgrade-v3.108.0
bdbd3e8456b Merge pull request #1098 from tchapgouv/1096-remove-force-rust-crypto-migration
3c89bf1c4ca feat(setting): hide personnal info
e843fd48fa3 v3.108.0
2be2763167b Upgrade dependency to matrix-js-sdk@34.4.0
750ee1ac1ac v3.108.0-rc.0
193ae628f07 Merge pull request #12904 from matrix-org/dbkr/prettierrc_cjs_staging
aee2ca224d3 Upgrade dependency to matrix-js-sdk@34.4.0-rc.1
cd4f30152f7 Call the commjs version of the switch script
c01ad91a947 Rename prettier config file to .cjs
2a11fd5beb6 Upgrade dependency to matrix-js-sdk@34.4.0-rc.0
4961e232530 Reset matrix-js-sdk back to develop branch
f0e90ad15a7 Merge branch 'master' into develop
20df553def1 v3.107.0
64d61744121 Upgrade dependency to matrix-js-sdk@34.3.1
fe8c0739f89 [create-pull-request] automated change (#12901)
c37cb9f0b1c [create-pull-request] automated change (#12899)
9f5b39b9d95 Ensure elements on Login page are disabled when in-flight (#12895)
3f386a6cacc [create-pull-request] automated change (#12898)
6f3dc306931 Message Pinning: rework the message pinning list in the right panel (#12825)
88cf643cbd6 Tweak UIA postMessage check to work cross-origin (#12878)
7a91e3efcfe [create-pull-request] automated change (#12894)
63615671a47 [create-pull-request] automated change (#12891)
d9846dc62d4 Hide pinned messages when grouped in timeline when feature pinning is disabled (#12888)
4751c52d82e Refactor the various email/phone management UI into a single component (#12884)
de898d1b62a [create-pull-request] automated change (#12887)
62e164173c8 [create-pull-request] automated change (#12886)
ad8da830796 Reset matrix-js-sdk back to develop branch
349c4a11e66 Resetting package fields for development
95b2f3ed600 Merge branch 'master' into develop
6df8423826e v3.106.0
269a9dfd22a Upgrade dependency to matrix-js-sdk@34.3.0
bdc4ca0cf2a [create-pull-request] automated change (#12885)
eacb22eac7b Add chat button on new room header for maximised widgets (#12882)
0e37c090427 Show spinner whilst initial search request is in progress (#12883)
239330b5e2f [create-pull-request] automated change (#12881)
5e98cbf409c Fix user menu font (#12879)
284cd4082b0 Update @vector-im/compound-design-tokens (#12876)
8e45d5053bf [create-pull-request] automated change (#12877)
ff15249f03f Make widget tests throw when a modal is shown (#12834)
11cc174d23c [create-pull-request] automated change (#12874)
a437c677bb5 Support delayed events (MSC4140) for call widget (#12714)
a35bf68f22f Stop the ongoing ring if another device joins the call session. (#12866)
2978b86e52c Allow selecting text in the right panel topic (#12870)
5d16a38b17a Rich text Editor: Auto-replace plain text emoticons with emoji (#12828)
e6835fe9d24 Clean up editor drafts for unknown rooms  (#12850)
6e7ddbbae9d [create-pull-request] automated change (#12873)
f71d8bdf2c8 [create-pull-request] automated change (#12872)
7a4783f9072 Import base64 utils directly from js-sdk (#12871)
8285283cc33 Make tests more resilient for React 18 upgrade (#12861)
4e4c5c7768d Rename general user settings to account (#12841)
1be4c12fd2a Switch to ghcr.io image for Synapse (#12869)
6ca4f670bf6 Update settings tab icons (#12867)
5519b81af9b Disable jump to read receipt button instead of hiding when nothing to jump to (#12863)
dde19f36ace Add missing presence indicator to new room header (#12865)
119bc3484e3 v3.106.0-rc.1
018c4f4f429 Upgrade dependency to matrix-js-sdk@34.3.0-rc.1
3a6ec1e0191 v3.106.0-rc.0
f42dca2e088 Upgrade dependency to matrix-js-sdk@34.3.0-rc.0
ca8d63af374 Revert: Re-add olm dependency which is needed for types
fe720ecbc4e Re-add olm dependency which is needed for types
3fff7bfeca7 Reset matrix-js-sdk back to develop branch
a047f69992e Resetting package fields for development
a7bc0e46123 Merge branch 'master' into develop
25e67beab6d v3.105.1
edf32d245a4 Fix types
d4819cf0549 v3.105.0
c7bbc1c0459 Merge commit from fork
73cc59894ef [create-pull-request] automated change (#12864)
cbd2379ff78 Fix formatting of rich text emotes (#12862)
92bf203a195 Fixed custom emotes background color #27745 (#12798)
54e5321f39e Clear settings caches on reset rather than custom lifecycle method (#12859)
090586439fe Preparations for React 18 (#12860)
accbe07439c Merge pull request #12857 from matrix-org/dbkr/email_phone_css_temporary_move
3c490fa1052 Fix comment typos
67f5c08301b [create-pull-request] automated change (#12858)
8dfe561225b Fix test to not use otherwise unused class name
69efe91bb5e More reanaming & snapshot
dd61eb932c2 Fix classname
d60d28d7c4b More snapshots
a6345424502 Update snapshot
da67dbcc873 Merge branch 'develop' into dbkr/email_phone_css_temporary_move
c1d4199b02b Upgrade target to es2022 (#12852)
77062ac721e Move General user settings styles to more specific places
9cd0c247a20 Convert general user to functional component (#12856)
127051892d2 Invite dialog: display MXID on its own line (#11756)
a38a5161ef2 Align RoomSummaryCard styles with Figma (#12793)
b6addb4118d Fix React contexts (#12855)
9b77279b3e5 [create-pull-request] automated change (#12851)
fa60edf00ff Ignore permalink_prefix when serializing pills (#11726)
e6a32386216 Deflake the chat export test (#12854)
a0c029c3c10 Fix alignment of RTL messages (#12837)
f3ac6692da6 Handle media download errors better (#12848)
b55653ddf0a Extract Extensions into their own right panel tab (#12844)
fae5bf1612d Remove topic from new room header and expand right panel topic (#12842)
2defb1041e0 [create-pull-request] automated change (#12847)
aeecba97e95 [create-pull-request] automated change (#12846)
2e6f8511f23 Extract useIsVideoRoom hook (#12843)
bc21ed30106 Fix picklekey debug (#12845)
02047243f0a Rework how the onboarding notifications task works (#12839)
dd20741b874 feat: Add autoformat and lint for ts/tsx files (#11806)
272a66baa5f Split up bodyToHtml (#12840)
66a89d8a844 Update tests for new unsupported browser view (#12836)
b0392b8fc38 Update toast styles to match Figma (#12833)
a1897583b14 Stabilise screenshot tests (#12835)
077549e4121 [create-pull-request] automated change (#12838)
a12c1874f92 Warn users on unsupported browsers before they lack features (#12830)
96777f84b54 Make micIcon display on primary (#11908)
c2c108957ee Add sign out button to settings profile section (#12666)
844da7a6563 Fix compound typography font component issues (#12826)
4e6b1c82e24 [create-pull-request] automated change (#12829)
76d2ab44711 Support pagination while querying for issues in flaky reporter (#12832)
95db2d943c4 Add some logging to pickle key save/restore (#12831)
25ab9e4e914 Revert "Use multiple workers in Playwright CI to make use of multiple cores (…" (#12827)
c1420ba1262 Allow Chrome page translator to translate messages in rooms (#11113)
3c370c6cbc4 Remove MatrixRTC realted import ES lint exceptions using a index.ts for matrixrtc (#12780)
2e0716cc59e Fix unwanted ringing of other devices even though the user is already connected to the call. (#12742)
72e7df0f13a Acknowledge `DeviceMute` widget actions (#12790)
6e9fc55cb45 [create-pull-request] automated change (#12824)
042f7a9a585 Update dependency posthog-js to v1.149.1 (#12823)
36d02aeda03 Update dependency @vector-im/compound-web to v5.5.0 (#12818)
efbd2073249 Update dependency @testing-library/jest-dom to v6.4.8 (#12810)
bacf738ac86 Update all non-major dependencies (#12815)
57f30f18d07 [create-pull-request] automated change (#12805)
20c205e4255 Update dependency blob-polyfill to v9 (#12819)
fc86c5df7fa Update stylelint (#12817)
8b55139f8b0 Update dependency @sentry/browser to v8.19.0 (#12816)
bbd583aadc6 Update typescript-eslint monorepo to v7.16.1 (#12814)
0b87caca243 Update playwright monorepo to v1.45.3 (#12813)
12f086eec92 Update dependency typescript to v5.5.4 (#12812)
182c81b864d Update dependency @types/node to v18.19.41 (#12811)
ae74e404746 Update babel monorepo (#12809)
f17d14bdab8 Hide tooltip when taking screenshot (#12807)
ae18bb9ba4a Update compound-design-tokens to satisfy compound-web peer dependency (#12808)
a35ab23eff0 Update snapshot (#12806)

git-subtree-dir: linked-dependencies/matrix-react-sdk
git-subtree-split: 225d19f9d9016d1c8dff3638cfcd0e58bc3123f3
  • Loading branch information
marc.sirisak committed Sep 12, 2024
1 parent 04e3118 commit f6f6765
Show file tree
Hide file tree
Showing 414 changed files with 9,378 additions and 5,132 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ module.exports = {
"!matrix-js-sdk/src/models/read-receipt",
"!matrix-js-sdk/src/models/relations-container",
"!matrix-js-sdk/src/models/related-relations",
"!matrix-js-sdk/src/matrixrtc",
],
message: "Please use matrix-js-sdk/src/matrix instead",
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/playwright-image-updates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Update matrixdotorg/synapse image
- name: Update synapse image
run: |
docker pull "$IMAGE"
INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
DIGEST=${INSPECT#*@}
sed -i "s/const DOCKER_TAG.*/const DOCKER_TAG = \"develop@$DIGEST\";/" playwright/plugins/homeserver/synapse/index.ts
env:
IMAGE: matrixdotorg/synapse:develop
IMAGE: ghcr.io/element-hq/synapse:develop

- name: Create Pull Request
id: cpr
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Switch js-sdk to release mode
working-directory: node_modules/matrix-js-sdk
run: |
scripts/switch_package_to_release.js
scripts/switch_package_to_release.cjs
yarn install
yarn run build:compile
yarn run build:types
Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged --concurrent false
5 changes: 5 additions & 0 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"*": "prettier --write",
"*.(ts|tsx|js|jsx)": ["eslint --fix"],
"*.pcss": ["stylelint"]
}
File renamed without changes.
67 changes: 67 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
Changes in [3.108.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.108.0) (2024-08-27)
=======================================================================================================
## ✨ Features

* Message Pinning: rework the message pinning list in the right panel ([#12825](https://github.com/matrix-org/matrix-react-sdk/pull/12825)). Contributed by @florianduros.
* Tweak UIA postMessage check to work cross-origin ([#12878](https://github.com/matrix-org/matrix-react-sdk/pull/12878)). Contributed by @t3chguy.
* Delayed events (Futures) / MSC4140 for call widget ([#12714](https://github.com/matrix-org/matrix-react-sdk/pull/12714)). Contributed by @AndrewFerr.
* Stop the ongoing ring if another device joins the call session. ([#12866](https://github.com/matrix-org/matrix-react-sdk/pull/12866)). Contributed by @toger5.
* Rich text Editor: Auto-replace plain text emoticons with emoji ([#12828](https://github.com/matrix-org/matrix-react-sdk/pull/12828)). Contributed by @langleyd.
* Clean up editor drafts for unknown rooms ([#12850](https://github.com/matrix-org/matrix-react-sdk/pull/12850)). Contributed by @langleyd.
* Rename general user settings to account ([#12841](https://github.com/matrix-org/matrix-react-sdk/pull/12841)). Contributed by @dbkr.
* Update settings tab icons ([#12867](https://github.com/matrix-org/matrix-react-sdk/pull/12867)). Contributed by @dbkr.
* Disable jump to read receipt button instead of hiding when nothing to jump to ([#12863](https://github.com/matrix-org/matrix-react-sdk/pull/12863)). Contributed by @t3chguy.

## 🐛 Bug Fixes

* Ensure elements on Login page are disabled when in-flight ([#12895](https://github.com/matrix-org/matrix-react-sdk/pull/12895)). Contributed by @t3chguy.
* Hide pinned messages when grouped in timeline when feature pinning is disabled ([#12888](https://github.com/matrix-org/matrix-react-sdk/pull/12888)). Contributed by @florianduros.
* Add chat button on new room header for maximised widgets ([#12882](https://github.com/matrix-org/matrix-react-sdk/pull/12882)). Contributed by @t3chguy.
* Show spinner whilst initial search request is in progress ([#12883](https://github.com/matrix-org/matrix-react-sdk/pull/12883)). Contributed by @t3chguy.
* Fix user menu font ([#12879](https://github.com/matrix-org/matrix-react-sdk/pull/12879)). Contributed by @florianduros.
* Allow selecting text in the right panel topic ([#12870](https://github.com/matrix-org/matrix-react-sdk/pull/12870)). Contributed by @t3chguy.
* Add missing presence indicator to new room header ([#12865](https://github.com/matrix-org/matrix-react-sdk/pull/12865)). Contributed by @t3chguy.


Changes in [3.107.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.107.0) (2024-08-20)
=======================================================================================================
* No changes


Changes in [3.106.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.106.0) (2024-08-13)
=======================================================================================================
## ✨ Features

* Invite dialog: display MXID on its own line ([#11756](https://github.com/matrix-org/matrix-react-sdk/pull/11756)). Contributed by @AndrewFerr.
* Align RoomSummaryCard styles with Figma ([#12793](https://github.com/matrix-org/matrix-react-sdk/pull/12793)). Contributed by @t3chguy.
* Extract Extensions into their own right panel tab ([#12844](https://github.com/matrix-org/matrix-react-sdk/pull/12844)). Contributed by @t3chguy.
* Remove topic from new room header and expand right panel topic ([#12842](https://github.com/matrix-org/matrix-react-sdk/pull/12842)). Contributed by @t3chguy.
* Rework how the onboarding notifications task works ([#12839](https://github.com/matrix-org/matrix-react-sdk/pull/12839)). Contributed by @t3chguy.
* Update toast styles to match Figma ([#12833](https://github.com/matrix-org/matrix-react-sdk/pull/12833)). Contributed by @t3chguy.
* Warn users on unsupported browsers before they lack features ([#12830](https://github.com/matrix-org/matrix-react-sdk/pull/12830)). Contributed by @t3chguy.
* Add sign out button to settings profile section ([#12666](https://github.com/matrix-org/matrix-react-sdk/pull/12666)). Contributed by @dbkr.
* Remove MatrixRTC realted import ES lint exceptions using a index.ts for matrixrtc ([#12780](https://github.com/matrix-org/matrix-react-sdk/pull/12780)). Contributed by @toger5.
* Fix unwanted ringing of other devices even though the user is already connected to the call. ([#12742](https://github.com/matrix-org/matrix-react-sdk/pull/12742)). Contributed by @toger5.
* Acknowledge `DeviceMute` widget actions ([#12790](https://github.com/matrix-org/matrix-react-sdk/pull/12790)). Contributed by @toger5.

## 🐛 Bug Fixes

* Fix formatting of rich text emotes ([#12862](https://github.com/matrix-org/matrix-react-sdk/pull/12862)). Contributed by @dbkr.
* Fixed custom emotes background color #27745 ([#12798](https://github.com/matrix-org/matrix-react-sdk/pull/12798)). Contributed by @asimdelvi.
* Ignore permalink\_prefix when serializing pills ([#11726](https://github.com/matrix-org/matrix-react-sdk/pull/11726)). Contributed by @herkulessi.
* Deflake the chat export test ([#12854](https://github.com/matrix-org/matrix-react-sdk/pull/12854)). Contributed by @dbkr.
* Fix alignment of RTL messages ([#12837](https://github.com/matrix-org/matrix-react-sdk/pull/12837)). Contributed by @dbkr.
* Handle media download errors better ([#12848](https://github.com/matrix-org/matrix-react-sdk/pull/12848)). Contributed by @t3chguy.
* Make micIcon display on primary ([#11908](https://github.com/matrix-org/matrix-react-sdk/pull/11908)). Contributed by @kdanielm.
* Fix compound typography font component issues ([#12826](https://github.com/matrix-org/matrix-react-sdk/pull/12826)). Contributed by @t3chguy.
* Allow Chrome page translator to translate messages in rooms ([#11113](https://github.com/matrix-org/matrix-react-sdk/pull/11113)). Contributed by @lukaszpolowczyk.


Changes in [3.105.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.105.1) (2024-08-06)
=======================================================================================================
Fixes for CVE-2024-42347 / GHSA-f83w-wqhc-cfp4

Changes in [3.105.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.105.0) (2024-08-06)
=======================================================================================================
Fixes for CVE-2024-42347 / GHSA-f83w-wqhc-cfp4

Changes in [3.104.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.104.0) (2024-07-30)
=======================================================================================================
## ✨ Features
Expand Down
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ module.exports = {
"last 2 Safari versions",
"last 2 Edge versions",
],
include: ["@babel/plugin-transform-class-properties"],
},
],
"@babel/preset-typescript",
["@babel/preset-typescript", { allowDeclareFields: true }],
"@babel/preset-react",
],
plugins: [
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-transform-numeric-separator",
"@babel/plugin-transform-class-properties",
"@babel/plugin-transform-object-rest-spread",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-transform-runtime",
Expand Down
2 changes: 1 addition & 1 deletion docs/playwright.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ need to have Docker installed and working in order to run the Playwright tests.
There are a few different ways to run the tests yourself. The simplest is to run:

```shell
docker pull matrixdotorg/synapse:develop
docker pull ghcr.io/element-hq/synapse:develop
yarn run test:playwright
```

Expand Down
28 changes: 17 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "matrix-react-sdk",
"version": "0.0.0",
"version-matrix": "3.104.0",
"version-matrix": "3.108.0",
"description": "SDK for matrix.org using React for Tchap",
"author": "DINUM",
"repository": {
Expand Down Expand Up @@ -70,32 +70,36 @@
"oidc-client-ts": "3.0.1",
"jwt-decode": "4.0.0",
"@floating-ui/react": "0.26.11",
"@radix-ui/react-id": "1.1.0"
"@radix-ui/react-id": "1.1.0",
"caniuse-lite": "1.0.30001643",
"electron-to-chromium": "1.5.2"
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@matrix-org/analytics-events": "^0.24.0",
"@matrix-org/emojibase-bindings": "^1.1.2",
"@matrix-org/matrix-wysiwyg": "2.37.4",
"@matrix-org/matrix-wysiwyg": "2.37.8",
"@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.6.1",
"@vector-im/compound-web": "^5.4.0",
"@vector-im/compound-design-tokens": "^1.8.0",
"@vector-im/compound-web": "^5.5.0",
"@zxcvbn-ts/core": "^3.0.4",
"@zxcvbn-ts/language-common": "^3.0.4",
"@zxcvbn-ts/language-en": "^3.0.2",
"await-lock": "^2.1.0",
"bloom-filters": "^3.0.1",
"blurhash": "^2.0.3",
"browserslist": "^4.23.2",
"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",
"electron-to-chromium": "^1.5.2",
"emojibase-regex": "15.3.2",
"escape-html": "^1.0.3",
"file-saver": "^2.0.5",
Expand All @@ -116,15 +120,15 @@
"maplibre-gl": "^2.0.0",
"matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "0.0.1",
"matrix-js-sdk": "34.2.0",
"matrix-widget-api": "^1.5.0",
"matrix-js-sdk": "34.4.0",
"matrix-widget-api": "^1.8.2",
"memoize-one": "^6.0.0",
"minimist": "^1.2.5",
"oidc-client-ts": "^3.0.1",
"opus-recorder": "^8.0.3",
"pako": "^2.0.3",
"png-chunks-extract": "^1.0.0",
"posthog-js": "1.145.0",
"posthog-js": "1.149.1",
"qrcode": "1.5.3",
"re-resizable": "^6.9.0",
"react": "17.0.2",
Expand Down Expand Up @@ -199,7 +203,7 @@
"@typescript-eslint/parser": "^7.0.0",
"axe-core": "4.9.1",
"babel-jest": "^29.0.0",
"blob-polyfill": "^7.0.0",
"blob-polyfill": "^9.0.0",
"eslint": "8.57.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -216,26 +220,28 @@
"fetch-mock-jest": "^1.5.1",
"fs-extra": "^11.0.0",
"glob": "^11.0.0",
"husky": "^8.0.3",
"jest": "^29.6.2",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.6.2",
"jest-mock": "^29.6.2",
"jest-raw-loader": "^1.0.1",
"jsqr": "^1.4.0",
"lint-staged": "^15.0.2",
"mailhog": "^4.16.0",
"matrix-web-i18n": "^3.2.1",
"mocha-junit-reporter": "^2.2.0",
"node-fetch": "2",
"playwright-core": "^1.45.1",
"postcss-scss": "^4.0.4",
"prettier": "3.3.2",
"prettier": "3.3.3",
"raw-loader": "^4.0.2",
"rimraf": "^6.0.0",
"stylelint": "^16.1.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-scss": "^6.0.0",
"ts-node": "^10.9.1",
"typescript": "5.5.3",
"typescript": "5.5.4",
"web-streams-polyfill": "^4.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default defineConfig({
},
testDir: "playwright/e2e",
outputDir: "playwright/test-results",
workers: process.env.CI ? "50%" : 1,
workers: 1,
retries: process.env.CI ? 2 : 0,
reporter: process.env.CI ? [["blob"], ["github"]] : [["html", { outputFolder: "playwright/html-report" }]],
snapshotDir: "playwright/snapshots",
Expand Down
2 changes: 1 addition & 1 deletion playwright/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/playwright:v1.45.1-jammy
FROM mcr.microsoft.com/playwright:v1.45.3-jammy

WORKDIR /work/matrix-react-sdk
VOLUME ["/work/element-web/node_modules"]
Expand Down
8 changes: 4 additions & 4 deletions playwright/e2e/app-loading/feature-detection.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ test(`shows error page if browser lacks Intl support`, async ({ page }) => {
await page.goto("/");

// Lack of Intl support causes the app bundle to fail to load, so we get the iframed
// static error page and need to explicitly look in the iframe becuse Playwright doesn't
// static error page and need to explicitly look in the iframe because Playwright doesn't
// recurse into iframes when looking for elements
const header = await page.frameLocator("iframe").getByText("Unsupported browser");
const header = page.frameLocator("iframe").getByText("Unsupported browser");
await expect(header).toBeVisible();

await expect(page).toMatchScreenshot("unsupported-browser.png");
Expand All @@ -34,8 +34,8 @@ test(`shows error page if browser lacks WebAssembly support`, async ({ page }) =
await page.goto("/");

// Lack of WebAssembly support doesn't cause the bundle to fail loading, so we get
// CompatibilityView, ie. no iframes.
const header = await page.getByText("Unsupported browser");
// CompatibilityView, i.e. no iframes.
const header = page.getByText("Element does not support this browser");
await expect(header).toBeVisible();

await expect(page).toMatchScreenshot("unsupported-browser-CompatibilityView.png");
Expand Down
5 changes: 4 additions & 1 deletion playwright/e2e/chat-export/html-export.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ test.describe("HTML Export", () => {
});

test("should export html successfully and match screenshot", async ({ page, app, room }) => {
// Set a fixed time rather than masking off the line with the time in it: we don't need to worry
// about the width changing and we can actually test this line looks correct.
page.clock.setSystemTime(new Date("2024-01-01T00:00:00Z"));

// Send a bunch of messages to populate the room
for (let i = 1; i < 10; i++) {
await app.client.sendMessage(room.roomId, { body: `Testing ${i}`, msgtype: "m.text" });
Expand All @@ -123,7 +127,6 @@ test.describe("HTML Export", () => {
await page.goto(`file://${dirPath}/${Object.keys(zip.files)[0]}/messages.html`);
await expect(page).toMatchScreenshot("html-export.png", {
mask: [
page.getByText("This is the start of export", { exact: false }),
// We need to mask the whole thing because the width of the time part changes
page.locator(".mx_TimelineSeparator"),
page.locator(".mx_MessageTimestamp"),
Expand Down
1 change: 0 additions & 1 deletion playwright/e2e/create-room/create-room.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,5 @@ test.describe("Create Room", () => {
await expect(page).toHaveURL(/\/#\/room\/#test-room-1:localhost/);
const header = page.locator(".mx_RoomHeader");
await expect(header).toContainText(name);
await expect(header).toContainText(topic);
});
});
2 changes: 1 addition & 1 deletion playwright/e2e/file-upload/image-upload.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ test.describe("Image Upload", () => {

await expect(page.getByRole("button", { name: "Upload" })).toBeEnabled();
await expect(page.getByRole("button", { name: "Close dialog" })).toBeEnabled();
await expect(page).toMatchScreenshot("image-upload-preview.png");
await expect(page.locator(".mx_Dialog")).toMatchScreenshot("image-upload-preview.png");
});
});
6 changes: 2 additions & 4 deletions playwright/e2e/integration-manager/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import type { ElementAppPage } from "../../pages/ElementAppPage";
export async function openIntegrationManager(app: ElementAppPage) {
const { page } = app;
await app.toggleRoomInfoPanel();
await page
.locator(".mx_RoomSummaryCard_appsGroup")
.getByRole("button", { name: "Add widgets, bridges & bots" })
.click();
await page.getByRole("tab", { name: "Extensions" }).click();
await page.getByRole("button", { name: "Add extensions" }).click();
}
Loading

0 comments on commit f6f6765

Please sign in to comment.