Fix TS warning and improve formatting

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v5.0.1
+
+-   Fixed a Typescript warning and minor formatting issues.
+
 # v5.0.0
 
 -   Removed Zere's Plugin Library support.

bin/config/rollup.ts

@@ -15,11 +15,13 @@ import replace, { RollupReplaceOptions } from "@rollup/plugin-replace";
 import svgr from "@svgr/rollup";
 import esbuild from "rollup-plugin-esbuild";
 import styles from "rollup-plugin-styles";
+import cleanup from "rollup-plugin-cleanup";
 import styleLoader from "../plugins/styleloader";
 import text from "../plugins/text";
 import moduleComments from "../plugins/modulecomments";
 import constPlugin from "../plugins/const";
 import expandedStyles from "../plugins/expandedstyles";
+import compressedTemplates from "../plugins/compressedtemplates";
 
 type AliasEntry = { find: RegExp; replacement: string };
 
@@ -157,6 +159,8 @@ export default function getRollupConfig(options: BundleBDOptions, pluginConfig:
 			}),
 			constPlugin({ regex: constRegex }),
 			replace(createReplaced(globals)),
+			cleanup({ extensions: ["js", "ts", "jsx", "tsx"] }),
+			compressedTemplates({ regex: /(\.jsx?$)|(\.tsx?$)/ }),
 			options.format.moduleComments && moduleComments({ root: entryDir, aliases: options.importAliases }),
 			options.importAliases &&
 				alias({

bin/plugins/compressedtemplates.ts

@@ -0,0 +1,16 @@
+import { Plugin } from "rollup";
+
+interface CompressedTemplatesOptions {
+	regex: RegExp;
+}
+
+export default function compressedTemplates(options: CompressedTemplatesOptions): Plugin {
+	return {
+		name: "compressed-templates",
+		transform(code: string, id: string) {
+			if (options.regex.test(id)) {
+				return code.replace(/`(.*?[^\\])`/gs, (_, contents) => `\`${contents.replace(/\n/g, "\\n")}\``);
+			}
+		},
+	};
+}

bin/plugins/expandedstyles.ts

@@ -12,7 +12,8 @@ export default function expandedStyles(options: ExpandedStylesOptions): Plugin {
 				const unescaped: string = JSON.parse(JSON.stringify(code).replace(/\\\\/g, "\\"));
 				return unescaped
 					.replace(/\t/g, "  ")
-					.replace(/css = "(.*\n.*)";/s, (_, contents) => `css = \`\n${contents.trimEnd()}\n\`;`)
+					.replace(/\n+/g, "\n")
+					.replace(/css = "(.*\n.*)";/s, (_, contents) => `css = \`\n${contents.trimEnd()}\`;`)
 					.replace(
 						/modules(.*) = ({.*});/,
 						(_, id, obj) => `modules${id} = ${JSON.stringify(JSON.parse(obj), null, "  ")};`

package.json

@@ -47,6 +47,7 @@
 		"@types/bdapi": "github:zerthox/betterdiscord-types",
 		"less": "^4.1.3",
 		"rollup": "^2.79.1",
+		"rollup-plugin-cleanup": "^3.2.1",
 		"rollup-plugin-esbuild": "^4.10.1",
 		"rollup-plugin-styles": "^4.0.0",
 		"sass": "^1.53.0",

tsconfig.json

@@ -1,5 +1,7 @@
 {
 	"compilerOptions": {
+		"target": "es2022",
+		"moduleResolution": "node",
 		"resolveJsonModule": true,
 		"esModuleInterop": true,
 		"skipLibCheck": true

types/global.d.ts

@@ -1,6 +1,7 @@
 declare module "betterdiscord" {
 	import type { BoundBdApi } from "bdapi";
 	const BdApi: BoundBdApi;
+	// @ts-ignore
 	export = BdApi;
 	export * from "bdapi/plugin";
 	export {