Merge branch 'master' into develop

* Lock file maintenance

* Lock file maintenance

* Claw back minipass from 4.2.7 which is broken

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

.github/workflows/pull_request.yaml

@@ -2,7 +2,6 @@ name: Pull Request
 on:
     pull_request_target:
         types: [opened, edited, labeled, unlabeled, synchronize]
-concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
 jobs:
     action:
         uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop

package.json

@@ -70,7 +70,7 @@
     "@babel/core": "^7.18.10",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-typescript": "^7.18.6",
-    "@electron/asar": "^3.2.0",
+    "@electron/asar": "^3.2.3",
     "@electron/notarize": "^1.2.3",
     "@types/auto-launch": "^5.0.1",
     "@types/counterpart": "^0.18.1",
@@ -78,21 +78,19 @@
     "@types/jest": "^29.0.0",
     "@types/minimist": "^1.2.1",
     "@types/mkdirp": "^1.0.2",
-    "@types/node": "16.18.21",
+    "@types/node": "16.18.23",
     "@types/pacote": "^11.1.1",
-    "@types/rimraf": "^3.0.2",
     "@types/tar": "^6.1.3",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
     "allchange": "^1.0.6",
     "app-builder-lib": "24.0.0",
-    "asar": "^3.2.0",
     "babel-jest": "^29.0.0",
     "chokidar": "^3.5.2",
     "detect-libc": "^1.0.3",
-    "electron": "^23.0.0",
+    "electron": "^24.0.0",
     "electron-builder": "24.0.0",
-    "electron-builder-squirrel-windows": "24.0.0",
+    "electron-builder-squirrel-windows": "24.1.2",
     "electron-devtools-installer": "^3.2.0",
     "eslint": "^8.26.0",
     "eslint-config-google": "^0.14.0",
@@ -103,7 +101,7 @@
     "expect-playwright": "^0.8.0",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^11.0.0",
-    "glob": "^8.0.0",
+    "glob": "^9.0.0",
     "jest": "^29.0.0",
     "matrix-web-i18n": "^1.3.0",
     "mkdirp": "^2.0.0",
@@ -111,18 +109,18 @@
     "pacote": "^15.0.0",
     "playwright": "^1.25.0",
     "prettier": "^2.8.1",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.4.1",
     "tar": "^6.1.2",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.5"
+    "typescript": "5.0.3"
   },
   "hakDependencies": {
     "matrix-seshat": "^2.3.3",
     "keytar": "^7.9.0"
   },
   "resolutions": {
-    "@types/node": "16.18.21"
+    "@types/node": "16.18.23"
   },
   "build": {
     "appId": "im.riot.app",

scripts/fetch-package.ts

@@ -4,7 +4,7 @@ import * as path from "path";
 import { createWriteStream, promises as fs } from "fs";
 import * as childProcess from "child_process";
 import tar from "tar";
-import * as asar from "asar";
+import * as asar from "@electron/asar";
 import fetch from "node-fetch";
 import { promises as stream } from "stream";
 

scripts/hak/clean.ts

@@ -21,33 +21,7 @@ import { DependencyInfo } from "./dep";
 import HakEnv from "./hakEnv";
 
 export default async function clean(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    await new Promise<void>((resolve, reject) => {
-        rimraf(moduleInfo.moduleDotHakDir, (err?: Error | null) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve();
-            }
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        rimraf(path.join(hakEnv.dotHakDir, "links", moduleInfo.name), (err?: Error | null) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve();
-            }
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        rimraf(path.join(hakEnv.projectRoot, "node_modules", moduleInfo.name), (err?: Error | null) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve();
-            }
-        });
-    });
+    await rimraf(moduleInfo.moduleDotHakDir);
+    await rimraf(path.join(hakEnv.dotHakDir, "links", moduleInfo.name));
+    await rimraf(path.join(hakEnv.projectRoot, "node_modules", moduleInfo.name));
 }

scripts/hak/copy.ts

@@ -18,7 +18,7 @@ import path from "path";
 import fsProm from "fs/promises";
 import childProcess from "child_process";
 import rimraf from "rimraf";
-import glob from "glob";
+import { glob } from "glob";
 import mkdirp from "mkdirp";
 
 import HakEnv from "./hakEnv";
@@ -33,11 +33,7 @@ export default async function copy(hakEnv: HakEnv, moduleInfo: DependencyInfo):
         try {
             await mkdirp(moduleInfo.moduleOutDir);
             process.chdir(moduleInfo.moduleOutDir);
-            await new Promise<void>((resolve, reject) => {
-                rimraf(moduleInfo.cfg.prune, {}, (err) => {
-                    err ? reject(err) : resolve();
-                });
-            });
+            await rimraf(moduleInfo.cfg.prune);
         } finally {
             process.chdir(oldCwd);
         }
@@ -47,18 +43,8 @@ export default async function copy(hakEnv: HakEnv, moduleInfo: DependencyInfo):
         // If there are multiple moduleBuildDirs, singular moduleBuildDir
         // is the same as moduleBuildDirs[0], so we're just listing the contents
         // of the first one.
-        const files = await new Promise<string[]>((resolve, reject) => {
-            glob(
-                moduleInfo.cfg.copy,
-                {
-                    nosort: true,
-                    silent: true,
-                    cwd: moduleInfo.moduleBuildDir,
-                },
-                (err, files) => {
-                    err ? reject(err) : resolve(files);
-                },
-            );
+        const files = await glob(moduleInfo.cfg.copy, {
+            cwd: moduleInfo.moduleBuildDir,
         });
 
         if (moduleInfo.moduleBuildDirs.length > 1) {

scripts/set-version.ts

@@ -6,7 +6,7 @@
  */
 
 import { promises as fs } from "fs";
-import * as asar from "asar";
+import * as asar from "@electron/asar";
 import * as childProcess from "child_process";
 
 export async function versionFromAsar(): Promise<string> {

scripts/tsconfig.json

@@ -9,7 +9,7 @@
         "strict": true,
         "lib": ["es2019", "dom"]
     },
-    "include": ["./**/*.ts"],
+    "include": ["../src/@types", "./**/*.ts"],
     "ts-node": {
         "transpileOnly": true
     }

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/ipc.ts

@@ -220,7 +220,8 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) {
                                     return resp.arrayBuffer();
                                 })
                                 .then((arrayBuffer) => {
-                                    const buffer = Buffer.from(arrayBuffer!);
+                                    if (!arrayBuffer) return;
+                                    const buffer = Buffer.from(arrayBuffer);
                                     button.icon = nativeImage.createFromBuffer(buffer);
                                     button.label = "";
                                     button.backgroundColor = "";