lint

.github/workflows/build_and_deploy.yaml

@@ -59,7 +59,7 @@ jobs:
         name: Windows ${{ matrix.arch }}
         strategy:
             matrix:
-                arch: [ia32, x64]
+                arch: [x64]
         uses: ./.github/workflows/build_windows.yaml
         secrets: inherit
         with:
@@ -85,7 +85,7 @@ jobs:
         strategy:
             matrix:
                 arch: [amd64, arm64]
-                sqlcipher: [static]
+                sqlcipher: [system, static]
         uses: ./.github/workflows/build_linux.yaml
         with:
             arch: ${{ matrix.arch }}
@@ -110,7 +110,7 @@ jobs:
             - name: Prepare artifacts for deployment
               run: |
                   # Windows
-                  for arch in x64 ia32 arm64
+                  for arch in x64 arm64
                   do
                       if [ -d "win-$arch" ]; then
                           mkdir -p packages.element.io/{install,update}/win32/$arch
@@ -143,7 +143,7 @@ jobs:
               if: needs.prepare.outputs.nightly-version != ''
               run: |
                   # Windows
-                  for arch in x64 ia32 arm64
+                  for arch in x64 arm64
                   do
                       [ -d "win-$arch" ] && mv packages.element.io/install/win32/$arch/{*,"Element Nightly Setup"}.exe
                   done
@@ -159,7 +159,7 @@ jobs:
               if: needs.prepare.outputs.nightly-version == ''
               run: |
                   # Windows
-                  for arch in x64 ia32 arm64
+                  for arch in x64 arm64
                   do
                       if [ -d "win-$arch" ]; then
                           pushd packages.element.io/install/win32/$arch
@@ -218,7 +218,7 @@ jobs:
               run: |
                   for arch in amd64 arm64
                   do
-                      echo "$arch=$(ls linux-$arch-sqlcipher-static/*.deb | tail -n1)" >> $GITHUB_OUTPUT
+                      echo "$arch=$(ls linux-$arch-sqlcipher-system/*.deb | tail -n1)" >> $GITHUB_OUTPUT
                   done
 
             - name: Stash debs

.github/workflows/build_and_test.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: ./.github/workflows/build_windows.yaml
         strategy:
             matrix:
-                arch: [x64, ia32]
+                arch: [x64]
         with:
             arch: ${{ matrix.arch }}
 
@@ -63,26 +63,22 @@ jobs:
                       os: ubuntu-latest
                       artifact: linux-amd64-sqlcipher-system
                       executable: "/opt/Element/element-desktop"
-                      prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb"
+                      prepare_cmd: "sudo apt install ./dist/*.deb"
                     - name: "Linux (amd64) (sqlcipher: static)"
                       os: ubuntu-latest
                       artifact: linux-amd64-sqlcipher-static
                       executable: "/opt/Element/element-desktop"
-                      prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb"
+                      prepare_cmd: "sudo apt install ./dist/*.deb"
                     - name: "Linux (arm64) (sqlcipher: system)"
                       os: dind-l-arm64
                       artifact: linux-arm64-sqlcipher-system
                       executable: "/opt/Element/element-desktop"
-                      prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb"
+                      prepare_cmd: "sudo apt install -y ./dist/*.deb"
                     - name: "Linux (arm64) (sqlcipher: static)"
                       os: dind-l-arm64
                       artifact: linux-arm64-sqlcipher-static
                       executable: "/opt/Element/element-desktop"
-                      prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb"
-                    - name: Windows (x86)
-                      os: windows-latest
-                      artifact: win-ia32
-                      executable: "./dist/win-ia32-unpacked/Element.exe"
+                      prepare_cmd: "sudo apt install -y ./dist/*.deb"
                     - name: Windows (x64)
                       os: windows-latest
                       artifact: win-x64
@@ -94,9 +90,6 @@ jobs:
             - name: Install Yarn
               if: runner.environment == 'self-hosted'
               run: |
-                  # Sanity check that the arch is arm64 as we expect
-                  [[ $(uname -p) == "aarch64" ]] || exit 1
-
                   sudo apt-get -qq update
                   sudo apt-get install -y curl
                   curl -fsSL --create-dirs -o $HOME/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.19/yarn-1.22.19.js
@@ -131,12 +124,6 @@ jobs:
                   # We need sudo on Linux as it is installed in /opt/
                   RUN_AS: ${{ runner.os == 'Linux' && 'sudo' || '' }}
 
-            - name: Workaround macOS GHA permission issues
-              if: matrix.os == 'macos-latest'
-              run: |
-                  sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
-                  sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/opt/off/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
-
             - name: Run tests
               uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
               timeout-minutes: 5

.github/workflows/build_linux.yaml

@@ -38,9 +38,6 @@ jobs:
             - name: Install missing tools
               if: runner.environment == 'self-hosted'
               run: |
-                  # Sanity check that the arch is arm64 as we expect
-                  [[ $(uname -p) == "aarch64" ]] || exit 1
-
                   sudo apt-get -qq update
                   # curl for yarn download, git for tj-actions/changed-files, zstd for actions/cache
                   sudo apt-get install -y curl git zstd
@@ -112,14 +109,14 @@ jobs:
             - name: "Get modified files"
               id: changed_files
               if: steps.cache.outputs.cache-hit != 'true' && github.event_name == 'pull_request'
-              uses: tj-actions/changed-files@6b2903bdce6310cfbddd87c418f253cf29b2dec9 # v44
+              uses: tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44
               with:
                   files: |
                       dockerbuild/**
 
             # This allows contributors to test changes to the dockerbuild image within a pull request
             - name: Build docker image
-              uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6
+              uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5
               if: steps.changed_files.outputs.any_modified == 'true'
               with:
                   context: dockerbuild

.github/workflows/build_windows.yaml

@@ -19,7 +19,7 @@ on:
             arch:
                 type: string
                 required: true
-                description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'"
+                description: "The architecture to build for, one of 'x64' | 'arm64'"
             version:
                 type: string
                 required: false
@@ -49,11 +49,6 @@ jobs:
                           "target": "aarch64-pc-windows-msvc",
                           "build-args": "--arm64",
                           "arch": "amd64_arm64"
-                        },
-                        "ia32": {
-                          "target": "i686-pc-windows-msvc",
-                          "build-args": "--ia32",
-                          "arch": "x86"
                         }
                       }
 

.github/workflows/dockerbuild.yaml

@@ -20,15 +20,15 @@ jobs:
             - uses: actions/checkout@v4
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
+              uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3
+              uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3
               with:
                   install: true
 
             - name: Log in to the Container registry
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+              uses: docker/login-action@406e1d71198d2324043d77a06783c53195decb37
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -43,7 +43,7 @@ jobs:
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6
+              uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5
               with:
                   context: dockerbuild
                   push: true

.github/workflows/release-drafter.yml

@@ -3,6 +3,8 @@ on:
     push:
         branches: [staging]
     workflow_dispatch: {}
+    repository_dispatch:
+        types: [upstream-release-notify]
 concurrency: ${{ github.workflow }}
 jobs:
     draft:

.github/workflows/release.yml

@@ -20,6 +20,7 @@ jobs:
             GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         with:
             final: ${{ inputs.mode == 'final' }}
+            include-changes: element-hq/element-web@$VERSION
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             expected-asset-count: 1
 

CHANGELOG.md

@@ -1,255 +1,3 @@
-Changes in [1.11.76](https://github.com/element-hq/element-desktop/releases/tag/v1.11.76) (2024-08-27)
-======================================================================================================
-## ✨ Features
-
-* Message Pinning: rework the message pinning list in the right panel ([#12825](https://github.com/matrix-org/matrix-react-sdk/pull/12825)). Contributed by @florianduros.
-* Tweak UIA postMessage check to work cross-origin ([#12878](https://github.com/matrix-org/matrix-react-sdk/pull/12878)). Contributed by @t3chguy.
-* Delayed events (Futures) / MSC4140 for call widget ([#12714](https://github.com/matrix-org/matrix-react-sdk/pull/12714)). Contributed by @AndrewFerr.
-* Stop the ongoing ring if another device joins the call session. ([#12866](https://github.com/matrix-org/matrix-react-sdk/pull/12866)). Contributed by @toger5.
-* Rich text Editor: Auto-replace plain text emoticons with emoji ([#12828](https://github.com/matrix-org/matrix-react-sdk/pull/12828)). Contributed by @langleyd.
-* Clean up editor drafts for unknown rooms  ([#12850](https://github.com/matrix-org/matrix-react-sdk/pull/12850)). Contributed by @langleyd.
-* Rename general user settings to account ([#12841](https://github.com/matrix-org/matrix-react-sdk/pull/12841)). Contributed by @dbkr.
-* Update settings tab icons ([#12867](https://github.com/matrix-org/matrix-react-sdk/pull/12867)). Contributed by @dbkr.
-* Disable jump to read receipt button instead of hiding when nothing to jump to ([#12863](https://github.com/matrix-org/matrix-react-sdk/pull/12863)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Ensure elements on Login page are disabled when in-flight ([#12895](https://github.com/matrix-org/matrix-react-sdk/pull/12895)). Contributed by @t3chguy.
-* Hide pinned messages when grouped in timeline when feature pinning is disabled ([#12888](https://github.com/matrix-org/matrix-react-sdk/pull/12888)). Contributed by @florianduros.
-* Add chat button on new room header for maximised widgets ([#12882](https://github.com/matrix-org/matrix-react-sdk/pull/12882)). Contributed by @t3chguy.
-* Show spinner whilst initial search request is in progress ([#12883](https://github.com/matrix-org/matrix-react-sdk/pull/12883)). Contributed by @t3chguy.
-* Fix user menu font ([#12879](https://github.com/matrix-org/matrix-react-sdk/pull/12879)). Contributed by @florianduros.
-* Allow selecting text in the right panel topic ([#12870](https://github.com/matrix-org/matrix-react-sdk/pull/12870)). Contributed by @t3chguy.
-* Add missing presence indicator to new room header ([#12865](https://github.com/matrix-org/matrix-react-sdk/pull/12865)). Contributed by @t3chguy.
-* Fix permissions in release tarballs ([#27904](https://github.com/element-hq/element-web/pull/27904)). Contributed by @t3chguy.
-
-## 🧰 Maintenance
-
-* Update dependencies for MSC4157 ([#27906](https://github.com/element-hq/element-web/pull/27906)). Contributed by @AndrewFerr.
-
-
-Changes in [1.11.75](https://github.com/element-hq/element-desktop/releases/tag/v1.11.75) (2024-08-20)
-======================================================================================================
-# Security
-- Fixes for [CVE-2024-42369](https://nvd.nist.gov/vuln/detail/CVE-2024-42369) / [GHSA-vhr5-g3pm-49fm](https://github.com/matrix-org/matrix-js-sdk/security/advisories/GHSA-vhr5-g3pm-49fm).
-
-Changes in [1.11.74](https://github.com/element-hq/element-desktop/releases/tag/v1.11.74) (2024-08-13)
-======================================================================================================
-## ✨ Features
-
-* Update unsupported browser react component to new designs ([#27857](https://github.com/element-hq/element-web/pull/27857)). Contributed by @t3chguy.
-* Invite dialog: display MXID on its own line ([#11756](https://github.com/matrix-org/matrix-react-sdk/pull/11756)). Contributed by @AndrewFerr.
-* Align RoomSummaryCard styles with Figma ([#12793](https://github.com/matrix-org/matrix-react-sdk/pull/12793)). Contributed by @t3chguy.
-* Extract Extensions into their own right panel tab ([#12844](https://github.com/matrix-org/matrix-react-sdk/pull/12844)). Contributed by @t3chguy.
-* Remove topic from new room header and expand right panel topic ([#12842](https://github.com/matrix-org/matrix-react-sdk/pull/12842)). Contributed by @t3chguy.
-* Rework how the onboarding notifications task works ([#12839](https://github.com/matrix-org/matrix-react-sdk/pull/12839)). Contributed by @t3chguy.
-* Update toast styles to match Figma ([#12833](https://github.com/matrix-org/matrix-react-sdk/pull/12833)). Contributed by @t3chguy.
-* Warn users on unsupported browsers before they lack features ([#12830](https://github.com/matrix-org/matrix-react-sdk/pull/12830)). Contributed by @t3chguy.
-* Add sign out button to settings profile section ([#12666](https://github.com/matrix-org/matrix-react-sdk/pull/12666)). Contributed by @dbkr.
-* Remove MatrixRTC realted import ES lint exceptions using a index.ts for matrixrtc ([#12780](https://github.com/matrix-org/matrix-react-sdk/pull/12780)). Contributed by @toger5.
-* Fix unwanted ringing of other devices even though the user is already connected to the call. ([#12742](https://github.com/matrix-org/matrix-react-sdk/pull/12742)). Contributed by @toger5.
-* Acknowledge `DeviceMute` widget actions ([#12790](https://github.com/matrix-org/matrix-react-sdk/pull/12790)). Contributed by @toger5.
-
-## 🐛 Bug Fixes
-
-* Update Element icons ([#27900](https://github.com/element-hq/element-web/pull/27900)). Contributed by @t3chguy.
-* Fix Jitsi by updating device mute updates over postMessage API ([#27858](https://github.com/element-hq/element-web/pull/27858)). Contributed by @t3chguy.
-* Fix formatting of rich text emotes ([#12862](https://github.com/matrix-org/matrix-react-sdk/pull/12862)). Contributed by @dbkr.
-* Fixed custom emotes background color #27745 ([#12798](https://github.com/matrix-org/matrix-react-sdk/pull/12798)). Contributed by @asimdelvi.
-* Ignore permalink\_prefix when serializing pills ([#11726](https://github.com/matrix-org/matrix-react-sdk/pull/11726)). Contributed by @herkulessi.
-* Deflake the chat export test ([#12854](https://github.com/matrix-org/matrix-react-sdk/pull/12854)). Contributed by @dbkr.
-* Fix alignment of RTL messages ([#12837](https://github.com/matrix-org/matrix-react-sdk/pull/12837)). Contributed by @dbkr.
-* Handle media download errors better ([#12848](https://github.com/matrix-org/matrix-react-sdk/pull/12848)). Contributed by @t3chguy.
-* Make micIcon display on primary ([#11908](https://github.com/matrix-org/matrix-react-sdk/pull/11908)). Contributed by @kdanielm.
-* Fix compound typography font component issues ([#12826](https://github.com/matrix-org/matrix-react-sdk/pull/12826)). Contributed by @t3chguy.
-* Allow Chrome page translator to translate messages in rooms ([#11113](https://github.com/matrix-org/matrix-react-sdk/pull/11113)). Contributed by @lukaszpolowczyk.
-
-
-
-Changes in [1.11.73](https://github.com/element-hq/element-desktop/releases/tag/v1.11.73) (2024-08-06)
-======================================================================================================
-Fixes for CVE-2024-42347 / GHSA-f83w-wqhc-cfp4
-
-
-
-Changes in [1.11.72](https://github.com/element-hq/element-desktop/releases/tag/v1.11.72) (2024-07-30)
-======================================================================================================
-## ✨ Features
-
-* Support authenticated media downloads in Desktop too ([#1757](https://github.com/element-hq/element-desktop/pull/1757)). Contributed by @turt2live.
-* Polyfill Intl.Segmenter for wider web browser compatibility ([#27803](https://github.com/element-hq/element-web/pull/27803)). Contributed by @dbkr.
-* Enable audio/webaudio Modernizr rule ([#27772](https://github.com/element-hq/element-web/pull/27772)). Contributed by @t3chguy.
-* Add release announcement for the new room header ([#12802](https://github.com/matrix-org/matrix-react-sdk/pull/12802)). Contributed by @MidhunSureshR.
-* Default the room header to on ([#12803](https://github.com/matrix-org/matrix-react-sdk/pull/12803)). Contributed by @MidhunSureshR.
-* Update Thread Panel to match latest designs ([#12797](https://github.com/matrix-org/matrix-react-sdk/pull/12797)). Contributed by @t3chguy.
-* Close any open modals on logout ([#12777](https://github.com/matrix-org/matrix-react-sdk/pull/12777)). Contributed by @dbkr.
-* Iterate design of right panel empty state ([#12796](https://github.com/matrix-org/matrix-react-sdk/pull/12796)). Contributed by @t3chguy.
-* Update styling of UserInfo right panel card ([#12788](https://github.com/matrix-org/matrix-react-sdk/pull/12788)). Contributed by @t3chguy.
-* Accessibility: Add Landmark navigation ([#12190](https://github.com/matrix-org/matrix-react-sdk/pull/12190)). Contributed by @akirk.
-* Let Element Call widget receive m.room.create ([#12710](https://github.com/matrix-org/matrix-react-sdk/pull/12710)). Contributed by @AndrewFerr.
-* Let Element Call widget set session memberships ([#12713](https://github.com/matrix-org/matrix-react-sdk/pull/12713)). Contributed by @AndrewFerr.
-* Update right panel base card styling to match Compound ([#12768](https://github.com/matrix-org/matrix-react-sdk/pull/12768)). Contributed by @t3chguy.
-* Align `widget_build_url_ignore_dm` with call behaviour switch between 1:1 and Widget ([#12760](https://github.com/matrix-org/matrix-react-sdk/pull/12760)). Contributed by @t3chguy.
-* Move integrations switch ([#12733](https://github.com/matrix-org/matrix-react-sdk/pull/12733)). Contributed by @dbkr.
-* Element-R: Report events with withheld keys separately to Posthog. ([#12755](https://github.com/matrix-org/matrix-react-sdk/pull/12755)). Contributed by @richvdh.
-
-## 🐛 Bug Fixes
-
-* Fix Docker tooling for building native components ([#1779](https://github.com/element-hq/element-desktop/pull/1779)). Contributed by @t3chguy.
-* Add a modernizr check for WebAssembly support ([#27776](https://github.com/element-hq/element-web/pull/27776)). Contributed by @dbkr.
-* Test for lack of WebAssembly support ([#12792](https://github.com/matrix-org/matrix-react-sdk/pull/12792)). Contributed by @dbkr.
-* Fix stray 'account' heading ([#12791](https://github.com/matrix-org/matrix-react-sdk/pull/12791)). Contributed by @dbkr.
-* Add test for the unsupported browser screen ([#12787](https://github.com/matrix-org/matrix-react-sdk/pull/12787)). Contributed by @dbkr.
-* Fix HTML export test ([#12778](https://github.com/matrix-org/matrix-react-sdk/pull/12778)). Contributed by @dbkr.
-* Fix HTML export missing a bunch of Compound variables ([#12774](https://github.com/matrix-org/matrix-react-sdk/pull/12774)). Contributed by @t3chguy.
-* Fix inability to change accent colour consistently in custom theming ([#12772](https://github.com/matrix-org/matrix-react-sdk/pull/12772)). Contributed by @t3chguy.
-* Fix edge case of landing on 3pid email link with registration disabled ([#12771](https://github.com/matrix-org/matrix-react-sdk/pull/12771)). Contributed by @t3chguy.
-
-
-
-Changes in [1.11.71](https://github.com/element-hq/element-desktop/releases/tag/v1.11.71) (2024-07-16)
-======================================================================================================
-## ✨ Features
-
-* Add Modernizr rule for Intl.Segmenter ([#27677](https://github.com/element-hq/element-web/pull/27677)). Contributed by @t3chguy.
-* Add tabs to the right panel ([#12672](https://github.com/matrix-org/matrix-react-sdk/pull/12672)). Contributed by @MidhunSureshR.
-* Promote new room header from labs to Beta ([#12739](https://github.com/matrix-org/matrix-react-sdk/pull/12739)). Contributed by @t3chguy.
-* Redesign room search interface ([#12677](https://github.com/matrix-org/matrix-react-sdk/pull/12677)). Contributed by @t3chguy.
-* Move language settings to 'preferences' ([#12723](https://github.com/matrix-org/matrix-react-sdk/pull/12723)). Contributed by @dbkr.
-* New layout selector ui in user settings ([#12676](https://github.com/matrix-org/matrix-react-sdk/pull/12676)). Contributed by @florianduros.
-* Prevent Element appearing in system media controls  ([#10995](https://github.com/matrix-org/matrix-react-sdk/pull/10995)). Contributed by @SuperKenVery.
-* Move the account management button ([#12663](https://github.com/matrix-org/matrix-react-sdk/pull/12663)). Contributed by @dbkr.
-* Disable profile controls if the HS doesn't allow them to be set ([#12652](https://github.com/matrix-org/matrix-react-sdk/pull/12652)). Contributed by @dbkr.
-* New theme ui in user settings ([#12576](https://github.com/matrix-org/matrix-react-sdk/pull/12576)). Contributed by @florianduros.
-* Adjust room header hover transition from 300ms to 200ms ([#12703](https://github.com/matrix-org/matrix-react-sdk/pull/12703)). Contributed by @t3chguy.
-* Split out email \& phone number settings to separate components \& move discovery to privacy tab ([#12670](https://github.com/matrix-org/matrix-react-sdk/pull/12670)). Contributed by @dbkr.
-
-## 🐛 Bug Fixes
-
-* Ensure we do not load matrix-react-sdk is a manner which can white-screen ([#27685](https://github.com/element-hq/element-web/pull/27685)). Contributed by @t3chguy.
-* Fix incoming call toast crash due to audio refactor ([#12737](https://github.com/matrix-org/matrix-react-sdk/pull/12737)). Contributed by @t3chguy.
-* Improve new room header accessibility ([#12725](https://github.com/matrix-org/matrix-react-sdk/pull/12725)). Contributed by @t3chguy.
-* Fix closing all modals ([#12728](https://github.com/matrix-org/matrix-react-sdk/pull/12728)). Contributed by @dbkr.
-* Fix close button on forgot password flow ([#12732](https://github.com/matrix-org/matrix-react-sdk/pull/12732)). Contributed by @dbkr.
-* Don't consider textual characters to be emoji ([#12582](https://github.com/matrix-org/matrix-react-sdk/pull/12582)). Contributed by @robintown.
-* Clear autocomplete input on selection accept ([#12709](https://github.com/matrix-org/matrix-react-sdk/pull/12709)). Contributed by @dbkr.
-* Fix `Match system theme` toggle ([#12719](https://github.com/matrix-org/matrix-react-sdk/pull/12719)). Contributed by @florianduros.
-
-
-
-Changes in [1.11.70](https://github.com/element-hq/element-desktop/releases/tag/v1.11.70) (2024-07-08)
-======================================================================================================
-## ✨ Features
-
-* Tighten macOS entitlements ([#1731](https://github.com/element-hq/element-desktop/pull/1731)). Contributed by @t3chguy.
-* Add SSO redirect option for login page ([#27576](https://github.com/element-hq/element-web/pull/27576)). Contributed by @bartvdbraak.
-* Use stable endpoints for MSC3916 ([#27558](https://github.com/element-hq/element-web/pull/27558)). Contributed by @turt2live.
-* Switch to Rust crypto stack for all logins ([#12630](https://github.com/matrix-org/matrix-react-sdk/pull/12630)). Contributed by @richvdh.
-* Hide voip buttons in group rooms in environments with widgets disabled ([#12664](https://github.com/matrix-org/matrix-react-sdk/pull/12664)). Contributed by @t3chguy.
-* Minor tweaks to UserSettings dialog ([#12651](https://github.com/matrix-org/matrix-react-sdk/pull/12651)). Contributed by @florianduros.
-* Hide voice call button when redundant ([#12639](https://github.com/matrix-org/matrix-react-sdk/pull/12639)). Contributed by @t3chguy.
-* Improve accessibility of the room summary card ([#12586](https://github.com/matrix-org/matrix-react-sdk/pull/12586)). Contributed by @t3chguy.
-* Show tooltips on narrow tabbed views ([#12624](https://github.com/matrix-org/matrix-react-sdk/pull/12624)). Contributed by @dbkr.
-* Update gfm.css to github-markdown-css ([#12613](https://github.com/matrix-org/matrix-react-sdk/pull/12613)). Contributed by @t3chguy.
-* Cache e2eStatus to avoid concerning unencrypted flicker when changing rooms ([#12606](https://github.com/matrix-org/matrix-react-sdk/pull/12606)). Contributed by @t3chguy.
-* Tweak copy for user verification toast ([#12605](https://github.com/matrix-org/matrix-react-sdk/pull/12605)). Contributed by @t3chguy.
-* Support s tags for strikethrough for Matrix v1.10 ([#12604](https://github.com/matrix-org/matrix-react-sdk/pull/12604)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Switch debs to use the SQLCipher static version ([#1001](https://github.com/element-hq/element-desktop/pull/1001)). Contributed by @MatMaul.
-* Fix "Unable to restore session" error ([#4299](https://github.com/matrix-org/matrix-js-sdk/pull/4299)).
-* Fix error when sending encrypted messages in large rooms ([#4297](https://github.com/matrix-org/matrix-js-sdk/pull/4297)).
-* Remove redundant copy in deactive uia modal ([#12668](https://github.com/matrix-org/matrix-react-sdk/pull/12668)). Contributed by @t3chguy.
-* Fix high contrast theme in settings ([#12649](https://github.com/matrix-org/matrix-react-sdk/pull/12649)). Contributed by @florianduros.
-* Fix background on live location sharing footer ([#12629](https://github.com/matrix-org/matrix-react-sdk/pull/12629)). Contributed by @t3chguy.
-* Remove outdated iframe sandbox attribute ([#12633](https://github.com/matrix-org/matrix-react-sdk/pull/12633)). Contributed by @t3chguy.
-* Remove stray setState which caused encryption state shields to flicker ([#12632](https://github.com/matrix-org/matrix-react-sdk/pull/12632)). Contributed by @t3chguy.
-* Fix stray background colour on markdown body ([#12628](https://github.com/matrix-org/matrix-react-sdk/pull/12628)). Contributed by @t3chguy.
-* Fix widgets not being cleaned up correctly. ([#12616](https://github.com/matrix-org/matrix-react-sdk/pull/12616)). Contributed by @toger5.
-* Add in-progress view to display name EditInPlace ([#12609](https://github.com/matrix-org/matrix-react-sdk/pull/12609)). Contributed by @dbkr.
-* Fix config override of other settings levels ([#12593](https://github.com/matrix-org/matrix-react-sdk/pull/12593)). Contributed by @langleyd.
-* Don't show 'saved' on display name save error ([#12600](https://github.com/matrix-org/matrix-react-sdk/pull/12600)). Contributed by @dbkr.
-
-
-
-Changes in [1.11.69](https://github.com/element-hq/element-desktop/releases/tag/v1.11.69) (2024-06-18)
-======================================================================================================
-## ✨ Features
-
-* Change avatar setting component to use a menu ([#12585](https://github.com/matrix-org/matrix-react-sdk/pull/12585)). Contributed by @dbkr.
-* New user profile UI in User Settings ([#12548](https://github.com/matrix-org/matrix-react-sdk/pull/12548)). Contributed by @dbkr.
-* MSC4108 support OIDC QR code login ([#12370](https://github.com/matrix-org/matrix-react-sdk/pull/12370)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Fix image upload preview size ([#12612](https://github.com/matrix-org/matrix-react-sdk/pull/12612)). Contributed by @RiotRobot.
-* Fix screen sharing in recent Chrome (https://github.com/matrix-org/matrix-js-sdk/pull/4243).
-* Fix roving tab index crash `compareDocumentPosition` ([#12594](https://github.com/matrix-org/matrix-react-sdk/pull/12594)). Contributed by @t3chguy.
-* Keep dialog glass border on narrow screens ([#12591](https://github.com/matrix-org/matrix-react-sdk/pull/12591)). Contributed by @dbkr.
-* Add missing a11y label to dismiss onboarding button in room list ([#12587](https://github.com/matrix-org/matrix-react-sdk/pull/12587)). Contributed by @t3chguy.
-* Add hover / active state on avatar setting upload button ([#12590](https://github.com/matrix-org/matrix-react-sdk/pull/12590)). Contributed by @dbkr.
-* Fix EditInPlace button styles ([#12589](https://github.com/matrix-org/matrix-react-sdk/pull/12589)). Contributed by @dbkr.
-* Fix incorrect assumptions about required fields in /search response ([#12575](https://github.com/matrix-org/matrix-react-sdk/pull/12575)). Contributed by @t3chguy.
-* Fix display of no avatar in avatar setting controls ([#12558](https://github.com/matrix-org/matrix-react-sdk/pull/12558)). Contributed by @dbkr.
-* Element-R: pass pickleKey in as raw key for indexeddb encryption ([#12543](https://github.com/matrix-org/matrix-react-sdk/pull/12543)). Contributed by @richvdh.
-
-
-
-Changes in [1.11.68](https://github.com/element-hq/element-desktop/releases/tag/v1.11.68) (2024-06-04)
-======================================================================================================
-Updates to Electron 30
-
-## ✨ Features
-
-* Tooltip: Improve accessibility for  context menus ([#12462](https://github.com/matrix-org/matrix-react-sdk/pull/12462)). Contributed by @florianduros.
-* Tooltip: Improve accessibility of space panel ([#12525](https://github.com/matrix-org/matrix-react-sdk/pull/12525)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Close the release announcement when a dialog is opened ([#12559](https://github.com/matrix-org/matrix-react-sdk/pull/12559)). Contributed by @florianduros.
-* Tooltip: close field tooltip when ESC is pressed ([#12553](https://github.com/matrix-org/matrix-react-sdk/pull/12553)). Contributed by @florianduros.
-* Fix tabbedview breakpoint width ([#12556](https://github.com/matrix-org/matrix-react-sdk/pull/12556)). Contributed by @dbkr.
-* Fix E2E icon display in room header ([#12545](https://github.com/matrix-org/matrix-react-sdk/pull/12545)). Contributed by @florianduros.
-* Tooltip: Improve placement for space settings ([#12541](https://github.com/matrix-org/matrix-react-sdk/pull/12541)). Contributed by @florianduros.
-* Fix deformed avatar in a call in a narrow timeline ([#12538](https://github.com/matrix-org/matrix-react-sdk/pull/12538)). Contributed by @florianduros.
-* Shown own sent state indicator even when showReadReceipts is disabled ([#12540](https://github.com/matrix-org/matrix-react-sdk/pull/12540)). Contributed by @t3chguy.
-* Ensure we do not fire the verification mismatch modal multiple times ([#12526](https://github.com/matrix-org/matrix-react-sdk/pull/12526)). Contributed by @t3chguy.
-* Fix avatar in chat export ([#12537](https://github.com/matrix-org/matrix-react-sdk/pull/12537)). Contributed by @florianduros.
-* Use `*` for italics as it doesn't break when used mid-word ([#12523](https://github.com/matrix-org/matrix-react-sdk/pull/12523)). Contributed by @t3chguy.
-
-
-
-Changes in [1.11.67](https://github.com/element-hq/element-desktop/releases/tag/v1.11.67) (2024-05-22)
-======================================================================================================
-## ✨ Features
-
-* Tooltip: Improve the accessibility of the composer and the rich text editor ([#12459](https://github.com/matrix-org/matrix-react-sdk/pull/12459)). Contributed by @florianduros.
-* Allow explicit configuration of OIDC dynamic registration metadata ([#12514](https://github.com/matrix-org/matrix-react-sdk/pull/12514)). Contributed by @t3chguy.
-* Tooltip: improve accessibility for messages ([#12487](https://github.com/matrix-org/matrix-react-sdk/pull/12487)). Contributed by @florianduros.
-* Collapse UserSettings tabs to just icons on narrow screens ([#12505](https://github.com/matrix-org/matrix-react-sdk/pull/12505)). Contributed by @dbkr.
-* Add room topic to right panel room info ([#12503](https://github.com/matrix-org/matrix-react-sdk/pull/12503)). Contributed by @t3chguy.
-* OIDC: pass `id_token` via `id_token_hint` on Manage Account interaction ([#12499](https://github.com/matrix-org/matrix-react-sdk/pull/12499)). Contributed by @t3chguy.
-* Tooltip: improve accessibility in room ([#12493](https://github.com/matrix-org/matrix-react-sdk/pull/12493)). Contributed by @florianduros.
-* Tooltip: improve accessibility for call and voice messages ([#12489](https://github.com/matrix-org/matrix-react-sdk/pull/12489)). Contributed by @florianduros.
-* Move the active tab in user settings to the dialog title ([#12481](https://github.com/matrix-org/matrix-react-sdk/pull/12481)). Contributed by @dbkr.
-* Tooltip: improve accessibility of spaces ([#12497](https://github.com/matrix-org/matrix-react-sdk/pull/12497)). Contributed by @florianduros.
-* Tooltip: improve accessibility of the right panel ([#12490](https://github.com/matrix-org/matrix-react-sdk/pull/12490)). Contributed by @florianduros.
-* MSC3575 (Sliding Sync) add well-known proxy support ([#12307](https://github.com/matrix-org/matrix-react-sdk/pull/12307)). Contributed by @EdGeraghty.
-
-## 🐛 Bug Fixes
-
-* Reuse single PlaybackWorker between Playback instances ([#12520](https://github.com/matrix-org/matrix-react-sdk/pull/12520)). Contributed by @t3chguy.
-* Fix well-known lookup for sliding sync labs check ([#12519](https://github.com/matrix-org/matrix-react-sdk/pull/12519)). Contributed by @t3chguy.
-* Fix `element-desktop-ssoid being` included in OIDC Authorization call ([#12495](https://github.com/matrix-org/matrix-react-sdk/pull/12495)). Contributed by @t3chguy.
-* Fix beta notifications reconciliation for intentional mentions push rules ([#12510](https://github.com/matrix-org/matrix-react-sdk/pull/12510)). Contributed by @t3chguy.
-* fix avatar stretched on 1:1 call ([#12494](https://github.com/matrix-org/matrix-react-sdk/pull/12494)). Contributed by @I-lander.
-* Check native sliding sync support against an unstable feature flag ([#12498](https://github.com/matrix-org/matrix-react-sdk/pull/12498)). Contributed by @turt2live.
-* Use OPTIONS for sliding sync detection poke ([#12492](https://github.com/matrix-org/matrix-react-sdk/pull/12492)). Contributed by @turt2live.
-* TAC: hide tooltip when the release announcement is displayed ([#12472](https://github.com/matrix-org/matrix-react-sdk/pull/12472)). Contributed by @florianduros.
-
-
-
 Changes in [1.11.66](https://github.com/element-hq/element-desktop/releases/tag/v1.11.66) (2024-05-07)
 ======================================================================================================
 ## ✨ Features

build/entitlements.mac.plist

@@ -9,11 +9,11 @@
          Latest electron-builder does, but it appears to be causing issues:
          (https://github.com/electron-userland/electron-builder/issues/4390)
     -->
-
     <!-- https://github.com/electron/electron-notarize#prerequisites -->
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
-
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
     <!-- https://github.com/electron-userland/electron-builder/issues/3940 -->
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>

dockerbuild/Dockerfile

@@ -4,8 +4,8 @@ FROM rust:buster
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN curl --proto "=https" -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* /yarn && ln -s /yarn/bin/yarn /usr/bin/yarn
-RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \
-  apt-get -y -qq install --no-install-recommends \
+RUN apt-get -qq update && apt-get -qq dist-upgrade && \
+  apt-get -qq install --no-install-recommends \
   # tclsh is required for building SQLite as part of SQLCipher
   tcl \
   # libsecret-1-dev is required even for prebuild keytar
@@ -18,9 +18,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
 
-WORKDIR /project
-
-ENV NODE_VERSION 20.15.1
+ENV NODE_VERSION 18.19.0
 ARG TARGETOS
 ARG TARGETARCH
 COPY setup.sh /setup.sh

docs/native-node-modules.md

@@ -109,13 +109,7 @@ yarn run build:universal
 
 ### Windows
 
-If you're on Windows, you can choose to build specifically for 32 or 64 bit:
-
-```
-yarn run build:32
-```
-
-or
+If you're on Windows, you can only build for 64 bit:
 
 ```
 yarn run build:64

docs/windows-requirements.md

@@ -22,17 +22,8 @@ If you want to build native modules, make sure that the following tools are inst
 
 Once installed make sure all those utilities are accessible in your `PATH`.
 
-If you want to be able to build x86 targets from an x64 host install the right toolchain:
-
-```cmd
-rustup toolchain install stable-i686-pc-windows-msvc
-rustup target add i686-pc-windows-msvc
-```
-
 In order to load all the C++ utilities installed by Visual Studio you can run the following in a terminal window.
 
 ```
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
 ```
-
-You can replace `amd64` with `x86` depending on your CPU architecture.

element.io/nightly/config.json

@@ -23,7 +23,7 @@
     "uisi_autorageshake_app": "element-auto-uisi",
     "show_labs_settings": true,
     "room_directory": {
-        "servers": ["matrix.org", "gitter.im"]
+        "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,

element.io/release/config.json

@@ -22,7 +22,7 @@
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "room_directory": {
-        "servers": ["matrix.org", "gitter.im"]
+        "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "show_labs_settings": false,
     "enable_presence_by_hs_url": {
@@ -46,6 +46,6 @@
     "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": 60
+        "RustCrypto.staged_rollout_percent": 30
     }
 }

hak/tsconfig.json

@@ -2,10 +2,10 @@
     "compilerOptions": {
         "moduleResolution": "node",
         "esModuleInterop": true,
-        "target": "es2022",
+        "target": "es2016",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2022"]
+        "lib": ["es2020"]
     },
     "include": ["../scripts/@types/*.d.ts", "./**/*.ts"],
     "ts-node": {

package.json

@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.76",
+    "version": "1.11.66",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",
@@ -62,7 +62,7 @@
         "test:screenshots:run": "docker run --rm --network host -v $(pwd):/work/element-desktop -v /var/run/docker.sock:/var/run/docker.sock --platform linux/amd64 -it element-desktop-playwright"
     },
     "dependencies": {
-        "@sentry/electron": "^5.0.0",
+        "@sentry/electron": "^4.3.0",
         "auto-launch": "^5.0.5",
         "counterpart": "^0.18.6",
         "electron-clear-data": "^1.0.5",
@@ -71,7 +71,7 @@
         "minimist": "^1.2.6",
         "node-fetch": "^2",
         "png-to-ico": "^2.1.1",
-        "uuid": "^10.0.0"
+        "uuid": "^9.0.0"
     },
     "devDependencies": {
         "@action-validator/cli": "^0.6.0",
@@ -82,21 +82,22 @@
         "@electron/asar": "^3.2.3",
         "@electron/fuses": "^1.7.0",
         "@mapbox/node-pre-gyp": "^1.0.11",
-        "@playwright/test": "1.45.3",
+        "@playwright/test": "1.43.1",
         "@types/auto-launch": "^5.0.1",
         "@types/counterpart": "^0.18.1",
         "@types/minimist": "^1.2.1",
-        "@types/node": "18.19.41",
+        "@types/mkdirp": "^2.0.0",
+        "@types/node": "18.19.31",
         "@types/pacote": "^11.1.1",
         "@types/tar": "^6.1.3",
-        "@types/uuid": "^10.0.0",
+        "@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",
         "chokidar": "^3.5.2",
         "detect-libc": "^2.0.0",
-        "electron": "^31.0.0",
+        "electron": "^30.0.0",
         "electron-builder": "24.13.3",
         "electron-builder-squirrel-windows": "24.13.3",
         "electron-devtools-installer": "^3.2.0",
@@ -105,24 +106,25 @@
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-unicorn": "^54.0.0",
-        "glob": "^11.0.0",
+        "eslint-plugin-unicorn": "^53.0.0",
+        "find-npm-prefix": "^1.0.2",
+        "glob": "^10.0.0",
         "knip": "^5.0.0",
         "matrix-web-i18n": "^3.2.1",
         "mkdirp": "^3.0.0",
         "pacote": "^18.0.0",
         "prettier": "^3.0.0",
-        "rimraf": "^6.0.0",
+        "rimraf": "^5.0.0",
         "tar": "^6.2.1",
         "ts-node": "^10.9.1",
-        "typescript": "5.5.4"
+        "typescript": "5.4.5"
     },
     "hakDependencies": {
-        "matrix-seshat": "^4.0.0",
+        "matrix-seshat": "^3.0.1",
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "18.19.41",
+        "@types/node": "18.19.31",
         "config-file-ts": "0.2.8-rc1"
     }
 }

playwright.config.ts

@@ -29,5 +29,5 @@ export default defineConfig({
     reporter: [["html", { outputFolder: "playwright/html-report" }]],
     snapshotDir: "playwright/snapshots",
     snapshotPathTemplate: "{snapshotDir}/{testFilePath}/{arg}-{platform}{ext}",
-    timeout: 30 * 1000,
+    timeout: 10 * 1000,
 });

playwright/Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/playwright:v1.45.3-jammy
+FROM mcr.microsoft.com/playwright:v1.44.0-jammy
 
 WORKDIR /work/element-desktop
 
-RUN apt-get update && apt-get -y install xvfb && apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get -y install xvfb
 
 USER 1000:1000
 

playwright/tsconfig.json

@@ -3,9 +3,9 @@
         "resolveJsonModule": true,
         "moduleResolution": "node",
         "esModuleInterop": true,
-        "target": "es2022",
+        "target": "es2017",
         "module": "es2022",
-        "lib": ["es2022", "dom"]
+        "lib": ["ESNext", "es2021", "dom"]
     },
     "include": ["**/*.ts"]
 }

scripts/@types/find-npm-prefix.d.ts

@@ -0,0 +1,19 @@
+/*
+Copyright 2022 New Vector Ltd
+
+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.
+*/
+
+declare module "find-npm-prefix" {
+    export default function findPrefix(dir: string): Promise<string>;
+}

scripts/fetch-package.ts

@@ -114,7 +114,7 @@ async function main(): Promise<number | undefined> {
             return 1;
         }
 
-        await new Promise<boolean>((resolve, reject) => {
+        await new Promise<boolean>((resolve) => {
             const gpgProc = childProcess.execFile("gpg", ["--import"], (error) => {
                 if (error) {
                     console.log("Failed to import key", error);
@@ -123,11 +123,9 @@ async function main(): Promise<number | undefined> {
                 }
                 resolve(!error);
             });
-            fetch(PUB_KEY_URL)
-                .then((resp) => {
-                    stream.pipeline(resp.body, gpgProc.stdin!).catch(reject);
-                })
-                .catch(reject);
+            fetch(PUB_KEY_URL).then((resp) => {
+                stream.pipeline(resp.body, gpgProc.stdin!);
+            });
         });
         return 0;
     }

scripts/hak/hakEnv.ts

@@ -97,16 +97,15 @@ export default class HakEnv {
     }
 
     public makeGypEnv(): Record<string, string | undefined> {
-        return {
-            ...process.env,
+        return Object.assign({}, process.env, {
             npm_config_arch: this.target.arch,
             npm_config_target_arch: this.target.arch,
             npm_config_disturl: "https://electronjs.org/headers",
             npm_config_runtime: this.runtime,
             npm_config_target: this.runtimeVersion,
-            npm_config_build_from_source: "true",
+            npm_config_build_from_source: true,
             npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
-        };
+        });
     }
 
     public wantsStaticSqlCipher(): boolean {

scripts/hak/index.ts

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import path from "path";
+import findNpmPrefix from "find-npm-prefix";
 
 import HakEnv from "./hakEnv";
 import { TargetId } from "./target";
@@ -36,7 +37,7 @@ const METACOMMANDS: Record<string, string[]> = {
 const HAKSCRIPTS = ["check", "fetch", "build"];
 
 async function main(): Promise<void> {
-    const prefix = path.join(__dirname, "..", "..");
+    const prefix = await findNpmPrefix(process.cwd());
     let packageJson;
     try {
         packageJson = require(path.join(prefix, "package.json"));

scripts/hak/target.ts

@@ -23,7 +23,6 @@ export type TargetId =
     | "aarch64-apple-darwin"
     | "x86_64-apple-darwin"
     | "universal-apple-darwin"
-    | "i686-pc-windows-msvc"
     | "x86_64-pc-windows-msvc"
     | "aarch64-pc-windows-msvc"
     | "i686-unknown-freebsd"
@@ -88,13 +87,6 @@ const universalAppleDarwin: UniversalTarget = {
     subtargets: [aarch64AppleDarwin, x8664AppleDarwin],
 };
 
-const i686PcWindowsMsvc: WindowsTarget = {
-    id: "i686-pc-windows-msvc",
-    platform: "win32",
-    arch: "ia32",
-    vcVarsArch: "x86",
-};
-
 const x8664PcWindowsMsvc: WindowsTarget = {
     id: "x86_64-pc-windows-msvc",
     platform: "win32",
@@ -189,7 +181,6 @@ export const TARGETS: Record<TargetId, Target> = {
     "x86_64-apple-darwin": x8664AppleDarwin,
     "universal-apple-darwin": universalAppleDarwin,
     // Windows
-    "i686-pc-windows-msvc": i686PcWindowsMsvc,
     "x86_64-pc-windows-msvc": x8664PcWindowsMsvc,
     "aarch64-pc-windows-msvc": aarch64WindowsMsvc,
     // FreeBSD

src/@types/glob.d.ts

@@ -0,0 +1,6 @@
+import { GlobOptions } from "glob";
+
+declare module "glob" {
+    // Workaround for @electron/asar importing IOptions instead of GlobOptions
+    export type IOptions = GlobOptions;
+}

src/electron-main.ts

@@ -42,7 +42,6 @@ import { _t, AppLocalization } from "./language-helper";
 import { setDisplayMediaCallback } from "./displayMediaCallback";
 import { setupMacosTitleBar } from "./macos-titlebar";
 import { loadJsonFile } from "./utils";
-import { setupMediaAuth } from "./media-auth";
 
 const argv = minimist(process.argv, {
     alias: { help: "h" },
@@ -177,7 +176,7 @@ async function loadConfig(): Promise<void> {
         global.vectorConfig = Object.assign(global.vectorConfig, localConfig);
     } catch (e) {
         if (e instanceof SyntaxError) {
-            void dialog.showMessageBox({
+            dialog.showMessageBox({
                 type: "error",
                 title: `Your ${global.vectorConfig.brand || "Element"} is misconfigured`,
                 message:
@@ -293,7 +292,7 @@ const warnBeforeExit = (event: Event, input: Input): void => {
     }
 };
 
-void configureSentry();
+configureSentry();
 
 // handle uncaught errors otherwise it displays
 // stack traces in popup dialogs, which is terrible (which
@@ -443,7 +442,7 @@ app.on("ready", async () => {
         console.log('Auto update disabled via command line flag "--no-update"');
     } else if (global.vectorConfig["update_base_url"]) {
         console.log(`Starting auto update with base URL: ${global.vectorConfig["update_base_url"]}`);
-        void updater.start(global.vectorConfig["update_base_url"]);
+        updater.start(global.vectorConfig["update_base_url"]);
     } else {
         console.log("No update_base_url is defined: auto update is disabled");
     }
@@ -478,7 +477,7 @@ app.on("ready", async () => {
             webgl: true,
         },
     });
-    void global.mainWindow.loadURL("vector://vector/webapp/");
+    global.mainWindow.loadURL("vector://vector/webapp/");
 
     if (process.platform === "darwin") {
         setupMacosTitleBar(global.mainWindow);
@@ -550,8 +549,6 @@ app.on("ready", async () => {
         global.mainWindow?.webContents.send("openDesktopCapturerSourcePicker");
         setDisplayMediaCallback(callback);
     });
-
-    setupMediaAuth(global.mainWindow);
 });
 
 app.on("window-all-closed", () => {

src/ipc.ts

@@ -38,15 +38,13 @@ ipcMain.on("setBadgeCount", function (_ev: IpcMainEvent, count: number): void {
 
 let focusHandlerAttached = false;
 ipcMain.on("loudNotification", function (): void {
-    if (process.platform === "win32" || process.platform === "linux") {
-        if (global.mainWindow && !global.mainWindow.isFocused() && !focusHandlerAttached) {
-            global.mainWindow.flashFrame(true);
-            global.mainWindow.once("focus", () => {
-                global.mainWindow?.flashFrame(false);
-                focusHandlerAttached = false;
-            });
-            focusHandlerAttached = true;
-        }
+    if (process.platform === "win32" && global.mainWindow && !global.mainWindow.isFocused() && !focusHandlerAttached) {
+        global.mainWindow.flashFrame(true);
+        global.mainWindow.once("focus", () => {
+            global.mainWindow?.flashFrame(false);
+            focusHandlerAttached = false;
+        });
+        focusHandlerAttached = true;
     }
 });
 
@@ -217,11 +215,11 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) {
                             label: r.initial,
                             backgroundColor: defaultColors[total % defaultColors.length],
                             click: (): void => {
-                                void global.mainWindow?.loadURL(`vector://vector/webapp/#/room/${r.roomId}`);
+                                global.mainWindow?.loadURL(`vector://vector/webapp/#/room/${r.roomId}`);
                             },
                         });
                         if (r.avatarUrl) {
-                            void fetch(r.avatarUrl)
+                            fetch(r.avatarUrl)
                                 .then((resp) => {
                                     if (!resp.ok) return;
                                     return resp.arrayBuffer();

src/macos-titlebar.ts

@@ -150,15 +150,15 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
 
     window.on("enter-full-screen", () => {
         if (cssKey !== undefined) {
-            void window.webContents.removeInsertedCSS(cssKey);
+            window.webContents.removeInsertedCSS(cssKey);
         }
     });
     window.on("leave-full-screen", () => {
-        void applyStyling();
+        applyStyling();
     });
     window.webContents.on("did-finish-load", () => {
         if (!window.isFullScreen()) {
-            void applyStyling();
+            applyStyling();
         }
     });
 }

src/media-auth.ts

@@ -1,80 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd
-
-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.
-*/
-
-import { BrowserWindow, ipcMain, session } from "electron";
-
-/**
- * Check for feature support from the server.
- * This requires asking the renderer process for supported versions.
- */
-async function getSupportedVersions(window: BrowserWindow): Promise<string[]> {
-    return new Promise((resolve) => {
-        ipcMain.once("serverSupportedVersions", (_, versionsResponse) => {
-            resolve(versionsResponse?.versions || []);
-        });
-        window.webContents.send("serverSupportedVersions"); // ping now that the listener exists
-    });
-}
-
-/**
- * Get the access token for the user.
- * This requires asking the renderer process for the access token.
- */
-async function getAccessToken(window: BrowserWindow): Promise<string | undefined> {
-    return new Promise((resolve) => {
-        ipcMain.once("userAccessToken", (_, accessToken) => {
-            resolve(accessToken);
-        });
-        window.webContents.send("userAccessToken"); // ping now that the listener exists
-    });
-}
-
-export function setupMediaAuth(window: BrowserWindow): void {
-    session.defaultSession.webRequest.onBeforeRequest(async (req, callback) => {
-        // This handler emulates the element-web service worker, where URLs are rewritten late in the request
-        // for backwards compatibility. As authenticated media becomes more prevalent, this should be replaced
-        // by the app using authenticated URLs from the outset.
-        let url = req.url;
-        if (!url.includes("/_matrix/media/v3/download") && !url.includes("/_matrix/media/v3/thumbnail")) {
-            return callback({}); // not a URL we care about
-        }
-
-        const supportedVersions = await getSupportedVersions(window);
-        // We have to check that the access token is truthy otherwise we'd be intercepting pre-login media request too,
-        // e.g. those required for SSO button icons.
-        const accessToken = await getAccessToken(window);
-        if (supportedVersions.includes("v1.11") && accessToken) {
-            url = url.replace(/\/media\/v3\/(.*)\//, "/client/v1/media/$1/");
-            return callback({ redirectURL: url });
-        } else {
-            return callback({}); // no support == no modification
-        }
-    });
-
-    session.defaultSession.webRequest.onBeforeSendHeaders(async (req, callback) => {
-        if (!req.url.includes("/_matrix/client/v1/media")) {
-            return callback({}); // invoke unmodified
-        }
-
-        // Only add authorization header to authenticated media URLs. This emulates the service worker
-        // behaviour in element-web.
-        const accessToken = await getAccessToken(window);
-        // `accessToken` can be falsy, but if we're trying to download media without authentication
-        // then we should expect failure anyway.
-        const headers = { ...req.requestHeaders, Authorization: `Bearer ${accessToken}` };
-        return callback({ requestHeaders: headers });
-    });
-}

src/preload.ts

@@ -35,8 +35,6 @@ const CHANNELS = [
     "userDownloadCompleted",
     "userDownloadAction",
     "openDesktopCapturerSourcePicker",
-    "userAccessToken",
-    "serverSupportedVersions",
 ];
 
 contextBridge.exposeInMainWorld("electron", {

src/protocol.ts

@@ -50,7 +50,7 @@ function processUrl(url: string): void {
     urlToLoad.hash = parsed.hash;
 
     console.log("Opening URL: ", urlToLoad.href);
-    void global.mainWindow.loadURL(urlToLoad.href);
+    global.mainWindow.loadURL(urlToLoad.href);
 }
 
 function readStore(): Record<string, string> {

src/squirrelhooks.ts

@@ -43,7 +43,7 @@ function checkSquirrelHooks(): boolean {
 
     switch (cmd) {
         case "--squirrel-install":
-            void runUpdateExe(["--createShortcut=" + target]).then(() => app.quit());
+            runUpdateExe(["--createShortcut=" + target]).then(() => app.quit());
             return true;
 
         case "--squirrel-updated":
@@ -52,7 +52,7 @@ function checkSquirrelHooks(): boolean {
             return true;
 
         case "--squirrel-uninstall":
-            void runUpdateExe(["--removeShortcut=" + target]).then(() => app.quit());
+            runUpdateExe(["--removeShortcut=" + target]).then(() => app.quit());
             return true;
 
         default:

src/updater.ts

@@ -79,7 +79,7 @@ async function pollForUpdates(): Promise<void> {
 
 export async function start(updateBaseUrl: string): Promise<void> {
     if (!(await available(updateBaseUrl))) return;
-    if (!updateBaseUrl.endsWith("/")) {
+    if (updateBaseUrl.slice(-1) !== "/") {
         updateBaseUrl = updateBaseUrl + "/";
     }
 

src/vectormenu.ts

@@ -140,7 +140,7 @@ export function buildMenuTemplate(): Menu {
                     // XXX: vectorConfig won't have defaults applied to it so we need to duplicate them here
                     label: _t("common|brand_help", { brand: global.vectorConfig?.brand || "Element" }),
                     click(): void {
-                        void shell.openExternal(global.vectorConfig?.help_url || "https://element.io/help");
+                        shell.openExternal(global.vectorConfig?.help_url || "https://element.io/help");
                     },
                 },
             ],

src/webcontents-handler.ts

@@ -53,7 +53,7 @@ function safeOpenURL(target: string): void {
         // so we know the url parser has understood all the parts
         // of the input string
         const newTarget = url.format(parsedUrl);
-        void shell.openExternal(newTarget);
+        shell.openExternal(newTarget);
     }
 }
 
@@ -169,7 +169,7 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
                         }
                     } catch (err) {
                         console.error(err);
-                        void dialog.showMessageBox({
+                        dialog.showMessageBox({
                             type: "error",
                             title: _t("right_click_menu|save_image_as_error_title"),
                             message: _t("right_click_menu|save_image_as_error_description"),
@@ -275,7 +275,7 @@ const userDownloadMap = new Map<number, string>(); // Map from id to path
 ipcMain.on("userDownloadAction", function (ev: IpcMainEvent, { id, open = false }) {
     const path = userDownloadMap.get(id);
     if (open && path) {
-        void shell.openPath(path);
+        shell.openPath(path);
     }
     userDownloadMap.delete(id);
 });

tsconfig.json

@@ -4,13 +4,13 @@
         "esModuleInterop": true,
         "module": "commonjs",
         "moduleResolution": "node",
-        "target": "es2022",
+        "target": "es2016",
         "sourceMap": false,
         "outDir": "./lib",
         "rootDir": "./src",
         "declaration": true,
         "typeRoots": ["src/@types", "node_modules/@types"],
-        "lib": ["es2022", "dom"],
+        "lib": ["es2020", "dom"],
         "types": ["node"],
         "strict": true
     },