Merge tag 'v3.5.2' into staging

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [v3.5.2] - 2022-05-12
+
+Upgrade instructions can be found at [.wiki/Upgrading](.wiki/Upgrading.md).
+
+### Fixed
+- fix: Assert package.json import as json
+- fix: Limited NodeJS version to v16.15
+- fix: Temporarily disabled eslint for moduleManager import
+
 ## [v3.5.1] - 2022-05-06
 
 Upgrade instructions can be found at [.wiki/Upgrading](.wiki/Upgrading.md).
@@ -8,7 +17,7 @@ Upgrade instructions can be found at [.wiki/Upgrading](.wiki/Upgrading.md).
 - fix: Songs requestSet could return null songs
 - fix: Prevent adding duplicate items with bulk actions
 - fix: Throw error if unknown job is called
-- fix: EditSongs missing modalUuid socker parameter
+- fix: EditSongs missing modalUuid socket parameter
 - fix: Unable to focus/blur AdvancedTable rows
 - fix: EditSong song duration can reset on video state change
 - fix: Backend exception if an empty playlist is updated

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:16.15
 
 RUN npm install -g nodemon
 

backend/index.js

@@ -4,7 +4,7 @@ import util from "util";
 import config from "config";
 import fs from "fs";
 
-import package_json from "./package.json";
+import package_json from "./package.json" assert { type: "json" };
 
 const REQUIRED_CONFIG_VERSION = 9;
 

backend/logic/actions/activities.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isLoginRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/apis.js

@@ -4,6 +4,7 @@ import axios from "axios";
 
 import { isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const UtilsModule = moduleManager.modules.utils;

backend/logic/actions/dataRequests.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/hooks/adminRequired.js

@@ -1,5 +1,6 @@
 import async from "async";
 
+// eslint-disable-next-line
 import moduleManager from "../../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/hooks/loginRequired.js

@@ -1,5 +1,6 @@
 import async from "async";
 
+// eslint-disable-next-line
 import moduleManager from "../../../index";
 
 const CacheModule = moduleManager.modules.cache;

backend/logic/actions/hooks/ownerRequired.js

@@ -1,5 +1,6 @@
 import async from "async";
 
+// eslint-disable-next-line
 import moduleManager from "../../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/news.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/playlists.js

@@ -3,6 +3,7 @@ import config from "config";
 
 import { isAdminRequired, isLoginRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/punishments.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/reports.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired, isLoginRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/songs.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired, isLoginRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/stations.js

@@ -4,6 +4,7 @@ import config from "config";
 
 import { isLoginRequired, isOwnerRequired, isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/users.js

@@ -8,6 +8,7 @@ import bcrypt from "bcrypt";
 import sha256 from "sha256";
 import { isAdminRequired, isLoginRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const DBModule = moduleManager.modules.db;

backend/logic/actions/utils.js

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isAdminRequired } from "./hooks";
 
+// eslint-disable-next-line
 import moduleManager from "../../index";
 
 const UtilsModule = moduleManager.modules.utils;

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:16.15
 
 RUN apt-get update
 RUN apt-get install nginx -y