diff --git a/lib/modules/manager/npm/extract/yarn.ts b/lib/modules/manager/npm/extract/yarn.ts index 0e13e39207ae42587da63b5400bc7d64d8e7df6b..cee4f1577627804e511a690db40fdd6b77e0b614 100644 --- a/lib/modules/manager/npm/extract/yarn.ts +++ b/lib/modules/manager/npm/extract/yarn.ts @@ -21,6 +21,9 @@ export async function getYarnLock(filePath: string): Promise<LockFile> { if (key === '__metadata') { // yarn 2 lockfileVersion = parseInt(val.cacheKey, 10); + logger.once.debug( + `yarn.lock ${filePath} has __metadata.cacheKey=${lockfileVersion}`, + ); } else { for (const entry of key.split(', ')) { try { @@ -39,8 +42,18 @@ export async function getYarnLock(filePath: string): Promise<LockFile> { } } } + const isYarn1 = !('__metadata' in parsed); + if (isYarn1) { + logger.once.debug( + `yarn.lock ${filePath} is has no __metadata so is yarn 1`, + ); + } else { + logger.once.debug( + `yarn.lock ${filePath} is has __metadata so is yarn 2+`, + ); + } return { - isYarn1: !('__metadata' in parsed), + isYarn1, lockfileVersion, lockedVersions, }; diff --git a/lib/modules/manager/npm/post-update/utils.ts b/lib/modules/manager/npm/post-update/utils.ts index a38da9ee45e054c99946efe53f4dada518f6dd3a..e799e3165285dc710f2ee0dd78ae6e97c2c230ec 100644 --- a/lib/modules/manager/npm/post-update/utils.ts +++ b/lib/modules/manager/npm/post-update/utils.ts @@ -1,4 +1,5 @@ import upath from 'upath'; +import { logger } from '../../../../logger'; import { readLocalFile } from '../../../../util/fs'; import { Lazy } from '../../../../util/lazy'; import { PackageJson, PackageJsonSchema } from '../schema'; @@ -30,10 +31,18 @@ export function getPackageManagerVersion( pkg: PackageJsonSchema, ): string | null { if (pkg.packageManager?.name === name) { - return pkg.packageManager.version; + const version = pkg.packageManager.version; + logger.debug( + `Found ${name} constraint in package.json packageManager: ${version}`, + ); + return version; } if (pkg.engines?.[name]) { - return pkg.engines[name]; + const version = pkg.engines[name]; + logger.debug( + `Found ${name} constraint in package.json engines: ${version}`, + ); + return version; } return null; }