Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 10:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support for using yarn instead of npm, include unread counts on cold load (#6179)

Browse Source 
* Close #6178

* Support for package managers besides npm

- Also fixes issue where upgrade-plugins wouldn't work
This commit is contained in:
Peter Jaszkowiak
2017-12-20 13:56:14 -07:00
committed by Julian Lam
parent 96084340ad
commit be00a1c013
8 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/install.js
View File

@@ -13,6 +13,23 @@ var meta = require('../meta');
var pubsub = require('../pubsub');
var events = require('../events');
var packageManager = nconf.get('package_manager') === 'yarn' ? 'yarn' : 'npm';
var packageManagerExecutable = packageManager;
var packageManagerCommands = {
yarn: {
install: 'add',
uninstall: 'remove',
},
npm: {
install: 'install',
uninstall: 'uninstall',
},
};
if (process.platform === 'win32') {
packageManagerExecutable += '.cmd';
}
module.exports = function (Plugins) {
if (nconf.get('isPrimary') === 'true') {
pubsub.on('plugins:toggleInstall', function (data) {
@@ -95,7 +112,7 @@ module.exports = function (Plugins) {
setImmediate(next);
},
function (next) {
runNpmCommand(type, id, version || 'latest', next);
runPackageManagerCommand(type, id, version || 'latest', next);
},
function (next) {
Plugins.get(id, next);
@@ -107,8 +124,12 @@ module.exports = function (Plugins) {
], callback);
}
function runNpmCommand(command, pkgName, version, callback) {
cproc.execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', [command, pkgName + (command === 'install' ? '@' + version : ''), '--save'], function (err, stdout) {
function runPackageManagerCommand(command, pkgName, version, callback) {
cproc.execFile(packageManagerExecutable, [
packageManagerCommands[packageManager][command],
pkgName + (command === 'install' ? '@' + version : ''),
'--save',
], function (err, stdout) {
if (err) {
return callback(err);
}
@@ -125,7 +146,7 @@ module.exports = function (Plugins) {
function upgrade(id, version, callback) {
async.waterfall([
async.apply(runNpmCommand, 'install', id, version || 'latest'),
async.apply(runPackageManagerCommand, 'install', id, version || 'latest'),
function (next) {
Plugins.isActive(id, next);
},