kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-09-14 08:07:01 +00:00
Code Issues Projects Releases Wiki Activity

revert changes breaking node --run config:check (#3885)

Browse Source
This commit is contained in:
Karsten Hassel
2025-09-10 07:55:05 +02:00
committed by GitHub
parent b1865d8115
commit 2481bc621f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -24,7 +24,7 @@ Thanks to: @dathbe.
- [clock] Add CSS to prevent line breaking of sunset/sunrise time display (#3816) - [clock] Add CSS to prevent line breaking of sunset/sunrise time display (#3816)
- [core] Enhance system information logging format and include additional env and RAM details (#3839, #3843) - [core] Enhance system information logging format and include additional env and RAM details (#3839, #3843)
- [refactor] Add new file `js/module_functions.js` to move code used in several modules to one place (#3837) - [refactor] Add new file `js/module_functions.js` to move code used in several modules to one place (#3837)
- [refactor] Use global.root_path where possible (#3883) - [refactor] Use global.root_path where possible (#3883, #3885)
- [tests] refactor: simplify jest config file (#3844) - [tests] refactor: simplify jest config file (#3844)
- [tests] refactor: extract constants for weather electron tests (#3845) - [tests] refactor: extract constants for weather electron tests (#3845)
- [tests] refactor: add `setupDOMEnvironment` helper function to eliminate repetitive JSDOM setup code (#3860) - [tests] refactor: add `setupDOMEnvironment` helper function to eliminate repetitive JSDOM setup code (#3860)

7
js/check_config.js
View File

@@ -5,8 +5,9 @@ const Ajv = require("ajv");
const globals = require("globals"); const globals = require("globals");
const { Linter } = require("eslint"); const { Linter } = require("eslint");
const Log = require(`${global.root_path}/js/logger.js`); const rootPath = path.resolve(`${__dirname}/../`);
const Utils = require(`${global.root_path}/js/utils.js`); const Log = require(`${rootPath}/js/logger.js`);
const Utils = require(`${rootPath}/js/utils.js`);
const linter = new Linter({ configType: "flat" }); const linter = new Linter({ configType: "flat" });
const ajv = new Ajv(); const ajv = new Ajv();
@@ -18,7 +19,7 @@ const ajv = new Ajv();
*/ */
function getConfigFile () { function getConfigFile () {
// FIXME: This function should be in core. Do you want refactor me ;) ?, be good! // FIXME: This function should be in core. Do you want refactor me ;) ?, be good!
return path.resolve(process.env.MM_CONFIG_FILE || `${global.root_path}/config/config.js`); return path.resolve(process.env.MM_CONFIG_FILE || `${rootPath}/config/config.js`);
} }
/** /**

5
js/utils.js
View File

@@ -1,4 +1,7 @@
const Log = require(`${global.root_path}/js/logger.js`); const path = require("node:path");
const rootPath = path.resolve(`${__dirname}/../`);
const Log = require(`${rootPath}/js/logger.js`);
const os = require("node:os"); const os = require("node:os");
const fs = require("node:fs"); const fs = require("node:fs");
const si = require("systeminformation"); const si = require("systeminformation");