fix: dedupe-peer-dependents should not remove peer deps

close #6154
pnpm · Mar 25, 2023 · 0562519 · 0562519
1 parent eb5b7d5
commit 0562519
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 58 deletions.
diff --git a/__utils__/assert-project/package.json b/__utils__/assert-project/package.json
@@ -44,7 +44,7 @@
     "@pnpm/constants": "workspace:*",
     "@pnpm/lockfile-types": "workspace:*",
     "@pnpm/modules-yaml": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/types": "workspace:*",
     "is-windows": "^1.0.2",
     "isexe": "2.0.0",

diff --git a/__utils__/assert-store/package.json b/__utils__/assert-store/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@pnpm/cafs": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "path-exists": "^4.0.0"
   },
   "devDependencies": {

diff --git a/exec/plugin-commands-rebuild/package.json b/exec/plugin-commands-rebuild/package.json
@@ -38,7 +38,7 @@
     "@pnpm/filter-workspace-packages": "workspace:*",
     "@pnpm/plugin-commands-rebuild": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/ramda": "0.28.20",
     "@types/semver": "7.3.13",

diff --git a/exec/plugin-commands-script-runners/package.json b/exec/plugin-commands-script-runners/package.json
@@ -37,7 +37,7 @@
     "@pnpm/filter-workspace-packages": "workspace:*",
     "@pnpm/plugin-commands-script-runners": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@types/is-windows": "^1.0.0",
     "@types/ramda": "0.28.20",
     "is-windows": "^1.0.2",

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@commitlint/prompt-cli": "^17.4.4",
     "@pnpm/eslint-config": "workspace:*",
     "@pnpm/meta-updater": "0.2.2",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/tsconfig": "workspace:*",
     "@types/jest": "^29.4.0",
     "@types/node": "^14.18.37",

diff --git a/patching/plugin-commands-patching/package.json b/patching/plugin-commands-patching/package.json
@@ -36,7 +36,7 @@
     "@pnpm/filter-workspace-packages": "workspace:*",
     "@pnpm/plugin-commands-patching": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/normalize-path": "^3.0.0",
     "@types/ramda": "0.28.20",

diff --git a/pkg-manager/core/package.json b/pkg-manager/core/package.json
@@ -78,7 +78,7 @@
     "@pnpm/lockfile-types": "workspace:*",
     "@pnpm/package-store": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/store-path": "workspace:*",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/fs-extra": "^9.0.13",

diff --git a/pkg-manager/headless/package.json b/pkg-manager/headless/package.json
@@ -22,7 +22,7 @@
     "@pnpm/package-store": "workspace:*",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-projects-context": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/store-path": "workspace:*",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/fs-extra": "^9.0.13",

diff --git a/pkg-manager/package-requester/package.json b/pkg-manager/package-requester/package.json
@@ -68,7 +68,7 @@
     "@pnpm/client": "workspace:*",
     "@pnpm/create-cafs-store": "workspace:*",
     "@pnpm/package-requester": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/normalize-path": "^3.0.0",
     "@types/ramda": "0.28.20",

diff --git a/pkg-manager/plugin-commands-installation/package.json b/pkg-manager/plugin-commands-installation/package.json
@@ -38,7 +38,7 @@
     "@pnpm/modules-yaml": "workspace:*",
     "@pnpm/plugin-commands-installation": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/test-fixtures": "workspace:*",
     "@types/proxyquire": "^1.3.28",
     "@types/ramda": "0.28.20",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm/package.json b/pnpm/package.json
@@ -60,7 +60,7 @@
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",
     "@pnpm/read-project-manifest": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@pnpm/run-npm": "workspace:*",
     "@pnpm/tabtab": "^0.1.2",
     "@pnpm/test-fixtures": "workspace:*",

diff --git a/pnpm/test/monorepo/dedupePeers.test.ts b/pnpm/test/monorepo/dedupePeers.test.ts
@@ -90,3 +90,34 @@ auto-install-peers=false`, 'utf8')
   expect(loadJsonFile<any>('project-1/package.json').dependencies['@pnpm.e2e/abc-grand-parent-with-c']).toBe('^1.0.0') // eslint-disable-line
   expect(loadJsonFile<any>('project-2/package.json').dependencies['@pnpm.e2e/abc-grand-parent-with-c']).toBe('^1.0.1') // eslint-disable-line
 })
+
+// Covers https://github.com/pnpm/pnpm/issues/6154
+test('peer dependents deduplication should not remove peer dependencies', async () => {
+  preparePackages([
+    {
+      location: '',
+      package: {
+        name: 'project-1',
+
+        dependencies: {
+          '@pnpm.e2e/abc-parent-with-missing-peers': '1.0.0',
+        },
+      },
+    },
+    {
+      location: 'project-2',
+      package: {
+        name: 'project-2',
+      },
+    },
+  ])
+
+  writeYamlFile('pnpm-workspace.yaml', { packages: ['**', '!store/**'] })
+  writeFileSync('.npmrc', `dedupe-peer-dependents=true
+auto-install-peers=true`, 'utf8')
+  await execPnpm(['install'])
+  await execPnpm(['--filter=project-2', 'add', 'is-positive@1.0.0'])
+
+  const lockfile = readYamlFile<any>(path.resolve(WANTED_LOCKFILE)) // eslint-disable-line
+  expect(lockfile.importers['.']?.dependencies?.['@pnpm.e2e/abc-parent-with-missing-peers'].version).toStrictEqual('1.0.0(@pnpm.e2e/peer-a@1.0.0)(@pnpm.e2e/peer-b@1.0.0)(@pnpm.e2e/peer-c@1.0.0)')
+})
diff --git a/releasing/plugin-commands-deploy/package.json b/releasing/plugin-commands-deploy/package.json
@@ -42,7 +42,7 @@
     "@pnpm/lockfile-types": "workspace:*",
     "@pnpm/plugin-commands-deploy": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0"
+    "@pnpm/registry-mock": "3.8.0"
   },
   "dependencies": {
     "@pnpm/cli-utils": "workspace:*",

diff --git a/releasing/plugin-commands-publishing/package.json b/releasing/plugin-commands-publishing/package.json
@@ -38,7 +38,7 @@
     "@pnpm/filter-workspace-packages": "workspace:*",
     "@pnpm/plugin-commands-publishing": "workspace:*",
     "@pnpm/prepare": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/is-windows": "^1.0.0",
     "@types/npm-packlist": "^3.0.0",

diff --git a/reviewing/plugin-commands-licenses/package.json b/reviewing/plugin-commands-licenses/package.json
@@ -38,7 +38,7 @@
     "@pnpm/plugin-commands-installation": "workspace:*",
     "@pnpm/plugin-commands-licenses": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",
-    "@pnpm/registry-mock": "3.7.0",
+    "@pnpm/registry-mock": "3.8.0",
     "@types/ramda": "0.28.20",
     "@types/wrap-ansi": "^8.0.1",
     "@types/zkochan__table": "npm:@types/table@6.0.0",