renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-14 08:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(npm): better logs when transitive remediation is prevented

Browse source
This commit is contained in:
Rhys Arkins 2021-05-14 12:44:02 +02:00
parent c482661cf5
commit 570ce0ccee
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/manager/npm/update/locked-dependency/dep-constraints.ts
View file

@ -1,4 +1,5 @@
import type { PackageJson } from 'type-fest'; import type { PackageJson } from 'type-fest';
import { logger } from '../../../../logger';
import { api as semver } from '../../../../versioning/npm'; import { api as semver } from '../../../../versioning/npm';
import type { PackageLockOrEntry, ParentDependency } from './types'; import type { PackageLockOrEntry, ParentDependency } from './types';
@ -29,7 +30,10 @@ export function findDepConstraints(
const { dependencies, requires, version } = lockEntry; const { dependencies, requires, version } = lockEntry;
if (parentDepName && requires) { if (parentDepName && requires) {
const constraint = requires[depName]; const constraint = requires[depName];
if (constraint && semver.matches(currentVersion, constraint)) { if (constraint) {
// istanbul ignore else
if (semver.isValid(constraint)) {
if (semver.matches(currentVersion, constraint)) {
if (constraint === currentVersion) { if (constraint === currentVersion) {
// Workaround for old versions of npm which wrote the exact version in requires instead of the constraint // Workaround for old versions of npm which wrote the exact version in requires instead of the constraint
requires[depName] = newVersion; requires[depName] = newVersion;
@ -40,6 +44,13 @@ export function findDepConstraints(
constraint, constraint,
}); });
} }
} else {
logger.warn(
{ parentDepName, depName, currentVersion, constraint },
'Parent constraint is invalid'
);
}
}
} }
if (dependencies) { if (dependencies) {
for (const [packageName, dependency] of Object.entries(dependencies)) { for (const [packageName, dependency] of Object.entries(dependencies)) {

5
lib/manager/npm/update/locked-dependency/index.ts
View file

@ -89,7 +89,10 @@ export async function updateLockedDependency(
); );
logger.trace({ deps: lockedDeps, constraints }, 'Matching details'); logger.trace({ deps: lockedDeps, constraints }, 'Matching details');
if (!constraints.length) { if (!constraints.length) {
logger.warn('Could not find constraints for the locked dependency'); logger.info(
{ depName, currentVersion, newVersion },
'Could not find constraints for the locked dependency - cannot remediate'
);
return null; return null;
} }
const parentUpdates: UpdateLockedConfig[] = []; const parentUpdates: UpdateLockedConfig[] = [];