From 826b2c98200b0173f9e0f7516477fc200b8b7c45 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sat, 9 Oct 2021 01:44:44 +0200
Subject: [PATCH] :bug: fix build

---
 .gitignore                |   3 +-
 api/.swcrc                |  17 ------------
 api/package-lock.json     | Bin 1067823 -> 1067779 bytes
 bundle/.swcrc             |  12 --------
 bundle/package-lock.json  | Bin 143154 -> 149300 bytes
 bundle/scripts/build.js   |  56 ++++++++++++++++++++++++++++++--------
 bundle/tsconfig.json      |   3 +-
 cdn/tsconfig.json         |   4 +--
 gateway/.swcrc            |   5 ++--
 gateway/package-lock.json | Bin 537293 -> 537249 bytes
 gateway/tsconfig.json     |   4 +--
 util/.swcrc               |  18 ------------
 webrtc/.swcrc             |  12 --------
 13 files changed, 55 insertions(+), 79 deletions(-)
 delete mode 100644 api/.swcrc
 delete mode 100644 bundle/.swcrc
 delete mode 100644 util/.swcrc
 delete mode 100644 webrtc/.swcrc

diff --git a/.gitignore b/.gitignore
index c302ad40..f67723af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ dist/
 node_modules
 api/assets/*.js
 api/assets/*.css
-database.db
\ No newline at end of file
+database.db
+tsconfig.tsbuildinfo
\ No newline at end of file
diff --git a/api/.swcrc b/api/.swcrc
deleted file mode 100644
index 794efbd7..00000000
--- a/api/.swcrc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"module": {
-		"type": "commonjs"
-	},
-	"jsc": {
-		"parser": {
-			"syntax": "typescript",
-			"decorators": true
-		},
-		"target": "es2021",
-		"baseUrl": "./",
-		"paths": {
-			"@fosscord/api": ["src/index.ts"],
-			"@fosscord/api/*": ["src/*"]
-		}
-	}
-}
diff --git a/api/package-lock.json b/api/package-lock.json
index 2af8c7b95e0e39fe02736cc70b5e6c081aff71ce..f4e7506c84cdfd84def723a016c0bbac6c6a6d67 100644
GIT binary patch
delta 85
zcmZ2K&9Ql!<A!bA(|4}mtZVk-Y4_q`1Y#y2W(HywAZ7((HXvpPVvg-zJe-kp+JUNp
Wm<x!xftUw~d4ZU3`_2{oWs3m&NguTU

delta 141
zcmZpk=D2>E<A!bAe8uI-N>&O=afW&ZdWMFR8(EyEM@n(<HUH;s|If_`#7scU48$xz
z%nHP8K+F!r9NYhMbN0=_Wx(YB+@_OrIXS1_TgA!KuCS65h`E568;C)CULfY%uCS8-
G@j?K<T`{o$

diff --git a/bundle/.swcrc b/bundle/.swcrc
deleted file mode 100644
index 9a89b49d..00000000
--- a/bundle/.swcrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"module": {
-		"type": "commonjs"
-	},
-	"jsc": {
-		"parser": {
-			"syntax": "typescript",
-			"decorators": true
-		},
-		"target": "es2021"
-	}
-}
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index dd80d787e4cba53a5e26d0a5239417653c6deef4..cb8078dee537874015689ba58490795f5a7aac69 100644
GIT binary patch
delta 4266
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

delta 929
zcmZWnT}V_x80EX}uKVNNy&BfKsipY8rF(^n?5dk<QbZBH2nM>4j}=0Z_+YJ37J(vs
z;XGKlYMP3FH0G#SRwR|0iDl7?(Mu2#ri5r>G<TOUuTL{`&iUq?Z@w9*Gd-F&*3XkC
zg<zs~sFSRhD$d1c?Ts&y(_QJZOl*Y^MOk>UPD?BnLp*ivoYoR_$x&{g(Mh)|v2njd
zTbouwFxMl~k=8sw*WqlM+U5oo!I-u*I?(P=Q5n6RPU`4L3^3H&$t6t%GWvQl=+7=|
zP~z*!Bq`IdjFSf>tX7WWR96D-?bTy)#~Cc|GpKvwe+P}&)f>wl6jeZS$H79*&%hc+
z_s3za5<nYfA(Y<jx2tw45KC^4gGh#FVTl)u=<>L!Og{-~G@3e?uclFOV<?G^v4~)r
znF0&l81e*L;Rnvz>5Y-<F#7y;ejM#tsM*2F1xN%os)Ni#R_TOQE1oQp(0f^ASF<47
z@Gv6}bfokwnAnFCP$p`gn7N9eK12he)$U>I#o*gUEIDe}S_yn9BhKr5G@`#yAhtO$
z;`bIY@I>l5-*O+PZc4;^5$xpI1ZNe07^!##i)yq@m?$s7hSv^;qx4w8oCl!|Z$OWI
zZTE<!0#ejU2}j#k$dP0SRxu9QKy%6BB&=?S3`Bg(r?_zCf4@D`u&$AE$b{}@J*IV>
z+B)B@rQF4^Ip)nsf&Pff(%OCijbZmJ{LyIH#Ctd<XmlALx$a-nM#7Iq9AhinRYvp;
z>oH~ccR<bVd<M5=@Ee@o&A);0R3fF3!Vi|SOZXLoFA^e2ofDRc|0_h0hJ9dX7Y+#y
VGns3KC{}+|=++s`rYdul`7e<tWwihR

diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js
index ba559ecf..9939558d 100644
--- a/bundle/scripts/build.js
+++ b/bundle/scripts/build.js
@@ -1,8 +1,7 @@
 const { spawn } = require("child_process");
 const path = require("path");
-const { performance } = require("perf_hooks");
 const fs = require("fs");
-const esbuildPluginTsc = require("esbuild-plugin-tsc");
+const { performance } = require("perf_hooks");
 
 let parts = "api,cdn,gateway,bundle".split(",");
 const tscBin = path.join(__dirname, "..", "..", "util", "node_modules", "typescript", "bin", "tsc");
@@ -13,17 +12,49 @@ const swcBin = path.join(__dirname, "..", "..", "util", "node_modules", "@swc",
 function buildPackage(dir) {
 	const element = path.basename(dir);
 
-	require("esbuild").build({
+	return require("esbuild").build({
 		entryPoints: walk(path.join(dir, "src")),
 		bundle: false,
 		outdir: path.join(dir, "dist"),
 		target: "es2021",
-		format: "cjs",
-		plugins: [esbuildPluginTsc({})],
-		keepNames: true,
+		// plugins don't really work because bundle is false
+		keepNames: false,
+		tsconfig: path.join(dir, "tsconfig.json"),
 	});
 }
 
+const importPart = /import (\* as )?(({[^}]+})|(\w+)) from ("[.\w-/@q]+")/g;
+const importMod = /import ("[\w-/@q.]+")/g;
+const exportDefault = /export default/g;
+const exportAllAs = /export \* from (".+")/g;
+const exportMod = /export ({[\w, ]+})/g;
+const exportConst = /export (const|var|let) (\w+)/g;
+const exportPart = /export ((async )?\w+) (\w+)/g;
+
+// resolves tsconfig paths + rewrites es6 imports/exports to require (because esbuild/swc doesn't work properly)
+function transpileFiles() {
+	for (const part of ["gateway", "api", "cdn", "bundle"]) {
+		const files = walk(path.join(__dirname, "..", "..", part, "dist"));
+		for (const file of files) {
+			let content = fs.readFileSync(file, { encoding: "utf8" });
+			console.log(file);
+			content = content
+				.replaceAll(
+					`@fosscord/${part}`,
+					path.relative(file, path.join(__dirname, "..", "..", part, "dist")).slice(3)
+				)
+				.replace(importPart, `const $2 = require($5)`)
+				.replace(importMod, `require($1)`)
+				.replace(exportDefault, `module.exports =`)
+				.replace(exportAllAs, `module.exports = {...(module.exports)||{}, ...require($1)}`)
+				.replace(exportMod, "module.exports = $1")
+				.replace(exportConst, `let $2 = {};\nmodule.exports.$2 = $2`)
+				.replace(exportPart, `module.exports.$3 = $1 $3`);
+			fs.writeFileSync(file, content);
+		}
+	}
+}
+
 function util() {
 	// const child = spawn("node", `${swcBin}  src --out-dir dist --sync`.split(" "), {
 	const child = spawn("node", `${tscBin} -b .`.split(" "), {
@@ -41,13 +72,16 @@ function util() {
 }
 
 const start = performance.now();
-console.log("[Build] starting ...");
 
-util();
-for (const part of parts) {
-	buildPackage(path.join(__dirname, "..", "..", part));
+async function main() {
+	console.log("[Build] starting ...");
+	util();
+	await Promise.all(parts.map((part) => buildPackage(path.join(__dirname, "..", "..", part))));
+	transpileFiles();
 }
 
+main();
+
 process.on("exit", () => {
 	console.log("[Build] took " + Math.round(performance.now() - start) + "ms");
 });
@@ -61,7 +95,7 @@ function walk(dir) {
 		if (stat && stat.isDirectory()) {
 			/* Recurse into a subdirectory */
 			results = results.concat(walk(file));
-		} else if (file.endsWith(".ts")) {
+		} else if (file.endsWith(".ts") || file.endsWith(".js")) {
 			/* Is a file */
 			results.push(file);
 		}
diff --git a/bundle/tsconfig.json b/bundle/tsconfig.json
index b300a426..69725244 100644
--- a/bundle/tsconfig.json
+++ b/bundle/tsconfig.json
@@ -65,6 +65,7 @@
 		"skipLibCheck": true /* Skip type checking of declaration files. */,
 		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
 		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true
+		"experimentalDecorators": true,
+		"baseUrl": "."
 	}
 }
diff --git a/cdn/tsconfig.json b/cdn/tsconfig.json
index c80d16fd..249dffff 100644
--- a/cdn/tsconfig.json
+++ b/cdn/tsconfig.json
@@ -4,7 +4,7 @@
 		/* Visit https://aka.ms/tsconfig.json to read more about this file */
 
 		/* Basic Options */
-		"incremental": true,                   /* Enable incremental compilation */
+		"incremental": true /* Enable incremental compilation */,
 		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
 		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
 		"lib": ["ES2015", "dom"] /* Specify library files to be included in the compilation. */,
@@ -68,7 +68,7 @@
 		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
 		"baseUrl": ".",
 		"paths": {
-			"@fosscord/cdn/": ["src/index"],
+			"@fosscord/cdn": ["src/index"],
 			"@fosscord/cdn/*": ["src/*"]
 		},
 		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
diff --git a/gateway/.swcrc b/gateway/.swcrc
index 3079a89f..e8cbb8a1 100644
--- a/gateway/.swcrc
+++ b/gateway/.swcrc
@@ -7,11 +7,10 @@
 			"syntax": "typescript",
 			"decorators": true
 		},
-		"target": "es2021",
+		"target": "es5",
 		"baseUrl": ".",
 		"paths": {
-			"@fosscord/gateway": ["src/index"],
-			"@fosscord/gateway/*": ["src/*"]
+			"@fosscord/gateway": ["src/index"]
 		}
 	}
 }
diff --git a/gateway/package-lock.json b/gateway/package-lock.json
index 38962a2a11605ae052a16a760ba422a2f0d1f664..07ae02f9ad19037f4ca5f602eca03aa0552e3189 100644
GIT binary patch
delta 63
zcmX^6RAJ#$g$@7Mrdyn36P(`L!&2Hji@kjoJ0lP?0WtITS?nxlTENonKxrUm1!A`C
Jy*=y>%K%x88Lj{T

delta 83
zcmZ4ZRN?GXg$@7M_=?Mum8=w$;tcf+^b8HBd-SmMHMg+0x3Dt;F%u9oZ*O5|In#os
TupOunh*^P{ZM#Pgd*m_zzakr_

diff --git a/gateway/tsconfig.json b/gateway/tsconfig.json
index e2ac5b0b..2ad38f93 100644
--- a/gateway/tsconfig.json
+++ b/gateway/tsconfig.json
@@ -5,7 +5,7 @@
 		/* Visit https://aka.ms/tsconfig.json to read more about this file */
 
 		/* Basic Options */
-		"incremental": true,                   /* Enable incremental compilation */
+		"incremental": true /* Enable incremental compilation */,
 		"target": "ES2020" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
 		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
 		"lib": ["ES2015", "ES2020.BigInt", "DOM"] /* Specify library files to be included in the compilation. */,
@@ -70,7 +70,7 @@
 		"resolveJsonModule": true,
 		"baseUrl": ".",
 		"paths": {
-			"@fosscord/gateway": ["src/index"],
+			"@fosscord/gateway": ["src/index.ts"],
 			"@fosscord/gateway/*": ["src/*"]
 		},
 		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
diff --git a/util/.swcrc b/util/.swcrc
deleted file mode 100644
index a723d37f..00000000
--- a/util/.swcrc
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"module": {
-		"type": "commonjs"
-	},
-	"jsc": {
-		"parser": {
-			"syntax": "typescript",
-			"decorators": true
-		},
-		"target": "es2021",
-		"transform": {
-			"legacyDecorator": true,
-			"decoratorMetadata": true
-		},
-		"keepClassNames": true,
-		"loose": true
-	}
-}
diff --git a/webrtc/.swcrc b/webrtc/.swcrc
deleted file mode 100644
index 9a89b49d..00000000
--- a/webrtc/.swcrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"module": {
-		"type": "commonjs"
-	},
-	"jsc": {
-		"parser": {
-			"syntax": "typescript",
-			"decorators": true
-		},
-		"target": "es2021"
-	}
-}