Skip to content

Commit

Permalink
Update wordpress monorepo (#39176)
Browse files Browse the repository at this point in the history
* Update wordpress monorepo
* js-packages/components: ToggleControl: Update styles for WordPress/gutenberg#63490
  That change started setting a height on the control itself (versus
  just the stuff inside it), so update our styles to override that too.
* Add `__nextHasNoMarginBottom` all over the place
  The vast majority are inside a `PanelBody`, which already overrides
  margins. Had to fix one margin on the simple-payments block.

---------

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10684158857

Upstream-Ref: Automattic/jetpack@fe2a3d1
  • Loading branch information
anomiex authored and matticbot committed Sep 3, 2024
1 parent 6e1ec53 commit b185cb3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This is an alpha version! The changes listed here are not final.

### Changed
- Enable Users -> Profile (profile.php) on all sites
- Updated package dependencies.

### Fixed
- Hosting Configuration: Make the menu title under the settings the same as the destination
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-blaze": "^0.22.8",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-blaze": "^0.22.9-alpha",
"automattic/jetpack-compat": "^3.0.2",
"automattic/jetpack-device-detection": "^2.1.4",
"automattic/jetpack-connection": "^3.0.0-alpha",
"automattic/jetpack-jitm": "^3.1.19",
"automattic/jetpack-jitm": "^3.1.20-alpha",
"automattic/jetpack-logo": "^2.0.4",
"automattic/jetpack-plans": "^0.4.8",
"automattic/jetpack-status": "^3.3.4"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@automattic/remove-asset-webpack-plugin": "^1.0.22",
"@babel/core": "7.24.7",
"@csstools/postcss-global-data": "2.1.1",
"@wordpress/browserslist-config": "6.5.0",
"@wordpress/dependency-extraction-webpack-plugin": "6.5.0",
"@wordpress/browserslist-config": "6.6.0",
"@wordpress/dependency-extraction-webpack-plugin": "6.6.0",
"autoprefixer": "10.4.14",
"core-js": "3.23.5",
"glob": "10.4.1",
Expand Down

0 comments on commit b185cb3

Please sign in to comment.