Merge branch 'develop' of https://github.com/vector-im/element-web in…

…to t3chguy/dedup-icons
element-hq · Oct 4, 2024 · af2041f · af2041f
2 parents e6105c1 + 00a9bb3
commit af2041f
Show file tree

Hide file tree

Showing 150 changed files with 4,162 additions and 2,827 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,3 +1,3 @@
-_extends: matrix-org/matrix-react-sdk
+_extends: element-hq/matrix-react-sdk
 version-resolver:
     default: patch
diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
@@ -30,22 +30,22 @@ jobs:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3
+              uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3
 
             - name: Prepare
               if: matrix.prepare
               run: ${{ matrix.prepare }}
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3
+              uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3
+              uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3
+              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
 
             - name: Build and push
               id: build-and-push
-              uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6
+              uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6
               with:
                   context: .
                   push: true

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -33,7 +33,7 @@ jobs:
             - name: Fetch matrix-react-sdk
               uses: actions/checkout@v4
               with:
-                  repository: matrix-org/matrix-react-sdk
+                  repository: element-hq/matrix-react-sdk
                   path: matrix-react-sdk
 
             - name: Fetch matrix-js-sdk

diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
@@ -16,14 +16,14 @@ concurrency:
 jobs:
     playwright:
         name: Playwright
-        uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
+        uses: element-hq/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
         permissions:
             actions: read
             issues: read
             pull-requests: read
         with:
             element-web-sha: ${{ github.sha }}
-            react-sdk-repository: matrix-org/matrix-react-sdk
+            react-sdk-repository: element-hq/matrix-react-sdk
             # We only want to run the playwright tests on merge queue to prevent regressions
             # from creeping in. They take a long time to run and consume multiple concurrent runners.
             skip: ${{ github.event_name != 'merge_group' }}
diff --git a/.github/workflows/pending-reviews.yaml b/.github/workflows/pending-reviews.yaml
@@ -1,8 +1,10 @@
 name: Pending reviews automation
 on:
+    # The bot exceeded its API rate limit. Disabling for now (adding workflow dispatch so the workflow file stays valid & we can test to see if it starts working again)
+    workflow_dispatch: {}
     # We run it on a schedule instead of on pull_request_* events to not create confusing messaging in the PR
-    schedule:
-        - cron: "*/10 * * * *"
+    #schedule:
+    #    - cron: "*/10 * * * *"
 concurrency: ${{ github.workflow }}
 jobs:
     bot:
@@ -62,7 +64,7 @@ jobs:
                       const repos = [
                           "element-hq/element-desktop",
                           "element-hq/element-web",
-                          "matrix-org/matrix-react-sdk",
+                          "element-hq/matrix-react-sdk",
                           "matrix-org/matrix-js-sdk",
                       ];
                       const teams = [

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1
+              uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1
               with:
                   workflow: release-drafter.yml
                   repo: element-hq/element-desktop

diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
@@ -53,7 +53,7 @@ jobs:
               uses: actions/checkout@v4
               if: inputs.matrix-react-sdk
               with:
-                  repository: matrix-org/matrix-react-sdk
+                  repository: element-hq/matrix-react-sdk
                   path: matrix-react-sdk
                   ref: staging
                   fetch-depth: 0
@@ -70,11 +70,27 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-            - name: Merge develop
+            - name: Prepare Git
               run: |
                   git config --global user.email "[email protected]"
                   git config --global user.name "RiotRobot"
-                  for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
+
+            - name: Merge Element Desktop
+              if: inputs.element-desktop
+              run: |
+                  git -C "element-desktop" merge origin/develop
+            - name: Merge Element Web
+              if: inputs.element-web
+              run: |
+                  git -C "element-web" merge origin/develop
+            - name: Merge React SDK
+              if: inputs.matrix-react-sdk
+              run: |
+                  git -C "matrix-react-sdk" merge origin/develop
+            - name: Merge JS SDK
+              if: inputs.matrix-js-sdk
+              run: |
+                  git -C "matrix-js-sdk" merge origin/develop
 
             - name: Push staging
               run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done
@@ -95,7 +111,7 @@ jobs:
               uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
               with:
                   ref: staging
-                  repo: matrix-org/matrix-react-sdk
+                  repo: element-hq/matrix-react-sdk
                   repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   wait-interval: 10
                   check-name: draft

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
@@ -14,7 +14,6 @@ jobs:
         runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-Maths') ||
-            contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
             contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
             contains(github.event.issue.labels.*.name, 'Z-IA') ||
             contains(github.event.issue.labels.*.name, 'A-Jump-To-Date ') ||
@@ -60,7 +59,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'X-Needs-Info')
         steps:
             - id: add_to_project
-              uses: actions/[email protected].1
+              uses: actions/[email protected].2
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -83,7 +82,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
         steps:
             - id: add_to_project
-              uses: actions/[email protected].1
+              uses: actions/[email protected].2
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -175,26 +174,3 @@ jobs:
               with:
                   project-url: https://github.com/orgs/element-hq/projects/101
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    element_r:
-        name: Add Element R issues to Crypto Team board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Element-R')
-        steps:
-            - id: add_to_project
-              uses: actions/[email protected]
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-            - id: set_fields
-              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
-                  field-keys: Workstream,module
-                  field-values: Element-R,web
-        env:
-            PROJECT_URL: https://github.com/orgs/element-hq/projects/76
diff --git a/.github/workflows/triage-stale-flaky-tests.yml b/.github/workflows/triage-stale-flaky-tests.yml
@@ -6,6 +6,7 @@ jobs:
     close:
         runs-on: ubuntu-latest
         permissions:
+            actions: write
             issues: write
         steps:
             - uses: actions/stale@v9

diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
@@ -22,7 +22,7 @@ jobs:
               run: "yarn update:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
+              uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update

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,7 @@
+{
+    "*": "prettier --write",
+    "src/**/*.(ts|tsx)": ["eslint --fix"],
+    "scripts/**/*.(ts|tsx)": ["eslint --fix"],
+    "module_system/**/*.(ts|tsx)": ["eslint --fix --config .eslintrc-module_system.js module_system"],
+    "*.pcss": ["stylelint --fix"]
+}