refactor: remove newVersion usage (#8710)

lib/config/__snapshots__/migration.spec.ts.snap

@@ -326,7 +326,7 @@ exports[`config/migration migrateConfig(config, parentConfig) migrates packageRu
 Object {
   "packageRules": Array [
     Object {
-      "commitMessage": "fix(package): update peerDependency to accept typescript ^{{newValue}} {{newValue}}",
+      "commitMessage": "fix(package): update peerDependency to accept typescript ^{{newMajor}} {{newMajor}}",
       "matchPackageNames": Array [
         "typescript",
       ],

lib/config/migration.spec.ts

@@ -313,7 +313,7 @@ describe('config/migration', () => {
           packageNames: ['typescript'],
           updateTypes: ['major'],
           commitMessage:
-            'fix(package): update peerDependency to accept typescript ^{{newVersion}} {{newVersion}}',
+            'fix(package): update peerDependency to accept typescript ^{{newValueMajor}} {{newValueMajor}}',
         },
       } as any;
       const { isMigrated, migratedConfig } = configMigration.migrateConfig(

lib/config/migration.ts

@@ -505,9 +505,9 @@ export function migrateConfig(
       }
       const migratedTemplates = {
         fromVersion: 'currentVersion',
-        newVersion: 'newValue',
         newValueMajor: 'newMajor',
         newValueMinor: 'newMinor',
+        newVersion: 'toVersion',
         newVersionMajor: 'newMajor',
         newVersionMinor: 'newMinor',
       };

lib/datasource/docker/index.ts

@@ -28,7 +28,7 @@ export const defaultConfig = {
   commitMessageTopic: '{{{depName}}} Docker tag',
   major: { enabled: false },
   commitMessageExtra:
-    'to v{{#if isMajor}}{{{newMajor}}}{{else}}{{{newVersion}}}{{/if}}',
+    'to v{{#if isMajor}}{{{newMajor}}}{{else}}{{{toVersion}}}{{/if}}',
   digest: {
     branchTopic: '{{{depNameSanitized}}}-{{{currentValue}}}',
     commitMessageExtra: 'to {{newDigestShort}}',

lib/manager/batect-wrapper/artifacts.spec.ts

@@ -3,13 +3,13 @@ import * as httpMock from '../../../test/http-mock';
 import { UpdateArtifact } from '../common';
 import { updateArtifacts } from './artifacts';
 
-const newVersion = '1.2.3';
-const newUnixWrapperContent = `Unix wrapper script for ${newVersion}`;
-const newWindowsWrapperContent = `Windows wrapper script for ${newVersion}`;
+const defaultTo = '1.2.3';
+const newUnixWrapperContent = `Unix wrapper script for ${defaultTo}`;
+const newWindowsWrapperContent = `Windows wrapper script for ${defaultTo}`;
 
 function artifactForPath(
   path: string,
-  toVersion: string = newVersion
+  toVersion: string = defaultTo
 ): UpdateArtifact {
   return {
     packageFileName: path,

lib/manager/common.ts

@@ -147,7 +147,6 @@ export interface LookupUpdate {
   newMajor?: number;
   newMinor?: number;
   newValue: string;
-  newVersion?: string;
   semanticCommitType?: string;
   skippedOverVersions?: string[];
   toVersion?: string;
@@ -195,7 +194,6 @@ export interface Upgrade<T = Record<string, any>>
   newFrom?: string;
   newMajor?: number;
   newValue?: string;
-  newVersion?: string;
   packageFile?: string;
   rangeStrategy?: RangeStrategy;
   toVersion?: string;

lib/manager/git-submodules/update.ts

@@ -12,7 +12,7 @@ export default async function updateDependency({
 
   try {
     await git.submoduleUpdate(['--init', upgrade.depName]);
-    await submoduleGit.checkout([upgrade.newVersion]);
+    await submoduleGit.checkout([upgrade.toVersion]);
     return fileContent;
   } catch (err) {
     return null;

lib/manager/gradle/build-gradle.ts

@@ -18,7 +18,7 @@ interface UpdateFunction {
   (
     dependency: GradleDependency,
     buildGradleContent: string,
-    newVersion: string
+    newValue: string
   ): string;
 }
 
@@ -240,7 +240,7 @@ export function init(): void {
 function updateVersionLiterals(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   const regexes: RegExp[] = [
     moduleStringVersionFormatMatch(dependency),
@@ -254,7 +254,7 @@ function updateVersionLiterals(
   for (const regex of regexes) {
     const match = regex.exec(result);
     if (match) {
-      result = result.replace(match[0], `${match[1]}${newVersion}${match[2]}`);
+      result = result.replace(match[0], `${match[1]}${newValue}${match[2]}`);
     }
   }
   return result === buildGradleContent ? null : result;
@@ -263,7 +263,7 @@ function updateVersionLiterals(
 function updateLocalVariables(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   const regexes: RegExp[] = [
     ...moduleMapVariableVersionFormatMatch(dependency),
@@ -284,7 +284,7 @@ function updateLocalVariables(
       if (variableDefinitionMatch) {
         return buildGradleContent.replace(
           variableDefinitionMatch[0],
-          `${variableDefinitionMatch[1]}${newVersion}${variableDefinitionMatch[3]}`
+          `${variableDefinitionMatch[1]}${newValue}${variableDefinitionMatch[3]}`
         );
       }
     }
@@ -295,7 +295,7 @@ function updateLocalVariables(
 function updateGlobalVariables(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   const variable = variables[`${dependency.group}:${dependency.name}`];
   if (variable) {
@@ -304,7 +304,7 @@ function updateGlobalVariables(
     if (match) {
       return buildGradleContent.replace(
         match[0],
-        `${match[1]}${newVersion}${match[3]}`
+        `${match[1]}${newValue}${match[3]}`
       );
     }
   }
@@ -314,7 +314,7 @@ function updateGlobalVariables(
 function updateGlobalMapVariables(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   let variable = variables[`${dependency.group}:${dependency.name}`];
   if (variable) {
@@ -327,7 +327,7 @@ function updateGlobalMapVariables(
       if (match) {
         return buildGradleContent.replace(
           match[0],
-          `${match[1]}${newVersion}${match[3]}`
+          `${match[1]}${newValue}${match[3]}`
         );
       }
 
@@ -341,7 +341,7 @@ function updateGlobalMapVariables(
 function updateKotlinVariablesByExtra(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   const variable = variables[`${dependency.group}:${dependency.name}`];
   if (variable) {
@@ -352,7 +352,7 @@ function updateKotlinVariablesByExtra(
     if (match) {
       return buildGradleContent.replace(
         match[0],
-        `${match[1]}${newVersion}${match[3]}`
+        `${match[1]}${newValue}${match[3]}`
       );
     }
   }
@@ -362,14 +362,14 @@ function updateKotlinVariablesByExtra(
 function updatePropertyFileGlobalVariables(
   dependency: GradleDependency,
   buildGradleContent: string,
-  newVersion: string
+  newValue: string
 ): string | null {
   const variable = variables[`${dependency.group}:${dependency.name}`];
   if (variable) {
     const regex = regEx(`(${variable}\\s*=\\s*)(.*)`);
     const match = regex.exec(buildGradleContent);
     if (match) {
-      return buildGradleContent.replace(match[0], `${match[1]}${newVersion}`);
+      return buildGradleContent.replace(match[0], `${match[1]}${newValue}`);
     }
   }
   return null;
@@ -378,7 +378,7 @@ function updatePropertyFileGlobalVariables(
 export function updateGradleVersion(
   buildGradleContent: string,
   dependency: GradleDependency,
-  newVersion: string
+  newValue: string
 ): string {
   if (dependency) {
     const updateFunctions: UpdateFunction[] = [
@@ -394,7 +394,7 @@ export function updateGradleVersion(
       const gradleContentUpdated = updateFunction(
         dependency,
         buildGradleContent,
-        newVersion
+        newValue
       );
       if (gradleContentUpdated) {
         return gradleContentUpdated;

lib/manager/sbt/update.ts

@@ -12,20 +12,20 @@ export function bumpPackageVersion(
     'Checking if we should bump build.sbt version'
   );
   let bumpedContent = content;
-  const newVersion = inc(currentValue, bumpVersion as ReleaseType);
-  if (!newVersion) {
+  const bumpedVersion = inc(currentValue, bumpVersion as ReleaseType);
+  if (!bumpedVersion) {
     logger.warn('Version incremental failed');
     return { bumpedContent };
   }
   bumpedContent = content.replace(
     /^(version\s*:=\s*).*$/m,
-    `$1"${newVersion}"`
+    `$1"${bumpedVersion}"`
   );
 
   if (bumpedContent === content) {
     logger.debug('Version was already bumped');
   } else {
-    logger.debug({ newVersion }, 'Bumped build.sbt version');
+    logger.debug({ bumpedVersion }, 'Bumped build.sbt version');
   }
 
   return { bumpedContent };

lib/util/template/index.ts

@@ -72,7 +72,6 @@ export const allowedFields = {
     'The minor version of the new version. e.g. "1" if the new version if "3.1.0"',
   newValue:
     'The new value in the upgrade. Can be a range or version e.g. "^3.0.0" or "3.1.0"',
-  newVersion: 'The new version in the upgrade.',
   packageFile: 'The filename that the dependency was found in',
   packageFileDir:
     'The directory with full path where the packageFile was found',

lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap

@@ -257,8 +257,7 @@ Object {
     Object {
       "currentVersion": undefined,
       "newValue": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
-      "newVersion": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
-      "toVersion": undefined,
+      "toVersion": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
       "updateType": "digest",
     },
   ],
@@ -1285,7 +1284,6 @@ Object {
       "newMajor": 9,
       "newMinor": null,
       "newValue": "9",
-      "newVersion": "9",
       "toVersion": "9",
       "updateType": "major",
     },
@@ -1309,7 +1307,6 @@ Object {
       "newMajor": 8,
       "newMinor": 2,
       "newValue": "8.2",
-      "newVersion": "8.2",
       "toVersion": "8.2",
       "updateType": "minor",
     },
@@ -1320,7 +1317,6 @@ Object {
       "newMajor": 9,
       "newMinor": 0,
       "newValue": "9.0",
-      "newVersion": "9.0",
       "toVersion": "9.0",
       "updateType": "major",
     },
@@ -1344,7 +1340,6 @@ Object {
       "newMajor": 8,
       "newMinor": 2,
       "newValue": "8.2.5",
-      "newVersion": "8.2.5",
       "skippedOverVersions": Array [
         "8.1.5",
         "8.2.0",

lib/workers/repository/process/lookup/index.ts

@@ -450,7 +450,7 @@ export async function lookupUpdates(
     }
     if (versioning.valueToVersion) {
       for (const update of res.updates || []) {
-        update.newVersion = versioning.valueToVersion(update.newValue);
+        update.toVersion = versioning.valueToVersion(update.newValue);
         update.currentVersion = versioning.valueToVersion(
           update.currentVersion
         );

lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap

@@ -124,7 +124,7 @@ Object {
       "datasource": "npm",
       "depName": "@types/some-dep",
       "displayFrom": "0.5.7",
-      "displayTo": "",
+      "displayTo": "0.5.8",
       "isRange": false,
       "prTitle": "some-title",
       "prettyDepType": "dependency",

lib/workers/repository/updates/flatten.ts

@@ -48,8 +48,8 @@ export async function flattenUpdates(
           for (const update of dep.updates) {
             let updateConfig = mergeChildConfig(depConfig, update);
             delete updateConfig.updates;
-            updateConfig.newVersion =
-              updateConfig.newVersion || updateConfig.newValue;
+            updateConfig.toVersion =
+              updateConfig.toVersion || updateConfig.newValue;
             if (updateConfig.updateType) {
               updateConfig[`is${upper(updateConfig.updateType)}`] = true;
             }

lib/workers/repository/updates/generate.ts

@@ -124,15 +124,15 @@ export function generateBranchConfig(
         upgrade.displayTo =
           upgrade.displayTo ||
           upgrade.newDigestShort ||
-          upgrade.newVersion ||
+          upgrade.toVersion ||
           '';
       } else {
         upgrade.displayFrom =
           upgrade.currentValue || upgrade.currentDigestShort || '';
         upgrade.displayTo =
           upgrade.displayTo ||
           upgrade.newValue ||
-          upgrade.newVersion ||
+          upgrade.toVersion ||
           upgrade.newDigestShort ||
           '';
       }