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 89ee630 commit c65fbea
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 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.4.7-alpha] - unreleased

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

### Changed
- Updated package dependencies.

## [3.4.6] - 2024-09-02
### Changed
- Admin menu: change order of Jetpack sub-menu items [#39095]
Expand Down Expand Up @@ -681,6 +688,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add API endpoints and Jetpack Backup package for managing Help…

[3.4.7-alpha]: https://github.com/Automattic/jetpack-backup/compare/v3.4.6...v3.4.7-alpha
[3.4.6]: https://github.com/Automattic/jetpack-backup/compare/v3.4.5...v3.4.6
[3.4.5]: https://github.com/Automattic/jetpack-backup/compare/v3.4.4...v3.4.5
[3.4.4]: https://github.com/Automattic/jetpack-backup/compare/v3.4.3...v3.4.4
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-admin-ui": "^0.4.4",
"automattic/jetpack-autoloader": "^3.0.10",
"automattic/jetpack-backup-helper-script-manager": "^0.2.7",
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,29 @@
"dependencies": {
"@automattic/format-currency": "1.0.1",
"@automattic/jetpack-analytics": "^0.1.31",
"@automattic/jetpack-api": "^0.17.11",
"@automattic/jetpack-components": "^0.55.11",
"@automattic/jetpack-connection": "^0.35.3",
"@wordpress/api-fetch": "7.5.0",
"@wordpress/components": "28.5.0",
"@wordpress/data": "10.5.0",
"@wordpress/date": "5.5.0",
"@wordpress/element": "6.5.0",
"@wordpress/i18n": "5.5.0",
"@automattic/jetpack-api": "^0.17.12-alpha",
"@automattic/jetpack-components": "^0.55.12-alpha",
"@automattic/jetpack-connection": "^0.35.4-alpha",
"@wordpress/api-fetch": "7.6.0",
"@wordpress/components": "28.6.0",
"@wordpress/data": "10.6.0",
"@wordpress/date": "5.6.0",
"@wordpress/element": "6.6.0",
"@wordpress/i18n": "5.6.0",
"prop-types": "^15.8.1",
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@automattic/jetpack-base-styles": "^0.6.30",
"@automattic/jetpack-base-styles": "^0.6.31-alpha",
"@automattic/jetpack-webpack-config": "workspace:*",
"@babel/core": "7.24.7",
"@babel/preset-env": "7.24.7",
"@babel/runtime": "7.24.7",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
"@wordpress/browserslist-config": "6.5.0",
"@wordpress/browserslist-config": "6.6.0",
"concurrently": "7.6.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
Expand Down
2 changes: 1 addition & 1 deletion src/class-package-version.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '3.4.6';
const PACKAGE_VERSION = '3.4.7-alpha';

const PACKAGE_SLUG = 'backup';

Expand Down

0 comments on commit c65fbea

Please sign in to comment.