Revise require imports

CHANGELOG.md

@@ -39,7 +39,7 @@ _This release is scheduled to be released on 2023-04-01._
 - Update `stylelint` dependencies, switch to `stylelint-config-standard` and handle `stylelint` issues, update `main.css` matching new rules
 - Update Eslint config, add new rule and handle issue
 - Convert lots of callbacks to async/await
-- Fixed Open-Meteo wind speed units
+- Revise require imports
 
 ### Fixed
 
@@ -58,6 +58,7 @@ _This release is scheduled to be released on 2023-04-01._
 - Fix e2e tests (failed after async changes) by running calendar and newsfeed tests last
 - Lint: Use template literals instead of string concatenation
 - Fix default alert module to render HTML for title and message
+- Fixed Open-Meteo wind speed units
 
 ## [2.22.0] - 2023-01-01
 

js/app.js

@@ -8,13 +8,13 @@
 // Alias modules mentioned in package.js under _moduleAliases.
 require("module-alias/register");
 
+const envsub = require("envsub");
 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`);
-const envsub = require("envsub");
 
 // Get version number.
 global.version = require(`${__dirname}/../package.json`).version;

js/check_config.js

@@ -5,7 +5,8 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-const Linter = require("eslint").Linter;
+const { Linter } = require("eslint");
+
 const linter = new Linter();
 
 const path = require("path");

js/electron.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const electron = require("electron");
-const core = require("./app.js");
+const core = require("./app");
 const Log = require("logger");
 
 // Config

js/node_helper.js

@@ -4,9 +4,9 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-const Class = require("./class.js");
-const Log = require("logger");
 const express = require("express");
+const Class = require("./class");
+const Log = require("logger");
 
 const NodeHelper = Class.extend({
 	init() {

js/server.js

@@ -14,8 +14,8 @@ const http = require("http");
 const https = require("https");
 
 const Log = require("logger");
-const Utils = require("./utils.js");
-const { cors, getConfig, getHtml, getVersion } = require("./server_functions.js");
+const Utils = require("./utils");
+const { cors, getConfig, getHtml, getVersion } = require("./server_functions");
 
 /**
  * Server

js/server_functions.js

@@ -1,6 +1,6 @@
-const fetch = require("./fetch");
 const fs = require("fs");
 const path = require("path");
+const fetch = require("./fetch");
 const Log = require("logger");
 
 /**

modules/default/calendar/calendarfetcher.js

@@ -4,13 +4,14 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+
+const digest = require("digest-fetch");
+const https = require("https");
+const ical = require("node-ical");
 const CalendarUtils = require("./calendarutils");
+const fetch = require("fetch");
 const Log = require("logger");
 const NodeHelper = require("node_helper");
-const ical = require("node-ical");
-const fetch = require("fetch");
-const digest = require("digest-fetch");
-const https = require("https");
 
 /**
  *

modules/default/calendar/calendarutils.js

@@ -11,7 +11,7 @@
 const moment = require("moment");
 const path = require("path");
 const zoneTable = require(path.join(__dirname, "windowsZones.json"));
-const Log = require("../../../js/logger.js");
+const Log = require("../../../js/logger");
 
 const CalendarUtils = {
 	/**

modules/default/calendar/debug.js

@@ -8,7 +8,7 @@
 // Alias modules mentioned in package.js under _moduleAliases.
 require("module-alias/register");
 
-const CalendarFetcher = require("./calendarfetcher.js");
+const CalendarFetcher = require("./calendarfetcher");
 
 const url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics"; // Standard test URL
 //const url = "https://www.googleapis.com/calendar/v3/calendars/primary/events/"; // URL for Bearer auth (must be configured  in Google OAuth2 first)

modules/default/calendar/node_helper.js

@@ -5,7 +5,7 @@
  * MIT Licensed.
  */
 const NodeHelper = require("node_helper");
-const CalendarFetcher = require("./calendarfetcher.js");
+const CalendarFetcher = require("./calendarfetcher");
 const Log = require("logger");
 
 module.exports = NodeHelper.create({

modules/default/newsfeed/newsfeedfetcher.js

@@ -4,12 +4,13 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-const Log = require("logger");
+
 const FeedMe = require("feedme");
-const NodeHelper = require("node_helper");
-const fetch = require("fetch");
 const iconv = require("iconv-lite");
 const stream = require("stream");
+const fetch = require("fetch");
+const Log = require("logger");
+const NodeHelper = require("node_helper");
 
 /**
  * Responsible for requesting an update on the set interval and broadcasting the data.

modules/default/newsfeed/node_helper.js

@@ -6,7 +6,7 @@
  */
 
 const NodeHelper = require("node_helper");
-const NewsfeedFetcher = require("./newsfeedfetcher.js");
+const NewsfeedFetcher = require("./newsfeedfetcher");
 const Log = require("logger");
 
 module.exports = NodeHelper.create({

serveronly/index.js

@@ -1,4 +1,4 @@
-const app = require("../js/app.js");
+const app = require("../js/app");
 const Log = require("logger");
 
 app.start().then((config) => {

tests/e2e/helpers/global-setup.js

@@ -13,7 +13,7 @@ exports.startApplication = async (configFilename, exec) => {
 		process.env.MM_CONFIG_FILE = configFilename;
 	}
 	if (exec) exec;
-	global.app = require("app.js");
+	global.app = require("../../../js/app");
 
 	return global.app.start();
 };

tests/e2e/modules/calendar_spec.js

@@ -1,5 +1,5 @@
 const helpers = require("../helpers/global-setup");
-const serverBasicAuth = require("../helpers/basic-auth.js");
+const serverBasicAuth = require("../helpers/basic-auth");
 
 describe("Calendar module", () => {
 	/**

tests/e2e/modules/clock_spec.js

@@ -1,5 +1,5 @@
-const helpers = require("../helpers/global-setup");
 const moment = require("moment");
+const helpers = require("../helpers/global-setup");
 
 describe("Clock module", () => {
 	afterAll(async () => {

tests/e2e/translations_spec.js

@@ -1,10 +1,10 @@
 const fs = require("fs");
 const path = require("path");
-const translations = require("../../translations/translations.js");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
 const express = require("express");
 const sinon = require("sinon");
+const translations = require("../../translations/translations");
 
 describe("Translations", () => {
 	let server;

tests/electron/env_spec.js

@@ -1,5 +1,5 @@
-const helpers = require("./helpers/global-setup");
 const events = require("events");
+const helpers = require("./helpers/global-setup");
 
 describe("Electron app environment", () => {
 	beforeEach(async () => {

tests/unit/classes/translator_spec.js

@@ -2,6 +2,7 @@ const path = require("path");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
 const express = require("express");
+
 const sockets = new Set();
 
 describe("Translator", () => {

tests/unit/classes/utils_spec.js

@@ -1,5 +1,5 @@
-const Utils = require("../../../js/utils.js");
 const colors = require("colors/safe");
+const Utils = require("../../../js/utils");
 
 describe("Utils", () => {
 	describe("colors", () => {

tests/unit/functions/calendar_spec.js

@@ -10,7 +10,7 @@ describe("Functions into modules/default/calendar/calendar.js", () => {
 
 	beforeAll(() => {
 		// load calendar.js
-		require("../../../modules/default/calendar/calendar.js");
+		require("../../../modules/default/calendar/calendar");
 	});
 
 	describe("capFirst", () => {

tests/unit/functions/weather_object_spec.js

@@ -1,5 +1,5 @@
-const WeatherObject = require("../../../modules/default/weather/weatherobject.js");
-const WeatherUtils = require("../../../modules/default/weather/weatherutils.js");
+const WeatherObject = require("../../../modules/default/weather/weatherobject");
+const WeatherUtils = require("../../../modules/default/weather/weatherutils");
 
 global.moment = require("moment-timezone");
 global.SunCalc = require("suncalc");

tests/unit/modules/default/utils_spec.js

@@ -1,4 +1,5 @@
-const { performWebRequest } = require("../../../../modules/default/utils.js");
+const { performWebRequest } = require("../../../../modules/default/utils");
+
 const nodeVersion = process.version.match(/^v(\d+)\.*/)[1];
 
 describe("Utils tests", () => {

tests/unit/modules/default/weather/weather_utils_spec.js

@@ -1,4 +1,4 @@
-const weather = require("../../../../../modules/default/weather/weatherutils.js");
+const weather = require("../../../../../modules/default/weather/weatherutils");
 
 describe("Weather utils tests", () => {
 	describe("convertPrecipitationUnit tests", () => {