Merge branch 'develop' into activitypub

src/controllers/api.js

@@ -89,7 +89,9 @@ apiController.loadConfig = async function (req) {
 			size: meta.config.topicThumbSize,
 		},
 		emailPrompt: meta.config.emailPrompt,
-		useragent: req.useragent,
+		useragent: {
+			isSafari: req.useragent.isSafari,
+		},
 		fontawesome: {
 			pro: fontawesome_pro,
 			styles: fontawesome_styles,

src/meta/templates.js

@@ -114,7 +114,7 @@ async function compile() {
 	let files = await plugins.getActive();
 	files = await getTemplateDirs(files);
 	files = await getTemplateFiles(files);
-
+	const minify = process.env.NODE_ENV !== 'development';
 	await Promise.all(Object.keys(files).map(async (name) => {
 		const filePath = files[name];
 		let imported = await fs.promises.readFile(filePath, 'utf8');
@@ -122,6 +122,11 @@ async function compile() {
 
 		await mkdirp(path.join(viewsPath, path.dirname(name)));
 
+		// remove empty lines and whitespace
+		if (minify) {
+			imported = imported.split('\n').map(line => line.trim()).filter(Boolean).join('\n');
+		}
+
 		await fs.promises.writeFile(path.join(viewsPath, name), imported);
 		const compiled = await Benchpress.precompile(imported, { filename: name });
 		await fs.promises.writeFile(path.join(viewsPath, name.replace(/\.tpl$/, '.js')), compiled);