Merge branch 'develop' into t3chguy/ci3

Merge branch 'master' into develop
v1.11.24
2026-02-24 02:08:58 -05:00 · 2023-02-28 12:37:24 +00:00 · 2023-02-28 11:24:52 +00:00 · 2023-02-28 11:24:38 +00:00 · 2023-02-28 11:24:37 +00:00 · 2023-02-27 18:04:55 +00:00
19 changed files with 594 additions and 287 deletions
--- a/.eslintrc-hak.js
+++ b/.eslintrc-hak.js
@@ -0,0 +1,22 @@
+module.exports = {
+    plugins: ["matrix-org"],
+    extends: [".eslintrc.js"],
+    parserOptions: {
+        project: ["hak/tsconfig.json"],
+    },
+    overrides: [
+        {
+            files: ["hak/**/*.ts"],
+            extends: ["plugin:matrix-org/typescript"],
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+            },
+        },
+    ],
+};
--- a/.eslintrc-scripts.js
+++ b/.eslintrc-scripts.js
@@ -0,0 +1,22 @@
+module.exports = {
+    plugins: ["matrix-org"],
+    extends: [".eslintrc.js"],
+    parserOptions: {
+        project: ["scripts/tsconfig.json"],
+    },
+    overrides: [
+        {
+            files: ["scripts/**/*.ts"],
+            extends: ["plugin:matrix-org/typescript"],
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+            },
+        },
+    ],
+};
--- a/.eslintrc-test.js
+++ b/.eslintrc-test.js
@@ -0,0 +1,22 @@
+module.exports = {
+    plugins: ["matrix-org"],
+    extends: [".eslintrc.js"],
+    parserOptions: {
+        project: ["test/tsconfig.json"],
+    },
+    overrides: [
+        {
+            files: ["test/**/*.ts"],
+            extends: ["plugin:matrix-org/typescript"],
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+            },
+        },
+    ],
+};
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
    extends: ["plugin:matrix-org/javascript"],
    parserOptions: {
        ecmaVersion: 2021,
+        project: ["tsconfig.json"],
    },
    env: {
        es6: true,
@@ -20,7 +21,7 @@ module.exports = {
    },
    overrides: [
        {
-            files: ["{src,scripts,hak}/**/*.{ts,tsx}"],
+            files: ["src/**/*.ts"],
            extends: ["plugin:matrix-org/typescript"],
            rules: {
                // Things we do that break the ideal style
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -1,105 +1,143 @@
 name: Build and Deploy
 on:
-  # Nightly build
-  schedule:
-    - cron: '0 9 * * *'
-  # Manual nightly & release
-  workflow_dispatch:
-    inputs:
-      mode:
-        description: What type of build to trigger. Release builds should be ran from the `master` branch.
-        required: true
-        default: nightly
-        type: choice
-        options:
-          - nightly
-          - release
-      macos:
-        description: Whether to build macOS
-        required: true
-        type: boolean
-        default: true
-      linux:
-        description: Whether to build Linux
-        required: true
-        type: boolean
-        default: true
-      deploy:
-        description: Whether to deploy artifacts
-        required: true
-        type: boolean
-        default: true
+    # Nightly build
+    schedule:
+        - cron: "0 9 * * *"
+    # Manual nightly & release
+    workflow_dispatch:
+        inputs:
+            mode:
+                description: What type of build to trigger. Release builds MUST be ran from the `master` branch.
+                required: true
+                default: nightly
+                type: choice
+                options:
+                    - nightly
+                    - release
+            macos:
+                description: Build macOS
+                required: true
+                type: boolean
+                default: true
+            windows_32bit:
+                description: Build Windows 32-bit
+                required: true
+                type: boolean
+                default: true
+            windows_64bit:
+                description: Build Windows 64-bit
+                required: true
+                type: boolean
+                default: true
+            linux:
+                description: Build Linux
+                required: true
+                type: boolean
+                default: true
+            deploy:
+                description: Deploy artifacts
+                required: true
+                type: boolean
+                default: true
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 env:
-  # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
-  R2_BUCKET: 'packages-element-io-test'
+    # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
+    R2_BUCKET: "packages-element-io-test"
 jobs:
-  prepare:
-    uses: ./.github/workflows/build_prepare.yaml
-    with:
-      config: element.io/${{ inputs.mode || 'nightly' }}
-      version: ${{ inputs.mode == 'release' && '' || 'develop' }}
-      calculate-nightly-versions: ${{ inputs.mode != 'release' }}
-    secrets:
-      CF_R2_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-      CF_R2_TOKEN: ${{ secrets.CF_R2_TOKEN }}
-      CF_R2_S3_API: ${{ secrets.CF_R2_S3_API }}
-
-  macos:
-    if: github.event_name != 'workflow_dispatch' || inputs.macos
-    needs: prepare
-    name: macOS
-    uses: ./.github/workflows/build_macos.yaml
-    secrets: inherit
-    with:
-      sign: true
-      deploy-mode: true
-      base-url: https://packages.element.io/${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
-      version: ${{ needs.prepare.outputs.macos-version }}
-
-  linux:
-    if: github.event_name != 'workflow_dispatch' || inputs.linux
-    needs: prepare
-    name: Linux
-    uses: ./.github/workflows/build_linux.yaml
-    secrets: inherit
-    with:
-      sqlcipher: system
-      deploy-mode: true
-      version: ${{ needs.prepare.outputs.linux-version }}
-
-  deploy:
-    needs:
-      - macos
-    runs-on: ubuntu-latest
-    name: Deploy
-    if: always() && (github.event != 'workflow_dispatch' || inputs.deploy)
-    environment: packages.element.io
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
+    prepare:
+        uses: ./.github/workflows/build_prepare.yaml
        with:
-          name: packages.element.io
-          path: packages.element.io
+            config: element.io/${{ inputs.mode || 'nightly' }}
+            version: ${{ inputs.mode == 'release' && '' || 'develop' }}
+            calculate-nightly-versions: ${{ inputs.mode != 'release' }}
+        secrets:
+            CF_R2_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+            CF_R2_TOKEN: ${{ secrets.CF_R2_TOKEN }}
+            CF_R2_S3_API: ${{ secrets.CF_R2_S3_API }}

-      - name: Deploy debian repo
-        if: github.event_name != 'workflow_dispatch' || inputs.linux
-        run: |
-          mv packages.element.io/debian .
-          aws s3 cp --recursive debian/ s3://$R2_BUCKET/debian --endpoint-url $R2_URL --region auto
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-          R2_URL: ${{ secrets.CF_R2_S3_API }}
+    windows_32bit:
+        if: github.event_name != 'workflow_dispatch' || inputs.windows_32bit
+        needs: prepare
+        name: Windows 32-bit
+        uses: ./.github/workflows/build_windows.yaml
+        secrets: inherit
+        with:
+            sign: true
+            deploy-mode: true
+            arch: x86
+            version: ${{ needs.prepare.outputs.win32-x86-version }}

-      - name: Deploy artifacts
+    windows_64bit:
+        if: github.event_name != 'workflow_dispatch' || inputs.windows_64bit
+        needs: prepare
+        name: Windows 64-bit
+        uses: ./.github/workflows/build_windows.yaml
+        secrets: inherit
+        with:
+            sign: true
+            deploy-mode: true
+            arch: x64
+            version: ${{ needs.prepare.outputs.win32-x64-version }}
+
+    macos:
        if: github.event_name != 'workflow_dispatch' || inputs.macos
-        run: |
-          aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-          R2_URL: ${{ secrets.CF_R2_S3_API }}
-          DEPLOYMENT_DIR: ${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
+        needs: prepare
+        name: macOS
+        uses: ./.github/workflows/build_macos.yaml
+        secrets: inherit
+        with:
+            sign: true
+            deploy-mode: true
+            # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
+            base-url: https://packages-element-io-test.element.io/${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
+            version: ${{ needs.prepare.outputs.macos-version }}
+
+    linux:
+        if: github.event_name != 'workflow_dispatch' || inputs.linux
+        needs: prepare
+        name: Linux
+        uses: ./.github/workflows/build_linux.yaml
+        secrets: inherit
+        with:
+            sqlcipher: system
+            deploy-mode: true
+            version: ${{ needs.prepare.outputs.linux-version }}
+
+    deploy:
+        needs:
+            - macos
+            - linux
+            - windows_32bit
+            - windows_64bit
+        runs-on: ubuntu-latest
+        name: Deploy
+        if: always() && (github.event != 'workflow_dispatch' || inputs.deploy)
+        environment: packages.element.io
+        steps:
+            - name: Download artifacts
+              uses: actions/download-artifact@v3
+              with:
+                  name: packages.element.io
+                  path: packages.element.io
+
+            - name: Deploy debian repo
+              if: github.event_name != 'workflow_dispatch' || inputs.linux
+              run: |
+                  mv packages.element.io/debian .
+                  aws s3 cp --recursive debian/ s3://$R2_BUCKET/debian --endpoint-url $R2_URL --region auto
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+                  R2_URL: ${{ secrets.CF_R2_S3_API }}
+
+            - name: Deploy artifacts
+              if: github.event_name != 'workflow_dispatch' || inputs.macos || inputs.windows_32bit || inputs.windows_64bit
+              run: |
+                  aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+                  R2_URL: ${{ secrets.CF_R2_S3_API }}
+                  DEPLOYMENT_DIR: ${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -1,107 +1,107 @@
 name: Build and Test
 on:
-  pull_request: {}
-  push:
-    branches: [develop, staging, master]
+    pull_request: {}
+    push:
+        branches: [develop, staging, master]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 jobs:
-  fetch:
-    uses: ./.github/workflows/build_prepare.yaml
-    with:
-      config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
-      version: ${{ github.event.pull_request.base.ref == 'develop' && 'develop' || '' }}
-
-  windows:
-    needs: fetch
-    name: Windows
-    uses: ./.github/workflows/build_windows.yaml
-    strategy:
-      matrix:
-        arch: [x64, x86]
-    with:
-      arch: ${{ matrix.arch }}
-
-  linux:
-    needs: fetch
-    name: Linux
-    uses: ./.github/workflows/build_linux.yaml
-    strategy:
-      matrix:
-        sqlcipher: [system, static]
-    with:
-      sqlcipher: ${{ matrix.sqlcipher }}
-
-  macos:
-    needs: fetch
-    name: macOS
-    uses: ./.github/workflows/build_macos.yaml
-
-  test:
-    needs:
-      - macos
-      - linux
-      - windows
-    strategy:
-      matrix:
-        include:
-          - name: macOS Universal
-            os: macos
-            artifact: macos
-            executable: "./dist/mac-universal/Element.app/Contents/MacOS/Element"
-            prepare_cmd: "find ./dist/mac-universal/Element.app -type f | perl -lne 'print if -B' | tr '\\n' '\\0' | xargs -0 -n1 chmod 755"
-          - name: "Linux (sqlcipher: system)"
-            os: ubuntu
-            artifact: linux-sqlcipher-system
-            executable: "element-desktop"
-            prepare_cmd: "sudo apt install ./dist/*.deb"
-          - name: "Linux (sqlcipher: static)"
-            os: ubuntu
-            artifact: linux-sqlcipher-static
-            executable: "element-desktop"
-            prepare_cmd: "sudo apt install ./dist/*.deb"
-          - name: Windows (x86)
-            os: windows
-            artifact: win-x86
-            executable: "./dist/win-ia32-unpacked/Element.exe"
-          - name: Windows (x64)
-            os: windows
-            artifact: win-x64
-            executable: "./dist/win-unpacked/Element.exe"
-    name: Test ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
+    fetch:
+        uses: ./.github/workflows/build_prepare.yaml
        with:
-          cache: "yarn"
+            config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
+            version: ${{ github.event.pull_request.base.ref == 'develop' && 'develop' || '' }}

-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - uses: actions/download-artifact@v3
+    windows:
+        needs: fetch
+        name: Windows
+        uses: ./.github/workflows/build_windows.yaml
+        strategy:
+            matrix:
+                arch: [x64, x86]
        with:
-          name: ${{ matrix.artifact }}
-          path: dist
+            arch: ${{ matrix.arch }}

-      - name: Prepare for tests
-        run: ${{ matrix.prepare_cmd }}
-        if: matrix.prepare_cmd
-
-      - name: Run tests
-        uses: GabrielBB/xvfb-action@v1
-        timeout-minutes: 5
+    linux:
+        needs: fetch
+        name: Linux
+        uses: ./.github/workflows/build_linux.yaml
+        strategy:
+            matrix:
+                sqlcipher: [system, static]
        with:
-          run: "yarn test"
-        env:
-          ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}
+            sqlcipher: ${{ matrix.sqlcipher }}

-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: ${{ matrix.artifact }}
-          path: test_artifacts
-          retention-days: 1
+    macos:
+        needs: fetch
+        name: macOS
+        uses: ./.github/workflows/build_macos.yaml
+
+    test:
+        needs:
+            - macos
+            - linux
+            - windows
+        strategy:
+            matrix:
+                include:
+                    - name: macOS Universal
+                      os: macos
+                      artifact: macos
+                      executable: "./dist/mac-universal/Element.app/Contents/MacOS/Element"
+                      prepare_cmd: "find ./dist/mac-universal/Element.app -type f | perl -lne 'print if -B' | tr '\\n' '\\0' | xargs -0 -n1 chmod 755"
+                    - name: "Linux (sqlcipher: system)"
+                      os: ubuntu
+                      artifact: linux-sqlcipher-system
+                      executable: "element-desktop"
+                      prepare_cmd: "sudo apt install ./dist/*.deb"
+                    - name: "Linux (sqlcipher: static)"
+                      os: ubuntu
+                      artifact: linux-sqlcipher-static
+                      executable: "element-desktop"
+                      prepare_cmd: "sudo apt install ./dist/*.deb"
+                    - name: Windows (x86)
+                      os: windows
+                      artifact: win-x86
+                      executable: "./dist/win-ia32-unpacked/Element.exe"
+                    - name: Windows (x64)
+                      os: windows
+                      artifact: win-x64
+                      executable: "./dist/win-unpacked/Element.exe"
+        name: Test ${{ matrix.name }}
+        runs-on: ${{ matrix.os }}-latest
+        steps:
+            - uses: actions/checkout@v3
+
+            - uses: actions/setup-node@v3
+              with:
+                  cache: "yarn"
+
+            - name: Install Deps
+              run: "yarn install --pure-lockfile"
+
+            - uses: actions/download-artifact@v3
+              with:
+                  name: ${{ matrix.artifact }}
+                  path: dist
+
+            - name: Prepare for tests
+              run: ${{ matrix.prepare_cmd }}
+              if: matrix.prepare_cmd
+
+            - name: Run tests
+              uses: GabrielBB/xvfb-action@v1
+              timeout-minutes: 5
+              with:
+                  run: "yarn test"
+              env:
+                  ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}
+
+            - name: Upload Artifacts
+              uses: actions/upload-artifact@v3
+              if: always()
+              with:
+                  name: ${{ matrix.artifact }}
+                  path: test_artifacts
+                  retention-days: 1
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -70,7 +70,7 @@ jobs:
              env:
                  SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}

-            - name: '[Nightly] Resolve version'
+            - name: "[Nightly] Resolve version"
              id: nightly
              if: inputs.version != ''
              run: |
@@ -101,17 +101,17 @@ jobs:
              run: |
                  # Clear out the template packages.element.io directory, it has a dedicated deploy workflow
                  rm -R packages.element.io/*
-                  
+
                  # Install reprepro
                  sudo apt-get install -y reprepro
-                  
+
                  # Fetch reprepro database
                  aws s3 cp --recursive s3://$R2_BUCKET debian/db/ --endpoint-url $R2_URL --region auto
-                  
+
                  grep Codename debian/conf/distributions | sed -n 's/Codename: //p' | while read -r target ; do
                      reprepro -b debian includedeb "$target" ./dist/*.deb
                  done
-                  
+
                  # Store reprepro database
                  aws s3 cp --recursive debian/db/ s3://$R2_BUCKET --endpoint-url $R2_URL --region auto
              env:
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -69,14 +69,14 @@ jobs:
              if: steps.cache.outputs.cache-hit != 'true'
              run: "yarn build:native:universal"

-            - name: '[Nightly] Resolve version'
+            - name: "[Nightly] Resolve version"
              id: nightly
              if: inputs.version != ''
              run: |
                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT

            # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string
-            - name: '[Signed] Build App'
+            - name: "[Signed] Build App"
              if: inputs.sign != ''
              run: |
                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }}
@@ -88,7 +88,7 @@ jobs:
                  CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
                  CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}

-            - name: '[Unsigned] Build App'
+            - name: "[Unsigned] Build App"
              if: inputs.sign == ''
              run: |
                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }}
@@ -103,11 +103,12 @@ jobs:
                  mkdir -p dist/install/macos dist/update/macos
                  mv _dist/*-mac.zip dist/update/macos/
                  mv _dist/*.dmg dist/install/macos/
-        
+
                  PKG_JSON_VERSION=$(cat package.json | jq -r .version)
                  LATEST=$(find dist -type f -iname "*-mac.zip" | xargs -0 -n1 -- basename)
-                  URL="${{ inputs.base-url }}/update/macos/$LATEST"
-        
+                  # Encode spaces in the URL as Squirrel.Mac complains about bad JSON otherwise
+                  URL="${{ inputs.base-url }}/update/macos/${LATEST// /%20}"
+
                  jq -n --arg version "${VERSION:-$PKG_JSON_VERSION}" --arg url "$URL" '
                    {
                      currentRelease: $version,
@@ -127,12 +128,12 @@ jobs:
                  VERSION: ${{ inputs.version }}

            # We don't wish to store the installer for every nightly ever, so we only keep the latest
-            - name: '[Nightly] Strip version from installer file'
+            - name: "[Nightly] Strip version from installer file"
              if: inputs.deploy-mode && inputs.version != ''
              run: |
                  mv dist/install/macos/*.dmg "dist/install/macos/Element Nightly.dmg"

-            - name: '[Release] Prepare release latest symlink'
+            - name: "[Release] Prepare release latest symlink"
              if: inputs.deploy-mode && inputs.version == ''
              run: |
                  ln -s "$(find . -type f -iname "*.dmg" | xargs -0 -n1 -- basename)" "Element.dmg"
--- a/.github/workflows/build_prepare.yaml
+++ b/.github/workflows/build_prepare.yaml
@@ -31,6 +31,12 @@ on:
            linux-version:
                description: "The version string the next Linux Nightly should use, only output for calculate-nightly-versions"
                value: ${{ jobs.prepare.outputs.linux-version }}
+            win32-x64-version:
+                description: "The version string the next Windows x64 Nightly should use, only output for calculate-nightly-versions"
+                value: ${{ jobs.prepare.outputs.win32-x64-version }}
+            win32-x86-version:
+                description: "The version string the next Windows x86 Nightly should use, only output for calculate-nightly-versions"
+                value: ${{ jobs.prepare.outputs.win32-x86-version }}
 jobs:
    prepare:
        name: Prepare
@@ -39,6 +45,8 @@ jobs:
        outputs:
            macos-version: ${{ steps.versions.outputs.macos }}
            linux-version: ${{ steps.versions.outputs.linux }}
+            win32-x64-version: ${{ steps.versions.outputs.win_x64 }}
+            win32-x86-version: ${{ steps.versions.outputs.win_x86 }}
        steps:
            - uses: actions/checkout@v3

@@ -77,9 +85,14 @@ jobs:

                  LINUX=$(aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p')
                  echo "linux=$(scripts/generate-nightly-version.ts --latest $LINUX)" >> $GITHUB_OUTPUT
+
+                  WINx64=$(aws s3 cp s3://$R2_BUCKET/nightly/update/win32/x64/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8-)
+                  echo "win_x64=$(scripts/generate-nightly-version.ts --latest $WINx64)" >> $GITHUB_OUTPUT
+                  WINx86=$(aws s3 cp s3://$R2_BUCKET/nightly/update/win32/ia32/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8-)
+                  echo "win_x86=$(scripts/generate-nightly-version.ts --latest $WINx86)" >> $GITHUB_OUTPUT
              env:
                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
                  # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
-                  R2_BUCKET: 'packages-element-io-test'
+                  R2_BUCKET: "packages-element-io-test"
                  R2_URL: ${{ secrets.CF_R2_S3_API }}
--- a/.github/workflows/build_windows.yaml
+++ b/.github/workflows/build_windows.yaml
@@ -3,14 +3,34 @@
 # the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
 on:
    workflow_call:
+        secrets:
+            ESIGNER_USER_NAME:
+                required: false
+            ESIGNER_USER_PASSWORD:
+                required: false
+            ESIGNER_USER_TOTP:
+                required: false
        inputs:
            arch:
                type: string
                required: true
                description: "The architecture to build for, one of 'x64' | 'x86'"
+            version:
+                type: string
+                required: false
+                description: "Version string to override the one in package.json, used for non-release builds"
+            sign:
+                type: string
+                required: false
+                description: "Whether to sign & notarise the build, requires 'packages.element.io' environment"
+            deploy-mode:
+                type: string
+                required: false
+                description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones"
 jobs:
    build:
        runs-on: windows-latest
+        environment: ${{ inputs.sign && 'packages.element.io' || '' }}
        steps:
            - uses: kanga333/variable-mapper@master
              id: config
@@ -20,11 +40,13 @@ jobs:
                  map: |
                      {
                        "x64": {
-                          "target": "x86_64-pc-windows-msvc"
+                          "target": "x86_64-pc-windows-msvc",
+                          "dir": "x64"
                        },
                        "x86": {
                          "target": "i686-pc-windows-msvc",
-                          "build-args": "--ia32"
+                          "build-args": "--ia32",
+                          "dir": "ia32"
                        }
                      }

@@ -50,12 +72,14 @@ jobs:
            # ActiveTCL package on choco is from 2015,
            # this one is newer but includes more than we need
            - name: Choco install tclsh
+              if: steps.cache.outputs.cache-hit != 'true'
              shell: pwsh
              run: |
                  choco install -y magicsplat-tcl-tk --no-progress
                  echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

            - name: Choco install NetWide Assembler
+              if: steps.cache.outputs.cache-hit != 'true'
              shell: pwsh
              run: |
                  choco install -y nasm --no-progress
@@ -82,12 +106,90 @@ jobs:
                  refreshenv
                  yarn build:native --target ${{ steps.config.outputs.target }}

+            - name: Install and configure eSigner CKA
+              id: esigner
+              if: inputs.sign
+              run: |
+                  Set-StrictMode -Version 'Latest'
+
+                  # 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"
+                  ./eSigner_CKA.exe /CURRENTUSER /VERYSILENT /SUPPRESSMSGBOXES /DIR="${{ env.INSTALL_DIR }}" | Out-Null
+
+                  # Disable logger
+                  $LogConfig = Get-Content -Path ${{ env.INSTALL_DIR }}/log4net.config
+                  $LogConfig[0] = '<log4net threshold="OFF">'
+                  $LogConfig | Set-Content -Path ${{ env.INSTALL_DIR }}/log4net.config
+
+                  # Configure
+                  ${{ env.INSTALL_DIR }}/eSignerCKATool.exe config -mode "${{ env.MODE }}" -user "${{ secrets.ESIGNER_USER_NAME }}" -pass "${{ secrets.ESIGNER_USER_PASSWORD }}" -totp "${{ secrets.ESIGNER_USER_TOTP }}" -key "${{ env.MASTER_KEY_FILE }}" -r
+                  ${{ env.INSTALL_DIR }}/eSignerCKATool.exe unload
+                  ${{ env.INSTALL_DIR }}/eSignerCKATool.exe load
+
+                  # Find certificate
+                  $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+                  echo Certificate: $CodeSigningCert
+
+                  # Extract thumbprint and subject name
+                  $Thumbprint = $CodeSigningCert.Thumbprint
+                  $SubjectName = ($CodeSigningCert.Subject -replace ", ?", "`n" | ConvertFrom-StringData).CN
+                  echo "config-args=--signtool-thumbprint '$Thumbprint' --signtool-subject-name '$SubjectName'" >> $env:GITHUB_OUTPUT
+              env:
+                  # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
+                  MODE: sandbox
+                  INSTALL_DIR: C:\Users\runneradmin\eSignerCKA
+                  MASTER_KEY_FILE: C:\Users\runneradmin\eSignerCKA\master.key
+
+            - name: "[Nightly] Resolve version"
+              id: nightly
+              if: inputs.version != ''
+              shell: bash
+              run: |
+                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
+
            - name: Build App
-              run: "yarn build --publish never -w ${{ steps.config.outputs.build-args }}"
+              run: |
+                  yarn ts-node scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }} ${{ steps.esigner.outputs.config-args }}
+                  yarn build --publish never -w --config electron-builder.json ${{ steps.config.outputs.build-args }}
+              env:
+                  SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe"
+
+            - name: Prepare artifacts for deployment
+              if: inputs.deploy-mode
+              shell: bash
+              run: |
+                  mv dist _dist
+                  mkdir -p "dist/install/win32/$DIR/msi" "dist/update/win32/$DIR"
+                  mv _dist/squirrel-windows*/*.exe "dist/install/win32/$DIR"
+                  mv _dist/squirrel-windows*/*.nupkg "dist/update/win32/$DIR/"
+                  mv _dist/squirrel-windows*/RELEASES "dist/update/win32/$DIR/"
+                  # mv _dist/*.msi "dist/install/win32/$DIR/msi/"
+              env:
+                  DIR: ${{ steps.config.outputs.dir }}
+
+            # We don't wish to store the installer for every nightly ever, so we only keep the latest
+            - name: "[Nightly] Strip version from installer file"
+              if: inputs.deploy-mode && inputs.version != ''
+              shell: bash
+              run: |
+                  mv dist/install/win32/$DIR/*.exe "dist/install/win32/$DIR/Element Nightly Setup.exe"
+                  # mv dist/install/win32/$DIR/msi/*.msi "dist/install/win32/$DIR/msi/Element Nightly Setup.msi"
+              env:
+                  DIR: ${{ steps.config.outputs.dir }}
+
+            - name: "[Release] Prepare release latest symlink"
+              if: inputs.deploy-mode && inputs.version == ''
+              shell: bash
+              run: |
+                  ln -s "$(find . -type f -iname "*.exe" | xargs -0 -n1 -- basename)" "Element Setup.exe"
+              working-directory: "dist/install/win32/${{ steps.config.outputs.dir }}"

            - name: Upload Artifacts
              uses: actions/upload-artifact@v3
              with:
-                  name: win-${{ inputs.arch }}
+                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('win-{0}', inputs.arch) }}
                  path: dist
                  retention-days: 1
--- a/.github/workflows/packages_index.yaml
+++ b/.github/workflows/packages_index.yaml
@@ -8,9 +8,9 @@ on:
    # Trigger a daily rebuild for (mac-mini built) Nightly builds
    schedule:
        - cron: "0 11 * * *"
-  # Trigger after Nightly builds are deployed
+    # Trigger after Nightly builds are deployed
    workflow_run:
-        workflows: [ "Build and Deploy" ]
+        workflows: ["Build and Deploy"]
        types:
            - completed
    # Manual trigger for rebuilding for releases
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,21 @@
-Changes in [1.11.24-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.11.24-rc.2) (2023-02-22)
-===============================================================================================================
+Changes in [1.11.24](https://github.com/vector-im/element-desktop/releases/tag/v1.11.24) (2023-02-28)
+=====================================================================================================

 ## ✨ Features
- * Polls: show warning about undecryptable relations ([\#10179](https://github.com/matrix-org/matrix-react-sdk/pull/10179)). Contributed by @kerryarchibald.
+ * Remove experimental PWA support for Firefox and Safari ([\#24630](https://github.com/vector-im/element-web/pull/24630)).
+ * Fix block code styling in rich text editor ([\#10246](https://github.com/matrix-org/matrix-react-sdk/pull/10246)). Contributed by @alunturner.
+ * Poll history: fetch more poll history ([\#10235](https://github.com/matrix-org/matrix-react-sdk/pull/10235)). Contributed by @kerryarchibald.
+ * Sort short/exact emoji matches before longer incomplete matches ([\#10212](https://github.com/matrix-org/matrix-react-sdk/pull/10212)). Fixes vector-im/element-web#23210. Contributed by @grimhilt.
+ * Poll history: detail screen ([\#10172](https://github.com/matrix-org/matrix-react-sdk/pull/10172)). Contributed by @kerryarchibald.
+ * Provide a more detailed error message than "No known servers" ([\#6048](https://github.com/matrix-org/matrix-react-sdk/pull/6048)). Fixes vector-im/element-web#13247. Contributed by @aaronraimist.
+ * Say when a call was answered from a different device ([\#10224](https://github.com/matrix-org/matrix-react-sdk/pull/10224)).
+ * Widget permissions customizations using module api ([\#10121](https://github.com/matrix-org/matrix-react-sdk/pull/10121)). Contributed by @maheichyk.
+ * Fix copy button icon overlapping with copyable text ([\#10227](https://github.com/matrix-org/matrix-react-sdk/pull/10227)). Contributed by @Adesh-Pandey.
+ * Support joining non-peekable rooms via the module API ([\#10154](https://github.com/matrix-org/matrix-react-sdk/pull/10154)). Contributed by @maheichyk.
+ * The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\#10200](https://github.com/matrix-org/matrix-react-sdk/pull/10200)).
+ * Do not prompt for a password when doing a „reset all“ after login ([\#10208](https://github.com/matrix-org/matrix-react-sdk/pull/10208)).
 * Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\#10202](https://github.com/matrix-org/matrix-react-sdk/pull/10202)). Contributed by @florianduros.
- * Filter NSFW content in room directory ([\#10196](https://github.com/matrix-org/matrix-react-sdk/pull/10196)). Contributed by @kerryarchibald.
-
-## 🐛 Bug Fixes
- * Stop access token overflowing the box ([\#10069](https://github.com/matrix-org/matrix-react-sdk/pull/10069)). Fixes vector-im/element-web#24023. Contributed by @sbjaj33.
- * Add link to next file in the export ([\#10190](https://github.com/matrix-org/matrix-react-sdk/pull/10190)). Fixes vector-im/element-web#20272. Contributed by @grimhilt.
- * Ended poll tiles: add ended the poll message ([\#10193](https://github.com/matrix-org/matrix-react-sdk/pull/10193)). Fixes vector-im/element-web#24579. Contributed by @kerryarchibald.
-
-Changes in [1.11.24-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.11.24-rc.1) (2023-02-21)
-===============================================================================================================
-
-## ✨ Features
+ * Polls: show warning about undecryptable relations ([\#10179](https://github.com/matrix-org/matrix-react-sdk/pull/10179)). Contributed by @kerryarchibald.
 * Poll history: fetch last 30 days of polls ([\#10157](https://github.com/matrix-org/matrix-react-sdk/pull/10157)). Contributed by @kerryarchibald.
 * Poll history - ended polls list items ([\#10119](https://github.com/matrix-org/matrix-react-sdk/pull/10119)). Contributed by @kerryarchibald.
 * Remove threads labs flag and the ability to disable threads ([\#9878](https://github.com/matrix-org/matrix-react-sdk/pull/9878)). Fixes vector-im/element-web#24365.
@@ -26,6 +27,14 @@ Changes in [1.11.24-rc.1](https://github.com/vector-im/element-desktop/releases/
 * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.

 ## 🐛 Bug Fixes
+ * Let electron-builder correctly set StartupWMClass ([\#526](https://github.com/vector-im/element-desktop/pull/526)). Fixes vector-im/element-web#13780.
+ * Use the room avatar as a placeholder in calls ([\#10231](https://github.com/matrix-org/matrix-react-sdk/pull/10231)).
+ * Fix calls showing as 'connecting' after hangup ([\#10223](https://github.com/matrix-org/matrix-react-sdk/pull/10223)).
+ * Stop access token overflowing the box ([\#10069](https://github.com/matrix-org/matrix-react-sdk/pull/10069)). Fixes vector-im/element-web#24023. Contributed by @sbjaj33.
+ * Prevent multiple Jitsi calls started at the same time ([\#10183](https://github.com/matrix-org/matrix-react-sdk/pull/10183)). Fixes vector-im/element-web#23009.
+ * Make localization keys compatible with agglutinative and/or SOV type languages ([\#10159](https://github.com/matrix-org/matrix-react-sdk/pull/10159)). Contributed by @luixxiul.
+ * Add link to next file in the export ([\#10190](https://github.com/matrix-org/matrix-react-sdk/pull/10190)). Fixes vector-im/element-web#20272. Contributed by @grimhilt.
+ * Ended poll tiles: add ended the poll message ([\#10193](https://github.com/matrix-org/matrix-react-sdk/pull/10193)). Fixes vector-im/element-web#24579. Contributed by @kerryarchibald.
 * Fix accidentally inverted condition for room ordering ([\#10178](https://github.com/matrix-org/matrix-react-sdk/pull/10178)). Fixes vector-im/element-web#24527. Contributed by @justjanne.
 * Re-focus the composer on dialogue quit ([\#10007](https://github.com/matrix-org/matrix-react-sdk/pull/10007)). Fixes vector-im/element-web#22832. Contributed by @Ashu999.
 * Try to resolve emails before creating a DM ([\#10164](https://github.com/matrix-org/matrix-react-sdk/pull/10164)).
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "element-desktop",
  "productName": "Element",
  "main": "lib/electron-main.js",
-  "version": "1.11.24-rc.2",
+  "version": "1.11.24",
  "description": "A feature-rich client for Matrix.org",
  "author": "Element",
  "repository": {
@@ -20,9 +20,21 @@
    "asar-webapp": "asar p webapp webapp.asar",
    "start": "yarn run build:ts && yarn run build:res && electron .",
    "lint": "yarn lint:types && yarn lint:js",
-    "lint:js": "eslint --max-warnings 0 src scripts hak",
-    "lint:js-fix": "eslint --fix src scripts hak",
-    "lint:types": "tsc --noEmit && tsc -p scripts/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit",
+    "lint:js": "yarn lint:js:src && yarn lint:js:test && yarn lint:js:scripts && yarn lint:js:hak",
+    "lint:js:src": "eslint --max-warnings 0 src",
+    "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js test",
+    "lint:js:scripts": "eslint --max-warnings 0 --config .eslintrc-scripts.js scripts",
+    "lint:js:hak": "eslint --max-warnings 0 --config .eslintrc-hak.js hak",
+    "lint:js-fix": "yarn lint:js-fix:src &&yarn lint:js-fix:test && yarn lint:js-fix:scripts && yarn lint:js-fix:hak",
+    "lint:js-fix:src": "eslint --fix --max-warnings 0 src",
+    "lint:js-fix:test": "eslint --fix --max-warnings 0 --config .eslintrc-test.js test",
+    "lint:js-fix:scripts": "eslint --fix --max-warnings 0 --config .eslintrc-scripts.js scripts",
+    "lint:js-fix:hak": "eslint --fix --max-warnings 0 --config .eslintrc-hak.js hak",
+    "lint:types": "yarn lint:types:src && yarn lint:types:test && yarn lint:types:scripts && yarn lint:types:hak",
+    "lint:types:src": "tsc --noEmit",
+    "lint:types:test": "tsc --noEmit -p test/tsconfig.json",
+    "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
+    "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
    "build:native": "yarn run hak",
    "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
    "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
@@ -80,7 +92,7 @@
    "eslint-config-google": "^0.14.0",
    "eslint-config-prettier": "^8.5.0",
    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^0.9.0",
+    "eslint-plugin-matrix-org": "^1.0.0",
    "eslint-plugin-unicorn": "^45.0.0",
    "expect-playwright": "^0.8.0",
    "find-npm-prefix": "^1.0.2",
@@ -97,7 +109,7 @@
    "tar": "^6.1.2",
    "ts-jest": "^29.0.0",
    "ts-node": "^10.9.1",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
  },
  "hakDependencies": {
    "matrix-seshat": "^2.3.3",
@@ -130,10 +142,7 @@
        "deb"
      ],
      "category": "Network;InstantMessaging;Chat",
-      "maintainer": "support@element.io",
-      "desktop": {
-        "StartupWMClass": "element"
-      }
+      "maintainer": "support@element.io"
    },
    "mac": {
      "category": "public.app-category.social-networking",
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -10,6 +10,7 @@ defbranch="$3"

 rm -r "$defrepo" || true

+# A function that clones a branch of a repo based on the org, repo and branch
 clone() {
    org=$1
    repo=$2
@@ -22,20 +23,56 @@ clone() {
    fi
 }

-# Try the PR author's branch in case it exists on the deps as well.
-# If BUILDKITE_BRANCH is set, it will contain either:
-#   * "branch" when the author's branch and target branch are in the same repo
-#   * "author:branch" when the author's branch is in their fork
-# We can split on `:` into an array to check.
-BUILDKITE_BRANCH_ARRAY=(${BUILDKITE_BRANCH//:/ })
-if [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "1" ]]; then
-    clone $deforg $defrepo $BUILDKITE_BRANCH
-elif [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
-    clone ${BUILDKITE_BRANCH_ARRAY[0]} $defrepo ${BUILDKITE_BRANCH_ARRAY[1]}
+# A function that gets info about a PR from the GitHub API based on its number
+getPRInfo() {
+    number=$1
+    if [ -n "$number" ]; then
+        echo "Getting info about a PR with number $number"
+
+        apiEndpoint="https://api.github.com/repos/${REPOSITORY:-"vector-im/element-desktop"}/pulls/"
+        apiEndpoint+=$number
+
+        head=$(curl $apiEndpoint | jq -r '.head.label')
+    fi
+}
+
+# Some CIs don't give us enough info, so we just get the PR number and ask the
+# GH API for more info - "fork:branch". Some give us this directly.
+if [ -n "$BUILDKITE_BRANCH" ]; then
+    # BuildKite
+    head=$BUILDKITE_BRANCH
+elif [ -n "$PR_NUMBER" ]; then
+    # GitHub
+    getPRInfo $PR_NUMBER
+elif [ -n "$REVIEW_ID" ]; then
+    # Netlify
+    getPRInfo $REVIEW_ID
 fi
+
+# for forks, $head will be in the format "fork:branch", so we split it by ":"
+# into an array. On non-forks, this has the effect of splitting into a single
+# element array given ":" shouldn't appear in the head - it'll just be the
+# branch name. Based on the results, we clone.
+BRANCH_ARRAY=(${head//:/ })
+TRY_ORG=$deforg
+TRY_BRANCH=${BRANCH_ARRAY[0]}
+if [[ "$head" == *":"* ]]; then
+    # ... but only match that fork if it's a real fork
+    if [ "${BRANCH_ARRAY[0]}" != "matrix-org" ]; then
+        TRY_ORG=${BRANCH_ARRAY[0]}
+    fi
+    TRY_BRANCH=${BRANCH_ARRAY[1]}
+fi
+clone ${TRY_ORG} $defrepo ${TRY_BRANCH}
+
 # Try the target branch of the push or PR.
-clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
-# Try the current branch from Jenkins.
-clone $deforg $defrepo `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
+if [ -n "$GITHUB_BASE_REF" ]; then
+    clone $deforg $defrepo $GITHUB_BASE_REF
+elif [ -n "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" ]; then
+    clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
+fi
+
+# Try HEAD which is the branch name in Netlify (not BRANCH which is pull/xxxx/head for PR builds)
+clone $deforg $defrepo $HEAD
 # Use the default branch as the last resort.
 clone $deforg $defrepo $defbranch
--- a/scripts/generate-builder-config.ts
+++ b/scripts/generate-builder-config.ts
@@ -22,10 +22,12 @@ const NIGHTLY_APP_ID = "im.riot.nightly";
 const NIGHTLY_APP_NAME = "element-desktop-nightly";

 const argv = parseArgs<{
-    nightly?: string;
+    "nightly"?: string;
+    "signtool-thumbprint"?: string;
+    "signtool-subject-name"?: string;
    "deb-custom-control"?: string;
 }>(process.argv.slice(2), {
-    string: ["nightly", "deb-custom-control"],
+    string: ["nightly", "deb-custom-control", "signtool-thumbprint", "signtool-subject-name"],
 });

 interface File {
@@ -54,7 +56,10 @@ interface PackageBuild {
        target: {
            target: string;
        };
-        sign: string;
+        sign?: string;
+        signingHashAlgorithms?: string[];
+        certificateSubjectName?: string;
+        certificateSha1?: string;
    };
    deb?: {
        fpm?: string[];
@@ -108,6 +113,13 @@ async function main(): Promise<number | void> {
        cfg.extraMetadata!.version = version;
    }

+    if (argv["signtool-thumbprint"] && argv["signtool-subject-name"]) {
+        delete cfg.win.sign;
+        cfg.win.signingHashAlgorithms = ["sha256"];
+        cfg.win.certificateSubjectName = argv["signtool-subject-name"];
+        cfg.win.certificateSha1 = argv["signtool-thumbprint"];
+    }
+
    if (os.platform() === "linux") {
        // Electron crashes on debian if there's a space in the path.
        // https://github.com/vector-im/element-web/issues/13171
@@ -123,9 +135,11 @@ async function main(): Promise<number | void> {
    await fsProm.writeFile(ELECTRON_BUILDER_CFG_FILE, JSON.stringify(cfg, null, 4));
 }

-main().then((ret) => {
-    process.exit(ret!);
-}).catch((e) => {
-    console.error(e);
-    process.exit(1);
-});
+main()
+    .then((ret) => {
+        process.exit(ret!);
+    })
+    .catch((e) => {
+        console.error(e);
+        process.exit(1);
+    });
--- a/scripts/generate-packages-index.ts
+++ b/scripts/generate-packages-index.ts
@@ -8,6 +8,7 @@ const HIDDEN_FILES = [
    ".DS_Store",
    "index.html",
    "/fonts/",
+    "/tools/",
    "/nginx-theme/",
    ".~tmp~/",
    "msi/",
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "target": "es2017",
+        "module": "commonjs",
+        "sourceMap": false,
+        "strict": true,
+        "lib": ["es2019", "dom"]
+    },
+    "include": ["./**/*.ts"],
+    "ts-node": {
+        "transpileOnly": true
+    }
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,10 +9,10 @@
        "outDir": "./lib",
        "rootDir": "./src",
        "declaration": true,
-        "typeRoots": ["src/@types"],
+        "typeRoots": ["src/@types", "node_modules/@types"],
        "lib": ["es2019", "dom"],
-        "types": ["jest", "node"],
+        "types": ["node"],
        "strict": true
    },
-    "include": ["./src/**/*.ts", "./tests/**/*.ts"]
+    "include": ["./src/**/*.ts"]
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -2848,12 +2848,12 @@
  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==

 "@types/tar@^6.1.3":
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750"
-  integrity sha512-YzDOr5kdAeqS8dcO6NTTHTMJ44MUCBDoLEIyPtwEn7PssKqUYL49R1iCVJPeiPzPlKi6DbH33eZkpeJ27e4vHg==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.4.tgz#cf8497e1ebdc09212fd51625cd2eb5ca18365ad1"
+  integrity sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ==
  dependencies:
    "@types/node" "*"
-    minipass "^3.3.5"
+    minipass "^4.0.0"

 "@types/verror@^1.10.3":
  version "1.10.6"
@@ -4563,10 +4563,10 @@ eslint-plugin-import@^2.25.4:
    semver "^6.3.0"
    tsconfig-paths "^3.14.1"

-eslint-plugin-matrix-org@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-0.9.0.tgz#b2a5186052ddbfa7dc9878779bafa5d68681c7b4"
-  integrity sha512-+j6JuMnFH421Z2vOxc+0YMt5Su5vD76RSatviy3zHBaZpgd+sOeAWoCLBHD5E7mMz5oKae3Y3wewCt9LRzq2Nw==
+eslint-plugin-matrix-org@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-1.0.0.tgz#cead71391e2a36d63cb8f8018a38305ecf81b4b8"
+  integrity sha512-JSjw+hswEcFR+N4N2JXZttK65cK6huykZKkbnwcITxPTelsaOfZ8qXG0Az9BfmVADaLgY3MGmHK1YYKbykUfBQ==

 eslint-plugin-unicorn@^45.0.0:
  version "45.0.2"
@@ -6632,7 +6632,7 @@ minipass@^2.6.0, minipass@^2.9.0:
    safe-buffer "^5.1.2"
    yallist "^3.0.0"

-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6, minipass@^3.3.5:
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
  version "3.3.6"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
@@ -6640,9 +6640,9 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6, minipass@^3.3.5:
    yallist "^4.0.0"

 minipass@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72"
-  integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.1.tgz#084031141113657662d40f66f9c2329036892128"
+  integrity sha512-KS4CHIsDfOZetnT+u6fwxyFADXLamtkPxkGScmmtTW//MlRrImV+LtbmbJpLQ86Hw7km/utbfEfndhGBrfwvlA==

 minizlib@^1.3.3:
  version "1.3.3"
@@ -7171,17 +7171,17 @@ pkg-up@^3.1.0:
  dependencies:
    find-up "^3.0.0"

-playwright-core@1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.30.0.tgz#de987cea2e86669e3b85732d230c277771873285"
-  integrity sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==
+playwright-core@1.31.1:
+  version "1.31.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.31.1.tgz#4deeebbb8fb73b512593fe24bea206d8fd85ff7f"
+  integrity sha512-JTyX4kV3/LXsvpHkLzL2I36aCdml4zeE35x+G5aPc4bkLsiRiQshU5lWeVpHFAuC8xAcbI6FDcw/8z3q2xtJSQ==

 playwright@^1.25.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.30.0.tgz#b1d7be2d45d97fbb59f829f36f521f12010fe072"
-  integrity sha512-ENbW5o75HYB3YhnMTKJLTErIBExrSlX2ZZ1C/FzmHjUYIfxj/UnI+DWpQr992m+OQVSg0rCExAOlRwB+x+yyIg==
+  version "1.31.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.31.1.tgz#66164cdc1506bc883c7a98b44714dfea50b22d50"
+  integrity sha512-zKJabsIA2rvOwJ12lGTqWv4HVJzlfw2JtUvO4hAr7J8UXQZ1qEPpX20E1vcz/9fotnTkwgqp3CVdIBwptBN3Fg==
  dependencies:
-    playwright-core "1.30.0"
+    playwright-core "1.31.1"

 plist@^3.0.1, plist@^3.0.4:
  version "3.0.6"
@@ -8196,10 +8196,10 @@ typed-array-length@^1.0.4:
    for-each "^0.3.3"
    is-typed-array "^1.1.9"

-typescript@4.9.4:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
-  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+typescript@4.9.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

 unbox-primitive@^1.0.2:
  version "1.0.2"
Author	SHA1	Message	Date
Michael Telatyński	5976d3822c	Merge branch 'develop' into t3chguy/ci3	2023-02-28 12:37:24 +00:00
RiotRobot	144d04a5ae	Merge branch 'master' into develop	2023-02-28 11:24:52 +00:00
RiotRobot	75e3ea6818	v1.11.24	2023-02-28 11:24:38 +00:00
RiotRobot	248ec9cedd	Prepare changelog for v1.11.24	2023-02-28 11:24:37 +00:00
Michael Telatyński	65a7871d45	Let electron-builder correctly set StartupWMClass (#526 )	2023-02-27 18:04:55 +00:00
Michael Telatynski	b858e45eee	Fix invalid JSON	2023-02-27 10:52:25 +00:00
Michael Telatynski	3656125552	Fix Windows deploy path	2023-02-27 10:47:40 +00:00
Michael Telatynski	20f8099253	Update base-url for macos staging builds	2023-02-27 10:17:14 +00:00
Michael Telatyński	fc961737f4	Fix build_and_deploy workflow (#553 )	2023-02-27 09:52:47 +00:00
Michael Telatyński	f79713980a	Update build_macos.yaml	2023-02-27 09:45:54 +00:00
renovate[bot]	8497d743cd	Update dependency playwright to v1.31.1 (#536 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-24 23:47:08 +00:00
renovate[bot]	58f7c2534c	Update dependency eslint-plugin-matrix-org to v1 (#551 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-24 14:27:25 +01:00
renovate[bot]	ed60ea1977	Update dependency @types/tar to v6.1.4 (#549 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-24 12:44:18 +00:00
renovate[bot]	12c6f2c268	Update all non-major dependencies (#529 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-24 11:11:19 +00:00
Andy Balaam	a528d8c7c5	Merge pull request #546 from vector-im/andybalaam/harmonise-eslintrc-tsconfig Separate linting and compiling src+test, scripts and hak	2023-02-24 10:31:38 +00:00
Andy Balaam	3eeb8c14a9	Lint the test directory	2023-02-24 09:39:14 +00:00
Andy Balaam	51a8667b89	Share what we can with extends in eslintrc	2023-02-23 17:33:06 +00:00
Andy Balaam	f960700a2a	Exclude test from eslint checking since it always was excluded, and I can't get it to check	2023-02-23 17:10:06 +00:00
Michael Telatynski	a0a9ec830c	Build & EV Sign Windows builds (#517 * Add way to provide apple ID and app password to notarise script * Add utility to generate electron-builder.json for release & nightly builds * Run Build & Test on staging too * First attempt at build & deploy for macOS with signing and notarisation * Fix quote mismatch * use correct quotes * add runs-on * Fix inputs.mode usage * remove quotes * chmod +x * Fix artifact paths * Fix deploy condition * Fix deploy condition * Fix artifact path * Iterate * Fix workflow * Fix env * Iterate * Fix missing env * Fix version calculation * Iterate * Fix config not taking effect * Update build_and_deploy.yaml * Fix alignments * delint * Fix alignment * Update build_macos.yaml * Add ability to EV sign using eSigner CKA * Initial work to build & sign Windows nightlies in CI * Format * Format * Fix gha * fix winSign * Fix install command * Add signtool to path * Update build_and_deploy.yaml * Fix quotes * Test * Fix comments * Fix cmd * Try again * arg slashes * Fix exe path * Fix matrix strategy * Use ampersand-call * fwd slash ftw? * ls * * 🌲 * tree dist * prepend path * Specify /fd and /td to modern signtool * /tr not /t for CKA * Test signing * missing comma * 🤦‍♂️ * Fix wrong mv * Lets sign * Fix config gen * Debug * Fix typo * Multiple drives why * Try NVL sandbox creds * Update * Attempt to disable logger * Try again * Iterate * Update build_macos.yaml * Update build_and_deploy.yaml * Update build_macos.yaml * Update build_and_deploy.yaml * Update build_and_deploy.yaml * Try custom build of eSigner CKA * Fix typos * Update build_windows.yaml * Update build_and_deploy.yaml * Update build_windows.yaml * Update build_and_deploy.yaml * Fix symlinking * Fix working-directory incantation * exe * remove debug * Prettier * Vendor check in SSL.com executable * Download CKA from packages.element.io instead * Use demo creds * StrictMode * Switch back to 0207 (unsigned) * Fix call syntax * Revert env inc * Partial rollback * Trace * Trace less * Fix CN being passed wrong * DEBUG * Debug 2 * Fix ConvertFrom-StringData * 0214 * Test * Test * Untested * Revert to 0207 * stash * Try with 20230221 * Restore scripts/electron_winSign.js * Prepare for merge * Update build_windows.yaml * Update build_and_deploy.yaml * Restore .github/workflows/build_and_deploy.yaml * Restore .github/workflows/build_and_deploy.yaml * Fix bad restore	2023-02-22 13:51:19 +00:00
Andy Balaam	26a308d8c6	Add typeRoots to try and appease CI	2023-02-20 16:25:17 +00:00
Andy Balaam	a0034c1ade	Add a rootDir to try and appease the CI	2023-02-20 16:08:11 +00:00
Andy Balaam	1271c22aee	Separate linting and compiling src+test, scripts and hak Inspired by the failure of https://github.com/vector-im/element-desktop/pull/529 to lint our code with the @typescript-eslint/no-base-to-string rule turned on, I found we needed to add a parserOptions.project to our .eslintrc.js, pointing to the tsconfig.json. This led to more fixes, because we have 3 tsconfig.json files for src+test, scripts and hak and the single eslintrc was complaining that it could see more files than the tsconfig file knew about. So, I think the right split is to have one eslintrc file and one tsconfig for each of the three projects.	2023-02-17 12:17:42 +00:00
Andy Balaam	bd8c69ec74	Include the test directory in tsconfig.	2023-02-17 12:14:53 +00:00
Michael Telatynski	c25bbe75fb	Merge branch 'develop' into t3chguy/ci3	2022-06-10 22:28:31 +01:00
Michael Telatynski	4b4cee8ebb	Update fetchdep to also take into account forks	2022-04-27 22:50:28 +01:00
Michael Telatynski	a759b96a70	Use fetchdep everywhere	2022-04-27 17:12:34 +01:00