Update dependency glob to v9 (#575)

* Update dependency glob to v9

* Adjust copy.ts to promisifed glob

* Switch asar -> @electron/asar

* Update rimraf for glob v9 compatibility

* Iterate

* Iterate

* Patch @electron/asar

* Fix another way

---------

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

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
     }