fix: install failure on pnpm deploy when using catalogs

pkg-manager/plugin-commands-installation/src/install.ts

@@ -251,6 +251,7 @@ export type InstallCommandOptions = Pick<Config,
 | 'autoInstallPeers'
 | 'bail'
 | 'bin'
+| 'catalogs'
 | 'cliOptions'
 | 'dedupeDirectDeps'
 | 'dedupePeerDependents'

releasing/plugin-commands-deploy/package.json

@@ -42,6 +42,8 @@
     "@pnpm/workspace.filter-packages-from-dir": "workspace:*"
   },
   "dependencies": {
+    "@pnpm/catalogs.resolver": "workspace:*",
+    "@pnpm/catalogs.types": "workspace:*",
     "@pnpm/cli-utils": "workspace:*",
     "@pnpm/common-cli-options-help": "workspace:*",
     "@pnpm/directory-fetcher": "workspace:*",

releasing/plugin-commands-deploy/src/deploy.ts

@@ -9,8 +9,9 @@ import { FILTERING } from '@pnpm/common-cli-options-help'
 import { PnpmError } from '@pnpm/error'
 import rimraf from '@zkochan/rimraf'
 import renderHelp from 'render-help'
-import { deployHook } from './deployHook'
+import { deployCatalogHook, deployHook } from './deployHook'
 import { logger } from '@pnpm/logger'
+import { resolveFromCatalog } from '@pnpm/catalogs.resolver'
 
 export const shorthands = install.shorthands
 
@@ -101,6 +102,7 @@ export async function handler (
       readPackage: [
         ...(opts.hooks?.readPackage ?? []),
         deployHook,
+        deployCatalogHook.bind(null, opts.catalogs ?? {}),
       ],
     },
     frozenLockfile: false,

releasing/plugin-commands-deploy/src/deployHook.ts

@@ -1,3 +1,5 @@
+import { matchCatalogResolveResult, resolveFromCatalog } from '@pnpm/catalogs.resolver'
+import { type Catalogs } from '@pnpm/catalogs.types'
 import { type ProjectManifest, DEPENDENCIES_FIELDS } from '@pnpm/types'
 
 export function deployHook (pkg: ProjectManifest): ProjectManifest {
@@ -13,3 +15,28 @@ export function deployHook (pkg: ProjectManifest): ProjectManifest {
   }
   return pkg
 }
+
+export function deployCatalogHook (catalogs: Catalogs, pkg: ProjectManifest): ProjectManifest {
+  for (const depField of DEPENDENCIES_FIELDS) {
+    const depsBlock = pkg[depField]
+
+    if (depsBlock == null) {
+      continue
+    }
+
+    for (const [alias, pref] of Object.entries(depsBlock)) {
+      matchCatalogResolveResult(resolveFromCatalog(catalogs, { alias, pref }), {
+        unused: () => undefined,
+        misconfiguration: (result) => {
+          throw result.error
+        },
+
+        found: (result) => {
+          depsBlock[alias] = result.resolution.specifier
+        },
+      })
+    }
+  }
+
+  return pkg
+}

releasing/plugin-commands-deploy/tsconfig.json

@@ -15,6 +15,12 @@
     {
       "path": "../../__utils__/prepare"
     },
+    {
+      "path": "../../catalogs/resolver"
+    },
+    {
+      "path": "../../catalogs/types"
+    },
     {
       "path": "../../cli/cli-utils"
     },