refactor: replace Loader object with named exports

js/loader.js

@@ -249,60 +249,57 @@ function loadFile (fileName) {
 
 /* Public Methods */
 
-export const Loader = {
-
-	/**
-	 * Load all modules as defined in the config.
-	 */
-	async loadModules () {
-		const moduleData = await getModuleData();
-		const envVars = await getEnvVars();
-		const customCss = envVars.customCss;
-
-		// Load all modules
-		for (const module of moduleData) {
-			await loadModule(module);
-		}
+/**
+ * Load all modules as defined in the config.
+ */
+export async function loadModules () {
+	const moduleData = await getModuleData();
+	const envVars = await getEnvVars();
+	const customCss = envVars.customCss;
 
-		// Load custom.css
-		// Since this happens after loading the modules,
-		// it overwrites the default styles.
-		await loadFile(customCss);
+	// Load all modules
+	for (const module of moduleData) {
+		await loadModule(module);
+	}
 
-		// Start all modules.
-		await startModules();
-	},
+	// Load custom.css
+	// Since this happens after loading the modules,
+	// it overwrites the default styles.
+	await loadFile(customCss);
 
-	/**
-	 * Load a file (script or stylesheet).
-	 * Prevent double loading and search for files defined in js/vendor.js.
-	 * @param {string} fileName Path of the file we want to load.
-	 * @param {Module} module The module that calls the loadFile function.
-	 * @returns {Promise} resolved when the file is loaded
-	 */
-	loadFileForModule (fileName, module) {
-		if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
-			Log.log(`File already loaded: ${fileName}`);
-			return Promise.resolve();
-		}
+	// Start all modules.
+	await startModules();
+}
 
-		if (fileName.indexOf("http://") === 0 || fileName.indexOf("https://") === 0 || fileName.indexOf("/") !== -1) {
-			// This is an absolute or relative path.
-			// Load it and then return.
-			loadedFiles.push(fileName.toLowerCase());
-			return loadFile(fileName);
-		}
+/**
+ * Load a file (script or stylesheet).
+ * Prevent double loading and search for files defined in js/vendor.js.
+ * @param {string} fileName Path of the file we want to load.
+ * @param {Module} module The module that calls the loadFile function.
+ * @returns {Promise} resolved when the file is loaded
+ */
+export function loadFileForModule (fileName, module) {
+	if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
+		Log.log(`File already loaded: ${fileName}`);
+		return Promise.resolve();
+	}
 
-		if (vendor[fileName] !== undefined) {
-			// This file is defined in js/vendor.js.
-			// Load it from its location.
-			loadedFiles.push(fileName.toLowerCase());
-			return loadFile(`${vendor[fileName]}`);
-		}
+	if (fileName.indexOf("http://") === 0 || fileName.indexOf("https://") === 0 || fileName.indexOf("/") !== -1) {
+		// This is an absolute or relative path.
+		// Load it and then return.
+		loadedFiles.push(fileName.toLowerCase());
+		return loadFile(fileName);
+	}
 
-		// File not loaded yet.
-		// Load it based on the module path.
+	if (vendor[fileName] !== undefined) {
+		// This file is defined in js/vendor.js.
+		// Load it from its location.
 		loadedFiles.push(fileName.toLowerCase());
-		return loadFile(module.file(fileName));
+		return loadFile(`${vendor[fileName]}`);
 	}
-};
+
+	// File not loaded yet.
+	// Load it based on the module path.
+	loadedFiles.push(fileName.toLowerCase());
+	return loadFile(module.file(fileName));
+}

js/main.js

@@ -1,7 +1,7 @@
 /* global addAnimateCSS, removeAnimateCSS, AnimateCSSIn, AnimateCSSOut, modulePositions, io */
 
 // eslint-disable-next-line import-x/extensions
-import { Loader } from "./loader.js";
+import { loadModules } from "./loader.js";
 
 let modules = [];
 
@@ -573,7 +573,7 @@
 		Log.setLogLevel(config.logLevel);
 
 		await globalThis.Translator.loadCoreTranslations(config.language);
-		await Loader.loadModules();
+		await loadModules();
 	},
 
 	/**

js/module.js

@@ -1,7 +1,7 @@
 /* global nunjucks */
 
 // eslint-disable-next-line import-x/extensions
-import { Loader } from "./loader.js";
+import { loadFileForModule } from "./loader.js";
 // eslint-disable-next-line import-x/extensions
 import { MMSocket } from "./socketclient.js";
 
@@ -282,7 +282,7 @@
 		const loadNextDependency = async () => {
 			if (dependencies.length > 0) {
 				const nextDependency = dependencies[0];
-				await Loader.loadFileForModule(nextDependency, this);
+				await loadFileForModule(nextDependency, this);
 				dependencies = dependencies.slice(1);
 				await loadNextDependency();
 			} else {