Skip to content

Commit 83dbda3

Browse files
odelcroiodelcroi
authored
Bump to 4.3.2_1.11.30 (element-web upgrade)
Bump to 4.3.2_1.11.30 (element-web upgrade)
2 parents 939e664 + 2c12aae commit 83dbda3

File tree

39 files changed

+522
-377
lines changed

39 files changed

+522
-377
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

‎CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
Changes in [1.11.30](https://github.com/vector-im/element-web/releases/tag/v1.11.30) (2023-04-25)
2+
=================================================================================================
3+
4+
## 🔒 Security
5+
* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw
6+
7+
## ✨ Features
8+
* Pick sensible default option for phone country dropdown ([\#10627](https://github.com/matrix-org/matrix-react-sdk/pull/10627)). Fixes #3528.
9+
* Relate field validation tooltip via aria-describedby ([\#10522](https://github.com/matrix-org/matrix-react-sdk/pull/10522)). Fixes #24963.
10+
* Handle more completion types in rte autocomplete ([\#10560](https://github.com/matrix-org/matrix-react-sdk/pull/10560)). Contributed by @alunturner.
11+
* Show a tile for an unloaded predecessor room if it has via_servers ([\#10483](https://github.com/matrix-org/matrix-react-sdk/pull/10483)). Contributed by @andybalaam.
12+
* Exclude message timestamps from aria live region ([\#10584](https://github.com/matrix-org/matrix-react-sdk/pull/10584)). Fixes #5696.
13+
* Make composer format bar an aria toolbar ([\#10583](https://github.com/matrix-org/matrix-react-sdk/pull/10583)). Fixes #11283.
14+
* Improve accessibility of font slider ([\#10473](https://github.com/matrix-org/matrix-react-sdk/pull/10473)). Fixes #20168 and #24962.
15+
* fix file size display from kB to KB ([\#10561](https://github.com/matrix-org/matrix-react-sdk/pull/10561)). Fixes #24866. Contributed by @NSV1991.
16+
* Handle /me in rte ([\#10558](https://github.com/matrix-org/matrix-react-sdk/pull/10558)). Contributed by @alunturner.
17+
* bind html with switch for manage extension setting option ([\#10553](https://github.com/matrix-org/matrix-react-sdk/pull/10553)). Contributed by @NSV1991.
18+
* Handle command completions in RTE ([\#10521](https://github.com/matrix-org/matrix-react-sdk/pull/10521)). Contributed by @alunturner.
19+
* Add room and user avatars to rte ([\#10497](https://github.com/matrix-org/matrix-react-sdk/pull/10497)). Contributed by @alunturner.
20+
* Support for MSC3882 revision 1 ([\#10443](https://github.com/matrix-org/matrix-react-sdk/pull/10443)). Contributed by @hughns.
21+
* Check profiles before starting a DM ([\#10472](https://github.com/matrix-org/matrix-react-sdk/pull/10472)). Fixes #24830.
22+
* Quick settings: Change the copy / labels on the options ([\#10427](https://github.com/matrix-org/matrix-react-sdk/pull/10427)). Fixes #24522. Contributed by @justjanne.
23+
* Update rte autocomplete styling ([\#10503](https://github.com/matrix-org/matrix-react-sdk/pull/10503)). Contributed by @alunturner.
24+
25+
## 🐛 Bug Fixes
26+
* Fix create subspace dialog not working ([\#10652](https://github.com/matrix-org/matrix-react-sdk/pull/10652)). Fixes vector-im/element-web#24882
27+
* Fix multiple accessibility defects identified by AXE ([\#10606](https://github.com/matrix-org/matrix-react-sdk/pull/10606)).
28+
* Fix view source from edit history dialog always showing latest event ([\#10626](https://github.com/matrix-org/matrix-react-sdk/pull/10626)). Fixes #21859.
29+
* #21451 Fix WebGL disabled error message ([\#10589](https://github.com/matrix-org/matrix-react-sdk/pull/10589)). Contributed by @rashmitpankhania.
30+
* Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\#10432](https://github.com/matrix-org/matrix-react-sdk/pull/10432)). Contributed by @MadLittleMods.
31+
* Fix overflow on auth pages ([\#10605](https://github.com/matrix-org/matrix-react-sdk/pull/10605)). Fixes #19548.
32+
* Fix incorrect avatar background colour when using a custom theme ([\#10598](https://github.com/matrix-org/matrix-react-sdk/pull/10598)). Contributed by @jdauphant.
33+
* Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\#10593](https://github.com/matrix-org/matrix-react-sdk/pull/10593)).
34+
* Update setting description to match reality ([\#10600](https://github.com/matrix-org/matrix-react-sdk/pull/10600)). Fixes #25106.
35+
* Fix no identity server in help & about settings ([\#10563](https://github.com/matrix-org/matrix-react-sdk/pull/10563)). Fixes #25077.
36+
* Fix: Images no longer reserve their space in the timeline correctly ([\#10571](https://github.com/matrix-org/matrix-react-sdk/pull/10571)). Fixes #25082. Contributed by @kerryarchibald.
37+
* Fix issues with inhibited accessible focus outlines ([\#10579](https://github.com/matrix-org/matrix-react-sdk/pull/10579)). Fixes #19742.
38+
* Fix read receipts falling from sky ([\#10576](https://github.com/matrix-org/matrix-react-sdk/pull/10576)). Fixes #25081.
39+
* Fix avatar text issue in rte ([\#10559](https://github.com/matrix-org/matrix-react-sdk/pull/10559)). Contributed by @alunturner.
40+
* fix resizer only work with left mouse click ([\#10546](https://github.com/matrix-org/matrix-react-sdk/pull/10546)). Contributed by @NSV1991.
41+
* Fix send two join requests when joining a room from spotlight search ([\#10534](https://github.com/matrix-org/matrix-react-sdk/pull/10534)). Fixes #25054.
42+
* Highlight event when any version triggered a highlight ([\#10502](https://github.com/matrix-org/matrix-react-sdk/pull/10502)). Fixes #24923 and #24970. Contributed by @kerryarchibald.
43+
* Fix spacing of headings of integration manager on General settings tab ([\#10232](https://github.com/matrix-org/matrix-react-sdk/pull/10232)). Fixes #24085. Contributed by @luixxiul.
44+
145
Changes in [1.11.29](https://github.com/vector-im/element-web/releases/tag/v1.11.29) (2023-04-11)
246
=================================================================================================
347

‎jest.config.ts

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
Copyright 2023 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
import { env } from "process";
18+
19+
import type { Config } from "jest";
20+
21+
/*
22+
"jest-comments": {
23+
"README": "For the tests to work, you need matrix-react-sdk to be git-cloned and yarn linked into this project.",
24+
"snapshotSerializers": "used for jest snapshot",
25+
"testEnvironment": "switch to jsdom like in matrix-react-sdk",
26+
"testMatch": "execute only tests in unit-tests directory",
27+
"setupFilesAfterEnv": "duplicate enzyme configuration in our own setup file '<rootDir>/test/setupTests.js'",
28+
"moduleNameMapper": "use mapper from element-web, helps at mocking {module, ressources} directly with regexp",
29+
"transformIgnorePatterns": "make regexp inline {matrix-js-sdk|matrix-react-sdk} else it does not work"
30+
}
31+
*/
32+
const config: Config = {
33+
snapshotSerializers: ["enzyme-to-json/serializer"],
34+
testEnvironment: "jsdom",
35+
testEnvironmentOptions: {
36+
url: "http://localhost/",
37+
},
38+
testMatch: ["<rootDir>/test/unit-tests/**/*-test.[tj]s?(x)"],
39+
setupFiles: ["jest-canvas-mock"],
40+
setupFilesAfterEnv: ["<rootDir>/test/setupTests.js", "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"],
41+
moduleNameMapper: {
42+
"\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
43+
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
44+
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
45+
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
46+
"^react$": "<rootDir>/node_modules/react",
47+
"^react-dom$": "<rootDir>/node_modules/react-dom",
48+
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
49+
"^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
50+
"decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
51+
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
52+
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
53+
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
54+
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
55+
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
56+
"^!!raw-loader!.*": "jest-raw-loader",
57+
"RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
58+
"MImageBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningImageBody.tsx",
59+
"../../../../../../src/components/views/messages/OriginalFileBody":
60+
"<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
61+
"MAudioBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningAudioBody.tsx",
62+
"../../../../../../src/components/views/messages/OriginalAudioBody":
63+
"<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
64+
"MStickerBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningStickerBody.tsx",
65+
},
66+
transformIgnorePatterns: ["/node_modules/(?!matrix-js-sdk|matrix-react-sdk).+$"],
67+
coverageReporters: ["text-summary", "lcov"],
68+
testResultsProcessor: "@casualbot/jest-sonar-reporter",
69+
};
70+
71+
// if we're running under GHA, enable the GHA reporter
72+
if (env["GITHUB_ACTIONS"] !== undefined) {
73+
config.reporters = [["github-actions", { silent: false }], "summary"];
74+
}
75+
76+
export default config;

‎package.json

Lines changed: 10 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "element-web",
33
"productName": "Tchap",
4-
"version": "4.3.1-1.11.29",
4+
"version": "4.3.2-1.11.30",
55
"description": "A feature-rich client for Matrix.org",
66
"author": "DINUM",
77
"repository": {
@@ -81,10 +81,9 @@
8181
"gfm.css": "^1.1.2",
8282
"jsrsasign": "^10.5.25",
8383
"katex": "^0.16.0",
84-
"matrix-js-sdk": "24.1.0",
85-
"matrix-react-sdk": "3.70.0",
84+
"matrix-js-sdk": "25.0.0",
85+
"matrix-react-sdk": "3.71.1",
8686
"matrix-widget-api": "^1.3.1",
87-
"prop-types": "^15.7.2",
8887
"react": "17.0.2",
8988
"react-dom": "17.0.2",
9089
"sanitize-html": "^2.3.2",
@@ -129,7 +128,7 @@
129128
"@types/jsrsasign": "^10.5.4",
130129
"@types/modernizr": "^3.5.3",
131130
"@types/node": "^16",
132-
"@types/react": "17.0.53",
131+
"@types/react": "17.0.55",
133132
"@types/react-dom": "17.0.19",
134133
"@types/sanitize-html": "^2.3.1",
135134
"@types/ua-parser-js": "^0.7.36",
@@ -142,7 +141,7 @@
142141
"babel-jest": "^29.0.0",
143142
"babel-loader": "^8.2.2",
144143
"chokidar": "^3.5.1",
145-
"concurrently": "^7.0.0",
144+
"concurrently": "^8.0.0",
146145
"cpx": "^1.5.0",
147146
"css-loader": "^4",
148147
"cypress": "^10.3.0",
@@ -167,7 +166,7 @@
167166
"fs-extra": "^11.0.0",
168167
"html-webpack-plugin": "^4.5.2",
169168
"jest": "^29.0.0",
170-
"jest-canvas-mock": "^2.3.0",
169+
"jest-canvas-mock": "2.4.0",
171170
"jest-environment-jsdom": "^29.0.0",
172171
"jest-mock": "^29.0.0",
173172
"jest-raw-loader": "^1.0.1",
@@ -202,78 +201,20 @@
202201
"simple-proxy-agent": "^1.1.0",
203202
"string-replace-loader": "3",
204203
"style-loader": "2",
205-
"stylelint": "^15.0.0",
206-
"stylelint-config-standard": "^30.0.0",
204+
"stylelint": "^15.3.0",
205+
"stylelint-config-standard": "^32.0.0",
207206
"stylelint-scss": "^4.2.0",
208207
"terser-webpack-plugin": "^4.0.0",
208+
"ts-node": "^10.9.1",
209209
"ts-prune": "^0.10.3",
210-
"typescript": "4.9.5",
210+
"typescript": "5.0.3",
211211
"webpack": "^4.46.0",
212212
"webpack-cli": "^3.3.12",
213213
"webpack-dev-server": "^3.11.2",
214214
"worker-loader": "^3.0.0",
215215
"worklet-loader": "^2.0.0",
216216
"yaml": "^2.0.1"
217217
},
218-
"jest-comments": {
219-
"README": "For the tests to work, you need matrix-react-sdk to be git-cloned and yarn linked into this project.",
220-
"snapshotSerializers": "used for jest snapshot",
221-
"testEnvironment": "switch to jsdom like in matrix-react-sdk",
222-
"testMatch": "execute only tests in unit-tests directory",
223-
"setupFilesAfterEnv": "duplicate enzyme configuration in our own setup file '<rootDir>/test/setupTests.js'",
224-
"moduleNameMapper": "use mapper from element-web, helps at mocking {module, ressources} directly with regexp",
225-
"transformIgnorePatterns": "make regexp inline {matrix-js-sdk|matrix-react-sdk} else it does not work"
226-
},
227-
"jest": {
228-
"snapshotSerializers": [
229-
"enzyme-to-json/serializer"
230-
],
231-
"testEnvironment": "jsdom",
232-
"testEnvironmentOptions": {
233-
"url": "http://localhost/"
234-
},
235-
"testMatch": [
236-
"<rootDir>/test/unit-tests/**/*-test.[tj]s?(x)"
237-
],
238-
"setupFiles": [
239-
"jest-canvas-mock"
240-
],
241-
"setupFilesAfterEnv": [
242-
"<rootDir>/test/setupTests.js",
243-
"<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
244-
],
245-
"moduleNameMapper": {
246-
"\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
247-
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
248-
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
249-
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
250-
"^react$": "<rootDir>/node_modules/react",
251-
"^react-dom$": "<rootDir>/node_modules/react-dom",
252-
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
253-
"^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
254-
"decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
255-
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
256-
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
257-
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
258-
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
259-
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
260-
"^!!raw-loader!.*": "jest-raw-loader",
261-
"RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
262-
"MImageBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningImageBody.tsx",
263-
"../../../../../../src/components/views/messages/OriginalFileBody": "<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
264-
"MAudioBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningAudioBody.tsx",
265-
"../../../../../../src/components/views/messages/OriginalAudioBody": "<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
266-
"MStickerBody": "<rootDir>/src/customisations/components/views/messages/ContentScanningStickerBody.tsx"
267-
},
268-
"transformIgnorePatterns": [
269-
"/node_modules/(?!matrix-js-sdk|matrix-react-sdk).+$"
270-
],
271-
"coverageReporters": [
272-
"text-summary",
273-
"lcov"
274-
],
275-
"testResultsProcessor": "@casualbot/jest-sonar-reporter"
276-
},
277218
"@casualbot/jest-sonar-reporter": {
278219
"outputDirectory": "coverage",
279220
"outputName": "jest-sonar-report.xml",

‎patches/activate-cross-signing-and-secure-storage-js/matrix-js-sdk+24.1.0.patch renamed to ‎patches/activate-cross-signing-and-secure-storage-js/matrix-js-sdk+25.0.0.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/matrix-js-sdk/src/client.ts b/node_modules/matrix-js-sdk/src/client.ts
2-
index 0e47ff6..a4883e6 100644
2+
index cb8df7a..1ca2f21 100644
33
--- a/node_modules/matrix-js-sdk/src/client.ts
44
+++ b/node_modules/matrix-js-sdk/src/client.ts
55
@@ -20,6 +20,7 @@ limitations under the License.
@@ -10,17 +10,17 @@ index 0e47ff6..a4883e6 100644
1010
import type { IDeviceKeys, IMegolmSessionData, IOneTimeKey } from "./@types/crypto";
1111
import { ISyncStateData, SyncApi, SyncApiOptions, SyncState } from "./sync";
1212
import {
13-
@@ -209,6 +210,9 @@ import { CryptoApi } from "./crypto-api";
14-
import { DeviceInfoMap } from "./crypto/DeviceList";
15-
import { SecretStorageKeyDescription } from "./secret-storage";
13+
@@ -214,6 +215,9 @@ import {
14+
ServerSideSecretStorageImpl,
15+
} from "./secret-storage";
1616

1717
+import TchapUIFeature from '../../../src/util/TchapUIFeature'; // :TCHAP:
1818
+
1919
+
2020
export type Store = IStore;
2121

2222
export type ResetTimelineCallback = (roomId: string) => boolean;
23-
@@ -7242,6 +7246,17 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
23+
@@ -7284,6 +7288,17 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
2424
const response = await this.getVersions();
2525
if (!response) return false;
2626
const unstableFeatures = response["unstable_features"];

0 commit comments

Comments
 (0)