remove vendor dir

Author: khassel

.github/dependabot.yaml

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

.gitignore

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

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", "css/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

@@ -13,7 +13,10 @@
     <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="vendor/node_modules/animate.css/animate.min.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">
@@ -42,10 +45,13 @@
     </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="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="modules/default/defaultmodules.js"></script>
     <script type="text/javascript" src="modules/default/utils.js"></script>
     <script type="text/javascript" src="js/logger.js"></script>

index.html

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

js/loader.js

@@ -72,7 +72,7 @@ function Server (config) {
 			app.use(helmet(config.httpHeaders));
 			app.use("/js", express.static(__dirname));
 
-			let directories = ["/config", "/css", "/node_modules/@fontsource", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks"];
+			let directories = ["/config", "/css", "/node_modules", "/modules", "/translations", "/tests/configs", "/tests/mocks"];
 			for (const directory of directories) {
 				app.use(directory, express.static(path.resolve(global.root_path + directory)));
 			}

js/server.js

@@ -27,12 +27,11 @@
 		"config:check": "node js/check_config.js",
 		"install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev",
 		"install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",
-		"install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
-		"lint:css": "stylelint 'css/main.css' 'css/roboto.css' 'modules/default/**/*.css' 'vendor/*.css' --fix",
+		"lint:css": "stylelint 'css/main.css' 'css/roboto.css' 'css/font-awesome.css' 'modules/default/**/*.css' --fix",
 		"lint:js": "eslint --fix",
 		"lint:markdown": "markdownlint-cli2 . --fix",
 		"lint:prettier": "prettier . --write",
-		"postinstall": "node --run install-vendor && echo \"MagicMirror² installation finished successfully! \n\"",
+		"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",
@@ -46,7 +45,7 @@
 		"test": "NODE_ENV=test jest -i --forceExit",
 		"test:calendar": "node ./modules/default/calendar/debug.js",
 		"test:coverage": "NODE_ENV=test jest --coverage -i --verbose false --forceExit",
-		"test:css": "stylelint 'css/main.css' 'css/roboto.css' 'modules/default/**/*.css' 'vendor/*.css'",
+		"test:css": "stylelint 'css/main.css' 'css/roboto.css' 'css/font-awesome.css' 'modules/default/**/*.css'",
 		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
 		"test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit",
 		"test:js": "eslint",
@@ -61,10 +60,13 @@
 		"*.css": "stylelint --fix"
 	},
 	"dependencies": {
+		"@fortawesome/fontawesome-free": "^6.7.2",
 		"@fontsource/roboto": "^5.2.5",
 		"@fontsource/roboto-condensed": "^5.2.5",
 		"ajv": "^8.17.1",
+		"animate.css": "^4.1.1",
 		"console-stamp": "^3.1.2",
+		"croner": "^9.0.0",
 		"envsub": "^4.1.0",
 		"eslint": "^9.27.0",
 		"express": "^5.1.0",
@@ -75,12 +77,15 @@
 		"iconv-lite": "^0.6.3",
 		"module-alias": "^2.2.3",
 		"moment": "^2.30.1",
+		"moment-timezone": "^0.5.48",
 		"node-ical": "^0.20.1",
+		"nunjucks": "^3.2.4",
 		"pm2": "^6.0.6",
 		"socket.io": "^4.8.1",
 		"suncalc": "^1.9.0",
 		"systeminformation": "^5.26.1",
-		"undici": "^7.10.0"
+		"undici": "^7.10.0",
+		"weathericons": "^2.1.0"
 	},
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^4.2.0",