simplify install and maintaining dependencies

.github/dependabot.yaml

@@ -18,23 +18,3 @@ updates:
       - "Skip Changelog"
       - "dependencies"
       - "javascript"
-
-  - package-ecosystem: "npm"
-    directory: "/vendor"
-    schedule:
-      interval: "monthly"
-    target-branch: "develop"
-    labels:
-      - "Skip Changelog"
-      - "dependencies"
-      - "javascript"
-
-  - package-ecosystem: "npm"
-    directory: "/fonts"
-    schedule:
-      interval: "monthly"
-    target-branch: "develop"
-    labels:
-      - "Skip Changelog"
-      - "dependencies"
-      - "javascript"

.gitignore

@@ -10,8 +10,6 @@ coverage
 .lock-wscript
 build/Release
 /node_modules/**/*
-fonts/node_modules/**/*
-vendor/node_modules/**/*
 !/tests/node_modules/**/*
 jspm_modules
 .npm
@@ -67,6 +65,8 @@ Temporary Items
 /css/*
 !/css/custom.css.sample
 !/css/main.css
+!/css/roboto.css
+!/css/font-awesome.css
 
 # Ignore users config file but keep the sample.
 /config/*

CHANGELOG.md

@@ -31,7 +31,8 @@ planned for 2025-07-01
   - Switch Stylelint config to flat format and simplify Stylelint scripts
 - [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`
+- [refactor] Replace `ansis` with built-in function `util.styleText` (#3793)
+- [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795)
 
 ### Fixed
 

cspell.config.json

@@ -244,6 +244,6 @@
 		"Ybbet",
 		"yearmatchgroup"
 	],
-	"ignorePaths": ["node_modules/**", "modules/**", "vendor/node_modules/**", "translations/**", "tests/mocks/**", "tests/e2e/modules/clock_es_spec.js", "fonts/roboto.css"],
+	"ignorePaths": ["node_modules/**", "modules/**", "translations/**", "tests/mocks/**", "tests/e2e/modules/clock_es_spec.js", "css/roboto.css"],
 	"dictionaries": ["node"]
 }

index.html

@@ -12,8 +12,8 @@
 
     <link rel="icon" href="data:;base64,iVBORw0KGgo=" />
     <link rel="stylesheet" type="text/css" href="css/main.css" />
-    <link rel="stylesheet" type="text/css" href="fonts/roboto.css" />
-    <link rel="stylesheet" type="text/css" href="vendor/node_modules/animate.css/animate.min.css" />
+    <link rel="stylesheet" type="text/css" href="css/roboto.css" />
+    <link rel="stylesheet" type="text/css" href="node_modules/animate.css/animate.min.css" />
     <!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. -->
 
     <script type="text/javascript">
@@ -42,10 +42,10 @@
     </div>
     <div class="region fullscreen above"><div class="container"></div></div>
     <script type="text/javascript" src="socket.io/socket.io.js"></script>
-    <script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script>
+    <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="vendor/vendor.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

@@ -260,7 +260,7 @@ const Loader = (function () {
 				// This file is available in the vendor folder.
 				// Load it from this vendor folder.
 				loadedFiles.push(fileName.toLowerCase());
-				return loadFile(`vendor/${vendor[fileName]}`);
+				return loadFile(`${vendor[fileName]}`);
 			}
 
 			// File not loaded yet.

js/server.js

@@ -6,10 +6,11 @@ const express = require("express");
 const ipfilter = require("express-ipfilter").IpFilter;
 const helmet = require("helmet");
 const socketio = require("socket.io");
-
 const Log = require("logger");
 const { cors, getConfig, getHtml, getVersion, getStartup, getEnvVars } = require("./server_functions");
 
+const vendor = require(`${__dirname}/vendor`);
+
 /**
  * Server
  * @param {object} config The MM config
@@ -72,8 +73,13 @@ function Server (config) {
 			app.use(helmet(config.httpHeaders));
 			app.use("/js", express.static(__dirname));
 
-			let directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks"];
-			for (const directory of directories) {
+			let directories = ["/config", "/css", "/modules", "/node_modules/animate.css", "/node_modules/@fontsource", "/node_modules/@fortawesome", "/translations", "/tests/configs", "/tests/mocks"];
+			for (const [key, value] of Object.entries(vendor)) {
+				const dirArr = value.split("/");
+				if (dirArr[0] === "node_modules") directories.push(`/${dirArr[0]}/${dirArr[1]}`);
+			}
+			const uniqDirs = [...new Set(directories)];
+			for (const directory of uniqDirs) {
 				app.use(directory, express.static(path.resolve(global.root_path + directory)));
 			}