From 4e76f22166e5b770bc53e41c962c12be0f3fc95d Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <z@kochan.io>
Date: Fri, 9 Oct 2026 15:57:51 +0200
Subject: [PATCH] chore: set lockfile.includeResolutionSettings to true
 (#16796)

---
 pnpm-lock.yaml      | 4 ++++
 pnpm-workspace.yaml | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a8153159db..90a88d8b09 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -159,8 +159,12 @@ snapshots:
 lockfileVersion: '9.0'
 
 settings:
+  autoDedupe: true
   autoInstallPeers: true
+  dedupeInjectedDeps: true
+  dedupePeerDependents: true
   excludeLinksFromLockfile: false
+  linkWorkspacePackages: false
 
 catalogs:
   default:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index e4ae89abda..c547ba2f36 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -589,12 +589,8 @@ minimumReleaseAgeExclude:
   - write-yaml-file
   - http-proxy-middleware@3.0.7
 
-# lockfile.includeResolutionSettings is off until devEngines pins a pnpm
-# release with pnpm/pnpm#16674: with it on, `pnpm deploy` in
-# pnpm/wasm/stage.mjs fails with ERR_PNPM_LOCKFILE_CONFIG_MISMATCH.
-# Restore it as:
-#   lockfile:
-#     includeResolutionSettings: true
+lockfile:
+  includeResolutionSettings: true
 
 minimumReleaseAgeExcludePrune: true