Skip to content

Commit bbfe90f

Browse files
matticbotrenovate-botanomiexmanzoorwanijk
authored
Update wordpress monorepo (#41099)
* Update wordpress monorepo. * Update pnpm-patch hack. * Remove unused eslint-disable directives. * In the future, let's do `@wordpress/dataviews` separately for now. * Move ResizeObserver mock to base Jest config. Something new in Gutenberg needs it. * Add pnpmfile hacks for `@wordpress/upload-media` missing deps. * Remove obsolete `@ts-expect-error` * Pass `undefined` explicitly to `getUnstableBase()` 🤷 * Add `__next40pxDefaultSize` to `<SelectControl>` * Fix tests for color picker. Buttons are now named like "Black" rather than "Color: Black". * Replace ButtonGroup with ToggleGroupControl --------- Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Brad Jorsch <[email protected]> Co-authored-by: Manzoor Wani <[email protected]>
1 parent d2c7b02 commit bbfe90f

File tree

114 files changed

+2886
-1968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2886
-1968
lines changed

.github/renovate.json5

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@
8787
matchPackageNames: [ 'docker/**' ],
8888
},
8989

90+
// Separate this from 'monorepo:wordpress' while it's still considered unstable.
91+
{
92+
groupName: '@wordpress/dataviews',
93+
matchPackageNames: [ '@wordpress/dataviews' ],
94+
separateMajorMinor: false,
95+
prPriority: 1,
96+
},
97+
9098
// 🤷
9199
{
92100
groupName: 'Instant Search Dependency Updates',

.pnpm-patches/@[email protected]

-15
This file was deleted.

.pnpm-patches/@[email protected]

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Hack for https://github.com/WordPress/gutenberg/issues/67897
2+
3+
diff --git a/package.json b/package.json
4+
index 9df754abc5e871d61e726aa84c92e079db5d6c60..9a0db897aeb3eb15b4a1767da4cd7ef7acef88d7 100644
5+
--- a/package.json
6+
+++ b/package.json
7+
@@ -23,11 +23,9 @@
8+
"npm": ">=8.19.2"
9+
},
10+
"main": "build/index.js",
11+
- "module": "build-module/index.js",
12+
"exports": {
13+
".": {
14+
"types": "./build-types/index.d.ts",
15+
- "import": "./build-module/index.js",
16+
"default": "./build/index.js"
17+
},
18+
"./wp": {

.pnpmfile.cjs

+12-1
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,25 @@ function fixDeps( pkg ) {
2222

2323
// Missing dep or peer dep on react.
2424
// https://github.com/WordPress/gutenberg/issues/55171
25+
// https://github.com/WordPress/gutenberg/issues/68694
2526
if (
26-
pkg.name === '@wordpress/icons' &&
27+
( pkg.name === '@wordpress/icons' || pkg.name === '@wordpress/upload-media' ) &&
2728
! pkg.dependencies?.react &&
2829
! pkg.peerDependencies?.react
2930
) {
3031
pkg.peerDependencies.react = '^18';
3132
}
3233

34+
// Missing dep or peer dep on @babel/runtime and react
35+
// https://github.com/WordPress/gutenberg/issues/68694
36+
if (
37+
pkg.name === '@wordpress/upload-media' &&
38+
! pkg.dependencies?.[ '@babel/runtime' ] &&
39+
! pkg.peerDependencies?.[ '@babel/runtime' ]
40+
) {
41+
pkg.peerDependencies[ '@babel/runtime' ] = '^7';
42+
}
43+
3344
// Missing dep or peer dep.
3445
// https://github.com/actions/toolkit/issues/1684
3546
if (

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"packageManager": "[email protected]",
4141
"pnpm": {
4242
"patchedDependencies": {
43-
"@wordpress/dataviews@4.10.0": ".pnpm-patches/@wordpress__dataviews@4.10.0.patch"
43+
"@wordpress/dataviews@4.12.0": ".pnpm-patches/@wordpress__dataviews@4.12.0.patch"
4444
}
4545
}
4646
}

0 commit comments

Comments
 (0)