Skip to content

Commit 97880df

Browse files
sdetweilsdetweil
committed
sync changelog
2 parents 8050a4f + 63178eb commit 97880df

File tree

7 files changed

+87
-81
lines changed

7 files changed

+87
-81
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ _This release is scheduled to be released on 2025-01-01._
1414
### Added
1515

1616
- [core] Add wayland and windows start options to `package.json` (#3594)
17-
- [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 (#3586)
18-
- [docs] Added step for npm publishing in release process (#3595)
19-
- [core] Add GitHub workflow to run spellcheck a few days before each release.
17+
- [docs] Add step for npm publishing in release process (#3595)
18+
- [core] Add GitHub workflow to run spellcheck a few days before each release (#3623)
2019
- [core] Add intest flag to index.html to pass to module js for test mode detection (needed by #3630)
2120
- [compliments] add support for refreshing remote compliments file, and testcases (#3630)
21+
- [linter] Re-add `eslint-plugin-import`now that it supports ESLint v9 (#3586)
22+
- [linter] Re-activate `eslint-plugin-package-json` to lint `package.json`
23+
- [core] Add export on animation names
2224
- [calendar] - added ability to display end date for full date events, where end is not same day (showEnd=true)
2325

2426
### Removed

‎eslint.config.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import eslintPluginImport from "eslint-plugin-import";
22
import eslintPluginJest from "eslint-plugin-jest";
33
import eslintPluginJs from "@eslint/js";
4+
import eslintPluginPackageJson from "eslint-plugin-package-json/configs/recommended";
45
import eslintPluginStylistic from "@stylistic/eslint-plugin";
56
import globals from "globals";
67

78
const config = [
89
eslintPluginJs.configs.recommended,
910
eslintPluginImport.flatConfigs.recommended,
11+
eslintPluginPackageJson,
1012
{
1113
files: ["**/*.js"],
1214
languageOptions: {
@@ -106,6 +108,7 @@ const config = [
106108
"@stylistic/quote-props": ["error", "as-needed"],
107109
"func-style": "off",
108110
"import/namespace": "off",
111+
"import/no-unresolved": "off",
109112
"max-lines-per-function": ["error", 100],
110113
"no-magic-numbers": "off",
111114
"one-var": "off",

‎js/animateCSS.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,4 @@ function removeAnimateCSS (element, animation) {
155155
node.classList.remove("animate__animated", animationName);
156156
node.style.removeProperty("--animate-duration");
157157
}
158+
module.exports = { AnimateCSSIn, AnimateCSSOut };

‎package-lock.json

Lines changed: 55 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@
2424
],
2525
"main": "js/electron.js",
2626
"scripts": {
27+
"config:check": "node js/check_config.js",
28+
"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
29+
"install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev",
30+
"install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",
31+
"install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
32+
"lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json --fix",
33+
"lint:js": "eslint . --fix",
34+
"lint:prettier": "prettier . --write",
35+
"lint:staged": "lint-staged",
36+
"postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"",
37+
"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed.",
38+
"server": "node ./serveronly",
2739
"start": "npm run start:x11",
2840
"start:dev": "npm run start -- dev",
2941
"start:wayland": "WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY:=wayland-1}\" ./node_modules/.bin/electron js/electron.js --enable-features=UseOzonePlatform --ozone-platform=wayland",
@@ -32,28 +44,16 @@
3244
"start:windows:dev": "npm run start:windows -- dev",
3345
"start:x11": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
3446
"start:x11:dev": "npm run start -- dev",
35-
"server": "node ./serveronly",
36-
"install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev",
37-
"install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",
38-
"install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
39-
"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
40-
"postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"",
4147
"test": "NODE_ENV=test jest -i --forceExit",
48+
"test:calendar": "node ./modules/default/calendar/debug.js",
4249
"test:coverage": "NODE_ENV=test jest --coverage -i --verbose false --forceExit",
43-
"test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit",
50+
"test:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json",
4451
"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
45-
"test:unit": "NODE_ENV=test jest --selectProjects unit",
46-
"test:prettier": "prettier . --check",
52+
"test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit",
4753
"test:js": "eslint .",
48-
"test:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json",
49-
"test:calendar": "node ./modules/default/calendar/debug.js",
54+
"test:prettier": "prettier . --check",
5055
"test:spelling": "cspell . --gitignore",
51-
"config:check": "node js/check_config.js",
52-
"lint:prettier": "prettier . --write",
53-
"lint:js": "eslint . --fix",
54-
"lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json --fix",
55-
"lint:staged": "lint-staged",
56-
"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed."
56+
"test:unit": "NODE_ENV=test jest --selectProjects unit"
5757
},
5858
"lint-staged": {
5959
"*": "prettier --write",
@@ -86,7 +86,7 @@
8686
"eslint-plugin-import": "^2.31.0",
8787
"eslint-plugin-jest": "^28.8.3",
8888
"eslint-plugin-jsdoc": "^50.4.3",
89-
"eslint-plugin-package-json": "^0.15.4",
89+
"eslint-plugin-package-json": "^0.17.0",
9090
"express-basic-auth": "^1.2.1",
9191
"husky": "^9.1.6",
9292
"jest": "^29.7.0",

‎vendor/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"license": "MIT",
1313
"dependencies": {
14-
"@fortawesome/fontawesome-free": "^6.6.0",
14+
"@fortawesome/fontawesome-free": "^6.7.1",
1515
"animate.css": "^4.1.1",
1616
"croner": "^9.0.0",
1717
"moment": "^2.30.1",

0 commit comments

Comments
 (0)