Merge branch 'develop' of https://github.com/vector-im/element-desktop into t3chguy/electron-35

# Conflicts: # package.json
Test upgrade Electron to 35
2026-01-02 04:29:38 -05:00 · 2025-02-27 17:49:05 +00:00 · 2025-02-27 17:48:27 +00:00
11 changed files with 20 additions and 23 deletions
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -97,7 +97,7 @@ jobs:

            - uses: actions/setup-node@v4
              with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                  cache: "yarn"

            - name: Install Deps
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -76,7 +76,7 @@ jobs:

            - uses: actions/setup-node@v4
              with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                  cache: "yarn"
              env:
                  # Workaround for https://github.com/actions/setup-node/issues/317
@@ -98,7 +98,7 @@ jobs:
              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
              if: steps.changed_files.outputs.any_modified == 'true'
              with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                  load: true
                  platforms: linux/${{ inputs.arch }}
                  tags: ${{ env.HAK_DOCKER_IMAGE }}
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -62,7 +62,7 @@ jobs:

            - uses: actions/setup-node@v4
              with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                  cache: "yarn"

            - name: Install Deps
--- a/.github/workflows/build_prepare.yaml
+++ b/.github/workflows/build_prepare.yaml
@@ -56,7 +56,7 @@ jobs:

            - uses: actions/setup-node@v4
              with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                  cache: "yarn"

            - name: Install Deps
--- a/.github/workflows/build_windows.yaml
+++ b/.github/workflows/build_windows.yaml
@@ -99,9 +99,7 @@ jobs:

            - uses: actions/setup-node@v4
              with:
-                  # node-version-file: package.json
-                  # For https://github.com/element-hq/element-desktop/issues/2161
-                  node-version: 23.9.0
+                  node-version-file: package.json
                  cache: "yarn"

            - name: Install Deps
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -32,7 +32,7 @@ jobs:
            - name: Build test image
              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
              with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                  push: false
                  load: true
                  tags: element-desktop-dockerbuild
@@ -63,7 +63,7 @@ jobs:
              if: github.event_name != 'pull_request'
              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
              with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                  push: true
                  tags: ${{ steps.meta.outputs.tags }}
                  labels: ${{ steps.meta.outputs.labels }}
--- a/.node-version
+++ b/.node-version
@@ -1 +0,0 @@
-v22.13.1
--- a/dockerbuild/Dockerfile
+++ b/dockerbuild/Dockerfile
@@ -21,7 +21,8 @@ ENV FORCE_COLOR true

 WORKDIR /project

+ENV NODE_VERSION 20.18.2
 ARG TARGETOS
 ARG TARGETARCH
-COPY .node-version dockerbuild/setup.sh /
+COPY setup.sh /setup.sh
 RUN /setup.sh
--- a/dockerbuild/setup.sh
+++ b/dockerbuild/setup.sh
@@ -3,6 +3,5 @@
 set -x
 declare -A archMap=(["amd64"]="x64" ["arm64"]="arm64")
 ARCH="${archMap["$TARGETARCH"]}"
-NODE_VERSION=$(cat /.node-version)
-curl --proto "=https" -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \
+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
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
    "type": "module",
    "files": [],
    "engines": {
-        "node": ">=18.0.0 <=22.13.1 || >22"
+        "node": ">=18.0.0"
    },
    "scripts": {
        "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
@@ -44,7 +44,7 @@
        "build": "yarn run build:ts && yarn run build:res && electron-builder",
        "build:ts": "tsc",
        "build:res": "tsx scripts/copy-res.ts",
-        "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .",
+        "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild dockerbuild",
        "docker:build:native": "scripts/in-docker.sh yarn run hak",
        "docker:build": "scripts/in-docker.sh yarn run build",
        "docker:install": "scripts/in-docker.sh yarn install",
@@ -85,7 +85,7 @@
        "app-builder-lib": "26.0.8",
        "chokidar": "^4.0.0",
        "detect-libc": "^2.0.0",
-        "electron": "34.2.0",
+        "electron": "35.0.0-beta.10",
        "electron-builder": "26.0.8",
        "electron-builder-squirrel-windows": "26.0.8",
        "electron-devtools-installer": "^4.0.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -2178,7 +2178,7 @@
    "@types/node" "*"
    form-data "^4.0.0"

-"@types/node@*", "@types/node@18.19.76", "@types/node@^17.0.36", "@types/node@^20.9.0":
+"@types/node@*", "@types/node@18.19.76", "@types/node@^17.0.36", "@types/node@^22.7.7":
  version "18.19.76"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.76.tgz#7991658e0ba41ad30cc8be01c9bbe580d58f2112"
  integrity sha512-yvR7Q9LdPz2vGpmpJX5LolrgRdWvB67MJKDPSgIIzpFbaf9a1j/f5DnLp5VDyHGMR0QZHlTr1afsD87QCXFHKw==
@@ -3519,13 +3519,13 @@ electron-winstaller@5.4.0:
  optionalDependencies:
    "@electron/windows-sign" "^1.1.2"

-electron@34.2.0:
-  version "34.2.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-34.2.0.tgz#3cec06c34f47f0e86956be71629b485b290bafd1"
-  integrity sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==
+electron@35.0.0-beta.10:
+  version "35.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-35.0.0-beta.10.tgz#680c8b4066e18d138ad0ab744a7d95086004426a"
+  integrity sha512-pfEutRnyVuqVJVspmpcj4urEzeTS2170hbZogDf2x48oR9Y1m3Vl3RtSU0GTWcR1GZ5JenzFxW2SOgXcDwvFPA==
  dependencies:
    "@electron/get" "^2.0.0"
-    "@types/node" "^20.9.0"
+    "@types/node" "^22.7.7"
    extract-zip "^2.0.1"

 emoji-regex@^10.3.0:
Author	SHA1	Message	Date
Michael Telatynski	aa1bf5c212	Merge branch 'develop' of https://github.com/vector-im/element-desktop into t3chguy/electron-35 # Conflicts: # package.json	2025-02-27 17:49:05 +00:00
Michael Telatynski	18bd630e74	Test upgrade Electron to 35 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2025-02-27 17:48:27 +00:00