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 63b5989 commit 5749814
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build/automations-admin/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '73e8874db82e7855ccac');
<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'c00ae164880e9f9ecffa');
2 changes: 1 addition & 1 deletion build/automations-admin/index.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/automations-admin/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/automations-admin/index.rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"require": {
"php": ">=7.4",
"automattic/jetpack-assets": "^2.3.5",
"automattic/jetpack-assets": "^2.3.6-alpha",
"automattic/jetpack-autoloader": "^3.0.10",
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/woocommerce": "^3.0",
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
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"devDependencies": {
"@automattic/jetpack-webpack-config": "workspace:*",
"@wordpress/browserslist-config": "6.5.0",
"@wordpress/browserslist-config": "6.6.0",
"jest": "29.7.0",
"md5-es": "1.8.2",
"webpack": "5.94.0",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'packages' => array(
'jetpack-assets' => array(
'path' => 'jetpack_vendor/automattic/jetpack-assets',
'ver' => '2.3.5',
'ver' => '2.3.6-alpha1725370896',
),
),
);
12 changes: 6 additions & 6 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"packages": [
{
"name": "automattic/jetpack-assets",
"version": "2.3.5",
"version_normalized": "2.3.5.0",
"version": "2.3.6-alpha.1725370896",
"version_normalized": "2.3.6.0-alpha1725370896",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "852abbe2c8ec8189b524e1d5c2dc7ed521170133"
"reference": "c8a10dd209c9b19595fe8cc884937f08e03f96f0"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -76,7 +76,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "bae42c5699a23b5b1124bd5feb9dc973eade32f0"
"reference": "a719efab897cec9a955a52bdc5ccb6d74aecb86c"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -143,7 +143,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "2b329ed93a96b1b4b342b77f98ea9e9b52405fd5"
"reference": "be749045c3ba0b3aa8eeffaf6150ff7ee41b39a1"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "a4a22e9d92855cbda24255fbca3b102aa25de65a"
"reference": "59142ca02e424a677feba51e7f36891202d492a7"
},
"require": {
"php": ">=7.0"
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
),
'versions' => array(
'automattic/jetpack-assets' => array(
'pretty_version' => '2.3.5',
'version' => '2.3.5.0',
'reference' => '852abbe2c8ec8189b524e1d5c2dc7ed521170133',
'pretty_version' => '2.3.6-alpha.1725370896',
'version' => '2.3.6.0-alpha1725370896',
'reference' => 'c8a10dd209c9b19595fe8cc884937f08e03f96f0',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-assets',
'aliases' => array(),
Expand All @@ -22,7 +22,7 @@
'automattic/jetpack-autoloader' => array(
'pretty_version' => '3.0.10',
'version' => '3.0.10.0',
'reference' => 'bae42c5699a23b5b1124bd5feb9dc973eade32f0',
'reference' => 'a719efab897cec9a955a52bdc5ccb6d74aecb86c',
'type' => 'composer-plugin',
'install_path' => __DIR__ . '/../automattic/jetpack-autoloader',
'aliases' => array(),
Expand All @@ -31,7 +31,7 @@
'automattic/jetpack-composer-plugin' => array(
'pretty_version' => '2.0.3',
'version' => '2.0.3.0',
'reference' => '2b329ed93a96b1b4b342b77f98ea9e9b52405fd5',
'reference' => 'be749045c3ba0b3aa8eeffaf6150ff7ee41b39a1',
'type' => 'composer-plugin',
'install_path' => __DIR__ . '/../automattic/jetpack-composer-plugin',
'aliases' => array(),
Expand All @@ -40,7 +40,7 @@
'automattic/jetpack-constants' => array(
'pretty_version' => '2.0.4',
'version' => '2.0.4.0',
'reference' => 'a4a22e9d92855cbda24255fbca3b102aa25de65a',
'reference' => '59142ca02e424a677feba51e7f36891202d492a7',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-constants',
'aliases' => array(),
Expand Down
6 changes: 3 additions & 3 deletions vendor/composer/jetpack_autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
'path' => $vendorDir . '/automattic/jetpack-autoloader/src/class-autoloader-locator.php'
),
'Automattic\\Jetpack\\Assets' => array(
'version' => '2.3.5.0',
'version' => '2.3.6.0-alpha1725370896',
'path' => $baseDir . '/jetpack_vendor/automattic/jetpack-assets/src/class-assets.php'
),
'Automattic\\Jetpack\\Assets\\Script_Data' => array(
'version' => '2.3.5.0',
'version' => '2.3.6.0-alpha1725370896',
'path' => $baseDir . '/jetpack_vendor/automattic/jetpack-assets/src/class-script-data.php'
),
'Automattic\\Jetpack\\Assets\\Semver' => array(
'version' => '2.3.5.0',
'version' => '2.3.6.0-alpha1725370896',
'path' => $baseDir . '/jetpack_vendor/automattic/jetpack-assets/src/class-semver.php'
),
'Automattic\\Jetpack\\Autoloader\\AutoloadFileWriter' => array(
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/jetpack_autoload_filemap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

return array(
'3773ef3f09c37da5478d578e32b03a4b' => array(
'version' => '2.3.5.0',
'version' => '2.3.6.0-alpha1725370896',
'path' => $baseDir . '/jetpack_vendor/automattic/jetpack-assets/actions.php'
),
);

0 comments on commit 5749814

Please sign in to comment.