diff --git a/lib/workers/package-file/index.js b/lib/workers/package-file/index.js
index 62b667101db0bc8aa0c69100baab3af8c48ce435..5a1bad604f81f46fc9363f8cd594d16aab52b31d 100644
--- a/lib/workers/package-file/index.js
+++ b/lib/workers/package-file/index.js
@@ -104,7 +104,7 @@ async function renovatePackageFile(packageFileConfig) {
(depType === 'devDependencies' ||
(depType === 'dependencies' && !mightBeABrowserLibrary(config.content)))
) {
- logger.debug('Autodetecting pinVersions = true');
+ logger.debug({ depType }, 'Autodetecting pinVersions = true');
depTypeConfig.pinVersions = true;
}
logger.trace({ config: depTypeConfig }, 'depTypeConfig');
diff --git a/lib/workers/package/versions.js b/lib/workers/package/versions.js
index 010ac5af33589323d08e80cd8c188dc7dffd87d8..9ff8591a43e1be71044856d00f4fca6a9fc6f786 100644
--- a/lib/workers/package/versions.js
+++ b/lib/workers/package/versions.js
@@ -12,7 +12,8 @@ module.exports = {
};
function determineUpgrades(npmDep, config) {
- logger.debug({ dependency: npmDep.name }, `determineUpgrades()`);
+ const dependency = npmDep.name;
+ logger.debug({ dependency }, `determineUpgrades()`);
logger.trace({ npmDep, config });
const result = {
type: 'warning',
@@ -21,7 +22,7 @@ function determineUpgrades(npmDep, config) {
const { versions } = npmDep;
if (!versions || Object.keys(versions).length === 0) {
result.message = `No versions returned from registry for this package`;
- logger.warn(result.message);
+ logger.warn({ dependency }, result.message);
return [result];
}
const versionList = Object.keys(versions);
@@ -34,20 +35,17 @@ function determineUpgrades(npmDep, config) {
newVersion = lockedVersion;
} else {
// Pin ranges to their maximum satisfying version
- logger.debug(
- { dependency: npmDep.name },
- 'currentVersion is range, not locked'
- );
+ logger.debug({ dependency }, 'currentVersion is range, not locked');
const maxSatisfying = semver.maxSatisfying(versionList, currentVersion);
if (!maxSatisfying) {
result.message = `No satisfying version found for existing dependency range "${currentVersion}"`;
logger.info(
- { dependency: npmDep.name, currentVersion },
+ { dependency, currentVersion },
`Warning: ${result.message}`
);
return [result];
}
- logger.debug({ maxSatisfying });
+ logger.debug({ dependency, maxSatisfying });
newVersion = maxSatisfying;
}
@@ -59,7 +57,7 @@ function determineUpgrades(npmDep, config) {
};
changeLogFromVersion = newVersion;
} else if (versionList.indexOf(currentVersion) === -1) {
- logger.debug({ dependency: npmDep.name }, 'Cannot find currentVersion');
+ logger.debug({ dependency }, 'Cannot find currentVersion');
try {
const rollbackVersion = semver.maxSatisfying(
versionList,
@@ -76,7 +74,7 @@ function determineUpgrades(npmDep, config) {
};
} catch (err) /* istanbul ignore next */ {
logger.info(
- { dependency: npmDep.name, currentVersion },
+ { dependency, currentVersion },
'Warning: current version is missing from npm registry and cannot roll back'
);
}
@@ -177,12 +175,12 @@ function determineUpgrades(npmDep, config) {
return upgrades;
}
- logger.debug('User wanrs ranges - filtering out pins');
+ logger.debug({ dependency }, 'User wanrs ranges - filtering out pins');
upgrades = upgrades.filter(upgrade => upgrade.type !== 'pin');
// Return empty if all results were pins
if (!upgrades.length) {
- logger.debug('No upgrades left - returning');
+ logger.debug({ dependency }, 'No upgrades left - returning');
return [];
}
@@ -193,19 +191,19 @@ function determineUpgrades(npmDep, config) {
const secondLastSemver = semverParsed[semverParsed.length - 2];
if (semverParsed.length > 1) {
if (lastSemver.operator === '<' || lastSemver.operator === '<=') {
- logger.debug('Found less than range');
+ logger.debug({ dependency }, 'Found less than range');
} else if (secondLastSemver.operator === '||') {
- logger.debug('Found an OR range');
+ logger.debug({ dependency }, 'Found an OR range');
} else if (secondLastSemver.operator === '-') {
logger.info(
- { currentVersion, upgrades, semverParsed },
+ { dependency, currentVersion, upgrades, semverParsed },
'Found a hyphen range'
);
} else {
// We don't know how to support complex semver ranges, so don't upgrade
result.message = `Complex semver ranges such as "${currentVersion}" are not yet supported so will be skipped`;
logger.info(
- { dependency: npmDep.name, upgrades, semverParsed },
+ { dependency, upgrades, semverParsed },
'Semver warning: ' + result.message
);
return [result];
@@ -284,18 +282,18 @@ function determineUpgrades(npmDep, config) {
const patchZero = !lastSemver.patch || lastSemver.patch === '0';
const newRange = [...semverParsed];
if (minorZero && patchZero) {
- logger.debug('Found a less than major');
+ logger.debug({ dependency }, 'Found a less than major');
newRange[newRange.length - 1].major = String(
upgrade.newVersionMajor + 1
);
} else if (patchZero) {
- logger.debug('Found a less than minor');
+ logger.debug({ dependency }, 'Found a less than minor');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
newRange[newRange.length - 1].minor = String(
upgrade.newVersionMinor + 1
);
} else {
- logger.debug('Found a less than full semver');
+ logger.debug({ dependency }, 'Found a less than full semver');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
newRange[newRange.length - 1].minor = String(upgrade.newVersionMinor);
newRange[newRange.length - 1].patch = String(
@@ -309,18 +307,18 @@ function determineUpgrades(npmDep, config) {
const patchZero = !lastSemver.patch || lastSemver.patch === '0';
const newRange = [...semverParsed];
if (minorZero && patchZero) {
- logger.debug('Found a less than major');
+ logger.debug({ dependency }, 'Found a less than major');
newRange[newRange.length - 1].major = String(
upgrade.newVersionMajor + 1
);
} else if (patchZero) {
- logger.debug('Found a less than minor');
+ logger.debug({ dependency }, 'Found a less than minor');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
newRange[newRange.length - 1].minor = String(
upgrade.newVersionMinor + 1
);
} else {
- logger.debug('Found full semver minor');
+ logger.debug({ dependency }, 'Found full semver minor');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
newRange[newRange.length - 1].minor = String(upgrade.newVersionMinor);
newRange[newRange.length - 1].patch = String(
@@ -332,7 +330,7 @@ function determineUpgrades(npmDep, config) {
} else if (lastSemver.minor === undefined) {
// Example: 1
const newRange = [...semverParsed];
- logger.debug('Found a standalone major');
+ logger.debug({ dependency }, 'Found a standalone major');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
let newVersion;
if (secondLastSemver && secondLastSemver.operator === '||') {
@@ -346,7 +344,7 @@ function determineUpgrades(npmDep, config) {
} else if (lastSemver.minor === 'x') {
// Example: 1.x
const newRange = [...semverParsed];
- logger.debug('Found a .x');
+ logger.debug({ dependency }, 'Found a .x');
newRange[newRange.length - 1].major = String(upgrade.newVersionMajor);
let newVersion;
if (secondLastSemver && secondLastSemver.operator === '||') {
@@ -367,7 +365,7 @@ function determineUpgrades(npmDep, config) {
// istanbul ignore next
result.message = `The current semver range "${currentVersion}" is not supported so won't ever be upgraded`;
// istanbul ignore next
- logger.warn(result.message);
+ logger.warn({ dependency }, result.message);
// istanbul ignore next
return null;
})