From b52620f68f320f03612e2d814109ce6cdf5bc3c7 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Wed, 18 Jul 2018 20:18:40 +0200 Subject: [PATCH] refactor: getUpdatedPackageFiles --- lib/workers/branch/get-updated.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/workers/branch/get-updated.js b/lib/workers/branch/get-updated.js index 2d613b9929..cf26300da3 100644 --- a/lib/workers/branch/get-updated.js +++ b/lib/workers/branch/get-updated.js @@ -7,14 +7,14 @@ module.exports = { async function getUpdatedPackageFiles(config) { logger.debug('manager.getUpdatedPackageFiles()'); logger.trace({ config }); - const updatedPackageFiles = {}; + const updatedFileContents = {}; for (const upgrade of config.upgrades) { - const { manager } = upgrade; + const { manager, packageFile } = upgrade; if (upgrade.updateType !== 'lockFileMaintenance') { const existingContent = - updatedPackageFiles[upgrade.packageFile] || - (await platform.getFile(upgrade.packageFile, config.parentBranch)); + updatedFileContents[packageFile] || + (await platform.getFile(packageFile, config.parentBranch)); let newContent = existingContent; const updateDependency = get(manager, 'updateDependency'); newContent = await updateDependency(existingContent, upgrade); @@ -38,15 +38,16 @@ async function getUpdatedPackageFiles(config) { }); } logger.debug('Updating packageFile content'); - updatedPackageFiles[upgrade.packageFile] = newContent; + updatedFileContents[packageFile] = newContent; } } } + const updatedPackageFiles = Object.keys(updatedFileContents).map(name => ({ + name, + contents: updatedFileContents[name], + })); return { parentBranch: config.parentBranch, // Need to overwrite original config - updatedPackageFiles: Object.keys(updatedPackageFiles).map(packageFile => ({ - name: packageFile, - contents: updatedPackageFiles[packageFile], - })), + updatedPackageFiles, }; } -- GitLab