Merge branch 'dev' into 'main'

Refactor

See merge request illegitimate/illegitimate-bot!361

scripts/build.ts

@@ -21,17 +21,11 @@ const files = [
     eventFiles.map(f => `src/events/${f}`)
 ].flat()
 
-const banner = [
-    "const bun__build = true",
-    process.env.DOCKER === "1" ? "const bun__docker = true" : null
-].filter(v => typeof v === "string").join("\n")
-
 await Bun.build({
     entrypoints: ["src/index.ts", ...files],
     outdir: "dist",
     target: "bun",
     splitting: true,
-    minify: true,
     sourcemap: process.env.NODE_ENV === "dev" ? "external" : undefined,
     naming: {
         entry: "[dir]/[name].[ext]",
@@ -39,5 +33,5 @@ await Bun.build({
         asset: "asset/[name]-[hash].[ext]"
     },
     root: "src",
-    banner
+    banner: process.env.DOCKER === "1" ? "process.env.BUN__DOCKER = 'true'" : undefined
 })

src/enviroment.d.ts

@@ -3,8 +3,7 @@ declare global {
         interface ProcessEnv {
             NODE_ENV?: "dev" | "prod"
             TYPESCRIPT?: "true"
-            BUILD?: "true"
+            BUN__DOCKER?: "true"
-            DOCKER?: "1"
         }
     }
 }
@@ -16,9 +15,4 @@ declare global {
     }
 }
 
-declare global {
-    const bun__build: boolean | undefined
-    const bun__docker: boolean | undefined
-}
-
 export {}

src/utils/Illegitimate.ts

@@ -1,4 +1,5 @@
 import { RedisClient } from "bun"
+import { LoadEventsOptions } from "~/typings"
 import { ExtendedClient as Client } from "~/utils/Client"
 import env from "./Env"
 import loadAllEvents from "./Events/loadevents"
@@ -7,12 +8,9 @@ import { log } from "./Logger"
 const client = new Client()
 const redis = new RedisClient(env.prod.REDISURI)
 
-const ft = bun__build !== true ? "ts" : "js"
-const dir = bun__docker !== true ? bun__build !== true ? "src" : "dist" : ""
-
 class Illegitimate {
     async start() {
-        await loadAllEvents(client, { ft, dir })
+        await loadAllEvents(client, this.getOpts())
         await client.start()
         await this.databases()
         this.loadMethods()
@@ -28,6 +26,20 @@ class Illegitimate {
         })
     }
 
+    private getOpts(): LoadEventsOptions {
+        if (process.env.BUN__DOCKER === "true") {
+            return {
+                ft: "js",
+                dir: ""
+            }
+        } else {
+            return {
+                ft: "ts",
+                dir: "src"
+            }
+        }
+    }
+
     private loadMethods() {
         String.prototype.removeIndents = function(this: string) {
             return this.replace(/^ */gm, "")