renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-11 22:46:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

feat(lerna): dynamic npm and yarn versioning

Browse source 
Closes #6369
This commit is contained in:
Rhys Arkins 2020-06-03 08:06:28 +02:00
parent 3a49eeaaf6
commit 098ed9a09c
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/manager/npm/post-update/lerna.spec.ts
View file

@ -70,7 +70,12 @@ describe('generateLockFiles()', () => {
JSON.stringify({ devDependencies: { lerna: '2.0.0' } }) JSON.stringify({ devDependencies: { lerna: '2.0.0' } })
); );
const execSnapshots = mockExecAll(exec); const execSnapshots = mockExecAll(exec);
const res = await lernaHelper.generateLockFiles('yarn', 'some-dir', {}, {}); const res = await lernaHelper.generateLockFiles(
'yarn',
'some-dir',
{ compatibility: { yarn: '^1.10.0' } },
{}
);
expect(execSnapshots).toMatchSnapshot(); expect(execSnapshots).toMatchSnapshot();
expect(res.error).toBe(false); expect(res.error).toBe(false);
}); });
@ -87,7 +92,10 @@ describe('generateLockFiles()', () => {
const res = await lernaHelper.generateLockFiles( const res = await lernaHelper.generateLockFiles(
'npm', 'npm',
'some-dir', 'some-dir',
{ dockerMapDotfiles: true }, {
dockerMapDotfiles: true,
compatibility: { npm: '^6.0.0' },
},
{} {}
); );
expect(res.error).toBe(false); expect(res.error).toBe(false);

15
lib/manager/npm/post-update/lerna.ts
View file

@ -1,4 +1,4 @@
import semver from 'semver'; import semver, { validRange } from 'semver';
import { quote } from 'shlex'; import { quote } from 'shlex';
import { join } from 'upath'; import { join } from 'upath';
import { logger } from '../../../logger'; import { logger } from '../../../logger';
@ -30,12 +30,23 @@ export async function generateLockFiles(
let cmdOptions = ''; let cmdOptions = '';
try { try {
if (lernaClient === 'yarn') { if (lernaClient === 'yarn') {
preCommands.push('npm i -g yarn'); let installYarn = 'npm i -g yarn';
const yarnCompatibility = config.compatibility?.yarn;
if (validRange(yarnCompatibility)) {
installYarn += `@${quote(yarnCompatibility)}`;
}
preCommands.push(installYarn);
if (skipInstalls !== false) { if (skipInstalls !== false) {
preCommands.push(optimizeCommand); preCommands.push(optimizeCommand);
} }
cmdOptions = '--ignore-scripts --ignore-engines --ignore-platform'; cmdOptions = '--ignore-scripts --ignore-engines --ignore-platform';
} else if (lernaClient === 'npm') { } else if (lernaClient === 'npm') {
let installNpm = 'npm i -g npm';
const npmCompatibility = config.compatibility?.npm;
if (validRange(npmCompatibility)) {
installNpm += `@${quote(npmCompatibility)}`;
preCommands.push(installNpm);
}
cmdOptions = '--ignore-scripts --no-audit'; cmdOptions = '--ignore-scripts --no-audit';
if (skipInstalls !== false) { if (skipInstalls !== false) {
cmdOptions += ' --package-lock-only'; cmdOptions += ' --package-lock-only';