Skip to content

Commit 65960ec

Browse files
committed
Merge tag 'v1.11.30' into upgrade/element-web-v1.11.30_odelcroi
* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw * Pick sensible default option for phone country dropdown ([\#10627](matrix-org/matrix-react-sdk#10627)). Fixes #3528. * Relate field validation tooltip via aria-describedby ([\#10522](matrix-org/matrix-react-sdk#10522)). Fixes #24963. * Handle more completion types in rte autocomplete ([\#10560](matrix-org/matrix-react-sdk#10560)). Contributed by @alunturner. * Show a tile for an unloaded predecessor room if it has via_servers ([\#10483](matrix-org/matrix-react-sdk#10483)). Contributed by @andybalaam. * Exclude message timestamps from aria live region ([\#10584](matrix-org/matrix-react-sdk#10584)). Fixes #5696. * Make composer format bar an aria toolbar ([\#10583](matrix-org/matrix-react-sdk#10583)). Fixes #11283. * Improve accessibility of font slider ([\#10473](matrix-org/matrix-react-sdk#10473)). Fixes #20168 and #24962. * fix file size display from kB to KB ([\#10561](matrix-org/matrix-react-sdk#10561)). Fixes #24866. Contributed by @NSV1991. * Handle /me in rte ([\#10558](matrix-org/matrix-react-sdk#10558)). Contributed by @alunturner. * bind html with switch for manage extension setting option ([\#10553](matrix-org/matrix-react-sdk#10553)). Contributed by @NSV1991. * Handle command completions in RTE ([\#10521](matrix-org/matrix-react-sdk#10521)). Contributed by @alunturner. * Add room and user avatars to rte ([\#10497](matrix-org/matrix-react-sdk#10497)). Contributed by @alunturner. * Support for MSC3882 revision 1 ([\#10443](matrix-org/matrix-react-sdk#10443)). Contributed by @hughns. * Check profiles before starting a DM ([\#10472](matrix-org/matrix-react-sdk#10472)). Fixes #24830. * Quick settings: Change the copy / labels on the options ([\#10427](matrix-org/matrix-react-sdk#10427)). Fixes #24522. Contributed by @justjanne. * Update rte autocomplete styling ([\#10503](matrix-org/matrix-react-sdk#10503)). Contributed by @alunturner. * Fix create subspace dialog not working ([\#10652](matrix-org/matrix-react-sdk#10652)). Fixes element-hq/element-web#24882 * Fix multiple accessibility defects identified by AXE ([\#10606](matrix-org/matrix-react-sdk#10606)). * Fix view source from edit history dialog always showing latest event ([\#10626](matrix-org/matrix-react-sdk#10626)). Fixes #21859. * #21451 Fix WebGL disabled error message ([\#10589](matrix-org/matrix-react-sdk#10589)). Contributed by @rashmitpankhania. * Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\#10432](matrix-org/matrix-react-sdk#10432)). Contributed by @MadLittleMods. * Fix overflow on auth pages ([\#10605](matrix-org/matrix-react-sdk#10605)). Fixes #19548. * Fix incorrect avatar background colour when using a custom theme ([\#10598](matrix-org/matrix-react-sdk#10598)). Contributed by @jdauphant. * Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\#10593](matrix-org/matrix-react-sdk#10593)). * Update setting description to match reality ([\#10600](matrix-org/matrix-react-sdk#10600)). Fixes #25106. * Fix no identity server in help & about settings ([\#10563](matrix-org/matrix-react-sdk#10563)). Fixes #25077. * Fix: Images no longer reserve their space in the timeline correctly ([\#10571](matrix-org/matrix-react-sdk#10571)). Fixes #25082. Contributed by @kerryarchibald. * Fix issues with inhibited accessible focus outlines ([\#10579](matrix-org/matrix-react-sdk#10579)). Fixes #19742. * Fix read receipts falling from sky ([\#10576](matrix-org/matrix-react-sdk#10576)). Fixes #25081. * Fix avatar text issue in rte ([\#10559](matrix-org/matrix-react-sdk#10559)). Contributed by @alunturner. * fix resizer only work with left mouse click ([\#10546](matrix-org/matrix-react-sdk#10546)). Contributed by @NSV1991. * Fix send two join requests when joining a room from spotlight search ([\#10534](matrix-org/matrix-react-sdk#10534)). Fixes #25054. * Highlight event when any version triggered a highlight ([\#10502](matrix-org/matrix-react-sdk#10502)). Fixes #24923 and #24970. Contributed by @kerryarchibald. * Fix spacing of headings of integration manager on General settings tab ([\#10232](matrix-org/matrix-react-sdk#10232)). Fixes #24085. Contributed by @luixxiul.
2 parents a2a098d + f59d4c9 commit 65960ec

20 files changed

+1200
-81
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
blank_issues_enabled: false
21
contact_links:
32
- name: Questions & support
43
url: https://tchap.beta.gouv.fr/#contact

.github/workflows/backport.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Backport
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
branches:
8+
- develop
9+
10+
jobs:
11+
backport:
12+
name: Backport
13+
runs-on: ubuntu-latest
14+
# Only react to merged PRs for security reasons.
15+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16+
if: >
17+
github.event.pull_request.merged
18+
&& (
19+
github.event.action == 'closed'
20+
|| (
21+
github.event.action == 'labeled'
22+
&& contains(github.event.label.name, 'backport')
23+
)
24+
)
25+
steps:
26+
- uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2
27+
with:
28+
labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
29+
# We can't use GITHUB_TOKEN here or CI won't run on the new PR
30+
github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# Separate to the main build workflow for access to develop
2+
# environment secrets, largely similar to build.yaml.
3+
name: Build and Deploy develop
4+
on:
5+
push:
6+
branches: [develop]
7+
repository_dispatch:
8+
types: [element-web-notify]
9+
concurrency:
10+
group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
11+
cancel-in-progress: true
12+
jobs:
13+
build:
14+
name: "Build & Deploy develop.element.io"
15+
# Only respect triggers from our develop branch, ignore that of forks
16+
if: github.repository == 'vector-im/element-web'
17+
runs-on: ubuntu-latest
18+
environment: develop
19+
env:
20+
R2_BUCKET: "element-web-develop"
21+
R2_URL: ${{ vars.CF_R2_S3_API }}
22+
R2_PUBLIC_URL: "https://element-web-develop.element.io"
23+
steps:
24+
- uses: actions/checkout@v3
25+
26+
- uses: actions/setup-node@v3
27+
with:
28+
cache: "yarn"
29+
30+
- name: Install Dependencies
31+
run: "./scripts/layered.sh"
32+
33+
- name: Build, Package & Upload sourcemaps
34+
run: "./scripts/ci_package.sh"
35+
env:
36+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
37+
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
38+
SENTRY_URL: ${{ secrets.SENTRY_URL }}
39+
SENTRY_ORG: element
40+
SENTRY_PROJECT: riot-web
41+
# We only deploy the latest bundles to Cloudflare Pages and use _redirects to fallback to R2 for
42+
# older ones. This redirect means that 'self' is insufficient in the CSP,
43+
# and we have to add the R2 URL.
44+
# Once Cloudflare redirects support proxying mode we will be able to ditch this.
45+
# See Proxying in support table at https://developers.cloudflare.com/pages/platform/redirects
46+
CSP_EXTRA_SOURCE: ${{ env.R2_PUBLIC_URL }}
47+
48+
- run: mv dist/element-*.tar.gz dist/develop.tar.gz
49+
50+
- uses: actions/upload-artifact@v3
51+
with:
52+
name: webapp
53+
path: dist/develop.tar.gz
54+
retention-days: 1
55+
56+
- name: Extract webapp
57+
run: |
58+
mkdir _deploy
59+
tar xf dist/develop.tar.gz -C _deploy --strip-components=1
60+
61+
- name: Copy config
62+
run: cp element.io/develop/config.json _deploy/config.json
63+
64+
- name: Populate 404.html
65+
run: echo "404 Not Found" > _deploy/404.html
66+
67+
- name: Populate _headers
68+
run: cp .github/cfp_headers _deploy/_headers
69+
70+
# Redirect requests for the develop tarball and the historical bundles to R2
71+
- name: Populate _redirects
72+
run: |
73+
{
74+
echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
75+
for bundle in $(aws s3 ls s3://$R2_BUCKET/bundles/ --endpoint-url $R2_URL --region=auto | awk '{print $2}'); do
76+
echo "/bundles/${bundle}* $R2_PUBLIC_URL/bundles/${bundle}:splat 301"
77+
done
78+
} | tee _deploy/_redirects
79+
env:
80+
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
81+
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
82+
83+
- name: Wait for other steps to succeed
84+
uses: t3chguy/wait-on-check-action@05861d3a448898eb33dfce34153bd1ecb9422fb9 # fork
85+
with:
86+
ref: ${{ github.sha }}
87+
running-workflow-name: "Build & Deploy develop.element.io"
88+
repo-token: ${{ secrets.GITHUB_TOKEN }}
89+
wait-interval: 10
90+
check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label).)*$
91+
92+
# We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
93+
# as the expires after 24h and requires auth to download.
94+
# Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
95+
- name: Deploy to R2
96+
run: |
97+
aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
98+
aws s3 cp _deploy/ s3://$R2_BUCKET/ --recursive --endpoint-url $R2_URL --region=auto
99+
env:
100+
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
101+
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
102+
103+
- name: Deploy to Cloudflare Pages
104+
id: cfp
105+
uses: cloudflare/pages-action@61eafe73baad0195ab582cb447b2c6e15a0df9ce # v1
106+
with:
107+
apiToken: ${{ secrets.CF_PAGES_TOKEN }}
108+
accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
109+
projectName: element-web-develop
110+
directory: _deploy
111+
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
112+
113+
- run: |
114+
echo "Deployed to ${{ steps.cfp.outputs.url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/dockerhub.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Dockerhub
2+
on:
3+
workflow_dispatch: {}
4+
push:
5+
tags: [v*]
6+
schedule:
7+
# This job can take a while, and we have usage limits, so just publish develop only twice a day
8+
- cron: "0 7/12 * * *"
9+
concurrency: ${{ github.workflow }}-${{ github.ref_name }}
10+
jobs:
11+
buildx:
12+
name: Docker Buildx
13+
runs-on: ubuntu-latest
14+
environment: dockerhub
15+
steps:
16+
- uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 0 # needed for docker-package to be able to calculate the version
19+
20+
- name: Set up QEMU
21+
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2
22+
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
25+
with:
26+
install: true
27+
28+
- name: Login to Docker Hub
29+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
30+
with:
31+
username: ${{ secrets.DOCKERHUB_USERNAME }}
32+
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
34+
- name: Docker meta
35+
id: meta
36+
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 # v4
37+
with:
38+
images: |
39+
vectorim/element-web
40+
tags: |
41+
type=ref,event=branch
42+
type=ref,event=tag
43+
flavor: |
44+
latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
45+
46+
- name: Build and push
47+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
48+
with:
49+
context: .
50+
push: true
51+
platforms: linux/amd64,linux/arm64
52+
tags: ${{ steps.meta.outputs.tags }}
53+
labels: ${{ steps.meta.outputs.labels }}
54+
55+
- name: Update repo description
56+
uses: peter-evans/dockerhub-description@202973a37c8a723405c0c5f0a71b6d99db470dae # v3
57+
continue-on-error: true
58+
with:
59+
username: ${{ secrets.DOCKERHUB_USERNAME }}
60+
password: ${{ secrets.DOCKERHUB_TOKEN }}
61+
repository: vectorim/element-web
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Pull Request
2+
on:
3+
pull_request_target:
4+
types: [opened, edited, labeled, unlabeled, synchronize]
5+
jobs:
6+
action:
7+
uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
8+
secrets:
9+
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/static_analysis.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
REPOSITORY: ${{ github.repository }}
1212
PR_NUMBER: ${{ github.event.pull_request.number }}
1313
jobs:
14+
<<<<<<< HEAD
1415
# Removing until we fix the crash :
1516
# Error: matrix-react-sdk/src/autocomplete/CommandProvider.tsx(38,24): error TS2589:
1617
# Type instantiation is excessively deep and possibly infinite.
@@ -83,6 +84,65 @@ jobs:
8384
# i18n_lint:
8485
# name: "i18n Check"
8586
# uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
87+
=======
88+
ts_lint:
89+
name: "Typescript Syntax Check"
90+
runs-on: ubuntu-latest
91+
steps:
92+
- uses: actions/checkout@v3
93+
94+
- uses: actions/setup-node@v3
95+
with:
96+
cache: "yarn"
97+
98+
- name: Install Dependencies
99+
run: "./scripts/layered.sh"
100+
101+
- name: Typecheck
102+
run: "yarn run lint:types"
103+
104+
tsc-strict:
105+
name: Typescript Strict Error Checker
106+
if: github.event_name == 'pull_request'
107+
runs-on: ubuntu-latest
108+
permissions:
109+
pull-requests: read
110+
checks: write
111+
steps:
112+
- uses: actions/checkout@v3
113+
114+
- name: Install Deps
115+
run: "scripts/layered.sh"
116+
117+
- name: Get diff lines
118+
id: diff
119+
uses: Equip-Collaboration/diff-line-numbers@df70b4b83e05105c15f20dc6cc61f1463411b2a6 # v1.0.0
120+
with:
121+
include: '["\\.tsx?$"]'
122+
123+
- name: Detecting files changed
124+
id: files
125+
uses: futuratrepadeira/changed-files@96d5fd702a6479d573287ef07381ad59acc390ed # v4.0.0
126+
with:
127+
repo-token: ${{ secrets.GITHUB_TOKEN }}
128+
pattern: '^.*\.tsx?$'
129+
130+
- uses: t3chguy/typescript-check-action@main
131+
with:
132+
repo-token: ${{ secrets.GITHUB_TOKEN }}
133+
use-check: false
134+
check-fail-mode: added
135+
output-behaviour: annotate
136+
ts-extra-args: "--strict --noImplicitAny"
137+
files-changed: ${{ steps.files.outputs.files_updated }}
138+
files-added: ${{ steps.files.outputs.files_created }}
139+
files-deleted: ${{ steps.files.outputs.files_deleted }}
140+
line-numbers: ${{ steps.diff.outputs.lineNumbers }}
141+
142+
i18n_lint:
143+
name: "i18n Check"
144+
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
145+
>>>>>>> v1.11.30
86146

87147
js_lint:
88148
name: "ESLint"

.github/workflows/tests.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ jobs:
3333
uses: SimenB/github-actions-cpu-cores@410541432439795d30db6501fb1d8178eb41e502 # v1
3434

3535
- name: Run tests with coverage
36+
<<<<<<< HEAD
3637
run: "yarn coverage --ci"
38+
=======
39+
run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
40+
>>>>>>> v1.11.30
3741

3842
- name: Upload Artifact
3943
uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)