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

Author: KristjanESPERANTO

.gitignore

@@ -9,8 +9,7 @@ lib-cov
 coverage
 .lock-wscript
 build/Release
-/node_modules/**/*
-!/tests/node_modules/**/*
+node_modules
 jspm_modules
 .npm
 .node_repl_history
@@ -56,21 +55,15 @@ Temporary Items
 .Trash-*
 
 # Ignore all modules except the default modules.
-/modules/**
-!/modules/default
-!/modules/default/**
-!/modules/README.md**
+modules
+!modules/default
 
-# Ignore changes to the custom css files but keep the sample and main.
-/css/*
-!/css/custom.css.sample
-!/css/main.css
-!/css/roboto.css
-!/css/font-awesome.css
+# Ignore changes to the custom css files but keep others.
+css/custom.css
 
 # Ignore users config file but keep the sample.
-/config/*
-!/config/config.js.sample
+config
+!config/config.js.sample
 
 # Vim
 ## swap

CHANGELOG.md

@@ -16,6 +16,10 @@ planned for 2026-01-01
 - [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)
 
+### Removed
+
+- [weather] Removed deprecated ukmetoffice datapoint provider (#3842, #3952)
+
 ### Changed
 
 - [core] refactor: replace `module-alias` dependency with internal alias resolver (#3893)
@@ -25,6 +29,7 @@ planned for 2026-01-01
 - [tests] migrate from `jest` to `vitest` (#3940, #3941)
 - [ci] Add concurrency to automated tests workflow to cancel outdated runs (#3943)
 - [tests] replace `node-libgpiod` with `serialport` in electron-rebuild workflow (#3945)
+- [calendar] hide repeatingCountTitle if the event count is zero (#3949)
 - [weatherprovider] update override warning wording (#3914)
 
 ### Fixed
@@ -34,10 +39,11 @@ planned for 2026-01-01
 - [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)
+- [newsfeed] fixed header layout issue introduced with prettier njk linting (#3946)
 
 ### Updated
 
-- [core] Update dependencies (#3909, #3916, #3921, #3925, #3934)
+- [core] Update dependencies incl. electron to v39 (#3909, #3916, #3921, #3925, #3934)
 - [logger] Add prefixes to most Log messages (#3923, #3926)
 
 ## [2.33.0] - 2025-10-01

modules/default/calendar/calendar.js

@@ -330,7 +330,9 @@ Module.register("calendar", {
 					const thisYear = eventStartDateMoment.year(),
 						yearDiff = thisYear - event.firstYear;
 
-					repeatingCountTitle = `, ${yearDiff} ${repeatingCountTitle}`;
+					if (yearDiff > 0) {
+						repeatingCountTitle = `, ${yearDiff} ${repeatingCountTitle}`;
+					}
 				}
 			}
 

modules/default/newsfeed/newsfeed.njk

@@ -40,7 +40,7 @@
           {% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %}
             <div class="newsfeed-source light small dimmed">
               {% if item.sourceTitle and config.showSourceTitle %}
-                {{ item.sourceTitle }}{% if config.showPublishDate %},{% else %}:{% endif %}
+                {{ item.sourceTitle }}{% if config.showPublishDate %},&nbsp;{% else %}:{% endif %}
               {% endif %}
               {% if config.showPublishDate %}{{ item.publishDate }}:{% endif %}
             </div>
@@ -63,7 +63,7 @@
       {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
         <div class="newsfeed-source light small dimmed">
           {% if sourceTitle and config.showSourceTitle %}
-            {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %},{% else %}:{% endif %}
+            {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %},&nbsp;{% else %}:{% endif %}
           {% endif %}
           {% if config.showPublishDate %}{{ publishDate }}:{% endif %}
         </div>

modules/default/weather/providers/ukmetoffice.js

@@ -11,8 +11,9 @@ describe("Electron app environment", () => {
 	});
 
 	it("should open browserwindow", async () => {
-		const module = await helpers.getElement("#module_0_helloworld");
-		await expect(module.textContent()).resolves.toContain("Test Display Header");
+		// Wait for module content to be rendered, not just the module wrapper
+		const moduleContent = await helpers.getElement("#module_0_helloworld .module-content");
+		await expect(moduleContent.textContent()).resolves.toContain("Test Display Header");
 		expect(global.electronApp.windows()).toHaveLength(1);
 	});
 });