Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into…

… t3chguy/dedup-icons Signed-off-by: Michael Telatynski <[email protected]> # Conflicts: # playwright/snapshots/file-upload/image-upload.spec.ts/image-upload-preview-linux.png # playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png # playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png # playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png # playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png # playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png # playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png # playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png # playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png # playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png # playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png # playwright/snapshots/room/room-header.spec.ts/encrypted-room-header-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-highlighted-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-long-name-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-video-room-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-highlighted-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-not-highlighted-linux.png # playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png # playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png # playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png # playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-linux.png # playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-smallscreen-linux.png # playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png # playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png # playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png # playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png # playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png # playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png # playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png # playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png # playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png # res/css/_common.pcss # res/css/structures/_SearchBox.pcss # res/css/structures/_UserMenu.pcss # res/css/views/dialogs/_UserSettingsDialog.pcss # res/css/views/elements/_ImageView.pcss # res/css/views/right_panel/_RoomSummaryCard.pcss # res/css/views/rooms/_PinnedEventTile.pcss # src/components/structures/RoomStatusBar.tsx # src/components/views/beacon/DialogSidebar.tsx # src/components/views/beacon/RoomLiveShareWarning.tsx # src/components/views/messages/MessageActionBar.tsx # src/components/views/right_panel/PinnedMessagesCard.tsx # src/components/views/rooms/RoomKnocksBar.tsx # src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx # src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx # src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
element-hq · Oct 4, 2024 · 2ccac7f · 2ccac7f
2 parents d85d400 + 70418f8
commit 2ccac7f
Show file tree

Hide file tree

Showing 2,677 changed files with 27,357 additions and 39,392 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,16 +1,8 @@
+#   Copyright 2024 New Vector Ltd.
 #   Copyright 2017 Aviral Dasgupta
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+#   
+#   SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+#   Please see LICENSE files in the repository root for full details.
 
 root = true
 

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -92,6 +92,8 @@ module.exports = {
                             "!matrix-js-sdk/src/crypto-api",
                             "!matrix-js-sdk/src/types",
                             "!matrix-js-sdk/src/testing",
+                            "!matrix-js-sdk/src/utils/**",
+                            "matrix-js-sdk/src/utils/internal/**",
                             "matrix-js-sdk/lib",
                             "matrix-js-sdk/lib/",
                             "matrix-js-sdk/lib/**",
@@ -119,11 +121,8 @@ module.exports = {
                             "!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
                             "!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
                             "!matrix-js-sdk/src/crypto",
-                            "!matrix-js-sdk/src/crypto/aes",
                             "!matrix-js-sdk/src/crypto/keybackup",
                             "!matrix-js-sdk/src/crypto/deviceinfo",
-                            "!matrix-js-sdk/src/crypto/key_passphrase",
-                            "!matrix-js-sdk/src/crypto/recoverykey",
                             "!matrix-js-sdk/src/crypto/dehydration",
                             "!matrix-js-sdk/src/oidc",
                             "!matrix-js-sdk/src/oidc/discovery",
@@ -142,6 +141,7 @@ module.exports = {
                             "!matrix-js-sdk/src/models/read-receipt",
                             "!matrix-js-sdk/src/models/relations-container",
                             "!matrix-js-sdk/src/models/related-relations",
+                            "!matrix-js-sdk/src/matrixrtc",
                         ],
                         message: "Please use matrix-js-sdk/src/matrix instead",
                     },

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,17 +1,18 @@
-*                         @matrix-org/element-web-reviewers
-/.github/workflows/**     @matrix-org/element-web-team
-/package.json             @matrix-org/element-web-team
-/yarn.lock                @matrix-org/element-web-team
+*                         @element-hq/element-web-reviewers
+/.github/workflows/**     @element-hq/element-web-team
+/package.json             @element-hq/element-web-team
+/yarn.lock                @element-hq/element-web-team
 
-/src/SecurityManager.ts                           @matrix-org/element-crypto-web-reviewers
-/test/SecurityManager-test.ts                     @matrix-org/element-crypto-web-reviewers
-/src/async-components/views/dialogs/security/     @matrix-org/element-crypto-web-reviewers
-/src/components/views/dialogs/security/           @matrix-org/element-crypto-web-reviewers
-/test/components/views/dialogs/security/          @matrix-org/element-crypto-web-reviewers
-/src/stores/SetupEncryptionStore.ts               @matrix-org/element-crypto-web-reviewers
-/test/stores/SetupEncryptionStore-test.ts         @matrix-org/element-crypto-web-reviewers
+/src/SecurityManager.ts                           @element-hq/element-crypto-web-reviewers
+/test/SecurityManager-test.ts                     @element-hq/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/     @element-hq/element-crypto-web-reviewers
+/src/components/views/dialogs/security/           @element-hq/element-crypto-web-reviewers
+/test/components/views/dialogs/security/          @element-hq/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts               @element-hq/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts         @element-hq/element-crypto-web-reviewers
 
 # Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
 # Ignore the synapse plugin as this is updated by GHA for docker image updating
 /playwright/plugins/homeserver/synapse/index.ts
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,4 +5,4 @@
 -   [ ] Tests written for new code (and old code if feasible).
 -   [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
 -   [ ] Linter and other CI checks pass.
--   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/matrix-org/matrix-react-sdk/blob/develop/CONTRIBUTING.md)).
+-   [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/matrix-react-sdk)
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -0,0 +1,28 @@
+- name: "A-Timesheet-1"
+  description: "Log any time spent on this into the A-Timesheet-1 project"
+  color: "5319E7"
+- name: "backport staging"
+  description: "Label to automatically backport PR to staging branch"
+  color: "B60205"
+- name: "Dependencies"
+  description: "Pull requests that update a dependency file"
+  color: "0366d6"
+- name: "Sponsored"
+  color: "b506d8"
+- name: "T-Deprecation"
+  description: "A pull request that makes something deprecated"
+  color: "98e6ae"
+- name: "X-Blocked"
+  description: "The PR cannot move forward in any capacity until an action is made"
+  color: "ff7979"
+- name: "X-Breaking-Change"
+  color: "ff7979"
+- name: "X-Upcoming-Release-Blocker"
+  description: "This does not affect the current release cycle but will affect the next one"
+  color: "e99695"
+- name: "Z-Community-PR"
+  description: "Issue is solved by a community member's PR"
+  color: "ededed"
+- name: "Z-Experiment"
+  description: "Experimental PR, primarily up for its Netlify build, high likelihood of never making it beyond here."
+  color: "b60205"
diff --git a/.github/workflows/notify-element-web.yml b/.github/workflows/notify-element-web.yml
@@ -9,7 +9,7 @@ jobs:
         name: "Notify Element Web"
         runs-on: ubuntu-latest
         # Only respect triggers from our develop branch, ignore that of forks
-        if: github.repository == 'matrix-org/matrix-react-sdk'
+        if: github.repository == 'element-hq/matrix-react-sdk'
         steps:
             - name: Notify element-web repo that a new SDK build is on develop
               uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3

diff --git a/.github/workflows/playwright-image-updates.yaml b/.github/workflows/playwright-image-updates.yaml
@@ -9,18 +9,18 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - name: Update matrixdotorg/synapse image
+            - name: Update synapse image
               run: |
                   docker pull "$IMAGE"
                   INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
                   DIGEST=${INSPECT#*@}
                   sed -i "s/const DOCKER_TAG.*/const DOCKER_TAG = \"develop@$DIGEST\";/" playwright/plugins/homeserver/synapse/index.ts
               env:
-                  IMAGE: matrixdotorg/synapse:develop
+                  IMAGE: ghcr.io/element-hq/synapse:develop
 
             - name: Create Pull Request
               id: cpr
-              uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
+              uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/playwright-image-updates

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,9 @@ concurrency: ${{ github.workflow }}
 jobs:
     release:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
-        secrets: inherit
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         with:
             final: ${{ inputs.mode == 'final' }}
             npm: ${{ inputs.npm }}

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -36,7 +36,7 @@ jobs:
             - name: Switch js-sdk to release mode
               working-directory: node_modules/matrix-js-sdk
               run: |
-                  scripts/switch_package_to_release.js
+                  scripts/switch_package_to_release.cjs
                   yarn install
                   yarn run build:compile
                   yarn run build:types

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -0,0 +1,21 @@
+name: Sync labels
+on:
+    workflow_dispatch: {}
+    schedule:
+        - cron: "0 1 * * *" # 1am every day
+    push:
+        branches:
+            - develop
+        paths:
+            - .github/labels.yml
+jobs:
+    sync-labels:
+        uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
+        with:
+            LABELS: |
+                element-hq/element-meta
+                .github/labels.yml
+            DELETE: true
+            WET: true
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
-                  repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
+                  repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/matrix-react-sdk' || github.repository }}
 
             - name: Yarn cache
               uses: actions/setup-node@v4
@@ -89,14 +89,18 @@ jobs:
                       coverage
                       !coverage/lcov-report
 
-    skip_sonar:
-        name: Skip SonarCloud in merge queue
-        if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-        runs-on: ubuntu-latest
+    complete:
+        name: jest-tests
         needs: jest
+        if: always()
+        runs-on: ubuntu-latest
         steps:
-            - name: Skip SonarCloud
-              uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
+            - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
+              run: exit 1
+
+            - name: Skip SonarCloud in merge queue
+              if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
+              uses: Sibz/github-status-action@faaa4d96fecf273bd762985e0e7f9f933c774918 # v1
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success
@@ -111,7 +115,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
               with:
-                  repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
+                  repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/matrix-react-sdk' || github.repository }}
 
             - uses: actions/setup-node@v4
               with:

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged --concurrent false
diff --git a/.lintstagedrc b/.lintstagedrc
@@ -0,0 +1,5 @@
+{
+    "*": "prettier --write",
+    "*.(ts|tsx|js|jsx)": ["eslint --fix"],
+    "*.pcss": ["stylelint"]
+}
diff --git a/.prettierrc.js → .prettierrc.cjs b/.prettierrc.js → .prettierrc.cjs