Skip to content
Snippets Groups Projects
Unverified Commit 48d3ebab authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix(lerna): detect lerna in dependencies (#23575)

parent 4180be07
No related branches found
No related tags found
No related merge requests found
...@@ -219,7 +219,9 @@ describe('modules/manager/npm/post-update/lerna', () => { ...@@ -219,7 +219,9 @@ describe('modules/manager/npm/post-update/lerna', () => {
it('returns specified version', () => { it('returns specified version', () => {
const pkg = {}; const pkg = {};
expect( expect(
lernaHelper.getLernaVersion(pkg, { engines: { lerna: '2.0.0' } }) lernaHelper.getLernaVersion(pkg, {
devDependencies: { lerna: '2.0.0' },
})
).toBe('2.0.0'); ).toBe('2.0.0');
}); });
...@@ -227,7 +229,7 @@ describe('modules/manager/npm/post-update/lerna', () => { ...@@ -227,7 +229,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
const pkg = {}; const pkg = {};
expect( expect(
lernaHelper.getLernaVersion(pkg, { lernaHelper.getLernaVersion(pkg, {
engines: { lerna: '1.x || >=2.5.0 || 5.0.0 - 7.2.3' }, 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'); ).toBe('1.x || >=2.5.0 || 5.0.0 - 7.2.3');
}); });
......
...@@ -24,9 +24,10 @@ import { getPackageManagerVersion, lazyLoadPackageJson } from './utils'; ...@@ -24,9 +24,10 @@ import { getPackageManagerVersion, lazyLoadPackageJson } from './utils';
// Exported for testability // Exported for testability
export function getLernaVersion( export function getLernaVersion(
lernaPackageFile: Partial<PackageFile<NpmManagerData>>, lernaPackageFile: Partial<PackageFile<NpmManagerData>>,
lazyPgkJson: PackageJsonSchema lazyPkgJson: PackageJsonSchema
): string | null { ): string | null {
const constraint = getPackageManagerVersion('lerna', lazyPgkJson); const constraint =
lazyPkgJson.dependencies?.lerna ?? lazyPkgJson.devDependencies?.lerna;
if (!constraint || !semver.validRange(constraint)) { if (!constraint || !semver.validRange(constraint)) {
logger.warn( logger.warn(
// TODO: types (#7154) // TODO: types (#7154)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment