diff --git a/lib/workers/repository/update/branch/get-updated.ts b/lib/workers/repository/update/branch/get-updated.ts index 59bdac1e429a12dfa9b921b3fad62878a579c2a5..2c69a82fdbd64069506e1fd0362b2f23147cdb67 100644 --- a/lib/workers/repository/update/branch/get-updated.ts +++ b/lib/workers/repository/update/branch/get-updated.ts @@ -14,7 +14,7 @@ import type { import { getFile } from '../../../../util/git'; import type { FileAddition, FileChange } from '../../../../util/git/types'; import { coerceString } from '../../../../util/string'; -import type { BranchConfig } from '../../../types'; +import type { BranchConfig, BranchUpgradeConfig } from '../../../types'; import { doAutoReplace } from './auto-replace'; export interface PackageFilesResult { @@ -231,7 +231,6 @@ export async function getUpdatedPackageFiles( } } } else { - const bumpPackageVersion = get(manager, 'bumpPackageVersion'); const updateDependency = get(manager, 'updateDependency'); if (!updateDependency) { let res = await doAutoReplace( @@ -242,19 +241,7 @@ export async function getUpdatedPackageFiles( ); firstUpdate = false; if (res) { - if ( - bumpPackageVersion && - upgrade.bumpVersion && - upgrade.packageFileVersion - ) { - const { bumpedContent } = await bumpPackageVersion( - res, - upgrade.packageFileVersion, - upgrade.bumpVersion, - packageFile, - ); - res = bumpedContent; - } + res = await applyManagerBumpPackageVersion(res, upgrade); if (res === packageFileContent) { logger.debug({ packageFile, depName }, 'No content changed'); } else { @@ -276,20 +263,7 @@ export async function getUpdatedPackageFiles( fileContent: packageFileContent!, upgrade, }); - if ( - newContent && - bumpPackageVersion && - upgrade.bumpVersion && - upgrade.packageFileVersion - ) { - const { bumpedContent } = await bumpPackageVersion( - newContent, - upgrade.packageFileVersion, - upgrade.bumpVersion, - packageFile, - ); - newContent = bumpedContent; - } + newContent = await applyManagerBumpPackageVersion(newContent, upgrade); if (!newContent) { if (reuseExistingBranch) { logger.debug( @@ -530,3 +504,27 @@ function processUpdateArtifactResults( } } } + +async function applyManagerBumpPackageVersion( + packageFileContent: string | null, + upgrade: BranchUpgradeConfig, +): Promise<string | null> { + const bumpPackageVersion = get(upgrade.manager, 'bumpPackageVersion'); + if ( + !bumpPackageVersion || + !packageFileContent || + !upgrade.bumpVersion || + !upgrade.packageFileVersion + ) { + return packageFileContent; + } + + const result = await bumpPackageVersion( + packageFileContent, + upgrade.packageFileVersion, + upgrade.bumpVersion, + upgrade.packageFile!, + ); + + return result.bumpedContent; +}