libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

Fixed installing of local packages.

Browse source
This commit is contained in:
SamTV12345 2024-01-30 22:27:31 +01:00
parent 31dd3a6690
commit a7f81e824a
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/static/js/pluginfw/installer.js
View file

@ -9,6 +9,7 @@ const axios = require('axios');
const {PluginManager} = require("live-plugin-manager"); const {PluginManager} = require("live-plugin-manager");
const {promises: fs} = require("fs"); const {promises: fs} = require("fs");
const path = require("path"); const path = require("path");
const {findEtherpadRoot} = require("../../../node/utils/AbsolutePaths");
const logger = log4js.getLogger('plugins'); const logger = log4js.getLogger('plugins');
exports.manager = new PluginManager(); exports.manager = new PluginManager();
@ -50,17 +51,22 @@ const migratePluginsFromNodeModules = async () => {
const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']})); const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']}));
await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => { await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => {
if (pkg.startsWith(plugins.prefix) && pkg !== 'ep_etherpad-lite') { if (pkg.startsWith(plugins.prefix) && pkg !== 'ep_etherpad-lite') {
await exports.manager.install(pkg) if (!info._resolved) {
// Install from node_modules directory
await exports.manager.installFromPath(`${findEtherpadRoot()}/src/node_modules/${pkg}`);
} else {
await exports.manager.install(pkg);
}
} }
})); }));
await persistInstalledPlugins(); await persistInstalledPlugins();
} };
exports.checkForMigration = async () => { exports.checkForMigration = async () => {
logger.info('check installed plugins for migration') logger.info('check installed plugins for migration');
try { try {
await fs.access(installedPluginsPath, fs.constants.F_OK) await fs.access(installedPluginsPath, fs.constants.F_OK);
} catch (err) { } catch (err) {
await migratePluginsFromNodeModules(); await migratePluginsFromNodeModules();
} }
@ -143,8 +149,8 @@ exports.search = (searchTerm, maxCacheAge) => exports.getAvailablePlugins(maxCac
if (pluginName.indexOf(plugins.prefix) !== 0) continue; if (pluginName.indexOf(plugins.prefix) !== 0) continue;
if (searchTerm && !~results[pluginName].name.toLowerCase().indexOf(searchTerm) && if (searchTerm && !~results[pluginName].name.toLowerCase().indexOf(searchTerm) &&
(typeof results[pluginName].description !== 'undefined' && (typeof results[pluginName].description !== 'undefined' &&
!~results[pluginName].description.toLowerCase().indexOf(searchTerm)) !~results[pluginName].description.toLowerCase().indexOf(searchTerm))
) { ) {
if (typeof results[pluginName].description === 'undefined') { if (typeof results[pluginName].description === 'undefined') {
logger.debug(`plugin without Description: ${results[pluginName].name}`); logger.debug(`plugin without Description: ${results[pluginName].name}`);