From b55b3782d83c59a8b8b43e6969958947d1795fa5 Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <z@kochan.io>
Date: Thu, 30 Jun 2022 11:00:52 +0300
Subject: [PATCH] fix: --lockfile-only in CI and with frozen-lockfile=true
 (#4955)

close #4951
---
 .changeset/lucky-icons-give.md                |  7 +++++++
 packages/core/src/install/index.ts            |  2 +-
 packages/core/test/install/lockfileOnly.ts    | 20 +++++++++++++++++++
 .../src/install.ts                            |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/lucky-icons-give.md

diff --git a/.changeset/lucky-icons-give.md b/.changeset/lucky-icons-give.md
new file mode 100644
index 00000000000..7e36b4b76f1
--- /dev/null
+++ b/.changeset/lucky-icons-give.md
@@ -0,0 +1,7 @@
+---
+"@pnpm/core": patch
+"@pnpm/plugin-commands-installation": patch
+"pnpm": patch
+---
+
+Never skip lockfile resolution when the lockfile is not up-to-date and `--lockfile-only` is used. Even if `frozen-lockfile` is `true` [#4951](https://github.com/pnpm/pnpm/issues/4951).
diff --git a/packages/core/src/install/index.ts b/packages/core/src/install/index.ts
index e46c1352253..24d6c032425 100644
--- a/packages/core/src/install/index.ts
+++ b/packages/core/src/install/index.ts
@@ -269,7 +269,7 @@ export async function mutateModules (
       !opts.fixLockfile &&
       installsOnly &&
       (
-        frozenLockfile ||
+        frozenLockfile && !opts.lockfileOnly ||
         opts.ignorePackageManifest ||
         !needsFullResolution &&
         opts.preferFrozenLockfile &&
diff --git a/packages/core/test/install/lockfileOnly.ts b/packages/core/test/install/lockfileOnly.ts
index 8e4e7ab8d95..8594963373d 100644
--- a/packages/core/test/install/lockfileOnly.ts
+++ b/packages/core/test/install/lockfileOnly.ts
@@ -76,3 +76,23 @@ test('warn when installing with lockfileOnly = true and node_modules exists', as
   const currentLockfile = await project.readCurrentLockfile()
   expect(currentLockfile.packages['/rimraf/2.5.1']).toBeFalsy()
 })
+
+// For @pnpm/core it might make sense to throw an exception in this case but for now it is better than having
+// the https://github.com/pnpm/pnpm/issues/4951 issue.
+test('always update the lockfile when lockfileOnly is used, even if frozenLockfile is used', async () => {
+  const project = prepareEmpty()
+  await addDependenciesToPackage({}, ['is-positive@1.0.0'], await testDefaults({
+    lockfileOnly: true,
+  }))
+  await install({
+    dependencies: {
+      'is-positive': '2.0.0',
+    },
+  }, await testDefaults({
+    lockfileOnly: true,
+    frozenLockfile: true,
+  }))
+
+  const lockfile = await project.readLockfile()
+  expect(lockfile.specifiers['is-positive']).toBe('2.0.0')
+})
diff --git a/packages/plugin-commands-installation/src/install.ts b/packages/plugin-commands-installation/src/install.ts
index 8805ceaafcf..aa9745fc5f5 100644
--- a/packages/plugin-commands-installation/src/install.ts
+++ b/packages/plugin-commands-installation/src/install.ts
@@ -300,7 +300,7 @@ export async function handler (
   }
   return installDeps({
     ...opts,
-    frozenLockfileIfExists: isCI &&
+    frozenLockfileIfExists: isCI && !opts.lockfileOnly &&
       typeof opts.rawLocalConfig['frozen-lockfile'] === 'undefined' &&
       typeof opts.rawLocalConfig['prefer-frozen-lockfile'] === 'undefined',
     include,