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-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

plugins: Use npm CLI to install/uninstall plugins

Browse source 
Using npm as a module has long been discouraged and will stop working
with npm v7.
This commit is contained in:
Richard Hansen 2021-02-17 22:53:50 -05:00 committed by John McLear
parent 9633b98f92
commit b3b5af3c3c
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/node/server.js
View file

@ -43,11 +43,9 @@ const UpdateCheck = require('./utils/UpdateCheck');
const db = require('./db/DB'); const db = require('./db/DB');
const express = require('./hooks/express'); const express = require('./hooks/express');
const hooks = require('../static/js/pluginfw/hooks'); const hooks = require('../static/js/pluginfw/hooks');
const npm = require('npm/lib/npm.js');
const pluginDefs = require('../static/js/pluginfw/plugin_defs'); const pluginDefs = require('../static/js/pluginfw/plugin_defs');
const plugins = require('../static/js/pluginfw/plugins'); const plugins = require('../static/js/pluginfw/plugins');
const settings = require('./utils/Settings'); const settings = require('./utils/Settings');
const util = require('util');
const logger = log4js.getLogger('server'); const logger = log4js.getLogger('server');
@ -138,7 +136,6 @@ exports.start = async () => {
}); });
} }
await util.promisify(npm.load)();
await db.init(); await db.init();
await plugins.update(); await plugins.update();
const installedPlugins = Object.values(pluginDefs.plugins) const installedPlugins = Object.values(pluginDefs.plugins)

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

@ -3,20 +3,11 @@
const log4js = require('log4js'); const log4js = require('log4js');
const plugins = require('./plugins'); const plugins = require('./plugins');
const hooks = require('./hooks'); const hooks = require('./hooks');
const npm = require('npm');
const request = require('request'); const request = require('request');
const util = require('util'); const runCmd = require('../../../node/utils/run_cmd');
const logger = log4js.getLogger('plugins'); const logger = log4js.getLogger('plugins');
let npmIsLoaded = false;
const loadNpm = async () => {
if (npmIsLoaded) return;
await util.promisify(npm.load)({});
npmIsLoaded = true;
npm.on('log', log4js.getLogger('npm').log);
};
const onAllTasksFinished = () => { const onAllTasksFinished = () => {
hooks.aCallAll('restartServer', {}, () => {}); hooks.aCallAll('restartServer', {}, () => {});
}; };
@ -37,8 +28,8 @@ exports.uninstall = async (pluginName, cb = null) => {
cb = wrapTaskCb(cb); cb = wrapTaskCb(cb);
logger.info(`Uninstalling plugin ${pluginName}...`); logger.info(`Uninstalling plugin ${pluginName}...`);
try { try {
await loadNpm(); // The --no-save flag prevents npm from creating package.json or package-lock.json.
await util.promisify(npm.commands.uninstall)([pluginName]); await runCmd(['npm', 'uninstall', '--no-save', pluginName]);
} catch (err) { } catch (err) {
logger.error(`Failed to uninstall plugin ${pluginName}`); logger.error(`Failed to uninstall plugin ${pluginName}`);
cb(err || new Error(err)); cb(err || new Error(err));
@ -54,8 +45,8 @@ exports.install = async (pluginName, cb = null) => {
cb = wrapTaskCb(cb); cb = wrapTaskCb(cb);
logger.info(`Installing plugin ${pluginName}...`); logger.info(`Installing plugin ${pluginName}...`);
try { try {
await loadNpm(); // The --no-save flag prevents npm from creating package.json or package-lock.json.
await util.promisify(npm.commands.install)([`${pluginName}@latest`]); await runCmd(['npm', 'install', '--no-save', pluginName]);
} catch (err) { } catch (err) {
logger.error(`Failed to install plugin ${pluginName}`); logger.error(`Failed to install plugin ${pluginName}`);
cb(err || new Error(err)); cb(err || new Error(err));