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 <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
Automattic · Sep 3, 2024 · 965c26b · 965c26b
1 parent 2cda53c
commit 965c26b
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 88 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,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/jetpack-connection": "^3.0.0-alpha",

diff --git a/jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-assets/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).
 
+## [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]
@@ -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

diff --git a/jetpack_vendor/automattic/jetpack-assets/package.json b/jetpack_vendor/automattic/jetpack-assets/package.json
@@ -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",

diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -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

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -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",

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -10,15 +10,15 @@
     ),
     'jetpack-assets' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-assets',
-      'ver' => '2.3.5',
+      'ver' => '2.3.6-alpha1725370896',
     ),
     'jetpack-config' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-config',
       'ver' => '2.0.4',
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '3.0.0-alpha1725370413',
+      'ver' => '3.0.0-alpha1725370896',
     ),
   ),
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "72a58d747bace1f64de514b94561c7ce531a9393"
+                "reference": "cefc676af6dbd1156ae8f9498de10e9cdede4183"
             },
             "require": {
                 "php": ">=7.0"
@@ -60,7 +60,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "307557b515e4511d50cc293a71f4da0dc24cfa1f"
+                "reference": "a1e794df7bd01f899a1f05622e3f887d331c769d"
             },
             "require": {
                 "php": ">=7.0"
@@ -120,12 +120,12 @@
         },
         {
             "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": "03805caeedb459a4d91c3b01b1074ab0b4706c1a"
+                "reference": "9b0a4145a5310f5104386968584547b8ca3493ce"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",
@@ -194,7 +194,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "ab786e501eeb4d83dbbb86f331c259c54f75a8df"
+                "reference": "eadf7604ea28c287f2473a9de700c0c4e246fe16"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0",
@@ -261,7 +261,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "1401a3d4841bad2820a7e25677927087b473537c"
+                "reference": "aaddef31c9a2f4c7175b4289c7f836ecefc738d0"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0",
@@ -321,7 +321,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "f6ba5b114fe8eebd86ba4bf5e29eacd6e3d19ec7"
+                "reference": "551645ad244498c4202394baabc9a65c5883eb9f"
             },
             "require": {
                 "php": ">=7.0"
@@ -391,17 +391,17 @@
         },
         {
             "name": "automattic/jetpack-connection",
-            "version": "3.0.0-alpha.1725370413",
-            "version_normalized": "3.0.0.0-alpha1725370413",
+            "version": "3.0.0-alpha.1725370896",
+            "version_normalized": "3.0.0.0-alpha1725370896",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "912aad1ff2815998b58df6f0bab3962008b4915f"
+                "reference": "845ffcc0dc7f72e6e78327a35ac3dedd041cf0d6"
             },
             "require": {
                 "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-redirect": "^2.0.3",
                 "automattic/jetpack-roles": "^2.0.3",
@@ -486,7 +486,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "78a9fdafa5c00d7c0cf8382e731cdd45e7cb068d"
+                "reference": "2a2d15624f97f5d22d8fa3952b59ffb0cad94848"
             },
             "require": {
                 "php": ">=7.0"
@@ -540,7 +540,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "eb5098072fa70a84568283a6961cc4e645a28dbd"
+                "reference": "3fc6ac2c55e0eee87c2d770795bfa49176a849c1"
             },
             "require": {
                 "automattic/jetpack-status": "^3.3.4",
@@ -595,7 +595,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "9112f652bb54363fcbcc97e96cecc7b7a7eb4fa3"
+                "reference": "730a6025daa67bfd36a17ef69754cdb1cbb5a5d8"
             },
             "require": {
                 "php": ">=7.0"
@@ -649,7 +649,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "01575cf367e5784fdd962f7d5b401422dc872983"
+                "reference": "d5a9aec5fccc3d574d1b912a5e879ce292624baf"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -13,7 +13,7 @@
         'automattic/jetpack-a8c-mc-stats' => array(
             'pretty_version' => '2.0.2',
             'version' => '2.0.2.0',
-            'reference' => '72a58d747bace1f64de514b94561c7ce531a9393',
+            'reference' => 'cefc676af6dbd1156ae8f9498de10e9cdede4183',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-a8c-mc-stats',
             'aliases' => array(),
@@ -22,16 +22,16 @@
         'automattic/jetpack-admin-ui' => array(
             'pretty_version' => '0.4.4',
             'version' => '0.4.4.0',
-            'reference' => '307557b515e4511d50cc293a71f4da0dc24cfa1f',
+            'reference' => 'a1e794df7bd01f899a1f05622e3f887d331c769d',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-admin-ui',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'automattic/jetpack-assets' => array(
-            'pretty_version' => '2.3.5',
-            'version' => '2.3.5.0',
-            'reference' => '03805caeedb459a4d91c3b01b1074ab0b4706c1a',
+            'pretty_version' => '2.3.6-alpha.1725370896',
+            'version' => '2.3.6.0-alpha1725370896',
+            'reference' => '9b0a4145a5310f5104386968584547b8ca3493ce',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-assets',
             'aliases' => array(),
@@ -40,7 +40,7 @@
         'automattic/jetpack-autoloader' => array(
             'pretty_version' => '3.0.10',
             'version' => '3.0.10.0',
-            'reference' => 'ab786e501eeb4d83dbbb86f331c259c54f75a8df',
+            'reference' => 'eadf7604ea28c287f2473a9de700c0c4e246fe16',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../automattic/jetpack-autoloader',
             'aliases' => array(),
@@ -49,7 +49,7 @@
         'automattic/jetpack-composer-plugin' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => '1401a3d4841bad2820a7e25677927087b473537c',
+            'reference' => 'aaddef31c9a2f4c7175b4289c7f836ecefc738d0',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../automattic/jetpack-composer-plugin',
             'aliases' => array(),
@@ -58,16 +58,16 @@
         'automattic/jetpack-config' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
-            'reference' => 'f6ba5b114fe8eebd86ba4bf5e29eacd6e3d19ec7',
+            'reference' => '551645ad244498c4202394baabc9a65c5883eb9f',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-config',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'automattic/jetpack-connection' => array(
-            'pretty_version' => '3.0.0-alpha.1725370413',
-            'version' => '3.0.0.0-alpha1725370413',
-            'reference' => '912aad1ff2815998b58df6f0bab3962008b4915f',
+            'pretty_version' => '3.0.0-alpha.1725370896',
+            'version' => '3.0.0.0-alpha1725370896',
+            'reference' => '845ffcc0dc7f72e6e78327a35ac3dedd041cf0d6',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-connection',
             'aliases' => array(),
@@ -76,7 +76,7 @@
         'automattic/jetpack-constants' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
-            'reference' => '78a9fdafa5c00d7c0cf8382e731cdd45e7cb068d',
+            'reference' => '2a2d15624f97f5d22d8fa3952b59ffb0cad94848',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-constants',
             'aliases' => array(),
@@ -94,7 +94,7 @@
         'automattic/jetpack-redirect' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => 'eb5098072fa70a84568283a6961cc4e645a28dbd',
+            'reference' => '3fc6ac2c55e0eee87c2d770795bfa49176a849c1',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-redirect',
             'aliases' => array(),
@@ -103,7 +103,7 @@
         'automattic/jetpack-roles' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => '9112f652bb54363fcbcc97e96cecc7b7a7eb4fa3',
+            'reference' => '730a6025daa67bfd36a17ef69754cdb1cbb5a5d8',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-roles',
             'aliases' => array(),
@@ -112,7 +112,7 @@
         'automattic/jetpack-status' => array(
             'pretty_version' => '3.3.4',
             'version' => '3.3.4.0',
-            'reference' => '01575cf367e5784fdd962f7d5b401422dc872983',
+            'reference' => 'd5a9aec5fccc3d574d1b912a5e879ce292624baf',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-status',
             'aliases' => array(),