Skip to content

Commit 5ea8a34

Browse files
rejasMichMichKristjanESPERANTOdependabot[bot]khassel
authored
Release 2.27.0 (#3410)
## [2.27.0] - 2024-04-01 Thanks to: @bugsounet, @crazyscot, @illimarkangur, @jkriegshauser, @khassel, @KristjanESPERANTO, @Paranoid93, @rejas, @sdetweil and @vppencilsharpener. This release marks the first release without Michael Teeuw (@MichMich). A very special thanks to him for creating MagicMirror and leading the project for so many years. For more info, please read the following post: [A New Chapter for MagicMirror: The Community Takes the Lead](https://forum.magicmirror.builders/topic/18329/a-new-chapter-for-magicmirror-the-community-takes-the-lead). ### Added - Output of system information to the console for troubleshooting (#3328 and #3337), ignore errors under aarch64 (#3349) - [chore] Add `eslint-plugin-package-json` to lint the `package.json` files (#3368) - [weather] `showHumidity` config is now a string describing where to show this element. Supported values: "wind", "temp", "feelslike", "below", "none". (#3330) - electron-rebuild test suite for electron and 3rd party modules compatibility (#3392) - Create MM² icon and attach it to electron process (#3407) ### Updated - Update updatenotification (update_helper.js): Recode with pm2 library (#3332) - Removing lodash dependency by replacing merge by spread operator (#3339) - Use node prefix for build-in modules (#3340) - Rework logging colors (#3350) - Update pm2 to v5.3.1 with no allow-ghsas (#3364) - [chore] Update husky and let lint-staged fix ESLint issues - [chore] Update dependencies including electron to v29 (#3357) and node-ical - Update translations for estonian (#3371) - Update electron to v29 and update other dependencies - [calendar] fullDay events over several days now show the left days from the first day on and 'today' on the last day - Update layout of current weather indoor values ### Fixed - 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 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) - [newsfeed] Suppress unsightly animation cases when there are 0 or 1 active news items (#3336) - [newsfeed] Always compute the feed item URL using the same helper function (#3336) - Ignore all custom css files (#3359) - [newsfeed] Fix newsfeed stall issue introduced by #3336 (#3361) - Changed `log.debug` to `log.log` in `app.js` where logLevel is not set because config is not loaded at this time (#3353) - [calendar] deny fetch interval < 60000 and set 60000 in this case (prevent fetch loop failed) (#3382) - added message in case where config.js is missing the module.export line PR #3383 - Fixed an issue where recurring events could extend past their recurrence end date (#3393) - Don't display any `npm WARN <....>` on install (#3399) - Fixed move suncalc dependency to production from dev, as it is used by clock module - [compliments] Fix mirror not responding anymore when no compliments are to be shown (#3385) ### Deleted - Unneeded file headers (#3358) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Michael Teeuw <[email protected]> Co-authored-by: Kristjan ESPERANTO <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Karsten Hassel <[email protected]> Co-authored-by: Ross Younger <[email protected]> Co-authored-by: Bugsounet - Cédric <[email protected]> Co-authored-by: jkriegshauser <[email protected]> Co-authored-by: illimarkangur <[email protected]> Co-authored-by: sam detweiler <[email protected]> Co-authored-by: vppencilsharpener <[email protected]> Co-authored-by: Paranoid93 <[email protected]>
1 parent 118e212 commit 5ea8a34

File tree

173 files changed

+4108
-2557
lines changed

Some content is hidden

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

173 files changed

+4108
-2557
lines changed

‎.eslintignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
modules/default/calendar/vendor/*
1+
modules/*
2+
!modules/default/

‎.eslintrc.json

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"extends": ["eslint:recommended", "plugin:@stylistic/all-extends", "plugin:import/recommended", "plugin:jest/recommended", "plugin:jsdoc/recommended"],
3-
"plugins": [],
3+
"plugins": ["unicorn"],
44
"env": {
55
"browser": true,
6-
"es2023": true,
6+
"es2024": true,
77
"jest/globals": true,
88
"node": true
99
},
@@ -16,7 +16,7 @@
1616
},
1717
"parserOptions": {
1818
"sourceType": "module",
19-
"ecmaVersion": 2023,
19+
"ecmaVersion": "latest",
2020
"ecmaFeatures": {
2121
"globalReturn": true
2222
}
@@ -62,7 +62,8 @@
6262
"@stylistic/indent": ["error", "tab"],
6363
"@stylistic/semi": ["error", "always"],
6464
"@stylistic/space-before-function-paren": ["error", "always"],
65-
"@stylistic/spaced-comment": "off"
65+
"@stylistic/spaced-comment": "off",
66+
"unicorn/prefer-node-protocol": "error"
6667
},
6768
"overrides": [
6869
{
@@ -78,6 +79,15 @@
7879
"rules": {
7980
"@stylistic/quotes": "off"
8081
}
82+
},
83+
{
84+
"extends": ["plugin:package-json/recommended"],
85+
"files": ["package.json"],
86+
"parser": "jsonc-eslint-parser",
87+
"plugins": ["package-json"],
88+
"rules": {
89+
"package-json/sort-collections": ["error", ["devDependencies", "dependencies", "peerDependencies", "config"]]
90+
}
8191
}
8292
]
8393
}

‎.github/codecov.yaml

-10
This file was deleted.

‎.github/dependabot.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,36 @@ updates:
55
schedule:
66
interval: "weekly"
77
target-branch: "develop"
8+
labels:
9+
- "Skip Changelog"
10+
- "dependencies"
811

912
- package-ecosystem: "npm"
1013
directory: "/"
1114
schedule:
1215
interval: "monthly"
1316
target-branch: "develop"
17+
labels:
18+
- "Skip Changelog"
19+
- "dependencies"
20+
- "javascript"
1421

1522
- package-ecosystem: "npm"
1623
directory: "/vendor"
1724
schedule:
1825
interval: "monthly"
1926
target-branch: "develop"
27+
labels:
28+
- "Skip Changelog"
29+
- "dependencies"
30+
- "javascript"
2031

2132
- package-ecosystem: "npm"
2233
directory: "/fonts"
2334
schedule:
2435
interval: "monthly"
2536
target-branch: "develop"
37+
labels:
38+
- "Skip Changelog"
39+
- "dependencies"
40+
- "javascript"

‎.github/workflows/depsreview.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
- name: "Checkout code"
1616
uses: actions/checkout@v4
1717
- name: "Dependency Review"
18-
uses: actions/dependency-review-action@v3
18+
uses: actions/dependency-review-action@v4

‎.github/workflows/electronRebuild.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Electron Rebuild Testing"
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
rebuild:
7+
name: Run electron-rebuild
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
- name: Install MagicMirror
13+
run: npm run install-mm
14+
- name: Install @electron/rebuild
15+
run: npm install @electron/rebuild
16+
- name: Install some test library to be rebuilded
17+
run: npm install onoff node-pty drivelist
18+
- name: Run electron-rebuild
19+
run: npx electron-rebuild
20+
continue-on-error: false

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
changeLogPath: "CHANGELOG.md"
2020
skipLabels: "Skip Changelog"
2121
- name: "Enforce develop branch"
22-
if: ${{ github.base_ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }}
22+
if: ${{ github.event.pull_request.base.ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }}
2323
run: |
2424
echo "This PR is based against the master branch and not a release or hotfix."
2525
echo "Please don't do this. Switch the branch to 'develop'."

‎.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ Temporary Items
6363
!/modules/default/**
6464
!/modules/README.md**
6565

66-
# Ignore changes to the custom css files.
67-
/css/custom.css
66+
# Ignore changes to the custom css files but keep the sample and main.
67+
/css/*
68+
!/css/custom.css.sample
69+
!/css/main.css
6870

6971
# Ignore users config file but keep the sample.
7072
/config/*

‎.husky/pre-commit

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/sh
22

3-
[ -f "$(dirname "$0")/_/husky.sh" ] && . "$(dirname "$0")/_/husky.sh"
4-
53
if command -v npm &> /dev/null; then
64
npm run lint:staged
75
fi

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
engine-strict=true
22
audit=false
3+
loglevel="error"

‎.prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.js
2+
.eslintignore
3+
.husky/pre-commit
24
.prettierignore
35
/config
46
/coverage

‎CHANGELOG.md

+127-72
Large diffs are not rendered by default.

‎Collaboration.md

+22-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This document describes how collaborators of this repository should work togethe
55
- never merge your own PR's
66
- never merge without someone having approved (approving and merging from same person is allowed)
77
- wait for all approvals requested (or the author decides something different in the comments)
8-
- never merge to `master`, except for releases (because of update notification)
8+
- merge to `master` only for releases or other urgent issues (update notification is only triggered by tags)
99
- merges to master should be tagged with the "mastermerge" label so that the test runs through
1010

1111
## Issues
@@ -15,4 +15,24 @@ This document describes how collaborators of this repository should work togethe
1515

1616
## Releases
1717

18-
- are done by @MichMich only
18+
Are done by @rejas or @khassel.
19+
20+
### Deployment steps
21+
22+
- pull latest `develop` branch
23+
- update `package.json` to reflect correct version number
24+
- run `npm install` to generate new `package-lock.json`
25+
- test `develop` branch
26+
- update `CHANGELOG.md` (don't forget to add all contributor names)
27+
- commit and push all changes
28+
- after successful test run via github actions: create pull request to `master` branch
29+
- after PR tests run without issues, merge PR
30+
- create new release with corresponding version tag
31+
- publish release notes with link to github release on forum in new locked topic
32+
33+
### Draft new development release
34+
35+
- checkout `develop` branch
36+
- update `package.json` to reflect correct version number `2.xx.0-develop`
37+
- draft new section in `CHANGELOG.md`
38+
- commit and publish `develop` branch

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The MIT License (MIT)
22

3-
Copyright © 2016-2022 Michael Teeuw
3+
Copyright © 2016-2024 Michael Teeuw
44

55
Permission is hereby granted, free of charge, to any person
66
obtaining a copy of this software and associated documentation

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<a href="https://choosealicense.com/licenses/mit">
55
<img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License">
66
</a>
7-
<img src="https://img.shields.io/github/actions/workflow/status/michmich/magicmirror/automated-tests.yaml" alt="GitHub Actions">
8-
<img src="https://img.shields.io/github/checks-status/michmich/magicmirror/master" alt="Build Status">
9-
<a href="https://github.com/MichMich/MagicMirror">
10-
<img src="https://img.shields.io/github/stars/michmich/magicmirror?style=social">
7+
<img src="https://img.shields.io/github/actions/workflow/status/magicmirrororg/magicmirror/automated-tests.yaml" alt="GitHub Actions">
8+
<img src="https://img.shields.io/github/checks-status/magicmirrororg/magicmirror/master" alt="Build Status">
9+
<a href="https://github.com/MagicMirrorOrg/MagicMirror">
10+
<img src="https://img.shields.io/github/stars/magicmirrororg/magicmirror?style=social">
1111
</a>
1212
</p>
1313

14-
**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
14+
**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MagicMirrorOrg/MagicMirror/graphs/contributors).
1515

1616
MagicMirror² focuses on a modular plugin system and uses [Electron](https://www.electronjs.org/) as an application wrapper. So no more web server or browser installs necessary!
1717

‎clientonly/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
// Return new pending promise
4141
return new Promise((resolve, reject) => {
4242
// Select http or https module, depending on requested url
43-
const lib = url.startsWith("https") ? require("https") : require("http");
43+
const lib = url.startsWith("https") ? require("node:https") : require("node:http");
4444
const request = lib.get(url, (response) => {
4545
let configData = "";
4646

@@ -94,7 +94,7 @@
9494

9595
// Spawn electron application
9696
const electron = require("electron");
97-
const child = require("child_process").spawn(electron, ["js/electron.js"], options);
97+
const child = require("node:child_process").spawn(electron, ["js/electron.js"], options);
9898

9999
// Pipe all child process output to current stdout
100100
child.stdout.on("data", function (buf) {

‎config/config.js.sample

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/* MagicMirror² Config Sample
2-
*
3-
* By Michael Teeuw https://michaelteeuw.nl
4-
* MIT Licensed.
1+
/* Config Sample
52
*
63
* For more information on how you can configure this file
74
* see https://docs.magicmirror.builders/configuration/introduction.html

‎css/custom.css.sample

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
/* MagicMirror² Custom CSS Sample
1+
/* Custom CSS Sample
22
*
33
* Change color and fonts here.
44
*
55
* Beware that properties cannot be unitless, so for example write '--gap-body: 0px;' instead of just '--gap-body: 0;'
6-
*
7-
* MIT Licensed.
86
*/
97

108
/* Uncomment and adjust accordingly if you want to import another font from the google-fonts-api: */
@@ -18,14 +16,14 @@
1816

1917
--font-primary: "Roboto Condensed";
2018
--font-secondary: "Roboto";
21-
19+
2220
--font-size: 20px;
2321
--font-size-small: 0.75rem;
2422

2523
--gap-body-top: 60px;
2624
--gap-body-right: 60px;
2725
--gap-body-bottom: 60px;
2826
--gap-body-left: 60px;
29-
27+
3028
--gap-modules: 30px;
3129
}

‎fonts/package-lock.json

+10-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fonts/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"name": "magicmirror-fonts",
3-
"description": "Package for fonts use by MagicMirror² Core.",
3+
"version": "1.0.0",
4+
"description": "Package for fonts use by MagicMirror² core.",
45
"repository": {
56
"type": "git",
6-
"url": "git+https://github.com/MichMich/MagicMirror.git"
7+
"url": "https://github.com/MagicMirrorOrg/MagicMirror"
78
},
89
"license": "MIT",
910
"bugs": {
10-
"url": "https://github.com/MichMich/MagicMirror/issues"
11+
"url": "https://github.com/MagicMirrorOrg/MagicMirror/issues"
1112
},
1213
"dependencies": {
13-
"@fontsource/roboto": "^5.0.8",
14-
"@fontsource/roboto-condensed": "^5.0.14"
14+
"@fontsource/roboto": "^5.0.12",
15+
"@fontsource/roboto-condensed": "^5.0.15"
1516
}
1617
}

‎js/animateCSS.js

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/* MagicMirror²
2-
* AnimateCSS System from https://animate.style/
3-
* by @bugsounet
4-
* for Michael Teeuw https://michaelteeuw.nl
5-
* MIT Licensed.
6-
*/
7-
81
/* enumeration of animations in Array **/
92
const AnimateCSSIn = [
103
// Attention seekers

0 commit comments

Comments
 (0)