Merge branch 'develop' into translations

Author: KristjanESPERANTO

.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

@@ -33,6 +33,7 @@ planned for 2025-07-01
 - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789)
 - [refactor] Replace `ansis` with built-in function `util.styleText` (#3793)
 - [l10n] Complete translations (with the help of translation tools) (#3794)
+- [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795)
 
 ### Fixed
 
@@ -43,7 +44,7 @@ planned for 2025-07-01
 
 ### Updated
 
-- [core] Update dependencies incl. electron to v36 (#3774, #3788)
+- [core] Update dependencies including electron to v36 (#3774, #3788)
 
 ## [2.31.0] - 2025-04-01
 

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"]
 }

vendor/css/font-awesome.css css/font-awesome.cssvendor/css/font-awesome.css renamed to css/font-awesome.css

@@ -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>

fonts/roboto.css css/roboto.cssfonts/roboto.css renamed to css/roboto.css

@@ -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.