Merge branch 'develop' of ssh://github.com/vector-im/element-desktop into renovate/electron-builder

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	package.json
#	yarn.lock

.github/workflows/build_and_test.yaml

@@ -55,6 +55,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   cache: "yarn"

.github/workflows/build_linux.yaml

@@ -122,6 +122,7 @@ jobs:
                   path: |
                       ./.hak
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: .node-version

.github/workflows/build_macos.yaml

@@ -105,6 +105,7 @@ jobs:
               with:
                   python-version: "3.13"
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: .node-version

.github/workflows/build_prepare.yaml

@@ -56,6 +56,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: .node-version

.github/workflows/build_test.yaml

@@ -40,6 +40,10 @@ jobs:
               with:
                   repository: ${{ github.repository == 'element-hq/element-web-pro' && 'element-hq/element-desktop' || github.repository }}
 
+            # https://github.com/actions/setup-node/issues/480#issuecomment-2907867335
+            - run: npm install -g corepack@0.34.5 --force
+              if: runner.os == 'Windows'
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: .node-version

.github/workflows/build_windows.yaml

@@ -148,6 +148,9 @@ jobs:
                   rustup default stable
                   rustup target add ${{ steps.config.outputs.target }}
 
+            # https://github.com/actions/setup-node/issues/480#issuecomment-2907867335
+            - run: npm install -g corepack@0.34.5 --force
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: .node-version

.github/workflows/static_analysis.yaml

@@ -11,6 +11,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: package.json
@@ -25,7 +26,7 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
-        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
+        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@t3chguy/corepack
         permissions:
             pull-requests: read
         with:
@@ -37,6 +38,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: package.json
@@ -55,6 +57,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: package.json
@@ -73,6 +76,7 @@ jobs:
         steps:
             - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
+            - run: corepack enable
             - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
               with:
                   node-version-file: package.json

.gitignore

@@ -19,3 +19,4 @@ yarn-error.log
 /scripts/hak/**/*.js
 .DS_Store
 /playwright-report
+/.yarn/install-state.gz

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

CHANGELOG.md

@@ -1,53 +1,3 @@
-Changes in [1.12.7](https://github.com/element-hq/element-desktop/releases/tag/v1.12.7) (2025-12-16)
-====================================================================================================
-## ✨ Features
-
-* Replace legacy icons with compound ([#31424](https://github.com/element-hq/element-web/pull/31424)). Contributed by @t3chguy.
-* Update polls UX to match EX Mobile and improve accessibility ([#31245](https://github.com/element-hq/element-web/pull/31245)). Contributed by @langleyd.
-* Add option to enable read receipt and marker when user interact with UI ([#31353](https://github.com/element-hq/element-web/pull/31353)). Contributed by @florianduros.
-* Introduce a hook to auto dispose view models ([#31178](https://github.com/element-hq/element-web/pull/31178)). Contributed by @MidhunSureshR.
-* Update settings toggles to use consistent design across app. ([#30169](https://github.com/element-hq/element-web/pull/30169)). Contributed by @Half-Shot.
-* Add ability to the room view to hide widgets ([#31400](https://github.com/element-hq/element-web/pull/31400)). Contributed by @langleyd.
-* call: Pass the echo cancellation and noise suppression settings to EC ([#31317](https://github.com/element-hq/element-web/pull/31317)). Contributed by @BillCarsonFr.
-* Tweak rendering of icons for a11y ([#31358](https://github.com/element-hq/element-web/pull/31358)). Contributed by @t3chguy.
-* Implement new `renderNotificationDecoration` from module API  ([#31389](https://github.com/element-hq/element-web/pull/31389)). Contributed by @MidhunSureshR.
-* Replace more icons with compound ([#31381](https://github.com/element-hq/element-web/pull/31381)). Contributed by @t3chguy.
-* Replace more icons with compound ([#31378](https://github.com/element-hq/element-web/pull/31378)). Contributed by @t3chguy.
-* `<Banner/>`: Hide `Dismiss` button if `onClose` handler is not provided. ([#31362](https://github.com/element-hq/element-web/pull/31362)). Contributed by @kaylendog.
-* Replace batch of legacy icons with compound design tokens ([#31360](https://github.com/element-hq/element-web/pull/31360)). Contributed by @t3chguy.
-* MSC4380: Invite blocking ([#31268](https://github.com/element-hq/element-web/pull/31268)). Contributed by @richvdh.
-* Tweak rendering of icons for accessibility ([#31346](https://github.com/element-hq/element-web/pull/31346)). Contributed by @t3chguy.
-* Implement a shared `Banner` component. ([#31266](https://github.com/element-hq/element-web/pull/31266)). Contributed by @kaylendog.
-* Allow the Login screen to use the dark theme ([#31293](https://github.com/element-hq/element-web/pull/31293)). Contributed by @richvdh.
-
-## 🐛 Bug Fixes
-
-* [Backport staging] Amend e2e normal icon from lock-solid to info ([#31559](https://github.com/element-hq/element-web/pull/31559)). Contributed by @t3chguy.
-* [Backport staging] Fix CSS specificity causing icon issues in e2e verification ([#31548](https://github.com/element-hq/element-web/pull/31548)). Contributed by @RiotRobot.
-* [Backport staging] Fix e2e icons in CompleteSecurity \& SetupEncryptionBody ([#31522](https://github.com/element-hq/element-web/pull/31522)). Contributed by @RiotRobot.
-* [Backport staging] Remove an extra paragraph in advanced room settings ([#31511](https://github.com/element-hq/element-web/pull/31511)). Contributed by @RiotRobot.
-* [Backport staging] Don't show the key storage out of sync toast when backup disabled ([#31507](https://github.com/element-hq/element-web/pull/31507)). Contributed by @RiotRobot.
-* Fix composer button visibility in contrast colour mode ([#31255](https://github.com/element-hq/element-web/pull/31255)). Contributed by @t3chguy.
-* Ensure correct room version is used and permissions are appropriately sert when creating rooms ([#31464](https://github.com/element-hq/element-web/pull/31464)). Contributed by @Half-Shot.
-* Fix e2e icon rendering ([#31454](https://github.com/element-hq/element-web/pull/31454)). Contributed by @t3chguy.
-* EventIndexer: ensure we add initial checkpoints when the db is first opened ([#31448](https://github.com/element-hq/element-web/pull/31448)). Contributed by @richvdh.
-* Fix `/join <alias>` command failing due to race condition ([#31433](https://github.com/element-hq/element-web/pull/31433)). Contributed by @MidhunSureshR.
-* MessageEventIndexDialog: distinguish indexed rooms ([#31436](https://github.com/element-hq/element-web/pull/31436)). Contributed by @richvdh.
-* Move `EditInPlace` out of `Form` (Fixes: reloading EW on EC url update) ([#31434](https://github.com/element-hq/element-web/pull/31434)). Contributed by @toger5.
-* Fixes issue where cursor would jump to the beginning of the input field after converting Japanese text and pressing Tab ([#31432](https://github.com/element-hq/element-web/pull/31432)). Contributed by @shinaoka.
-* Fix widgets getting stuck in loading states ([#31314](https://github.com/element-hq/element-web/pull/31314)). Contributed by @robintown.
-* Room list: fix room options remaining on room item after mouse leaving ([#31414](https://github.com/element-hq/element-web/pull/31414)). Contributed by @florianduros.
-* Make `RoomList.showMessagePreview` configurable by `config.json` ([#31419](https://github.com/element-hq/element-web/pull/31419)). Contributed by @florianduros.
-* Fix bug which caused app not to load correctly when `force_verification` is enabled ([#31265](https://github.com/element-hq/element-web/pull/31265)). Contributed by @richvdh.
-* Room list: display the menu option on the room list item when clicked/opened ([#31380](https://github.com/element-hq/element-web/pull/31380)). Contributed by @florianduros.
-* Fix handling of SVGs ([#31359](https://github.com/element-hq/element-web/pull/31359)). Contributed by @t3chguy.
-* Fix word wrapping in expanded left panel buttons ([#31377](https://github.com/element-hq/element-web/pull/31377)). Contributed by @t3chguy.
-* Fix aspect ratio on error view background ([#31361](https://github.com/element-hq/element-web/pull/31361)). Contributed by @t3chguy.
-* Fix failure to request persistent storage perms ([#31299](https://github.com/element-hq/element-web/pull/31299)). Contributed by @richvdh.
-* Fix calls sometimes not knowing that they're presented ([#31313](https://github.com/element-hq/element-web/pull/31313)). Contributed by @robintown.
-
-
-
 Changes in [1.12.6](https://github.com/element-hq/element-desktop/releases/tag/v1.12.6) (2025-12-03)
 ====================================================================================================
 This release fixes a bug where 1:1 calling was incorrectly not available if no Element Call focus was set.

README.md

@@ -52,9 +52,7 @@ If you only want to run the app locally and don't need to build packages, you ca
 provide the `webapp` directory directly:
 
 ```
-# Assuming you've checked out and built a copy of element-web in ../element-web.
-# Note that you will not be able to `yarn build` after this, but `yarn start`
-# will work fine.
+# Assuming you've checked out and built a copy of element-web in ../element-web
 ln -s ../element-web/webapp ./
 ```
 

dockerbuild/Dockerfile

@@ -4,7 +4,6 @@ FROM rust:bullseye@sha256:4886b155a84b46ad61df6a2249905bea8c61fc1eaa903398713233
 
 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 \
   # tclsh is required for building SQLite as part of SQLCipher
@@ -16,6 +15,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
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 
 WORKDIR /project
 

dockerbuild/setup.sh

@@ -9,3 +9,4 @@ ARCH="${archMap["$TARGETARCH"]}"
 NODE_VERSION=$(cat /.node-version | sed -e 's/^v//')
 curl --proto "=https" -L "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \
   unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md
+corepack enable

docs/native-node-modules.md

@@ -13,35 +13,12 @@ custom build of Element without installing the various build tools required.
 The process is automated by [vector-im/element-builder](https://github.com/vector-im/element-builder)
 when releasing.
 
-## Use docker
-
-If you are building for Linux, you can build the native modules with:
-
-```
-yarn docker:setup
-yarn docker:install
-INDOCKER_SQLCIPHER_BUNDLED=1 yarn docker:build:native
-```
-
-The above will build `matrix-seshat` in
-`docker/node_modules/matrix-seshat`. You can then either run `yarn docker:build`
-to build the app inside docker, or:
-
-```
-yarn --cwd docker/node_modules/matrix-seshat link
-yarn link matrix-seshat
-```
-
-... and build the app with `yarn build` or run it with `yarn start`.
-
-(See also https://github.com/element-hq/element-desktop#docker.)
-
 ## Building
 
 Install the pre-requisites for your system:
 
 - [Windows pre-requisites](https://github.com/vector-im/element-desktop/blob/develop/docs/windows-requirements.md)
-- Linux: TODO. Using the docker environment as above is recommended.
+- Linux: TODO
 - OS X: TODO
 
 Then optionally, [add seshat and dependencies to support search in E2E rooms](#adding-seshat-for-search-in-e2e-encrypted-rooms).
@@ -79,8 +56,7 @@ This is also needed to when pulling in changes to Seshat using `yarn link`.
 
 Recompiling Seshat itself can be done like so:
 
-    ELECTRON_VERSION=$(electron --version)
-    yarn run electron-build-env -- --electron ${ELECTRON_VERSION#v} -- neon build matrix-seshat --release
+    yarn run electron-build-env -- --electron 6.1.1 -- neon build matrix-seshat --release
 
 Please make sure to include all the `--` as well as the `--release` command line
 switch at the end. Modify your electron version accordingly depending on the

hak/matrix-seshat/build.ts

@@ -17,7 +17,8 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
     }
 
     console.log("Running yarn install");
-    await hakEnv.spawn("yarn", ["install"], {
+
+    await hakEnv.spawn("corepack", ["yarn@1.22.22", "install"], {
         cwd: moduleInfo.moduleBuildDir,
         env,
         shell: true,
@@ -26,7 +27,7 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
     const buildTarget = hakEnv.wantsStaticSqlCipher() ? "build-bundled" : "build";
 
     console.log("Running yarn build");
-    await hakEnv.spawn("yarn", ["run", buildTarget], {
+    await hakEnv.spawn("corepack", ["yarn@1.22.22", "run", buildTarget], {
         cwd: moduleInfo.moduleBuildDir,
         env,
         shell: true,

package.json

@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.7",
+    "version": "1.12.6",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",
@@ -85,12 +85,12 @@
         "@types/pacote": "^11.1.1",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
-        "app-builder-lib": "26.2.0",
+        "app-builder-lib": "26.3.4",
         "chokidar": "^5.0.0",
         "detect-libc": "^2.0.0",
         "electron": "39.2.3",
-        "electron-builder": "26.2.0",
-        "electron-builder-squirrel-windows": "26.2.0",
+        "electron-builder": "26.3.4",
+        "electron-builder-squirrel-windows": "26.3.4",
         "electron-devtools-installer": "^4.0.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
@@ -121,5 +121,6 @@
         "@types/node": "18.19.130",
         "config-file-ts": "0.2.8-rc1",
         "node-abi": "4.24.0"
-    }
+    },
+    "packageManager": "yarn@4.12.0"
 }

scripts/hak/README.md

@@ -40,7 +40,7 @@ the npm 'install' phase - modules that do this will typically end up with native
 targeted to the build platform and the node that npm/yarn is using, which is no good for an
 electron app.
 
-It does this by installing it with `--ignore-scripts` and then using `yarn link` to keep the
+It does this by installing it with `--mode=skip-build` and then using `yarn link` to keep the
 dependency module separate so yarn doesn't try to run its install / postinstall script
 at other points (eg. whenever you `yarn add` a random other dependency).
 

scripts/hak/fetch.ts

@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import fsProm from "node:fs/promises";
-import pacote from "pacote";
+import pacote, { type Packument } from "pacote";
 
 import type HakEnv from "./hakEnv.js";
 import type { DependencyInfo } from "./dep.js";
@@ -25,13 +25,13 @@ export default async function fetch(hakEnv: HakEnv, moduleInfo: DependencyInfo):
 
     console.log("Fetching " + moduleInfo.name + "@" + moduleInfo.version);
 
-    const packumentCache = new Map();
+    const packumentCache = new Map<string, Packument>();
     await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleBuildDir, {
         packumentCache,
     });
 
     console.log("Running yarn install in " + moduleInfo.moduleBuildDir);
-    await hakEnv.spawn("yarn", ["install", "--ignore-scripts"], {
+    await hakEnv.spawn("corepack", ["yarn@1.22.22", "install", "--mode=skip-build"], {
         cwd: moduleInfo.moduleBuildDir,
     });
 
@@ -45,6 +45,7 @@ export default async function fetch(hakEnv: HakEnv, moduleInfo: DependencyInfo):
     // actual runtime dependencies will have to be added to the main app's
     // dependencies. We can't tell what dependencies are real runtime deps
     // and which are just used for native module building.
+    console.log("@@ Pacote2", moduleInfo.moduleOutDir);
     await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleOutDir, {
         packumentCache,
     });

scripts/hak/hakEnv.ts

@@ -84,6 +84,7 @@ export default class HakEnv {
             npm_config_target: this.runtimeVersion,
             npm_config_build_from_source: "true",
             npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
+            COREPACK_ENABLE_DOWNLOAD_PROMPT: "0",
         };
     }
 

scripts/hak/link.ts

@@ -7,17 +7,42 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import path from "node:path";
+import os from "node:os";
+import fsProm from "node:fs/promises";
 
 import type HakEnv from "./hakEnv.js";
 import { type DependencyInfo } from "./dep.js";
 
 export default async function link(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const linkFolder = path.join(hakEnv.dotHakDir, "links");
-    await hakEnv.spawn("yarn", ["link", "--link-folder", linkFolder], {
+    const yarnrc = path.join(hakEnv.projectRoot, ".yarnrc");
+    // this is fairly terrible but it's reasonably clunky to either parse a yarnrc
+    // properly or get yarn to do it, so this will probably suffice for now.
+    // We just check to see if there is a local .yarnrc at all, and assume that
+    // if you've put one there yourself, you probably know what you're doing and
+    // we won't meddle with it.
+    // Also we do this for each module which is unnecessary, but meh.
+    try {
+        await fsProm.stat(yarnrc);
+    } catch {
+        await fsProm.writeFile(
+            yarnrc,
+            // XXX: 1. This must be absolute, as yarn will resolve link directories
+            // relative to the closest project root, which means when we run it
+            // in the dependency project, it will put the link directory in its
+            // own project folder rather than the main project.
+            // 2. The parser gets very confused by strings with colons in them
+            // (ie. Windows absolute paths) but strings in quotes get parsed as
+            // JSON so need to be valid JSON encoded strings (ie. have the
+            // backslashes escaped). JSON.stringify will add quotes and escape.
+            "--link-folder " + JSON.stringify(path.join(hakEnv.dotHakDir, "links")) + os.EOL,
+        );
+    }
+
+    console.log("@@", moduleInfo.moduleOutDir);
+    await hakEnv.spawn("corepack", ["yarn@1.22.22", "link"], {
         cwd: moduleInfo.moduleOutDir,
     });
-
-    await hakEnv.spawn("yarn", ["link", "--link-folder", linkFolder, moduleInfo.name], {
+    await hakEnv.spawn("corepack", ["yarn@1.22.22", "link", moduleInfo.name], {
         cwd: hakEnv.projectRoot,
     });
 }

scripts/in-docker.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-set -e
-
-cd $(dirname "$0")/..
-
 IMAGE=${DOCKER_IMAGE_NAME:-"element-desktop-dockerbuild"}
 
 docker inspect "$IMAGE" 2> /dev/null > /dev/null
@@ -12,8 +8,6 @@ if [ $? != 0 ]; then
     exit 1
 fi
 
-mkdir -p docker/node_modules docker/.hak docker/.gnupg
-
 # Taken from https://www.electron.build/multi-platform-build#docker
 # Pass through any vars prefixed with INDOCKER_, removing the prefix
 docker run --rm -ti \

src/i18n/strings/uk.json

@@ -32,9 +32,6 @@
         "speech_start_speaking": "Почати говорити",
         "speech_stop_speaking": "Припинити говорити"
     },
-    "eol": {
-        "title": "Система не підтримується"
-    },
     "file_menu": {
         "label": "Файл"
     },