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 cf187b3 commit e29bc49
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.1.20-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Changed
- Updated package dependencies.

## [3.1.19] - 2024-08-29
### Changed
- Updated package dependencies. [#39111]
Expand Down Expand Up @@ -755,6 +762,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Update Jetpack to use new JITM package

[3.1.20-alpha]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.19...v3.1.20-alpha
[3.1.19]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.18...v3.1.19
[3.1.18]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.17...v3.1.18
[3.1.17]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.16...v3.1.17
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-connection": "^3.0.0-alpha",
"automattic/jetpack-device-detection": "^2.1.4",
"automattic/jetpack-logo": "^2.0.4",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"browserslist": "extends @wordpress/browserslist-config",
"devDependencies": {
"@automattic/jetpack-webpack-config": "workspace:*",
"@wordpress/browserslist-config": "6.5.0",
"@wordpress/browserslist-config": "6.6.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
"webpack": "5.94.0",
Expand Down
2 changes: 1 addition & 1 deletion src/class-jitm.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
class JITM {

const PACKAGE_VERSION = '3.1.19';
const PACKAGE_VERSION = '3.1.20-alpha';

/**
* The configuration method that is called from the jetpack-config package.
Expand Down

0 comments on commit e29bc49

Please sign in to comment.