Merge remote-tracking branch 'upstream/dev' into dev

browser/manifest.json

@@ -43,7 +43,7 @@
         {
             "resources": [
                 "dist/*",
-                "third-party/*"
+                "vendor/*"
             ],
             "matches": [
                 "*://*.discord.com/*"

browser/monaco.ts

@@ -15,7 +15,7 @@ declare global {
     const getTheme: () => string;
 }
 
-const BASE = "/dist/monaco/vs";
+const BASE = "/vendor/monaco/vs";
 
 self.MonacoEnvironment = {
     getWorkerUrl(_moduleId: unknown, label: string) {

eslint.config.mjs

@@ -132,7 +132,7 @@ export default tseslint.config(
             "no-unsafe-optional-chaining": "error",
             "no-useless-backreference": "error",
             "use-isnan": "error",
-            "prefer-const": "error",
+            "prefer-const": ["error", { destructuring: "all" }],
             "prefer-spread": "error",
 
             // Plugin Rules

package.json

@@ -31,7 +31,7 @@
         "lint": "eslint",
         "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
         "lint:fix": "pnpm lint --fix",
-        "test": "pnpm buildStandalone && pnpm lint:fix && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
+        "test": "pnpm buildStandalone && pnpm testTsc && pnpm lint:fix && pnpm lint-styles && pnpm generatePluginJson",
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
         "testTsc": "tsc --noEmit"
     },
@@ -39,7 +39,6 @@
         "@ffmpeg/ffmpeg": "^0.12.10",
         "@ffmpeg/util": "^0.12.1",
         "@intrnl/xxhash64": "^0.1.2",
-        "@sapphi-red/web-noise-suppressor": "0.3.5",
         "@types/less": "^3.0.6",
         "@types/stylus": "^0.48.42",
         "@types/tinycolor2": "^1.4.6",
@@ -68,7 +67,7 @@
         "@types/yazl": "^2.4.5",
         "diff": "^7.0.0",
         "discord-types": "^1.3.26",
-        "esbuild": "^0.15.18",
+        "esbuild": "^0.25.0",
         "eslint": "^9.17.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-react": "^7.37.3",

pnpm-lock.yaml

@@ -25,9 +25,6 @@ importers:
       '@intrnl/xxhash64':
         specifier: ^0.1.2
         version: 0.1.2
-      '@sapphi-red/web-noise-suppressor':
-        specifier: 0.3.5
-        version: 0.3.5
       '@types/less':
         specifier: ^3.0.6
         version: 3.0.6(patch_hash=krcufrsfhsuxuoj7hocqugs6zi)
@@ -108,8 +105,8 @@ importers:
         specifier: ^1.3.26
         version: 1.3.26
       esbuild:
-        specifier: ^0.15.18
+        specifier: ^0.25.0
-        version: 0.15.18
+        version: 0.25.0
       eslint:
         specifier: ^9.17.0
         version: 9.17.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
@@ -274,6 +271,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.25.0':
+    resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.17.18':
     resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==}
     engines: {node: '>=12'}
@@ -286,10 +289,10 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.15.18':
+  '@esbuild/android-arm64@0.25.0':
-    resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
+    resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
-    engines: {node: '>=12'}
+    engines: {node: '>=18'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [android]
 
   '@esbuild/android-arm@0.17.18':
@@ -304,6 +307,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.25.0':
+    resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.17.18':
     resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==}
     engines: {node: '>=12'}
@@ -316,6 +325,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.25.0':
+    resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.17.18':
     resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==}
     engines: {node: '>=12'}
@@ -328,6 +343,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.25.0':
+    resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.17.18':
     resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==}
     engines: {node: '>=12'}
@@ -340,6 +361,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.25.0':
+    resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.17.18':
     resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==}
     engines: {node: '>=12'}
@@ -352,6 +379,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.17.18':
     resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==}
     engines: {node: '>=12'}
@@ -364,6 +397,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.25.0':
+    resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.17.18':
     resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==}
     engines: {node: '>=12'}
@@ -376,6 +415,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.25.0':
+    resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.17.18':
     resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==}
     engines: {node: '>=12'}
@@ -388,6 +433,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.25.0':
+    resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.17.18':
     resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==}
     engines: {node: '>=12'}
@@ -400,10 +451,10 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.15.18':
+  '@esbuild/linux-ia32@0.25.0':
-    resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
+    resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
-    engines: {node: '>=12'}
+    engines: {node: '>=18'}
-    cpu: [loong64]
+    cpu: [ia32]
     os: [linux]
 
   '@esbuild/linux-loong64@0.17.18':
@@ -418,6 +469,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.25.0':
+    resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.17.18':
     resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==}
     engines: {node: '>=12'}
@@ -430,6 +487,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.25.0':
+    resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.17.18':
     resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==}
     engines: {node: '>=12'}
@@ -442,6 +505,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.25.0':
+    resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.17.18':
     resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==}
     engines: {node: '>=12'}
@@ -454,6 +523,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.25.0':
+    resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.17.18':
     resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==}
     engines: {node: '>=12'}
@@ -466,6 +541,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.25.0':
+    resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.17.18':
     resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==}
     engines: {node: '>=12'}
@@ -478,6 +559,18 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.25.0':
+    resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.17.18':
     resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==}
     engines: {node: '>=12'}
@@ -490,12 +583,24 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.25.0':
+    resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/openbsd-arm64@0.23.1':
     resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.17.18':
     resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==}
     engines: {node: '>=12'}
@@ -508,6 +613,12 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.25.0':
+    resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/sunos-x64@0.17.18':
     resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==}
     engines: {node: '>=12'}
@@ -520,6 +631,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.25.0':
+    resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.17.18':
     resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==}
     engines: {node: '>=12'}
@@ -532,6 +649,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.25.0':
+    resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.17.18':
     resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==}
     engines: {node: '>=12'}
@@ -544,6 +667,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.25.0':
+    resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.17.18':
     resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==}
     engines: {node: '>=12'}
@@ -556,6 +685,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.25.0':
+    resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -667,9 +802,6 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  '@sapphi-red/web-noise-suppressor@0.3.5':
-    resolution: {integrity: sha512-jh3+V9yM+zxLriQexoGm0GatoPaJWjs6ypFIbFYwQp+AoUb55eUXrjKtKQyuC5zShzzeAQUl0M5JzqB7SSrsRA==}
-
   '@socket.io/component-emitter@3.1.2':
     resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
 
@@ -1280,131 +1412,6 @@ packages:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
-  esbuild-android-64@0.15.18:
-    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
-  esbuild-android-arm64@0.15.18:
-    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
-  esbuild-darwin-64@0.15.18:
-    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
-  esbuild-darwin-arm64@0.15.18:
-    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
-  esbuild-freebsd-64@0.15.18:
-    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
-  esbuild-freebsd-arm64@0.15.18:
-    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  esbuild-linux-32@0.15.18:
-    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
-  esbuild-linux-64@0.15.18:
-    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
-  esbuild-linux-arm64@0.15.18:
-    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
-  esbuild-linux-arm@0.15.18:
-    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
-  esbuild-linux-mips64le@0.15.18:
-    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
-  esbuild-linux-ppc64le@0.15.18:
-    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
-  esbuild-linux-riscv64@0.15.18:
-    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
-  esbuild-linux-s390x@0.15.18:
-    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
-  esbuild-netbsd-64@0.15.18:
-    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
-  esbuild-openbsd-64@0.15.18:
-    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
-  esbuild-sunos-64@0.15.18:
-    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
-  esbuild-windows-32@0.15.18:
-    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
-  esbuild-windows-64@0.15.18:
-    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
-  esbuild-windows-arm64@0.15.18:
-    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
-  esbuild@0.15.18:
-    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-
   esbuild@0.17.18:
     resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==}
     engines: {node: '>=12'}
@@ -1415,6 +1422,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.25.0:
+    resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -3014,13 +3026,16 @@ snapshots:
   '@esbuild/aix-ppc64@0.23.1':
     optional: true
 
+  '@esbuild/aix-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/android-arm64@0.17.18':
     optional: true
 
   '@esbuild/android-arm64@0.23.1':
     optional: true
 
-  '@esbuild/android-arm@0.15.18':
+  '@esbuild/android-arm64@0.25.0':
     optional: true
 
   '@esbuild/android-arm@0.17.18':
@@ -3029,55 +3044,79 @@ snapshots:
   '@esbuild/android-arm@0.23.1':
     optional: true
 
+  '@esbuild/android-arm@0.25.0':
+    optional: true
+
   '@esbuild/android-x64@0.17.18':
     optional: true
 
   '@esbuild/android-x64@0.23.1':
     optional: true
 
+  '@esbuild/android-x64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.17.18':
     optional: true
 
   '@esbuild/darwin-arm64@0.23.1':
     optional: true
 
+  '@esbuild/darwin-arm64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.17.18':
     optional: true
 
   '@esbuild/darwin-x64@0.23.1':
     optional: true
 
+  '@esbuild/darwin-x64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.17.18':
     optional: true
 
   '@esbuild/freebsd-arm64@0.23.1':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.17.18':
     optional: true
 
   '@esbuild/freebsd-x64@0.23.1':
     optional: true
 
+  '@esbuild/freebsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.17.18':
     optional: true
 
   '@esbuild/linux-arm64@0.23.1':
     optional: true
 
+  '@esbuild/linux-arm64@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm@0.17.18':
     optional: true
 
   '@esbuild/linux-arm@0.23.1':
     optional: true
 
+  '@esbuild/linux-arm@0.25.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.17.18':
     optional: true
 
   '@esbuild/linux-ia32@0.23.1':
     optional: true
 
-  '@esbuild/linux-loong64@0.15.18':
+  '@esbuild/linux-ia32@0.25.0':
     optional: true
 
   '@esbuild/linux-loong64@0.17.18':
@@ -3086,75 +3125,117 @@ snapshots:
   '@esbuild/linux-loong64@0.23.1':
     optional: true
 
+  '@esbuild/linux-loong64@0.25.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.17.18':
     optional: true
 
   '@esbuild/linux-mips64el@0.23.1':
     optional: true
 
+  '@esbuild/linux-mips64el@0.25.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.17.18':
     optional: true
 
   '@esbuild/linux-ppc64@0.23.1':
     optional: true
 
+  '@esbuild/linux-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.17.18':
     optional: true
 
   '@esbuild/linux-riscv64@0.23.1':
     optional: true
 
+  '@esbuild/linux-riscv64@0.25.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.17.18':
     optional: true
 
   '@esbuild/linux-s390x@0.23.1':
     optional: true
 
+  '@esbuild/linux-s390x@0.25.0':
+    optional: true
+
   '@esbuild/linux-x64@0.17.18':
     optional: true
 
   '@esbuild/linux-x64@0.23.1':
     optional: true
 
+  '@esbuild/linux-x64@0.25.0':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.17.18':
     optional: true
 
   '@esbuild/netbsd-x64@0.23.1':
     optional: true
 
+  '@esbuild/netbsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.23.1':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.17.18':
     optional: true
 
   '@esbuild/openbsd-x64@0.23.1':
     optional: true
 
+  '@esbuild/openbsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.17.18':
     optional: true
 
   '@esbuild/sunos-x64@0.23.1':
     optional: true
 
+  '@esbuild/sunos-x64@0.25.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.17.18':
     optional: true
 
   '@esbuild/win32-arm64@0.23.1':
     optional: true
 
+  '@esbuild/win32-arm64@0.25.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.17.18':
     optional: true
 
   '@esbuild/win32-ia32@0.23.1':
     optional: true
 
+  '@esbuild/win32-ia32@0.25.0':
+    optional: true
+
   '@esbuild/win32-x64@0.17.18':
     optional: true
 
   '@esbuild/win32-x64@0.23.1':
     optional: true
 
+  '@esbuild/win32-x64@0.25.0':
+    optional: true
+
   '@eslint-community/eslint-utils@4.4.0(eslint@9.17.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))':
     dependencies:
       eslint: 9.17.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
@@ -3268,8 +3349,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@sapphi-red/web-noise-suppressor@0.3.5': {}
-
   '@socket.io/component-emitter@3.1.2': {}
 
   '@stylistic/eslint-plugin@2.12.1(eslint@9.17.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.7.2)':
@@ -4087,91 +4166,6 @@ snapshots:
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  esbuild-android-64@0.15.18:
-    optional: true
-
-  esbuild-android-arm64@0.15.18:
-    optional: true
-
-  esbuild-darwin-64@0.15.18:
-    optional: true
-
-  esbuild-darwin-arm64@0.15.18:
-    optional: true
-
-  esbuild-freebsd-64@0.15.18:
-    optional: true
-
-  esbuild-freebsd-arm64@0.15.18:
-    optional: true
-
-  esbuild-linux-32@0.15.18:
-    optional: true
-
-  esbuild-linux-64@0.15.18:
-    optional: true
-
-  esbuild-linux-arm64@0.15.18:
-    optional: true
-
-  esbuild-linux-arm@0.15.18:
-    optional: true
-
-  esbuild-linux-mips64le@0.15.18:
-    optional: true
-
-  esbuild-linux-ppc64le@0.15.18:
-    optional: true
-
-  esbuild-linux-riscv64@0.15.18:
-    optional: true
-
-  esbuild-linux-s390x@0.15.18:
-    optional: true
-
-  esbuild-netbsd-64@0.15.18:
-    optional: true
-
-  esbuild-openbsd-64@0.15.18:
-    optional: true
-
-  esbuild-sunos-64@0.15.18:
-    optional: true
-
-  esbuild-windows-32@0.15.18:
-    optional: true
-
-  esbuild-windows-64@0.15.18:
-    optional: true
-
-  esbuild-windows-arm64@0.15.18:
-    optional: true
-
-  esbuild@0.15.18:
-    optionalDependencies:
-      '@esbuild/android-arm': 0.15.18
-      '@esbuild/linux-loong64': 0.15.18
-      esbuild-android-64: 0.15.18
-      esbuild-android-arm64: 0.15.18
-      esbuild-darwin-64: 0.15.18
-      esbuild-darwin-arm64: 0.15.18
-      esbuild-freebsd-64: 0.15.18
-      esbuild-freebsd-arm64: 0.15.18
-      esbuild-linux-32: 0.15.18
-      esbuild-linux-64: 0.15.18
-      esbuild-linux-arm: 0.15.18
-      esbuild-linux-arm64: 0.15.18
-      esbuild-linux-mips64le: 0.15.18
-      esbuild-linux-ppc64le: 0.15.18
-      esbuild-linux-riscv64: 0.15.18
-      esbuild-linux-s390x: 0.15.18
-      esbuild-netbsd-64: 0.15.18
-      esbuild-openbsd-64: 0.15.18
-      esbuild-sunos-64: 0.15.18
-      esbuild-windows-32: 0.15.18
-      esbuild-windows-64: 0.15.18
-      esbuild-windows-arm64: 0.15.18
-
   esbuild@0.17.18:
     optionalDependencies:
       '@esbuild/android-arm': 0.17.18
@@ -4224,6 +4218,34 @@ snapshots:
       '@esbuild/win32-ia32': 0.23.1
       '@esbuild/win32-x64': 0.23.1
 
+  esbuild@0.25.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.0
+      '@esbuild/android-arm': 0.25.0
+      '@esbuild/android-arm64': 0.25.0
+      '@esbuild/android-x64': 0.25.0
+      '@esbuild/darwin-arm64': 0.25.0
+      '@esbuild/darwin-x64': 0.25.0
+      '@esbuild/freebsd-arm64': 0.25.0
+      '@esbuild/freebsd-x64': 0.25.0
+      '@esbuild/linux-arm': 0.25.0
+      '@esbuild/linux-arm64': 0.25.0
+      '@esbuild/linux-ia32': 0.25.0
+      '@esbuild/linux-loong64': 0.25.0
+      '@esbuild/linux-mips64el': 0.25.0
+      '@esbuild/linux-ppc64': 0.25.0
+      '@esbuild/linux-riscv64': 0.25.0
+      '@esbuild/linux-s390x': 0.25.0
+      '@esbuild/linux-x64': 0.25.0
+      '@esbuild/netbsd-arm64': 0.25.0
+      '@esbuild/netbsd-x64': 0.25.0
+      '@esbuild/openbsd-arm64': 0.25.0
+      '@esbuild/openbsd-x64': 0.25.0
+      '@esbuild/sunos-x64': 0.25.0
+      '@esbuild/win32-arm64': 0.25.0
+      '@esbuild/win32-ia32': 0.25.0
+      '@esbuild/win32-x64': 0.25.0
+
   escalade@3.1.2: {}
 
   escape-string-regexp@1.0.5: {}

scripts/build/build.mjs

@@ -17,41 +17,44 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import esbuild from "esbuild";
+// @ts-check
+
 import { createPackage } from "@electron/asar";
 import { readdir, writeFile } from "fs/promises";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 
-import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_COMPANION_TEST, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_COMPANION_TEST, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, commonRendererPlugins, watch, buildOrWatchAll, stringifyValues } from "./common.mjs";
 
-const defines = {
+const defines = stringifyValues({
-    IS_STANDALONE: String(IS_STANDALONE),
+    IS_STANDALONE,
-    IS_DEV: String(IS_DEV),
+    IS_DEV,
-    IS_REPORTER: String(IS_REPORTER),
+    IS_REPORTER,
-    IS_COMPANION_TEST: String(IS_COMPANION_TEST),
+    IS_COMPANION_TEST,
-    IS_UPDATER_DISABLED: String(IS_UPDATER_DISABLED),
+    IS_UPDATER_DISABLED,
-    IS_WEB: "false",
+    IS_WEB: false,
-    IS_EXTENSION: "false",
+    IS_EXTENSION: false,
-    VERSION: JSON.stringify(VERSION),
+    VERSION,
-    BUILD_TIMESTAMP: String(BUILD_TIMESTAMP)
+    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}
+ * @type {import("esbuild").BuildOptions}
  */
 const nodeCommonOpts = {
     ...commonOpts,
+    define: defines,
     format: "cjs",
     platform: "node",
     target: ["esnext"],
-    external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external],
+    // @ts-ignore this is never undefined
-    define: defines
+    external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external]
 };
 
 const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
@@ -105,26 +108,28 @@ const globNativesPlugin = {
     }
 };
 
-await Promise.all([
+/** @type {import("esbuild").BuildOptions[]} */
+const buildConfigs = ([
     // Discord Desktop main & renderer & preload
-    esbuild.build({
+    {
         ...nodeCommonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/main/index.ts")],
         outfile: "dist/desktop/patcher.js",
         footer: { js: "//# sourceURL=VencordPatcher\n" + sourceMapFooter("patcher") },
         sourcemap,
+        plugins: [
+            // @ts-ignore this is never undefined
+            ...nodeCommonOpts.plugins,
+            globNativesPlugin
+        ],
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: "true",
             IS_VESKTOP: "false",
             IS_EQUIBOP: "false"
+        }
     },
-        plugins: [
+    {
-            ...nodeCommonOpts.plugins,
-            globNativesPlugin
-        ]
-    }),
-    esbuild.build({
         ...commonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/Vencord.ts")],
         outfile: "dist/desktop/renderer.js",
@@ -143,8 +148,8 @@ await Promise.all([
             IS_VESKTOP: "false",
             IS_EQUIBOP: "false"
         }
-    }),
+    },
-    esbuild.build({
+    {
         ...nodeCommonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/preload.ts")],
         outfile: "dist/desktop/preload.js",
@@ -156,27 +161,27 @@ await Promise.all([
             IS_VESKTOP: "false",
             IS_EQUIBOP: "false"
         }
-    }),
+    },
 
-    // Equicord Desktop main & renderer & preload
+    // Vencord Desktop main & renderer & preload
-    esbuild.build({
+    {
         ...nodeCommonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/main/index.ts")],
         outfile: "dist/equibop/main.js",
         footer: { js: "//# sourceURL=VencordMain\n" + sourceMapFooter("main") },
         sourcemap,
+        plugins: [
+            ...nodeCommonOpts.plugins,
+            globNativesPlugin
+        ],
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: "false",
             IS_VESKTOP: "false",
             IS_EQUIBOP: "true"
+        }
     },
-        plugins: [
+    {
-            ...nodeCommonOpts.plugins,
-            globNativesPlugin
-        ]
-    }),
-    esbuild.build({
         ...commonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/Vencord.ts")],
         outfile: "dist/equibop/renderer.js",
@@ -195,8 +200,8 @@ await Promise.all([
             IS_VESKTOP: "false",
             IS_EQUIBOP: "true"
         }
-    }),
+    },
-    esbuild.build({
+    {
         ...nodeCommonOpts,
         entryPoints: [join(dirname(fileURLToPath(import.meta.url)), "../../src/preload.ts")],
         outfile: "dist/equibop/preload.js",
@@ -208,14 +213,10 @@ await Promise.all([
             IS_VESKTOP: "false",
             IS_EQUIBOP: "true"
         }
-    }),
+    }
-]).catch(err => {
+]);
-    console.error("Build failed");
+
-    console.error(err.message);
+await buildOrWatchAll(buildConfigs);
-    // make ci fail
-    if (!commonOpts.watch)
-        process.exitCode = 1;
-});
 
 await Promise.all([
     writeFile("dist/desktop/package.json", JSON.stringify({

scripts/build/buildWeb.mjs

@@ -17,42 +17,42 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import esbuild from "esbuild";
+// @ts-check
+
 import { readFileSync } from "fs";
 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, IS_COMPANION_TEST, VERSION } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, IS_COMPANION_TEST, VERSION, commonRendererPlugins, buildOrWatchAll, stringifyValues } from "./common.mjs";
 
 /**
- * @type {esbuild.BuildOptions}
+ * @type {import("esbuild").BuildOptions}
  */
 const commonOptions = {
     ...commonOpts,
     entryPoints: ["browser/Vencord.ts"],
-    globalName: "Vencord",
     format: "iife",
+    globalName: "Vencord",
     external: ["~plugins", "~git-hash", "/assets/*"],
+    target: ["esnext"],
     plugins: [
         globPlugins("web"),
-        ...commonOpts.plugins
+        ...commonRendererPlugins
     ],
-    target: ["esnext"],
+    define: stringifyValues({
-    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_COMPANION_TEST,
-        IS_COMPANION_TEST: String(IS_COMPANION_TEST),
+        IS_DISCORD_DESKTOP: false,
-        IS_DISCORD_DESKTOP: "false",
+        IS_VESKTOP: false,
-        IS_VESKTOP: "false",
+        IS_UPDATER_DISABLED: true,
-        IS_EQUIBOP: "false",
+        VERSION,
-        IS_UPDATER_DISABLED: "true",
+        BUILD_TIMESTAMP
-        VERSION: JSON.stringify(VERSION),
+    })
-        BUILD_TIMESTAMP: String(BUILD_TIMESTAMP)
-    }
 };
 
 const MonacoWorkerEntryPoints = [
@@ -67,45 +67,46 @@ const RnNoiseFiles = [
     "LICENSE"
 ];
 
-await Promise.all(
+
-    [
+/** @type {import("esbuild").BuildOptions[]} */
-        esbuild.build({
+const buildConfigs = [
+    {
         entryPoints: MonacoWorkerEntryPoints.map(entry => `node_modules/monaco-editor/esm/${entry}`),
         bundle: true,
         minify: true,
         format: "iife",
         outbase: "node_modules/monaco-editor/esm/",
-            outdir: "dist/browser/monaco"
+        outdir: "dist/vendor/monaco"
-        }),
+    },
-        esbuild.build({
+    {
         entryPoints: ["browser/monaco.ts"],
         bundle: true,
         minify: true,
         format: "iife",
-            outfile: "dist/browser/monaco/index.js",
+        outfile: "dist/vendor/monaco/index.js",
         loader: {
             ".ttf": "file"
         }
-        }),
+    },
-        esbuild.build({
+    {
         ...commonOptions,
-            outfile: "dist/browser/browser.js",
+        outfile: "dist/browser.js",
         footer: { js: "//# sourceURL=VencordWeb" }
-        }),
+    },
-        esbuild.build({
+    {
         ...commonOptions,
-            outfile: "dist/browser/extension.js",
+        outfile: "dist/extension.js",
         define: {
-                ...commonOptions?.define,
+            ...commonOptions.define,
-                IS_EXTENSION: "true",
+            IS_EXTENSION: "true"
         },
         footer: { js: "//# sourceURL=VencordWeb" }
-        }),
+    },
-        esbuild.build({
+    {
         ...commonOptions,
         inject: ["browser/GMPolyfill.js", ...(commonOptions?.inject || [])],
         define: {
-                ...(commonOptions?.define),
+            ...commonOptions.define,
             window: "unsafeWindow",
         },
         outfile: "dist/Vencord.user.js",
@@ -116,9 +117,10 @@ await Promise.all(
             // UserScripts get wrapped in an iife, so define Vencord prop on window that returns our local
             js: "Object.defineProperty(unsafeWindow,'Vencord',{get:()=>Vencord});"
         }
-        })
+    }
-    ]
+];
-);
+
+await buildOrWatchAll(buildConfigs);
 
 /**
  * @type {(dir: string) => Promise<string[]>}
@@ -157,9 +159,9 @@ async function loadDir(dir, basePath = "") {
  */
 async function buildExtension(target, files) {
     const entries = {
-        "dist/Vencord.js": await readFile("dist/browser/extension.js"),
+        "dist/Vencord.js": await readFile("dist/extension.js"),
-        "dist/Vencord.css": await readFile("dist/browser/extension.css"),
+        "dist/Vencord.css": await readFile("dist/extension.css"),
-        ...await loadDir("dist/browser/monaco"),
+        ...await loadDir("dist/vendor/monaco", "dist/"),
         ...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}`)]
         ))),
@@ -168,7 +170,7 @@ async function buildExtension(target, files) {
             if (f.startsWith("manifest")) {
                 const json = JSON.parse(content.toString("utf-8"));
                 json.version = VERSION;
-                content = new TextEncoder().encode(JSON.stringify(json));
+                content = Buffer.from(new TextEncoder().encode(JSON.stringify(json)));
             }
 
             return [

scripts/build/common.mjs

@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// @ts-check
+
 import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";
 
 import { exec, execSync } from "child_process";
-import esbuild from "esbuild";
+import esbuild, { build, context } 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 +31,9 @@ import { fileURLToPath } from "url";
 import { promisify } from "util";
 
 import { getPluginTarget } from "../utils.mjs";
+import { builtinModules } from "module";
 
-const PackageJSON = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "../../package.json")));
+const PackageJSON = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "../../package.json"), "utf-8"));
 
 export const VERSION = PackageJSON.version;
 // https://reproducible-builds.org/docs/source-date-epoch/
@@ -56,6 +59,34 @@ export const banner = {
 `.trim()
 };
 
+/**
+ * JSON.stringify all values in an object
+ * @type {(obj: Record<string, any>) => Record<string, string>}
+ */
+export function stringifyValues(obj) {
+    for (const key in obj) {
+        obj[key] = JSON.stringify(obj[key]);
+    }
+    return obj;
+}
+
+/**
+ * @param {import("esbuild").BuildOptions[]} buildConfigs
+ */
+export async function buildOrWatchAll(buildConfigs) {
+    if (watch) {
+        await Promise.all(buildConfigs.map(cfg =>
+            context(cfg).then(ctx => ctx.watch())
+        ));
+    } else {
+        await Promise.all(buildConfigs.map(cfg => build(cfg)))
+            .catch(error => {
+                console.error(error.message);
+                process.exit(1); // exit immediately to skip the rest of the builds
+            });
+    }
+}
+
 const PluginDefinitionNameMatcher = /definePlugin\(\{\s*(["'])?name\1:\s*(["'`])(.+?)\2/;
 /**
  * @param {string} base
@@ -271,6 +302,18 @@ export const fileUrlPlugin = {
     }
 };
 
+/**
+ * @type {(filter: RegExp, message: string) => import("esbuild").Plugin}
+ */
+export const banImportPlugin = (filter, message) => ({
+    name: "ban-imports",
+    setup: build => {
+        build.onResolve({ filter }, () => {
+            return { errors: [{ text: message }] };
+        });
+    }
+});
+
 const styleModule = readFileSync(join(dirname(fileURLToPath(import.meta.url)), "module/style.js"), "utf-8");
 
 /**
@@ -303,17 +346,28 @@ export const stylePlugin = {
 export const commonOpts = {
     logLevel: "info",
     bundle: true,
-    watch,
     minify: !watch && !IS_REPORTER,
-    sourcemap: watch ? "inline" : "",
+    sourcemap: watch ? "inline" : "external",
     legalComments: "linked",
     banner,
     plugins: [fileUrlPlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
     external: ["~plugins", "~git-hash", "~git-remote", "/assets/*"],
     inject: [join(dirname(fileURLToPath(import.meta.url)), "inject/react.mjs")],
-    jsxFactory: "VencordCreateElement",
-    jsxFragment: "VencordFragment",
     jsx: "transform",
-    // Work around https://github.com/evanw/esbuild/issues/2460
+    jsxFactory: "VencordCreateElement",
-    tsconfig: join(dirname(fileURLToPath(import.meta.url)), "tsconfig.esbuild.json")
+    jsxFragment: "VencordFragment"
 };
+
+const escapedBuiltinModules = builtinModules
+    .map(m => m.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"))
+    .join("|");
+const builtinModuleRegex = new RegExp(`^(node:)?(${escapedBuiltinModules})$`);
+
+export const commonRendererPlugins = [
+    banImportPlugin(builtinModuleRegex, "Cannot import node inbuilt modules in browser code. You need to use a native.ts file"),
+    banImportPlugin(/^react$/, "Cannot import from react. React and hooks should be imported from @webpack/common"),
+    banImportPlugin(/^electron(\/.*)?$/, "Cannot import electron in browser code. You need to use a native.ts file"),
+    banImportPlugin(/^ts-pattern$/, "Cannot import from ts-pattern. match and P should be imported from @webpack/common"),
+    // @ts-ignore this is never undefined
+    ...commonOpts.plugins
+];

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

@@ -16,11 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-/* eslint-disable no-fallthrough */
-
-// eslint-disable-next-line spaced-comment
 /// <reference types="../src/globals" />
-// eslint-disable-next-line spaced-comment
 /// <reference types="../src/modules" />
 
 import { createHmac } from "crypto";
@@ -58,14 +54,17 @@ async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
         .catch(() => undefined);
 }
 
-const report = {
+interface PatchInfo {
-    badPatches: [] as {
     plugin: string;
     type: string;
     id: string;
     match: string;
     error?: string;
-    }[],
+};
+
+const report = {
+    badPatches: [] as PatchInfo[],
+    slowPatches: [] as PatchInfo[],
     badStarts: [] as {
         plugin: string;
         error: string;
@@ -136,9 +135,22 @@ async function printReport() {
     console.log();
 
     if (process.env.WEBHOOK_URL) {
-        const body = JSON.stringify({
+        const patchesToEmbed = (title: string, patches: PatchInfo[], color: number) => ({
-            username: "Equicord Reporter" + (CANARY ? " (Canary)" : ""),
+            title,
-            embeds: [
+            color,
+            description: patches.map(p => {
+                const lines = [
+                    `**__${p.plugin} (${p.type}):__**`,
+                    `ID: \`${p.id}\``,
+                    `Match: ${toCodeBlock(p.match, "Match: ".length, true)}`
+                ];
+                if (p.error) lines.push(`Error: ${toCodeBlock(p.error, "Error: ".length, true)}`);
+
+                return lines.join("\n");
+            }).join("\n\n"),
+        });
+
+        const embeds = [
             {
                 author: {
                     name: `Discord ${CANARY ? "Canary" : "Stable"} (${metaData.buildNumber})`,
@@ -147,25 +159,14 @@ async function printReport() {
                 },
                 color: CANARY ? 0xfbb642 : 0x5865f2
             },
-                {
+            report.badPatches.length > 0 && patchesToEmbed("Bad Patches", report.badPatches, 0xff0000),
-                    title: "Bad Patches",
+            report.slowPatches.length > 0 && patchesToEmbed("Slow Patches", report.slowPatches, 0xf0b232),
-                    description: report.badPatches.map(p => {
+            report.badWebpackFinds.length > 0 && {
-                        const lines = [
-                            `**__${p.plugin} (${p.type}):__**`,
-                            `ID: \`${p.id}\``,
-                            `Match: ${toCodeBlock(p.match, "Match: ".length, true)}`
-                        ];
-                        if (p.error) lines.push(`Error: ${toCodeBlock(p.error, "Error: ".length, true)}`);
-                        return lines.join("\n");
-                    }).join("\n\n") || "None",
-                    color: report.badPatches.length ? 0xff0000 : 0x00ff00
-                },
-                {
                 title: "Bad Webpack Finds",
                 description: report.badWebpackFinds.map(f => toCodeBlock(f, 0, true)).join("\n") || "None",
-                    color: report.badWebpackFinds.length ? 0xff0000 : 0x00ff00
+                color: 0xff0000
             },
-                {
+            report.badStarts.length > 0 && {
                 title: "Bad Starts",
                 description: report.badStarts.map(p => {
                     const lines = [
@@ -175,14 +176,26 @@ async function printReport() {
                     return lines.join("\n");
                 }
                 ).join("\n\n") || "None",
-                    color: report.badStarts.length ? 0xff0000 : 0x00ff00
+                color: 0xff0000
             },
-                {
+            report.otherErrors.length > 0 && {
                 title: "Discord Errors",
                 description: report.otherErrors.length ? toCodeBlock(report.otherErrors.join("\n"), 0, true) : "None",
-                    color: report.otherErrors.length ? 0xff0000 : 0x00ff00
+                color: 0xff0000
             }
-            ]
+        ].filter(Boolean);
+
+        if (embeds.length === 1) {
+            embeds.push({
+                title: "No issues found",
+                description: "Seems like everything is working fine (for now)",
+                color: 0x00ff00
+            });
+        }
+
+        const body = JSON.stringify({
+            username: "Equicord Reporter" + (CANARY ? " (Canary)" : ""),
+            embeds
         });
 
         const headers = {
@@ -249,14 +262,17 @@ page.on("console", async e => {
 
         switch (tag) {
             case "WebpackInterceptor:":
-                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module|took [\d.]+?ms) \(Module id is (.+?)\): (.+)/)!;
+                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/);
-                if (!patchFailMatch) break;
+                const patchSlowMatch = message.match(/Patch by (.+?) (took [\d.]+?ms) \(Module id is (.+?)\): (.+)/);
+                const match = patchFailMatch ?? patchSlowMatch;
+                if (!match) break;
 
                 logStderr(await getText());
                 process.exitCode = 1;
 
-                const [, plugin, type, id, regex] = patchFailMatch;
+                const [, plugin, type, id, regex] = match;
-                report.badPatches.push({
+                const list = patchFailMatch ? report.badPatches : report.slowPatches;
+                list.push({
                     plugin,
                     type,
                     id,

src/debug/loadLazyChunks.ts

@@ -8,7 +8,7 @@ import { Logger } from "@utils/Logger";
 import { canonicalizeMatch } from "@utils/patches";
 import * as Webpack from "@webpack";
 import { wreq } from "@webpack";
-import { AnyModuleFactory, ModuleFactory } from "webpack";
+import { AnyModuleFactory, ModuleFactory } from "@webpack/wreq.d";
 
 export async function loadLazyChunks() {
     const LazyChunkLoaderLogger = new Logger("LazyChunkLoader");
@@ -140,8 +140,8 @@ export async function loadLazyChunks() {
         }
 
         Webpack.factoryListeners.add(factoryListener);
-        for (const factoryId in wreq.m) {
+        for (const moduleId in wreq.m) {
-            factoryListener(wreq.m[factoryId]);
+            factoryListener(wreq.m[moduleId]);
         }
 
         await chunksSearchingDone;

src/debug/runReporter.ts

@@ -6,10 +6,10 @@
 
 import { Logger } from "@utils/Logger";
 import * as Webpack from "@webpack";
-import { addPatch, patches } from "plugins";
 import { initWs } from "plugins/devCompanion.dev/initWs";
-import { getBuildNumber } from "webpack/patchWebpack";
+import { getBuildNumber, patchTimings } from "webpack/patchWebpack";
 
+import { addPatch, patches } from "../plugins";
 import { loadLazyChunks } from "./loadLazyChunks";
 import { reporterData } from "./reporterData";
 
@@ -55,7 +55,7 @@ async function runReporter() {
             }
         }
 
-        for (const [plugin, moduleId, match, totalTime] of Vencord.WebpackPatcher.patchTimings) {
+        for (const [plugin, moduleId, match, totalTime] of patchTimings) {
             if (totalTime > 5) {
                 new Logger("WebpackInterceptor").warn(`Patch by ${plugin} took ${Math.round(totalTime * 100) / 100}ms (Module id is ${String(moduleId)}): ${match}`);
             }

src/plugins/_core/noTrack.ts

@@ -20,7 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
-import { WebpackRequire } from "webpack";
+import { WebpackRequire } from "@webpack/wreq.d";
 
 const settings = definePluginSettings({
     disableAnalytics: {

src/plugins/betterFolders/index.tsx

@@ -185,8 +185,8 @@ export default definePlugin({
                 {
                     // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                     predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
-                    match: /(?<=\.isExpanded\),.{0,25}children:\[)/,
+                    match: /\.isExpanded\),.{0,30}children:\[/,
-                    replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
+                    replace: "$&$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
                 },
                 {
                     // Decide if we should render the expanded folder icon if we are rendering the Better Folders sidebar

src/plugins/index.ts

@@ -31,6 +31,7 @@ import { Logger } from "@utils/Logger";
 import { canonicalizeFind, canonicalizeReplacement } from "@utils/patches";
 import { Patch, Plugin, PluginDef, ReporterTestable, StartAt } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
+import { patches } from "@webpack/patcher";
 import { FluxEvents } from "@webpack/types";
 
 import Plugins from "~plugins";
@@ -41,7 +42,7 @@ const logger = new Logger("PluginManager", "#a6d189");
 
 export const PMLogger = logger;
 export const plugins = Plugins;
-export const patches = [] as Patch[];
+export { patches };
 
 /** Whether we have subscribed to flux events of all the enabled plugins when FluxDispatcher was ready */
 let enabledPluginsSubscribedFlux = false;

src/webpack/patchWebpack.ts

@@ -9,33 +9,24 @@ import { makeLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { interpolateIfDefined } from "@utils/misc";
 import { canonicalizeReplacement } from "@utils/patches";
-import { PatchReplacement } from "@utils/types";
+import { Patch, PatchReplacement } from "@utils/types";
 import { reporterData } from "debug/reporterData";
 
 import { traceFunctionWithResults } from "../debug/Tracer";
-import { patches } from "../plugins";
+import { _initWebpack, _shouldIgnoreModule, factoryListeners, findModuleId, moduleListeners, waitForSubscriptions, wreq } from "./webpack";
-import { _initWebpack, _shouldIgnoreModule, AnyModuleFactory, AnyWebpackRequire, factoryListeners, findModuleId, MaybeWrappedModuleFactory, ModuleExports, moduleListeners, waitForSubscriptions, WebpackRequire, WrappedModuleFactory, wreq } from ".";
+import { AnyModuleFactory, AnyWebpackRequire, MaybePatchedModuleFactory, ModuleExports, PatchedModuleFactory, WebpackRequire } from "./wreq.d";
+
+export const patches = [] as Patch[];
 
 export const SYM_ORIGINAL_FACTORY = Symbol("WebpackPatcher.originalFactory");
 export const SYM_PATCHED_SOURCE = Symbol("WebpackPatcher.patchedSource");
 export const SYM_PATCHED_BY = Symbol("WebpackPatcher.patchedBy");
-/** A set with all the Webpack instances */
 export const allWebpackInstances = new Set<AnyWebpackRequire>();
-export const patchTimings = [] as Array<[plugin: string, moduleId: PropertyKey, match: string | RegExp, totalTime: number]>;
 
-const logger = new Logger("WebpackInterceptor", "#8caaee");
+export const patchTimings = [] as Array<[plugin: string, moduleId: PropertyKey, match: PatchReplacement["match"], totalTime: number]>;
-/** Whether we tried to fallback to factory WebpackRequire, or disabled patches */
-let wreqFallbackApplied = false;
-/** Whether we should be patching factories.
- *
- * This should be disabled if we start searching for the module to get the build number, and then resumed once it's done.
- * */
-let shouldPatchFactories = true;
 
 export const getBuildNumber = makeLazy(() => {
     try {
-        shouldPatchFactories = false;
-
         try {
             if (wreq.m[128014]?.toString().includes("Trying to open a changelog for an invalid build number")) {
                 const hardcodedGetBuildNumber = wreq(128014).b as () => number;
@@ -60,13 +51,23 @@ export const getBuildNumber = makeLazy(() => {
         return typeof buildNumber === "number" ? buildNumber : -1;
     } catch {
         return -1;
-    } finally {
-        shouldPatchFactories = true;
     }
 });
 
-type Define = typeof Reflect.defineProperty;
+export function getFactoryPatchedSource(moduleId: PropertyKey, webpackRequire = wreq as AnyWebpackRequire) {
-const define: Define = (target, p, attributes) => {
+    return webpackRequire.m[moduleId]?.[SYM_PATCHED_SOURCE];
+}
+
+export function getFactoryPatchedBy(moduleId: PropertyKey, webpackRequire = wreq as AnyWebpackRequire) {
+    return webpackRequire.m[moduleId]?.[SYM_PATCHED_BY];
+}
+
+const logger = new Logger("WebpackInterceptor", "#8caaee");
+
+/** Whether we tried to fallback to the WebpackRequire of the factory, or disabled patches */
+let wreqFallbackApplied = false;
+
+const define: typeof Reflect.defineProperty = (target, p, attributes) => {
     if (Object.hasOwn(attributes, "value")) {
         attributes.writable = true;
     }
@@ -78,22 +79,17 @@ const define: Define = (target, p, attributes) => {
     });
 };
 
-export function getOriginalFactory(id: PropertyKey, webpackRequire = wreq as AnyWebpackRequire) {
+// wreq.m is the Webpack object containing module factories. It is pre-populated with factories, and is also populated via webpackGlobal.push
-    const moduleFactory = webpackRequire.m[id];
+// We use this setter to intercept when wreq.m is defined and apply patching to its factories.
-    return (moduleFactory?.[SYM_ORIGINAL_FACTORY] ?? moduleFactory) as AnyModuleFactory | undefined;
-}
 
-export function getFactoryPatchedSource(id: PropertyKey, webpackRequire = wreq as AnyWebpackRequire) {
+// Factories can be patched in two ways. Eagerly or lazily.
-    return webpackRequire.m[id]?.[SYM_PATCHED_SOURCE];
+// If we are patching eagerly, pre-populated factories are patched immediately and new factories are patched when set.
-}
+// Else, we only patch them when called.
 
-export function getFactoryPatchedBy(id: PropertyKey, webpackRequire = wreq as AnyWebpackRequire) {
+// Factories are always wrapped in a proxy, which allows us to intercept the call to them, patch if they werent eagerly patched,
-    return webpackRequire.m[id]?.[SYM_PATCHED_BY];
+// and call them with our wrapper which notifies our listeners.
-}
 
-// wreq.m is the Webpack object containing module factories. It is pre-populated with module factories, and is also populated via webpackGlobal.push
+// wreq.m is also wrapped in a proxy to intercept when new factories are set, patch them eargely, if enabled, and wrap them in the factory proxy.
-// We use this setter to intercept when wreq.m is defined and apply the patching in its module factories.
-// We wrap wreq.m with our proxy, which is responsible for patching the module factories when they are set, or defining getters for the patched versions.
 
 // If this is the main Webpack, we also set up the internal references to WebpackRequire.
 define(Function.prototype, "m", {
@@ -132,13 +128,17 @@ define(Function.prototype, "m", {
         const setterTimeout = setTimeout(() => Reflect.deleteProperty(this, "e"), 0);
 
         // Patch the pre-populated factories
-        for (const id in originalModules) {
+        for (const moduleId in originalModules) {
-            if (updateExistingFactory(originalModules, id, originalModules[id], true)) {
+            const originalFactory = originalModules[moduleId];
+
+            if (updateExistingFactory(originalModules, moduleId, originalFactory, originalModules, true)) {
                 continue;
             }
 
-            notifyFactoryListeners(originalModules[id]);
+            notifyFactoryListeners(moduleId, originalFactory);
-            defineModulesFactoryGetter(id, Settings.eagerPatches && shouldPatchFactories ? wrapAndPatchFactory(id, originalModules[id]) : originalModules[id]);
+
+            const proxiedFactory = new Proxy(Settings.eagerPatches ? patchFactory(moduleId, originalFactory) : originalFactory, moduleFactoryHandler);
+            define(originalModules, moduleId, { value: proxiedFactory });
         }
 
         define(originalModules, Symbol.toStringTag, {
@@ -146,7 +146,6 @@ define(Function.prototype, "m", {
             enumerable: false
         });
 
-        // The proxy responsible for patching the module factories when they are set, or defining getters for the patched versions
         const proxiedModuleFactories = new Proxy(originalModules, moduleFactoriesHandler);
         /*
         If Webpack ever decides to set module factories using the variable of the modules object directly, instead of wreq.m, switch the proxy to the prototype
@@ -157,6 +156,7 @@ define(Function.prototype, "m", {
     }
 });
 
+// The proxy for patching eagerly and/or wrapping factories in their proxy.
 const moduleFactoriesHandler: ProxyHandler<AnyWebpackRequire["m"]> = {
     /*
     If Webpack ever decides to set module factories using the variable of the modules object directly instead of wreq.m, we need to switch the proxy to the prototype
@@ -173,57 +173,96 @@ const moduleFactoriesHandler: ProxyHandler<AnyWebpackRequire["m"]> = {
     },
     */
 
-    // The set trap for patching or defining getters for the module factories when new module factories are loaded
     set(target, p, newValue, receiver) {
-        if (updateExistingFactory(target, p, newValue)) {
+        if (updateExistingFactory(target, p, newValue, receiver)) {
             return true;
         }
 
-        notifyFactoryListeners(newValue);
+        notifyFactoryListeners(p, newValue);
-        defineModulesFactoryGetter(p, Settings.eagerPatches && shouldPatchFactories ? wrapAndPatchFactory(p, newValue) : newValue);
 
-        return true;
+        const proxiedFactory = new Proxy(Settings.eagerPatches ? patchFactory(p, newValue) : newValue, moduleFactoryHandler);
+        return Reflect.set(target, p, proxiedFactory, receiver);
+    }
+};
+
+// The proxy for patching lazily and/or running factories with our wrapper.
+const moduleFactoryHandler: ProxyHandler<MaybePatchedModuleFactory> = {
+    apply(target, thisArg: unknown, argArray: Parameters<AnyModuleFactory>) {
+        // SAFETY: Factories have `name` as their key in the module factories object, and that is always their module id
+        const moduleId = target.name;
+
+        // SYM_ORIGINAL_FACTORY means the factory has already been patched
+        if (target[SYM_ORIGINAL_FACTORY] != null) {
+            return runFactoryWithWrap(moduleId, target as PatchedModuleFactory, thisArg, argArray);
+        }
+
+        const patchedFactory = patchFactory(moduleId, target);
+        return runFactoryWithWrap(moduleId, patchedFactory, thisArg, argArray);
+    },
+
+    get(target, p, receiver) {
+        if (target[SYM_ORIGINAL_FACTORY] != null && (p === SYM_PATCHED_SOURCE || p === SYM_PATCHED_BY)) {
+            return Reflect.get(target[SYM_ORIGINAL_FACTORY], p, target[SYM_ORIGINAL_FACTORY]);
+        }
+
+        const v = Reflect.get(target, p, receiver);
+
+        // Make proxied factories `toString` return their original factory `toString`
+        if (p === "toString") {
+            return v.bind(target[SYM_ORIGINAL_FACTORY] ?? target);
+        }
+
+        return v;
     }
 };
 
 /**
  * Update a factory that exists in any Webpack instance with a new original factory.
  *
- * @target The module factories where this new original factory is being set
+ * @param moduleFactoriesTarget The module factories where this new original factory is being set
- * @param id The id of the module
+ * @param moduleId The id of the module
  * @param newFactory The new original factory
+ * @param receiver The receiver of the new factory
  * @param ignoreExistingInTarget Whether to ignore checking if the factory already exists in the moduleFactoriesTarget
  * @returns Whether the original factory was updated, or false if it doesn't exist in any Webpack instance
  */
-function updateExistingFactory(moduleFactoriesTarget: AnyWebpackRequire["m"], id: PropertyKey, newFactory: AnyModuleFactory, ignoreExistingInTarget: boolean = false) {
+function updateExistingFactory(moduleFactoriesTarget: AnyWebpackRequire["m"], moduleId: PropertyKey, newFactory: AnyModuleFactory, receiver: any, ignoreExistingInTarget: boolean = false) {
     let existingFactory: TypedPropertyDescriptor<AnyModuleFactory> | undefined;
     let moduleFactoriesWithFactory: AnyWebpackRequire["m"] | undefined;
     for (const wreq of allWebpackInstances) {
-        if (ignoreExistingInTarget && wreq.m === moduleFactoriesTarget) continue;
+        if (ignoreExistingInTarget && wreq.m === moduleFactoriesTarget) {
+            continue;
+        }
 
-        if (Object.hasOwn(wreq.m, id)) {
+        if (Object.hasOwn(wreq.m, moduleId)) {
-            existingFactory = Reflect.getOwnPropertyDescriptor(wreq.m, id);
+            existingFactory = Reflect.getOwnPropertyDescriptor(wreq.m, moduleId);
             moduleFactoriesWithFactory = wreq.m;
             break;
         }
     }
 
     if (existingFactory != null) {
-        // If existingFactory exists in any Webpack instance, it's either wrapped in defineModuleFactoryGetter, or it has already been required.
+        // If existingFactory exists in any Webpack instance, it's either wrapped in our proxy, or it has already been required.
-        // So define the descriptor of it on this current Webpack instance (if it doesn't exist already), call Reflect.set with the new original,
+        // In the case it is wrapped in our proxy, we need the Webpack instance with this new original factory to also have our proxy.
-        // and let the correct logic apply (normal set, or defineModuleFactoryGetter setter)
+        // So, define the descriptor of the existing factory on it.
-
         if (moduleFactoriesWithFactory !== moduleFactoriesTarget) {
-            Reflect.defineProperty(moduleFactoriesTarget, id, existingFactory);
+            Reflect.defineProperty(receiver, moduleId, existingFactory);
         }
 
-        // Persist patched source and patched by in the new original factory, if the patched one has already been required
+        const existingFactoryValue = moduleFactoriesWithFactory![moduleId];
-        if (IS_DEV && existingFactory.value != null) {
+
-            newFactory[SYM_PATCHED_SOURCE] = existingFactory.value[SYM_PATCHED_SOURCE];
+        // Update with the new original factory, if it does have a current original factory
-            newFactory[SYM_PATCHED_BY] = existingFactory.value[SYM_PATCHED_BY];
+        if (existingFactoryValue[SYM_ORIGINAL_FACTORY] != null) {
+            existingFactoryValue[SYM_ORIGINAL_FACTORY] = newFactory;
         }
 
-        return Reflect.set(moduleFactoriesTarget, id, newFactory, moduleFactoriesTarget);
+        // Persist patched source and patched by in the new original factory
+        if (IS_DEV) {
+            newFactory[SYM_PATCHED_SOURCE] = existingFactoryValue[SYM_PATCHED_SOURCE];
+            newFactory[SYM_PATCHED_BY] = existingFactoryValue[SYM_PATCHED_BY];
+        }
+
+        return true;
     }
 
     return false;
@@ -232,12 +271,13 @@ function updateExistingFactory(moduleFactoriesTarget: AnyWebpackRequire["m"], id
 /**
  * Notify all factory listeners.
  *
+ * @param moduleId The id of the module
  * @param factory The original factory to notify for
  */
-function notifyFactoryListeners(factory: AnyModuleFactory) {
+function notifyFactoryListeners(moduleId: PropertyKey, factory: AnyModuleFactory) {
     for (const factoryListener of factoryListeners) {
         try {
-            factoryListener(factory);
+            factoryListener(factory, moduleId);
         } catch (err) {
             logger.error("Error in Webpack factory listener:\n", err, factoryListener);
         }
@@ -245,64 +285,27 @@ function notifyFactoryListeners(factory: AnyModuleFactory) {
 }
 
 /**
- * Define the getter for returning the patched version of the module factory.
+ * Run a (possibly) patched module factory with a wrapper which notifies our listeners.
  *
- * If eagerPatches is enabled, the factory argument should already be the patched version, else it will be the original
+ * @param moduleId The id of the module
- * and only be patched when accessed for the first time.
+ * @param patchedFactory The (possibly) patched module factory
- *
+ * @param thisArg The `value` of the call to the factory
- * @param id The id of the module
+ * @param argArray The arguments of the call to the factory
- * @param factory The original or patched module factory
  */
-function defineModulesFactoryGetter(id: PropertyKey, factory: MaybeWrappedModuleFactory) {
+function runFactoryWithWrap(moduleId: PropertyKey, patchedFactory: PatchedModuleFactory, thisArg: unknown, argArray: Parameters<MaybePatchedModuleFactory>) {
-    const descriptor: PropertyDescriptor = {
+    const originalFactory = patchedFactory[SYM_ORIGINAL_FACTORY];
-        get() {
+
-            // SYM_ORIGINAL_FACTORY means the factory is already patched
+    if (patchedFactory === originalFactory) {
-            if (!shouldPatchFactories || factory[SYM_ORIGINAL_FACTORY] != null) {
+        // @ts-expect-error Clear up ORIGINAL_FACTORY if the factory did not have any patch applied
-                return factory;
+        delete patchedFactory[SYM_ORIGINAL_FACTORY];
     }
 
-            return (factory = wrapAndPatchFactory(id, factory));
+    // Restore the original factory in all the module factories objects, discarding our proxy and allowing it to be garbage collected
-        },
-        set(newFactory: MaybeWrappedModuleFactory) {
-            if (IS_DEV) {
-                newFactory[SYM_PATCHED_SOURCE] = factory[SYM_PATCHED_SOURCE];
-                newFactory[SYM_PATCHED_BY] = factory[SYM_PATCHED_BY];
-            }
-
-            if (factory[SYM_ORIGINAL_FACTORY] != null) {
-                factory.toString = newFactory.toString.bind(newFactory);
-                factory[SYM_ORIGINAL_FACTORY] = newFactory;
-            } else {
-                factory = newFactory;
-            }
-        }
-    };
-
-    // Define the getter in all the module factories objects. Patches are only executed once, so make sure all module factories object
-    // have the patched version
     for (const wreq of allWebpackInstances) {
-        define(wreq.m, id, descriptor);
+        define(wreq.m, moduleId, { value: originalFactory });
-    }
     }
 
-/**
+    let [module, exports, require] = argArray;
- * Wraps and patches a module factory.
- *
- * @param id The id of the module
- * @param factory The original or patched module factory
- * @returns The wrapper for the patched module factory
- */
-function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory) {
-    const [patchedFactory, patchedSource, patchedBy] = patchFactory(id, originalFactory);
-
-    const wrappedFactory: WrappedModuleFactory = function (...args) {
-        // Restore the original factory in all the module factories objects. We want to make sure the original factory is restored properly, no matter what is the Webpack instance
-        for (const wreq of allWebpackInstances) {
-            define(wreq.m, id, { value: wrappedFactory[SYM_ORIGINAL_FACTORY] });
-        }
-
-        // eslint-disable-next-line prefer-const
-        let [module, exports, require] = args;
 
     if (wreq == null) {
         if (!wreqFallbackApplied) {
@@ -314,33 +317,33 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
                 const webpackInstanceFileName = stack?.match(/\/assets\/(.+?\.js)/)?.[1];
 
                 logger.warn(
-                        "WebpackRequire was not initialized, falling back to WebpackRequire passed to the first called patched module factory (" +
+                    "WebpackRequire was not initialized, falling back to WebpackRequire passed to the first called wrapped module factory (" +
-                        `id: ${String(id)}` + interpolateIfDefined`, WebpackInstance origin: ${webpackInstanceFileName}` +
+                    `id: ${String(moduleId)}` + interpolateIfDefined`, WebpackInstance origin: ${webpackInstanceFileName}` +
                     ")"
                 );
 
+                // Could technically be wrong, but it's better than nothing
                 _initWebpack(require as WebpackRequire);
             } else if (IS_DEV) {
                 logger.error("WebpackRequire was not initialized, running modules without patches instead.");
-                    return wrappedFactory[SYM_ORIGINAL_FACTORY].apply(this, args);
+                return originalFactory.apply(thisArg, argArray);
             }
         } else if (IS_DEV) {
-                return wrappedFactory[SYM_ORIGINAL_FACTORY].apply(this, args);
+            return originalFactory.apply(thisArg, argArray);
         }
     }
 
     let factoryReturn: unknown;
     try {
-            // Call the patched factory
+        factoryReturn = patchedFactory.apply(thisArg, argArray);
-            factoryReturn = patchedFactory.apply(this, args);
     } catch (err) {
         // Just re-throw Discord errors
-            if (patchedFactory === wrappedFactory[SYM_ORIGINAL_FACTORY]) {
+        if (patchedFactory === originalFactory) {
             throw err;
         }
 
         logger.error("Error in patched module factory:\n", err);
-            return wrappedFactory[SYM_ORIGINAL_FACTORY].apply(this, args);
+        return originalFactory.apply(thisArg, argArray);
     }
 
     exports = module.exports;
@@ -353,8 +356,8 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
 
         if (shouldIgnoreModule) {
             if (require.c != null) {
-                    Object.defineProperty(require.c, id, {
+                Object.defineProperty(require.c, moduleId, {
-                        value: require.c[id],
+                    value: require.c[moduleId],
                     enumerable: false,
                     configurable: true,
                     writable: true
@@ -367,7 +370,7 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
 
     for (const callback of moduleListeners) {
         try {
-                callback(exports, id);
+            callback(exports, moduleId);
         } catch (err) {
             logger.error("Error in Webpack module listener:\n", err, callback);
         }
@@ -377,7 +380,7 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
         try {
             if (filter(exports)) {
                 waitForSubscriptions.delete(filter);
-                    callback(exports, id);
+                callback(exports, moduleId);
                 continue;
             }
 
@@ -390,7 +393,7 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
 
                 if (exportValue != null && filter(exportValue)) {
                     waitForSubscriptions.delete(filter);
-                        callback(exportValue, id);
+                    callback(exportValue, moduleId);
                     break;
                 }
             }
@@ -400,35 +403,20 @@ function wrapAndPatchFactory(id: PropertyKey, originalFactory: AnyModuleFactory)
     }
 
     return factoryReturn;
-    };
-
-    wrappedFactory.toString = originalFactory.toString.bind(originalFactory);
-    wrappedFactory[SYM_ORIGINAL_FACTORY] = originalFactory;
-
-    if (IS_DEV && patchedFactory !== originalFactory) {
-        wrappedFactory[SYM_PATCHED_SOURCE] = patchedSource;
-        wrappedFactory[SYM_PATCHED_BY] = patchedBy;
-        originalFactory[SYM_PATCHED_SOURCE] = patchedSource;
-        originalFactory[SYM_PATCHED_BY] = patchedBy;
-    }
-
-    // @ts-expect-error Allow GC to get into action, if possible
-    originalFactory = undefined;
-    return wrappedFactory;
 }
 
 /**
  * Patches a module factory.
  *
- * @param id The id of the module
+ * @param moduleId The id of the module
- * @param factory The original module factory
+ * @param originalFactory The original module factory
- * @returns The patched module factory, the patched source of it, and the plugins that patched it
+ * @returns The patched module factory
  */
-function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFactory: AnyModuleFactory, patchedSource: string, patchedBy: Set<string>] {
+function patchFactory(moduleId: PropertyKey, originalFactory: AnyModuleFactory): PatchedModuleFactory {
     // 0, prefix to turn it into an expression: 0,function(){} would be invalid syntax without the 0,
-    let code: string = "0," + String(factory);
+    let code: string = "0," + String(originalFactory);
     let patchedSource = code;
-    let patchedFactory = factory;
+    let patchedFactory = originalFactory;
 
     const patchedBy = new Set<string>();
 
@@ -443,8 +431,8 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
             continue;
         }
 
-        // Reporter eagerly patches and cannot retrieve the build number because this code runs before the module for it is loaded
+        // Eager patches cannot retrieve the build number because this code runs before the module for it is loaded
-        const buildNumber = IS_REPORTER ? -1 : getBuildNumber();
+        const buildNumber = Settings.eagerPatches ? -1 : getBuildNumber();
         const shouldCheckBuildNumber = !Settings.eagerPatches && buildNumber !== -1;
 
         if (
@@ -464,7 +452,7 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
         });
 
         const previousCode = code;
-        const previousFactory = factory;
+        const previousFactory = originalFactory;
         let markedAsPatched = false;
 
         // We change all patch.replacement to array in plugins/index
@@ -483,25 +471,25 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
             }
 
             const lastCode = code;
-            const lastFactory = factory;
+            const lastFactory = originalFactory;
 
             try {
                 const [newCode, totalTime] = executePatch(replacement.match, replacement.replace as string);
 
                 if (IS_REPORTER) {
-                    patchTimings.push([patch.plugin, id, replacement.match, totalTime]);
+                    patchTimings.push([patch.plugin, moduleId, replacement.match, totalTime]);
                 }
 
                 if (newCode === code) {
                     if (!patch.noWarn) {
-                        logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${String(id)}): ${replacement.match}`);
+                        logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${String(moduleId)}): ${replacement.match}`);
                         if (IS_DEV) {
                             logger.debug("Function Source:\n", code);
                         }
                         if (IS_COMPANION_TEST)
                             reporterData.failedPatches.hadNoEffect.push({
                                 ...patch,
-                                id
+                                id: moduleId
                             });
                     }
 
@@ -517,7 +505,7 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
                         if (IS_COMPANION_TEST)
                             reporterData.failedPatches.undoingPatchGroup.push({
                                 ...patch,
-                                id
+                                id: moduleId
                             });
 
                         break;
@@ -527,7 +515,7 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
                 }
 
                 code = newCode;
-                patchedSource = `// Webpack Module ${String(id)} - Patched by ${[...patchedBy, patch.plugin].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${String(id)}`;
+                patchedSource = `// Webpack Module ${String(moduleId)} - Patched by ${[...patchedBy, patch.plugin].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${String(moduleId)}`;
                 patchedFactory = (0, eval)(patchedSource);
 
                 if (!patchedBy.has(patch.plugin)) {
@@ -535,14 +523,14 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
                     markedAsPatched = true;
                 }
             } catch (err) {
-                logger.error(`Patch by ${patch.plugin} errored (Module id is ${String(id)}): ${replacement.match}\n`, err);
+                logger.error(`Patch by ${patch.plugin} errored (Module id is ${String(moduleId)}): ${replacement.match}\n`, err);
 
                 if (IS_COMPANION_TEST)
                     reporterData.failedPatches.erroredPatch.push({
                         ...patch,
                         oldModule: lastCode,
                         newModule: code,
-                        id
+                        id: moduleId
                     });
 
                 if (IS_DEV) {
@@ -558,7 +546,7 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
                     if (IS_COMPANION_TEST)
                         reporterData.failedPatches.undoingPatchGroup.push({
                             ...patch,
-                            id
+                            id: moduleId
                         });
                     code = previousCode;
                     patchedFactory = previousFactory;
@@ -575,7 +563,14 @@ function patchFactory(id: PropertyKey, factory: AnyModuleFactory): [patchedFacto
         }
     }
 
-    return [patchedFactory, patchedSource, patchedBy];
+    patchedFactory[SYM_ORIGINAL_FACTORY] = originalFactory;
+
+    if (IS_DEV && patchedFactory !== originalFactory) {
+        originalFactory[SYM_PATCHED_SOURCE] = patchedSource;
+        originalFactory[SYM_PATCHED_BY] = patchedBy;
+    }
+
+    return patchedFactory as PatchedModuleFactory;
 }
 
 function diffErroredPatch(code: string, lastCode: string, match: RegExpMatchArray) {

src/webpack/webpack.ts

@@ -90,7 +90,7 @@ export const filters = {
 };
 
 export type CallbackFn = (module: ModuleExports, id: PropertyKey) => void;
-export type FactoryListernFn = (factory: AnyModuleFactory) => void;
+export type FactoryListernFn = (factory: AnyModuleFactory, moduleId: PropertyKey) => void;
 
 export const waitForSubscriptions = new Map<FilterFn, CallbackFn>();
 export const moduleListeners = new Set<CallbackFn>();

src/webpack/wreq.d.ts

@@ -200,12 +200,10 @@ export type AnyModuleFactory = ((this: ModuleExports, module: Module, exports: M
     [SYM_PATCHED_BY]?: Set<string>;
 };
 
-export type WrappedModuleFactory = AnyModuleFactory & {
+export type PatchedModuleFactory = AnyModuleFactory & {
     [SYM_ORIGINAL_FACTORY]: AnyModuleFactory;
     [SYM_PATCHED_SOURCE]?: string;
     [SYM_PATCHED_BY]?: Set<string>;
 };
 
-export type MaybeWrappedModuleFactory = AnyModuleFactory | WrappedModuleFactory;
+export type MaybePatchedModuleFactory = PatchedModuleFactory | AnyModuleFactory;
-
-export type WrappedModuleFactories = Record<PropertyKey, WrappedModuleFactory>;

tsconfig.json

@@ -21,39 +21,18 @@
         "jsx": "preserve",
         "baseUrl": "./src/",
         "paths": {
-            "@main/*": [
+            "@main/*": ["./main/*"],
-                "./main/*"
+            "@api/*": ["./api/*"],
-            ],
+            "@components/*": ["./components/*"],
-            "@api/*": [
+            "@utils/*": ["./utils/*"],
-                "./api/*"
+            "@shared/*": ["./shared/*"],
-            ],
+            "@webpack/types": ["./webpack/common/types"],
-            "@components/*": [
+            "@webpack/common": ["./webpack/common"],
-                "./components/*"
+            "@webpack": ["./webpack/webpack"],
-            ],
+            "@webpack/patcher": ["./webpack/patchWebpack"],
-            "@utils/*": [
+            "@webpack/wreq.d": ["./webpack/wreq.d"],
-                "./utils/*"
+            "@plugins": ["./plugins"],
-            ],
+            "@equicordplugins": ["./equicordplugins"]
-            "@shared/*": [
-                "./shared/*"
-            ],
-            "@webpack/types": [
-                "./webpack/common/types"
-            ],
-            "@webpack/common": [
-                "./webpack/common"
-            ],
-            "@webpack": [
-                "./webpack/webpack"
-            ],
-            "@webpack/patch": [
-                "./webpack/patchWebpack"
-            ],
-            "@plugins": [
-                "./plugins"
-            ],
-            "@equicordplugins": [
-                "./equicordplugins"
-            ]
         },
         "plugins": [
             // Transform paths in output .d.ts files (Include this line if you output declarations files)