Skip to content

Commit d05ea75

Browse files
khasselKristjanESPERANTObugsounetdependabot[bot]sdetweil
authored
Release 2.35.0 (#4072)
## Release Notes Thanks to: @angeldeejay, @in-voker, @JHWelch, @khassel, @KristjanESPERANTO, @rejas, @sdetweil > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.34.0](v2.34.0...v2.25.0) > ⚠️ We introduced some internal changes with this release, please read [this forum post](https://forum.magicmirror.builders/topic/20138/upcoming-release-april-1-2026-breaking-changes-some-operational-changes) before upgrading! ### [core] - Prepare Release 2.35.0 (#4071) - docs: add security policy and vulnerability reporting guidelines (#4069) - refactor: simplify internal `require()` calls (#4056) - allow environment variables in cors urls (#4033) - fix cors proxy getting binary data (e.g. png, webp) (#4030) - fix: correct secret redaction and optimize loadConfig (#4031) - change loading config.js, allow variables in config.js and try to protect sensitive data (#4029) - remove kioskmode (#4027) - Add dark theme logo (#4026) - move custom.css from css to config (#4020) - move default modules from /modules/default to /defaultmodules (#4019) - update node versions in workflows (#4018) - [core] refactor: extract and centralize HTTP fetcher (#4016) - fix systeminformation not displaying electron version (#4012) - Update node-ical and support it's rrule-temporal changes (#4010) - Change default start scripts from X11 to Wayland (#4011) - refactor: unify favicon for index.html and Electron (#4006) - [core] run systeminformation in subprocess so the info is always displayed (#4002) - set next release dev number (#4000) ### [dependencies] - update dependencies (#4068) - update dependencies incl. electron to v41 (#4058) - chore: upgrade ESLint to v10 and fix newly surfaced issues (#4057) - chore: update ESLint and plugins, simplify config, apply new rules (#4052) - chore: update dependencies + add exports, files, and sideEffects fields to package.json (#4040) - [core] refactor: enable ESLint rule require-await and handle detected issues (#4038) - Update node-ical and other deps (#4025) - chore: update dependencies (#4021) - chore(eslint): migrate from eslint-plugin-vitest to @vitest/eslint-plugin and run rules only on test files (#4014) - Update deps as requested by dependabot (#4008) - update Collaboration.md and dependencies (#4001) ### [logging] - refactor: further logger clean-up (#4050) - Fix Node.js v25 logging prefix and modernize logger (#4049) ### [modules/calendar] - fix(calendar): make showEnd behavior more consistent across time formats (#4059) - test(calendar): fix hardcoded date in event shape test (#4055) - [calendar] refactor: delegate event expansion to node-ical's expandRecurringEvent (#4047) - calendar.js: remove useless hasCalendarURL function (#4028) - fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup (#4013) - fix(calendar): correct day-of-week for full-day recurring events across all timezones (#4004) ### [modules/newsfeed] - fix(newsfeed): fix full article view and add framing check (#4039) - [newsfeed] refactor: migrate to centralized HTTPFetcher (#4023) ### [modules/weather] - fix(weather): fix openmeteo forecast stuck in the past (#4064) - fix(weather): fix weathergov forecast day labels off by one (#4065) - weather: fixes for templates (#4054) - weather: add possibility to override njk's and css (#4051) - Use getDateString in openmeteo (#4046) - [weather] refactor: migrate to server-side providers with centralized HTTPFetcher (#4032) - [weather] feat: add Weather API Provider (#4036) ### [testing] - chore: remove obsolete Jest config and unit test global setup (#4044) - replace template_spec test with config_variables test (#4034) - refactor(clientonly): modernize code structure and add comprehensive tests (#4022) - Switch to undici Agent for HTTPS requests (#4015) - chore: migrate CI workflows to ubuntu-slim for faster startup times (#4007) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
1 parent b742e83 commit d05ea75

File tree

294 files changed

+36065
-10383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+36065
-10383
lines changed

.github/SECURITY.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Security Policy
2+
3+
## Scope and Deployment
4+
5+
MagicMirror is primarily intended for trusted local/private network environments.
6+
Direct public exposure to the internet or other untrusted networks is not recommended.
7+
8+
We take security seriously and encourage responsible disclosure of vulnerabilities to help us improve the software.
9+
10+
## Reporting a Vulnerability
11+
12+
**Please keep vulnerability details private** — do not post them in public GitHub issues.
13+
14+
Instead, reach out privately via the MagicMirror forum to one of the core developers:
15+
16+
- [rejas](https://forum.magicmirror.builders/user/rejas)
17+
- [karsten13](https://forum.magicmirror.builders/user/karsten13)
18+
- [sdetweil](https://forum.magicmirror.builders/user/sdetweil)
19+
- [Kristjan](https://forum.magicmirror.builders/user/kristjanesperanto)
20+
21+
Please include, if possible:
22+
23+
- Affected version(s)
24+
- Reproduction steps or proof-of-concept
25+
- What could an attacker do with this?
26+
- Any ideas how to fix it?
27+
28+
## Coordinated Disclosure
29+
30+
We will keep reported vulnerabilities private until a fix is available and coordinate the disclosure timeline with you.
31+
We aim to respond as quickly as possible.

.github/workflows/automated-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
code-style-check:
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-slim
2222
timeout-minutes: 15
2323
steps:
2424
- name: "Checkout code"
@@ -42,7 +42,7 @@ jobs:
4242
timeout-minutes: 30
4343
strategy:
4444
matrix:
45-
node-version: [22.21.1, 22.x, 24.x]
45+
node-version: [22.x, 24.x, 25.x]
4646
steps:
4747
- name: Install electron dependencies and labwc
4848
run: |
@@ -69,7 +69,7 @@ jobs:
6969
sudo chmod 4755 ./node_modules/electron/dist/chrome-sandbox
7070
# Start labwc
7171
WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 WLR_RENDERER=pixman labwc &
72-
touch css/custom.css
72+
touch config/custom.css
7373
- name: "Run tests"
7474
run: |
7575
export WAYLAND_DISPLAY=wayland-0

.github/workflows/dep-review.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
dependency-review:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-slim
1414
steps:
1515
- name: "Checkout code"
1616
uses: actions/checkout@v6

.github/workflows/electron-rebuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on: [pull_request]
55
jobs:
66
rebuild:
77
name: Run electron-rebuild
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-slim
99
strategy:
1010
matrix:
11-
node-version: [22.21.1, 22.x, 24.x]
11+
node-version: [22.x, 24.x, 25.x]
1212
steps:
1313
- name: Checkout code
1414
uses: actions/checkout@v6

.github/workflows/enforce-pullrequest-rules.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
check:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-slim
1616
if: github.event_name == 'pull_request'
1717
timeout-minutes: 10
1818
steps:

.github/workflows/release-notes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
release-notes:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-slim
1919
timeout-minutes: 15
2020
steps:
2121
- name: "Checkout code"

.github/workflows/spellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
jobs:
1414
spellcheck:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-slim
1616
steps:
1717
- name: Checkout code
1818
uses: actions/checkout@v6

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
stale:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-slim
1414
steps:
1515
- uses: actions/stale@v10
1616
with:

.gitignore

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,13 @@ Temporary Items
5454
.directory
5555
.Trash-*
5656

57-
# Ignore all modules except the default modules.
57+
# Ignore all modules
5858
/modules/*
59-
!/modules/default
6059

61-
# Ignore changes to the custom css files but keep the sample and main.
62-
/css/*
63-
!/css/custom.css.sample
64-
!/css/font-awesome.css
65-
!/css/main.css
66-
!/css/roboto.css
67-
68-
# Ignore users config file but keep the sample.
60+
# Ignore users config file but keep the samples.
6961
config
7062
!config/config.js.sample
63+
!config/custom.css.sample
7164

7265
# Vim
7366
## swap

Collaboration.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Are done by
4646
- [ ] add label `mastermerge`
4747
- [ ] title of the PR is `Release 2.xx.0`
4848
- [ ] description of the PR is the body of the draft release with name `v2.xx.0`
49+
- [ ] check if new PR has merge conflicts, if so, merge `master` into the new PR and solve the conflicts
4950
- [ ] after PR tests run without issues, merge PR
5051
- [ ] edit draft release with name `v2.xx.0`
5152
- [ ] set corresponding version tag `v2.xx.0` (with `Select tag` and then `Create new tag`)
@@ -61,11 +62,24 @@ Are done by
6162

6263
### After release
6364

64-
- [ ] publish release notes with link to github release on forum in new locked topic
65+
- [ ] publish release notes with link to github release on forum in new locked topic (use edit release on github to copy the content with markdown syntax)
6566
- [ ] close all issues with label `ready (coming with next release)`
6667
- [ ] release new documentation by merging `develop` on `master` in documentation repository
6768
- [ ] publish new version on [npm](https://www.npmjs.com/package/magicmirror)
6869
- [ ] use a clean environment (e.g. container)
6970
- [ ] clone this repository with the new `master` branch and `cd` into the local repository directory
70-
- [ ] log in to npm with `npm login --auth-type legacy` which will ask for username and password and one-time-password which is sent via mail
71-
- [ ] execute `npm publish`
71+
- [ ] **Method 1 (recommended): With browser and 2FA**
72+
- [ ] execute `npm login` which will open a browser window
73+
- [ ] log in with your npm credentials and enter your 2FA code
74+
- [ ] execute `npm publish`
75+
- [ ] **Method 2 (fallback for headless environments): With token (bypasses 2FA)**
76+
- [ ] ⚠️ Note: This method bypasses 2FA and should only be used when a browser is not available
77+
- [ ] goto `https://www.npmjs.com/settings/<username>/tokens/` and click `generate new token`
78+
- [ ] enable `Bypass two-factor authentication (2FA)` and under `Packages and scopes` give `Read and write` permission to the `magicmirror` package, press `Generate token`
79+
- [ ] execute:
80+
81+
```bash
82+
NPM_TOKEN="npm_xxxxxx"
83+
npm set "//registry.npmjs.org/:_authToken=$NPM_TOKEN"
84+
npm publish
85+
```

0 commit comments

Comments
 (0)