Skip to content

Commit 263b3a0

Browse files
floriandurosflorianduros
committed
Merge branch 'develop' into florianduros/rip-out-legacy-crypto/2-remove-isRoomEncrypted
# Conflicts: # src/utils/arrays.ts # test/unit-tests/utils/arrays-test.ts
2 parents 010d7c4 + 0d5c9a3 commit 263b3a0

File tree

115 files changed

+823
-637
lines changed

Some content is hidden

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

115 files changed

+823
-637
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ module.exports = {
117117
"!matrix-js-sdk/src/extensible_events_v1/PollResponseEvent",
118118
"!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
119119
"!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
120-
"!matrix-js-sdk/src/crypto",
121-
"!matrix-js-sdk/src/crypto/keybackup",
122-
"!matrix-js-sdk/src/crypto/deviceinfo",
123-
"!matrix-js-sdk/src/crypto/dehydration",
124120
"!matrix-js-sdk/src/oidc",
125121
"!matrix-js-sdk/src/oidc/discovery",
126122
"!matrix-js-sdk/src/oidc/authorize",

‎.github/workflows/end-to-end-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
VERSION: "${{ steps.layered_build.outputs.VERSION }}"
7070
run: |
7171
yarn build
72-
echo $VERSION > webapp/version
7372
7473
- name: Upload Artifact
7574
uses: actions/upload-artifact@v4

‎.stylelintrc.js

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
extends: ["stylelint-config-standard"],
33
customSyntax: "postcss-scss",
4-
plugins: ["stylelint-scss"],
4+
plugins: ["stylelint-scss", "stylelint-value-no-unknown-custom-properties"],
55
rules: {
66
"comment-empty-line-before": null,
77
"declaration-empty-line-before": null,
@@ -46,5 +46,33 @@ module.exports = {
4646
"number-max-precision": null,
4747
"no-invalid-double-slash-comments": true,
4848
"media-feature-range-notation": null,
49+
"csstools/value-no-unknown-custom-properties": [
50+
true,
51+
{
52+
importFrom: [
53+
{ from: "res/css/_common.pcss", type: "css" },
54+
{ from: "res/themes/light/css/_light.pcss", type: "css" },
55+
// Right now our styles share vars all over the place, this is not ideal but acceptable for now
56+
{ from: "res/css/views/rooms/_EventTile.pcss", type: "css" },
57+
{ from: "res/css/views/rooms/_IRCLayout.pcss", type: "css" },
58+
{ from: "res/css/views/rooms/_EventBubbleTile.pcss", type: "css" },
59+
{ from: "res/css/views/rooms/_ReadReceiptGroup.pcss", type: "css" },
60+
{ from: "res/css/views/rooms/_EditMessageComposer.pcss", type: "css" },
61+
{ from: "res/css/views/right_panel/_BaseCard.pcss", type: "css" },
62+
{ from: "res/css/views/messages/_MessageTimestamp.pcss", type: "css" },
63+
{ from: "res/css/views/messages/_EventTileBubble.pcss", type: "css" },
64+
{ from: "res/css/views/messages/_MessageActionBar.pcss", type: "css" },
65+
{ from: "res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss", type: "css" },
66+
{ from: "res/css/views/elements/_ToggleSwitch.pcss", type: "css" },
67+
{ from: "res/css/views/settings/tabs/_SettingsTab.pcss", type: "css" },
68+
{ from: "res/css/structures/_RoomView.pcss", type: "css" },
69+
// Compound vars
70+
"node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-base.css",
71+
"node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-semantic.css",
72+
"node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-base-mq.css",
73+
"node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-semantic-mq.css",
74+
],
75+
},
76+
],
4977
},
5078
};

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@matrix-org/react-sdk-module-api": "^2.4.0",
8686
"@matrix-org/spec": "^1.7.0",
8787
"@sentry/browser": "^8.0.0",
88-
"@vector-im/compound-design-tokens": "^1.8.0",
89-
"@vector-im/compound-web": "^7.1.0",
88+
"@vector-im/compound-design-tokens": "^2.0.1",
89+
"@vector-im/compound-web": "^7.3.0",
9090
"@vector-im/matrix-wysiwyg": "2.37.13",
9191
"@zxcvbn-ts/core": "^3.0.4",
9292
"@zxcvbn-ts/language-common": "^3.0.4",
@@ -276,6 +276,7 @@
276276
"stylelint": "^16.1.0",
277277
"stylelint-config-standard": "^36.0.0",
278278
"stylelint-scss": "^6.0.0",
279+
"stylelint-value-no-unknown-custom-properties": "^6.0.1",
279280
"terser-webpack-plugin": "^5.3.9",
280281
"ts-node": "^10.9.1",
281282
"ts-prune": "^0.10.3",
@@ -286,6 +287,7 @@
286287
"webpack-bundle-analyzer": "^4.8.0",
287288
"webpack-cli": "^5.0.0",
288289
"webpack-dev-server": "^5.0.0",
290+
"webpack-version-file-plugin": "^0.5.0",
289291
"yaml": "^2.3.3"
290292
},
291293
"@casualbot/jest-sonar-reporter": {

‎playwright/plugins/homeserver/synapse/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { randB64Bytes } from "../../utils/rand";
2020
// Docker tag to use for synapse docker image.
2121
// We target a specific digest as every now and then a Synapse update will break our CI.
2222
// This digest is updated by the playwright-image-updates.yaml workflow periodically.
23-
const DOCKER_TAG = "develop@sha256:27e36370a0422d275b54d0292c8bf87e925dc004d0fe5b10dbee7ea4ffd27289";
23+
const DOCKER_TAG = "develop@sha256:d947f40999b060ad4856c0af741b8619fa131430a29922606e374fdba532082b";
2424

2525
async function cfgDirFromTemplate(opts: StartHomeserverOpts): Promise<Omit<HomeserverConfig, "dockerUrl">> {
2626
const templateDir = path.join(__dirname, "templates", opts.template);

‎playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png

17 Bytes
Loading

‎playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png

173 Bytes
Loading

‎playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png

163 Bytes
Loading

‎playwright/snapshots/user-menu/user-menu.spec.ts/user-menu-linux.png

64 Bytes
Loading

‎res/css/components/views/elements/_AppPermission.pcss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Please see LICENSE files in the repository root for full details.
1111
font-size: $font-12px;
1212
width: 100%; /* make mx_AppPermission fill width of mx_AppTileBody so that scroll bar appears on the edge */
1313
overflow-y: scroll;
14-
.mx_AppPermission_bolder {
14+
.mx_AppPermission_bolder,
15+
.mx_AppPermission_content_bolder {
1516
font-weight: var(--cpd-font-weight-semibold);
1617
}
1718
.mx_AppPermission_content {
@@ -21,10 +22,6 @@ Please see LICENSE files in the repository root for full details.
2122
margin-block: 12px;
2223
}
2324

24-
.mx_AppPermission_content_bolder {
25-
font-weight: var(--font-semi-bold);
26-
}
27-
2825
.mx_TextWithTooltip_target--helpIcon {
2926
display: inline-block;
3027
height: $font-14px; /* align with characters on the same line */

‎res/css/structures/_RightPanel.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Please see LICENSE files in the repository root for full details.
2727
/** Fixme - factor this out with the main header **/
2828

2929
.mx_RightPanel_threadsButton::before {
30-
mask-image: url("$(res)/img/element-icons/room/thread.svg");
30+
mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg");
3131
}
3232

3333
.mx_RightPanel_notifsButton::before {
@@ -36,7 +36,7 @@ Please see LICENSE files in the repository root for full details.
3636
}
3737

3838
.mx_RightPanel_roomSummaryButton::before {
39-
mask-image: url("$(res)/img/element-icons/room/room-summary.svg");
39+
mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
4040
mask-position: center;
4141
}
4242

‎res/css/structures/_RoomView.pcss

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -207,62 +207,3 @@ Please see LICENSE files in the repository root for full details.
207207
min-height: 42px;
208208
}
209209
}
210-
211-
@keyframes mx_Indicator_pulse {
212-
0% {
213-
transform: scale(0.95);
214-
}
215-
216-
70% {
217-
transform: scale(1);
218-
}
219-
220-
100% {
221-
transform: scale(0.95);
222-
}
223-
}
224-
225-
@keyframes mx_Indicator_pulse_shadow {
226-
0% {
227-
opacity: 0.7;
228-
}
229-
230-
70% {
231-
transform: scale(2.2);
232-
opacity: 0;
233-
}
234-
235-
100% {
236-
opacity: 0;
237-
}
238-
}
239-
240-
.mx_Indicator {
241-
position: absolute;
242-
right: -3px;
243-
top: -3px;
244-
width: var(--RoomHeader-indicator-dot-size);
245-
height: var(--RoomHeader-indicator-dot-size);
246-
border-radius: 50%;
247-
transform: scale(1);
248-
background: var(--RoomHeader-indicator-pulseColor);
249-
box-shadow: 0 0 0 0 var(--RoomHeader-indicator-pulseColor);
250-
animation: mx_Indicator_pulse 2s infinite;
251-
animation-iteration-count: 1;
252-
253-
&::after {
254-
content: "";
255-
position: absolute;
256-
width: inherit;
257-
height: inherit;
258-
top: 0;
259-
left: 0;
260-
transform: scale(1);
261-
transform-origin: center center;
262-
animation-name: mx_Indicator_pulse_shadow;
263-
animation-duration: inherit;
264-
animation-iteration-count: inherit;
265-
border-radius: 50%;
266-
background: inherit;
267-
}
268-
}

‎res/css/structures/_SpacePanel.pcss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ Please see LICENSE files in the repository root for full details.
211211
}
212212

213213
&.mx_SpaceButton_favourites .mx_SpaceButton_icon::before {
214-
mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg");
214+
mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg");
215215
}
216216

217217
&.mx_SpaceButton_people .mx_SpaceButton_icon::before {
218-
mask-image: url("$(res)/img/element-icons/room/members.svg");
218+
mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
219219
}
220220

221221
&.mx_SpaceButton_orphans .mx_SpaceButton_icon::before {
@@ -426,11 +426,11 @@ Please see LICENSE files in the repository root for full details.
426426
}
427427

428428
.mx_SpacePanel_iconLeave::before {
429-
mask-image: url("$(res)/img/element-icons/leave.svg");
429+
mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
430430
}
431431

432432
.mx_SpacePanel_iconMembers::before {
433-
mask-image: url("$(res)/img/element-icons/room/members.svg");
433+
mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
434434
}
435435

436436
.mx_SpacePanel_iconPlus::before {

‎res/css/structures/_SpaceRoomView.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Please see LICENSE files in the repository root for full details.
3939
}
4040

4141
&:hover {
42-
border-color: var(--cpd-color-bg-interactive-primary-rest);
42+
border-color: var(--cpd-color-bg-action-primary-rest);
4343

4444
&::before {
4545
background-color: var(--cpd-color-icon-primary);
@@ -248,7 +248,7 @@ Please see LICENSE files in the repository root for full details.
248248
}
249249

250250
.mx_SpaceRoomView_privateScope_justMeButton::before {
251-
mask-image: url("$(res)/img/element-icons/room/members.svg");
251+
mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
252252
}
253253

254254
.mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before {

‎res/css/structures/_UserMenu.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Please see LICENSE files in the repository root for full details.
197197
}
198198

199199
.mx_UserMenu_iconSignOut::before {
200-
mask-image: url("$(res)/img/element-icons/leave.svg");
200+
mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
201201
}
202202

203203
.mx_UserMenu_iconQr::before {

‎res/css/views/audio_messages/_PlaybackContainer.pcss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ Please see LICENSE files in the repository root for full details.
2828

2929
/* Waveforms are present in live recording only */
3030
.mx_Waveform {
31+
/* default, overridden in JS */
32+
--barHeight: 1;
3133
.mx_Waveform_bar {
3234
background-color: $quaternary-content;
3335
height: 100%;
34-
/* Variable set by a JS component */
3536
transform: scaleY(max(0.05, var(--barHeight)));
3637

3738
&.mx_Waveform_bar_100pct {

‎res/css/views/audio_messages/_SeekBar.pcss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Please see LICENSE files in the repository root for full details.
1212
/* * https://css-tricks.com/styling-cross-browser-compatible-range-inputs-css/ */
1313

1414
.mx_SeekBar {
15+
/* default, overridden in JS */
16+
--fillTo: 1;
17+
1518
/* Dev note: we deliberately do not have the -ms-track (and friends) selectors because we don't */
1619
/* need to support IE. */
1720

‎res/css/views/context_menus/_MessageContextMenu.pcss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Please see LICENSE files in the repository root for full details.
3333
}
3434

3535
.mx_MessageContextMenu_iconLink::before {
36-
mask-image: url("$(res)/img/element-icons/link.svg");
36+
mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
3737
}
3838

3939
.mx_MessageContextMenu_iconPermalink::before {
@@ -53,7 +53,7 @@ Please see LICENSE files in the repository root for full details.
5353
}
5454

5555
.mx_MessageContextMenu_iconForward::before {
56-
mask-image: url("$(res)/img/element-icons/message/fwd.svg");
56+
mask-image: url("@vector-im/compound-design-tokens/icons/forward.svg");
5757
}
5858

5959
.mx_MessageContextMenu_iconRedact::before {
@@ -96,7 +96,7 @@ Please see LICENSE files in the repository root for full details.
9696
}
9797

9898
.mx_MessageContextMenu_iconReplyInThread::before {
99-
mask-image: url("$(res)/img/element-icons/message/thread.svg");
99+
mask-image: url("@vector-im/compound-design-tokens/icons/threads.svg");
100100
}
101101

102102
.mx_MessageContextMenu_iconReact::before {

‎res/css/views/context_menus/_RoomGeneralContextMenu.pcss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.mx_RoomGeneralContextMenu_iconStar::before {
2-
mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg");
2+
mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg");
33
}
44

55
.mx_RoomGeneralContextMenu_iconArrowDown::before {
@@ -31,7 +31,7 @@
3131
}
3232

3333
.mx_RoomGeneralContextMenu_iconPeople::before {
34-
mask-image: url("$(res)/img/element-icons/room/members.svg");
34+
mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
3535
}
3636

3737
.mx_RoomGeneralContextMenu_iconFiles::before {
@@ -43,29 +43,29 @@
4343
}
4444

4545
.mx_RoomGeneralContextMenu_iconWidgets::before {
46-
mask-image: url("$(res)/img/element-icons/room/apps.svg");
46+
mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg");
4747
}
4848

4949
.mx_RoomGeneralContextMenu_iconSettings::before {
5050
mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg");
5151
}
5252

5353
.mx_RoomGeneralContextMenu_iconExport::before {
54-
mask-image: url("$(res)/img/element-icons/export.svg");
54+
mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg");
5555
}
5656

5757
.mx_RoomGeneralContextMenu_iconDeveloperTools::before {
5858
mask-image: url("$(res)/img/element-icons/settings/flask.svg");
5959
}
6060

6161
.mx_RoomGeneralContextMenu_iconCopyLink::before {
62-
mask-image: url("$(res)/img/element-icons/link.svg");
62+
mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
6363
}
6464

6565
.mx_RoomGeneralContextMenu_iconInvite::before {
6666
mask-image: url("$(res)/img/element-icons/room/invite.svg");
6767
}
6868

6969
.mx_RoomGeneralContextMenu_iconSignOut::before {
70-
mask-image: url("$(res)/img/element-icons/leave.svg");
70+
mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
7171
}

‎res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Please see LICENSE files in the repository root for full details.
5151
background-color: $secondary-content;
5252
mask-repeat: no-repeat;
5353
mask-size: contain;
54-
mask-image: url("$(res)/img/element-icons/room/room-summary.svg");
54+
mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
5555
mask-position: center;
5656
}
5757
}

‎res/css/views/dialogs/_LeaveSpaceDialog.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Please see LICENSE files in the repository root for full details.
4545
background-color: $secondary-content;
4646
mask-repeat: no-repeat;
4747
mask-size: contain;
48-
mask-image: url("$(res)/img/element-icons/room/room-summary.svg");
48+
mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
4949
mask-position: center;
5050
}
5151
}

‎res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Please see LICENSE files in the repository root for full details.
108108
background-color: $secondary-content;
109109
mask-repeat: no-repeat;
110110
mask-size: contain;
111-
mask-image: url("$(res)/img/element-icons/room/room-summary.svg");
111+
mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
112112
mask-position: center;
113113
}
114114
}

0 commit comments

Comments
 (0)