Commit 741b1f3c24f for woocommerce
commit 741b1f3c24f9789ee1f50ae115e1f54d77c90c3f
Author: Brandon Kraft <public@brandonkraft.com>
Date: Mon Sep 7 05:04:56 2026 -0500
Move pnpm dependency resolution settings to pnpm-workspace.yaml (#68063)
diff --git a/.npmrc b/.npmrc
index d90d3bd5cee..d54d7733b94 100644
--- a/.npmrc
+++ b/.npmrc
@@ -5,4 +5,5 @@ manage-package-manager-versions=true
; auto-install-peers=true
; strict-peer-dependencies=false
;
-; Remaining pnpm 10 settings live in pnpm-workspace.yaml.
+; All other pnpm settings live in pnpm-workspace.yaml, including the dependency
+; resolution ones that used to sit in the "pnpm" field of package.json.
diff --git a/package.json b/package.json
index 16f9ff6bbbb..1aa4f6e8fa7 100644
--- a/package.json
+++ b/package.json
@@ -76,27 +76,5 @@
"@wordpress/babel-preset-default": "next",
"lodash": "^4.18.1",
"wp-textdomain": "1.0.1"
- },
- "pnpm": {
- "packageExtensions": {
- "@wordpress/dataviews@10.1.7": {
- "dependencies": {
- "uuid": "^9.0.1"
- }
- }
- },
- "overrides": {
- "@types/react": "18.3.x",
- "@wordpress/data-controls>@wordpress/api-fetch": "catalog:wp-min",
- "@wordpress/private-apis": "catalog:wp-min",
- "js-yaml@<3.15.1": "3.15.1",
- "minimatch@<3.1.4": "3.1.5",
- "react-resize-aware": "3.1.1",
- "sass": "1.69.5"
- },
- "patchedDependencies": {
- "@wordpress/edit-site@5.15.0": "bin/patches/@wordpress__edit-site@5.15.0.patch",
- "@wordpress/e2e-test-utils-playwright@1.33.2": "bin/patches/@wordpress__e2e-test-utils-playwright@1.33.2.patch"
- }
}
}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 583f1706d5d..29d03cff47a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -98,6 +98,25 @@ packages:
- 'tools/storybook'
- 'tools/monorepo-utils'
+# Dependency resolution (migrated from the `pnpm` field of package.json)
+overrides:
+ '@types/react': 18.3.x
+ '@wordpress/data-controls>@wordpress/api-fetch': 'catalog:wp-min'
+ '@wordpress/private-apis': 'catalog:wp-min'
+ 'js-yaml@<3.15.1': 3.15.1
+ 'minimatch@<3.1.4': 3.1.5
+ react-resize-aware: 3.1.1
+ sass: 1.69.5
+
+packageExtensions:
+ '@wordpress/dataviews@10.1.7':
+ dependencies:
+ uuid: ^9.0.1
+
+patchedDependencies:
+ '@wordpress/edit-site@5.15.0': bin/patches/@wordpress__edit-site@5.15.0.patch
+ '@wordpress/e2e-test-utils-playwright@1.33.2': bin/patches/@wordpress__e2e-test-utils-playwright@1.33.2.patch
+
# Quality of life tweaks (migrated from .npmrc)
childConcurrency: 8 # 5 by default
confirmModulesPurge: false