pnpm · zkochan · May 28, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
@@ -0,0 +1,6 @@
+---
+"@pnpm/plugin-commands-deploy": patch
+"pnpm": patch
+---
+
+Fix an issue in which `pnpm deploy --legacy` creates unexpected directories when the root `package.json` has a workspace package as a peer dependency [#9550](https://github.com/pnpm/pnpm/issues/9550).
@@ -0,0 +1,85 @@
+import fs from 'fs'
+import path from 'path'
+import { preparePackages } from '@pnpm/prepare'
+import { sync as loadJsonFile } from 'load-json-file'
+import { sync as writeYamlFile } from 'write-yaml-file'
+import { execPnpm } from './utils'
+
+// Covers https://github.com/pnpm/pnpm/issues/9550
+test('legacy deploy creates only necessary directories when the root manifest has a workspace package as a peer dependency (#9550)', async () => {
+  preparePackages([
+    {
+      location: '.',
+      package: {
+        name: 'root',
+        version: '0.0.0',
+        peerDependencies: {
+          bar: 'workspace:^',
+        },
+      },
+    },
+    {
+      location: 'services/foo',
+      package: {
+        name: 'foo',
+        version: '0.0.0',
+        dependencies: {
+          '@pnpm.e2e/foo': '^100.1.0',
+          bar: 'workspace:*',
+        },
+      },
+    },
+    {
+      location: 'packages/bar',
+      package: {
+        name: 'bar',
+        version: '0.0.0',
+        dependencies: {
+          '@pnpm.e2e/bar': '^100.1.0',
+        },
+      },
+    },
+  ])
+
+  writeYamlFile('pnpm-workspace.yaml', {
+    packages: [
+      'services/*',
+      'packages/*',
+    ],
+    forceLegacyDeploy: true,
+    shamefullyHoist: true,
+    linkWorkspacePackages: true,
+    reporter: 'append-only',
+    storeDir: path.resolve('pnpm-store'),
+    cacheDir: path.resolve('pnpm-cache'),
+  })
+
+  await execPnpm(['install'])
+  expect(fs.realpathSync('node_modules/bar')).toBe(path.resolve('packages/bar'))
+  const beforeDeploy = {
+    '.': fs.readdirSync('.').sort(),
+    services: fs.readdirSync('services').sort(),
+    'services/foo': fs.readdirSync('services/foo').sort(),
+    packages: fs.readdirSync('packages').sort(),
+    'packages/bar': fs.readdirSync('packages/bar').sort(),
+  }
+
+  await execPnpm(['--filter=foo', 'deploy', 'services/foo/pnpm.out'])
+  const afterDeploy = {
+    '.': fs.readdirSync('.').sort(),
+    services: fs.readdirSync('services').sort(),
+    'services/foo': fs.readdirSync('services/foo').sort(),
+    packages: fs.readdirSync('packages').sort(),
+    'packages/bar': fs.readdirSync('packages/bar').sort(),
+  }
+
+  expect(afterDeploy).toStrictEqual({
+    ...beforeDeploy,
+    'services/foo': [
+      ...beforeDeploy['services/foo'],
+      'pnpm.out',
+    ].sort(),
+  })
+  expect(fs.readdirSync('services/foo/pnpm.out').sort()).toStrictEqual(['node_modules', 'package.json'])
+  expect(loadJsonFile('services/foo/pnpm.out/package.json')).toStrictEqual(loadJsonFile('services/foo/package.json'))
+})
@@ -179,6 +179,7 @@ export async function handler (opts: DeployOptions, params: string[]): Promise<v
     useLockfile: opts.nodeLinker !== 'hoisted',
     saveLockfile: false,
     virtualStoreDir: path.join(deployDir, 'node_modules/.pnpm'),
+    workspaceDir: deployDir,
     modulesDir: path.relative(opts.workspaceDir, path.join(deployDir, 'node_modules')),
     rawLocalConfig: {
       ...opts.rawLocalConfig,