Skip to content

Commit ab0f32c

Browse files
csett86csett86
committed
Merge remote-tracking branch 'upstream/master' into synodim
2 parents 292deec + 880048d commit ab0f32c

File tree

2,457 files changed

+10140
-5464
lines changed

Some content is hidden

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

2,457 files changed

+10140
-5464
lines changed

‎CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
Changes in [1.11.90](https://github.com/element-hq/element-web/releases/tag/v1.11.90) (2025-01-14)
2+
==================================================================================================
3+
## ✨ Features
4+
5+
* Docker: run as non-root ([#28849](https://github.com/element-hq/element-web/pull/28849)). Contributed by @richvdh.
6+
* Docker: allow configuration of HTTP listen port via env var ([#28840](https://github.com/element-hq/element-web/pull/28840)). Contributed by @richvdh.
7+
* Update matrix-wysiwyg to consume WASM asset ([#28838](https://github.com/element-hq/element-web/pull/28838)). Contributed by @t3chguy.
8+
* OIDC settings tweaks ([#28787](https://github.com/element-hq/element-web/pull/28787)). Contributed by @t3chguy.
9+
* Delabs native OIDC support ([#28615](https://github.com/element-hq/element-web/pull/28615)). Contributed by @t3chguy.
10+
* Move room header info button to right-most position ([#28754](https://github.com/element-hq/element-web/pull/28754)). Contributed by @t3chguy.
11+
* Enable key backup by default ([#28691](https://github.com/element-hq/element-web/pull/28691)). Contributed by @dbkr.
12+
13+
## 🐛 Bug Fixes
14+
15+
* Fix building the automations mermaid diagram ([#28881](https://github.com/element-hq/element-web/pull/28881)). Contributed by @dbkr.
16+
* Playwright: wait for the network listener on the postgres db ([#28808](https://github.com/element-hq/element-web/pull/28808)). Contributed by @dbkr.
17+
18+
119
Changes in [1.11.89](https://github.com/element-hq/element-web/releases/tag/v1.11.89) (2024-12-18)
220
==================================================================================================
321
This is a patch release to fix a bug which could prevent loading stored crypto state from storage, and also to fix URL previews when switching back to a room.

‎Dockerfile

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
# Builder
2-
FROM --platform=$BUILDPLATFORM node:22-bullseye as builder
2+
FROM --platform=$BUILDPLATFORM node:22-bullseye AS builder
33

44
# Support custom branch of the js-sdk. This also helps us build images of element-web develop.
55
ARG USE_CUSTOM_SDKS=false
66
ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
77
ARG JS_SDK_BRANCH="master"
88

9-
RUN apt-get update && apt-get install -y git dos2unix
10-
119
WORKDIR /src
1210

1311
COPY . /src
14-
RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
12+
RUN /src/scripts/docker-link-repos.sh
1513
RUN yarn --network-timeout=200000 install
16-
17-
RUN dos2unix /src/scripts/docker-package.sh /src/scripts/get-version-from-git.sh /src/scripts/normalize-version.sh && bash /src/scripts/docker-package.sh
14+
RUN /src/scripts/docker-package.sh
1815

1916
# Copy the config now so that we don't create another layer in the app image
2017
RUN cp /src/config.sample.json /src/webapp/config.json
@@ -24,8 +21,22 @@ FROM nginx:alpine-slim
2421

2522
COPY --from=builder /src/webapp /app
2623

27-
# Override default nginx config
28-
COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
24+
# Override default nginx config. Templates in `/etc/nginx/templates` are passed
25+
# through `envsubst` by the nginx docker image entry point.
26+
COPY /docker/nginx-templates/* /etc/nginx/templates/
27+
28+
# Tell nginx to put its pidfile elsewhere, so it can run as non-root
29+
RUN sed -i -e 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf
30+
31+
# nginx user must own the cache and etc directory to write cache and tweak the nginx config
32+
RUN chown -R nginx:0 /var/cache/nginx /etc/nginx
33+
RUN chmod -R g+w /var/cache/nginx /etc/nginx
2934

3035
RUN rm -rf /usr/share/nginx/html \
3136
&& ln -s /app /usr/share/nginx/html
37+
38+
# Run as nginx user by default
39+
USER nginx
40+
41+
# HTTP listen port
42+
ENV ELEMENT_WEB_PORT=80

‎LICENSE-COMMERCIAL

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Licensees holding a valid commercial license with Element may use this
2+
software in accordance with the terms contained in a written agreement
3+
between you and Element.
4+
5+
To purchase a commercial license please contact our sales team at
6+
[email protected]

‎README.md

+15
Original file line numberDiff line numberDiff line change
@@ -311,3 +311,18 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
311311
Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
312312

313313
We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
314+
315+
## Copyright & License
316+
317+
Copyright (c) 2014-2017 OpenMarket Ltd
318+
Copyright (c) 2017 Vector Creations Ltd
319+
Copyright (c) 2017-2025 New Vector Ltd
320+
321+
This software is multi licensed by New Vector Ltd (Element). It can be used either:
322+
323+
(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
324+
325+
(2) for free under the terms of the GNU General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
326+
327+
(3) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
328+
Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.

‎__mocks__/maplibre-gl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Copyright 2024 New Vector Ltd.
33
Copyright 2022 The Matrix.org Foundation C.I.C.
44
5-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
5+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
66
Please see LICENSE files in the repository root for full details.
77
*/
88

‎__mocks__/workerFactoryMock.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Copyright 2024 New Vector Ltd.
33
Copyright 2023 The Matrix.org Foundation C.I.C.
44
5-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
5+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
66
Please see LICENSE files in the repository root for full details.
77
*/
88

‎contribute.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A glossy Matrix collaboration client for the web.",
44
"repository": {
55
"url": "https://github.com/element-hq/element-web",
6-
"license": "AGPL-3.0-only OR GPL-3.0-only"
6+
"license": "AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial"
77
},
88
"bugs": {
99
"list": "https://github.com/element-hq/element-web/issues",

‎nginx/conf.d/default.conf ‎docker/nginx-templates/default.conf.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
server {
2-
listen 80;
3-
listen [::]:80;
2+
listen ${ELEMENT_WEB_PORT};
3+
listen [::]:${ELEMENT_WEB_PORT};
44
server_name localhost;
55

66
root /usr/share/nginx/html;

‎docs/install.md

+16
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,22 @@ would be:
6060
docker run --rm -p 127.0.0.1:80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
6161
```
6262

63+
The Docker image is configured to run as an unprivileged (non-root) user by
64+
default. This should be fine on modern Docker runtimes, but binding to port 80
65+
on other runtimes may require root privileges. To resolve this, either run the
66+
image as root (`docker run --user 0`) or, better, change the port that nginx
67+
listens on via the `ELEMENT_WEB_PORT` environment variable.
68+
69+
The behaviour of the docker image can be customised via the following
70+
environment variables:
71+
72+
- `ELEMENT_WEB_PORT`
73+
74+
The port to listen on (within the docker container) for HTTP
75+
traffic. Defaults to `80`.
76+
77+
### Building the docker image
78+
6379
To build the image yourself:
6480

6581
```bash

‎docs/oidc.md

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,9 @@
11
# OIDC and delegated authentication
22

3-
## Compatibility/OIDC-aware mode
4-
5-
[MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965)
6-
[MSC3824: OIDC aware clients](https://github.com/matrix-org/matrix-spec-proposals/pull/3824)
7-
This mode uses an SSO flow to gain a `loginToken` from the authentication provider, then continues with SSO login.
8-
Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
9-
Wherever valid MSC2965 configuration is discovered, OIDC-aware login flow will be the only option offered.
10-
11-
## (🧪Experimental) OIDC-native flow
12-
13-
Can be enabled by a config-level-only setting in `config.json`
14-
15-
```json
16-
{
17-
"features": {
18-
"feature_oidc_native_flow": true
19-
}
20-
}
21-
```
22-
233
See https://areweoidcyet.com/client-implementation-guide/ for implementation details.
244

255
Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
26-
Where OIDC native login flow is enabled and valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
6+
Where a valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
277
Element Web will attempt to [dynamically register](https://openid.net/specs/openid-connect-registration-1_0.html) with the configured OP.
288
Then, authentication will be completed [as described here](https://areweoidcyet.com/client-implementation-guide/).
299

‎docs/playwright.md

+15-8
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,11 @@ yarn run test:playwright:open --headed --debug
5353

5454
See more command line options at <https://playwright.dev/docs/test-cli>.
5555

56-
### Running with Rust cryptography
56+
## Projects
5757

58-
`matrix-js-sdk` is currently in the
59-
[process](https://github.com/vector-im/element-web/issues/21972) of being
60-
updated to replace its end-to-end encryption implementation to use the [Matrix
61-
Rust SDK](https://github.com/matrix-org/matrix-rust-sdk). This is not currently
62-
enabled by default, but it is possible to have Playwright configure Element to use
63-
the Rust crypto implementation by passing `--project="Rust Crypto"` or using
64-
the top left options in open mode.
58+
By default, Playwright will run all "Projects", this means tests will run against Chrome, Firefox and "Safari" (Webkit).
59+
We only run tests against Chrome in pull request CI, but all projects in the merge queue.
60+
Some tests are excluded from running on certain browsers due to incompatibilities in the test harness.
6561

6662
## How the Tests Work
6763

@@ -224,3 +220,14 @@ We use test tags to categorise tests for running subsets more efficiently.
224220

225221
- `@mergequeue`: Tests that are slow or flaky and cover areas of the app we update seldom, should not be run on every PR commit but will be run in the Merge Queue.
226222
- `@screenshot`: Tests that use `toMatchScreenshot` to speed up a run of `test:playwright:screenshots`. A test with this tag must not also have the `@mergequeue` tag as this would cause false positives in the stale screenshot detection.
223+
- `@no-$project`: Tests which are unsupported in $Project. These tests will be skipped when running in $Project.
224+
225+
Anything testing Matrix media will need to have `@no-firefox` and `@no-webkit` as those rely on the service worker which
226+
has to be disabled in Playwright on Firefox & Webkit to retain routing functionality.
227+
Anything testing VoIP/microphone will need to have `@no-webkit` as fake microphone functionality is not available
228+
there at this time.
229+
230+
## Colima
231+
232+
If you are running under Colima, you may need to set the environment variable `TMPDIR` to `/tmp/colima` or a path
233+
within `$HOME` to allow bind mounting temporary directories into the Docker containers.

‎jest.config.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Copyright 2024 New Vector Ltd.
33
Copyright 2023 The Matrix.org Foundation C.I.C.
44
5-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
5+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
66
Please see LICENSE files in the repository root for full details.
77
*/
88

@@ -14,6 +14,8 @@ const config: Config = {
1414
testEnvironment: "jsdom",
1515
testEnvironmentOptions: {
1616
url: "http://localhost/",
17+
// This is needed to be able to load dual CJS/ESM WASM packages e.g. rust crypto & matrix-wywiwyg
18+
customExportConditions: ["browser", "node"],
1719
},
1820
testMatch: ["<rootDir>/test/**/*-test.[tj]s?(x)"],
1921
globalSetup: "<rootDir>/test/globalSetup.ts",

‎module_system/BuildConfig.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2022-2024 New Vector Ltd.
33
4-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
4+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
55
Please see LICENSE files in the repository root for full details.
66
*/
77

‎module_system/installer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2022-2024 New Vector Ltd.
33
4-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
4+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
55
Please see LICENSE files in the repository root for full details.
66
*/
77

‎module_system/scripts/install.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2022-2024 New Vector Ltd.
33
4-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
4+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
55
Please see LICENSE files in the repository root for full details.
66
*/
77

‎package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.89",
3+
"version": "1.11.90",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/element-hq/element-web"
99
},
10-
"license": "AGPL-3.0-only OR GPL-3.0-only",
10+
"license": "SEE LICENSE IN README.md",
1111
"files": [
1212
"lib",
1313
"res",
@@ -64,7 +64,7 @@
6464
"test:playwright:open": "yarn test:playwright --ui",
6565
"test:playwright:screenshots": "yarn test:playwright:screenshots:build && yarn test:playwright:screenshots:run",
6666
"test:playwright:screenshots:build": "docker build playwright -t element-web-playwright",
67-
"test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot",
67+
"test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot --project=Chrome",
6868
"coverage": "yarn test --coverage",
6969
"analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
7070
"analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp",
@@ -87,9 +87,10 @@
8787
"@matrix-org/react-sdk-module-api": "^2.4.0",
8888
"@matrix-org/spec": "^1.7.0",
8989
"@sentry/browser": "^8.0.0",
90+
"@types/png-chunks-extract": "^1.0.2",
9091
"@vector-im/compound-design-tokens": "^2.0.1",
91-
"@vector-im/compound-web": "^7.4.0",
92-
"@vector-im/matrix-wysiwyg": "2.37.13",
92+
"@vector-im/compound-web": "^7.5.0",
93+
"@vector-im/matrix-wysiwyg": "2.38.0",
9394
"@zxcvbn-ts/core": "^3.0.4",
9495
"@zxcvbn-ts/language-common": "^3.0.4",
9596
"@zxcvbn-ts/language-en": "^3.0.2",
@@ -124,7 +125,7 @@
124125
"maplibre-gl": "^4.0.0",
125126
"matrix-encrypt-attachment": "^1.0.3",
126127
"matrix-events-sdk": "0.0.1",
127-
"matrix-js-sdk": "35.1.0",
128+
"matrix-js-sdk": "36.0.0",
128129
"matrix-widget-api": "^1.10.0",
129130
"memoize-one": "^6.0.0",
130131
"mime": "^4.0.4",
@@ -269,7 +270,7 @@
269270
"postcss-preset-env": "^10.0.0",
270271
"postcss-scss": "^4.0.4",
271272
"postcss-simple-vars": "^7.0.1",
272-
"prettier": "3.4.1",
273+
"prettier": "3.4.2",
273274
"process": "^0.11.10",
274275
"raw-loader": "^4.0.2",
275276
"rimraf": "^6.0.0",
@@ -282,7 +283,7 @@
282283
"terser-webpack-plugin": "^5.3.9",
283284
"ts-node": "^10.9.1",
284285
"ts-prune": "^0.10.3",
285-
"typescript": "5.6.3",
286+
"typescript": "5.7.2",
286287
"util": "^0.12.5",
287288
"web-streams-polyfill": "^4.0.0",
288289
"webpack": "^5.89.0",

‎playwright.config.ts

+39-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Copyright 2024 New Vector Ltd.
33
Copyright 2023 The Matrix.org Foundation C.I.C.
44
5-
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
5+
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
66
Please see LICENSE files in the repository root for full details.
77
*/
88

@@ -11,16 +11,49 @@ import { defineConfig, devices } from "@playwright/test";
1111
const baseURL = process.env["BASE_URL"] ?? "http://localhost:8080";
1212

1313
export default defineConfig({
14-
projects: [{ name: "Chrome", use: { ...devices["Desktop Chrome"], channel: "chromium" } }],
14+
projects: [
15+
{
16+
name: "Chrome",
17+
use: {
18+
...devices["Desktop Chrome"],
19+
channel: "chromium",
20+
permissions: ["clipboard-write", "clipboard-read", "microphone"],
21+
launchOptions: {
22+
args: ["--use-fake-ui-for-media-stream", "--use-fake-device-for-media-stream", "--mute-audio"],
23+
},
24+
},
25+
},
26+
{
27+
name: "Firefox",
28+
use: {
29+
...devices["Desktop Firefox"],
30+
launchOptions: {
31+
firefoxUserPrefs: {
32+
"permissions.default.microphone": 1,
33+
},
34+
},
35+
// This is needed to work around an issue between Playwright routes, Firefox, and Service workers
36+
// https://github.com/microsoft/playwright/issues/33561#issuecomment-2471642120
37+
serviceWorkers: "block",
38+
},
39+
ignoreSnapshots: true,
40+
},
41+
{
42+
name: "WebKit",
43+
use: {
44+
...devices["Desktop Safari"],
45+
// Seemingly WebKit has the same issue as Firefox in Playwright routes not working
46+
// https://playwright.dev/docs/network#missing-network-events-and-service-workers
47+
serviceWorkers: "block",
48+
},
49+
ignoreSnapshots: true,
50+
},
51+
],
1552
use: {
1653
viewport: { width: 1280, height: 720 },
1754
ignoreHTTPSErrors: true,
1855
video: "retain-on-failure",
1956
baseURL,
20-
permissions: ["clipboard-write", "clipboard-read", "microphone"],
21-
launchOptions: {
22-
args: ["--use-fake-ui-for-media-stream", "--use-fake-device-for-media-stream", "--mute-audio"],
23-
},
2457
trace: "on-first-retry",
2558
},
2659
webServer: {

0 commit comments

Comments
 (0)