fix(lookup): currentVersion = lockedVersion (#12922)

renovatebot · Dec 2, 2021 · 8e156ef · 8e156ef
1 parent e8e99ef
commit 8e156ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/lib/workers/repository/process/lookup/current.ts b/lib/workers/repository/process/lookup/current.ts
@@ -11,9 +11,6 @@ export function getCurrentVersion(
   latestVersion: string,
   allVersions: string[]
 ): string | null {
-  if (lockedVersion && is.undefined(currentValue)) {
-    return allVersions.pop();
-  }
   // istanbul ignore if
   if (!is.string(currentValue)) {
     return null;

diff --git a/lib/workers/repository/process/lookup/filter.ts b/lib/workers/repository/process/lookup/filter.ts
@@ -29,6 +29,7 @@ export function filterVersions(
     }
     return true;
   }
+  // istanbul ignore if: shouldn't happen
   if (!currentVersion) {
     return [];
   }

diff --git a/lib/workers/repository/process/lookup/index.spec.ts b/lib/workers/repository/process/lookup/index.spec.ts
@@ -351,7 +351,7 @@ describe('workers/repository/process/lookup/index', () => {
       expect(res.updates).toMatchInlineSnapshot(`
         Array [
           Object {
-            "bucket": "major",
+            "bucket": "non-major",
             "isLockfileUpdate": true,
             "isRange": true,
             "newMajor": 1,

diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts
@@ -169,7 +169,11 @@ export async function lookupUpdates(
       const nonDeprecatedVersions = dependency.releases
         .filter((release) => !release.isDeprecated)
         .map((release) => release.version);
-      const currentVersion =
+      let currentVersion: string;
+      if (rangeStrategy === 'update-lockfile') {
+        currentVersion = lockedVersion;
+      }
+      currentVersion ??=
         getCurrentVersion(
           currentValue,
           lockedVersion,
@@ -209,22 +213,15 @@ export async function lookupUpdates(
           newMajor: versioning.getMajor(currentVersion),
         });
       }
-      let filterStart = currentVersion;
-      if (lockedVersion) {
-        // istanbul ignore if
-        if (!versioning.isVersion(lockedVersion)) {
-          res.skipReason = SkipReason.InvalidVersion;
-          return res;
-        }
-        if (rangeStrategy === 'update-lockfile') {
-          // Look for versions greater than the current locked version that still satisfy the package.json range
-          filterStart = lockedVersion;
-        }
+      // istanbul ignore if
+      if (!versioning.isVersion(currentVersion)) {
+        res.skipReason = SkipReason.InvalidVersion;
+        return res;
       }
       // Filter latest, unstable, etc
       let filteredReleases = filterVersions(
         config,
-        filterStart,
+        currentVersion,
         latestVersion,
         allVersions,
         versioning