Merge remote-tracking branch 'origin/trunk' into add/performance-impr…

…ovements

.github/files/generate-ci-matrix.php

@@ -26,6 +26,9 @@
 	// {string} Name for the job. Required, and must be unique.
 	'name'                => null,
 
+	// {string} Runner name as found in https://github.com/actions/runner-images/.
+	'runner'              => 'ubuntu-latest',
+
 	// {string} Composer script for the job. Required.
 	'script'              => null,
 
@@ -68,9 +71,10 @@
 	);
 }
 
-// TODO: When WordPress 6.5 is no longer supported, this can be removed.
+// TODO: When WordPress 6.5 is no longer supported, this can be removed. Runs too slow on ubuntu-24.04 (ubuntu-latest).
 $matrix[] = array(
 	'name'                => 'PHP tests: PHP 7.0 WP previous',
+	'runner'              => 'ubuntu-22.04',
 	'script'              => 'test-php',
 	'php'                 => '7.0',
 	'wp'                  => 'previous',

.github/workflows/tests.yml

@@ -27,7 +27,7 @@ jobs:
 
   run-tests:
     name: ${{ matrix.name }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     needs: create-matrix
     services:
       database:

projects/js-packages/components/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.58.0] - 2024-10-15
+### Added
+- Add DiffViewer component [#39672]
+- Add ThreatSeverityBadge component [#39758]
+
 ## [0.57.0] - 2024-10-14
 ### Added
 - Add JetpackProtectLogo component. [#39703]
@@ -1190,6 +1195,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.58.0]: https://github.com/Automattic/jetpack-components/compare/0.57.0...0.58.0
 [0.57.0]: https://github.com/Automattic/jetpack-components/compare/0.56.3...0.57.0
 [0.56.3]: https://github.com/Automattic/jetpack-components/compare/0.56.2...0.56.3
 [0.56.2]: https://github.com/Automattic/jetpack-components/compare/0.56.1...0.56.2

projects/plugins/protect/src/js/components/severity/index.jsx → projects/js-packages/components/components/threat-severity-badge/index.tsx

@@ -12,11 +12,11 @@ const severityClassNames = severity => {
 
 const severityText = severity => {
 	if ( severity >= 5 ) {
-		return _x( 'Critical', 'Severity label for issues rated 5 or higher.', 'jetpack-protect' );
+		return _x( 'Critical', 'Severity label for issues rated 5 or higher.', 'jetpack' );
 	} else if ( severity >= 3 && severity < 5 ) {
-		return _x( 'High', 'Severity label for issues rated between 3 and 5.', 'jetpack-protect' );
+		return _x( 'High', 'Severity label for issues rated between 3 and 5.', 'jetpack' );
 	}
-	return _x( 'Low', 'Severity label for issues rated below 3.', 'jetpack-protect' );
+	return _x( 'Low', 'Severity label for issues rated below 3.', 'jetpack' );
 };
 
 const ThreatSeverityBadge = ( { severity } ) => {

projects/plugins/protect/src/js/components/severity/stories/index.stories.jsx → projects/js-packages/components/components/threat-severity-badge/stories/index.stories.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import ThreatSeverityBadge from '../index.jsx';
+import ThreatSeverityBadge from '../index.js';
 
 export default {
-	title: 'Plugins/Protect/Threat Severity Badge',
+	title: 'JS Packages/Components/Threat Severity Badge',
 	component: ThreatSeverityBadge,
 };
 

projects/js-packages/components/components/threat-severity-badge/test/index.test.tsx

@@ -0,0 +1,9 @@
+import { render, screen } from '@testing-library/react';
+import ThreatSeverityBadge from '..';
+
+describe( 'ThreatSeverityBadge', () => {
+	it( 'renders the correct severity label', () => {
+		render( <ThreatSeverityBadge severity={ 4 } /> );
+		expect( screen.getByText( 'High' ) ).toBeInTheDocument();
+	} );
+} );

projects/js-packages/components/index.ts

@@ -44,6 +44,7 @@ export { default as CopyToClipboard } from './components/copy-to-clipboard';
 export * from './components/icons';
 export { default as SplitButton } from './components/split-button';
 export { default as ThemeProvider } from './components/theme-provider';
+export { default as ThreatSeverityBadge } from './components/threat-severity-badge';
 export { default as Text, H2, H3, Title } from './components/text';
 export { default as ToggleControl } from './components/toggle-control';
 export { default as numberFormat } from './components/number-format';

projects/js-packages/components/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.57.0",
+	"version": "0.58.0",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

projects/js-packages/connection/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.35.14] - 2024-10-15
+### Changed
+- Update dependencies.
+
 ## [0.35.13] - 2024-10-14
 ### Changed
 - Internal updates.
@@ -871,6 +875,7 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.35.14]: https://github.com/Automattic/jetpack-connection-js/compare/v0.35.13...v0.35.14
 [0.35.13]: https://github.com/Automattic/jetpack-connection-js/compare/v0.35.12...v0.35.13
 [0.35.12]: https://github.com/Automattic/jetpack-connection-js/compare/v0.35.11...v0.35.12
 [0.35.11]: https://github.com/Automattic/jetpack-connection-js/compare/v0.35.10...v0.35.11

projects/js-packages/connection/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.35.13",
+	"version": "0.35.14",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {

projects/js-packages/idc/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA IDC package releases.
 
+## 0.11.17 - 2024-10-15
+### Changed
+- Update dependencies.
+
 ## 0.11.16 - 2024-10-14
 ### Changed
 - Update dependencies.

projects/js-packages/idc/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-idc",
-	"version": "0.11.16",
+	"version": "0.11.17",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

projects/js-packages/licensing/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.13.5 - 2024-10-15
+### Changed
+- Update dependencies. [#37982]
+
 ## 0.13.4 - 2024-10-14
 ### Changed
 - Update dependencies. [#37982]

projects/js-packages/licensing/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-licensing",
-	"version": "0.13.4",
+	"version": "0.13.5",
 	"description": "Jetpack licensing flow",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/licensing/#readme",
 	"bugs": {

projects/plugins/protect/changelog/fix-protect-last-checked-conversions → projects/js-packages/publicize-components/changelog/force-a-release

@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Fixes lastChecked conversions
+Update dependencies.

projects/plugins/protect/changelog/renovate-lock-file-maintenance → projects/js-packages/shared-extension-utils/changelog/force-a-release

@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies.
+Update dependencies.

projects/packages/autoloader/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.2] - 2024-10-15
+### Changed
+- Internal updates.
+
 ## [3.1.1] - 2024-10-10
 ### Changed
 - Internal updates.
@@ -381,6 +385,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add Custom Autoloader
 
+[3.1.2]: https://github.com/Automattic/jetpack-autoloader/compare/v3.1.1...v3.1.2
 [3.1.1]: https://github.com/Automattic/jetpack-autoloader/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/Automattic/jetpack-autoloader/compare/v3.0.10...v3.1.0
 [3.0.10]: https://github.com/Automattic/jetpack-autoloader/compare/v3.0.9...v3.0.10

projects/packages/autoloader/src/AutoloadGenerator.php

@@ -21,7 +21,7 @@
  */
 class AutoloadGenerator {
 
-	const VERSION = '3.1.1';
+	const VERSION = '3.1.2';
 
 	/**
 	 * IO object.

projects/plugins/protect/changelog/renovate-lock-file-maintenance#2 → projects/packages/backup/changelog/force-a-release

@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies.
+Update dependencies.

projects/plugins/protect/changelog/renovate-wordpress-monorepo → projects/packages/blaze/changelog/force-a-release

@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies.
+Update dependencies.

projects/packages/forms/changelog/force-a-release

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.

projects/packages/jetpack-mu-wpcom/changelog/add-reader-admin-bar-menu-title

@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Admin bar: Add reader icon tooltip

projects/packages/jetpack-mu-wpcom/changelog/add-ssl-provisioned-task

@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+adding a WPCOM task

projects/packages/jetpack-mu-wpcom/changelog/fix-migration-site-completed-by-default

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Make the Migrating the site task complete by default

projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php

@@ -806,7 +806,7 @@ function wpcom_launchpad_get_task_definitions() {
 			'get_title'            => function () {
 				return __( 'Migrating the site', 'jetpack-mu-wpcom' );
 			},
-			'is_complete_callback' => 'wpcom_launchpad_is_task_option_completed',
+			'is_complete_callback' => '__return_true',
 			'is_visible_callback'  => '__return_true',
 		),
 		// Post-migration tasks.
@@ -852,6 +852,17 @@ function wpcom_launchpad_get_task_definitions() {
 			'is_complete_callback' => 'wpcom_launchpad_is_task_option_completed',
 			'is_visible_callback'  => '__return_true',
 		),
+		'check_ssl_status'                => array(
+			'get_title'            => function () {
+				return __( 'Provision SSL certificate', 'jetpack-mu-wpcom' );
+			},
+			'is_complete_callback' => 'wpcom_launchpad_is_task_option_completed',
+			'is_disabled_callback' => 'wpcom_launchpad_is_primary_domain_wpcom',
+			'get_calypso_path'     => function ( $task, $default, $data ) {
+				$domain = $data['site_slug_encoded'];
+				return '/domains/manage/' . $domain . '/edit/' . $domain;
+			},
+		),
 	);
 
 	$extended_task_definitions = apply_filters( 'wpcom_launchpad_extended_task_definitions', array() );
@@ -2803,3 +2814,20 @@ function wpcom_launchpad_get_latest_draft_id() {
 
 	return $cached_draft_id;
 }
+
+/**
+ * Checks if the current site primary domain is a WPCOM domain.
+ *
+ * @return bool Will return true if the primary domain is a WPCOM domain.
+ */
+function wpcom_launchpad_is_primary_domain_wpcom() {
+	if ( ! ( new Automattic\Jetpack\Status\Host() )->is_wpcom_platform() ) {
+		return false;
+	}
+
+	$url  = home_url();
+	$host = wp_parse_url( $url, PHP_URL_HOST );
+
+	// If site_slug ends with .wpcomstaging.com return true
+	return str_ends_with( $host, '.wpcomstaging.com' );
+}

projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php

@@ -325,6 +325,7 @@ function wpcom_launchpad_get_task_list_definitions() {
 				'review_plugins',
 				'connect_migration_domain',
 				'domain_dns_mapped',
+				'check_ssl_status',
 			),
 		),
 	);

projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php

@@ -220,7 +220,7 @@ function wpcom_add_reader_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_menu(
 		array(
 			'id'     => 'reader',
-			'title'  => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' .
+			'title'  => '<span class="ab-icon" title="' . __( 'Read the blogs and topics you follow', 'jetpack-mu-wpcom' ) . '" aria-hidden="true"></span><span class="screen-reader-text">' .
 						/* translators: Hidden accessibility text. */
 						__( 'Reader', 'jetpack-mu-wpcom' ) .
 						'</span>',

projects/packages/my-jetpack/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).
 
+## [4.35.14] - 2024-10-15
+### Changed
+- Update dependencies. [#38910]
+
 ## [4.35.13] - 2024-10-14
 ### Changed
 - Only include `wp-polyfill` as a script dependency when needed. [#39629]
@@ -1776,6 +1780,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[4.35.14]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.13...4.35.14
 [4.35.13]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.12...4.35.13
 [4.35.12]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.11...4.35.12
 [4.35.11]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.35.10...4.35.11

projects/packages/my-jetpack/changelog/fix-my-jetpack-missing-site-connection-notice

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix the "Missing site connection" notice.

projects/packages/my-jetpack/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "4.35.13",
+	"version": "4.35.14",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

projects/packages/my-jetpack/src/class-initializer.php

@@ -42,7 +42,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.35.13';
+	const PACKAGE_VERSION = '4.35.14';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.
@@ -940,17 +940,18 @@ public static function alert_if_missing_connection( array $red_bubble_slugs ) {
 		$broken_modules = self::check_for_broken_modules();
 		$connection     = new Connection_Manager();
 
-		if ( ! empty( $broken_modules['needs_user_connection'] ) ) {
+		// Checking for site connection issues first.
+		if ( ! empty( $broken_modules['needs_site_connection'] ) ) {
 			$red_bubble_slugs[ self::MISSING_CONNECTION_NOTIFICATION_KEY ] = array(
-				'type'     => 'user',
+				'type'     => 'site',
 				'is_error' => true,
 			);
 			return $red_bubble_slugs;
 		}
 
-		if ( ! empty( $broken_modules['needs_site_connection'] ) ) {
+		if ( ! empty( $broken_modules['needs_user_connection'] ) ) {
 			$red_bubble_slugs[ self::MISSING_CONNECTION_NOTIFICATION_KEY ] = array(
-				'type'     => 'site',
+				'type'     => 'user',
 				'is_error' => true,
 			);
 			return $red_bubble_slugs;

projects/packages/search/changelog/force-a-release

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.