Merge branch 'develop' into update-subclass-language-use-override

Author: KristjanESPERANTO

.github/CONTRIBUTING.md

@@ -30,9 +30,19 @@ To run markdownlint, use `node --run lint:markdown`.
 
 ## Testing
 
-We use [Jest](https://jestjs.io) for JavaScript testing.
+We use [Vitest](https://vitest.dev) for JavaScript testing.
 
 To run all tests, use `node --run test`.
 
-The specific test commands are defined in `package.json`.
-So you can also run the specific tests with other commands, e.g. `node --run test:unit` or `npx jest tests/e2e/env_spec.js`.
+The `package.json` scripts expose finer-grained test commands:
+
+- `test:unit` – run unit tests only
+- `test:e2e` – execute browser-driven end-to-end tests
+- `test:electron` – launch the Electron-based regression suite
+- `test:coverage` – collect coverage while running every suite
+- `test:watch` – keep Vitest in watch mode for fast local feedback
+- `test:ui` – open the Vitest UI dashboard (needs OS file-watch support enabled)
+- `test:calendar` – run the legacy calendar debug helper
+- `test:css`, `test:markdown`, `test:prettier`, `test:spelling`, `test:js` – lint-only scripts that enforce formatting, spelling, markdown style, and ESLint.
+
+You can invoke any script with `node --run <script>` (or `npm run <script>`). Individual files can still be targeted directly, e.g. `npx vitest run tests/e2e/env_spec.js`.

.github/workflows/automated-tests.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v5
       - name: "Use Node.js"
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           cache: "npm"
@@ -38,7 +38,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        node-version: [22.18.0, 22.x, 24.x]
+        node-version: [22.20.0, 22.x, 24.x]
     steps:
       - name: Install electron dependencies and labwc
         run: |
@@ -47,7 +47,7 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v5
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true

.github/workflows/electron-rebuild.yaml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [22.18.0, 22.x, 24.x]
+        node-version: [22.20.0, 22.x, 24.x]
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true

.github/workflows/spellcheck.yaml

@@ -19,7 +19,7 @@ jobs:
         with:
           ref: develop
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           check-latest: true

.gitignore

@@ -88,3 +88,6 @@ js/positions.js
 # Ignore lock files other than package-lock.json
 pnpm-lock.yaml
 yarn.lock
+
+# Vitest temporary test files
+tests/**/.tmp/

CHANGELOG.md

@@ -13,18 +13,29 @@ planned for 2026-01-01
 
 ### Added
 
+- [weather] feat: add configurable forecast date format option (#3918)
+- [core] Add new `server:watch` script to run MagicMirror² server-only with automatic restarts when files (defined in `config.watchTargets`) change (#3920)
+
 ### Changed
 
 - [core] refactor: replace `module-alias` dependency with internal alias resolver (#3893)
+- [check_config] refactor: improve error handling (#3927)
+- [calendar] test: remove "Recurring event per timezone" test (#3929)
+- [calendar] chore: remove `requiresVersion: "2.1.0"` (#3932)
+- [tests] migrate from `jest` to `vitest` (#3940)
 
 ### Fixed
 
 - feat: add ESlint rule `no-sparse-arrays` for config check to fix #3910 (#3911)
 - fixed eslint warnings shown in #3911 and updated npm publish docs (#3913)
+- [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed.
+- fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0
+- fixed problems with daylight-saving-time in weather provider `openmeto` (#3930, #3931)
 
 ### Updated
 
-- [core] Update dependencies (#3909)
+- [core] Update dependencies (#3909, #3916, #3921, #3925, #3934)
+- [logger] Add prefixes to most Log messages (#3923, #3926)
 
 ## [2.33.0] - 2025-10-01
 
@@ -355,7 +366,7 @@ For more info, please read the following post: [A New Chapter for MagicMirror: T
 ### Fixed
 
 - [weather] Correct apiBase of weathergov weatherProvider to match documentation (#2926)
-- Worked around several issues in the RRULE library that were causing deleted calender events to still show, some
+- Worked around several issues in the RRULE library that were causing deleted calendar events to still show, some
   initial and recurring events to not show, and some event times to be off an hour. (#3291)
 - Skip changelog requirement when running tests for dependency updates (#3320)
 - Display precipitation probability when it is 0% instead of blank/empty (#3345)

Collaboration.md

@@ -36,7 +36,7 @@ Are done by
   - [ ] test `prep-release` branch
   - [ ] update `CHANGELOG.md`
     - [ ] add all contributor names: `...`
-    - [ ] add min. node version: > ⚠️ This release needs nodejs version `v22.18.0` or higher
+    - [ ] add min. node version: > ⚠️ This release needs nodejs version `v22.20.0` or higher
     - [ ] check release link at the bottom of the file
   - [ ] commit and push all changes
   - [ ] create pull request from `prep-release` to `develop` branch with title `Prepare Release 2.xx.0`

eslint.config.mjs

@@ -1,11 +1,11 @@
 import {defineConfig, globalIgnores} from "eslint/config";
 import globals from "globals";
 import {flatConfigs as importX} from "eslint-plugin-import-x";
-import jest from "eslint-plugin-jest";
 import js from "@eslint/js";
 import jsdocPlugin from "eslint-plugin-jsdoc";
 import packageJson from "eslint-plugin-package-json";
 import stylistic from "@stylistic/eslint-plugin";
+import vitest from "eslint-plugin-vitest";
 
 export default defineConfig([
 	globalIgnores(["config/**", "modules/**/*", "!modules/default/**", "js/positions.js"]),
@@ -16,15 +16,16 @@ export default defineConfig([
 			globals: {
 				...globals.browser,
 				...globals.node,
+				...vitest.environments.env.globals,
 				Log: "readonly",
 				MM: "readonly",
 				Module: "readonly",
 				config: "readonly",
 				moment: "readonly"
 			}
 		},
-		plugins: {js, stylistic},
-		extends: [importX.recommended, jest.configs["flat/recommended"], "js/recommended", jsdocPlugin.configs["flat/recommended"], "stylistic/all"],
+		plugins: {js, stylistic, vitest},
+		extends: [importX.recommended, vitest.configs.recommended, "js/recommended", jsdocPlugin.configs["flat/recommended"], "stylistic/all"],
 		rules: {
 			"@stylistic/array-element-newline": ["error", "consistent"],
 			"@stylistic/arrow-parens": ["error", "always"],
@@ -57,12 +58,9 @@ export default defineConfig([
 			"import-x/newline-after-import": "error",
 			"import-x/order": "error",
 			"init-declarations": "off",
-			"jest/consistent-test-it": "warn",
-			"jest/no-done-callback": "warn",
-			"jest/prefer-expect-resolves": "warn",
-			"jest/prefer-mock-promise-shorthand": "warn",
-			"jest/prefer-to-be": "warn",
-			"jest/prefer-to-have-length": "warn",
+			"vitest/consistent-test-it": "warn",
+			"vitest/prefer-to-be": "warn",
+			"vitest/prefer-to-have-length": "warn",
 			"max-lines-per-function": ["warn", 400],
 			"max-statements": "off",
 			"no-global-assign": "off",

js/animateCSS.js

@@ -132,7 +132,7 @@ function addAnimateCSS (element, animation, animationTime) {
 	const node = document.getElementById(element);
 	if (!node) {
 		// don't execute animate: we don't find div
-		Log.warn("addAnimateCSS: node not found for", element);
+		Log.warn("node not found for adding", element);
 		return;
 	}
 	node.style.setProperty("--animate-duration", `${animationTime}s`);
@@ -149,7 +149,7 @@ function removeAnimateCSS (element, animation) {
 	const node = document.getElementById(element);
 	if (!node) {
 		// don't execute animate: we don't find div
-		Log.warn("removeAnimateCSS: node not found for", element);
+		Log.warn("node not found for removing", element);
 		return;
 	}
 	node.classList.remove("animate__animated", animationName);

js/app.js

@@ -15,7 +15,7 @@ const Utils = require(`${__dirname}/utils`);
 const defaultModules = require(`${global.root_path}/modules/default/defaultmodules`);
 // used to control fetch timeout for node_helpers
 const { setGlobalDispatcher, Agent } = require("undici");
-const { getEnvVarsAsObj } = require("#server_functions");
+const { getEnvVarsAsObj, getConfigFilePath } = require("#server_functions");
 // common timeout value, provide environment override in case
 const fetch_timeout = process.env.mmFetchTimeout !== undefined ? process.env.mmFetchTimeout : 30000;
 
@@ -65,14 +65,14 @@ function App () {
 	async function loadConfig () {
 		Log.log("Loading config ...");
 		const defaults = require(`${__dirname}/defaults`);
-		if (process.env.JEST_WORKER_ID !== undefined) {
-			// if we are running with jest
+		if (global.mmTestMode) {
+			// if we are running in test mode
 			defaults.address = "0.0.0.0";
 		}
 
 		// For this check proposed to TestSuite
 		// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
-		const configFilename = path.resolve(global.configuration_file || `${global.root_path}/config/config.js`);
+		const configFilename = getConfigFilePath();
 		let templateFile = `${configFilename}.template`;
 
 		// check if templateFile exists
@@ -185,10 +185,10 @@ function App () {
 
 		if (defaultModules.includes(moduleName)) {
 			const defaultModuleFolder = path.resolve(`${global.root_path}/modules/default/`, module);
-			if (process.env.JEST_WORKER_ID === undefined) {
+			if (!global.mmTestMode) {
 				moduleFolder = defaultModuleFolder;
 			} else {
-				// running in Jest, allow defaultModules placed under moduleDir for testing
+				// running in test mode, allow defaultModules placed under moduleDir for testing
 				if (env.modulesDir === "modules" || env.modulesDir === "tests/mocks") {
 					moduleFolder = defaultModuleFolder;
 				}