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 4ff78bb commit f19aa48
Show file tree
Hide file tree
Showing 18 changed files with 207 additions and 181 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"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-composer-plugin": "^2.0.3",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-assets/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).

## [2.3.6-alpha] - unreleased

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

### Changed
- Updated package dependencies.

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

- Statically access asset tools

[2.3.6-alpha]: https://github.com/Automattic/jetpack-assets/compare/v2.3.5...v2.3.6-alpha
[2.3.5]: https://github.com/Automattic/jetpack-assets/compare/v2.3.4...v2.3.5
[2.3.4]: https://github.com/Automattic/jetpack-assets/compare/v2.3.3...v2.3.4
[2.3.3]: https://github.com/Automattic/jetpack-assets/compare/v2.3.2...v2.3.3
Expand Down
1 change: 1 addition & 0 deletions jetpack_vendor/automattic/jetpack-connection/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
- Updated connection js to load its bundle via connection package
- Updated package dependencies.

### Removed
- Removed registering of Jetpack option edit_links_calypso_redirect
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
"automattic/jetpack-admin-ui": "^0.4.4",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-roles": "^2.0.3",
"automattic/jetpack-status": "^3.3.4",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-explat/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).

## [0.1.6-alpha] - unreleased

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

### Changed
- Updated package dependencies.

## [0.1.5] - 2024-08-29
### Changed
- Updated package dependencies. [#39111]
Expand Down Expand Up @@ -35,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- ExPlat: add condition to prevent fetching the experiment assignment if there's not anon id (meaning that Tracks is likely disabled) [#38327]
- Updated package dependencies. [#38132]

[0.1.6-alpha]: https://github.com/Automattic/jetpack-explat/compare/v0.1.5...v0.1.6-alpha
[0.1.5]: https://github.com/Automattic/jetpack-explat/compare/v0.1.4...v0.1.5
[0.1.4]: https://github.com/Automattic/jetpack-explat/compare/v0.1.3...v0.1.4
[0.1.3]: https://github.com/Automattic/jetpack-explat/compare/v0.1.2...v0.1.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ExPlat {
*
* @var string
*/
const PACKAGE_VERSION = '0.1.5';
const PACKAGE_VERSION = '0.1.6-alpha';

/**
* Initializer.
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-jitm/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 jetpack_vendor/automattic/jetpack-jitm/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 jetpack_vendor/automattic/jetpack-jitm/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
1 change: 1 addition & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/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
- Jetpack AI product page: add fair usage link on over quota notice
- Updated package dependencies.

## [4.34.0] - 2024-09-02
### Changed
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '4874c2baea928aeba42e');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '776e58f71c0f362757b3');
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"require": {
"php": ">=7.0",
"automattic/jetpack-admin-ui": "^0.4.4",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-boost-speed-score": "^0.3.12",
"automattic/jetpack-connection": "^3.0.0-alpha",
"automattic/jetpack-explat": "^0.1.5",
"automattic/jetpack-jitm": "^3.1.19",
"automattic/jetpack-explat": "^0.1.6-alpha",
"automattic/jetpack-jitm": "^3.1.20-alpha",
"automattic/jetpack-licensing": "^2.0.7",
"automattic/jetpack-plugins-installer": "^0.4.2",
"automattic/jetpack-redirect": "^2.0.3",
Expand Down
10 changes: 5 additions & 5 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
),
'jetpack-assets' => array(
'path' => 'jetpack_vendor/automattic/jetpack-assets',
'ver' => '2.3.5',
'ver' => '2.3.6-alpha1725370896',
),
'jetpack-boost-core' => array(
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
Expand All @@ -26,27 +26,27 @@
),
'jetpack-connection' => array(
'path' => 'jetpack_vendor/automattic/jetpack-connection',
'ver' => '3.0.0-alpha1725370413',
'ver' => '3.0.0-alpha1725370896',
),
'jetpack-explat' => array(
'path' => 'jetpack_vendor/automattic/jetpack-explat',
'ver' => '0.1.5',
'ver' => '0.1.6-alpha1725370896',
),
'jetpack-ip' => array(
'path' => 'jetpack_vendor/automattic/jetpack-ip',
'ver' => '0.2.3',
),
'jetpack-jitm' => array(
'path' => 'jetpack_vendor/automattic/jetpack-jitm',
'ver' => '3.1.19',
'ver' => '3.1.20-alpha1725370896',
),
'jetpack-licensing' => array(
'path' => 'jetpack_vendor/automattic/jetpack-licensing',
'ver' => '2.0.7',
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.34.1-alpha1725370669',
'ver' => '4.34.1-alpha1725370896',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
Loading

0 comments on commit f19aa48

Please sign in to comment.