diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9427c8..e0b60007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ _This release is scheduled to be released on 2021-04-01._ - Bump electron to v11. - Dont update the DOM when a module is not displayed. - Cleaned up jsdoc and tests. +- Exposed logger as node module for easier access for 3rd party modules ### Removed diff --git a/js/app.js b/js/app.js index 9cec4902..e5156b19 100644 --- a/js/app.js +++ b/js/app.js @@ -4,16 +4,17 @@ * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. */ -const fs = require("fs"); -const path = require("path"); -const Log = require(`${__dirname}/logger`); -const Server = require(`${__dirname}/server`); -const Utils = require(`${__dirname}/utils`); -const defaultModules = require(`${__dirname}/../modules/default/defaultmodules`); // Alias modules mentioned in package.js under _moduleAliases. require("module-alias/register"); +const fs = require("fs"); +const path = require("path"); +const Log = require("logger"); +const Server = require(`${__dirname}/server`); +const Utils = require(`${__dirname}/utils`); +const defaultModules = require(`${__dirname}/../modules/default/defaultmodules`); + // Get version number. global.version = require(`${__dirname}/../package.json`).version; Log.log("Starting MagicMirror: v" + global.version); diff --git a/js/electron.js b/js/electron.js index 8df04b68..3e791359 100644 --- a/js/electron.js +++ b/js/electron.js @@ -2,7 +2,7 @@ const electron = require("electron"); const core = require("./app.js"); -const Log = require("./logger.js"); +const Log = require("logger"); // Config let config = process.env.config ? JSON.parse(process.env.config) : {}; diff --git a/js/node_helper.js b/js/node_helper.js index f394d505..81d2d9d5 100644 --- a/js/node_helper.js +++ b/js/node_helper.js @@ -5,7 +5,7 @@ * MIT Licensed. */ const Class = require("./class.js"); -const Log = require("./logger.js"); +const Log = require("logger"); const express = require("express"); const NodeHelper = Class.extend({ diff --git a/js/server.js b/js/server.js index 3c561514..5ce9435d 100644 --- a/js/server.js +++ b/js/server.js @@ -11,7 +11,7 @@ const ipfilter = require("express-ipfilter").IpFilter; const fs = require("fs"); const helmet = require("helmet"); -const Log = require("./logger.js"); +const Log = require("logger"); const Utils = require("./utils.js"); /** diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index 6c268c46..55e5cdaa 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -4,7 +4,7 @@ * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. */ -const Log = require("../../../js/logger.js"); +const Log = require("logger"); const ical = require("node-ical"); const request = require("request"); diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js index 06fa28ec..c44e91fc 100644 --- a/modules/default/calendar/node_helper.js +++ b/modules/default/calendar/node_helper.js @@ -7,7 +7,7 @@ const NodeHelper = require("node_helper"); const validUrl = require("valid-url"); const CalendarFetcher = require("./calendarfetcher.js"); -const Log = require("../../../js/logger"); +const Log = require("logger"); module.exports = NodeHelper.create({ // Override start method. diff --git a/modules/default/currentweather/node_helper.js b/modules/default/currentweather/node_helper.js index dd00dc73..d4c7a14c 100644 --- a/modules/default/currentweather/node_helper.js +++ b/modules/default/currentweather/node_helper.js @@ -1,5 +1,5 @@ const NodeHelper = require("node_helper"); -const Log = require("../../../js/logger"); +const Log = require("logger"); module.exports = NodeHelper.create({ // Override start method. diff --git a/modules/default/newsfeed/newsfeedfetcher.js b/modules/default/newsfeed/newsfeedfetcher.js index 20e45258..68ac75ac 100644 --- a/modules/default/newsfeed/newsfeedfetcher.js +++ b/modules/default/newsfeed/newsfeedfetcher.js @@ -4,7 +4,7 @@ * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. */ -const Log = require("../../../js/logger.js"); +const Log = require("logger"); const FeedMe = require("feedme"); const request = require("request"); const iconv = require("iconv-lite"); diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js index bdfcbfcc..18984f31 100644 --- a/modules/default/newsfeed/node_helper.js +++ b/modules/default/newsfeed/node_helper.js @@ -8,7 +8,7 @@ const NodeHelper = require("node_helper"); const validUrl = require("valid-url"); const NewsfeedFetcher = require("./newsfeedfetcher.js"); -const Log = require("../../../js/logger"); +const Log = require("logger"); module.exports = NodeHelper.create({ // Override start method. diff --git a/modules/default/updatenotification/node_helper.js b/modules/default/updatenotification/node_helper.js index 973dca51..a8b75c3e 100644 --- a/modules/default/updatenotification/node_helper.js +++ b/modules/default/updatenotification/node_helper.js @@ -3,7 +3,7 @@ const simpleGits = []; const fs = require("fs"); const path = require("path"); const defaultModules = require(__dirname + "/../defaultmodules.js"); -const Log = require(__dirname + "/../../../js/logger.js"); +const Log = require("logger"); const NodeHelper = require("node_helper"); module.exports = NodeHelper.create({ diff --git a/modules/default/weatherforecast/node_helper.js b/modules/default/weatherforecast/node_helper.js index dd00dc73..d4c7a14c 100644 --- a/modules/default/weatherforecast/node_helper.js +++ b/modules/default/weatherforecast/node_helper.js @@ -1,5 +1,5 @@ const NodeHelper = require("node_helper"); -const Log = require("../../../js/logger"); +const Log = require("logger"); module.exports = NodeHelper.create({ // Override start method. diff --git a/package.json b/package.json index 14303f91..8ca6cd30 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,8 @@ "valid-url": "^1.0.9" }, "_moduleAliases": { - "node_helper": "js/node_helper.js" + "node_helper": "js/node_helper.js", + "logger": "js/logger.js" }, "engines": { "node": ">=10" diff --git a/serveronly/index.js b/serveronly/index.js index 9cc7d942..136eaa00 100644 --- a/serveronly/index.js +++ b/serveronly/index.js @@ -1,5 +1,5 @@ const app = require("../js/app.js"); -const Log = require("../js/logger.js"); +const Log = require("logger"); app.start(function (config) { var bindAddress = config.address ? config.address : "localhost";