Skip to content

Commit 3c8fcbd

Browse files
committed
Merge branch 'refactor/event-tile' of https://github.com/ZacksBot/element-web into refactor/event-tile
2 parents df7c20d + d3ccc8e commit 3c8fcbd

287 files changed

Lines changed: 5412 additions & 3522 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/renovate.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,39 @@
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": ["github>matrix-org/renovate-config-element-web"],
44
"postUpdateOptions": ["pnpmDedupe"],
5+
"stopUpdatingLabel": "X-Blocked",
56
"packageRules": [
67
{
8+
"description": "Group all testcontainers docker digests",
79
"groupName": "testcontainers docker digests",
810
"groupSlug": "testcontainers-docker",
911
"matchDepTypes": ["testcontainers-docker"],
1012
"matchPackageNames": ["*"]
13+
},
14+
{
15+
"description": "Separate updates to overrides from other groups",
16+
"matchDepTypes": ["pnpm.overrides"],
17+
"groupSlug": null
18+
},
19+
{
20+
"description": "Disable any major updates to overrides as this almost always is wrong",
21+
"matchDepTypes": ["pnpm.overrides"],
22+
"matchUpdateTypes": ["major"],
23+
"enabled": false
1124
}
1225
],
1326
"customManagers": [
1427
{
28+
"description": "Update testcontainers docker digests",
1529
"customType": "regex",
1630
"datasourceTemplate": "docker",
1731
"versioningTemplate": "loose",
18-
"description": "Update testcontainers docker digests",
1932
"managerFilePatterns": ["**/testcontainers/*.ts"],
2033
"matchStrings": ["\\s+\"(?<depName>[^@]+):(?<currentValue>[^@]+)@(?<currentDigest>sha256:[a-f0-9]+)\""],
2134
"depTypeTemplate": "testcontainers-docker"
2235
},
2336
{
37+
"description": "Update element-desktop hakDependencies",
2438
"customType": "jsonata",
2539
"managerFilePatterns": ["/(^|/)package\\.json$/"],
2640
"fileFormat": "json",

.github/workflows/build-and-test.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ jobs:
206206
needs: prepare_ed
207207
name: "Desktop Windows"
208208
uses: ./.github/workflows/build_desktop_windows.yaml
209+
# Skip Windows builds on PRs, as the Linux amd64 build is enough of a smoke test and includes the screenshot tests
210+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests')
209211
strategy:
210212
matrix:
211213
arch: [x64, ia32, arm64]
@@ -223,10 +225,13 @@ jobs:
223225
arch: [amd64, arm64]
224226
runAllTests:
225227
- ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests') }}
226-
# We ship static sqlcipher builds, so delegate testing the system builds to the merge queue
227228
exclude:
229+
# We ship static sqlcipher builds, so delegate testing the system builds to the merge queue
228230
- runAllTests: false
229231
sqlcipher: system
232+
# Additionally skip arm64 system builds on PRs, as the amd64 test is enough for a smoke test and includes the screenshot tests
233+
- runAllTests: false
234+
arch: arm64
230235
with:
231236
sqlcipher: ${{ matrix.sqlcipher }}
232237
arch: ${{ matrix.arch }}
@@ -236,6 +241,9 @@ jobs:
236241
needs: prepare_ed
237242
name: "Desktop macOS"
238243
uses: ./.github/workflows/build_desktop_macos.yaml
244+
# Skip macOS builds on PRs, as the Linux amd64 build is enough of a smoke test and includes the screenshot tests
245+
# and we have a very low limit of concurrent macos runners (5) across the Github org.
246+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests')
239247
with:
240248
blob_report: true
241249

.github/workflows/shared-component-visual-tests-netlify.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ jobs:
2525
actions: read
2626
deployments: write
2727
steps:
28-
- name: Install tree
29-
run: "sudo apt-get install -y tree"
30-
3128
- name: Download Diffs
3229
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
3330
with:

.github/workflows/shared-component-visual-tests.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ jobs:
4545
working-directory: packages/shared-components
4646
run: "pnpm test:storybook --run"
4747

48-
# Workaround for vis silently adding new baselines if they didn't exist
49-
# Can be removed once https://github.com/repobuddy/visual-testing/issues/516 is released
50-
- run: |
51-
git add -N .
52-
git diff --exit-code
48+
- name: Detect stale screenshots
49+
run: |
50+
if diff -rq __baselines__ __results__ | grep "^Only in __baselines__"; then
51+
exit 1
52+
fi
53+
working-directory: packages/shared-components/__vis__/linux
5354

5455
- name: Upload received images & diffs
5556
if: always()

.github/workflows/static_analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
voip|element_call
104104
error|invalid_json
105105
error|misconfigured
106-
welcome_to_element
106+
welcome|title_element
107107
devtools|settings|elementCallUrl
108108
labs|sliding_sync_description
109109
settings|voip|noise_suppression_description

apps/desktop/hak/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"compilerOptions": {
3-
"moduleResolution": "node",
3+
"moduleResolution": "node16",
4+
"module": "Node16",
45
"esModuleInterop": true,
56
"target": "es2022",
67
"sourceMap": false,

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"prettier": "^3.0.0",
101101
"rimraf": "^6.0.0",
102102
"tar": "^7.5.8",
103-
"typescript": "5.9.3"
103+
"typescript": "6.0.3"
104104
},
105105
"hakDependencies": {
106106
"matrix-seshat": "4.2.0"

apps/desktop/playwright/element-desktop-test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import { PassThrough } from "node:stream";
1717
* A PassThrough stream that captures all data written to it.
1818
*/
1919
class CapturedPassThrough extends PassThrough {
20-
private _chunks = [];
20+
private _chunks: any[] = [];
2121

2222
public constructor() {
2323
super();
2424
super.on("data", this.onData);
2525
}
2626

27-
private onData = (chunk): void => {
27+
private onData = (chunk: any): void => {
2828
this._chunks.push(chunk);
2929
};
3030

Loading

apps/desktop/playwright/tsconfig.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"compilerOptions": {
33
"resolveJsonModule": true,
4-
"moduleResolution": "node",
4+
"moduleResolution": "bundler",
55
"esModuleInterop": true,
66
"target": "es2022",
7-
"module": "es2022",
8-
"lib": ["es2022", "dom"],
7+
"module": "ESNext",
8+
"lib": ["es2024", "dom", "dom.iterable"],
9+
"strictNullChecks": false,
910
"types": ["node"]
1011
},
1112
"include": ["**/*.ts"]

0 commit comments

Comments
 (0)