fix vendor.js

Author: khassel

CHANGELOG.md

@@ -32,6 +32,7 @@ planned for 2025-07-01
 - [workflow] Replace Node.js version v23 with v24 (#3770)
 - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789)
 - [refactor] Replace `ansis` with built-in function `util.styleText`
+- [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies
 
 ### Fixed
 

index.html

@@ -13,10 +13,7 @@
     <link rel="icon" href="data:;base64,iVBORw0KGgo=" />
     <link rel="stylesheet" type="text/css" href="css/main.css" />
     <link rel="stylesheet" type="text/css" href="css/roboto.css" />
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.css" />
     <link rel="stylesheet" type="text/css" href="node_modules/animate.css/animate.min.css" />
-    <link rel="stylesheet" type="text/css" href="node_modules/weathericons/css/weather-icons.css" />
-    <link rel="stylesheet" type="text/css" href="node_modules/weathericons/css/weather-icons-wind.css" />
     <!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. -->
 
     <script type="text/javascript">
@@ -48,10 +45,7 @@
     <script type="text/javascript" src="node_modules/nunjucks/browser/nunjucks.min.js"></script>
     <script type="text/javascript" src="js/defaults.js"></script>
     <script type="text/javascript" src="#CONFIG_FILE#"></script>
-    <script type="text/javascript" src="node_modules/moment/min/moment-with-locales.js"></script>
-    <script type="text/javascript" src="node_modules/moment-timezone/builds/moment-timezone-with-data.js"></script>
-    <script type="text/javascript" src="node_modules/suncalc/suncalc.js"></script>
-    <script type="text/javascript" src="node_modules/croner/dist/croner.umd.js"></script>
+    <script type="text/javascript" src="js/vendor.js"></script>
     <script type="text/javascript" src="modules/default/defaultmodules.js"></script>
     <script type="text/javascript" src="modules/default/utils.js"></script>
     <script type="text/javascript" src="js/logger.js"></script>

js/loader.js

@@ -1,4 +1,4 @@
-/* global defaultModules */
+/* global defaultModules, vendor */
 
 const Loader = (function () {
 
@@ -238,7 +238,7 @@ const Loader = (function () {
 
 		/**
 		 * Load a file (script or stylesheet).
-		 * Prevent double loading.
+		 * Prevent double loading and search for files in the vendor folder.
 		 * @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
@@ -256,6 +256,13 @@ const Loader = (function () {
 				return loadFile(fileName);
 			}
 
+			if (vendor[fileName] !== undefined) {
+				// This file is available in the vendor folder.
+				// Load it from this vendor folder.
+				loadedFiles.push(fileName.toLowerCase());
+				return loadFile(`${vendor[fileName]}`);
+			}
+
 			// File not loaded yet.
 			// Load it based on the module path.
 			loadedFiles.push(fileName.toLowerCase());

js/vendor.js

@@ -0,0 +1,13 @@
+const vendor = {
+	"moment.js": "node_modules/moment/min/moment-with-locales.js",
+	"moment-timezone.js": "node_modules/moment-timezone/builds/moment-timezone-with-data.js",
+	"weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
+	"weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
+	"font-awesome.css": "css/font-awesome.css",
+	"suncalc.js": "node_modules/suncalc/suncalc.js",
+	"croner.js": "node_modules/croner/dist/croner.umd.js"
+};
+
+if (typeof module !== "undefined") {
+	module.exports = vendor;
+}

package-lock.json

@@ -31,7 +31,6 @@
 		"lint:js": "eslint --fix",
 		"lint:markdown": "markdownlint-cli2 . --fix",
 		"lint:prettier": "prettier . --write",
-		"postinstall": "echo \"MagicMirror² installation finished successfully! \n\"",
 		"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed.",
 		"server": "node ./serveronly",
 		"start": "node --run start:x11",
@@ -60,9 +59,9 @@
 		"*.css": "stylelint --fix"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-free": "^6.7.2",
 		"@fontsource/roboto": "^5.2.5",
 		"@fontsource/roboto-condensed": "^5.2.5",
+		"@fortawesome/fontawesome-free": "^6.7.2",
 		"ajv": "^8.17.1",
 		"animate.css": "^4.1.1",
 		"console-stamp": "^3.1.2",

package.json

@@ -0,0 +1,30 @@
+const helpers = require("./helpers/global-setup");
+
+describe("Vendors", () => {
+	beforeAll(async () => {
+		await helpers.startApplication("tests/configs/default.js");
+	});
+	afterAll(async () => {
+		await helpers.stopApplication();
+	});
+
+	describe("Get list vendors", () => {
+		const vendors = require(`${__dirname}/../../js/vendor.js`);
+
+		Object.keys(vendors).forEach((vendor) => {
+			it(`should return 200 HTTP code for vendor "${vendor}"`, async () => {
+				const urlVendor = `http://localhost:8080/${vendors[vendor]}`;
+				const res = await fetch(urlVendor);
+				expect(res.status).toBe(200);
+			});
+		});
+
+		Object.keys(vendors).forEach((vendor) => {
+			it(`should return 404 HTTP code for vendor https://localhost/xx/"${vendor}"`, async () => {
+				const urlVendor = `http://localhost:8080/xx/${vendors[vendor]}`;
+				const res = await fetch(urlVendor);
+				expect(res.status).toBe(404);
+			});
+		});
+	});
+});