Merge remote-tracking branch 'origin/trunk' into feat/unify-masterbar-2

Automattic · Jul 18, 2024 · 94a224f · 94a224f
2 parents 2cfa7fa + 3a1eb8b
commit 94a224f
Show file tree

Hide file tree

Showing 49 changed files with 139 additions and 84 deletions.
diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.54.4] - 2024-07-18
+### Changed
+- Internal updates.
+
 ## [0.54.3] - 2024-07-03
 ### Changed
 - Updated package dependencies. [#38132]
@@ -1083,6 +1087,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.54.4]: https://github.com/Automattic/jetpack-components/compare/0.54.3...0.54.4
 [0.54.3]: https://github.com/Automattic/jetpack-components/compare/0.54.2...0.54.3
 [0.54.2]: https://github.com/Automattic/jetpack-components/compare/0.54.1...0.54.2
 [0.54.1]: https://github.com/Automattic/jetpack-components/compare/0.54.0...0.54.1

diff --git a/projects/js-packages/components/changelog/add-segmentation-to-jetpack-products-my-jetpack b/projects/js-packages/components/changelog/add-segmentation-to-jetpack-products-my-jetpack
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.54.4-alpha",
+	"version": "0.54.4",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.34.0] - 2024-07-18
+### Changed
+- Connection Screen: remove mention of Stats from the list of available free features. [#38328]
+
 ## [0.33.19] - 2024-07-03
 ### Changed
 - Updated package dependencies. [#38132]
@@ -797,6 +801,7 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.34.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.19...v0.34.0
 [0.33.19]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.18...v0.33.19
 [0.33.18]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.17...v0.33.18
 [0.33.17]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.16...v0.33.17

diff --git a/projects/js-packages/connection/changelog/remove-stats-from-connection-interstitial b/projects/js-packages/connection/changelog/remove-stats-from-connection-interstitial
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.34.0-alpha",
+	"version": "0.34.0",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {

diff --git a/...om-plugin/changelog/mu-wpcom-localize-url → .../partner-coupon/changelog/force-a-release b/...om-plugin/changelog/mu-wpcom-localize-url → .../partner-coupon/changelog/force-a-release
@@ -1,5 +1,4 @@
 Significance: patch
 Type: changed
-Comment: Updated composer.lock.
-
 
+Update dependencies.
diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-partner-coupon",
-	"version": "0.2.82",
+	"version": "0.2.83-alpha",
 	"description": "This package aims to add components to make it easier to redeem partner coupons",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/partner-coupon/#readme",
 	"bugs": {

diff --git a/projects/js-packages/shared-extension-utils/CHANGELOG.md b/projects/js-packages/shared-extension-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.14.18] - 2024-07-18
+### Changed
+- Update dependencies. [#37356]
+
 ## [0.14.17] - 2024-07-03
 ### Changed
 - Updated package dependencies. [#38132]
@@ -400,6 +404,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Core: prepare utility for release
 
+[0.14.18]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.14.17...0.14.18
 [0.14.17]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.14.16...0.14.17
 [0.14.16]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.14.15...0.14.16
 [0.14.15]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.14.14...0.14.15

diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-shared-extension-utils",
-	"version": "0.14.17",
+	"version": "0.14.18",
 	"description": "Utility functions used by the block editor extensions",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/shared-extension-utils/#readme",
 	"bugs": {

diff --git a/projects/packages/backup/changelog/force-a-release b/projects/packages/backup/changelog/force-a-release
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.
diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
@@ -16,7 +16,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '3.4.1';
+	const PACKAGE_VERSION = '3.4.2-alpha';
 
 	const PACKAGE_SLUG = 'backup';
 

diff --git a/projects/packages/forms/changelog/fix-contact-form-ip-field b/projects/packages/forms/changelog/fix-contact-form-ip-field
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Form submissions table: ensure the IP address is displayed for each submission, when available.
diff --git a/projects/packages/forms/package.json b/projects/packages/forms/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-forms",
-	"version": "0.32.4",
+	"version": "0.32.5-alpha",
 	"description": "Jetpack Forms",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/forms/#readme",
 	"bugs": {

diff --git a/projects/packages/forms/src/class-jetpack-forms.php b/projects/packages/forms/src/class-jetpack-forms.php
@@ -15,7 +15,7 @@
  */
 class Jetpack_Forms {
 
-	const PACKAGE_VERSION = '0.32.4';
+	const PACKAGE_VERSION = '0.32.5-alpha';
 
 	/**
 	 * Load the contact form module.

diff --git a/projects/packages/forms/src/contact-form/class-admin.php b/projects/packages/forms/src/contact-form/class-admin.php
@@ -738,6 +738,18 @@ public function grunion_manage_post_column_response( $post ) {
 			}
 		}
 
+		// Extract IP address if we still do not have it at this point.
+		if (
+			! isset( $content_fields['_feedback_ip'] )
+			&& is_array( $chunks )
+			&& ! empty( $chunks[0] )
+		) {
+			preg_match( '/^IP: (.+)$/m', $chunks[0], $matches );
+			if ( ! empty( $matches[1] ) ) {
+				$content_fields['_feedback_ip'] = $matches[1];
+			}
+		}
+
 		$response_fields = array_diff_key( $response_fields, array_flip( $non_printable_keys ) );
 
 		echo '<hr class="feedback_response__mobile-separator" />';
@@ -757,7 +769,7 @@ public function grunion_manage_post_column_response( $post ) {
 		echo '<hr />';
 
 		echo '<div class="feedback_response__item">';
-		if ( isset( $content_fields['_feedback_ip'] ) ) {
+		if ( ! empty( $content_fields['_feedback_ip'] ) ) {
 			echo '<div class="feedback_response__item-key">' . esc_html__( 'IP', 'jetpack-forms' ) . '</div>';
 			echo '<div class="feedback_response__item-value">' . esc_html( $content_fields['_feedback_ip'] ) . '</div>';
 		}

diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
@@ -5,6 +5,17 @@ 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).
 
+## [5.45.0] - 2024-07-18
+### Added
+- MU WPCOM: Support localizeUrl [#38318]
+
+### Changed
+- Block Perplexity AI bot in robots.txt when opted out of data sharing. [#38400]
+- Hide wpcom features when site is agency-managed or user is local [#38364]
+
+### Fixed
+- Admin Bar: Hotfix the order of the admin menu items for WP 6.6 [#38347]
+
 ## [5.44.0] - 2024-07-15
 ### Added
 - Add Profile -> My Account menu to admin bar. [#38294]
@@ -997,6 +1008,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[5.45.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.44.0...v5.45.0
 [5.44.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.43.0...v5.44.0
 [5.43.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.42.1...v5.43.0
 [5.42.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.42.0...v5.42.1

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-manual-previous-70-testing b/projects/packages/jetpack-mu-wpcom/changelog/add-manual-previous-70-testing
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/agency-managed-check b/projects/packages/jetpack-mu-wpcom/changelog/agency-managed-check
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-menu-order b/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-menu-order
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/mu-wpcom-localize-url b/projects/packages/jetpack-mu-wpcom/changelog/mu-wpcom-localize-url
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-wpcom-admin-bar-wp-logo b/projects/packages/jetpack-mu-wpcom/changelog/update-wpcom-admin-bar-wp-logo
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.45.0-alpha",
+	"version": "5.45.0",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {

diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.45.0-alpha';
+	const PACKAGE_VERSION = '5.45.0';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php b/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php
@@ -45,6 +45,7 @@ function robots_txt( string $output, $public ): string {
 			'GPTBot',
 			'omgili',
 			'omgilibot',
+			'PerplexityBot',
 			'SentiBot',
 			'sentibot',
 		);

diff --git a/...cts/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php b/...cts/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php
@@ -61,6 +61,9 @@ public function provide_robots_txt(): \Iterator {
 User-agent: omgilibot
 Disallow: /
 
+User-agent: PerplexityBot
+Disallow: /
+
 User-agent: SentiBot
 Disallow: /
 

diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.14] - 2024-07-18
+### Changed
+- Update margins on jitms in my jetpack [#38283]
+
 ## [3.1.13] - 2024-07-03
 ### Changed
 - Updated package dependencies. [#38132]
@@ -731,6 +735,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update Jetpack to use new JITM package
 
+[3.1.14]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.13...v3.1.14
 [3.1.13]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.12...v3.1.13
 [3.1.12]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.11...v3.1.12
 [3.1.11]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.10...v3.1.11

diff --git a/projects/packages/jitm/changelog/update-my-jetpack-jitm-css b/projects/packages/jitm/changelog/update-my-jetpack-jitm-css
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
  */
 class JITM {
 
-	const PACKAGE_VERSION = '3.1.14-alpha';
+	const PACKAGE_VERSION = '3.1.14';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.

diff --git a/projects/packages/masterbar/changelog/fix-warning-masterbar-undefined-array-key b/projects/packages/masterbar/changelog/fix-warning-masterbar-undefined-array-key
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Masterbar: Fix undefined array key warning in Base_Admin_Menu::hide_parent_of_hidden_submenus
diff --git a/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php
@@ -494,10 +494,8 @@ public function hide_parent_of_hidden_submenus() {
 		$this->sort_hidden_submenus();
 
 		foreach ( $menu as $menu_index => $menu_item ) {
-			$has_submenus = isset( $submenu[ $menu_item[2] ] );
-
 			// Skip if the menu doesn't have submenus.
-			if ( ! $has_submenus || ! is_array( $submenu[ $menu_item[2] ] ) ) {
+			if ( empty( $submenu[ $menu_item[2] ] ) || ! is_array( $submenu[ $menu_item[2] ] ) ) {
 				continue;
 			}
 

diff --git a/projects/packages/masterbar/tests/php/test-class-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-admin-menu.php
@@ -500,6 +500,15 @@ public function hide_menu_based_on_submenu_provider() {
 				),
 				array( '', 'read', 'test-slug', '', Base_Admin_Menu::HIDE_CSS_CLASS ),
 			),
+			array(
+				array(
+					array( '', 'read', 'test-empty-submenu', '', '' ),
+				),
+				array(
+					'test-empty-submenu' => array(),
+				),
+				array( '', 'read', 'test-empty-submenu', '', '' ),
+			),
 		);
 	}
 

diff --git a/projects/packages/search/changelog/fix-jetpack_search_customberg-events b/projects/packages/search/changelog/fix-jetpack_search_customberg-events
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: This commit fixes the property of a Tracks event that was being sent as a JSON, which is not a valid Tracks value.
+
+
diff --git a/projects/packages/search/changelog/force-a-release b/projects/packages/search/changelog/force-a-release
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-search",
-	"version": "0.44.12",
+	"version": "0.44.13-alpha",
 	"description": "Package for Jetpack Search products",
 	"main": "main.js",
 	"directories": {

diff --git a/projects/packages/search/src/class-package.php b/projects/packages/search/src/class-package.php
@@ -11,7 +11,7 @@
  * Search package general information
  */
 class Package {
-	const VERSION = '0.44.12';
+	const VERSION = '0.44.13-alpha';
 	const SLUG    = 'search';
 
 	/**

diff --git a/projects/packages/search/src/customberg/components/save-button/index.jsx b/projects/packages/search/src/customberg/components/save-button/index.jsx
@@ -1,7 +1,6 @@
 import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import useEntityRecordState from 'hooks/use-entity-record-state';
-import { SERVER_OBJECT_NAME } from 'instant-search/lib/constants';
 import { eventPrefix, recordEvent } from 'lib/analytics';
 import './styles.scss';
 
@@ -11,22 +10,13 @@ import './styles.scss';
  * @returns {Element} component instance
  */
 export default function SaveButton() {
-	const {
-		editedEntities: editedSettings,
-		isSaving,
-		hasUnsavedEdits,
-		saveRecords,
-	} = useEntityRecordState();
+	const { isSaving, hasUnsavedEdits, saveRecords } = useEntityRecordState();
 
 	const onClick = ( ...args ) => {
 		if ( isSaving ) {
 			return;
 		}
-		recordEvent( `${ eventPrefix }_save_button_click`, {
-			initialSettings: JSON.stringify( window[ SERVER_OBJECT_NAME ].overlayOptions ),
-			changedSettings: JSON.stringify( editedSettings ),
-			changedSettingNames: Object.keys( editedSettings ).join( ',' ),
-		} );
+		recordEvent( `${ eventPrefix }_save_button_click` );
 		saveRecords( ...args );
 	};
 

diff --git a/projects/packages/videopress/changelog/force-a-release b/projects/packages/videopress/changelog/force-a-release
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.