Merge pull request #2562 from rejas/config_check

CHANGELOG.md

@@ -42,6 +42,8 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
 - Fix alert not recognizing multiple alerts (#2522)
 - Fix fetch option httpsAgent to agent in calendar module (#466)
 - Fix module updatenotification which did not work for repos with many refs (#1907)
+- Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config")
+- Fix calendar debug check
 
 ## [2.15.0] - 2021-04-01
 

js/check_config.js

@@ -52,7 +52,13 @@ function checkConfigFile() {
 	// I'm not sure if all ever is utf-8
 	const configFile = fs.readFileSync(configFileName, "utf-8");
 
-	const errors = linter.verify(configFile);
+	// Explicitly tell linter that he might encounter es6 syntax ("let config = {...}")
+	const errors = linter.verify(configFile, {
+		env: {
+			es6: true
+		}
+	});
+
 	if (errors.length === 0) {
 		Log.info(Utils.colors.pass("Your configuration file doesn't contain syntax errors :)"));
 	} else {

modules/default/calendar/debug.js

@@ -5,6 +5,9 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+// Alias modules mentioned in package.js under _moduleAliases.
+require("module-alias/register");
+
 const CalendarFetcher = require("./calendarfetcher.js");
 
 const url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics"; // Standard test URL
@@ -26,11 +29,13 @@ const fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maxi
 fetcher.onReceive(function (fetcher) {
 	console.log(fetcher.events());
 	console.log("------------------------------------------------------------");
+	process.exit(0);
 });
 
 fetcher.onError(function (fetcher, error) {
 	console.log("Fetcher error:");
 	console.log(error);
+	process.exit(1);
 });
 
 fetcher.startFetch();