Revise require imports

.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:jsdoc/recommended"],
-	"plugins": ["prettier", "jsdoc", "jest"],
+	"plugins": ["prettier", "import", "jsdoc", "jest"],
 	"env": {
 		"browser": true,
 		"es2022": true,
@@ -23,6 +23,7 @@
 	},
 	"rules": {
 		"eqeqeq": "error",
+		"import/order": "error",
 		"no-prototype-builtins": "off",
 		"no-throw-literal": "error",
 		"no-unused-vars": "off",

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

@@ -10,11 +10,11 @@ require("module-alias/register");
 
 const fs = require("fs");
 const path = require("path");
+const envsub = require("envsub");
 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,11 +5,11 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-const Linter = require("eslint").Linter;
-const linter = new Linter();
-
 const path = require("path");
 const fs = require("fs");
+const { Linter } = require("eslint");
+
+const linter = new Linter();
 
 const rootPath = path.resolve(`${__dirname}/../`);
 const Log = require(`${rootPath}/js/logger.js`);

js/electron.js

@@ -1,8 +1,8 @@
 "use strict";
 
 const electron = require("electron");
-const core = require("./app.js");
-const Log = require("logger");
+const core = require("./app");
+const Log = require("./logger");
 
 // Config
 let config = process.env.config ? JSON.parse(process.env.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 Log = require("logger");
+const Class = require("./class");
 
 const NodeHelper = Class.extend({
 	init() {

js/server.js

@@ -4,18 +4,18 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-const express = require("express");
+const fs = require("fs");
+const http = require("http");
+const https = require("https");
 const path = require("path");
+const express = require("express");
 const ipfilter = require("express-ipfilter").IpFilter;
-const fs = require("fs");
 const helmet = require("helmet");
 const socketio = require("socket.io");
-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,7 +1,7 @@
-const fetch = require("./fetch");
 const fs = require("fs");
 const path = require("path");
 const Log = require("logger");
+const fetch = require("./fetch");
 
 /**
  * Gets the config.

modules/default/calendar/calendarfetcher.js

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

modules/default/calendar/calendarutils.js

@@ -8,10 +8,10 @@
 /**
  * @external Moment
  */
-const moment = require("moment");
 const path = require("path");
+const moment = require("moment");
 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,8 +5,8 @@
  * MIT Licensed.
  */
 const NodeHelper = require("node_helper");
-const CalendarFetcher = require("./calendarfetcher.js");
 const Log = require("logger");
+const CalendarFetcher = require("./calendarfetcher");
 
 module.exports = NodeHelper.create({
 	// Override start method.

modules/default/newsfeed/newsfeedfetcher.js

@@ -4,12 +4,13 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-const Log = require("logger");
+
+const stream = require("stream");
 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,8 +6,8 @@
  */
 
 const NodeHelper = require("node_helper");
-const NewsfeedFetcher = require("./newsfeedfetcher.js");
 const Log = require("logger");
+const NewsfeedFetcher = require("./newsfeedfetcher");
 
 module.exports = NodeHelper.create({
 	// Override start method.

modules/default/updatenotification/node_helper.js

@@ -1,6 +1,6 @@
-const GitHelper = require("./git_helper");
-const defaultModules = require("../defaultmodules");
 const NodeHelper = require("node_helper");
+const defaultModules = require("../defaultmodules");
+const GitHelper = require("./git_helper");
 
 const ONE_MINUTE = 60 * 1000;