From fb8e34dbc89a2250bf62aa79d7c80ad72fd64906 Mon Sep 17 00:00:00 2001 From: Misha Kaletsky <15040698+mmkal@users.noreply.github.com> Date: Fri, 17 Jul 2020 13:13:20 +0100 Subject: [PATCH] fix: revert: add currentValue to yarn upgrade command (#6775) * Revert "fix: add currentValue to yarn upgrade command (#6759)" This reverts commit 1c00491310d8426ed8fb88e4095c2e8d4a96c9a7. Co-authored-by: Michael Kriese <michael.kriese@visualon.de> --- lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap | 4 ++-- lib/manager/npm/post-update/yarn.spec.ts | 2 -- lib/manager/npm/post-update/yarn.ts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap b/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap index cd859537c0..3edffc2f3f 100644 --- a/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap +++ b/lib/manager/npm/post-update/__snapshots__/yarn.spec.ts.snap @@ -222,7 +222,7 @@ Array [ }, }, Object { - "cmd": "yarn upgrade some-dep@^1.2.3 --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts", + "cmd": "yarn upgrade some-dep --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts", "options": Object { "cwd": "some-dir", "encoding": "utf-8", @@ -261,7 +261,7 @@ Array [ }, }, Object { - "cmd": "yarn upgrade some-dep@^1.2.3 --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts", + "cmd": "yarn upgrade some-dep --ignore-engines --ignore-platform --network-timeout 100000 --ignore-scripts", "options": Object { "cwd": "some-dir", "encoding": "utf-8", diff --git a/lib/manager/npm/post-update/yarn.spec.ts b/lib/manager/npm/post-update/yarn.spec.ts index 78c43d8e65..e26f857efd 100644 --- a/lib/manager/npm/post-update/yarn.spec.ts +++ b/lib/manager/npm/post-update/yarn.spec.ts @@ -65,7 +65,6 @@ describe(getName(__filename), () => { const res = await yarnHelper.generateLockFile('some-dir', {}, {}, [ { depName: 'some-dep', - currentValue: '^1.2.3', isLockfileUpdate: true, }, ]); @@ -88,7 +87,6 @@ describe(getName(__filename), () => { const res = await yarnHelper.generateLockFile('some-dir', {}, {}, [ { depName: 'some-dep', - currentValue: '^1.2.3', isLockfileUpdate: true, }, ]); diff --git a/lib/manager/npm/post-update/yarn.ts b/lib/manager/npm/post-update/yarn.ts index b64b4a281d..7674240a6a 100644 --- a/lib/manager/npm/post-update/yarn.ts +++ b/lib/manager/npm/post-update/yarn.ts @@ -94,7 +94,7 @@ export async function generateLockFile( // rangeStrategy = update-lockfile const lockUpdates = upgrades .filter((upgrade) => upgrade.isLockfileUpdate) - .map((upgrade) => `${upgrade.depName}@${upgrade.currentValue}`); + .map((upgrade) => upgrade.depName); // note - this can hit a yarn bug, see https://github.com/yarnpkg/yarn/issues/8236 if (lockUpdates.length) { logger.debug('Performing lockfileUpdate (yarn)'); commands.push( -- GitLab