Merge branch 'master' into develop

This commit is contained in:
Barış Soner Uşaklı
2025-11-18 10:24:37 -05:00

View File

@@ -194,7 +194,7 @@ Plugins.listTrending = async () => {
Plugins.normalise = async function (apiReturn) { Plugins.normalise = async function (apiReturn) {
const pluginMap = {}; const pluginMap = {};
const { dependencies } = require(paths.currentPackage); const { dependencies } = require(paths.installPackage);
apiReturn = Array.isArray(apiReturn) ? apiReturn : []; apiReturn = Array.isArray(apiReturn) ? apiReturn : [];
apiReturn.forEach((packageData) => { apiReturn.forEach((packageData) => {
packageData.id = packageData.name; packageData.id = packageData.name;
@@ -229,7 +229,7 @@ Plugins.normalise = async function (apiReturn) {
pluginMap[plugin.id].settingsRoute = plugin.settingsRoute; pluginMap[plugin.id].settingsRoute = plugin.settingsRoute;
pluginMap[plugin.id].license = plugin.license; pluginMap[plugin.id].license = plugin.license;
// If package.json defines a version to use, stick to that // If install/package.json defines a version to use, stick to that
if (dependencies.hasOwnProperty(plugin.id) && semver.valid(dependencies[plugin.id])) { if (dependencies.hasOwnProperty(plugin.id) && semver.valid(dependencies[plugin.id])) {
pluginMap[plugin.id].latest = dependencies[plugin.id]; pluginMap[plugin.id].latest = dependencies[plugin.id];
} else { } else {