duh

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Try pre-depends
2026-01-16 03:21:40 -05:00 · 2024-01-22 10:18:20 +00:00 · 2024-01-22 10:14:52 +00:00 · 2024-01-22 08:46:52 +00:00 · 2024-01-19 09:52:28 +00:00
45 changed files with 1140 additions and 1583 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,12 @@

 ## Checklist

-   [ ] Ensure your code works with manual testing.
-   [ ] 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/vector-im/element-desktop/blob/develop/CONTRIBUTING.md)).
+-   [ ] Ensure your code works with manual testing
+-   [ ] Linter and other CI checks pass
+-   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-desktop/blob/develop/CONTRIBUTING.md))
+
+<!--
+If you would like to specify text for the changelog entry other than your PR title, add the following:
+
+Notes: Add super cool feature
+-->
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -103,9 +103,9 @@ jobs:
            - linux
            - windows
        runs-on: ubuntu-latest
-        name: ${{ needs.prepare.outputs.deploy == 'true' && 'Deploy' || 'Deploy (dry-run)' }}
+        name: ${{ needs.prepare.outputs.deploy && 'Deploy' || 'Deploy (dry-run)' }}
        if: always() && !failure() && !cancelled()
-        environment: ${{ needs.prepare.outputs.deploy == 'true' && 'packages.element.io' || '' }}
+        environment: ${{ needs.prepare.outputs.deploy && 'packages.element.io' || '' }}
        steps:
            - name: Download artifacts
              uses: actions/download-artifact@v4
@@ -181,14 +181,14 @@ jobs:
                  fi

            - name: Stash packages.element.io
-              if: needs.prepare.outputs.deploy == 'false'
+              if: ${{ !needs.prepare.outputs.deploy }}
              uses: actions/upload-artifact@v4
              with:
                  name: packages.element.io
                  path: packages.element.io

            - name: Deploy artifacts
-              if: needs.prepare.outputs.deploy == 'true'
+              if: needs.prepare.outputs.deploy
              run: |
                  aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
              env:
@@ -198,8 +198,8 @@ jobs:
                  DEPLOYMENT_DIR: ${{ needs.prepare.outputs.packages-dir }}

            - name: Notify packages.element.io of new files
-              if: needs.prepare.outputs.deploy == 'true'
-              uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+              if: needs.prepare.outputs.deploy
+              uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
              with:
                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  repository: element-hq/packages.element.io
@@ -215,7 +215,7 @@ jobs:
                  done

            - name: Stash debs
-              if: needs.prepare.outputs.deploy == 'false' && needs.linux.result == 'success'
+              if: ${{ !needs.prepare.outputs.deploy && needs.linux.result == 'success' }}
              uses: actions/upload-artifact@v4
              with:
                  name: debs
@@ -225,7 +225,7 @@ jobs:

            - name: Publish amd64 deb to packages.element.io
              uses: element-hq/packages.element.io@master
-              if: needs.prepare.outputs.deploy == 'true' && needs.linux.result == 'success'
+              if: needs.prepare.outputs.deploy && needs.linux.result == 'success'
              with:
                  file: ${{ steps.deb.outputs.amd64 }}
                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -235,43 +235,10 @@ jobs:

            - name: Publish arm64 deb to packages.element.io
              uses: element-hq/packages.element.io@master
-              if: needs.prepare.outputs.deploy == 'true' && needs.linux.result == 'success'
+              if: needs.prepare.outputs.deploy && needs.linux.result == 'success'
              with:
                  file: ${{ steps.deb.outputs.arm64 }}
                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  bucket-api: ${{ vars.CF_R2_S3_API }}
                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}
-
-    deploy-ess:
-        needs: deploy
-        runs-on: ubuntu-latest
-        name: Deploy builds to ESS
-        if: needs.prepare.outputs.deploy == 'true' && github.event_name == 'release'
-        env:
-            BUCKET_NAME: "element-desktop-msi.onprem.element.io"
-            AWS_REGION: "eu-central-1"
-        permissions:
-            id-token: write # This is required for requesting the JWT
-        steps:
-            - name: Configure AWS credentials
-              uses: aws-actions/configure-aws-credentials@v3
-              with:
-                  role-to-assume: arn:aws:iam::264135176173:role/Push-ElementDesktop-MSI
-                  role-session-name: githubaction-run-${{ github.run_id }}
-                  aws-region: ${{ env.AWS_REGION }}
-
-            - name: Download artifacts
-              uses: actions/download-artifact@v4
-              with:
-                  pattern: win-*
-
-            - name: Copy files to S3
-              run: |
-                  PREFIX="${VERSION%.*}"
-                  for file in win-*/*.msi; do
-                      filename=$(basename "$file")
-                      aws s3 cp "$file" "s3://${{ env.BUCKET_NAME }}/$PREFIX/$filename"
-                  done
-              env:
-                  VERSION: ${{ github.event.release.tag_name }}
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -41,13 +41,13 @@ jobs:

            - name: "Get modified files"
              id: changed_files
-              uses: tj-actions/changed-files@2d756ea4c53f7f6b397767d8723b3a10a9f35bf2 # v44
+              uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41
              with:
                  files: |
                      dockerbuild/**
            - name: Log in to the Container registry
              if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@5f4866a30a54f16a52d2ecb4a3898e9e424939cf
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
              with:
                  registry: ${{ env.REGISTRY }}
                  username: ${{ github.actor }}
@@ -63,7 +63,7 @@ jobs:

            - name: Build and push Docker image
              if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
              with:
                  context: dockerbuild
                  push: true
@@ -163,7 +163,7 @@ jobs:
                  RUN_AS: ${{ runner.os == 'Linux' && 'sudo' || '' }}

            - name: Run tests
-              uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
+              uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1
              timeout-minutes: 5
              with:
                  run: "yarn test ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }}"
@@ -171,9 +171,8 @@ jobs:
                  ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}

            - name: Upload HTML report
-              if: always()
              uses: actions/upload-artifact@v4
              with:
                  name: ${{ matrix.artifact }}-test
-                  path: playwright/html-report
+                  path: playwright-report
                  retention-days: 14
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -33,7 +33,7 @@ jobs:
            run:
                shell: bash
        steps:
-            - uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f
+            - uses: kanga333/variable-mapper@master
              id: config
              with:
                  key: "${{ inputs.arch }}"
@@ -59,7 +59,7 @@ jobs:

            - name: Cache .hak
              id: cache
-              uses: actions/cache@v4
+              uses: actions/cache@v3
              with:
                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                  path: |
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -29,7 +29,7 @@ on:
                description: "The URL to which the output will be deployed."
 jobs:
    build:
-        runs-on: macos-14 # M1
+        runs-on: macos-latest
        environment: ${{ inputs.sign && 'packages.element.io' || '' }}
        steps:
            - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:

            - name: Cache .hak
              id: cache
-              uses: actions/cache@v4
+              uses: actions/cache@v3
              with:
                  key: ${{ runner.os }}-${{ hashFiles('hakHash', 'electronVersion') }}
                  path: |
@@ -52,12 +52,6 @@ jobs:
                  rustup toolchain install stable --profile minimal --no-self-update
                  rustup default stable
                  rustup target add aarch64-apple-darwin
-                  rustup target add x86_64-apple-darwin
-
-            # M1 macos-14 comes without Python preinstalled
-            - uses: actions/setup-python@v5
-              with:
-                  python-version: "3.12"

            - uses: actions/setup-node@v4
              with:
--- a/.github/workflows/build_windows.yaml
+++ b/.github/workflows/build_windows.yaml
@@ -1,11 +1,6 @@
 # This workflow relies on actions/cache to store the hak dependency artifacts as they take a long time to build
 # Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
 # the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
-
-# window-latest by default uses the pwsh shell which breaks codeSigningCert in the workflow
-defaults:
-    run:
-        shell: powershell
 on:
    workflow_call:
        secrets:
@@ -35,7 +30,7 @@ jobs:
        env:
            SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe"
        steps:
-            - uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f
+            - uses: kanga333/variable-mapper@3681b75f5c6c00162721168fb91ab74925eaebcb
              id: config
              with:
                  key: "${{ inputs.arch }}"
@@ -65,7 +60,7 @@ jobs:

            - name: Cache .hak
              id: cache
-              uses: actions/cache@v4
+              uses: actions/cache@v3
              with:
                  key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                  path: |
@@ -119,10 +114,8 @@ jobs:
              run: |
                  Set-StrictMode -Version 'Latest'

-                  # Download, extract, and rename
-                  Invoke-WebRequest -OutFile eSigner_CKA.zip "$env:ESIGNER_URL"
-                  Expand-Archive -Path eSigner_CKA.zip -DestinationPath .
-                  Get-ChildItem -Path * -Include "*_build_*.exe" | Rename-Item -NewName eSigner_CKA.exe
+                  # Download
+                  Invoke-WebRequest -OutFile eSigner_CKA.exe "https://packages.element.io/tools/SSL.COM%20eSigner%20CKA_1.0.4-build-20230221_signed.exe"

                  # Install
                  New-Item -ItemType Directory -Force -Path "$env:INSTALL_DIR"
@@ -149,7 +142,6 @@ jobs:
                  echo "ED_SIGNTOOL_THUMBPRINT=$Thumbprint" >> $env:GITHUB_ENV
                  echo "ED_SIGNTOOL_SUBJECT_NAME=$SubjectName" >> $env:GITHUB_ENV
              env:
-                  ESIGNER_URL: https://github.com/SSLcom/eSignerCKA/releases/download/v1.0.6/SSL.COM-eSigner-CKA_1.0.6.zip
                  INSTALL_DIR: C:\Users\runneradmin\eSignerCKA
                  MASTER_KEY_FILE: C:\Users\runneradmin\eSignerCKA\master.key

--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -20,7 +20,7 @@ jobs:
            - uses: actions/checkout@v4

            - name: Log in to the Container registry
-              uses: docker/login-action@5f4866a30a54f16a52d2ecb4a3898e9e424939cf
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
              with:
                  registry: ${{ env.REGISTRY }}
                  username: ${{ github.actor }}
@@ -28,14 +28,14 @@ jobs:

            - name: Extract metadata for Docker
              id: meta
-              uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5
+              uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4
              with:
                  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                  tags: |
                      type=ref,event=branch

            - name: Build and push Docker image
-              uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
              with:
                  context: dockerbuild
                  push: true
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -2,12 +2,20 @@ name: Release Drafter
 on:
    push:
        branches: [staging]
-    workflow_dispatch: {}
-    repository_dispatch:
-        types: [upstream-release-notify]
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
 concurrency: ${{ github.workflow }}
 jobs:
    draft:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@develop
-        with:
-            include-changes: element-hq/element-web~$VERSION
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,17 +23,3 @@ jobs:
            include-changes: element-hq/element-web@$VERSION
            gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
            expected-asset-count: 1
-
-    check:
-        name: Post release checks
-        needs: release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Wait for desktop packaging
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: Deploy
-                  allowed-conclusions: success
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -25,8 +25,6 @@ jobs:
    i18n_lint:
        name: "i18n Check"
        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
-        with:
-            hardcoded-words: "Element"

    js_lint:
        name: "ESLint"
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -1,14 +0,0 @@
-name: Move new issues into Issue triage board
-
-on:
-    issues:
-        types: [opened]
-
-jobs:
-    automate-project-columns-next:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/element-hq/projects/120
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,211 +1,3 @@
-Changes in [1.11.65](https://github.com/element-hq/element-desktop/releases/tag/v1.11.65) (2024-04-23)
-======================================================================================================
-## ✨ Features
-
-* Make empty state copy for TAC depend on the value of the setting ([#12419](https://github.com/matrix-org/matrix-react-sdk/pull/12419)). Contributed by @dbkr.
-* Linkify User Interactive Authentication errors ([#12271](https://github.com/matrix-org/matrix-react-sdk/pull/12271)). Contributed by @t3chguy.
-* Add support for device dehydration v2 ([#12316](https://github.com/matrix-org/matrix-react-sdk/pull/12316)). Contributed by @uhoreg.
-* Replace `SecurityCustomisations` with `CryptoSetupExtension` ([#12342](https://github.com/matrix-org/matrix-react-sdk/pull/12342)). Contributed by @thoraj.
-* Add activity toggle for TAC ([#12413](https://github.com/matrix-org/matrix-react-sdk/pull/12413)). Contributed by @dbkr.
-* Humanize spell check language labels ([#12409](https://github.com/matrix-org/matrix-react-sdk/pull/12409)). Contributed by @t3chguy.
-* Call Guest Access, give user the option to change the acces level so they can generate a call link. ([#12401](https://github.com/matrix-org/matrix-react-sdk/pull/12401)). Contributed by @toger5.
-* TAC: Release Announcement ([#12380](https://github.com/matrix-org/matrix-react-sdk/pull/12380)). Contributed by @florianduros.
-* Show the call and share button if the user can create a guest link. ([#12385](https://github.com/matrix-org/matrix-react-sdk/pull/12385)). Contributed by @toger5.
-* Add analytics for mark all threads unread ([#12384](https://github.com/matrix-org/matrix-react-sdk/pull/12384)). Contributed by @dbkr.
-* Add `EventType.RoomEncryption` to the auto approve capabilities of Element Call widgets ([#12386](https://github.com/matrix-org/matrix-react-sdk/pull/12386)). Contributed by @toger5.
-
-## 🐛 Bug Fixes
-
-* Fix link modal not shown after access upgrade ([#12411](https://github.com/matrix-org/matrix-react-sdk/pull/12411)). Contributed by @toger5.
-* Fix thread navigation in timeline ([#12412](https://github.com/matrix-org/matrix-react-sdk/pull/12412)). Contributed by @florianduros.
-* Fix inability to join a `knock` room via space hierarchy view ([#12404](https://github.com/matrix-org/matrix-react-sdk/pull/12404)). Contributed by @t3chguy.
-* Focus the thread panel when clicking on an item in the TAC ([#12410](https://github.com/matrix-org/matrix-react-sdk/pull/12410)). Contributed by @dbkr.
-* Fix space hierarchy tile busy state being stuck after join error ([#12405](https://github.com/matrix-org/matrix-react-sdk/pull/12405)). Contributed by @t3chguy.
-* Fix room topic in-app links not being handled correctly on topic dialog ([#12406](https://github.com/matrix-org/matrix-react-sdk/pull/12406)). Contributed by @t3chguy.
-
-
-
-Changes in [1.11.64](https://github.com/element-hq/element-desktop/releases/tag/v1.11.64) (2024-04-09)
-======================================================================================================
-## ✨ Features
-
-* Mark all threads as read button ([#12378](https://github.com/matrix-org/matrix-react-sdk/pull/12378)). Contributed by @dbkr.
-* Video call meta space ([#12297](https://github.com/matrix-org/matrix-react-sdk/pull/12297)). Contributed by @toger5.
-* Add leave room warning for last admin ([#9452](https://github.com/matrix-org/matrix-react-sdk/pull/9452)). Contributed by @Arnei.
-* Iterate styles around Link new device via QR ([#12356](https://github.com/matrix-org/matrix-react-sdk/pull/12356)). Contributed by @t3chguy.
-* Improve code-splitting of highlight.js and maplibre-gs libs ([#12349](https://github.com/matrix-org/matrix-react-sdk/pull/12349)). Contributed by @t3chguy.
-* Use data-mx-color for rainbows ([#12325](https://github.com/matrix-org/matrix-react-sdk/pull/12325)). Contributed by @tulir.
-
-## 🐛 Bug Fixes
-
-* Fix external guest access url for unencrypted rooms ([#12345](https://github.com/matrix-org/matrix-react-sdk/pull/12345)). Contributed by @toger5.
-* Fix video rooms not showing share link button ([#12374](https://github.com/matrix-org/matrix-react-sdk/pull/12374)). Contributed by @toger5.
-* Fix space topic jumping on hover/focus ([#12377](https://github.com/matrix-org/matrix-react-sdk/pull/12377)). Contributed by @t3chguy.
-* Allow popping out a Jitsi widget to respect Desktop `web_base_url` config ([#12376](https://github.com/matrix-org/matrix-react-sdk/pull/12376)). Contributed by @t3chguy.
-* Remove the Lazy Loading `InvalidStoreError` Dialogs ([#12358](https://github.com/matrix-org/matrix-react-sdk/pull/12358)). Contributed by @langleyd.
-* Improve readability of badges and pills ([#12360](https://github.com/matrix-org/matrix-react-sdk/pull/12360)). Contributed by @robintown.
-
-
-
-Changes in [1.11.63](https://github.com/element-hq/element-desktop/releases/tag/v1.11.63) (2024-03-28)
-======================================================================================================
-This is a hotfix release to fix a couple of issues: one where the client would sometimes call the client/server API to set a push rule in a loop, and one where authentication was not sent for widgets when it should have been.
-
-## 🐛 Bug Fixes
-
-* Revert "Make EC widget theme reactive - Update widget url when the theme changes" ([#12383](https://github.com/matrix-org/matrix-react-sdk/pull/12383)) in order to fix widgets that require authentication.
-* Update to hotfixed js-sdk to fix an issue where Element could try to set a push rule in a loop.
-
-Changes in [1.11.62](https://github.com/element-hq/element-desktop/releases/tag/v1.11.62) (2024-03-26)
-======================================================================================================
-## ✨ Features
-
-* Change user permission by using a new apply button ([#12346](https://github.com/matrix-org/matrix-react-sdk/pull/12346)). Contributed by @florianduros.
-* Mark as Unread ([#12254](https://github.com/matrix-org/matrix-react-sdk/pull/12254)). Contributed by @dbkr.
-* Refine the colors of some more components ([#12343](https://github.com/matrix-org/matrix-react-sdk/pull/12343)). Contributed by @robintown.
-* TAC: Order rooms by most recent after notification level ([#12329](https://github.com/matrix-org/matrix-react-sdk/pull/12329)). Contributed by @florianduros.
-* Make EC widget theme reactive - Update widget url when the theme changes ([#12295](https://github.com/matrix-org/matrix-react-sdk/pull/12295)). Contributed by @toger5.
-* Refine styles of menus, toasts, popovers, and modals ([#12332](https://github.com/matrix-org/matrix-react-sdk/pull/12332)). Contributed by @robintown.
-* Element Call: fix widget shown while its still loading (`waitForIframeLoad=false`) ([#12292](https://github.com/matrix-org/matrix-react-sdk/pull/12292)). Contributed by @toger5.
-* Improve Forward Dialog a11y by switching to roving tab index interactions ([#12306](https://github.com/matrix-org/matrix-react-sdk/pull/12306)). Contributed by @t3chguy.
-* Call guest access link creation to join calls as a non registered user via the EC SPA ([#12259](https://github.com/matrix-org/matrix-react-sdk/pull/12259)). Contributed by @toger5.
-* Use `strong` element to semantically denote visually emphasised content ([#12320](https://github.com/matrix-org/matrix-react-sdk/pull/12320)). Contributed by @t3chguy.
-* Handle up/down arrow keys as well as left/right for horizontal toolbars for improved a11y ([#12305](https://github.com/matrix-org/matrix-react-sdk/pull/12305)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* [Backport staging] Remove the glass border from modal spinners ([#12369](https://github.com/matrix-org/matrix-react-sdk/pull/12369)). Contributed by @RiotRobot.
-* Fix incorrect check for private read receipt support ([#12348](https://github.com/matrix-org/matrix-react-sdk/pull/12348)). Contributed by @tulir.
-* TAC: Fix hover state when expanded ([#12337](https://github.com/matrix-org/matrix-react-sdk/pull/12337)). Contributed by @florianduros.
-* Fix the image view ([#12341](https://github.com/matrix-org/matrix-react-sdk/pull/12341)). Contributed by @robintown.
-* Use correct push rule to evaluate room-wide mentions ([#12318](https://github.com/matrix-org/matrix-react-sdk/pull/12318)). Contributed by @t3chguy.
-* Reset power selector on API failure to prevent state mismatch ([#12319](https://github.com/matrix-org/matrix-react-sdk/pull/12319)). Contributed by @t3chguy.
-* Fix spotlight opening in TAC ([#12315](https://github.com/matrix-org/matrix-react-sdk/pull/12315)). Contributed by @florianduros.
-
-
-
-Changes in [1.11.61](https://github.com/element-hq/element-desktop/releases/tag/v1.11.61) (2024-03-14)
-======================================================================================================
-* No changes
-
-## 🐛 Bug Fixes
-
-* Update `@vector-im/compound-design-tokens` in package.json ([#12340](https://github.com/matrix-org/matrix-react-sdk/pull/12340)).
-
-
-
-Changes in [1.11.60](https://github.com/element-hq/element-desktop/releases/tag/v1.11.60) (2024-03-12)
-======================================================================================================
-## ✨ Features
-
-* Refine styles of controls to match Compound ([#12299](https://github.com/matrix-org/matrix-react-sdk/pull/12299)). Contributed by @robintown.
-* Hide the archived section ([#12286](https://github.com/matrix-org/matrix-react-sdk/pull/12286)). Contributed by @dbkr.
-* Add theme data to EC widget Url ([#12279](https://github.com/matrix-org/matrix-react-sdk/pull/12279)). Contributed by @toger5.
-* Update MSC2965 OIDC Discovery implementation ([#12245](https://github.com/matrix-org/matrix-react-sdk/pull/12245)). Contributed by @t3chguy.
-* Use green dot for activity notification in `LegacyRoomHeader` ([#12270](https://github.com/matrix-org/matrix-react-sdk/pull/12270)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Fix requests for senders to submit auto-rageshakes ([#12304](https://github.com/matrix-org/matrix-react-sdk/pull/12304)). Contributed by @richvdh.
-* fix automatic DM avatar with functional members ([#12157](https://github.com/matrix-org/matrix-react-sdk/pull/12157)). Contributed by @HarHarLinks.
-* Feeds event with relation to unknown to the widget ([#12283](https://github.com/matrix-org/matrix-react-sdk/pull/12283)). Contributed by @maheichyk.
-* Fix TAC opening with keyboard ([#12285](https://github.com/matrix-org/matrix-react-sdk/pull/12285)). Contributed by @florianduros.
-* Allow screenshot update docker to run multiple test files ([#12291](https://github.com/matrix-org/matrix-react-sdk/pull/12291)). Contributed by @dbkr.
-* Fix alignment of user menu avatar ([#12289](https://github.com/matrix-org/matrix-react-sdk/pull/12289)). Contributed by @dbkr.
-* Fix buttons of widget in a room ([#12288](https://github.com/matrix-org/matrix-react-sdk/pull/12288)). Contributed by @florianduros.
-* ModuleAPI: `overwrite_login` action was not stopping the existing client resulting in the action failing with rust-sdk ([#12272](https://github.com/matrix-org/matrix-react-sdk/pull/12272)). Contributed by @BillCarsonFr.
-
-
-
-Changes in [1.11.59](https://github.com/element-hq/element-desktop/releases/tag/v1.11.59) (2024-02-27)
-======================================================================================================
-## 🦖 Deprecations
-
-* Enable custom themes to theme Compound ([#12240](https://github.com/matrix-org/matrix-react-sdk/pull/12240)). Contributed by @robintown.
-* Remove welcome bot `welcome_user_id` support ([#12153](https://github.com/matrix-org/matrix-react-sdk/pull/12153)). Contributed by @t3chguy.
-
-## ✨ Features
-
-* Ignore activity in TAC ([#12269](https://github.com/matrix-org/matrix-react-sdk/pull/12269)). Contributed by @florianduros.
-* Use browser's font size instead of hardcoded `16px` as root font size ([#12246](https://github.com/matrix-org/matrix-react-sdk/pull/12246)). Contributed by @florianduros.
-* Revert "Use Compound primary colors for most actions" ([#12264](https://github.com/matrix-org/matrix-react-sdk/pull/12264)). Contributed by @florianduros.
-* Revert "Refine menu, toast, and popover colors" ([#12263](https://github.com/matrix-org/matrix-react-sdk/pull/12263)). Contributed by @florianduros.
-* Fix Native OIDC for Element Desktop ([#12253](https://github.com/matrix-org/matrix-react-sdk/pull/12253)). Contributed by @t3chguy.
-* Improve client metadata used for OIDC dynamic registration ([#12257](https://github.com/matrix-org/matrix-react-sdk/pull/12257)). Contributed by @t3chguy.
-* Refine menu, toast, and popover colors ([#12247](https://github.com/matrix-org/matrix-react-sdk/pull/12247)). Contributed by @robintown.
-* Call the AsJson forms of import and exportRoomKeys ([#12233](https://github.com/matrix-org/matrix-react-sdk/pull/12233)). Contributed by @andybalaam.
-* Use Compound primary colors for most actions ([#12241](https://github.com/matrix-org/matrix-react-sdk/pull/12241)). Contributed by @robintown.
-* Enable redirected media by default ([#12142](https://github.com/matrix-org/matrix-react-sdk/pull/12142)). Contributed by @turt2live.
-* Reduce TAC width by `16px` ([#12239](https://github.com/matrix-org/matrix-react-sdk/pull/12239)). Contributed by @florianduros.
-* Pop out of Threads Activity Centre ([#12136](https://github.com/matrix-org/matrix-react-sdk/pull/12136)). Contributed by @florianduros.
-* Use new semantic tokens for username colors ([#12209](https://github.com/matrix-org/matrix-react-sdk/pull/12209)). Contributed by @robintown.
-
-## 🐛 Bug Fixes
-
-* Fix the space panel getting bigger when gaining a scroll bar ([#12267](https://github.com/matrix-org/matrix-react-sdk/pull/12267)). Contributed by @dbkr.
-* Fix gradients spacings on the space panel ([#12262](https://github.com/matrix-org/matrix-react-sdk/pull/12262)). Contributed by @dbkr.
-* Remove hardcoded `Element` in tac labs description ([#12266](https://github.com/matrix-org/matrix-react-sdk/pull/12266)). Contributed by @florianduros.
-* Fix branding in "migrating crypto" message ([#12265](https://github.com/matrix-org/matrix-react-sdk/pull/12265)). Contributed by @richvdh.
-* Use h1 as first heading in dialogs ([#12250](https://github.com/matrix-org/matrix-react-sdk/pull/12250)). Contributed by @dbkr.
-* Fix forced lowercase username in login/registration flows ([#9329](https://github.com/matrix-org/matrix-react-sdk/pull/9329)). Contributed by @vrifox.
-* Update the TAC indicator on event decryption ([#12243](https://github.com/matrix-org/matrix-react-sdk/pull/12243)). Contributed by @dbkr.
-* Fix OIDC delegated auth account url check ([#12242](https://github.com/matrix-org/matrix-react-sdk/pull/12242)). Contributed by @t3chguy.
-* New Header edgecase fixes: Close lobby button not shown, disable join button in various places, more... ([#12235](https://github.com/matrix-org/matrix-react-sdk/pull/12235)). Contributed by @toger5.
-* Fix TAC button alignment when expanded ([#12238](https://github.com/matrix-org/matrix-react-sdk/pull/12238)). Contributed by @florianduros.
-* Fix tooltip behaviour in TAC ([#12236](https://github.com/matrix-org/matrix-react-sdk/pull/12236)). Contributed by @florianduros.
-
-
-
-Changes in [1.11.58](https://github.com/element-hq/element-desktop/releases/tag/v1.11.58) (2024-02-13)
-======================================================================================================
-* 🦀  🔒 **The flag to enable the Rust crypto implementation is now set to `true` by default. This means that without any additional configuration every new login will use the new cryptography implementation.**
-* Add Element call related functionality to new room header ([#12091](https://github.com/matrix-org/matrix-react-sdk/pull/12091)). Contributed by @toger5.
-* Add labs flag for Threads Activity Centre ([#12137](https://github.com/matrix-org/matrix-react-sdk/pull/12137)). Contributed by @florianduros.
-* Refactor element call lobby + skip lobby ([#12057](https://github.com/matrix-org/matrix-react-sdk/pull/12057)). Contributed by @toger5.
-* Hide the "Message" button in the sidebar if the CreateRooms components should not be shown ([#9271](https://github.com/matrix-org/matrix-react-sdk/pull/9271)). Contributed by @dhenneke.
-* Add notification dots to thread summary icons ([#12146](https://github.com/matrix-org/matrix-react-sdk/pull/12146)). Contributed by @dbkr.
-
-## 🐛 Bug Fixes
-
-* Fix logout can take ages ([#12191](https://github.com/matrix-org/matrix-react-sdk/pull/12191)). Contributed by @BillCarsonFr.
-* Fix `Mark all as read` in settings ([#12205](https://github.com/matrix-org/matrix-react-sdk/pull/12205)). Contributed by @florianduros.
-* Fix default thread notification of the new RoomHeader ([#12194](https://github.com/matrix-org/matrix-react-sdk/pull/12194)). Contributed by @florianduros.
-* Fix display of room notification debug info ([#12183](https://github.com/matrix-org/matrix-react-sdk/pull/12183)). Contributed by @dbkr.
-
-Changes in [1.11.57](https://github.com/element-hq/element-desktop/releases/tag/v1.11.57) (2024-01-31)
-======================================================================================================
-## 🦖 Deprecations
-
-* Deprecate welcome bot `welcome_user_id` support ([#26885](https://github.com/element-hq/element-web/pull/26885)). Contributed by @t3chguy.
-
-## 🦖 Deprecations
-
-* Deprecate welcome bot `welcome_user_id` support ([#26885](https://github.com/element-hq/element-web/pull/26885)). Contributed by @t3chguy.
-
-## ✨ Features
-
-* Use jitsi-lobby in video channel (video rooms) ([#26879](https://github.com/element-hq/element-web/pull/26879)). Contributed by @toger5.
-## 🐛 Bug Fixes
-
-* Fix OIDC bugs due to amnesiac stores forgetting OIDC issuer \& other data ([#12166](https://github.com/matrix-org/matrix-react-sdk/pull/12166)). Contributed by @t3chguy.
-* Fix account management link for delegated auth OIDC setups ([#12144](https://github.com/matrix-org/matrix-react-sdk/pull/12144)). Contributed by @t3chguy.
-* Fix Safari IME support ([#11016](https://github.com/matrix-org/matrix-react-sdk/pull/11016)). Contributed by @SuperKenVery.
-* Fix Stickerpicker layout crossing multiple CSS stacking contexts ([#12127](https://github.com/matrix-org/matrix-react-sdk/pull/12127)).
-* Fix Stickerpicker layout crossing multiple CSS stacking contexts ([#12126](https://github.com/matrix-org/matrix-react-sdk/pull/12126)). Contributed by @t3chguy.
-* Fix 1F97A and 1F979 in Twemoji COLR font ([#12177](https://github.com/matrix-org/matrix-react-sdk/pull/12177)).
-## ✨ Features
-
-* Use jitsi-lobby in video channel (video rooms) ([#26879](https://github.com/element-hq/element-web/pull/26879)). Contributed by @toger5.
-## 🐛 Bug Fixes
-* Fix OIDC bugs due to amnesiac stores forgetting OIDC issuer \& other data ([#12166](https://github.com/matrix-org/matrix-react-sdk/pull/12166)). Contributed by @t3chguy.
-* Fix account management link for delegated auth OIDC setups ([#12144](https://github.com/matrix-org/matrix-react-sdk/pull/12144)). Contributed by @t3chguy.
-* Fix Safari IME support ([#11016](https://github.com/matrix-org/matrix-react-sdk/pull/11016)). Contributed by @SuperKenVery.
-* Fix Stickerpicker layout crossing multiple CSS stacking contexts ([#12127](https://github.com/matrix-org/matrix-react-sdk/pull/12127)).
-* Fix Stickerpicker layout crossing multiple CSS stacking contexts ([#12126](https://github.com/matrix-org/matrix-react-sdk/pull/12126)). Contributed by @t3chguy.
-* Fix 1F97A and 1F979 in Twemoji COLR font ([#12177](https://github.com/matrix-org/matrix-react-sdk/pull/12177)).
-
-
-
 Changes in [1.11.54](https://github.com/element-hq/element-desktop/releases/tag/v1.11.54) (2024-01-16)
 ======================================================================================================
 ## 🔧 Security
--- a/dockerbuild/Dockerfile
+++ b/dockerbuild/Dockerfile
@@ -34,11 +34,13 @@ ENV LC_ALL C.UTF-8

 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
-ENV NODE_VERSION 18.19.0
+ENV NODE_VERSION 16.18.1

 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl --proto "=https" -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
-  unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md
+  unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md && \
+  # https://github.com/npm/npm/issues/4531
+  npm config set unsafe-perm true

 ENV RUSTUP_HOME=/usr/local/rustup \
    CARGO_HOME=/usr/local/cargo \
--- a/docs/packaging.md
+++ b/docs/packaging.md
@@ -22,7 +22,12 @@ For releasing Element Desktop, we assume the following prerequisites:

 **Both of these are done automatically when you run the release automation.**

-The packaging is kicked off automagically for you when a Github Release for Element Desktop is published.
+Once those are ready, the **manual** release build can be manually invoked using https://github.com/vector-im/element-desktop/actions/workflows/build_and_deploy.yaml
+
+1. Click `Run workflow`
+1. Specify the `master` branch
+1. Switch type to release
+1. Click the green `Run workflow`

 ### More detail on the github actions

--- a/electron-builder.js
+++ b/electron-builder.js
@@ -1,8 +1,10 @@
-import * as os from "os";
-import * as fs from "fs";
-import * as path from "path";
-import { Arch, Configuration as BaseConfiguration, AfterPackContext } from "electron-builder";
-import { flipFuses, FuseVersion, FuseV1Options } from "@electron/fuses";
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+const Arch = require("electron-builder").Arch;
+const { flipFuses, FuseVersion, FuseV1Options } = require("@electron/fuses");
+
+// Typescript conversion blocked on https://github.com/electron-userland/electron-builder/issues/7775

 /**
 * This script has different outputs depending on your os platform.
@@ -24,47 +26,24 @@ import { flipFuses, FuseVersion, FuseV1Options } from "@electron/fuses";
 const NIGHTLY_APP_ID = "im.riot.nightly";
 const NIGHTLY_DEB_NAME = "element-nightly";

-interface Pkg {
-    name: string;
-    productName: string;
-    description: string;
-    version: string;
-}
-
-type Writable<T> = NonNullable<
-    T extends Function ? T : T extends object ? { -readonly [K in keyof T]: Writable<T[K]> } : T
->;
-
-const pkg: Pkg = JSON.parse(fs.readFileSync("package.json", "utf8"));
-
-interface Configuration extends BaseConfiguration {
-    extraMetadata: Partial<Pick<Pkg, "version">> & Omit<Pkg, "version">;
-    linux: {
-        desktop: Record<string, string>;
-    } & BaseConfiguration["linux"];
-    win: BaseConfiguration["win"];
-    mac: BaseConfiguration["mac"];
-    deb: {
-        fpm: string[];
-    } & BaseConfiguration["deb"];
-}
+const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"));

 /**
 * @type {import('electron-builder').Configuration}
 * @see https://www.electron.build/configuration/configuration
 */
-const config: Writable<Configuration> = {
+const config = {
    appId: "im.riot.app",
    asarUnpack: "**/*.node",
-    afterPack: async (context: AfterPackContext) => {
+    afterPack: async (context) => {
        if (context.electronPlatformName !== "darwin" || context.arch === Arch.universal) {
            // Burn in electron fuses for proactive security hardening.
            // On macOS, we only do this for the universal package, as the constituent arm64 and amd64 packages are embedded within.
-            const ext = (<Record<string, string>>{
+            const ext = {
                darwin: ".app",
                win32: ".exe",
                linux: "",
-            })[context.electronPlatformName];
+            }[context.electronPlatformName];

            let executableName = context.packager.appInfo.productFilename;
            if (context.electronPlatformName === "linux") {
@@ -136,6 +115,7 @@ const config: Writable<Configuration> = {
            "libsecret-1-0",
            "libasound2",
            "libgbm1",
+            "libc6 (>= 2.28)",
        ],
        recommends: ["libsqlcipher0", "element-io-archive-keyring"],
        fpm: [
@@ -154,13 +134,10 @@ const config: Writable<Configuration> = {
        icon: "build/icons/icon.icns",
    },
    win: {
-        target: ["squirrel", "msi"],
+        target: ["squirrel"],
        signingHashAlgorithms: ["sha256"],
        icon: "build/icons/icon.ico",
    },
-    msi: {
-        perMachine: true,
-    },
    directories: {
        output: "dist",
    },
@@ -236,4 +213,4 @@ if (os.platform() === "linux") {
    }
 }

-export default config;
+exports.default = config;
--- a/element.io/nightly/config.json
+++ b/element.io/nightly/config.json
@@ -50,11 +50,7 @@
    "privacy_policy_url": "https://element.io/cookie-policy",
    "features": {
        "feature_spotlight": true,
-        "feature_video_rooms": true,
-        "feature_element_call_video_rooms": true
-    },
-    "setting_defaults": {
-        "RustCrypto.staged_rollout_percent": 100
+        "feature_video_rooms": true
    },
    "element_call": {
        "url": "https://call.element.dev"
--- a/element.io/release/config.json
+++ b/element.io/release/config.json
@@ -44,8 +44,5 @@
        "api_host": "https://posthog.element.io"
    },
    "privacy_policy_url": "https://element.io/cookie-policy",
-    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx",
-    "setting_defaults": {
-        "RustCrypto.staged_rollout_percent": 10
-    }
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/hak/keytar/build.ts
+++ b/hak/keytar/build.ts
@@ -32,9 +32,6 @@ export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: Dependency
                cwd: moduleInfo.moduleBuildDir,
                env,
                stdio: "inherit",
-                // We need shell mode on Windows to be able to launch `.cmd` executables
-                // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-                shell: hakEnv.isWin(),
            },
        );
        proc.on("exit", (code) => {
--- a/hak/tsconfig.json
+++ b/hak/tsconfig.json
@@ -5,10 +5,10 @@
        "target": "es2016",
        "sourceMap": false,
        "strict": true,
-        "lib": ["es2020"]
+        "lib": ["es2020"],
    },
    "include": ["../scripts/@types/*.d.ts", "./**/*.ts"],
    "ts-node": {
-        "transpileOnly": true
-    }
+        "transpileOnly": true,
+    },
 }
--- a/knip.ts
+++ b/knip.ts
@@ -1,7 +1,7 @@
 import { KnipConfig } from "knip";

 export default {
-    entry: ["src/electron-main.ts", "src/preload.ts", "electron-builder.ts", ".eslintrc-*.js", "scripts/**", "hak/**"],
+    entry: ["src/electron-main.ts", "src/preload.ts", "electron-builder.js", ".eslintrc-*.js", "scripts/**", "hak/**"],
    project: ["**/*.{js,ts}"],
    ignoreDependencies: [
        // Brought in via hak scripts
@@ -9,7 +9,6 @@ export default {
        "matrix-seshat",
        // Needed by `electron-builder`
        "electron-builder-squirrel-windows",
-        "@types/yargs",
        // Required for `action-validator`
        "@action-validator/*",
    ],
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
    "name": "element-desktop",
    "productName": "Element",
    "main": "lib/electron-main.js",
-    "version": "1.11.65",
+    "version": "1.11.54",
    "description": "A feature-rich client for Matrix.org",
    "author": "Element",
    "homepage": "https://element.io",
@@ -74,42 +74,41 @@
        "uuid": "^9.0.0"
    },
    "devDependencies": {
-        "@action-validator/cli": "^0.6.0",
-        "@action-validator/core": "^0.6.0",
+        "@action-validator/cli": "^0.5.3",
+        "@action-validator/core": "^0.5.3",
        "@babel/core": "^7.18.10",
        "@babel/preset-env": "^7.18.10",
        "@babel/preset-typescript": "^7.18.6",
        "@electron/asar": "^3.2.3",
        "@electron/fuses": "^1.7.0",
-        "@playwright/test": "1.42.1",
+        "@playwright/test": "1.40.1",
        "@types/auto-launch": "^5.0.1",
        "@types/counterpart": "^0.18.1",
        "@types/minimist": "^1.2.1",
-        "@types/mkdirp": "^2.0.0",
-        "@types/node": "18.19.28",
+        "@types/mkdirp": "^1.0.2",
+        "@types/node": "18.19.8",
        "@types/pacote": "^11.1.1",
        "@types/tar": "^6.1.3",
        "@types/uuid": "^9.0.2",
-        "@types/yargs": "^17.0.32",
-        "@typescript-eslint/eslint-plugin": "^7.0.0",
-        "@typescript-eslint/parser": "^7.0.0",
-        "app-builder-lib": "24.13.3",
+        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/parser": "^6.0.0",
+        "app-builder-lib": "24.11.0",
        "chokidar": "^3.5.2",
        "detect-libc": "^2.0.0",
-        "electron": "^29.0.0",
-        "electron-builder": "24.13.3",
-        "electron-builder-squirrel-windows": "24.13.3",
+        "electron": "^28.0.0",
+        "electron-builder": "24.9.1",
+        "electron-builder-squirrel-windows": "24.11.0",
        "electron-devtools-installer": "^3.2.0",
        "eslint": "^8.26.0",
        "eslint-config-google": "^0.14.0",
        "eslint-config-prettier": "^9.0.0",
        "eslint-plugin-import": "^2.25.4",
        "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-unicorn": "^51.0.0",
+        "eslint-plugin-unicorn": "^50.0.0",
        "find-npm-prefix": "^1.0.2",
        "glob": "^10.0.0",
-        "knip": "^5.0.0",
-        "matrix-web-i18n": "^3.2.1",
+        "knip": "^4.0.1",
+        "matrix-web-i18n": "^3.1.3",
        "mkdirp": "^3.0.0",
        "node-pre-gyp": "^0.17.0",
        "pacote": "^17.0.0",
@@ -117,14 +116,13 @@
        "rimraf": "^5.0.0",
        "tar": "^6.1.2",
        "ts-node": "^10.9.1",
-        "typescript": "5.4.3"
+        "typescript": "5.3.3"
    },
    "hakDependencies": {
        "matrix-seshat": "^3.0.1",
        "keytar": "^7.9.0"
    },
    "resolutions": {
-        "@types/node": "18.19.28",
-        "config-file-ts": "0.2.8-rc1"
+        "@types/node": "18.19.8"
    }
 }
--- a/playwright/Dockerfile
+++ b/playwright/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.42.1-jammy
+FROM mcr.microsoft.com/playwright:v1.41.0-jammy

 WORKDIR /work/element-desktop

--- a/playwright/e2e/launch/launch.spec.ts
+++ b/playwright/e2e/launch/launch.spec.ts
@@ -17,7 +17,6 @@ limitations under the License.
 import { test, expect } from "../../element-desktop-test";

 test.describe("App launch", () => {
-    test.slow();
    test("should launch and render the welcome view successfully", async ({ page }) => {
        await page.locator("#matrixchat").waitFor();
        await page.locator(".mx_Welcome").waitFor();
--- a/playwright/element-desktop-test.ts
+++ b/playwright/element-desktop-test.ts
@@ -33,7 +33,7 @@ export const test = base.extend<{ app: ElectronApplication; tmpDir: string }>({
        const executablePath = process.env["ELEMENT_DESKTOP_EXECUTABLE"];
        if (!executablePath) {
            // Unpackaged mode testing
-            args.unshift(path.join(__dirname, "..", "lib", "electron-main.js"));
+            args.unshift("./lib/electron-main.js");
        }

        const app = await electron.launch({
@@ -42,9 +42,6 @@ export const test = base.extend<{ app: ElectronApplication; tmpDir: string }>({
            args,
        });

-        app.process().stdout.pipe(process.stdout);
-        app.process().stderr.pipe(process.stderr);
-
        await app.firstWindow();
        await use(app);
    },
--- a/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png
+++ b/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png
--- a/playwright/tsconfig.json
+++ b/playwright/tsconfig.json
@@ -5,7 +5,7 @@
        "esModuleInterop": true,
        "target": "es2017",
        "module": "es2022",
-        "lib": ["ESNext", "es2021", "dom"]
+        "lib": ["ESNext", "es2021", "dom"],
    },
-    "include": ["**/*.ts"]
+    "include": ["**/*.ts"],
 }
--- a/release.sh
+++ b/release.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Script to perform a release of element-desktop.
+
+set -e
+
+cd "$(dirname "$0")"
+
+./node_modules/matrix-js-sdk/release.sh "$@"
--- a/scripts/hak/fetch.ts
+++ b/scripts/hak/fetch.ts
@@ -44,9 +44,6 @@ export default async function fetch(hakEnv: HakEnv, moduleInfo: DependencyInfo):
        const proc = childProcess.spawn(hakEnv.isWin() ? "yarn.cmd" : "yarn", ["install", "--ignore-scripts"], {
            stdio: "inherit",
            cwd: moduleInfo.moduleBuildDir,
-            // We need shell mode on Windows to be able to launch `.cmd` executables
-            // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-            shell: hakEnv.isWin(),
        });
        proc.on("exit", (code) => {
            code ? reject(code) : resolve();
--- a/scripts/hak/hakEnv.ts
+++ b/scripts/hak/hakEnv.ts
@@ -17,17 +17,17 @@ limitations under the License.
 import path from "path";
 import os from "os";
 import nodePreGypVersioning from "node-pre-gyp/lib/util/versioning";
-import { getElectronVersionFromInstalled } from "app-builder-lib/out/electron/electronVersion";
+import { getElectronVersion } from "app-builder-lib/out/electron/electronVersion";

 import { Arch, Target, TARGETS, getHost, isHostId, TargetId } from "./target";

 async function getRuntime(projectRoot: string): Promise<string> {
-    const electronVersion = await getElectronVersionFromInstalled(projectRoot);
+    const electronVersion = await getElectronVersion(projectRoot);
    return electronVersion ? "electron" : "node-webkit";
 }

 async function getRuntimeVersion(projectRoot: string): Promise<string> {
-    const electronVersion = await getElectronVersionFromInstalled(projectRoot);
+    const electronVersion = await getElectronVersion(projectRoot);
    if (electronVersion) {
        return electronVersion;
    } else {
--- a/scripts/hak/link.ts
+++ b/scripts/hak/link.ts
@@ -53,9 +53,6 @@ export default async function link(hakEnv: HakEnv, moduleInfo: DependencyInfo):
        const proc = childProcess.spawn(yarnCmd, ["link"], {
            cwd: moduleInfo.moduleOutDir,
            stdio: "inherit",
-            // We need shell mode on Windows to be able to launch `.cmd` executables
-            // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-            shell: hakEnv.isWin(),
        });
        proc.on("exit", (code) => {
            code ? reject(code) : resolve();
@@ -66,9 +63,6 @@ export default async function link(hakEnv: HakEnv, moduleInfo: DependencyInfo):
        const proc = childProcess.spawn(yarnCmd, ["link", moduleInfo.name], {
            cwd: hakEnv.projectRoot,
            stdio: "inherit",
-            // We need shell mode on Windows to be able to launch `.cmd` executables
-            // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-            shell: hakEnv.isWin(),
        });
        proc.on("exit", (code) => {
            code ? reject(code) : resolve();
--- a/scripts/set-version.ts
+++ b/scripts/set-version.ts
@@ -32,11 +32,6 @@ export async function setPackageVersion(ver: string): Promise<void> {
                "--new-version",
                ver,
            ],
-            {
-                // We need shell mode on Windows to be able to launch `.cmd` executables
-                // See https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-                shell: process.platform === "win32",
-            },
            (err) => {
                if (err) {
                    reject(err);
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -7,10 +7,10 @@
        "module": "commonjs",
        "sourceMap": false,
        "strict": true,
-        "lib": ["es2020", "dom"]
+        "lib": ["es2020", "dom"],
    },
    "include": ["../src/@types", "./**/*.ts"],
    "ts-node": {
-        "transpileOnly": true
-    }
+        "transpileOnly": true,
+    },
 }
--- a/src/electron-main.ts
+++ b/src/electron-main.ts
@@ -41,7 +41,6 @@ import { getProfileFromDeeplink, protocolInit } from "./protocol";
 import { _t, AppLocalization } from "./language-helper";
 import { setDisplayMediaCallback } from "./displayMediaCallback";
 import { setupMacosTitleBar } from "./macos-titlebar";
-import { loadJsonFile } from "./utils";

 const argv = minimist(process.argv, {
    alias: { help: "h" },
@@ -144,7 +143,8 @@ async function loadConfig(): Promise<void> {
    const asarPath = await getAsarPath();

    try {
-        global.vectorConfig = loadJsonFile(asarPath, "config.json");
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        global.vectorConfig = require(asarPath + "config.json");
    } catch (e) {
        // it would be nice to check the error code here and bail if the config
        // is unparsable, but we get MODULE_NOT_FOUND in the case of a missing
@@ -155,7 +155,8 @@ async function loadConfig(): Promise<void> {

    try {
        // Load local config and use it to override values from the one baked with the build
-        const localConfig = loadJsonFile(app.getPath("userData"), "config.json");
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const localConfig = require(path.join(app.getPath("userData"), "config.json"));

        // If the local config has a homeserver defined, don't use the homeserver from the build
        // config. This is to avoid a problem where Riot thinks there are multiple homeservers
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -20,7 +20,6 @@
    },
    "common": {
        "about": "درباره",
-        "brand_help": "کمک %(brand)s",
        "help": "راهنما",
        "preferences": "ترجیحات"
    },
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -2,7 +2,6 @@
    "action": {
        "cancel": "ביטול",
        "close": "סגור",
-        "close_brand": "סגור%(brand)s",
        "copy": "העתק",
        "cut": "גזור",
        "delete": "מחק",
@@ -20,7 +19,6 @@
    },
    "common": {
        "about": "אודות",
-        "brand_help": "%(brand)s עזרה",
        "help": "עזרה",
        "preferences": "העדפות"
    },
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -57,7 +57,6 @@
    },
    "window_menu": {
        "bring_all_to_front": "Porta tutto in primo piano",
-        "label": "Finestra",
-        "zoom": "Ingrandisci"
+        "label": "Finestra"
    }
 }
--- a/src/language-helper.ts
+++ b/src/language-helper.ts
@@ -19,7 +19,6 @@ import { TranslationKey as TKey } from "matrix-web-i18n";

 import type Store from "electron-store";
 import type EN from "./i18n/strings/en_EN.json";
-import { loadJsonFile } from "./utils";

 const FALLBACK_LOCALE = "en";

@@ -106,7 +105,7 @@ export class AppLocalization {
    public fetchTranslationJson(locale: string): Record<string, string> {
        try {
            console.log("Fetching translation json for locale: " + locale);
-            return loadJsonFile(__dirname, "i18n", "strings", `${this.denormalize(locale)}.json`);
+            return require(`./i18n/strings/${this.denormalize(locale)}.json`);
        } catch (e) {
            console.log(`Could not fetch translation json for locale: '${locale}'`, e);
            return {};
--- a/src/protocol.ts
+++ b/src/protocol.ts
@@ -86,13 +86,8 @@ export function getProfileFromDeeplink(args: string[]): string | undefined {
    if (deeplinkUrl?.includes(SEARCH_PARAM)) {
        const parsedUrl = new URL(deeplinkUrl);
        if (parsedUrl.protocol === PROTOCOL) {
+            const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM)!;
            const store = readStore();
-            let ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
-            if (!ssoID) {
-                // In OIDC, we must shuttle the value in the `state` param rather than `element-desktop-ssoid`
-                // We encode it as a suffix like `:element-desktop-ssoid:XXYYZZ`
-                ssoID = parsedUrl.searchParams.get("state")!.split(`:${SEARCH_PARAM}:`)[1];
-            }
            console.log("Forwarding to profile: ", store[ssoID]);
            return store[ssoID];
        }
--- a/src/squirrelhooks.ts
+++ b/src/squirrelhooks.ts
@@ -18,16 +18,12 @@ import path from "path";
 import { spawn } from "child_process";
 import { app } from "electron";

-export function getSquirrelExecutable(): string {
-    return path.resolve(path.dirname(process.execPath), "..", "Update.exe");
-}
-
 function runUpdateExe(args: string[]): Promise<void> {
    // Invokes Squirrel's Update.exe which will do things for us like create shortcuts
    // Note that there's an Update.exe in the app-x.x.x directory and one in the parent
    // directory: we need to run the one in the parent directory, because it discovers
    // information about the app by inspecting the directory it's run from.
-    const updateExe = getSquirrelExecutable();
+    const updateExe = path.resolve(path.dirname(process.execPath), "..", "Update.exe");
    console.log(`Spawning '${updateExe}' with args '${args}'`);
    return new Promise((resolve) => {
        spawn(updateExe, args, {
--- a/src/tray.ts
+++ b/src/tray.ts
@@ -72,9 +72,7 @@ export function create(config: IConfig): void {
        guid = uuidv5(`${app.getName()}-${app.getPath("userData")}`, getUuid());
    }

-    // Passing guid=undefined on Windows will cause it to throw `Error: Invalid GUID format`
-    // The type here is wrong, the param must be omitted, never undefined.
-    trayIcon = guid ? new Tray(defaultIcon, guid) : new Tray(defaultIcon);
+    trayIcon = new Tray(defaultIcon, guid);
    trayIcon.setToolTip(config.brand);
    initApplicationMenu();
    trayIcon.on("click", toggleWin);
--- a/src/updater.ts
+++ b/src/updater.ts
@@ -15,9 +15,6 @@ limitations under the License.
 */

 import { app, autoUpdater, ipcMain } from "electron";
-import fs from "node:fs/promises";
-
-import { getSquirrelExecutable } from "./squirrelhooks";

 const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
 const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
@@ -77,12 +74,10 @@ async function pollForUpdates(): Promise<void> {
    }
 }

-export async function start(updateBaseUrl: string): Promise<void> {
-    if (!(await available(updateBaseUrl))) return;
+export function start(updateBaseUrl: string): void {
    if (updateBaseUrl.slice(-1) !== "/") {
        updateBaseUrl = updateBaseUrl + "/";
    }
-
    try {
        let url: string;
        let serverType: "json" | undefined;
@@ -98,6 +93,7 @@ export async function start(updateBaseUrl: string): Promise<void> {
            // Squirrel / electron only supports auto-update on these two platforms.
            // I'm not even going to try to guess which feed style they'd use if they
            // implemented it on Linux, or if it would be different again.
+            console.log("Auto update not supported on this platform");
            return;
        }

@@ -120,26 +116,6 @@ export async function start(updateBaseUrl: string): Promise<void> {
    }
 }

-async function available(updateBaseUrl?: string): Promise<boolean> {
-    if (process.platform === "linux") {
-        // Auto update is not supported on Linux
-        console.log("Auto update not supported on this platform");
-        return false;
-    }
-
-    if (process.platform === "win32") {
-        try {
-            await fs.access(getSquirrelExecutable());
-        } catch {
-            console.log("Squirrel not found, auto update not supported");
-            return false;
-        }
-    }
-
-    // Otherwise we're either on macOS or Windows with Squirrel
-    return !!updateBaseUrl;
-}
-
 ipcMain.on("install_update", installUpdate);
 ipcMain.on("check_updates", pollForUpdates);

--- a/src/utils.ts
+++ b/src/utils.ts
@@ -15,8 +15,6 @@ limitations under the License.
 */

 import crypto from "crypto";
-import fs from "node:fs";
-import path from "node:path";

 export async function randomArray(size: number): Promise<string> {
    return new Promise((resolve, reject) => {
@@ -29,20 +27,3 @@ export async function randomArray(size: number): Promise<string> {
        });
    });
 }
-
-type JsonValue = null | string | number;
-type JsonArray = Array<JsonValue | JsonObject | JsonArray>;
-interface JsonObject {
-    [key: string]: JsonObject | JsonArray | JsonValue;
-}
-type Json = JsonArray | JsonObject;
-
-/**
- * Synchronously load a JSON file from the local filesystem.
- * Unlike `require`, will never execute any javascript in a loaded file.
- * @param paths - An array of path segments which will be joined using the system's path delimiter.
- */
-export function loadJsonFile<T extends Json>(...paths: string[]): T {
-    const file = fs.readFileSync(path.join(...paths), { encoding: "utf-8" });
-    return JSON.parse(file);
-}
--- a/src/webcontents-handler.ts
+++ b/src/webcontents-handler.ts
@@ -33,7 +33,7 @@ import {
 import url from "url";
 import fs from "fs";
 import fetch from "node-fetch";
-import { pipeline } from "stream/promises";
+import { pipeline } from "stream";
 import path from "path";

 import { _t } from "./language-helper";
@@ -165,7 +165,7 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
                            const resp = await fetch(url);
                            if (!resp.ok) throw new Error(`unexpected response ${resp.statusText}`);
                            if (!resp.body) throw new Error(`unexpected response has no body ${resp.statusText}`);
-                            await pipeline(resp.body, fs.createWriteStream(filePath));
+                            pipeline(resp.body, fs.createWriteStream(filePath));
                        }
                    } catch (err) {
                        console.error(err);
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
        "typeRoots": ["src/@types", "node_modules/@types"],
        "lib": ["es2020", "dom"],
        "types": ["node"],
-        "strict": true
+        "strict": true,
    },
-    "include": ["./src/**/*.ts"]
+    "include": ["./src/**/*.ts"],
 }
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Michael Telatynski	b9ca3563b1	duh Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-01-22 10:18:20 +00:00
Michael Telatynski	f6dc2b562f	Try pre-depends Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-01-22 10:14:52 +00:00
Michael Telatynski	6e82f2a37c	Fix version specification Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-01-22 08:46:52 +00:00
Michael Telatynski	45e77dcb9b	Specify minimum libc version for Debian packages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-01-19 09:52:28 +00:00