Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(lerna): skip bootstrap if using a v7 range #23595

Merged
merged 1 commit into from
Jul 29, 2023
Merged

fix(lerna): skip bootstrap if using a v7 range #23595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 9 additions & 19 deletions lib/modules/manager/npm/post-update/lerna.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,33 +184,23 @@ describe('modules/manager/npm/post-update/lerna', () => {
const res = await lernaHelper.generateLockFiles(
lernaPkgFile('npm'),
'some-dir',
{ ...config, constraints: { ...config.constraints, npm: '6.0.0' } },
{
...config,
constraints: { ...config.constraints, lerna: '^7.1.4', npm: '6.0.0' },
},
viceice marked this conversation as resolved.
Show resolved Hide resolved
{}
);
expect(res.error).toBeFalse();
expect(execSnapshots).toMatchObject([
{ cmd: 'install-tool node 16.16.0' },
{ cmd: 'install-tool npm 6.0.0' },
{ cmd: 'hash -d npm 2>/dev/null || true' },
{ cmd: 'install-tool lerna 2.0.0' },
{
cmd: 'lerna info || echo "Ignoring lerna info failure"',
options: {
cwd: 'some-dir',
},
},
{
cmd: 'npm install --ignore-scripts --no-audit --package-lock-only',
options: {
cwd: 'some-dir',
},
},
{
cmd: 'lerna bootstrap --no-ci --ignore-scripts -- --ignore-scripts --no-audit --package-lock-only',
options: {
cwd: 'some-dir',
},
},
]);
});
});
Expand All @@ -219,7 +209,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
it('returns specified version', () => {
const pkg = {};
expect(
lernaHelper.getLernaVersion(pkg, {
lernaHelper.getLernaConstraint(pkg, {
devDependencies: { lerna: '2.0.0' },
})
).toBe('2.0.0');
Expand All @@ -228,26 +218,26 @@ describe('modules/manager/npm/post-update/lerna', () => {
it('returns specified range', () => {
const pkg = {};
expect(
lernaHelper.getLernaVersion(pkg, {
lernaHelper.getLernaConstraint(pkg, {
dependencies: { lerna: '1.x || >=2.5.0 || 5.0.0 - 7.2.3' },
})
).toBe('1.x || >=2.5.0 || 5.0.0 - 7.2.3');
});

it('returns latest if no lerna dep is specified', () => {
const pkg = {};
expect(lernaHelper.getLernaVersion(pkg, {})).toBeNull();
expect(lernaHelper.getLernaConstraint(pkg, {})).toBeNull();
});

it('returns latest if pkg has no deps at all', () => {
const pkg = {};
expect(lernaHelper.getLernaVersion(pkg, {})).toBeNull();
expect(lernaHelper.getLernaConstraint(pkg, {})).toBeNull();
});

it('returns latest if specified lerna version is not a valid semVer range', () => {
const pkg = {};
expect(
lernaHelper.getLernaVersion(pkg, { engines: { lerna: '[a.b.c;' } })
lernaHelper.getLernaConstraint(pkg, { engines: { lerna: '[a.b.c;' } })
).toBeNull();
});
});
Expand Down
19 changes: 11 additions & 8 deletions lib/modules/manager/npm/post-update/lerna.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import type { GenerateLockFileResult } from './types';
import { getPackageManagerVersion, lazyLoadPackageJson } from './utils';

// Exported for testability
export function getLernaVersion(
export function getLernaConstraint(
viceice marked this conversation as resolved.
Show resolved Hide resolved
lernaPackageFile: Partial<PackageFile<NpmManagerData>>,
lazyPkgJson: PackageJsonSchema
): string | null {
Expand Down Expand Up @@ -115,18 +115,21 @@ export async function generateLockFiles(
extraEnv.NPM_AUTH = env.NPM_AUTH;
extraEnv.NPM_EMAIL = env.NPM_EMAIL;
}
const lernaVersion =
const lernaConstraint =
viceice marked this conversation as resolved.
Show resolved Hide resolved
config.constraints?.lerna ??
getLernaVersion(lernaPackageFile, await lazyPgkJson.getValue());
getLernaConstraint(lernaPackageFile, await lazyPgkJson.getValue());
if (
!is.string(lernaVersion) ||
(semver.valid(lernaVersion) && semver.gte(lernaVersion, '7.0.0'))
!is.string(lernaConstraint) ||
(semver.valid(lernaConstraint) && semver.gte(lernaConstraint, '7.0.0')) ||
(semver.validRange(lernaConstraint) &&
(semver.satisfies('7.0.0', lernaConstraint) ||
semver.satisfies('7.999.999', lernaConstraint)))
viceice marked this conversation as resolved.
Show resolved Hide resolved
) {
logger.debug('Skipping lerna bootstrap');
logger.debug('Skipping lerna bootstrap for lerna >= 7.0.0');
cmd.push(`${lernaClient} install ${cmdOptions}`);
viceice marked this conversation as resolved.
Show resolved Hide resolved
} else {
logger.debug(`Using lerna version ${lernaVersion}`);
toolConstraints.push({ toolName: 'lerna', constraint: lernaVersion });
logger.debug(`Using lerna version ${lernaConstraint}`);
toolConstraints.push({ toolName: 'lerna', constraint: lernaConstraint });
cmd.push('lerna info || echo "Ignoring lerna info failure"');
cmd.push(`${lernaClient} install ${cmdOptions}`);
cmd.push(lernaCommand);
Expand Down