From e29bc492c0cd5460ee797623ac8c5b476c55defd Mon Sep 17 00:00:00 2001 From: anomiex Date: Tue, 3 Sep 2024 13:57:41 +0000 Subject: [PATCH] Update wordpress monorepo (#39176) * 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 Co-authored-by: Brad Jorsch Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10684158857 Upstream-Ref: Automattic/jetpack@fe2a3d1e65e8e8bd3a4488c719ae2de61b05f026 --- CHANGELOG.md | 8 ++++++++ composer.json | 2 +- package.json | 2 +- src/class-jitm.php | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13dcd5b..0f2e1a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] @@ -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 diff --git a/composer.json b/composer.json index 5fa5623..42ef751 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/package.json b/package.json index 9ce31fd..f371040 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/class-jitm.php b/src/class-jitm.php index 1e79af8..732edba 100644 --- a/src/class-jitm.php +++ b/src/class-jitm.php @@ -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.