This is all broken - I remembered branches exist

package.json

@@ -14,9 +14,9 @@
     "license": "GPL-3.0-or-later",
     "author": "Equicord",
     "scripts": {
-        "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
+        "build": "tsx scripts/build/build.mts",
         "buildStandalone": "pnpm build --standalone",
-        "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
+        "buildWeb": "tsx scripts/build/buildWeb.mts",
         "buildWebStandalone": "pnpm buildWeb --standalone",
         "buildReporter": "pnpm buildWebStandalone --reporter --skip-extension",
         "buildReporterDesktop": "pnpm build --reporter",
@@ -65,7 +65,7 @@
         "@typescript-eslint/parser": "^5.59.1",
         "diff": "^5.1.0",
         "discord-types": "^1.3.26",
-        "esbuild": "^0.15.18",
+        "esbuild": "^0.23.0",
         "eslint": "^8.46.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-simple-header": "^1.0.2",
@@ -79,7 +79,7 @@
         "stylelint": "^15.6.0",
         "stylelint-config-standard": "^33.0.0",
         "ts-patch": "^3.1.2",
-        "tsx": "^3.12.7",
+        "tsx": "^4.16.2",
         "type-fest": "^3.9.0",
         "typed-emitter": "^2.1.0",
         "typescript": "^5.4.5",

scripts/build/build.mts

@@ -18,32 +18,29 @@
 */
 
 import { createPackage } from "@electron/asar";
-import esbuild from "esbuild";
+import { BuildOptions, Plugin } from "esbuild";
 import { existsSync, readdirSync } from "fs";
 import { readdir, rm, writeFile } from "fs/promises";
 import { join } from "path";
 
-import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
+import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
 
 const defines = {
-    IS_STANDALONE,
+    IS_STANDALONE: String(IS_STANDALONE),
-    IS_DEV,
+    IS_DEV: String(IS_DEV),
-    IS_REPORTER,
+    IS_REPORTER: String(IS_REPORTER),
-    IS_UPDATER_DISABLED,
+    IS_UPDATER_DISABLED: String(IS_UPDATER_DISABLED),
-    IS_WEB: false,
+    IS_WEB: "false",
-    IS_EXTENSION: false,
+    IS_EXTENSION: "false",
     VERSION: JSON.stringify(VERSION),
-    BUILD_TIMESTAMP
+    BUILD_TIMESTAMP: String(BUILD_TIMESTAMP)
 };
 
-if (defines.IS_STANDALONE === false)
+if (defines.IS_STANDALONE === "false")
     // If this is a local build (not standalone), optimize
     // for the specific platform we're on
     defines["process.platform"] = JSON.stringify(process.platform);
 
-/**
- * @type {esbuild.BuildOptions}
- */
 const nodeCommonOpts = {
     ...commonOpts,
     format: "cjs",
@@ -51,15 +48,12 @@ const nodeCommonOpts = {
     target: ["esnext"],
     external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external],
     define: defines
-};
+} satisfies BuildOptions;
 
-const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
+const sourceMapFooter = (s: string) => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
 const sourcemap = watch ? "inline" : "external";
 
-/**
+const globNativesPlugin: Plugin = {
- * @type {import("esbuild").Plugin}
- */
-const globNativesPlugin = {
     name: "glob-natives-plugin",
     setup: build => {
         const filter = /^~pluginNatives$/;
@@ -106,7 +100,7 @@ const globNativesPlugin = {
 
 await Promise.all([
     // Discord Desktop main & renderer & preload
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
         outfile: "dist/desktop/patcher.js",
@@ -114,16 +108,16 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: true,
+            IS_DISCORD_DESKTOP: "true",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         },
         plugins: [
             ...nodeCommonOpts.plugins,
             globNativesPlugin
         ]
     }),
-    esbuild.build({
+    addBuild({
         ...commonOpts,
         entryPoints: ["src/Vencord.ts"],
         outfile: "dist/desktop/renderer.js",
@@ -138,12 +132,12 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: true,
+            IS_DISCORD_DESKTOP: "true",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         }
     }),
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/preload.ts"],
         outfile: "dist/desktop/preload.js",
@@ -151,14 +145,14 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: true,
+            IS_DISCORD_DESKTOP: "true",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         }
     }),
 
     // Vencord Desktop main & renderer & preload
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
         outfile: "dist/vesktop/main.js",
@@ -166,16 +160,16 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: true,
+            IS_VESKTOP: "true",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         },
         plugins: [
             ...nodeCommonOpts.plugins,
             globNativesPlugin
         ]
     }),
-    esbuild.build({
+    addBuild({
         ...commonOpts,
         entryPoints: ["src/Vencord.ts"],
         outfile: "dist/vesktop/renderer.js",
@@ -190,12 +184,12 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: true,
+            IS_VESKTOP: "true",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         }
     }),
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/preload.ts"],
         outfile: "dist/vesktop/preload.js",
@@ -203,14 +197,14 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: true,
+            IS_VESKTOP: "true",
-            IS_EQUIBOP: false
+            IS_EQUIBOP: "false"
         }
     }),
 
     // Equicord Desktop main & renderer & preload
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
         outfile: "dist/equibop/main.js",
@@ -218,16 +212,16 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: true
+            IS_EQUIBOP: "true"
         },
         plugins: [
             ...nodeCommonOpts.plugins,
             globNativesPlugin
         ]
     }),
-    esbuild.build({
+    addBuild({
         ...commonOpts,
         entryPoints: ["src/Vencord.ts"],
         outfile: "dist/equibop/renderer.js",
@@ -242,12 +236,12 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: true
+            IS_EQUIBOP: "true"
         }
     }),
-    esbuild.build({
+    addBuild({
         ...nodeCommonOpts,
         entryPoints: ["src/preload.ts"],
         outfile: "dist/equibop/preload.js",
@@ -255,18 +249,14 @@ await Promise.all([
         sourcemap,
         define: {
             ...defines,
-            IS_DISCORD_DESKTOP: false,
+            IS_DISCORD_DESKTOP: "false",
-            IS_VESKTOP: false,
+            IS_VESKTOP: "false",
-            IS_EQUIBOP: true
+            IS_EQUIBOP: "true"
         }
     }),
-]).catch(err => {
+]);
-    console.error("Build failed");
+
-    console.error(err.message);
+await buildOrWatchAll();
-    // make ci fail
-    if (!commonOpts.watch)
-        process.exitCode = 1;
-});
 
 await Promise.all([
     writeFile("dist/desktop/package.json", JSON.stringify({
@@ -289,6 +279,7 @@ await Promise.all([
     createPackage("dist/vesktop", "dist/vesktop.asar")
 ]);
 
+
 if (existsSync("dist/renderer.js")) {
     console.warn("Legacy dist folder. Cleaning up and adding shims.");
 

scripts/build/buildWeb.mts

@@ -23,12 +23,12 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises
 import { join } from "path";
 import Zip from "zip-local";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";
+import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
  */
-const commonOptions = {
+const commonOptions: esbuild.BuildOptions = {
     ...commonOpts,
     entryPoints: ["browser/Vencord.ts"],
     globalName: "Vencord",
@@ -40,17 +40,17 @@ const commonOptions = {
     ],
     target: ["esnext"],
     define: {
-        IS_WEB: true,
+        IS_WEB: "true",
-        IS_EXTENSION: false,
+        IS_EXTENSION: "false",
-        IS_STANDALONE: true,
+        IS_STANDALONE: "true",
-        IS_DEV,
+        IS_DEV: String(IS_DEV),
-        IS_REPORTER,
+        IS_REPORTER: String(IS_REPORTER),
-        IS_DISCORD_DESKTOP: false,
+        IS_DISCORD_DESKTOP: "false",
-        IS_VESKTOP: false,
+        IS_VESKTOP: "false",
-        IS_EQUIBOP: false,
+        IS_EQUIBOP: "false",
-        IS_UPDATER_DISABLED: true,
+        IS_UPDATER_DISABLED: "true",
         VERSION: JSON.stringify(VERSION),
-        BUILD_TIMESTAMP
+        BUILD_TIMESTAMP: String(BUILD_TIMESTAMP)
     }
 };
 
@@ -68,7 +68,7 @@ const RnNoiseFiles = [
 
 await Promise.all(
     [
-        esbuild.build({
+        addBuild({
             entryPoints: MonacoWorkerEntryPoints.map(entry => `node_modules/monaco-editor/esm/${entry}`),
             bundle: true,
             minify: true,
@@ -76,7 +76,7 @@ await Promise.all(
             outbase: "node_modules/monaco-editor/esm/",
             outdir: "dist/browser/monaco"
         }),
-        esbuild.build({
+        addBuild({
             entryPoints: ["browser/monaco.ts"],
             bundle: true,
             minify: true,
@@ -86,21 +86,21 @@ await Promise.all(
                 ".ttf": "file"
             }
         }),
-        esbuild.build({
+        addBuild({
             ...commonOptions,
             outfile: "dist/browser/browser.js",
             footer: { js: "//# sourceURL=VencordWeb" }
         }),
-        esbuild.build({
+        addBuild({
             ...commonOptions,
             outfile: "dist/browser/extension.js",
             define: {
                 ...commonOptions?.define,
-                IS_EXTENSION: true,
+                IS_EXTENSION: "true",
             },
             footer: { js: "//# sourceURL=VencordWeb" }
         }),
-        esbuild.build({
+        addBuild({
             ...commonOptions,
             inject: ["browser/GMPolyfill.js", ...(commonOptions?.inject || [])],
             define: {
@@ -119,11 +119,10 @@ await Promise.all(
     ]
 );
 
-/**
+await buildOrWatchAll();
- * @type {(dir: string) => Promise<string[]>}
+
- */
+async function globDir(dir: string): Promise<string[]> {
-async function globDir(dir) {
+    const files = [] as string[];
-    const files = [];
 
     for (const child of await readdir(dir, { withFileTypes: true })) {
         const p = join(dir, child.name);
@@ -136,27 +135,23 @@ async function globDir(dir) {
     return files;
 }
 
-/**
+async function loadDir(dir: string, basePath = "") {
- * @type {(dir: string, basePath?: string) => Promise<Record<string, string>>}
- */
-async function loadDir(dir, basePath = "") {
     const files = await globDir(dir);
-    return Object.fromEntries(await Promise.all(files.map(async f => [f.slice(basePath.length), await readFile(f)])));
+    return Object.fromEntries(await Promise.all(files.map(async f =>
+        [f.slice(basePath.length), await readFile(f)] as const
+    )));
 }
 
-/**
+async function buildExtension(target: string, files: string[]): Promise<void> {
-  * @type {(target: string, files: string[]) => Promise<void>}
+    const entries: Record<string, Buffer> = {
- */
-async function buildExtension(target, files) {
-    const entries = {
         "dist/Vencord.js": await readFile("dist/browser/extension.js"),
         "dist/Vencord.css": await readFile("dist/browser/extension.css"),
         ...await loadDir("dist/browser/monaco"),
         ...Object.fromEntries(await Promise.all(RnNoiseFiles.map(async file =>
-            [`third-party/rnnoise/${file.replace(/^dist\//, "")}`, await readFile(`node_modules/@sapphi-red/web-noise-suppressor/${file}`)]
+            [`third-party/rnnoise/${file.replace(/^dist\//, "")}`, await readFile(`node_modules/@sapphi-red/web-noise-suppressor/${file}`)] as const
         ))),
         ...Object.fromEntries(await Promise.all(files.map(async f => {
-            let content = await readFile(join("browser", f));
+            let content: Uint8Array | Buffer = await readFile(join("browser", f));
             if (f.startsWith("manifest")) {
                 const json = JSON.parse(content.toString("utf-8"));
                 json.version = VERSION;
@@ -166,7 +161,7 @@ async function buildExtension(target, files) {
             return [
                 f.startsWith("manifest") ? "manifest.json" : f,
                 content
-            ];
+            ] as const;
         })))
     };
 

scripts/build/common.mts

@@ -20,7 +20,7 @@ import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";
 
 import { exec, execSync } from "child_process";
-import esbuild from "esbuild";
+import esbuild, { build, BuildOptions, context, Plugin } from "esbuild";
 import { constants as FsConstants, readFileSync } from "fs";
 import { access, readdir, readFile } from "fs/promises";
 import { minify as minifyHtml } from "html-minifier-terser";
@@ -29,8 +29,7 @@ import { promisify } from "util";
 
 import { getPluginTarget } from "../utils.mjs";
 
-/** @type {import("../../package.json")} */
+const PackageJSON: typeof import("../../package.json") = JSON.parse(readFileSync("package.json", "utf-8"));
-const PackageJSON = JSON.parse(readFileSync("package.json"));
 
 export const VERSION = PackageJSON.version;
 // https://reproducible-builds.org/docs/source-date-epoch/
@@ -54,11 +53,8 @@ export const banner = {
 };
 
 const PluginDefinitionNameMatcher = /definePlugin\(\{\s*(["'])?name\1:\s*(["'`])(.+?)\2/;
-/**
+
- * @param {string} base
+export async function resolvePluginName(base: string, dirent: import("fs").Dirent) {
- * @param {import("fs").Dirent} dirent
- */
-export async function resolvePluginName(base, dirent) {
     const fullPath = join(base, dirent.name);
     const content = dirent.isFile()
         ? await readFile(fullPath, "utf-8")
@@ -79,28 +75,13 @@ export async function resolvePluginName(base, dirent) {
         })();
 }
 
-export async function exists(path) {
+export async function exists(path: string) {
     return await access(path, FsConstants.F_OK)
         .then(() => true)
         .catch(() => false);
 }
 
-// https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
+export const globPlugins: (kind: "web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop") => Plugin = kind => ({
-/**
- * @type {import("esbuild").Plugin}
- */
-export const makeAllPackagesExternalPlugin = {
-    name: "make-all-packages-external",
-    setup(build) {
-        const filter = /^[^./]|^\.[^./]|^\.\.[^/]/; // Must not start with "/" or "./" or "../"
-        build.onResolve({ filter }, args => ({ path: args.path, external: true }));
-    }
-};
-
-/**
- * @type {(kind: "web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop") => import("esbuild").Plugin}
- */
-export const globPlugins = kind => ({
     name: "glob-plugins",
     setup: build => {
         const filter = /^~plugins$/;
@@ -165,10 +146,7 @@ export const globPlugins = kind => ({
     }
 });
 
-/**
+export const gitHashPlugin: Plugin = {
- * @type {import("esbuild").Plugin}
- */
-export const gitHashPlugin = {
     name: "git-hash-plugin",
     setup: build => {
         const filter = /^~git-hash$/;
@@ -181,10 +159,7 @@ export const gitHashPlugin = {
     }
 };
 
-/**
+export const gitRemotePlugin: Plugin = {
- * @type {import("esbuild").Plugin}
- */
-export const gitRemotePlugin = {
     name: "git-remote-plugin",
     setup: build => {
         const filter = /^~git-remote$/;
@@ -206,10 +181,7 @@ export const gitRemotePlugin = {
     }
 };
 
-/**
+export const fileUrlPlugin: Plugin = {
- * @type {import("esbuild").Plugin}
- */
-export const fileUrlPlugin = {
     name: "file-uri-plugin",
     setup: build => {
         const filter = /^file:\/\/.+$/;
@@ -229,7 +201,7 @@ export const fileUrlPlugin = {
 
             const encoding = base64 ? "base64" : "utf-8";
 
-            let content;
+            let content: string;
             if (!minify) {
                 content = await readFile(path, encoding);
                 if (!noTrim) content = content.trimEnd();
@@ -269,10 +241,7 @@ export const fileUrlPlugin = {
 };
 
 const styleModule = readFileSync("./scripts/build/module/style.js", "utf-8");
-/**
+export const stylePlugin: Plugin = {
- * @type {import("esbuild").Plugin}
- */
-export const stylePlugin = {
     name: "style-plugin",
     setup: ({ onResolve, onLoad }) => {
         onResolve({ filter: /\.css\?managed$/, namespace: "file" }, ({ path, resolveDir }) => ({
@@ -293,15 +262,11 @@ export const stylePlugin = {
     }
 };
 
-/**
- * @type {import("esbuild").BuildOptions}
- */
 export const commonOpts = {
     logLevel: "info",
     bundle: true,
-    watch,
     minify: !watch,
-    sourcemap: watch ? "inline" : "",
+    sourcemap: watch ? "inline" : "external",
     legalComments: "linked",
     banner,
     plugins: [fileUrlPlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
@@ -309,6 +274,31 @@ export const commonOpts = {
     inject: ["./scripts/build/inject/react.mjs"],
     jsxFactory: "VencordCreateElement",
     jsxFragment: "VencordFragment",
-    // Work around https://github.com/evanw/esbuild/issues/2460
+    jsx: "transform"
-    tsconfig: "./scripts/build/tsconfig.esbuild.json"
+} satisfies BuildOptions;
-};
+
+
+const builds = [] as BuildOptions[];
+export function addBuild(options: BuildOptions) {
+    builds.push(options);
+}
+
+export async function buildOrWatchAll() {
+    if (watch) {
+        const contexts = await Promise.all(builds.map(context));
+        await Promise.all(contexts.map(ctx => ctx.watch()));
+    } else {
+        try {
+            await Promise.all(builds.map(build));
+        } catch (err) {
+            const reason = err instanceof Error
+                ? err.message
+                : err;
+
+            console.error("Build failed");
+            console.error(reason);
+            // make ci fail
+            process.exitCode = 1;
+        }
+    }
+}

scripts/build/tsconfig.esbuild.json

@@ -1,7 +0,0 @@
-// Work around https://github.com/evanw/esbuild/issues/2460
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "jsx": "react"
-    }
-}

scripts/utils.mts

@@ -16,15 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-/**
+export function getPluginTarget(filePath: string) {
- * @param {string} filePath
- * @returns {string | null}
- */
-export function getPluginTarget(filePath) {
     const pathParts = filePath.split(/[/\\]/);
-    if (/^index\.tsx?$/.test(pathParts.at(-1))) pathParts.pop();
+    if (/^index\.tsx?$/.test(pathParts.at(-1)!)) pathParts.pop();
 
-    const identifier = pathParts.at(-1).replace(/\.tsx?$/, "");
+    const identifier = pathParts.at(-1)!.replace(/\.tsx?$/, "");
     const identiferBits = identifier.split(".");
     return identiferBits.length === 1 ? null : identiferBits.at(-1);
 }

src/plugins/implicitRelationships/index.ts

@@ -117,7 +117,7 @@ export default definePlugin({
 
     wrapSort(comparator: Function, row: any) {
         return row.type === 5
-            ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
+            ? -(UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0)
             : comparator(row);
     },
 

src/webpack/webpack.ts

@@ -299,7 +299,7 @@ export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "f
  * Note that the example below exists already as an api, see {@link findByPropsLazy}
  * @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah);
  */
-export function proxyLazyWebpack<T = any>(factory: () => any, attempts?: number) {
+export function proxyLazyWebpack<T = any>(factory: () => T, attempts?: number) {
     if (IS_REPORTER) lazyWebpackSearchHistory.push(["proxyLazyWebpack", [factory]]);
 
     return proxyLazy<T>(factory, attempts);