Fix: install peerDeps which is not optional on headless install (#5243)

* fix: install peerDeps which is not optional on headless install * chore: add testcase for install peerDependencies which is not optional * refactor: auto install Co-authored-by: Zoltan Kochan <z@kochan.io>
pnpm · Aug 23, 2022 · 1beb1b4 · 1beb1b4
1 parent c242672
commit 1beb1b4
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 4 deletions.
diff --git a/.changeset/calm-windows-study.md b/.changeset/calm-windows-study.md
@@ -0,0 +1,7 @@
+---
+"@pnpm/filter-lockfile": patch
+"@pnpm/headless": patch
+"pnpm": patch
+---
+
+Auto install peer dependencies when auto-install-peers is set to true and the lockfile is up to date [#5213](https://github.com/pnpm/pnpm/issues/5213).
diff --git a/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts
@@ -161,10 +161,7 @@ function pkgAllDeps (
         ...pkgSnapshot.dependencies,
         ...(opts.include.optionalDependencies ? pkgSnapshot.optionalDependencies : {}),
       })
-      .map(([pkgName, ref]) => {
-        if (pkgSnapshot.peerDependencies?.[pkgName]) return null
-        return dp.refToRelative(ref, pkgName)
-      })
+      .map(([pkgName, ref]) => dp.refToRelative(ref, pkgName))
       .filter((nodeId) => nodeId !== null) as string[]
 
     pkgAllDeps(ctx, nextRelDepPaths, installable, opts)

diff --git a/packages/headless/test/fixtures/reinstall-peer-deps/.npmrc b/packages/headless/test/fixtures/reinstall-peer-deps/.npmrc
@@ -0,0 +1 @@
+auto-install-peers=true
diff --git a/packages/headless/test/fixtures/reinstall-peer-deps/package.json b/packages/headless/test/fixtures/reinstall-peer-deps/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "reinstall-peer-deps",
+  "version": "1.0.0",
+  "devDependencies": {
+    "@pnpm.e2e/abc": "1.0.0"
+  }
+}
diff --git a/packages/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml b/packages/headless/test/fixtures/reinstall-peer-deps/pnpm-lock.yaml
diff --git a/packages/headless/test/index.ts b/packages/headless/test/index.ts
@@ -528,6 +528,16 @@ test('installation of a dependency that has a resolved peer in subdeps', async (
   expect(project.requireModule('pnpm-default-reporter')).toBeTruthy()
 })
 
+test('install peer dependencies that are in prod dependencies', async () => {
+  const prefix = f.prepare('reinstall-peer-deps')
+
+  await headless(await testDefaults({ lockfileDir: prefix }))
+
+  const project = assertProject(prefix)
+
+  await project.has('.pnpm/@pnpm.e2e+peer-a@1.0.1/node_modules/@pnpm.e2e/peer-a')
+})
+
 test('installing with hoistPattern=*', async () => {
   const prefix = f.prepare('simple-shamefully-flatten')
   const reporter = jest.fn()