X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fplugins%2Fyarn.ts;h=3f45681d3f90ca839d575616681a4680b164ca23;hb=302eba0d898e38dca14739486441c27c0be6c62f;hp=74c67653c88e90f2f6aa8b88a4385a7dd318912f;hpb=9b474844e85cce916370693cc24f53339a695570;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/plugins/yarn.ts b/server/lib/plugins/yarn.ts index 74c67653c..3f45681d3 100644 --- a/server/lib/plugins/yarn.ts +++ b/server/lib/plugins/yarn.ts @@ -1,19 +1,24 @@ +import { outputJSON, pathExists } from 'fs-extra' +import { join } from 'path' import { execShell } from '../../helpers/core-utils' -import { logger } from '../../helpers/logger' import { isNpmPluginNameValid, isPluginVersionValid } from '../../helpers/custom-validators/plugins' +import { logger } from '../../helpers/logger' import { CONFIG } from '../../initializers/config' -import { outputJSON, pathExists } from 'fs-extra' -import { join } from 'path' +import { getLatestPluginVersion } from './plugin-index' -async function installNpmPlugin (npmName: string, version?: string) { +async function installNpmPlugin (npmName: string, versionArg?: string) { // Security check checkNpmPluginNameOrThrow(npmName) - if (version) checkPluginVersionOrThrow(version) + if (versionArg) checkPluginVersionOrThrow(versionArg) + + const version = versionArg || await getLatestPluginVersion(npmName) let toInstall = npmName if (version) toInstall += `@${version}` - await execYarn('add ' + toInstall) + const { stdout } = await execYarn('add ' + toInstall) + + logger.debug('Added a yarn package.', { yarnStdout: stdout }) } async function installNpmPluginFromDisk (path: string) { @@ -46,7 +51,7 @@ async function execYarn (command: string) { await outputJSON(pluginPackageJSON, {}) } - await execShell(`yarn ${command}`, { cwd: pluginDirectory }) + return execShell(`yarn ${command}`, { cwd: pluginDirectory }) } catch (result) { logger.error('Cannot exec yarn.', { command, err: result.err, stderr: result.stderr })