From 210e75345653abee7954a11d3669cd56175b9ea5 Mon Sep 17 00:00:00 2001
From: Sergey Mitroshin <sergeymitr@gmail.com>
Date: Wed, 15 Feb 2023 16:15:48 -0500
Subject: [PATCH 01/51] Connection: move the notice for deleting connection
 owner (#28516)

Move the "Delete Connection Owner" notice from JITM to Connection package.
---
 ...update-move-delete-connection-owner-notice |   4 +
 projects/packages/connection/composer.json    |   2 +-
 .../src/class-connection-notice.php           | 223 ++++++++++++++++++
 .../packages/connection/src/class-manager.php |   3 +
 .../connection/src/class-package-version.php  |   2 +-
 .../php/test-class-connection-notice.php      | 168 +++++++++++++
 ...update-move-delete-connection-owner-notice |   4 +
 projects/packages/jitm/composer.json          |   2 +-
 projects/packages/jitm/src/class-jitm.php     |   2 +-
 .../jitm/src/class-post-connection-jitm.php   | 191 ---------------
 ...update-move-delete-connection-owner-notice |   4 +
 ...update-move-delete-connection-owner-notice |   4 +
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/backup/composer.lock         |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/boost/composer.lock          |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/jetpack/composer.lock        |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/migration/composer.lock      |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/protect/composer.lock        |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/search/composer.lock         |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/social/composer.lock         |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/starter-plugin/composer.lock |   8 +-
 ...update-move-delete-connection-owner-notice |   5 +
 ...date-move-delete-connection-owner-notice#2 |   5 +
 projects/plugins/videopress/composer.lock     |   8 +-
 39 files changed, 540 insertions(+), 231 deletions(-)
 create mode 100644 projects/packages/connection/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/packages/connection/src/class-connection-notice.php
 create mode 100644 projects/packages/connection/tests/php/test-class-connection-notice.php
 create mode 100644 projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/packages/wp-js-data-sync/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/backup/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/backup/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/boost/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/boost/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/migration/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/migration/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/protect/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/protect/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/search/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/search/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/social/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/social/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice#2
 create mode 100644 projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice
 create mode 100644 projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice#2

diff --git a/projects/packages/connection/changelog/update-move-delete-connection-owner-notice b/projects/packages/connection/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..819bafa1a1ee8
--- /dev/null
+++ b/projects/packages/connection/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Moving deleting connection owner notice from JITM to Connection package.
diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json
index aae4136995cba..bd9979837e76f 100644
--- a/projects/packages/connection/composer.json
+++ b/projects/packages/connection/composer.json
@@ -65,7 +65,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "1.50.x-dev"
+			"dev-trunk": "1.51.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/connection/src/class-connection-notice.php b/projects/packages/connection/src/class-connection-notice.php
new file mode 100644
index 0000000000000..45f51a8232294
--- /dev/null
+++ b/projects/packages/connection/src/class-connection-notice.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Admin connection notices.
+ *
+ * @package automattic/jetpack-admin-ui
+ */
+
+namespace Automattic\Jetpack\Connection;
+
+use Automattic\Jetpack\Redirect;
+use Automattic\Jetpack\Tracking;
+
+/**
+ * Admin connection notices.
+ */
+class Connection_Notice {
+
+	/**
+	 * Whether the class has been initialized.
+	 *
+	 * @var bool
+	 */
+	private static $is_initialized = false;
+
+	/**
+	 * The constructor.
+	 */
+	public function __construct() {
+		if ( ! static::$is_initialized ) {
+			add_action( 'current_screen', array( $this, 'initialize_notices' ) );
+			static::$is_initialized = true;
+		}
+	}
+
+	/**
+	 * Initialize the notices if needed.
+	 *
+	 * @param \WP_Screen $screen WP Core's screen object.
+	 *
+	 * @return void
+	 */
+	public function initialize_notices( $screen ) {
+		if ( ! in_array(
+			$screen->id,
+			array(
+				'jetpack_page_akismet-key-config',
+				'admin_page_jetpack_modules',
+			),
+			true
+		) ) {
+			add_action( 'admin_notices', array( $this, 'delete_user_update_connection_owner_notice' ) );
+		}
+	}
+
+	/**
+	 * This is an entire admin notice dedicated to messaging and handling of the case where a user is trying to delete
+	 * the connection owner.
+	 */
+	public function delete_user_update_connection_owner_notice() {
+		global $current_screen;
+
+		/*
+		 * phpcs:disable WordPress.Security.NonceVerification.Recommended
+		 *
+		 * This function is firing within wp-admin and checks (below) if it is in the midst of a deletion on the users
+		 * page. Nonce will be already checked by WordPress, so we do not need to check ourselves.
+		 */
+
+		if ( ! isset( $current_screen->base ) || 'users' !== $current_screen->base ) {
+			return;
+		}
+
+		if ( ! isset( $_REQUEST['action'] ) || 'delete' !== $_REQUEST['action'] ) {
+			return;
+		}
+
+		// Get connection owner or bail.
+		$connection_manager  = new Manager();
+		$connection_owner_id = $connection_manager->get_connection_owner_id();
+		if ( ! $connection_owner_id ) {
+			return;
+		}
+		$connection_owner_userdata = get_userdata( $connection_owner_id );
+
+		// Bail if we're not trying to delete connection owner.
+		$user_ids_to_delete = array();
+		if ( isset( $_REQUEST['users'] ) ) {
+			$user_ids_to_delete = array_map( 'sanitize_text_field', wp_unslash( $_REQUEST['users'] ) );
+		} elseif ( isset( $_REQUEST['user'] ) ) {
+			$user_ids_to_delete[] = sanitize_text_field( wp_unslash( $_REQUEST['user'] ) );
+		}
+
+		// phpcs:enable
+		$user_ids_to_delete        = array_map( 'absint', $user_ids_to_delete );
+		$deleting_connection_owner = in_array( $connection_owner_id, (array) $user_ids_to_delete, true );
+		if ( ! $deleting_connection_owner ) {
+			return;
+		}
+
+		// Bail if they're trying to delete themselves to avoid confusion.
+		if ( get_current_user_id() === $connection_owner_id ) {
+			return;
+		}
+
+		$tracking = new Tracking();
+
+		// Track it!
+		if ( method_exists( $tracking, 'record_user_event' ) ) {
+			$tracking->record_user_event( 'delete_connection_owner_notice_view' );
+		}
+
+		$connected_admins = $connection_manager->get_connected_users( 'jetpack_disconnect' );
+		$user             = is_a( $connection_owner_userdata, 'WP_User' ) ? esc_html( $connection_owner_userdata->data->user_login ) : '';
+
+		echo "<div class='notice notice-warning' id='jetpack-notice-switch-connection-owner'>";
+		echo '<h2>' . esc_html__( 'Important notice about your Jetpack connection:', 'jetpack-connection' ) . '</h2>';
+		echo '<p>' . sprintf(
+			/* translators: WordPress User, if available. */
+			esc_html__( 'Warning! You are about to delete the Jetpack connection owner (%s) for this site, which may cause some of your Jetpack features to stop working.', 'jetpack-connection' ),
+			esc_html( $user )
+		) . '</p>';
+
+		if ( ! empty( $connected_admins ) && count( $connected_admins ) > 1 ) {
+			echo '<form id="jp-switch-connection-owner" action="" method="post">';
+			echo "<label for='owner'>" . esc_html__( 'You can choose to transfer connection ownership to one of these already-connected admins:', 'jetpack-connection' ) . ' </label>';
+
+			$connected_admin_ids = array_map(
+				function ( $connected_admin ) {
+					return $connected_admin->ID;
+				},
+				$connected_admins
+			);
+
+			wp_dropdown_users(
+				array(
+					'name'    => 'owner',
+					'include' => array_diff( $connected_admin_ids, array( $connection_owner_id ) ),
+					'show'    => 'display_name_with_login',
+				)
+			);
+
+			echo '<p>';
+			submit_button( esc_html__( 'Set new connection owner', 'jetpack-connection' ), 'primary', 'jp-switch-connection-owner-submit', false );
+			echo '</p>';
+
+			echo "<div id='jp-switch-user-results'></div>";
+			echo '</form>';
+			?>
+			<script type="text/javascript">
+				jQuery( document ).ready( function( $ ) {
+					$( '#jp-switch-connection-owner' ).on( 'submit', function( e ) {
+						var formData = $( this ).serialize();
+						var submitBtn = document.getElementById( 'jp-switch-connection-owner-submit' );
+						var results = document.getElementById( 'jp-switch-user-results' );
+
+						submitBtn.disabled = true;
+
+						$.ajax( {
+							type        : "POST",
+							url         : "<?php echo esc_url( get_rest_url() . 'jetpack/v4/connection/owner' ); ?>",
+							data        : formData,
+							headers     : {
+								'X-WP-Nonce': "<?php echo esc_js( wp_create_nonce( 'wp_rest' ) ); ?>",
+							},
+							success: function() {
+								results.innerHTML = "<?php esc_html_e( 'Success!', 'jetpack-connection' ); ?>";
+								setTimeout( function() {
+									$( '#jetpack-notice-switch-connection-owner' ).hide( 'slow' );
+								}, 1000 );
+							}
+						} ).done( function() {
+							submitBtn.disabled = false;
+						} );
+
+						e.preventDefault();
+						return false;
+					} );
+				} );
+			</script>
+			<?php
+		} else {
+			echo '<p>' . esc_html__( 'Every Jetpack site needs at least one connected admin for the features to work properly. Please connect to your WordPress.com account via the button below. Once you connect, you may refresh this page to see an option to change the connection owner.', 'jetpack-connection' ) . '</p>';
+			$connect_url = $connection_manager->get_authorization_url();
+			$connect_url = add_query_arg( 'from', 'delete_connection_owner_notice', $connect_url );
+			echo "<a href='" . esc_url( $connect_url ) . "' target='_blank' rel='noopener noreferrer' class='button-primary'>" . esc_html__( 'Connect to WordPress.com', 'jetpack-connection' ) . '</a>';
+		}
+
+		echo '<p>';
+		printf(
+			wp_kses(
+			/* translators: URL to Jetpack support doc regarding the primary user. */
+				__( "<a href='%s' target='_blank' rel='noopener noreferrer'>Learn more</a> about the connection owner and what will break if you do not have one.", 'jetpack-connection' ),
+				array(
+					'a' => array(
+						'href'   => true,
+						'target' => true,
+						'rel'    => true,
+					),
+				)
+			),
+			esc_url( Redirect::get_url( 'jetpack-support-primary-user' ) )
+		);
+		echo '</p>';
+		echo '<p>';
+		printf(
+			wp_kses(
+			/* translators: URL to contact Jetpack support. */
+				__( 'As always, feel free to <a href="%s" target="_blank" rel="noopener noreferrer">contact our support team</a> if you have any questions.', 'jetpack-connection' ),
+				array(
+					'a' => array(
+						'href'   => true,
+						'target' => true,
+						'rel'    => true,
+					),
+				)
+			),
+			esc_url( Redirect::get_url( 'jetpack-contact-support' ) )
+		);
+		echo '</p>';
+		echo '</div>';
+	}
+
+}
diff --git a/projects/packages/connection/src/class-manager.php b/projects/packages/connection/src/class-manager.php
index 4cb6b2e83512f..9254dc43a9713 100644
--- a/projects/packages/connection/src/class-manager.php
+++ b/projects/packages/connection/src/class-manager.php
@@ -131,6 +131,9 @@ public static function configure() {
 		if ( defined( 'JETPACK__SANDBOX_DOMAIN' ) && JETPACK__SANDBOX_DOMAIN ) {
 			( new Server_Sandbox() )->init();
 		}
+
+		// Initialize connection notices.
+		new Connection_Notice();
 	}
 
 	/**
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
index ffab5cfc318dc..27a338e319998 100644
--- a/projects/packages/connection/src/class-package-version.php
+++ b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.50.2-alpha';
+	const PACKAGE_VERSION = '1.51.0-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 
diff --git a/projects/packages/connection/tests/php/test-class-connection-notice.php b/projects/packages/connection/tests/php/test-class-connection-notice.php
new file mode 100644
index 0000000000000..2c829ce7bd202
--- /dev/null
+++ b/projects/packages/connection/tests/php/test-class-connection-notice.php
@@ -0,0 +1,168 @@
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+
+/**
+ * The nonce handler tests.
+ *
+ * @package automattic/jetpack-connection
+ */
+
+namespace Automattic\Jetpack\Connection;
+
+use Automattic\Jetpack\Constants;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * The nonce handler tests.
+ */
+class Test_Connection_Notice extends TestCase {
+
+	/**
+	 * Database query filter.
+	 *
+	 * @var callable
+	 */
+	private $users_query_filter;
+
+	/**
+	 * Fake users created by the tests.
+	 *
+	 * @var array
+	 */
+	private $fake_users = array();
+
+	/**
+	 * Testing the "need to connect first" notice.
+	 */
+	public function test_delete_user_connect_notice() {
+		$tokens = \Jetpack_Options::get_option( 'user_tokens' );
+		\Jetpack_Options::update_option( 'user_tokens', array_slice( $tokens, 0, 1, true ) );
+
+		$notice = new Connection_Notice();
+
+		$this->expectOutputRegex( '#Connect to WordPress.com#i' );
+		$this->expectOutputRegex( '#https://jetpack\.wordpress\.com/jetpack\.authorize/1/\?response_type=code#i' );
+
+		$notice->delete_user_update_connection_owner_notice();
+
+		\Jetpack_Options::update_option( 'user_tokens', $tokens );
+	}
+
+	/**
+	 * Testing the "choose new owner" notice.
+	 */
+	public function test_delete_user_change_owner_notice() {
+		$notice = new Connection_Notice();
+
+		$this->expectOutputRegex( '#Set new connection owner#i' );
+		$this->expectOutputRegex( '#http://example\.org/index\.php\?rest_route=/jetpack/v4/connection/owner#i' );
+
+		$notice->delete_user_update_connection_owner_notice();
+	}
+
+	/**
+	 * Set up the environment.
+	 *
+	 * @before
+	 *
+	 * @return void
+	 */
+	protected function set_up() {
+		global $current_screen;
+
+		\Jetpack_Options::update_option( 'blog_token', 'asdasd.123123' );
+		\Jetpack_Options::update_option( 'id', '12345' );
+
+		$id_admin           = wp_insert_user(
+			array(
+				'user_login' => 'admin',
+				'user_pass'  => 'pass',
+				'role'       => 'administrator',
+			)
+		);
+		$this->fake_users[] = $id_admin;
+
+		$id_admin2          = wp_insert_user(
+			array(
+				'user_login' => 'admin2',
+				'user_pass'  => 'pass2',
+				'role'       => 'administrator',
+			)
+		);
+		$this->fake_users[] = $id_admin2;
+		wp_set_current_user( $id_admin2 );
+
+		set_transient( 'jetpack_connected_user_data_' . $id_admin2, array( 'ID' => '12345' ) );
+
+		// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		$current_screen       = \WP_Screen::get();
+		$current_screen->base = 'users';
+
+		$_REQUEST['action'] = 'delete';
+		$_REQUEST['user']   = $id_admin;
+
+		$admin_role = get_role( 'administrator' );
+		$admin_role->add_cap( 'jetpack_disconnect', true );
+
+		Constants::set_constant( 'JETPACK__API_BASE', 'https://jetpack.wordpress.com/jetpack.' );
+		Constants::set_constant( 'JETPACK__API_VERSION', '1' );
+
+		\Jetpack_Options::update_option(
+			'user_tokens',
+			array(
+				$id_admin  => 'asd123.asd123.' . $id_admin,
+				$id_admin2 => 'asd123.asd123.' . $id_admin2,
+			)
+		);
+		\Jetpack_Options::update_option( 'master_user', $id_admin );
+
+		$this->users_query_filter = function ( $result, $query ) {
+			if ( 0 === strpos( trim( $query ), 'SELECT wp_users.user_registered' )
+				&& preg_match( '#wp_usermeta\.meta_value LIKE \'\{.*?\}"administrator"\{.*?\}\'#i', $query )
+			) {
+				return array( (object) array( 'user_registered' => '2012-03-19 00:00:00' ) );
+			}
+
+			return $result;
+		};
+
+		add_filter( 'wordbless_wpdb_query_results', $this->users_query_filter, 10, 2 );
+	}
+
+	/**
+	 * Clean up.
+	 *
+	 * @after
+	 *
+	 * @return void
+	 */
+	protected function tear_down() {
+		global $current_screen;
+
+		delete_transient( 'jetpack_connected_user_data_' . get_current_user_id() );
+
+		unset( $current_screen );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		unset( $_REQUEST['action'] );
+
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		unset( $_REQUEST['user'] );
+
+		\Jetpack_Options::delete_option( 'blog_token' );
+		\Jetpack_Options::delete_option( 'user_tokens' );
+		\Jetpack_Options::delete_option( 'id' );
+		\Jetpack_Options::delete_option( 'master_user' );
+
+		remove_filter( 'wordbless_wpdb_query_results', $this->users_query_filter, 10 );
+
+		Constants::clear_constants();
+
+		wp_destroy_current_session();
+
+		foreach ( $this->fake_users as $user_id ) {
+			wp_delete_user( $user_id );
+		}
+
+		$admin_role = get_role( 'administrator' );
+		$admin_role->remove_cap( 'jetpack_disconnect' );
+	}
+}
diff --git a/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice b/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..819bafa1a1ee8
--- /dev/null
+++ b/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Moving deleting connection owner notice from JITM to Connection package.
diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json
index 7b77465245659..26744020cdd07 100644
--- a/projects/packages/jitm/composer.json
+++ b/projects/packages/jitm/composer.json
@@ -66,7 +66,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.2.x-dev"
+			"dev-trunk": "2.3.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index 704cbf3238487..4e309fb0321f5 100644
--- 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 = '2.2.42';
+	const PACKAGE_VERSION = '2.3.0-alpha';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/jitm/src/class-post-connection-jitm.php b/projects/packages/jitm/src/class-post-connection-jitm.php
index 79aaf3cf50f9e..4ff2eb76fcd95 100644
--- a/projects/packages/jitm/src/class-post-connection-jitm.php
+++ b/projects/packages/jitm/src/class-post-connection-jitm.php
@@ -40,31 +40,6 @@ public function __construct() {
 		$this->tracking = new Tracking();
 	}
 
-	/**
-	 * Prepare actions according to screen and post type.
-	 *
-	 * @since 1.1.0
-	 * @since-jetpack 3.8.2
-	 *
-	 * @uses Jetpack_Autoupdate::get_possible_failures()
-	 *
-	 * @param \WP_Screen $screen WP Core's screen object.
-	 */
-	public function prepare_jitms( $screen ) {
-		parent::prepare_jitms( $screen );
-		if ( ! in_array(
-			$screen->id,
-			array(
-				'jetpack_page_akismet-key-config',
-				'admin_page_jetpack_modules',
-			),
-			true
-		) ) {
-			// Not really a JITM. Don't know where else to put this :) .
-			add_action( 'admin_notices', array( $this, 'delete_user_update_connection_owner_notice' ) );
-		}
-	}
-
 	/**
 	 * A special filter for WooCommerce, to set a message based on local state.
 	 *
@@ -229,172 +204,6 @@ public static function jitm_jetpack_boost_activate() {
 		);
 	}
 
-	/**
-	 * This is an entire admin notice dedicated to messaging and handling of the case where a user is trying to delete
-	 * the connection owner.
-	 */
-	public function delete_user_update_connection_owner_notice() {
-		global $current_screen;
-
-		/*
-		 * phpcs:disable WordPress.Security.NonceVerification.Recommended
-		 *
-		 * This function is firing within wp-admin and checks (below) if it is in the midst of a deletion on the users
-		 * page. Nonce will be already checked by WordPress, so we do not need to check ourselves.
-		 */
-
-		if ( ! isset( $current_screen->base ) || 'users' !== $current_screen->base ) {
-			return;
-		}
-
-		if ( ! isset( $_REQUEST['action'] ) || 'delete' !== $_REQUEST['action'] ) {
-			return;
-		}
-
-		// Get connection owner or bail.
-		$connection_manager  = new Manager();
-		$connection_owner_id = $connection_manager->get_connection_owner_id();
-		if ( ! $connection_owner_id ) {
-			return;
-		}
-		$connection_owner_userdata = get_userdata( $connection_owner_id );
-
-		// Bail if we're not trying to delete connection owner.
-		$user_ids_to_delete = array();
-		if ( isset( $_REQUEST['users'] ) ) {
-			$user_ids_to_delete = array_map( 'sanitize_text_field', wp_unslash( $_REQUEST['users'] ) );
-		} elseif ( isset( $_REQUEST['user'] ) ) {
-			$user_ids_to_delete[] = sanitize_text_field( wp_unslash( $_REQUEST['user'] ) );
-		}
-
-		// phpcs:enable
-		$user_ids_to_delete        = array_map( 'absint', $user_ids_to_delete );
-		$deleting_connection_owner = in_array( $connection_owner_id, (array) $user_ids_to_delete, true );
-		if ( ! $deleting_connection_owner ) {
-			return;
-		}
-
-		// Bail if they're trying to delete themselves to avoid confusion.
-		if ( get_current_user_id() === $connection_owner_id ) {
-			return;
-		}
-
-		// Track it!
-		if ( method_exists( $this->tracking, 'record_user_event' ) ) {
-			$this->tracking->record_user_event( 'delete_connection_owner_notice_view' );
-		}
-
-		$connected_admins = $connection_manager->get_connected_users( 'jetpack_disconnect' );
-		$user             = is_a( $connection_owner_userdata, 'WP_User' ) ? esc_html( $connection_owner_userdata->data->user_login ) : '';
-
-		echo "<div class='notice notice-warning' id='jetpack-notice-switch-connection-owner'>";
-		echo '<h2>' . esc_html__( 'Important notice about your Jetpack connection:', 'jetpack-jitm' ) . '</h2>';
-		echo '<p>' . sprintf(
-			/* translators: WordPress User, if available. */
-			esc_html__( 'Warning! You are about to delete the Jetpack connection owner (%s) for this site, which may cause some of your Jetpack features to stop working.', 'jetpack-jitm' ),
-			esc_html( $user )
-		) . '</p>';
-
-		if ( ! empty( $connected_admins ) && count( $connected_admins ) > 1 ) {
-			echo '<form id="jp-switch-connection-owner" action="" method="post">';
-			echo "<label for='owner'>" . esc_html__( 'You can choose to transfer connection ownership to one of these already-connected admins:', 'jetpack-jitm' ) . ' </label>';
-
-			$connected_admin_ids = array_map(
-				function ( $connected_admin ) {
-						return $connected_admin->ID;
-				},
-				$connected_admins
-			);
-
-			wp_dropdown_users(
-				array(
-					'name'    => 'owner',
-					'include' => array_diff( $connected_admin_ids, array( $connection_owner_id ) ),
-					'show'    => 'display_name_with_login',
-				)
-			);
-
-			echo '<p>';
-			submit_button( esc_html__( 'Set new connection owner', 'jetpack-jitm' ), 'primary', 'jp-switch-connection-owner-submit', false );
-			echo '</p>';
-
-			echo "<div id='jp-switch-user-results'></div>";
-			echo '</form>';
-			?>
-			<script type="text/javascript">
-				jQuery( document ).ready( function( $ ) {
-					$( '#jp-switch-connection-owner' ).on( 'submit', function( e ) {
-						var formData = $( this ).serialize();
-						var submitBtn = document.getElementById( 'jp-switch-connection-owner-submit' );
-						var results = document.getElementById( 'jp-switch-user-results' );
-
-						submitBtn.disabled = true;
-
-						$.ajax( {
-							type        : "POST",
-							url         : "<?php echo esc_url( get_rest_url() . 'jetpack/v4/connection/owner' ); ?>",
-							data        : formData,
-							headers     : {
-								'X-WP-Nonce': "<?php echo esc_js( wp_create_nonce( 'wp_rest' ) ); ?>",
-							},
-							success: function() {
-								results.innerHTML = "<?php esc_html_e( 'Success!', 'jetpack-jitm' ); ?>";
-								setTimeout( function() {
-									$( '#jetpack-notice-switch-connection-owner' ).hide( 'slow' );
-								}, 1000 );
-							}
-						} ).done( function() {
-							submitBtn.disabled = false;
-						} );
-
-						e.preventDefault();
-						return false;
-					} );
-				} );
-			</script>
-			<?php
-		} else {
-			echo '<p>' . esc_html__( 'Every Jetpack site needs at least one connected admin for the features to work properly. Please connect to your WordPress.com account via the button below. Once you connect, you may refresh this page to see an option to change the connection owner.', 'jetpack-jitm' ) . '</p>';
-			$connect_url = $connection_manager->get_authorization_url();
-			$connect_url = add_query_arg( 'from', 'delete_connection_owner_notice', $connect_url );
-			echo "<a href='" . esc_url( $connect_url ) . "' target='_blank' rel='noopener noreferrer' class='button-primary'>" . esc_html__( 'Connect to WordPress.com', 'jetpack-jitm' ) . '</a>';
-		}
-
-		echo '<p>';
-		printf(
-			wp_kses(
-				/* translators: URL to Jetpack support doc regarding the primary user. */
-				__( "<a href='%s' target='_blank' rel='noopener noreferrer'>Learn more</a> about the connection owner and what will break if you do not have one.", 'jetpack-jitm' ),
-				array(
-					'a' => array(
-						'href'   => true,
-						'target' => true,
-						'rel'    => true,
-					),
-				)
-			),
-			esc_url( Redirect::get_url( 'jetpack-support-primary-user' ) )
-		);
-		echo '</p>';
-		echo '<p>';
-		printf(
-			wp_kses(
-				/* translators: URL to contact Jetpack support. */
-				__( 'As always, feel free to <a href="%s" target="_blank" rel="noopener noreferrer">contact our support team</a> if you have any questions.', 'jetpack-jitm' ),
-				array(
-					'a' => array(
-						'href'   => true,
-						'target' => true,
-						'rel'    => true,
-					),
-				)
-			),
-			esc_url( Redirect::get_url( 'jetpack-contact-support' ) )
-		);
-		echo '</p>';
-		echo '</div>';
-	}
-
 	/**
 	 * Dismisses a JITM feature class so that it will no longer be shown.
 	 *
diff --git a/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice b/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..286356ac211bd
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Auto-formatting of some files.
diff --git a/projects/packages/wp-js-data-sync/changelog/update-move-delete-connection-owner-notice b/projects/packages/wp-js-data-sync/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..257377d5d535a
--- /dev/null
+++ b/projects/packages/wp-js-data-sync/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Auto-formatting files.
diff --git a/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice b/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/backup/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
index b8fcb1d5827f8..68636398c51a9 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -412,7 +412,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -440,7 +440,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -657,7 +657,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -686,7 +686,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice b/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index 514c0ea88d67e..999b6dd753a54 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -497,7 +497,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -526,7 +526,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index a0bdf9697b7a6..a3d04f525cf40 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -702,7 +702,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -730,7 +730,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -1118,7 +1118,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -1147,7 +1147,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice b/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
index e5eec6d94cc04..34dad27f9b49b 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice b/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index 1ae480e83c2a3..b1be744242de9 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/search/changelog/update-move-delete-connection-owner-notice b/projects/plugins/search/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/search/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/search/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/search/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
index 77f4663497d46..77b8ff0911170 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/social/changelog/update-move-delete-connection-owner-notice b/projects/plugins/social/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/social/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index dc5c204743fdd..b5990bb9d1550 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice b/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
index d1ec24b2554bc..6a014fdeae517 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice b/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-move-delete-connection-owner-notice#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock
index 524304efb9aec..22319b86341d9 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -327,7 +327,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "dab8bbf39827ae9e82e29437cd2823e07b2faca2"
+                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -355,7 +355,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.50.x-dev"
+                    "dev-trunk": "1.51.x-dev"
                 }
             },
             "autoload": {
@@ -572,7 +572,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "708bdf617a6e483c8c0ec81bade35db47c354440"
+                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -601,7 +601,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "2.2.x-dev"
+                    "dev-trunk": "2.3.x-dev"
                 }
             },
             "autoload": {

From 051be646b77b060bfa20d4939f69386f6084e8e0 Mon Sep 17 00:00:00 2001
From: Robert Felty <robert.felty@automattic.com>
Date: Thu, 16 Feb 2023 08:51:02 +0100
Subject: [PATCH 02/51] Fix/jetpack search multiple authors (#28975)

* better formatting for multiple authors

* changelog

* Bump package version

---------

Co-authored-by: Jason Moon <jason.moon@automattic.com>
---
 .../search/changelog/fix-jetpack-search-multiple-authors  | 4 ++++
 .../instant-search/components/search-result-expanded.jsx  | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 projects/packages/search/changelog/fix-jetpack-search-multiple-authors

diff --git a/projects/packages/search/changelog/fix-jetpack-search-multiple-authors b/projects/packages/search/changelog/fix-jetpack-search-multiple-authors
new file mode 100644
index 0000000000000..88094bcbf03fb
--- /dev/null
+++ b/projects/packages/search/changelog/fix-jetpack-search-multiple-authors
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Separated authors by comments if there are multiple authors in a search result
diff --git a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
index 47cb368c3287e..97ad26e871b88 100644
--- a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
@@ -37,6 +37,14 @@ export default function SearchResultExpanded( props ) {
 	const firstImage = Array.isArray( fields[ 'image.url.raw' ] )
 		? fields[ 'image.url.raw' ][ 0 ]
 		: fields[ 'image.url.raw' ];
+
+	if ( Array.isArray( fields.author ) ) {
+		if ( fields.author.length > 3 ) {
+			fields.author = fields.author.slice( 0, 3 ).join( ', ' ) + '...';
+		} else {
+			fields.author = fields.author.join( ', ' );
+		}
+	}
 	return (
 		<li
 			className={ [

From e83103dfd3c615d2a12260c7db02711f21b931ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Thu, 16 Feb 2023 07:52:25 -0300
Subject: [PATCH 03/51]  VideoPress: restore v5/v6 transform for all platforms
 (#28986)

* Allow transform from/to v5/v6 for Simple sites too

* restore v5/v6 video block transform

* changelog
---
 .../update-videopress-allow-v5-v6-transforms         |  4 ++++
 .../jetpack/extensions/blocks/videopress/editor.js   | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms

diff --git a/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms b/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms
new file mode 100644
index 0000000000000..a8aa9a6f4d1d1
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+VideoPress: restore v5/v6 transform for all platforms
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
index 476ea624b3a00..24528a54ccc28 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
@@ -419,16 +419,18 @@ addFilter(
  * @returns {object} Modified block settings.
  */
 function addVideoPressCoreVideoTransform( settings, name ) {
+	// Apply only to videopress/video block.
+	if ( name !== 'videopress/video' ) {
+		return settings;
+	}
+
 	const isVideoPressVideoBlockRegistered = getBlockType( 'videopress/video' );
 	const { available: isVideoPressVideoBlockAvailable } = getJetpackExtensionAvailability(
 		'videopress/video'
 	);
 
-	if ( isVideoPressVideoBlockRegistered && isVideoPressVideoBlockAvailable && isSimpleSite() ) {
-		return settings;
-	}
-
-	if ( name !== 'videopress/video' ) {
+	// If videopress/video block is not registered or not available, do not extend transforms.
+	if ( ! isVideoPressVideoBlockRegistered || ! isVideoPressVideoBlockAvailable ) {
 		return settings;
 	}
 

From 15f1f119f4859ded15e0f073ebca52bc732ceb66 Mon Sep 17 00:00:00 2001
From: Francesco Bigiarini <francesco.bigiarini@gmail.com>
Date: Thu, 16 Feb 2023 12:25:27 +0100
Subject: [PATCH 04/51] Add import package (#28824)

* [not verified] Add base endpoints.

* [not verified] Minor refactoring of DB queries.

* [not verified] Added Import package to Config package.

* [not verified] Added Import package

* [not verified] Changelog

* [not verified] Remove unnecessary code

* [not verified] Fix: wrong changelog type

* [not verified] Fix: outdated jetpack/composer.lock

* [not verified] Fix: wrong file name

* [not verified] Add support for pages

* [not verified] Fix: assign global namespace

* [not verified] Add check for existing posts

* [not verified] Fix: wrong inheritance

* [not verified] Fix: missing post ID

* [not verified] Fix undefined type

* [not verified] Add missing fields

* [not verified] Fix: missing categories and tags

* [not verified] Fix: missing ID

* [not verified] Add check if the user is connected to WPCOM

* [not verified] Update composer.lock files

* [not verified] Move terms extraction to its own method

* [not verified] changelog

* [not verified] Bump version

* Bump version
---
 .../components/changelog/fix-wrong-version    |   4 +
 projects/js-packages/components/package.json  |   2 +-
 .../config/changelog/add-import-package       |   4 +
 projects/packages/config/composer.json        |   2 +-
 projects/packages/config/src/class-config.php |  16 ++
 .../import/changelog/add-rest-endpoints       |   4 +
 projects/packages/import/composer.json        |   6 +-
 projects/packages/import/src/class-import.php |  27 ---
 projects/packages/import/src/class-main.php   |  89 +++++++++
 .../import/src/endpoints/class-category.php   | 102 ++++++++++
 .../import/src/endpoints/class-comment.php    |  78 ++++++++
 .../import/src/endpoints/class-page.php       |  45 +++++
 .../import/src/endpoints/class-post.php       | 158 +++++++++++++++
 .../import/src/endpoints/class-tag.php        |  61 ++++++
 .../import/src/endpoints/trait-import.php     | 180 ++++++++++++++++++
 .../backup/changelog/update-import-package    |   5 +
 projects/plugins/backup/composer.lock         |   4 +-
 .../boost/changelog/update-import-package     |   5 +
 projects/plugins/boost/composer.lock          |   4 +-
 .../jetpack/changelog/add-import-package      |   4 +
 .../jetpack/changelog/update-import-package   |   5 +
 projects/plugins/jetpack/class.jetpack.php    |   1 +
 projects/plugins/jetpack/composer.json        |   1 +
 projects/plugins/jetpack/composer.lock        |  74 ++++++-
 .../migration/changelog/update-import-package |   5 +
 projects/plugins/migration/composer.lock      |   4 +-
 .../protect/changelog/update-import-package   |   5 +
 projects/plugins/protect/composer.lock        |   4 +-
 .../search/changelog/update-import-package    |   5 +
 projects/plugins/search/composer.lock         |   4 +-
 .../social/changelog/update-import-package    |   5 +
 projects/plugins/social/composer.lock         |   4 +-
 .../changelog/update-import-package           |   5 +
 projects/plugins/starter-plugin/composer.lock |   4 +-
 .../changelog/update-import-package           |   5 +
 projects/plugins/videopress/composer.lock     |   4 +-
 36 files changed, 885 insertions(+), 50 deletions(-)
 create mode 100644 projects/js-packages/components/changelog/fix-wrong-version
 create mode 100644 projects/packages/config/changelog/add-import-package
 create mode 100644 projects/packages/import/changelog/add-rest-endpoints
 delete mode 100644 projects/packages/import/src/class-import.php
 create mode 100644 projects/packages/import/src/class-main.php
 create mode 100644 projects/packages/import/src/endpoints/class-category.php
 create mode 100644 projects/packages/import/src/endpoints/class-comment.php
 create mode 100644 projects/packages/import/src/endpoints/class-page.php
 create mode 100644 projects/packages/import/src/endpoints/class-post.php
 create mode 100644 projects/packages/import/src/endpoints/class-tag.php
 create mode 100644 projects/packages/import/src/endpoints/trait-import.php
 create mode 100644 projects/plugins/backup/changelog/update-import-package
 create mode 100644 projects/plugins/boost/changelog/update-import-package
 create mode 100644 projects/plugins/jetpack/changelog/add-import-package
 create mode 100644 projects/plugins/jetpack/changelog/update-import-package
 create mode 100644 projects/plugins/migration/changelog/update-import-package
 create mode 100644 projects/plugins/protect/changelog/update-import-package
 create mode 100644 projects/plugins/search/changelog/update-import-package
 create mode 100644 projects/plugins/social/changelog/update-import-package
 create mode 100644 projects/plugins/starter-plugin/changelog/update-import-package
 create mode 100644 projects/plugins/videopress/changelog/update-import-package

diff --git a/projects/js-packages/components/changelog/fix-wrong-version b/projects/js-packages/components/changelog/fix-wrong-version
new file mode 100644
index 0000000000000..599054c81e9b4
--- /dev/null
+++ b/projects/js-packages/components/changelog/fix-wrong-version
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Changed wrong version
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
index c4e4226ff28fe..775fea4841c2e 100644
--- a/projects/js-packages/components/package.json
+++ b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.27.6",
+	"version": "0.27.7-alpha",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/packages/config/changelog/add-import-package b/projects/packages/config/changelog/add-import-package
new file mode 100644
index 0000000000000..68054e25d828c
--- /dev/null
+++ b/projects/packages/config/changelog/add-import-package
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added the Import package.
diff --git a/projects/packages/config/composer.json b/projects/packages/config/composer.json
index 09dc2304e2a09..74564e1333fd2 100644
--- a/projects/packages/config/composer.json
+++ b/projects/packages/config/composer.json
@@ -31,7 +31,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "1.13.x-dev"
+			"dev-trunk": "1.14.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/config/src/class-config.php b/projects/packages/config/src/class-config.php
index c4277002342b2..125534da8f914 100644
--- a/projects/packages/config/src/class-config.php
+++ b/projects/packages/config/src/class-config.php
@@ -15,6 +15,7 @@
 use Automattic\Jetpack\Blaze as Blaze;
 use Automattic\Jetpack\Connection\Manager;
 use Automattic\Jetpack\Connection\Plugin;
+use Automattic\Jetpack\Import\Main as Import_Main;
 use Automattic\Jetpack\JITM as JITM;
 use Automattic\Jetpack\JITMS\JITM as JITMS_JITM;
 use Automattic\Jetpack\Post_List\Post_List as Post_List;
@@ -55,6 +56,7 @@ class Config {
 		'stats'           => false,
 		'stats_admin'     => false,
 		'blaze'           => false,
+		'import'          => false,
 	);
 
 	/**
@@ -162,6 +164,11 @@ public function on_plugins_loaded() {
 		if ( $this->config['blaze'] ) {
 			$this->ensure_class( 'Automattic\Jetpack\Blaze' ) && $this->ensure_feature( 'blaze' );
 		}
+
+		if ( $this->config['import'] ) {
+			$this->ensure_class( 'Automattic\Jetpack\Import\Main' )
+				&& $this->ensure_feature( 'import' );
+		}
 	}
 
 	/**
@@ -355,6 +362,15 @@ protected function enable_blaze() {
 		return true;
 	}
 
+	/**
+	 * Enables the Import feature.
+	 */
+	protected function enable_import() {
+		Import_Main::configure();
+
+		return true;
+	}
+
 	/**
 	 * Setup the Connection options.
 	 */
diff --git a/projects/packages/import/changelog/add-rest-endpoints b/projects/packages/import/changelog/add-rest-endpoints
new file mode 100644
index 0000000000000..4458504769c25
--- /dev/null
+++ b/projects/packages/import/changelog/add-rest-endpoints
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added import REST endpoints.
diff --git a/projects/packages/import/composer.json b/projects/packages/import/composer.json
index 4794daa03d3d1..9e25faca16c03 100644
--- a/projects/packages/import/composer.json
+++ b/projects/packages/import/composer.json
@@ -3,7 +3,9 @@
 	"description": "Set of REST API routes used in WPCOM Unified Importer.",
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
-	"require": {},
+	"require": {
+		"automattic/jetpack-connection": "@dev"
+	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.0.4",
 		"automattic/jetpack-changelogger": "@dev",
@@ -56,7 +58,7 @@
 		},
 		"textdomain": "jetpack-import",
 		"version-constants": {
-			"::PACKAGE_VERSION": "src/class-import.php"
+			"::PACKAGE_VERSION": "src/class-main.php"
 		}
 	}
 }
diff --git a/projects/packages/import/src/class-import.php b/projects/packages/import/src/class-import.php
deleted file mode 100644
index 25ad6671bb29a..0000000000000
--- a/projects/packages/import/src/class-import.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Set of REST API routes used in WPCOM Unified Importer.
- *
- * @package automattic/jetpack-import
- */
-
-namespace Automattic\Jetpack;
-
-/**
- * This class will provide endpoint for the Unified Importer.
- */
-class Import {
-	/**
-	 * Package version.
-	 *
-	 * @var string
-	 */
-	const PACKAGE_VERSION = '0.1.0-alpha';
-
-	/**
-	 * REST API prefix.
-	 *
-	 * @var string
-	 */
-	const REST_PREFIX = 'import/';
-}
diff --git a/projects/packages/import/src/class-main.php b/projects/packages/import/src/class-main.php
new file mode 100644
index 0000000000000..eee86ab88d9cd
--- /dev/null
+++ b/projects/packages/import/src/class-main.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Set of REST API routes used in WPCOM Unified Importer.
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import;
+
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
+use Automattic\Jetpack\Connection\Rest_Authentication;
+
+/**
+ * This class will provide endpoint for the Unified Importer.
+ */
+class Main {
+
+	/**
+	 * Package version.
+	 *
+	 * @var string
+	 */
+	const PACKAGE_VERSION = '0.1.0-alpha';
+
+	/**
+	 * A list of all the routes.
+	 *
+	 * @var \WP_REST_Controller[]
+	 */
+	private static $routes = array();
+
+	/**
+	 * Before everything else starts getting initalized, we need to initialize Jetpack using the
+	 * Config object.
+	 *
+	 * @return void
+	 */
+	public static function configure() {
+		if ( did_action( 'jetpack_import_initialized' ) ) {
+			return;
+		}
+
+		$connection = new Connection_Manager();
+
+		// Initialize the REST API only if the user is connected.
+		if ( $connection->has_connected_owner() ) {
+			add_action( 'rest_api_init', array( __CLASS__, 'initialize_rest_api' ) );
+		}
+
+		/**
+		 * Runs right after the Jetpack Import package is initialized.
+		 *
+		 * @since $$next-version$$
+		*/
+		do_action( 'jetpack_import_initialized' );
+	}
+
+	/**
+	 * Register import related REST routes.
+	 *
+	 * @return void
+	 */
+	public static function initialize_rest_api() {
+		// Set up the REST authentication hooks.
+		Rest_Authentication::init();
+
+		$routes = array(
+			'categories' => new Endpoints\Category(),
+			'comments'   => new Endpoints\Comment(),
+			'pages'      => new Endpoints\Page(),
+			'posts'      => new Endpoints\Post(),
+			'tags'       => new Endpoints\Tag(),
+		);
+
+		/**
+		 * Allow other plugins to modify import routes.
+		 *
+		 * @since $$next-version$$
+		 *
+		 * @param array $routes Array of import routes.
+		 */
+		self::$routes = apply_filters( 'jetpack_import_types', $routes );
+
+		// Register all the routes.
+		foreach ( self::$routes as $route ) {
+			$route->register_routes();
+		}
+	}
+}
diff --git a/projects/packages/import/src/endpoints/class-category.php b/projects/packages/import/src/endpoints/class-category.php
new file mode 100644
index 0000000000000..a96ee9f77551e
--- /dev/null
+++ b/projects/packages/import/src/endpoints/class-category.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Categories REST route
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+/**
+ * Class Category
+ */
+class Category extends \WP_REST_Terms_Controller {
+
+	/**
+	 * The Import ID add a new item to the schema.
+	 */
+	use Import;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct( 'category' );
+
+		// @see add_term_meta
+		$this->import_id_meta_type = 'term';
+	}
+
+	/**
+	 * Registers the routes for the objects of the controller.
+	 *
+	 * @see WP_REST_Terms_Controller::register_rest_route()
+	 */
+	public function register_routes() {
+		register_rest_route(
+			self::$rest_namespace,
+			'/categories',
+			$this->get_route_options()
+		);
+	}
+
+	/**
+	 * Adds the schema from additional fields to a schema array.
+	 *
+	 * The type of object is inferred from the passed schema.
+	 *
+	 * @param array $schema Schema array.
+	 * @return array Modified Schema array.
+	 */
+	public function add_additional_fields_schema( $schema ) {
+		// Parent term is saved like a slug in WXR so we have to rewrite the schema.
+		$schema['properties']['parent']['description'] = __( 'The parent category slug.', 'jetpack-import' );
+		$schema['properties']['parent']['type']        = 'string';
+
+		// Add the import unique ID to the schema.
+		return $this->add_unique_identifier_to_schema( $schema );
+	}
+
+	/**
+	 * Creates a single category.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function create_item( $request ) {
+		if ( isset( $request['parent'] ) ) {
+			$parent = get_term_by( 'slug', $request['parent'], 'category' );
+
+			// Overwrite the parent ID with the parent term ID found using the slug.
+			$request['parent'] = $parent ? $parent->term_id : 0;
+		}
+
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
+	}
+
+	/**
+	 * Update the category parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	protected function update_parent_id( $resource_id, $parent_import_id ) {
+		$categories = \get_categories( $this->get_import_db_query( $parent_import_id ) );
+
+		if ( is_array( $categories ) && count( $categories ) === 1 ) {
+			$parent_id = $categories[0];
+
+			return (bool) \wp_update_category(
+				array(
+					'cat_ID'          => $resource_id,
+					'category_parent' => $parent_id,
+				)
+			);
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/import/src/endpoints/class-comment.php b/projects/packages/import/src/endpoints/class-comment.php
new file mode 100644
index 0000000000000..b45e6e58c84f8
--- /dev/null
+++ b/projects/packages/import/src/endpoints/class-comment.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Comments REST route
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+/**
+ * Class Comment
+ */
+class Comment extends \WP_REST_Comments_Controller {
+
+	/**
+	 * The Import ID add a new item to the schema.
+	 */
+	use Import;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		// @see add_comment_meta
+		$this->import_id_meta_type = $this->rest_base;
+	}
+
+	/**
+	 * Registers the routes for the objects of the controller.
+	 *
+	 * @see WP_REST_Comments_Controller::register_rest_route()
+	 */
+	public function register_routes() {
+		register_rest_route(
+			self::$rest_namespace,
+			$this->rest_base,
+			$this->get_route_options()
+		);
+	}
+
+	/**
+	 * Creates a comment.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or error object on failure.
+	 */
+	public function create_item( $request ) {
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
+	}
+
+	/**
+	 * Update the comment parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	protected function update_parent_id( $resource_id, $parent_import_id ) {
+		$comments = \get_comments( $this->get_import_db_query( $parent_import_id ) );
+
+		if ( is_array( $comments ) && count( $comments ) === 1 ) {
+			$parent_id = $comments[0];
+
+			return (bool) \wp_update_comment(
+				array(
+					'comment_ID'     => $resource_id,
+					'comment_parent' => $parent_id,
+				)
+			);
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/import/src/endpoints/class-page.php b/projects/packages/import/src/endpoints/class-page.php
new file mode 100644
index 0000000000000..84f6a82edaf17
--- /dev/null
+++ b/projects/packages/import/src/endpoints/class-page.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pages REST route
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+/**
+ * Class Page
+ */
+class Page extends Post {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct( 'page' );
+	}
+
+	/**
+	 * Update the post parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	protected function update_parent_id( $resource_id, $parent_import_id ) {
+		$pages = \get_pages( $this->get_import_db_query( $parent_import_id ) );
+
+		if ( is_array( $pages ) && count( $pages ) === 1 ) {
+			$parent_id = $pages[0]->ID;
+
+			return (bool) \wp_update_post(
+				array(
+					'ID'          => $resource_id,
+					'post_parent' => $parent_id,
+				)
+			);
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/import/src/endpoints/class-post.php b/projects/packages/import/src/endpoints/class-post.php
new file mode 100644
index 0000000000000..d41877d919396
--- /dev/null
+++ b/projects/packages/import/src/endpoints/class-post.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Posts REST route
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+if ( ! function_exists( 'post_exists' ) ) {
+	require_once ABSPATH . 'wp-admin/includes/post.php';
+}
+
+/**
+ * Class Post
+ */
+class Post extends \WP_REST_Posts_Controller {
+
+	/**
+	 * The Import ID add a new item to the schema.
+	 */
+	use Import;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $post_type Post type.
+	 */
+	public function __construct( $post_type = 'post' ) {
+		parent::__construct( $post_type );
+
+		// @see add_post_meta
+		$this->import_id_meta_type = $post_type;
+	}
+
+	/**
+	 * Registers the routes for the objects of the controller.
+	 *
+	 * @see WP_REST_Posts_Controller::register_rest_route()
+	 */
+	public function register_routes() {
+		register_rest_route(
+			self::$rest_namespace,
+			'/' . $this->rest_base,
+			$this->get_route_options()
+		);
+	}
+
+	/**
+	 * Adds the schema from additional fields to a schema array.
+	 *
+	 * The type of object is inferred from the passed schema.
+	 *
+	 * @param array $schema Schema array.
+	 * @return array Modified Schema array.
+	 */
+	public function add_additional_fields_schema( $schema ) {
+		// WXR saves terms as slugs, so we need to overwrite the schema.
+		$schema['properties']['categories']['items']['type'] = 'string';
+		$schema['properties']['tags']['items']['type']       = 'string';
+
+		// Add the import unique ID to the schema.
+		return $this->add_unique_identifier_to_schema( $schema );
+	}
+
+	/**
+	 * Creates a single post / page.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function create_item( $request ) {
+		// Skip if the post already exists.
+		$post_id = \post_exists(
+			$request['title'],
+			'',
+			$request['date'],
+			$this->post_type,
+			$request['status']
+		);
+
+		if ( $post_id ) {
+			return new \WP_Error(
+				'post_exists',
+				__( 'Cannot create existing post.', 'jetpack-import' ),
+				array(
+					'status'  => 400,
+					'post_id' => $post_id,
+				)
+			);
+		}
+
+		// WXR saves terms as slugs, so we need to convert them to IDs before send the data to the legacy endpoint.
+		foreach ( array( 'categories', 'tags' ) as $taxonomy ) {
+			$request[ $taxonomy ] = $this->extract_terms_ids( $request, $taxonomy );
+		}
+
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
+	}
+
+	/**
+	 * Extract terms IDs from slugs.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @param string          $taxonomy Taxonomy name.
+	 * @return array List of terms IDs.
+	 */
+	protected function extract_terms_ids( $request, $taxonomy ) {
+		$ret = is_array( $request[ $taxonomy ] ) ? $request[ $taxonomy ] : array();
+
+		if ( ! count( $ret ) ) {
+			return $ret;
+		}
+
+		// Extract the terms by ID.
+		$ids = get_terms(
+			array(
+				'fields'     => 'ids',
+				'hide_empty' => false,
+				'slug'       => $ret,
+				'taxonomy'   => $taxonomy === 'tags' ? 'post_tag' : 'category',
+			)
+		);
+
+		if ( is_array( $ids ) ) {
+			return $ids;
+		} else {
+			// Flush away any invalid terms.
+			return array();
+		}
+	}
+
+	/**
+	 * Update the post parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	protected function update_parent_id( $resource_id, $parent_import_id ) {
+		$posts = \get_posts( $this->get_import_db_query( $parent_import_id ) );
+
+		if ( is_array( $posts ) && count( $posts ) === 1 ) {
+			$parent_id = $posts[0];
+
+			return (bool) \wp_update_post(
+				array(
+					'ID'          => $resource_id,
+					'post_parent' => $parent_id,
+				)
+			);
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/import/src/endpoints/class-tag.php b/projects/packages/import/src/endpoints/class-tag.php
new file mode 100644
index 0000000000000..78123c76dc223
--- /dev/null
+++ b/projects/packages/import/src/endpoints/class-tag.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Tags REST route
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+/**
+ * Class Tag
+ */
+class Tag extends \WP_REST_Terms_Controller {
+
+	/**
+	 * The Import ID add a new item to the schema.
+	 */
+	use Import;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct( 'post_tag' );
+
+		// @see add_term_meta
+		$this->import_id_meta_type = 'term';
+	}
+
+	/**
+	 * Registers the routes for the objects of the controller.
+	 *
+	 * @see WP_REST_Terms_Controller::register_rest_route()
+	 */
+	public function register_routes() {
+		register_rest_route(
+			self::$rest_namespace,
+			'/tags',
+			$this->get_route_options()
+		);
+	}
+
+	/**
+	 * Update the tag parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	protected function update_parent_id( $resource_id, $parent_import_id ) {
+		$terms = \get_terms( $this->get_import_db_query( $parent_import_id ) );
+
+		if ( is_array( $terms ) && count( $terms ) === 1 ) {
+			$parent_id = $terms[0];
+
+			return (bool) \wp_update_term( $resource_id, $this->import_id_meta_type, array( 'parent' => $parent_id ) );
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/import/src/endpoints/trait-import.php b/projects/packages/import/src/endpoints/trait-import.php
new file mode 100644
index 0000000000000..77af714cbbb08
--- /dev/null
+++ b/projects/packages/import/src/endpoints/trait-import.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Jetpack Import unique import ID.
+ *
+ * @package automattic/jetpack-import
+ */
+
+namespace Automattic\Jetpack\Import\Endpoints;
+
+/**
+ * Import trait. Add a unique import ID to the items schema and authentication.
+ */
+trait Import {
+
+	/**
+	 * REST API namespace.
+	 *
+	 * @var string
+	 */
+	private static $rest_namespace = 'jetpack/v4/import';
+
+	/**
+	 * Meta and REST property name used for storing the WXR import ID.
+	 *
+	 * @var string
+	 */
+	protected $import_id_field_name = 'unified_importer_id';
+
+	/**
+	 * Import ID meta name.
+	 *
+	 * @var string
+	 */
+	protected $import_id_meta_type;
+
+	/**
+	 * Adds the schema from additional fields to a schema array.
+	 *
+	 * The type of object is inferred from the passed schema.
+	 *
+	 * @param array $schema Schema array.
+	 * @return array Modified Schema array.
+	 */
+	public function add_additional_fields_schema( $schema ) {
+		// Add the import unique ID to the schema.
+		return $this->add_unique_identifier_to_schema( $schema );
+	}
+
+	/**
+	 * Create a resource.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function create_item( $request ) {
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
+	}
+
+	/**
+	 * Adds the unique identifier to the schema array.
+	 *
+	 * @param array $schema Schema array.
+	 * @return array Modified Schema array.
+	 */
+	protected function add_unique_identifier_to_schema( $schema ) {
+		// Add the import unique ID to the schema.
+		$schema['properties'][ $this->import_id_field_name ] = array(
+			'description' => __( 'Jetpack Import unique identifier for the term.', 'jetpack-import' ),
+			'type'        => 'integer',
+			'context'     => array( 'view', 'embed', 'edit' ),
+			'required'    => true,
+		);
+
+		return $schema;
+	}
+
+	/**
+	 * Add the import unique ID to the resource metadata.
+	 *
+	 * @param WP_REST_Request  $request Full details about the request.
+	 * @param WP_REST_Response $response Response object.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	protected function add_import_id_metadata( $request, $response ) {
+		// Skip on error.
+		if ( is_wp_error( $response ) ) {
+			return $response;
+		}
+
+		$data = $response->get_data();
+
+		// Skip if the resource has not been added.
+		if ( $response->get_status() !== 201 ) {
+			return $response;
+		}
+
+		// Add the import unique ID to the resource metadata.
+		\add_metadata( $this->import_id_meta_type, $data['id'], $this->import_id_field_name, $request[ $this->import_id_field_name ], true );
+
+		// If the resource has a parent.
+		if ( $request[ $this->import_id_field_name ] !== 0 ) {
+			// Update the parent.
+			$this->update_parent_id( $data['id'], $request[ $this->import_id_field_name ] );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Ensure that the user has permissions to import.
+	 *
+	 * @return bool|\WP_Error
+	 */
+	public function import_permissions_callback() {
+		// The permission check is done in the REST API authentication. It's the same
+		// as the one used in wp-admin/import.php.
+		if ( \current_user_can( 'import' ) ) {
+			return true;
+		}
+
+		$error_msg = \esc_html__(
+			'You are not allowed to perform this action.',
+			'jetpack-import'
+		);
+
+		return new \WP_Error( 'rest_forbidden', $error_msg, array( 'status' => \rest_authorization_required_code() ) );
+	}
+
+	/**
+	 * Get the import DB query. This is used to get the items with a specific
+	 * meta key that have been imported.
+	 *
+	 * @param int $parent_import_id The parent import ID.
+	 * @return array The query.
+	 */
+	protected function get_import_db_query( $parent_import_id ) {
+		// Get the only one item with the parent import ID.
+		return array(
+			'number'     => 1,
+			'fields'     => 'ids',
+			'meta_query' => array(
+				array(
+					'key'   => $this->import_id_field_name,
+					'value' => $parent_import_id,
+				),
+			),
+		);
+	}
+
+	/**
+	 * Get the register route options.
+	 *
+	 * @see register_rest_route()
+	 *
+	 * @return array The options.
+	 */
+	protected function get_route_options() {
+		return array(
+			array(
+				'methods'             => \WP_REST_Server::CREATABLE,
+				'callback'            => array( $this, 'create_item' ),
+				'permission_callback' => array( $this, 'import_permissions_callback' ),
+				'args'                => $this->get_endpoint_args_for_item_schema( \WP_REST_Server::CREATABLE ),
+			),
+			'allow_batch' => array( 'v1' => true ),
+			'schema'      => array( $this, 'get_public_item_schema' ),
+		);
+	}
+
+	/**
+	 * Update the resource parent ID.
+	 *
+	 * @param int $resource_id      The resource ID.
+	 * @param int $parent_import_id The parent ID.
+	 * @return bool True if updated.
+	 */
+	abstract protected function update_parent_id( $resource_id, $parent_import_id );
+}
diff --git a/projects/plugins/backup/changelog/update-import-package b/projects/plugins/backup/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/backup/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
index 68636398c51a9..6a2cd31b4c991 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -376,7 +376,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -390,7 +390,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/boost/changelog/update-import-package b/projects/plugins/boost/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index 999b6dd753a54..c4d58e98650ed 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/jetpack/changelog/add-import-package b/projects/plugins/jetpack/changelog/add-import-package
new file mode 100644
index 0000000000000..961b9a3cf1ef4
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-import-package
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Added the Import package.
diff --git a/projects/plugins/jetpack/changelog/update-import-package b/projects/plugins/jetpack/changelog/update-import-package
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/class.jetpack.php b/projects/plugins/jetpack/class.jetpack.php
index 75b14bfc947ea..19f5a7a110666 100644
--- a/projects/plugins/jetpack/class.jetpack.php
+++ b/projects/plugins/jetpack/class.jetpack.php
@@ -846,6 +846,7 @@ public function configure() {
 				'videopress',
 				'stats',
 				'stats_admin',
+				'import',
 			)
 			as $feature
 		) {
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index b2c76577be24e..3757a2f4f2e8e 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -29,6 +29,7 @@
 		"automattic/jetpack-forms": "@dev",
 		"automattic/jetpack-google-fonts-provider": "@dev",
 		"automattic/jetpack-identity-crisis": "@dev",
+		"automattic/jetpack-import": "@dev",
 		"automattic/jetpack-jitm": "@dev",
 		"automattic/jetpack-lazy-images": "@dev",
 		"automattic/jetpack-licensing": "@dev",
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index a3d04f525cf40..10f4519730891 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "885f93512258c1b17a95fec63e503ec8",
+    "content-hash": "995595368021b9c25c1a1a698dde4e89",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -666,7 +666,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -680,7 +680,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
@@ -1112,6 +1112,73 @@
                 "relative": true
             }
         },
+        {
+            "name": "automattic/jetpack-import",
+            "version": "dev-trunk",
+            "dist": {
+                "type": "path",
+                "url": "../../packages/import",
+                "reference": "16a752dfdad19508820a3c080a3eb501ea07770d"
+            },
+            "require": {
+                "automattic/jetpack-connection": "@dev"
+            },
+            "require-dev": {
+                "automattic/jetpack-changelogger": "@dev",
+                "automattic/wordbless": "dev-master",
+                "yoast/phpunit-polyfills": "1.0.4"
+            },
+            "type": "jetpack-library",
+            "extra": {
+                "mirror-repo": "Automattic/jetpack-import",
+                "changelogger": {
+                    "link-template": "https://github.com/Automattic/jetpack-import/compare/v${old}...v${new}"
+                },
+                "autotagger": true,
+                "branch-alias": {
+                    "dev-trunk": "0.1.x-dev"
+                },
+                "textdomain": "jetpack-import",
+                "version-constants": {
+                    "::PACKAGE_VERSION": "src/class-main.php"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "scripts": {
+                "phpunit": [
+                    "./vendor/phpunit/phpunit/phpunit --colors=always"
+                ],
+                "test-coverage": [
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                ],
+                "test-php": [
+                    "@composer phpunit"
+                ],
+                "build-production": [
+                    "echo 'Add your build step to composer.json, please!'"
+                ],
+                "build-development": [
+                    "echo 'Add your build step to composer.json, please!'"
+                ],
+                "post-install-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
+                ],
+                "post-update-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
+                ]
+            },
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Set of REST API routes used in WPCOM Unified Importer.",
+            "transport-options": {
+                "relative": true
+            }
+        },
         {
             "name": "automattic/jetpack-jitm",
             "version": "dev-trunk",
@@ -5347,6 +5414,7 @@
         "automattic/jetpack-forms": 20,
         "automattic/jetpack-google-fonts-provider": 20,
         "automattic/jetpack-identity-crisis": 20,
+        "automattic/jetpack-import": 20,
         "automattic/jetpack-jitm": 20,
         "automattic/jetpack-lazy-images": 20,
         "automattic/jetpack-licensing": 20,
diff --git a/projects/plugins/migration/changelog/update-import-package b/projects/plugins/migration/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
index 34dad27f9b49b..1b8c778f1e502 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/protect/changelog/update-import-package b/projects/plugins/protect/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index b1be744242de9..f266c8bd5b9cf 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/search/changelog/update-import-package b/projects/plugins/search/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/search/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
index 77b8ff0911170..4fe55dfe0cd78 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/social/changelog/update-import-package b/projects/plugins/social/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index b5990bb9d1550..c1ed43faa3bbd 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/starter-plugin/changelog/update-import-package b/projects/plugins/starter-plugin/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
index 6a014fdeae517..677accac3a849 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/videopress/changelog/update-import-package b/projects/plugins/videopress/changelog/update-import-package
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-import-package
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock
index 22319b86341d9..11307db2997ba 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -291,7 +291,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/config",
-                "reference": "9fb269f82eb6bbe761c191e257ede2c234c7a15e"
+                "reference": "d90086a6709e7995e301be3d8bc80d31ea3e0fbb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev"
@@ -305,7 +305,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-config/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.13.x-dev"
+                    "dev-trunk": "1.14.x-dev"
                 }
             },
             "autoload": {

From 85f481871f3be4230870ea509c3807cb426a1775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= <mail@sgomes.com>
Date: Thu, 16 Feb 2023 11:34:44 +0000
Subject: [PATCH 05/51] Story block: remove wp-components frontend dependency
 (#28743)

* Story block: remove wp-components frontend dep

* Add `@wordpress/primitives` as a dependency

---------

Co-authored-by: Jeremy Herve <jeremy@jeremy.hu>
---
 pnpm-lock.yaml                                               | 2 ++
 .../update-remove-wp-components-dep-from-story-frontend      | 4 ++++
 projects/plugins/jetpack/extensions/blocks/story/icon.js     | 2 +-
 .../extensions/blocks/story/player/components/background.js  | 2 +-
 .../extensions/blocks/story/player/components/bullet.js      | 5 ++---
 .../extensions/blocks/story/player/components/icons.js       | 2 +-
 .../jetpack/extensions/shared/render-material-icon.js        | 2 +-
 projects/plugins/jetpack/package.json                        | 1 +
 projects/plugins/jetpack/tools/check-block-assets.php        | 2 +-
 9 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26233ceae1cf5..46d40236de500 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1785,6 +1785,7 @@ importers:
       '@wordpress/icons': 9.17.0
       '@wordpress/keycodes': 3.26.0
       '@wordpress/notices': 3.26.0
+      '@wordpress/primitives': 3.24.0
       '@wordpress/token-list': 2.26.0
       '@wordpress/url': 3.27.0
       '@wordpress/viewport': 5.3.0
@@ -1867,6 +1868,7 @@ importers:
       '@wordpress/hooks': 3.26.0
       '@wordpress/i18n': 4.26.0
       '@wordpress/icons': 9.17.0
+      '@wordpress/primitives': 3.24.0
       '@wordpress/url': 3.27.0
       '@wordpress/viewport': 5.3.0_43aktpkp7q4bmohyiyj25up2li
       '@wordpress/widgets': 3.3.0_57czaiyk6rdr5iy5tfs5pior4u
diff --git a/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend b/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend
new file mode 100644
index 0000000000000..112c92d1c4ae2
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Story block: remove dependency on wp-components from the frontend code
diff --git a/projects/plugins/jetpack/extensions/blocks/story/icon.js b/projects/plugins/jetpack/extensions/blocks/story/icon.js
index ae830d9762213..0c71b43193efc 100644
--- a/projects/plugins/jetpack/extensions/blocks/story/icon.js
+++ b/projects/plugins/jetpack/extensions/blocks/story/icon.js
@@ -1,4 +1,4 @@
-import { Path, G } from '@wordpress/components';
+import { Path, G } from '@wordpress/primitives';
 import renderMaterialIcon from '../../shared/render-material-icon';
 
 const icon = renderMaterialIcon(
diff --git a/projects/plugins/jetpack/extensions/blocks/story/player/components/background.js b/projects/plugins/jetpack/extensions/blocks/story/player/components/background.js
index 06cc62a9c3ee5..1d60a48f91b16 100644
--- a/projects/plugins/jetpack/extensions/blocks/story/player/components/background.js
+++ b/projects/plugins/jetpack/extensions/blocks/story/player/components/background.js
@@ -1,4 +1,4 @@
-import { SVG } from '@wordpress/components';
+import { SVG } from '@wordpress/primitives';
 
 export default function Background( { currentMedia } ) {
 	const url = currentMedia && currentMedia.type === 'image' ? currentMedia.url : null;
diff --git a/projects/plugins/jetpack/extensions/blocks/story/player/components/bullet.js b/projects/plugins/jetpack/extensions/blocks/story/player/components/bullet.js
index b4c67a6b5c255..81bf6de2e5017 100644
--- a/projects/plugins/jetpack/extensions/blocks/story/player/components/bullet.js
+++ b/projects/plugins/jetpack/extensions/blocks/story/player/components/bullet.js
@@ -1,4 +1,3 @@
-import { Button } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import classNames from 'classnames';
 
@@ -19,7 +18,7 @@ export default function Bullet( { isEllipsis, disabled, index, isSelected, progr
 			  );
 	}
 	return (
-		<Button
+		<button
 			role={ bulletDisabled ? 'presentation' : 'tab' }
 			key={ index }
 			className={ classNames( 'wp-story-pagination-bullet', {
@@ -36,6 +35,6 @@ export default function Bullet( { isEllipsis, disabled, index, isSelected, progr
 					style={ { width: `${ progress }%` } }
 				></div>
 			</div>
-		</Button>
+		</button>
 	);
 }
diff --git a/projects/plugins/jetpack/extensions/blocks/story/player/components/icons.js b/projects/plugins/jetpack/extensions/blocks/story/player/components/icons.js
index 9b2174ca6b92b..a9add8c413c44 100644
--- a/projects/plugins/jetpack/extensions/blocks/story/player/components/icons.js
+++ b/projects/plugins/jetpack/extensions/blocks/story/player/components/icons.js
@@ -1,4 +1,4 @@
-import { Path } from '@wordpress/components';
+import { Path } from '@wordpress/primitives';
 import renderMaterialIcon from '../../../../shared/render-material-icon';
 
 const MaterialIcon = ( { children, size } ) => renderMaterialIcon( children, size, size );
diff --git a/projects/plugins/jetpack/extensions/shared/render-material-icon.js b/projects/plugins/jetpack/extensions/shared/render-material-icon.js
index 0478be63ebc79..a69a239b6d9c4 100644
--- a/projects/plugins/jetpack/extensions/shared/render-material-icon.js
+++ b/projects/plugins/jetpack/extensions/shared/render-material-icon.js
@@ -1,4 +1,4 @@
-import { Path, SVG } from '@wordpress/components';
+import { Path, SVG } from '@wordpress/primitives';
 
 const renderMaterialIcon = ( svg, width = 24, height = 24, viewbox = '0 0 24 24' ) => (
 	<SVG xmlns="http://www.w3.org/2000/svg" width={ width } height={ height } viewBox={ viewbox }>
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index b7e086d5b261c..7c8e8ba9afc08 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -71,6 +71,7 @@
 		"@wordpress/hooks": "3.26.0",
 		"@wordpress/i18n": "4.26.0",
 		"@wordpress/icons": "9.17.0",
+		"@wordpress/primitives": "3.24.0",
 		"@wordpress/url": "3.27.0",
 		"@wordpress/viewport": "5.3.0",
 		"@wordpress/widgets": "3.3.0",
diff --git a/projects/plugins/jetpack/tools/check-block-assets.php b/projects/plugins/jetpack/tools/check-block-assets.php
index 43beafc28cefd..9cf2fdbf3b35a 100755
--- a/projects/plugins/jetpack/tools/check-block-assets.php
+++ b/projects/plugins/jetpack/tools/check-block-assets.php
@@ -75,11 +75,11 @@
 		'lodash',
 		'react',
 		'react-dom',
-		'wp-components',
 		'wp-compose',
 		'wp-data',
 		'wp-element',
 		'wp-keycodes',
+		'wp-primitives',
 	),
 );
 

From f29cdf39f2ce22a46584d91c7a7f7c15d299088b Mon Sep 17 00:00:00 2001
From: Douglas Henri <dhasilva@users.noreply.github.com>
Date: Thu, 16 Feb 2023 10:47:43 -0300
Subject: [PATCH 06/51] My Jetpack: Fix button to add bundle in product
 interstitial component (#28984)

Co-authored-by: oskosk <oskosk@gmail.com>
---
 .../_inc/components/product-detail-card/index.jsx  |  2 +-
 .../_inc/components/product-interstitial/index.jsx | 14 +++++++++++---
 .../changelog/fix-my-jetpack-add-security          |  4 ++++
 projects/packages/my-jetpack/package.json          |  2 +-
 .../packages/my-jetpack/src/class-initializer.php  |  2 +-
 .../changelog/fix-my-jetpack-add-security          |  5 +++++
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
 create mode 100644 projects/plugins/videopress/changelog/fix-my-jetpack-add-security

diff --git a/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx b/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx
index 7836b5b16d200..6e75755143060 100644
--- a/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx
@@ -187,7 +187,7 @@ const ProductDetailCard = ( { slug, onClick, trackButtonClick, className, suppor
 	function ProductIcon( { slug: iconSlug } ) {
 		const ProIcon = getIconBySlug( iconSlug );
 		if ( ! ProIcon ) {
-			return () => null;
+			return null;
 		}
 
 		return (
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx
index cf2dce1b08f07..d44fefab8f3d9 100644
--- a/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx
@@ -59,8 +59,15 @@ export default function ProductInterstitial( {
 
 	const clickHandler = useCallback(
 		checkout => {
-			activate().finally( () => {
+			const activateOrCheckout = () => ( bundle ? Promise.resolve() : activate() );
+
+			activateOrCheckout().finally( () => {
 				const product = select( STORE_ID ).getProduct( slug );
+				if ( bundle ) {
+					// Get straight to the checkout page.
+					checkout?.();
+					return;
+				}
 				const postActivationUrl = product?.postActivationUrl;
 				const hasRequiredPlan = product?.hasRequiredPlan;
 				const isFree = product?.pricingForUi?.isFree;
@@ -79,7 +86,7 @@ export default function ProductInterstitial( {
 				checkout?.();
 			} );
 		},
-		[ navigateToMyJetpackOverviewPage, activate, slug ]
+		[ navigateToMyJetpackOverviewPage, activate, bundle, slug ]
 	);
 
 	const onClickGoBack = useCallback( () => {
@@ -113,8 +120,9 @@ export default function ProductInterstitial( {
 						<Col sm={ 4 } md={ 4 } lg={ 5 } className={ styles.imageContainer }>
 							{ bundle ? (
 								<ProductDetailCard
-									slug="security"
+									slug={ bundle }
 									trackButtonClick={ trackBundleClick }
+									onClick={ clickHandler }
 									className={ isUpgradableByBundle ? styles.container : null }
 								/>
 							) : (
diff --git a/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security b/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
new file mode 100644
index 0000000000000..6c3e03c14d682
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+My Jetpack: Fix button to add bundle in product interstitial component
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 3618bb360e8a9..58ea139516870 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "2.7.10",
+	"version": "2.7.11-alpha",
 	"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": {
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
index 0a07a199a0fb5..9fc0d73b89353 100644
--- a/projects/packages/my-jetpack/src/class-initializer.php
+++ b/projects/packages/my-jetpack/src/class-initializer.php
@@ -30,7 +30,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '2.7.10';
+	const PACKAGE_VERSION = '2.7.11-alpha';
 
 	/**
 	 * Initialize My Jetpack
diff --git a/projects/plugins/videopress/changelog/fix-my-jetpack-add-security b/projects/plugins/videopress/changelog/fix-my-jetpack-add-security
new file mode 100644
index 0000000000000..2378255b335d1
--- /dev/null
+++ b/projects/plugins/videopress/changelog/fix-my-jetpack-add-security
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Version bump
+
+

From c02f97a4261af8c6b89d4dcc59f6d3d345cd4e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Thu, 16 Feb 2023 13:44:16 -0300
Subject: [PATCH 07/51] VideoPress: resend token when requester retries
 (#28930)

* [not verified] flush the store token when client retries

* [not verified] changelog

* [not verified] add debgu() line

* fix changelog typo
---
 ...eopress-read-and-support-is-retry-from-token-requester | 4 ++++
 .../videopress/src/client/lib/token-bridge/index.ts       | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester

diff --git a/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester b/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester
new file mode 100644
index 0000000000000..cc902d7f7b16b
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+VideoPress: flush token when the requester retries
diff --git a/projects/packages/videopress/src/client/lib/token-bridge/index.ts b/projects/packages/videopress/src/client/lib/token-bridge/index.ts
index 73266106f9a6a..0cc6dde3439e5 100644
--- a/projects/packages/videopress/src/client/lib/token-bridge/index.ts
+++ b/projects/packages/videopress/src/client/lib/token-bridge/index.ts
@@ -26,6 +26,7 @@ type TokenBrigeEventProps = {
 	guid: VideoGUID;
 	requestId: string;
 	origin: Origin;
+	isRetry?: boolean;
 };
 
 /**
@@ -49,7 +50,7 @@ export async function tokenBridgeHandler(
 
 	const { context = 'main' } = videopressAjax;
 
-	const { guid, requestId } = event.data;
+	const { guid, requestId, isRetry } = event.data;
 	if ( ! guid || ! requestId ) {
 		debug( '(%s) Invalid request', context );
 		return;
@@ -94,10 +95,15 @@ export async function tokenBridgeHandler(
 		{ targetOrigin: '*' }
 	);
 
+	if ( isRetry ) {
+		debug( '(%s) client retrying request. Flush the token.', context );
+	}
+
 	const tokenData = await getMediaToken( 'playback', {
 		id: Number( postId ),
 		guid,
 		adminAjaxAPI: videopressAjax.ajaxUrl,
+		flushToken: isRetry, // flush the token if it's a retry
 	} );
 
 	if ( ! tokenData?.token ) {

From 68ffffe1578fdfebc5f53dc105fb58fc2df38b8e Mon Sep 17 00:00:00 2001
From: Jasper Kang <jasper.kang@automattic.com>
Date: Fri, 17 Feb 2023 06:49:17 +1300
Subject: [PATCH 08/51] Stats: Fix JSON decoding the wrong varible while
 parsing the response body (#28992)

---
 .../changelog/fix-decoding-wrong-varible          |  4 ++++
 .../stats-admin/src/class-rest-controller.php     | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 projects/packages/stats-admin/changelog/fix-decoding-wrong-varible

diff --git a/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible b/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible
new file mode 100644
index 0000000000000..dc2de5a332dbc
--- /dev/null
+++ b/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Stats: fix broken request_as_blog_cached
diff --git a/projects/packages/stats-admin/src/class-rest-controller.php b/projects/packages/stats-admin/src/class-rest-controller.php
index d2af00dcf3c2e..637ba29136ece 100644
--- a/projects/packages/stats-admin/src/class-rest-controller.php
+++ b/projects/packages/stats-admin/src/class-rest-controller.php
@@ -497,27 +497,28 @@ protected function request_as_blog_cached( $path, $version = '1.1', $args = arra
 		$cache_key = 'STATS_REST_RESP_' . md5( implode( '|', array( $path, $version, wp_json_encode( $args ), wp_json_encode( $body ), $base_api_path ) ) );
 
 		if ( $use_cache ) {
-			$response_body = get_transient( $cache_key );
-			if ( false !== $response_body ) {
-				return json_decode( $response_body, true );
+			$response_body_content = get_transient( $cache_key );
+			if ( false !== $response_body_content ) {
+				return json_decode( $response_body_content, true );
 			}
 		}
 
-		$response              = Client::wpcom_json_api_request_as_blog(
+		$response = Client::wpcom_json_api_request_as_blog(
 			$path,
 			$version,
 			$args,
 			$body,
 			$base_api_path
 		);
-		$response_code         = wp_remote_retrieve_response_code( $response );
-		$response_body_content = wp_remote_retrieve_body( $response );
-		$response_body         = json_decode( $response_body, true );
 
 		if ( is_wp_error( $response ) ) {
 			return $response;
 		}
 
+		$response_code         = wp_remote_retrieve_response_code( $response );
+		$response_body_content = wp_remote_retrieve_body( $response );
+		$response_body         = json_decode( $response_body_content, true );
+
 		if ( 200 !== $response_code ) {
 			return $this->get_wp_error( $response_body, $response_code );
 		}

From 9e93db46912232560e04bfdb5a4ad99020a241fd Mon Sep 17 00:00:00 2001
From: nunyvega <alvaro.vega@automattic.com>
Date: Thu, 16 Feb 2023 18:54:36 +0100
Subject: [PATCH 09/51] VideoPress: Update plugin stable version post release
 (#29008)

* Update VideoPress plugin stable tag post release

* changelog
---
 .../videopress/changelog/update-videopress-stable-version    | 5 +++++
 projects/plugins/videopress/readme.txt                       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 projects/plugins/videopress/changelog/update-videopress-stable-version

diff --git a/projects/plugins/videopress/changelog/update-videopress-stable-version b/projects/plugins/videopress/changelog/update-videopress-stable-version
new file mode 100644
index 0000000000000..21fe66b8756c7
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-videopress-stable-version
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: changed stable tag post release
+
+
diff --git a/projects/plugins/videopress/readme.txt b/projects/plugins/videopress/readme.txt
index d57e959c8853e..700a1233290e4 100644
--- a/projects/plugins/videopress/readme.txt
+++ b/projects/plugins/videopress/readme.txt
@@ -4,7 +4,7 @@ Tags: video, video-hosting, video-player, cdn, vimeo, youtube, video-streaming,
 
 Requires at least: 6.0
 Tested up to: 6.1
-Stable tag: 1.3.0
+Stable tag: 1.4.0
 Requires PHP: 5.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

From 84241c54c7a97d9eb052f60bae146cac12af617c Mon Sep 17 00:00:00 2001
From: Samiff <samiff@users.noreply.github.com>
Date: Thu, 16 Feb 2023 11:43:17 -0700
Subject: [PATCH 10/51] Jetpack: backport 11.8.4 changelog and stable tag
 (#28990)

* Jetpack: backport 11.8.4 changelog and stable tag

* changelog
---
 projects/plugins/jetpack/CHANGELOG.md                        | 5 +++++
 .../plugins/jetpack/changelog/update-jetpack-backport-11.8.4 | 5 +++++
 projects/plugins/jetpack/readme.txt                          | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4

diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
index d09b1a0c1ad38..1dbc979ee4b64 100644
--- a/projects/plugins/jetpack/CHANGELOG.md
+++ b/projects/plugins/jetpack/CHANGELOG.md
@@ -35,6 +35,11 @@
 - Subscriptions: fix a bug where comments would be open under pages [#28894]
 - Update to React 18. [#28710]
 
+## 11.8.4 - 2023-02-15
+### Bug fixes
+- Blaze: prevent error on frontend-loaded Gutenberg, and bail early if Jetpack is not connected. [#28955]
+- WAF: fix PHP fatal when the jetpack-waf directory has been deleted from the wp-content folder. [#28760]
+
 ## 11.9-a.1 - 2023-02-08
 ### Enhancements
 - Contact form: add a blur effect while the form is loading the styles. [#28212]
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4 b/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4
new file mode 100644
index 0000000000000..9bc1cb9040a03
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Jetpack: backport 11.8.4 changelog and stable tag
+
+
diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt
index 0056a89418f8e..99dedba647e2a 100644
--- a/projects/plugins/jetpack/readme.txt
+++ b/projects/plugins/jetpack/readme.txt
@@ -1,7 +1,7 @@
 === Jetpack - WP Security, Backup, Speed, & Growth ===
 Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav, alternatekev, andy, annamcphee, annezazu, apeatling, arcangelini, azaozz, batmoo, barry, beaulebens, bindlegirl, biskobe, blobaugh, bjorsch, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, samiff, scarstocea, scottsweb, sdixon194, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, wpkaren, yoavf, zinigor
 Tags: Security, backup, Woo, malware, scan, spam, CDN, search, social
-Stable tag: 11.8
+Stable tag: 11.8.4
 Requires at least: 6.0
 Requires PHP: 5.6
 Tested up to: 6.1

From 4eb26dd15cd5b699ea51c389921f3d82b4c66c60 Mon Sep 17 00:00:00 2001
From: Nate Weller <nate.weller@automattic.com>
Date: Thu, 16 Feb 2023 14:17:13 -0700
Subject: [PATCH 11/51] WAF: Add WorDBless Support (#28980)

* Add automattic/wordbless to the waf package

* changelog

* Add line break to end of .gitignore

* Update composer.json

* Split WAF php tests into two separate test projects

* Fix missing use statement for Waf_Runner

* Fixup project versions

* changelog

* Remove unrelated updates to videopress release cycle init

* Fix test-coverage-html

* Use WorDBless\BaseTestCase for WAF activation tests class base

* Remove @before tag from set_up method

* [not verified] Revert "Remove @before tag from set_up method"

This reverts commit 5b1acad446ac5a30d14347561f2db80cbd3b699f.

* Composer lock update

---------

Co-authored-by: Brandon Kraft <public@brandonkraft.com>
---
 projects/packages/waf/.gitignore              |  1 +
 .../packages/waf/changelog/add-waf-wordbless  |  5 +++
 projects/packages/waf/composer.json           | 17 +++++++--
 .../waf/tests/php/integration/bootstrap.php   | 12 +++++++
 .../php/integration}/phpunit.xml.dist         |  6 ++--
 .../php/integration/test-waf-activation.php   | 36 +++++++++++++++++++
 .../waf/tests/php/{ => unit}/bootstrap.php    |  2 +-
 .../php/{ => unit}/functions-wordpress.php    |  0
 .../waf/tests/php/unit/phpunit.xml.dist       | 21 +++++++++++
 .../php/{ => unit}/test-waf-operators.php     |  0
 .../tests/php/{ => unit}/test-waf-request.php |  0
 .../tests/php/{ => unit}/test-waf-runner.php  |  0
 .../{ => unit}/test-waf-runtime-targets.php   |  0
 .../tests/php/{ => unit}/test-waf-runtime.php |  0
 .../test-waf-standalone-bootstrap.php         |  0
 .../php/{ => unit}/test-waf-transforms.php    |  0
 .../jetpack/changelog/add-waf-wordbless       |  5 +++
 projects/plugins/jetpack/composer.lock        | 16 +++++++--
 .../protect/changelog/add-waf-wordbless       |  5 +++
 projects/plugins/protect/composer.lock        | 16 +++++++--
 20 files changed, 129 insertions(+), 13 deletions(-)
 create mode 100644 projects/packages/waf/changelog/add-waf-wordbless
 create mode 100644 projects/packages/waf/tests/php/integration/bootstrap.php
 rename projects/packages/waf/{ => tests/php/integration}/phpunit.xml.dist (81%)
 create mode 100644 projects/packages/waf/tests/php/integration/test-waf-activation.php
 rename projects/packages/waf/tests/php/{ => unit}/bootstrap.php (72%)
 rename projects/packages/waf/tests/php/{ => unit}/functions-wordpress.php (100%)
 create mode 100644 projects/packages/waf/tests/php/unit/phpunit.xml.dist
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-operators.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-request.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-runner.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-runtime-targets.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-runtime.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-standalone-bootstrap.php (100%)
 rename projects/packages/waf/tests/php/{ => unit}/test-waf-transforms.php (100%)
 create mode 100644 projects/plugins/jetpack/changelog/add-waf-wordbless
 create mode 100644 projects/plugins/protect/changelog/add-waf-wordbless

diff --git a/projects/packages/waf/.gitignore b/projects/packages/waf/.gitignore
index 77d344786d645..0eef3074d4db1 100644
--- a/projects/packages/waf/.gitignore
+++ b/projects/packages/waf/.gitignore
@@ -1,5 +1,6 @@
 vendor/
 node_modules/
 rules/
+wordpress/
 coverage
 clover.xml
diff --git a/projects/packages/waf/changelog/add-waf-wordbless b/projects/packages/waf/changelog/add-waf-wordbless
new file mode 100644
index 0000000000000..295867884b189
--- /dev/null
+++ b/projects/packages/waf/changelog/add-waf-wordbless
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Added the automattic/wordbless package.
+
+
diff --git a/projects/packages/waf/composer.json b/projects/packages/waf/composer.json
index f39fc190df39c..621ff038f5e53 100644
--- a/projects/packages/waf/composer.json
+++ b/projects/packages/waf/composer.json
@@ -4,12 +4,14 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
+		"automattic/jetpack-connection": "@dev",
 		"automattic/jetpack-status": "@dev",
 		"wikimedia/aho-corasick": "^1.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.0.4",
-		"automattic/jetpack-changelogger": "@dev"
+		"automattic/jetpack-changelogger": "@dev",
+		"automattic/wordbless": "@dev"
 	},
 	"autoload": {
 		"files": [
@@ -21,13 +23,17 @@
 	},
 	"scripts": {
 		"phpunit": [
-			"./vendor/phpunit/phpunit/phpunit --colors=always"
+			"./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
+			"./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
 		],
+		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
+		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"test-coverage": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
 		],
 		"test-coverage-html": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage"
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
 		],
 		"test-php": [
 			"@composer phpunit"
@@ -54,5 +60,10 @@
 		"branch-alias": {
 			"dev-trunk": "0.9.x-dev"
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"roots/wordpress-core-installer": true
+		}
 	}
 }
diff --git a/projects/packages/waf/tests/php/integration/bootstrap.php b/projects/packages/waf/tests/php/integration/bootstrap.php
new file mode 100644
index 0000000000000..5751e22ab1eb1
--- /dev/null
+++ b/projects/packages/waf/tests/php/integration/bootstrap.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Bootstrap.
+ *
+ * @package automattic/
+ */
+
+/**
+ * Include the composer autoloader.
+ */
+require_once __DIR__ . '/../../../vendor/autoload.php';
+\WorDBless\Load::load();
diff --git a/projects/packages/waf/phpunit.xml.dist b/projects/packages/waf/tests/php/integration/phpunit.xml.dist
similarity index 81%
rename from projects/packages/waf/phpunit.xml.dist
rename to projects/packages/waf/tests/php/integration/phpunit.xml.dist
index 022122f87aa6e..e901dd1acf030 100644
--- a/projects/packages/waf/phpunit.xml.dist
+++ b/projects/packages/waf/tests/php/integration/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 bootstrap="tests/php/bootstrap.php"
+		 bootstrap="bootstrap.php"
 		 backupGlobals="false"
 		 colors="true"
 		 convertDeprecationsToExceptions="true"
@@ -10,12 +10,12 @@
     <include>
 	  <!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
 	  <!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
-      <directory suffix=".php">src</directory>
+      <directory suffix=".php">../../../src</directory>
     </include>
   </coverage>
   <testsuites>
     <testsuite name="main">
-      <directory prefix="test" suffix=".php">tests/php</directory>
+      <directory prefix="test" suffix=".php">.</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/projects/packages/waf/tests/php/integration/test-waf-activation.php b/projects/packages/waf/tests/php/integration/test-waf-activation.php
new file mode 100644
index 0000000000000..0121efc1420bd
--- /dev/null
+++ b/projects/packages/waf/tests/php/integration/test-waf-activation.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Activation tests.
+ *
+ * @package automattic/jetpack-waf
+ */
+
+use Automattic\Jetpack\Waf\Waf_Initializer;
+use Automattic\Jetpack\Waf\Waf_Runner;
+
+/**
+ * Activation tests.
+ */
+final class WafActivationTest extends WorDBless\BaseTestCase {
+
+	/**
+	 * Test setup.
+	 *
+	 * @before
+	 */
+	protected function set_up() {
+		// Set a blog token and id so the site is connected.
+		Jetpack_Options::update_option( 'blog_token', 'asdasd.123123' );
+		Jetpack_Options::update_option( 'id', 1234 );
+	}
+
+	/**
+	 * Test WAF activation.
+	 */
+	public function testActivation() {
+		Waf_Initializer::on_activation();
+
+		$this->assertSame( get_option( Waf_Runner::MODE_OPTION_NAME ), 'normal' );
+	}
+
+}
diff --git a/projects/packages/waf/tests/php/bootstrap.php b/projects/packages/waf/tests/php/unit/bootstrap.php
similarity index 72%
rename from projects/packages/waf/tests/php/bootstrap.php
rename to projects/packages/waf/tests/php/unit/bootstrap.php
index d2ad4ccccde12..b16cb15e382d5 100644
--- a/projects/packages/waf/tests/php/bootstrap.php
+++ b/projects/packages/waf/tests/php/unit/bootstrap.php
@@ -8,5 +8,5 @@
 /**
  * Include the composer autoloader.
  */
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
 require_once __DIR__ . '/functions-wordpress.php';
diff --git a/projects/packages/waf/tests/php/functions-wordpress.php b/projects/packages/waf/tests/php/unit/functions-wordpress.php
similarity index 100%
rename from projects/packages/waf/tests/php/functions-wordpress.php
rename to projects/packages/waf/tests/php/unit/functions-wordpress.php
diff --git a/projects/packages/waf/tests/php/unit/phpunit.xml.dist b/projects/packages/waf/tests/php/unit/phpunit.xml.dist
new file mode 100644
index 0000000000000..e901dd1acf030
--- /dev/null
+++ b/projects/packages/waf/tests/php/unit/phpunit.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 bootstrap="bootstrap.php"
+		 backupGlobals="false"
+		 colors="true"
+		 convertDeprecationsToExceptions="true"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+  <coverage processUncoveredFiles="false">
+    <include>
+	  <!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
+	  <!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
+      <directory suffix=".php">../../../src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="main">
+      <directory prefix="test" suffix=".php">.</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/projects/packages/waf/tests/php/test-waf-operators.php b/projects/packages/waf/tests/php/unit/test-waf-operators.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-operators.php
rename to projects/packages/waf/tests/php/unit/test-waf-operators.php
diff --git a/projects/packages/waf/tests/php/test-waf-request.php b/projects/packages/waf/tests/php/unit/test-waf-request.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-request.php
rename to projects/packages/waf/tests/php/unit/test-waf-request.php
diff --git a/projects/packages/waf/tests/php/test-waf-runner.php b/projects/packages/waf/tests/php/unit/test-waf-runner.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-runner.php
rename to projects/packages/waf/tests/php/unit/test-waf-runner.php
diff --git a/projects/packages/waf/tests/php/test-waf-runtime-targets.php b/projects/packages/waf/tests/php/unit/test-waf-runtime-targets.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-runtime-targets.php
rename to projects/packages/waf/tests/php/unit/test-waf-runtime-targets.php
diff --git a/projects/packages/waf/tests/php/test-waf-runtime.php b/projects/packages/waf/tests/php/unit/test-waf-runtime.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-runtime.php
rename to projects/packages/waf/tests/php/unit/test-waf-runtime.php
diff --git a/projects/packages/waf/tests/php/test-waf-standalone-bootstrap.php b/projects/packages/waf/tests/php/unit/test-waf-standalone-bootstrap.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-standalone-bootstrap.php
rename to projects/packages/waf/tests/php/unit/test-waf-standalone-bootstrap.php
diff --git a/projects/packages/waf/tests/php/test-waf-transforms.php b/projects/packages/waf/tests/php/unit/test-waf-transforms.php
similarity index 100%
rename from projects/packages/waf/tests/php/test-waf-transforms.php
rename to projects/packages/waf/tests/php/unit/test-waf-transforms.php
diff --git a/projects/plugins/jetpack/changelog/add-waf-wordbless b/projects/plugins/jetpack/changelog/add-waf-wordbless
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-waf-wordbless
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 10f4519730891..09f77eb3eefc8 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -2418,14 +2418,16 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "6e38e0e44373497b441f60ca21806f217d70248e"
+                "reference": "ab08a17e5e6f9e04b5036ad4f3e64b041707386c"
             },
             "require": {
+                "automattic/jetpack-connection": "@dev",
                 "automattic/jetpack-status": "@dev",
                 "wikimedia/aho-corasick": "^1.0"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
+                "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "1.0.4"
             },
             "type": "jetpack-library",
@@ -2450,13 +2452,21 @@
             },
             "scripts": {
                 "phpunit": [
-                    "./vendor/phpunit/phpunit/phpunit --colors=always"
+                    "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
+                    "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
+                ],
+                "post-install-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
+                ],
+                "post-update-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
                 ],
                 "test-coverage": [
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
                 ],
                 "test-coverage-html": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage"
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
                 ],
                 "test-php": [
                     "@composer phpunit"
diff --git a/projects/plugins/protect/changelog/add-waf-wordbless b/projects/plugins/protect/changelog/add-waf-wordbless
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/add-waf-wordbless
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index f266c8bd5b9cf..12b07ab9a1b9d 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -1352,14 +1352,16 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "6e38e0e44373497b441f60ca21806f217d70248e"
+                "reference": "ab08a17e5e6f9e04b5036ad4f3e64b041707386c"
             },
             "require": {
+                "automattic/jetpack-connection": "@dev",
                 "automattic/jetpack-status": "@dev",
                 "wikimedia/aho-corasick": "^1.0"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
+                "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "1.0.4"
             },
             "type": "jetpack-library",
@@ -1384,13 +1386,21 @@
             },
             "scripts": {
                 "phpunit": [
-                    "./vendor/phpunit/phpunit/phpunit --colors=always"
+                    "./vendor/phpunit/phpunit/phpunit --configuration tests/php/integration/phpunit.xml.dist --colors=always",
+                    "./vendor/phpunit/phpunit/phpunit --configuration tests/php/unit/phpunit.xml.dist --colors=always"
+                ],
+                "post-install-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
+                ],
+                "post-update-cmd": [
+                    "WorDBless\\Composer\\InstallDropin::copy"
                 ],
                 "test-coverage": [
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
                 ],
                 "test-coverage-html": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage"
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
                 ],
                 "test-php": [
                     "@composer phpunit"

From 2cc7dbdabc704cb83e57cee7afcb8869d68768b1 Mon Sep 17 00:00:00 2001
From: Peter Petrov <peter.petrov89@gmail.com>
Date: Fri, 17 Feb 2023 01:31:42 +0200
Subject: [PATCH 12/51] [Boost] Add CSS/JS minification (#28686)

* Add page optimize plugin files;
Exclude page optimize plugin files from phpcs

* Allow page optimize to be enabled/disabled via Boost settings;
Update plugin hooks to initialize on boost plugin file;
Prevent minification to happen in WP admin

* changelog

* Prefix page optimize code to allow running with original page optimize

* Update options to avoid collision with official page optimize plugin

* Add migration for old page optimize options

This is necessary, to make sure the page optimize in Boost is backwards
compatible with existing page optimize installations.

* Fix fatal error when accessing a cached URL

* Update concatenated stylesheets to support style_loader_tag filter

* Allow disabling minify via GET param if enabled

* Refactor page optimize code as a Boost feature;
Ignore phpcs for minify feature

* Handle PHP constants from page optimize;
Add missing functionality from page optimize

* Remove global variable usage

* Fix fatal error

* Fix concatenation initialized too early

* Remove old page optimize plugin

* Update Minify description in UI

* Fix fatal error during CSS concatenation

* Remove page optimize compatibility

Options won't be migrated. An upcoming commit will revert to the
option names page optimize uses.

* Update page optimize settings to use original names

* Remove ability to disable minify feature via specific GET param

There's already a param for this - jb-disable-modules.

* Update cssmin to use composer package instead of separate files

* Fix versioning

* Hide minify feature behind a PHP constant

---------

Co-authored-by: Mark George <thingalon@gmail.com>
---
 projects/plugins/boost/.phpcsignore           |   2 +
 .../js/pages/settings/sections/Modules.svelte |  14 +
 .../features/optimizations/Optimizations.php  |   5 +
 .../optimizations/minify/Concatenate_CSS.php  | 214 +++++++++++
 .../optimizations/minify/Concatenate_JS.php   | 291 +++++++++++++++
 .../features/optimizations/minify/Config.php  |  46 +++
 .../minify/Dependency_Path_Mapping.php        | 145 ++++++++
 .../features/optimizations/minify/Minify.php  |  63 ++++
 .../minify/functions-helpers.php              | 299 ++++++++++++++++
 .../features/optimizations/minify/service.php | 337 ++++++++++++++++++
 .../boost/changelog/add-boost-minification    |   4 +
 .../boost/changelog/add-boost-minification#2  |   5 +
 projects/plugins/boost/composer.json          |   7 +-
 projects/plugins/boost/composer.lock          |  59 ++-
 projects/plugins/boost/jetpack-boost.php      |   4 +-
 projects/plugins/boost/package.json           |   2 +-
 16 files changed, 1490 insertions(+), 7 deletions(-)
 create mode 100644 projects/plugins/boost/.phpcsignore
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/Concatenate_CSS.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/Concatenate_JS.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/Config.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/Dependency_Path_Mapping.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/Minify.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/functions-helpers.php
 create mode 100644 projects/plugins/boost/app/features/optimizations/minify/service.php
 create mode 100644 projects/plugins/boost/changelog/add-boost-minification
 create mode 100644 projects/plugins/boost/changelog/add-boost-minification#2

diff --git a/projects/plugins/boost/.phpcsignore b/projects/plugins/boost/.phpcsignore
new file mode 100644
index 0000000000000..4a50d6733770d
--- /dev/null
+++ b/projects/plugins/boost/.phpcsignore
@@ -0,0 +1,2 @@
+# For the time being, ignore page optimize refactor
+/app/features/optimizations/minify/
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
index 4721488b03f3a..a972a32a4f61b 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
@@ -24,6 +24,7 @@
 	const criticalCssLink = getRedirectUrl( 'jetpack-boost-critical-css' );
 	const deferJsLink = getRedirectUrl( 'jetpack-boost-defer-js' );
 	const lazyLoadLink = getRedirectUrl( 'jetpack-boost-lazy-load' );
+	const minifyCssLink = getRedirectUrl( 'jetpack-boost-minify-css' );
 
 	// svelte-ignore unused-export-let - Ignored values supplied by svelte-navigator.
 	export let location, navigate;
@@ -134,6 +135,19 @@
 		</Module>
 	</div>
 
+	<Module slug={'minify'}>
+		<h3 slot="title">{__( 'Minify', 'jetpack-boost' )}<span class="beta">Beta</span></h3>
+		<p slot="description">
+			<TemplatedString
+				template={__(
+					`Minimize code and markup in your web pages and script files, reducing file sizes and speeding up your site. Read more on <link>web.dev</link>.`,
+					'jetpack-boost'
+				)}
+				vars={externalLinkTemplateVar( minifyCssLink )}
+			/>
+		</p>
+	</Module>
+
 	<SuperCacheInfo />
 </div>
 
diff --git a/projects/plugins/boost/app/features/optimizations/Optimizations.php b/projects/plugins/boost/app/features/optimizations/Optimizations.php
index a39b39267f443..11c3c420256b7 100644
--- a/projects/plugins/boost/app/features/optimizations/Optimizations.php
+++ b/projects/plugins/boost/app/features/optimizations/Optimizations.php
@@ -7,6 +7,7 @@
 use Automattic\Jetpack_Boost\Features\Optimizations\Cloud_CSS\Cloud_CSS;
 use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
 use Automattic\Jetpack_Boost\Features\Optimizations\Lazy_Images\Lazy_Images;
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Minify;
 use Automattic\Jetpack_Boost\Features\Optimizations\Render_Blocking_JS\Render_Blocking_JS;
 use Automattic\Jetpack_Boost\Lib\Premium_Features;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Has_Endpoints;
@@ -38,6 +39,10 @@ public function __construct() {
 			new Image_Guide(),
 		);
 
+		if ( defined( 'JETPACK_BOOST_MINIFY' ) && JETPACK_BOOST_MINIFY ) {
+			$features[] = new Minify();
+		}
+
 		foreach ( $features as $feature ) {
 			$slug                    = $feature->get_slug();
 			$this->features[ $slug ] = new Optimization( $feature );
diff --git a/projects/plugins/boost/app/features/optimizations/minify/Concatenate_CSS.php b/projects/plugins/boost/app/features/optimizations/minify/Concatenate_CSS.php
new file mode 100644
index 0000000000000..cb468c980180d
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/Concatenate_CSS.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Minify;
+
+use WP_Styles;
+
+class Concatenate_CSS extends WP_Styles {
+	private $dependency_path_mapping;
+	private $old_styles;
+
+	public $allow_gzip_compression;
+
+	function __construct( $styles ) {
+		if ( empty( $styles ) || ! ( $styles instanceof WP_Styles ) ) {
+			$this->old_styles = new WP_Styles();
+		} else {
+			$this->old_styles = $styles;
+		}
+
+		// Unset all the object properties except our private copy of the styles object.
+		// We have to unset everything so that the overload methods talk to $this->old_styles->whatever
+		// instead of $this->whatever.
+		foreach ( array_keys( get_object_vars( $this ) ) as $key ) {
+			if ( 'old_styles' === $key ) {
+				continue;
+			}
+			unset( $this->$key );
+		}
+
+		$this->dependency_path_mapping = new Dependency_Path_Mapping(
+			apply_filters( 'page_optimize_site_url', $this->base_url )
+		);
+	}
+
+	function do_items( $handles = false, $group = false ) {
+		$handles     = false === $handles ? $this->queue : (array) $handles;
+		$stylesheets = array();
+		$siteurl     = apply_filters( 'page_optimize_site_url', $this->base_url );
+
+		$this->all_deps( $handles );
+
+		$stylesheet_group_index = 0;
+		// Merge CSS into a single file
+		$concat_group = 'concat';
+		// Concat group on top (first array element gets processed earlier)
+		$stylesheets[ $concat_group ] = array();
+
+		foreach ( $this->to_do as $key => $handle ) {
+			$obj      = $this->registered[ $handle ];
+			$obj->src = apply_filters( 'style_loader_src', $obj->src, $obj->handle );
+
+			// Core is kind of broken and returns "true" for src of "colors" handle
+			// http://core.trac.wordpress.org/attachment/ticket/16827/colors-hacked-fixed.diff
+			// http://core.trac.wordpress.org/ticket/20729
+			$css_url = $obj->src;
+			if ( 'colors' == $obj->handle && true === $css_url ) {
+				$css_url = wp_style_loader_src( $css_url, $obj->handle );
+			}
+
+			$css_url_parsed = parse_url( $obj->src );
+			$extra          = $obj->extra;
+
+			// Don't concat by default
+			$do_concat = false;
+
+			// Only try to concat static css files
+			if ( false !== strpos( $css_url_parsed['path'], '.css' ) ) {
+				$do_concat = true;
+			} elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat CSS %s => Maybe Not Static File %s -->\n", esc_html( $handle ), esc_html( $obj->src ) );
+			}
+
+			// Don't try to concat styles which are loaded conditionally (like IE stuff)
+			if ( isset( $extra['conditional'] ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat CSS %s => Has Conditional -->\n", esc_html( $handle ) );
+				}
+				$do_concat = false;
+			}
+
+			// Don't concat rtl stuff for now until concat supports it correctly
+			if ( $do_concat && 'rtl' === $this->text_direction && ! empty( $extra['rtl'] ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat CSS %s => Is RTL -->\n", esc_html( $handle ) );
+				}
+				$do_concat = false;
+			}
+
+			// Don't try to concat externally hosted scripts
+			$is_internal_uri = $this->dependency_path_mapping->is_internal_uri( $css_url );
+			if ( $do_concat && ! $is_internal_uri ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat CSS %s => External URL: %s -->\n", esc_html( $handle ), esc_url( $css_url ) );
+				}
+				$do_concat = false;
+			}
+
+			if ( $do_concat ) {
+				// Resolve paths and concat styles that exist in the filesystem
+				$css_realpath = $this->dependency_path_mapping->dependency_src_to_fs_path( $css_url );
+				if ( false === $css_realpath ) {
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						echo sprintf( "\n<!-- No Concat CSS %s => Invalid Path %s -->\n", esc_html( $handle ), esc_html( $css_realpath ) );
+					}
+					$do_concat = false;
+				}
+			}
+
+			// Skip concating CSS from exclusion list
+			$exclude_list = jetpack_boost_page_optimize_css_exclude_list();
+			foreach ( $exclude_list as $exclude ) {
+				if ( $do_concat && $handle === $exclude ) {
+					$do_concat = false;
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						echo sprintf( "\n<!-- No Concat CSS %s => Excluded option -->\n", esc_html( $handle ) );
+					}
+				}
+			}
+
+			// Allow plugins to disable concatenation of certain stylesheets.
+			if ( $do_concat && ! apply_filters( 'css_do_concat', $do_concat, $handle ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat CSS %s => Filtered `false` -->\n", esc_html( $handle ) );
+				}
+			}
+			$do_concat = apply_filters( 'css_do_concat', $do_concat, $handle );
+
+			if ( true === $do_concat ) {
+				$media = $obj->args;
+				if ( empty( $media ) ) {
+					$media = 'all';
+				}
+
+				$stylesheets[ $concat_group ][ $media ][ $handle ] = $css_url_parsed['path'];
+				$this->done[]                                      = $handle;
+			} else {
+				++$stylesheet_group_index;
+				$stylesheets[ $stylesheet_group_index ]['noconcat'][] = $handle;
+				++$stylesheet_group_index;
+			}
+			unset( $this->to_do[ $key ] );
+		}
+
+		foreach ( $stylesheets as $idx => $stylesheets_group ) {
+			foreach ( $stylesheets_group as $media => $css ) {
+				if ( 'noconcat' == $media ) {
+					foreach ( $css as $handle ) {
+						if ( $this->do_item( $handle, $group ) ) {
+							$this->done[] = $handle;
+						}
+					}
+					continue;
+				} elseif ( count( $css ) > 1 ) {
+					$fs_paths = array();
+					foreach ( $css as $css_uri_path ) {
+						$fs_paths[] = $this->dependency_path_mapping->uri_path_to_fs_path( $css_uri_path );
+					}
+
+					$mtime = max( array_map( 'filemtime', $fs_paths ) );
+					if ( jetpack_boost_page_optimize_use_concat_base_dir() ) {
+						$path_str = implode( ',', array_map( 'jetpack_boost_page_optimize_remove_concat_base_prefix', $fs_paths ) );
+					} else {
+						$path_str = implode( ',', $css );
+					}
+					$path_str = "$path_str?m=$mtime";
+
+					if ( $this->allow_gzip_compression ) {
+						$path_64 = base64_encode( gzcompress( $path_str ) );
+						if ( strlen( $path_str ) > ( strlen( $path_64 ) + 1 ) ) {
+							$path_str = '-' . $path_64;
+						}
+					}
+
+					$href = $siteurl . '/_static/??' . $path_str;
+				} else {
+					$href = jetpack_boost_page_optimize_cache_bust_mtime( current( $css ), $siteurl );
+				}
+
+				$handles = array_keys( $css );
+				$css_id  = "$media-css-" . md5( $href );
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					$style_tag = "<link data-handles='" . esc_attr( implode( ',', $handles ) ) . "' rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />";
+				} else {
+					$style_tag = "<link rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />";
+				}
+
+				$style_tag = apply_filters( 'page_optimize_style_loader_tag', $style_tag, $handles, $href, $media );
+				$style_tag = apply_filters( 'style_loader_tag', $style_tag, $handles, $href, $media );
+
+				echo $style_tag . "\n";
+
+				array_map( array( $this, 'print_inline_style' ), array_keys( $css ) );
+			}
+		}
+
+		return $this->done;
+	}
+
+	function __isset( $key ) {
+		return isset( $this->old_styles->$key );
+	}
+
+	function __unset( $key ) {
+		unset( $this->old_styles->$key );
+	}
+
+	function &__get( $key ) {
+		return $this->old_styles->$key;
+	}
+
+	function __set( $key, $value ) {
+		$this->old_styles->$key = $value;
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/Concatenate_JS.php b/projects/plugins/boost/app/features/optimizations/minify/Concatenate_JS.php
new file mode 100644
index 0000000000000..948a3994dc5ab
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/Concatenate_JS.php
@@ -0,0 +1,291 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Minify;
+
+use WP_Scripts;
+
+class Concatenate_JS extends WP_Scripts {
+	private $dependency_path_mapping;
+	private $old_scripts;
+
+	public $allow_gzip_compression;
+
+	function __construct( $scripts ) {
+		if ( empty( $scripts ) || ! ( $scripts instanceof WP_Scripts ) ) {
+			$this->old_scripts = new WP_Scripts();
+		} else {
+			$this->old_scripts = $scripts;
+		}
+
+		// Unset all the object properties except our private copy of the scripts object.
+		// We have to unset everything so that the overload methods talk to $this->old_scripts->whatever
+		// instead of $this->whatever.
+		foreach ( array_keys( get_object_vars( $this ) ) as $key ) {
+			if ( 'old_scripts' === $key ) {
+				continue;
+			}
+			unset( $this->$key );
+		}
+
+		$this->dependency_path_mapping = new Dependency_Path_Mapping(
+			apply_filters( 'page_optimize_site_url', $this->base_url )
+		);
+	}
+
+	protected function has_inline_content( $handle ) {
+		$before_output = $this->get_data( $handle, 'before' );
+		if ( ! empty( $before_output ) ) {
+			return true;
+		}
+
+		$after_output = $this->get_data( $handle, 'after' );
+		if ( ! empty( $after_output ) ) {
+			return true;
+		}
+
+		// JavaScript translations
+		$has_translations = ! empty( $this->registered[ $handle ]->textdomain );
+		if ( $has_translations ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	function do_items( $handles = false, $group = false ) {
+		$handles     = false === $handles ? $this->queue : (array) $handles;
+		$javascripts = array();
+		$siteurl     = apply_filters( 'page_optimize_site_url', $this->base_url );
+		$this->all_deps( $handles );
+		$level = 0;
+
+		$using_strict = false;
+		foreach ( $this->to_do as $key => $handle ) {
+			$script_is_strict = false;
+			if ( in_array( $handle, $this->done ) || ! isset( $this->registered[ $handle ] ) ) {
+				continue;
+			}
+
+			if ( 0 === $group && $this->groups[ $handle ] > 0 ) {
+				$this->in_footer[] = $handle;
+				unset( $this->to_do[ $key ] );
+				continue;
+			}
+
+			if ( ! $this->registered[ $handle ]->src ) { // Defines a group.
+				// if there are localized items, echo them
+				$this->print_extra_script( $handle );
+				$this->done[] = $handle;
+				continue;
+			}
+
+			if ( false === $group && in_array( $handle, $this->in_footer, true ) ) {
+				$this->in_footer = array_diff( $this->in_footer, (array) $handle );
+			}
+
+			$obj           = $this->registered[ $handle ];
+			$js_url        = $obj->src;
+			$js_url_parsed = parse_url( $js_url );
+
+			// Don't concat by default
+			$do_concat = false;
+
+			// Only try to concat static js files
+			if ( false !== strpos( $js_url_parsed['path'], '.js' ) ) {
+				$do_concat = jetpack_boost_page_optimize_should_concat_js();
+			} elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => Maybe Not Static File %s -->\n", esc_html( $handle ), esc_html( $obj->src ) );
+			}
+
+			// Don't try to concat externally hosted scripts
+			$is_internal_uri = $this->dependency_path_mapping->is_internal_uri( $js_url );
+			if ( $do_concat && ! $is_internal_uri ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => External URL: %s -->\n", esc_html( $handle ), esc_url( $js_url ) );
+				}
+				$do_concat = false;
+			}
+
+			if ( $do_concat ) {
+				// Resolve paths and concat scripts that exist in the filesystem
+				$js_realpath = $this->dependency_path_mapping->dependency_src_to_fs_path( $js_url );
+				if ( false === $js_realpath ) {
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						echo sprintf( "\n<!-- No Concat JS %s => Invalid Path %s -->\n", esc_html( $handle ), esc_html( $js_realpath ) );
+					}
+					$do_concat = false;
+				}
+			}
+
+			if ( $do_concat && $this->has_inline_content( $handle ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => Has Inline Content -->\n", esc_html( $handle ) );
+				}
+				$do_concat = false;
+			}
+
+			// Skip core scripts that use Strict Mode
+			if ( $do_concat && ( 'react' === $handle || 'react-dom' === $handle ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => Has Strict Mode (Core) -->\n", esc_html( $handle ) );
+				}
+				$do_concat        = false;
+				$script_is_strict = true;
+			} elseif ( $do_concat && preg_match_all( '/^[\',"]use strict[\',"];/Uims', file_get_contents( $js_realpath ), $matches ) ) {
+				// Skip third-party scripts that use Strict Mode
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => Has Strict Mode (Third-Party) -->\n", esc_html( $handle ) );
+				}
+				$do_concat        = false;
+				$script_is_strict = true;
+			} else {
+				$script_is_strict = false;
+			}
+
+			// Skip concating scripts from exclusion list
+			$exclude_list = jetpack_boost_page_optimize_js_exclude_list();
+			foreach ( $exclude_list as $exclude ) {
+				if ( $do_concat && $handle === $exclude ) {
+					$do_concat = false;
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						echo sprintf( "\n<!-- No Concat JS %s => Excluded option -->\n", esc_html( $handle ) );
+					}
+				}
+			}
+
+			// Allow plugins to disable concatenation of certain scripts.
+			if ( $do_concat && ! apply_filters( 'js_do_concat', $do_concat, $handle ) ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					echo sprintf( "\n<!-- No Concat JS %s => Filtered `false` -->\n", esc_html( $handle ) );
+				}
+			}
+			$do_concat = apply_filters( 'js_do_concat', $do_concat, $handle );
+
+			if ( true === $do_concat ) {
+				if ( ! isset( $javascripts[ $level ] ) ) {
+					$javascripts[ $level ]['type'] = 'concat';
+				}
+
+				$javascripts[ $level ]['paths'][]   = $js_url_parsed['path'];
+				$javascripts[ $level ]['handles'][] = $handle;
+
+			} else {
+				++$level;
+				$javascripts[ $level ]['type']   = 'do_item';
+				$javascripts[ $level ]['handle'] = $handle;
+				++$level;
+			}
+			unset( $this->to_do[ $key ] );
+
+			if ( $using_strict !== $script_is_strict ) {
+				if ( $script_is_strict ) {
+					$using_strict = true;
+					$strict_count = 0;
+				} else {
+					$using_strict = false;
+				}
+			}
+
+			if ( $script_is_strict ) {
+				++$strict_count;
+			}
+		}
+
+		if ( empty( $javascripts ) ) {
+			return $this->done;
+		}
+
+		foreach ( $javascripts as $js_array ) {
+			if ( 'do_item' == $js_array['type'] ) {
+				if ( $this->do_item( $js_array['handle'], $group ) ) {
+					$this->done[] = $js_array['handle'];
+				}
+			} elseif ( 'concat' == $js_array['type'] ) {
+				array_map( array( $this, 'print_extra_script' ), $js_array['handles'] );
+
+				if ( isset( $js_array['paths'] ) && count( $js_array['paths'] ) > 1 ) {
+					$fs_paths = array();
+					foreach ( $js_array['paths'] as $js_url ) {
+						$fs_paths[] = $this->dependency_path_mapping->uri_path_to_fs_path( $js_url );
+					}
+
+					$mtime = max( array_map( 'filemtime', $fs_paths ) );
+					if ( jetpack_boost_page_optimize_use_concat_base_dir() ) {
+						$path_str = implode( ',', array_map( 'jetpack_boost_page_optimize_remove_concat_base_prefix', $fs_paths ) );
+					} else {
+						$path_str = implode( ',', $js_array['paths'] );
+					}
+					$path_str = "$path_str?m=$mtime";
+
+					if ( $this->allow_gzip_compression ) {
+						$path_64 = base64_encode( gzcompress( $path_str ) );
+						if ( strlen( $path_str ) > ( strlen( $path_64 ) + 1 ) ) {
+							$path_str = '-' . $path_64;
+						}
+					}
+
+					$href = $siteurl . '/_static/??' . $path_str;
+				} elseif ( isset( $js_array['paths'] ) && is_array( $js_array['paths'] ) ) {
+					$href = jetpack_boost_page_optimize_cache_bust_mtime( $js_array['paths'][0], $siteurl );
+				}
+
+				$this->done = array_merge( $this->done, $js_array['handles'] );
+
+				// Print before/after scripts from wp_inline_scripts() and concatenated script tag
+				if ( isset( $js_array['extras']['before'] ) ) {
+					foreach ( $js_array['extras']['before'] as $inline_before ) {
+						echo $inline_before;
+					}
+				}
+
+				if ( isset( $href ) ) {
+					$handles = implode( ',', $js_array['handles'] );
+
+					$load_mode = jetpack_boost_page_optimize_load_mode_js();
+
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						$tag = "<script data-handles='" . esc_attr( $handles ) . "' $load_mode type='text/javascript' src='$href'></script>\n";
+					} else {
+						$tag = "<script type='text/javascript' $load_mode src='$href'></script>\n";
+					}
+
+					if ( is_array( $js_array['handles'] ) && count( $js_array['handles'] ) === 1 ) {
+						// Because we have a single script, let's apply the `script_loader_tag` filter as core does in `do_item()`.
+						// That way, we interfere less with plugin and theme script filtering. For example, without this filter,
+						// there is a case where we block the TwentyTwenty theme from adding async/defer attributes.
+						// https://github.com/Automattic/page-optimize/pull/44
+						$tag = apply_filters( 'script_loader_tag', $tag, $js_array['handles'][0], $href );
+					}
+
+					echo $tag;
+				}
+
+				if ( isset( $js_array['extras']['after'] ) ) {
+					foreach ( $js_array['extras']['after'] as $inline_after ) {
+						echo $inline_after;
+					}
+				}
+			}
+		}
+
+		do_action( 'js_concat_did_items', $javascripts );
+
+		return $this->done;
+	}
+
+	function __isset( $key ) {
+		return isset( $this->old_scripts->$key );
+	}
+
+	function __unset( $key ) {
+		unset( $this->old_scripts->$key );
+	}
+
+	function &__get( $key ) {
+		return $this->old_scripts->$key;
+	}
+
+	function __set( $key, $value ) {
+		$this->old_scripts->$key = $value;
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/Config.php b/projects/plugins/boost/app/features/optimizations/minify/Config.php
new file mode 100644
index 0000000000000..8b42baaab3f7e
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/Config.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Minify;
+
+class Config {
+
+	public static function get_cache_dir_path() {
+		if ( defined( 'PAGE_OPTIMIZE_CACHE_DIR' ) ) {
+			if ( empty( PAGE_OPTIMIZE_CACHE_DIR ) ) {
+				$path = false;
+			} else {
+				$path = PAGE_OPTIMIZE_CACHE_DIR;
+			}
+		} else {
+			$path = WP_CONTENT_DIR . '/cache/page_optimize';
+		}
+
+		return $path;
+	}
+
+	public static function is_css_minify_enabled() {
+		if ( defined( 'PAGE_OPTIMIZE_CSS_MINIFY' ) ) {
+			$enabled = (bool) PAGE_OPTIMIZE_CSS_MINIFY;
+		} else {
+			$enabled = false;
+		}
+
+		return $enabled;
+	}
+
+	// @todo - PAGE_OPTIMIZE_CONCAT_BASE_DIR is used in the original plugin, but never defined anywhere.
+
+	public static function get_abspath() {
+		if ( defined( 'PAGE_OPTIMIZE_ABSPATH' ) ) {
+			$path = PAGE_OPTIMIZE_ABSPATH;
+		} else {
+			$path = ABSPATH;
+		}
+
+		return $path;
+	}
+
+	public static function get_cron_cache_cleanup_hook() {
+		return 'page_optimize_cron_cache_cleanup';
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/Dependency_Path_Mapping.php b/projects/plugins/boost/app/features/optimizations/minify/Dependency_Path_Mapping.php
new file mode 100644
index 0000000000000..1c9de4f811c34
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/Dependency_Path_Mapping.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Minify;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Config;
+
+/**
+ * This is a class to map script and style URLs to local filesystem paths.
+ * This is necessary when we are deciding what we can concatenate and when
+ * actually building the concatenation.
+ */
+class Dependency_Path_Mapping {
+	// Save entire site URL so we can check whether other URLs are based on it (internal URLs)
+	public $site_url;
+
+	// Save URI path and dir for mapping URIs to filesystem paths
+	public $site_uri_path    = null;
+	public $site_dir         = null;
+	public $content_uri_path = null;
+	public $content_dir      = null;
+	public $plugin_uri_path  = null;
+	public $plugin_dir       = null;
+
+	function __construct(
+		// Expose URLs and DIRs for unit test
+		$site_url = null, // default site URL is determined dynamically
+		$site_dir = null,
+		$content_url = WP_CONTENT_URL,
+		$content_dir = WP_CONTENT_DIR,
+		$plugin_url = WP_PLUGIN_URL,
+		$plugin_dir = WP_PLUGIN_DIR
+	) {
+		if ( null === $site_dir ) {
+			$site_dir = Config::get_abspath();
+		}
+
+		if ( null === $site_url ) {
+			$site_url = is_multisite() ? get_site_url( get_current_blog_id() ) : get_site_url();
+		}
+		$site_url            = trailingslashit( $site_url );
+		$this->site_url      = $site_url;
+		$this->site_uri_path = parse_url( $site_url, PHP_URL_PATH );
+		$this->site_dir      = trailingslashit( $site_dir );
+
+		// Only resolve content URLs if they are under the site URL
+		if ( $this->is_internal_uri( $content_url ) ) {
+			$this->content_uri_path = parse_url( trailingslashit( $content_url ), PHP_URL_PATH );
+			$this->content_dir      = trailingslashit( $content_dir );
+		}
+
+		// Only resolve plugin URLs if they are under the site URL
+		if ( $this->is_internal_uri( $plugin_url ) ) {
+			$this->plugin_uri_path = parse_url( trailingslashit( $plugin_url ), PHP_URL_PATH );
+			$this->plugin_dir      = trailingslashit( $plugin_dir );
+		}
+	}
+
+	/**
+	 * Given the full URL of a script/style dependency, return its local filesystem path.
+	 */
+	function dependency_src_to_fs_path( $src ) {
+		if ( ! $this->is_internal_uri( $src ) ) {
+			// If a URI is not internal, we can have no confidence
+			// we are resolving to the correct file.
+			return false;
+		}
+
+		$src_parts = parse_url( $src );
+		if ( false === $src_parts ) {
+			return false;
+		}
+
+		if ( empty( $src_parts['path'] ) ) {
+			// We can't find anything to resolve
+			return false;
+		}
+		$path = $src_parts['path'];
+
+		if ( empty( $src_parts['host'] ) ) {
+			// With no host, this is a path relative to the WordPress root
+			$fs_path = "{$this->site_dir}{$path}";
+
+			return file_exists( $fs_path ) ? $fs_path : false;
+		}
+
+		return $this->uri_path_to_fs_path( $path );
+	}
+
+	/**
+	 * Given a URI path of a script/style resource, return its local filesystem path.
+	 */
+	function uri_path_to_fs_path( $uri_path ) {
+		if ( 1 === preg_match( '#(?:^|/)\.\.?(?:/|$)#', $uri_path ) ) {
+			// Reject relative paths
+			return false;
+		}
+
+		// The plugin URI path may be contained within the content URI path, so we check it before the content URI.
+		// And both the plugin and content URI paths must be contained within the site URI path,
+		// so we check them before checking the site URI.
+		if ( isset( $this->plugin_uri_path ) && static::is_descendant_uri( $this->plugin_uri_path, $uri_path ) ) {
+			$file_path = $this->plugin_dir . substr( $uri_path, strlen( $this->plugin_uri_path ) );
+		} elseif ( isset( $this->content_uri_path ) && static::is_descendant_uri( $this->content_uri_path, $uri_path ) ) {
+			$file_path = $this->content_dir . substr( $uri_path, strlen( $this->content_uri_path ) );
+		} elseif ( static::is_descendant_uri( $this->site_uri_path, $uri_path ) ) {
+			$file_path = $this->site_dir . substr( $uri_path, strlen( $this->site_uri_path ) );
+		}
+
+		if ( isset( $file_path ) && file_exists( $file_path ) ) {
+			return $file_path;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Determine whether a URI is internal, contained by this site.
+	 *
+	 * This method helps ensure we only resolve to local FS paths.
+	 */
+	function is_internal_uri( $uri ) {
+		if ( jetpack_boost_page_optimize_starts_with( '/', $uri ) && ! jetpack_boost_page_optimize_starts_with( '//', $uri ) ) {
+			// Absolute paths are internal because they are based on the site dir (typically ABSPATH),
+			// and this looks like an absolute path.
+			return true;
+		}
+
+		// To be internal, a URL must have the same scheme, host, and port as the site URL
+		// and start with the same path as the site URL.
+		return static::is_descendant_uri( $this->site_url, $uri );
+	}
+
+	/**
+	 * Check whether a path is descended from the given directory path.
+	 *
+	 * Does not handle relative paths.
+	 */
+	static function is_descendant_uri( $dir_path, $candidate ) {
+		// Ensure a trailing slash to avoid false matches like
+		// "/wp-content/resource" being judged a descendant of "/wp".
+		$dir_path = trailingslashit( $dir_path );
+
+		return jetpack_boost_page_optimize_starts_with( $dir_path, $candidate );
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/Minify.php b/projects/plugins/boost/app/features/optimizations/minify/Minify.php
new file mode 100644
index 0000000000000..6011e8b220ec7
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/Minify.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Minify;
+
+use Automattic\Jetpack_Boost\Contracts\Feature;
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Config;
+
+class Minify implements Feature {
+	// @todo - handle PHP constants.
+
+	public function setup() {
+		require 'functions-helpers.php';
+
+		// TODO: Make concat URL dir configurable
+		if ( isset( $_SERVER['REQUEST_URI'] ) && '/_static/' === substr( $_SERVER['REQUEST_URI'], 0, 9 ) ) {
+			require_once __DIR__ . '/service.php';
+			exit;
+		}
+
+		if ( jetpack_boost_page_optimize_bail() ) {
+			return;
+		}
+
+		add_action( Config::get_cron_cache_cleanup_hook(), 'jetpack_boost_page_optimize_cache_cleanup' );
+		register_deactivation_hook( JETPACK_BOOST_PATH, 'jetpack_boost_page_optimize_deactivate' );
+		register_uninstall_hook( JETPACK_BOOST_PATH, 'jetpack_boost_page_optimize_uninstall' );
+
+		jetpack_boost_page_optimize_schedule_cache_cleanup();
+
+		add_action( 'init', array( $this, 'init_concatenate' ) );
+
+		// Disable Jetpack photon-cdn for static JS/CSS
+		add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' );
+	}
+
+	public static function get_slug() {
+		return 'minify';
+	}
+
+	public function setup_trigger() {
+		return 'init';
+	}
+
+	public function init_concatenate() {
+		if ( is_admin() ) {
+			return;
+		}
+
+		if ( jetpack_boost_page_optimize_should_concat_js() || jetpack_boost_page_optimize_load_mode_js() ) {
+			global $wp_scripts;
+
+			$wp_scripts                         = new Concatenate_JS( $wp_scripts );
+			$wp_scripts->allow_gzip_compression = true; // @todo - used constant ALLOW_GZIP_COMPRESSION = true if not defined.
+		}
+
+		if ( jetpack_boost_page_optimize_should_concat_css() ) {
+			global $wp_styles;
+
+			$wp_styles                         = new Concatenate_CSS( $wp_styles );
+			$wp_styles->allow_gzip_compression = true; // @todo - used constant ALLOW_GZIP_COMPRESSION = true if not defined.
+		}
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/functions-helpers.php b/projects/plugins/boost/app/features/optimizations/minify/functions-helpers.php
new file mode 100644
index 0000000000000..0d4910ac68228
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/functions-helpers.php
@@ -0,0 +1,299 @@
+<?php
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Config;
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Dependency_Path_Mapping;
+
+// @todo - refactor this. Dump of functions from page optimize.
+
+function jetpack_boost_page_optimize_cache_cleanup( $cache_folder = false, $file_age = DAY_IN_SECONDS ) {
+	if ( ! is_dir( $cache_folder ) ) {
+		return;
+	}
+
+	$defined_cache_dir = Config::get_cache_dir_path();
+
+	// If cache is disabled when the cleanup runs, purge it
+	$using_cache = ! empty( $defined_cache_dir );
+	if ( ! $using_cache ) {
+		$file_age = 0;
+	}
+	// If the cache folder changed since queueing, purge it
+	if ( $using_cache && $cache_folder !== $defined_cache_dir ) {
+		$file_age = 0;
+	}
+
+	// Grab all files in the cache directory
+	$cache_files = glob( $cache_folder . '/page-optimize-cache-*' );
+
+	// Cleanup all files older than $file_age
+	foreach ( $cache_files as $cache_file ) {
+		if ( ! is_file( $cache_file ) ) {
+			continue;
+		}
+
+		if ( ( time() - $file_age ) > filemtime( $cache_file ) ) {
+			unlink( $cache_file );
+		}
+	}
+}
+
+// Unschedule cache cleanup, and purge cache directory
+function jetpack_boost_page_optimize_deactivate() {
+	$cache_folder = Config::get_cache_dir_path();
+
+	jetpack_boost_page_optimize_cache_cleanup( $cache_folder, 0 /* max file age in seconds */ );
+
+	wp_clear_scheduled_hook( Config::get_cron_cache_cleanup_hook(), [ $cache_folder ] );
+}
+
+function jetpack_boost_page_optimize_uninstall() {
+	// Run cleanup on uninstall. You can uninstall an active plugin w/o deactivation.
+	jetpack_boost_page_optimize_deactivate();
+
+	// JS
+	delete_option( 'page_optimize-js' );
+	delete_option( 'page_optimize-load-mode' );
+	delete_option( 'page_optimize-js-exclude' );
+	// CSS
+	delete_option( 'page_optimize-css' );
+	delete_option( 'page_optimize-css-exclude' );
+
+}
+
+function jetpack_boost_page_optimize_get_text_domain() {
+	return 'page-optimize';
+}
+
+function jetpack_boost_page_optimize_should_concat_js() {
+	// Support query param for easy testing
+	if ( isset( $_GET['concat-js'] ) ) {
+		return $_GET['concat-js'] !== '0';
+	}
+
+	return (bool) get_option( 'page_optimize-js', jetpack_boost_page_optimize_js_default() );
+}
+
+// TODO: Support JS load mode regardless of whether concat is enabled
+function jetpack_boost_page_optimize_load_mode_js() {
+	// Support query param for easy testing
+	if ( ! empty( $_GET['load-mode-js'] ) ) {
+		$load_mode = jetpack_boost_page_optimize_sanitize_js_load_mode( $_GET['load-mode-js'] );
+	} else {
+		$load_mode = jetpack_boost_page_optimize_sanitize_js_load_mode( get_option( 'page_optimize-load-mode', jetpack_boost_page_optimize_js_load_mode_default() ) );
+	}
+
+	return $load_mode;
+}
+
+function jetpack_boost_page_optimize_should_concat_css() {
+	// Support query param for easy testing
+	if ( isset( $_GET['concat-css'] ) ) {
+		return $_GET['concat-css'] !== '0';
+	}
+
+	return (bool) get_option( 'page_optimize-css', jetpack_boost_page_optimize_css_default() );
+}
+
+function jetpack_boost_page_optimize_js_default() {
+	return true;
+}
+
+function jetpack_boost_page_optimize_css_default() {
+	return true;
+}
+
+function jetpack_boost_page_optimize_js_load_mode_default() {
+	return '';
+}
+
+function jetpack_boost_page_optimize_js_exclude_list() {
+	$exclude_list = get_option( 'page_optimize-js-exclude' );
+	if ( false === $exclude_list ) {
+		// Use the default since the option is not set
+		return jetpack_boost_page_optimize_js_exclude_list_default();
+	}
+	if ( '' === $exclude_list ) {
+		return array();
+	}
+
+	return explode( ',', $exclude_list );
+}
+
+function jetpack_boost_page_optimize_js_exclude_list_default() {
+	// WordPress core stuff, a lot of other plugins depend on it.
+	return array( 'jquery', 'jquery-core', 'underscore', 'backbone' );
+}
+
+function jetpack_boost_page_optimize_css_exclude_list() {
+	$exclude_list = get_option( 'page_optimize-css-exclude' );
+	if ( false === $exclude_list ) {
+		// Use the default since the option is not set
+		return jetpack_boost_page_optimize_css_exclude_list_default();
+	}
+	if ( '' === $exclude_list ) {
+		return array();
+	}
+
+	return explode( ',', $exclude_list );
+}
+
+function jetpack_boost_page_optimize_css_exclude_list_default() {
+	// WordPress core stuff
+	return array( 'admin-bar', 'dashicons' );
+}
+
+function jetpack_boost_page_optimize_sanitize_js_load_mode( $value ) {
+	switch ( $value ) {
+		case 'async':
+		case 'defer':
+			break;
+		default:
+			$value = '';
+			break;
+	}
+
+	return $value;
+}
+
+function jetpack_boost_page_optimize_sanitize_exclude_field( $value ) {
+	if ( empty( $value ) ) {
+		return '';
+	}
+
+	$excluded_strings = explode( ',', sanitize_text_field( $value ) );
+	$sanitized_values = array();
+	foreach ( $excluded_strings as $excluded_string ) {
+		if ( ! empty( $excluded_string ) ) {
+			$sanitized_values[] = trim( $excluded_string );
+		}
+	}
+
+	return implode( ',', $sanitized_values );
+}
+
+/**
+ * Determines whether a string starts with another string.
+ */
+function jetpack_boost_page_optimize_starts_with( $prefix, $str ) {
+	$prefix_length = strlen( $prefix );
+	if ( strlen( $str ) < $prefix_length ) {
+		return false;
+	}
+
+	return substr( $str, 0, $prefix_length ) === $prefix;
+}
+
+/**
+ * Answers whether the plugin should provide concat resource URIs
+ * that are relative to a common ancestor directory. Assuming a common ancestor
+ * allows us to skip resolving resource URIs to filesystem paths later on.
+ */
+function jetpack_boost_page_optimize_use_concat_base_dir() {
+	return defined( 'PAGE_OPTIMIZE_CONCAT_BASE_DIR' ) && file_exists( PAGE_OPTIMIZE_CONCAT_BASE_DIR );
+}
+
+/**
+ * Get a filesystem path relative to a configured base path for resources
+ * that will be concatenated. Assuming a common ancestor allows us to skip
+ * resolving resource URIs to filesystem paths later on.
+ */
+function jetpack_boost_page_optimize_remove_concat_base_prefix( $original_fs_path ) {
+	$abspath = Config::get_abspath();
+
+	// Always check longer path first
+	if ( strlen( $abspath ) > strlen( PAGE_OPTIMIZE_CONCAT_BASE_DIR ) ) {
+		$longer_path  = $abspath;
+		$shorter_path = PAGE_OPTIMIZE_CONCAT_BASE_DIR;
+	} else {
+		$longer_path  = PAGE_OPTIMIZE_CONCAT_BASE_DIR;
+		$shorter_path = $abspath;
+	}
+
+	$prefix_abspath = trailingslashit( $longer_path );
+	if ( jetpack_boost_page_optimize_starts_with( $prefix_abspath, $original_fs_path ) ) {
+		return substr( $original_fs_path, strlen( $prefix_abspath ) );
+	}
+
+	$prefix_basedir = trailingslashit( $shorter_path );
+	if ( jetpack_boost_page_optimize_starts_with( $prefix_basedir, $original_fs_path ) ) {
+		return substr( $original_fs_path, strlen( $prefix_basedir ) );
+	}
+
+	// If we end up here, this is a resource we shouldn't have tried to concat in the first place
+	return '/page-optimize-resource-outside-base-path/' . basename( $original_fs_path );
+}
+
+function jetpack_boost_page_optimize_schedule_cache_cleanup() {
+	$cache_folder = Config::get_cache_dir_path();
+	$args = array( $cache_folder );
+
+	$cache_cleanup_hook = Config::get_cron_cache_cleanup_hook();
+
+	// If caching is on, and job isn't queued for current cache folder
+	if ( false !== $cache_folder && false === wp_next_scheduled( $cache_cleanup_hook, $args ) ) {
+		wp_schedule_event( time(), 'daily', $cache_cleanup_hook, $args );
+	}
+}
+
+// Cases when we don't want to concat
+function jetpack_boost_page_optimize_bail() {
+	// Bail if we're in customizer
+	global $wp_customize;
+	if ( isset( $wp_customize ) ) {
+		return true;
+	}
+
+	// Bail if Divi theme is active, and we're in the Divi Front End Builder
+	if ( ! empty( $_GET['et_fb'] ) && 'Divi' === wp_get_theme()->get_template() ) {
+		return true;
+	}
+
+	// Bail if we're editing pages in Brizy Editor
+	if ( class_exists( 'Brizy_Editor' ) && method_exists( 'Brizy_Editor', 'prefix' ) && ( isset( $_GET[ Brizy_Editor::prefix( '-edit-iframe' ) ] ) || isset( $_GET[ Brizy_Editor::prefix( '-edit' ) ] ) ) ) {
+		return true;
+	}
+
+	return false;
+}
+
+// Taken from utils.php/Jetpack_Boost_Page_Optimize_Utils
+function jetpack_boost_page_optimize_cache_bust_mtime( $path, $siteurl ) {
+	static $dependency_path_mapping;
+
+	$url = $siteurl . $path;
+
+	if ( strpos( $url, '?m=' ) ) {
+		return $url;
+	}
+
+	$parts = parse_url( $url );
+	if ( ! isset( $parts['path'] ) || empty( $parts['path'] ) ) {
+		return $url;
+	}
+
+	if ( empty( $dependency_path_mapping ) ) {
+		$dependency_path_mapping = new Dependency_Path_Mapping();
+	}
+
+	$file = $dependency_path_mapping->dependency_src_to_fs_path( $url );
+
+	$mtime = false;
+	if ( file_exists( $file ) ) {
+		$mtime = filemtime( $file );
+	}
+
+	if ( ! $mtime ) {
+		return $url;
+	}
+
+	if ( false === strpos( $url, '?' ) ) {
+		$q = '';
+	} else {
+		list( $url, $q ) = explode( '?', $url, 2 );
+		if ( strlen( $q ) ) {
+			$q = '&amp;' . $q;
+		}
+	}
+
+	return "$url?m={$mtime}{$q}";
+}
diff --git a/projects/plugins/boost/app/features/optimizations/minify/service.php b/projects/plugins/boost/app/features/optimizations/minify/service.php
new file mode 100644
index 0000000000000..75774286da462
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/minify/service.php
@@ -0,0 +1,337 @@
+<?php
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Config;
+use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Dependency_Path_Mapping;
+use tubalmartin\CssMin;
+
+function jetpack_boost_page_optimize_types() {
+	return array(
+		'css' => 'text/css',
+		'js'  => 'application/javascript',
+	);
+}
+
+function jetpack_boost_page_optimize_service_request() {
+	$cache_dir = Config::get_cache_dir_path();
+	$use_cache = ! empty( $cache_dir );
+	if ( $use_cache && ! is_dir( $cache_dir ) && ! mkdir( $cache_dir, 0775, true ) ) {
+		$use_cache = false;
+		error_log(
+			sprintf(
+			/* translators: a filesystem path to a directory */
+				__( "Disabling page-optimize cache. Unable to create cache directory '%s'.", jetpack_boost_page_optimize_get_text_domain() ),
+				$cache_dir
+			)
+		);
+	}
+
+	if ( $use_cache && ( ! is_dir( $cache_dir ) || ! is_writable( $cache_dir ) || ! is_executable( $cache_dir ) ) ) {
+		$use_cache = false;
+		error_log(
+			sprintf(
+			/* translators: a filesystem path to a directory */
+				__( "Disabling page-optimize cache. Unable to write to cache directory '%s'.", jetpack_boost_page_optimize_get_text_domain() ),
+				$cache_dir
+			)
+		);
+	}
+
+	if ( $use_cache ) {
+		$request_uri_hash = md5( $_SERVER['REQUEST_URI'] );
+		$cache_file       = $cache_dir . "/page-optimize-cache-$request_uri_hash";
+		$cache_file_meta  = $cache_dir . "/page-optimize-cache-meta-$request_uri_hash";
+
+		if ( file_exists( $cache_file ) ) {
+			if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+				if ( strtotime( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) < filemtime( $cache_file ) ) {
+					header( 'HTTP/1.1 304 Not Modified' );
+					exit;
+				}
+			}
+
+			if ( file_exists( $cache_file_meta ) ) {
+				$meta = json_decode( file_get_contents( $cache_file_meta ) );
+				if ( null !== $meta && isset( $meta->headers ) ) {
+					foreach ( $meta->headers as $header ) {
+						header( $header );
+					}
+				}
+			}
+
+			$etag = '"' . md5( file_get_contents( $cache_file ) ) . '"';
+
+			header( 'X-Page-Optimize: cached' );
+			header( 'Cache-Control: max-age=' . 31536000 );
+			header( 'ETag: ' . $etag );
+
+			echo file_get_contents( $cache_file ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to trust this unfortunately.
+			die();
+		}
+	}
+
+	$output  = jetpack_boost_page_optimize_build_output();
+	$content = $output['content'];
+	$headers = $output['headers'];
+
+	foreach ( $headers as $header ) {
+		header( $header );
+	}
+	header( 'X-Page-Optimize: uncached' );
+	header( 'Cache-Control: max-age=' . 31536000 );
+	header( 'ETag: "' . md5( $content ) . '"' );
+
+	echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to trust this unfortunately.
+
+	if ( $use_cache ) {
+		file_put_contents( $cache_file, $content );
+		file_put_contents( $cache_file_meta, json_encode( array( 'headers' => $headers ) ) );
+	}
+
+	die();
+}
+
+function jetpack_boost_page_optimize_build_output() {
+	$jetpack_boost_page_optimize_types = jetpack_boost_page_optimize_types();
+
+	/* Config */
+	$concat_max_files = 150;
+	$concat_unique    = true;
+
+	/* Main() */
+	if ( ! in_array( $_SERVER['REQUEST_METHOD'], array( 'GET', 'HEAD' ) ) ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	// /_static/??/foo/bar.css,/foo1/bar/baz.css?m=293847g
+	// or
+	// /_static/??-eJzTT8vP109KLNJLLi7W0QdyDEE8IK4CiVjn2hpZGluYmKcDABRMDPM=
+	$args = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_QUERY );
+	if ( ! $args || false === strpos( $args, '?' ) ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	$args = substr( $args, strpos( $args, '?' ) + 1 );
+
+	// /foo/bar.css,/foo1/bar/baz.css?m=293847g
+	// or
+	// -eJzTT8vP109KLNJLLi7W0QdyDEE8IK4CiVjn2hpZGluYmKcDABRMDPM=
+	if ( '-' == $args[0] ) {
+		$args = @gzuncompress( base64_decode( substr( $args, 1 ) ) );
+
+		// Invalid data, abort!
+		if ( false === $args ) {
+			jetpack_boost_page_optimize_status_exit( 400 );
+		}
+	}
+
+	// /foo/bar.css,/foo1/bar/baz.css?m=293847g
+	$version_string_pos = strpos( $args, '?' );
+	if ( false !== $version_string_pos ) {
+		$args = substr( $args, 0, $version_string_pos );
+	}
+
+	// /foo/bar.css,/foo1/bar/baz.css
+	$args = explode( ',', $args );
+	if ( ! $args ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	// array( '/foo/bar.css', '/foo1/bar/baz.css' )
+	if ( 0 == count( $args ) || count( $args ) > $concat_max_files ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	// If we're in a subdirectory context, use that as the root.
+	// We can't assume that the root serves the same content as the subdir.
+	$subdir_path_prefix = '';
+	$request_path       = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+	$_static_index      = strpos( $request_path, '/_static/' );
+	if ( $_static_index > 0 ) {
+		$subdir_path_prefix = substr( $request_path, 0, $_static_index );
+	}
+	unset( $request_path, $_static_index );
+
+	$last_modified = 0;
+	$pre_output    = '';
+	$output        = '';
+
+	$should_minify_css = Config::is_css_minify_enabled();
+
+	if ( $should_minify_css ) {
+		$css_minify = new CssMin\Minifier();
+	}
+
+	foreach ( $args as $uri ) {
+		$fullpath = jetpack_boost_page_optimize_get_path( $uri );
+
+		if ( ! file_exists( $fullpath ) ) {
+			jetpack_boost_page_optimize_status_exit( 404 );
+		}
+
+		$mime_type = jetpack_boost_page_optimize_get_mime_type( $fullpath );
+		if ( ! in_array( $mime_type, $jetpack_boost_page_optimize_types ) ) {
+			jetpack_boost_page_optimize_status_exit( 400 );
+		}
+
+		if ( $concat_unique ) {
+			if ( ! isset( $last_mime_type ) ) {
+				$last_mime_type = $mime_type;
+			}
+
+			if ( $last_mime_type != $mime_type ) {
+				jetpack_boost_page_optimize_status_exit( 400 );
+			}
+		}
+
+		$stat = stat( $fullpath );
+		if ( false === $stat ) {
+			jetpack_boost_page_optimize_status_exit( 500 );
+		}
+
+		if ( $stat['mtime'] > $last_modified ) {
+			$last_modified = $stat['mtime'];
+		}
+
+		$buf = file_get_contents( $fullpath );
+		if ( false === $buf ) {
+			jetpack_boost_page_optimize_status_exit( 500 );
+		}
+
+		if ( 'text/css' == $mime_type ) {
+			$dirpath = '/' . ltrim( $subdir_path_prefix . dirname( $uri ), '/' );
+
+			// url(relative/path/to/file) -> url(/absolute/and/not/relative/path/to/file)
+			$buf = jetpack_boost_page_optimize_relative_path_replace( $buf, $dirpath );
+
+			// AlphaImageLoader(...src='relative/path/to/file'...) -> AlphaImageLoader(...src='/absolute/path/to/file'...)
+			$buf = preg_replace(
+				'/(Microsoft.AlphaImageLoader\s*\([^\)]*src=(?:\'|")?)([^\/\'"\s\)](?:(?<!http:|https:).)*)\)/isU',
+				'$1' . ( $dirpath == '/' ? '/' : $dirpath . '/' ) . '$2)',
+				$buf
+			);
+
+			// The @charset rules must be on top of the output
+			if ( 0 === strpos( $buf, '@charset' ) ) {
+				preg_replace_callback(
+					'/(?P<charset_rule>@charset\s+[\'"][^\'"]+[\'"];)/i',
+					function ( $match ) {
+						global $pre_output;
+
+						if ( 0 === strpos( $pre_output, '@charset' ) ) {
+							return '';
+						}
+
+						$pre_output = $match[0] . "\n" . $pre_output;
+
+						return '';
+					},
+					$buf
+				);
+			}
+
+			// Move the @import rules on top of the concatenated output.
+			// Only @charset rule are allowed before them.
+			if ( false !== strpos( $buf, '@import' ) ) {
+				$buf = preg_replace_callback(
+					'/(?P<pre_path>@import\s+(?:url\s*\()?[\'"\s]*)(?P<path>[^\'"\s](?:https?:\/\/.+\/?)?.+?)(?P<post_path>[\'"\s\)]*;)/i',
+					function ( $match ) use ( $dirpath ) {
+						global $pre_output;
+
+						if ( 0 !== strpos( $match['path'], 'http' ) && '/' != $match['path'][0] ) {
+							$pre_output .= $match['pre_path'] . ( $dirpath == '/' ? '/' : $dirpath . '/' ) .
+											$match['path'] . $match['post_path'] . "\n";
+						} else {
+							$pre_output .= $match[0] . "\n";
+						}
+
+						return '';
+					},
+					$buf
+				);
+			}
+
+			if ( $should_minify_css ) {
+				$buf = $css_minify->run( $buf );
+			}
+		}
+
+		if ( $jetpack_boost_page_optimize_types['js'] === $mime_type ) {
+			$output .= "$buf;\n";
+		} else {
+			$output .= "$buf";
+		}
+	}
+
+	$headers = array(
+		'Last-Modified: ' . gmdate( 'D, d M Y H:i:s', $last_modified ) . ' GMT',
+		'Content-Length: ' . ( strlen( $pre_output ) + strlen( $output ) ),
+		"Content-Type: $mime_type",
+	);
+
+	return array(
+		'headers' => $headers,
+		'content' => $pre_output . $output,
+	);
+}
+
+function jetpack_boost_page_optimize_status_exit( $status ) {
+	http_response_code( $status );
+	exit;
+}
+
+function jetpack_boost_page_optimize_get_mime_type( $file ) {
+	$jetpack_boost_page_optimize_types = jetpack_boost_page_optimize_types();
+
+	$lastdot_pos = strrpos( $file, '.' );
+	if ( false === $lastdot_pos ) {
+		return false;
+	}
+
+	$ext = substr( $file, $lastdot_pos + 1 );
+
+	return isset( $jetpack_boost_page_optimize_types[ $ext ] ) ? $jetpack_boost_page_optimize_types[ $ext ] : false;
+}
+
+function jetpack_boost_page_optimize_relative_path_replace( $buf, $dirpath ) {
+	// url(relative/path/to/file) -> url(/absolute/and/not/relative/path/to/file)
+	$buf = preg_replace(
+		'/(:?\s*url\s*\()\s*(?:\'|")?\s*([^\/\'"\s\)](?:(?<!data:|http:|https:|[\(\'"]#|%23).)*)[\'"\s]*\)/isU',
+		'$1' . ( $dirpath == '/' ? '/' : $dirpath . '/' ) . '$2)',
+		$buf
+	);
+
+	return $buf;
+}
+
+function jetpack_boost_page_optimize_get_path( $uri ) {
+	static $dependency_path_mapping;
+
+	if ( ! strlen( $uri ) ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	if ( false !== strpos( $uri, '..' ) || false !== strpos( $uri, "\0" ) ) {
+		jetpack_boost_page_optimize_status_exit( 400 );
+	}
+
+	if ( defined( 'PAGE_OPTIMIZE_CONCAT_BASE_DIR' ) ) {
+		$path = realpath( PAGE_OPTIMIZE_CONCAT_BASE_DIR . "/$uri" );
+
+		if ( false === $path ) {
+			$path = realpath( Config::get_abspath() . "/$uri" );
+		}
+	} else {
+		if ( empty( $dependency_path_mapping ) ) {
+			$dependency_path_mapping = new Dependency_Path_Mapping();
+		}
+		$path = $dependency_path_mapping->uri_path_to_fs_path( $uri );
+	}
+
+	if ( false === $path ) {
+		jetpack_boost_page_optimize_status_exit( 404 );
+	}
+
+	return $path;
+}
+
+jetpack_boost_page_optimize_service_request();
diff --git a/projects/plugins/boost/changelog/add-boost-minification b/projects/plugins/boost/changelog/add-boost-minification
new file mode 100644
index 0000000000000..e7d6c76f0ed57
--- /dev/null
+++ b/projects/plugins/boost/changelog/add-boost-minification
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add page optimizer functionality.
diff --git a/projects/plugins/boost/changelog/add-boost-minification#2 b/projects/plugins/boost/changelog/add-boost-minification#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/add-boost-minification#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index d7902407ecdbf..a5808cd664555 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -3,7 +3,7 @@
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"type": "library",
 	"license": "GPL-2.0-or-later",
-	"version": "1.7.1-alpha",
+	"version": "1.8.0-alpha",
 	"authors": [
 		{
 			"name": "Automattic, Inc.",
@@ -25,7 +25,8 @@
 		"automattic/jetpack-my-jetpack": "@dev",
 		"automattic/jetpack-plugin-deactivation": "@dev",
 		"automattic/jetpack-plugins-installer": "@dev",
-		"tedivm/jshrink": "1.4.0"
+		"tedivm/jshrink": "1.4.0",
+		"tubalmartin/cssmin": "^4.1"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "@dev",
@@ -71,7 +72,7 @@
 		"platform": {
 			"ext-intl": "0.0.0"
 		},
-		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ1_7_1_alpha",
+		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ1_8_0_alpha",
 		"allow-plugins": {
 			"roots/wordpress-core-installer": true,
 			"automattic/jetpack-autoloader": true,
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index c4d58e98650ed..ab5623968ea89 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4bb747a13beccc4926a371351e628a6",
+    "content-hash": "dbf8a68a4f510020adcc7a807448c5a6",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -1200,6 +1200,63 @@
                 }
             ],
             "time": "2020-11-30T18:10:21+00:00"
+        },
+        {
+            "name": "tubalmartin/cssmin",
+            "version": "v4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "cogpowered/finediff": "0.3.*",
+                "phpunit/phpunit": "4.8.*"
+            },
+            "bin": [
+                "cssmin"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "tubalmartin\\CssMin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Túbal Martín",
+                    "homepage": "http://tubalmartin.me/"
+                }
+            ],
+            "description": "A PHP port of the YUI CSS compressor",
+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
+            "keywords": [
+                "compress",
+                "compressor",
+                "css",
+                "cssmin",
+                "minify",
+                "yui"
+            ],
+            "support": {
+                "issues": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port/issues",
+                "source": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port"
+            },
+            "time": "2018-01-15T15:26:51+00:00"
         }
     ],
     "packages-dev": [
diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php
index 09775cc72bfc9..985bdde1f580b 100644
--- a/projects/plugins/boost/jetpack-boost.php
+++ b/projects/plugins/boost/jetpack-boost.php
@@ -9,7 +9,7 @@
  * Plugin Name:       Jetpack Boost
  * Plugin URI:        https://jetpack.com/boost
  * Description:       Boost your WordPress site's performance, from the creators of Jetpack
- * Version: 1.7.1-alpha
+ * Version: 1.8.0-alpha
  * Author:            Automattic - Jetpack Site Speed team
  * Author URI:        https://jetpack.com/boost/
  * License:           GPL-2.0+
@@ -29,7 +29,7 @@
 	die;
 }
 
-define( 'JETPACK_BOOST_VERSION', '1.7.1-alpha' );
+define( 'JETPACK_BOOST_VERSION', '1.8.0-alpha' );
 define( 'JETPACK_BOOST_SLUG', 'jetpack-boost' );
 
 if ( ! defined( 'JETPACK_BOOST_CLIENT_NAME' ) ) {
diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
index bba28aa6b5d79..61c0182d93864 100644
--- a/projects/plugins/boost/package.json
+++ b/projects/plugins/boost/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-boost",
-	"version": "1.7.1-alpha",
+	"version": "1.8.0-alpha",
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"directories": {
 		"test": "tests"

From f5ae7f78695327a3daf5eab804389962560a7994 Mon Sep 17 00:00:00 2001
From: Peter Petrov <peter.petrov89@gmail.com>
Date: Fri, 17 Feb 2023 01:31:53 +0200
Subject: [PATCH 13/51] [Boost] Fix features/optimizations initialization
 (#28888)

* Update feature/optimization initialization to respect setup_trigger

* changelog

* Refactor feature/optimization initialization

* Update optimizations setup to be properly registered

* Update Optimizations instance to handle feature endpoint initialization

This will update features to no longer take care of rest api
initialization themselves.

* Simplify setup process, to avoid unnecessary hooking

* Fix Setup not collecting instances

* Fix optimizations initializing before plugins_loaded
---
 .../plugins/boost/app/contracts/Has_Setup.php |  8 ------
 .../app/features/image-guide/Image_Guide.php  |  4 ---
 .../features/optimizations/Optimizations.php  | 26 ++++++++++---------
 .../optimizations/cloud-css/Cloud_CSS.php     |  9 -------
 .../critical-css/Critical_CSS.php             | 10 -------
 .../lazy-images/class-lazy-images.php         |  4 ---
 .../class-render-blocking-js.php              |  5 ----
 .../features/setup-prompt/Setup_Prompt.php    |  7 -----
 projects/plugins/boost/app/lib/Setup.php      |  3 +--
 .../boost/changelog/fix-boost-features-init   |  4 +++
 10 files changed, 19 insertions(+), 61 deletions(-)
 create mode 100644 projects/plugins/boost/changelog/fix-boost-features-init

diff --git a/projects/plugins/boost/app/contracts/Has_Setup.php b/projects/plugins/boost/app/contracts/Has_Setup.php
index 948f0227dceeb..cb6cc7af3d40a 100644
--- a/projects/plugins/boost/app/contracts/Has_Setup.php
+++ b/projects/plugins/boost/app/contracts/Has_Setup.php
@@ -18,12 +18,4 @@ interface Has_Setup {
 	 * @return mixed
 	 */
 	public function setup();
-
-	/**
-	 * Return a string - which action should the setup method be run on?
-	 * Typically, this should return `init` or `admin_init`
-	 *
-	 * @return string
-	 */
-	public function setup_trigger();
 }
diff --git a/projects/plugins/boost/app/features/image-guide/Image_Guide.php b/projects/plugins/boost/app/features/image-guide/Image_Guide.php
index 27518e0af107b..b10d4047d35af 100644
--- a/projects/plugins/boost/app/features/image-guide/Image_Guide.php
+++ b/projects/plugins/boost/app/features/image-guide/Image_Guide.php
@@ -46,10 +46,6 @@ public static function get_slug() {
 		return 'image-guide';
 	}
 
-	public function setup_trigger() {
-		return 'init';
-	}
-
 	public function enqueue_assets() {
 		wp_enqueue_script( 'jetpack-boost-guide', plugins_url( 'dist/guide.js', __FILE__ ), array(), JETPACK_BOOST_VERSION, true );
 		wp_enqueue_style( 'jetpack-boost-guide', plugins_url( 'dist/guide.css', __FILE__ ), array(), JETPACK_BOOST_VERSION, 'screen' );
diff --git a/projects/plugins/boost/app/features/optimizations/Optimizations.php b/projects/plugins/boost/app/features/optimizations/Optimizations.php
index 11c3c420256b7..540678f1e4ac9 100644
--- a/projects/plugins/boost/app/features/optimizations/Optimizations.php
+++ b/projects/plugins/boost/app/features/optimizations/Optimizations.php
@@ -10,7 +10,9 @@
 use Automattic\Jetpack_Boost\Features\Optimizations\Minify\Minify;
 use Automattic\Jetpack_Boost\Features\Optimizations\Render_Blocking_JS\Render_Blocking_JS;
 use Automattic\Jetpack_Boost\Lib\Premium_Features;
+use Automattic\Jetpack_Boost\Lib\Setup;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Has_Endpoints;
+use Automattic\Jetpack_Boost\REST_API\REST_API;
 
 class Optimizations implements Has_Setup {
 
@@ -95,12 +97,11 @@ public function register_endpoints( $feature ) {
 		if ( empty( $feature->get_endpoints() ) ) {
 			return false;
 		}
+
+		REST_API::register( $feature->get_endpoints() );
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function setup() {
+	public function init_features() {
 
 		foreach ( $this->available_modules() as $slug => $optimization ) {
 
@@ -108,7 +109,8 @@ public function setup() {
 				continue;
 			}
 
-			$optimization->feature->setup();
+			Setup::add( $optimization->feature );
+
 			$this->register_endpoints( $optimization->feature );
 
 			do_action( "jetpack_boost_{$slug}_initialized", $this );
@@ -116,6 +118,13 @@ public function setup() {
 		}
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function setup() {
+		add_action( 'plugins_loaded', array( $this, 'init_features' ) );
+	}
+
 	/**
 	 * Get the lists of modules explicitly disabled from the 'jb-disable-modules' query string.
 	 * The parameter is a comma separated value list of module slug.
@@ -135,11 +144,4 @@ public function get_disabled_modules() {
 		return array();
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function setup_trigger() {
-		return 'plugins_loaded';
-	}
-
 }
diff --git a/projects/plugins/boost/app/features/optimizations/cloud-css/Cloud_CSS.php b/projects/plugins/boost/app/features/optimizations/cloud-css/Cloud_CSS.php
index a6c926bff8dfa..e02ffe481f35b 100644
--- a/projects/plugins/boost/app/features/optimizations/cloud-css/Cloud_CSS.php
+++ b/projects/plugins/boost/app/features/optimizations/cloud-css/Cloud_CSS.php
@@ -13,7 +13,6 @@
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Cloud_CSS_Status;
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Request_Cloud_CSS;
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Update_Cloud_CSS;
-use Automattic\Jetpack_Boost\REST_API\REST_API;
 
 class Cloud_CSS implements Feature, Has_Endpoints {
 
@@ -42,7 +41,6 @@ public function setup() {
 		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_critical_css_constants' ) );
 		add_filter( 'jetpack_boost_total_problem_count', array( $this, 'update_total_problem_count' ) );
 
-		REST_API::register( $this->get_endpoints() );
 		Critical_CSS_Invalidator::init();
 		Cloud_CSS_Cron::init();
 
@@ -61,13 +59,6 @@ public function get_endpoints() {
 		);
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function setup_trigger() {
-		return 'init';
-	}
-
 	public function display_critical_css() {
 
 		// Don't look for Critical CSS in the dashboard.
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
index fade29c1da903..656abf7a163ea 100644
--- a/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
@@ -19,7 +19,6 @@
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Generator_Success;
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Recommendations_Dismiss;
 use Automattic\Jetpack_Boost\REST_API\Endpoints\Recommendations_Reset;
-use Automattic\Jetpack_Boost\REST_API\REST_API;
 
 class Critical_CSS implements Feature, Has_Endpoints {
 
@@ -68,8 +67,6 @@ public function setup() {
 
 		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_critical_css_constants' ) );
 
-		REST_API::register( $this->get_endpoints() );
-
 		// Admin Notices
 		Regenerate_Admin_Notice::init();
 
@@ -167,11 +164,4 @@ public function get_endpoints() {
 			Generator_Error::class,
 		);
 	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setup_trigger() {
-		return 'init';
-	}
 }
diff --git a/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php b/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php
index 905d6501e83a4..ce2a5a72aca98 100644
--- a/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php
+++ b/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php
@@ -14,8 +14,4 @@ public function setup() {
 	public static function get_slug() {
 		return 'lazy-images';
 	}
-
-	public function setup_trigger() {
-		return 'init';
-	}
 }
diff --git a/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php b/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
index 9719643b9d825..3862a3b599b91 100644
--- a/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
+++ b/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
@@ -309,9 +309,4 @@ public function is_opened_script( $buffer ) {
 	public static function get_slug() {
 		return 'render-blocking-js';
 	}
-
-	public function setup_trigger() {
-		return 'init';
-	}
-
 }
diff --git a/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php b/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php
index 51d5b32c4214c..f8dd936871816 100644
--- a/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php
+++ b/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php
@@ -35,13 +35,6 @@ public function enqueue_scripts() {
 		wp_enqueue_style( 'jetpack-boost-admin-banner', plugins_url( '../../assets/dist/admin-banner.css', __FILE__ ), array(), JETPACK_BOOST_VERSION );
 	}
 
-	/**
-	 * Get the action hoot that defines when to setup the prompt.
-	 */
-	public function setup_trigger() {
-		return 'admin_init';
-	}
-
 	public function connection_prompt() {
 		include __DIR__ . '/_inc/banner.php';
 	}
diff --git a/projects/plugins/boost/app/lib/Setup.php b/projects/plugins/boost/app/lib/Setup.php
index 7e2d3098ceb1b..b5b4f1786ad95 100644
--- a/projects/plugins/boost/app/lib/Setup.php
+++ b/projects/plugins/boost/app/lib/Setup.php
@@ -27,10 +27,9 @@ class Setup {
 	 * @return void
 	 */
 	public static function add( Has_Setup $instance ) {
-		$action = $instance->setup_trigger();
+		$instance->setup();
 
 		self::$instances[] = $instance;
-		add_action( $action, array( $instance, 'setup' ) );
 	}
 
 	public function get_instances() {
diff --git a/projects/plugins/boost/changelog/fix-boost-features-init b/projects/plugins/boost/changelog/fix-boost-features-init
new file mode 100644
index 0000000000000..ab8f17dd64b5b
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-boost-features-init
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix feature/optimization initialization happening always on plugins_loaded, due to setup_trigger not getting respected.

From 6ec8977c3c1ea59c40d24331814521eaa7c2d8fb Mon Sep 17 00:00:00 2001
From: ouikhuan <iverson0217@gmail.com>
Date: Fri, 17 Feb 2023 08:46:27 +0800
Subject: [PATCH 14/51] Update initial screen copy for migration plugin
 (#28993)

* Update initial screen content with new copy

* changelog

* Make title consistent between screens
---
 .../changelog/update-initial-screen-content   |  4 +++
 .../migration/src/class-wpcom-migration.php   |  2 +-
 .../src/js/components/migration/index.tsx     | 25 ++++++++-----------
 .../src/js/components/migration/loading.tsx   |  2 +-
 .../components/migration/styles.module.scss   | 21 +++-------------
 5 files changed, 21 insertions(+), 33 deletions(-)
 create mode 100644 projects/plugins/migration/changelog/update-initial-screen-content

diff --git a/projects/plugins/migration/changelog/update-initial-screen-content b/projects/plugins/migration/changelog/update-initial-screen-content
new file mode 100644
index 0000000000000..454f56a9a87f6
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-initial-screen-content
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Change initial screen wording with new copy
diff --git a/projects/plugins/migration/src/class-wpcom-migration.php b/projects/plugins/migration/src/class-wpcom-migration.php
index 8f3e74c4ba7d3..08322c74cb232 100644
--- a/projects/plugins/migration/src/class-wpcom-migration.php
+++ b/projects/plugins/migration/src/class-wpcom-migration.php
@@ -72,7 +72,7 @@ public function admin_menu_hook_callback() {
 			'manage_options',
 			'wpcom-migration',
 			array( $this, 'plugin_settings_page' ),
-			'dashicons-admin-generic',
+			'dashicons-migrate',
 			79 // right before the Settings menu (80)
 		);
 
diff --git a/projects/plugins/migration/src/js/components/migration/index.tsx b/projects/plugins/migration/src/js/components/migration/index.tsx
index f567b8f13ea92..1a95bfc6cd81b 100644
--- a/projects/plugins/migration/src/js/components/migration/index.tsx
+++ b/projects/plugins/migration/src/js/components/migration/index.tsx
@@ -84,35 +84,32 @@ export function Migration( props: Props ) {
 		<ConnectScreenLayout
 			className={ 'wordpress-branding' }
 			logo={ <WordPressLogo /> }
-			title={ __( 'Move to WordPress.com', 'wpcom-migration' ) }
+			title={ __( "Let's start moving your site over", 'wpcom-migration' ) }
 			images={ [ migrationImage1 ] }
 		>
 			<p>
 				{ __(
-					'Whether the result of poor performance, lack of support or limited bandwidth, ' +
-						"migrating your site to WordPress.com shouldn't be hard. That's our job! " +
-						'Migrate your site now and get managed by experienced, dedicated and specailists on ' +
-						'WordPress professionals.',
+					"You're a few steps away from upgrading your site to the speed and power of WordPress.com. " +
+						"Here's how it works: ",
 					'wpcom-migration'
 				) }
 			</p>
-			<ul>
-				<li className={ 'bullet-1' }>
+			<ol className={ 'migration-listing' }>
+				<li>{ __( 'Click Get started.', 'wpcom-migration' ) }</li>
+				<li>
 					{ __(
-						'No need to worry about budget - this is a free migration service offically provided by WordPress.com.',
+						"Choose what you'd like to move over from your old site - whether that's just the basics, or all of your content, plugins, and settings.",
 						'wpcom-migration'
 					) }
 				</li>
-				<li className={ 'bullet-2' }>
+				<li>
 					{ __(
-						'This is seamless and automated process. It takes one click to back-up and migrate your entire site to WordPress.com',
+						"Sit back, and let the plugin do the work. We'll email you when your migration's ready.",
 						'wpcom-migration'
 					) }
 				</li>
-				<li className={ 'bullet-3' }>
-					{ __( 'Move to WordPress.com provides low to zero downtime.', 'wpcom-migration' ) }
-				</li>
-			</ul>
+				<li>{ __( 'Welcome to WordPress.com!', 'wpcom-migration' ) }</li>
+			</ol>
 			<div className={ 'action-buttons' }>
 				<div className={ 'tos' }>{ ToS }</div>
 				<Button
diff --git a/projects/plugins/migration/src/js/components/migration/loading.tsx b/projects/plugins/migration/src/js/components/migration/loading.tsx
index a9b686f7afba7..9ebcecb8e3422 100644
--- a/projects/plugins/migration/src/js/components/migration/loading.tsx
+++ b/projects/plugins/migration/src/js/components/migration/loading.tsx
@@ -15,7 +15,7 @@ export function MigrationLoading() {
 		<ConnectScreenLayout
 			className={ 'wordpress-branding' }
 			logo={ <WordPressLogo /> }
-			title={ __( 'Move to WordPress.com', 'wpcom-migration' ) }
+			title={ __( "Let's start moving your site over", 'wpcom-migration' ) }
 			images={ [ migrationImage1 ] }
 		>
 			<p>{ __( 'Loading…', 'wpcom-migration' ) }</p>
diff --git a/projects/plugins/migration/src/js/components/migration/styles.module.scss b/projects/plugins/migration/src/js/components/migration/styles.module.scss
index 76c7c937308c3..672210e72cf2e 100644
--- a/projects/plugins/migration/src/js/components/migration/styles.module.scss
+++ b/projects/plugins/migration/src/js/components/migration/styles.module.scss
@@ -1,22 +1,9 @@
 :global {
 	#wpcom-migration-root {
-		.jp-connection__connect-screen-layout ul li {
-			background-size: 27px 27px;
-			background-repeat: no-repeat;
-		  	padding-left: 36px;
-		  	min-height: 27px;
-
-			&.bullet-1 {
-				background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA3CAYAAABHGbl4AAAR2UlEQVR4Xu2aa3Bb5Z3GNf2wne3M7jDdZbbM9GLYZYd2u0x2S8sCS+sdKENLu7CwwLQF1lxLuRrii2zLli3f77fEd1u25bvku2XZlmRZsnWxLFvxJXHiOFFuEKCUAGUvX5hnn/eco0SW7IQAZfqh78xv/uecSMr7O8//fXWUiUr1OY/z3lDcO8vbCe8sna787dKp4XeWTgbfDZwMRfKeP+R4b+nE8O+WTlS+Gdh+4Lx3My76c/4oxtml4/HnOMm3A6HQef9JvCURUupJvL0YvhbmRNQ5X0PhtwMn9O/4t/ZFf/4XPkL+7YRTvPunKXGGkzvDCZ9d3MY5VsGbi4JthUvn5/2Xh+LB8/6thOi/7w8+Nr2b8cd8J0Nbvm0c50S3yQken5Q4jtDicZwK49vCaV+4Xi3HQiHvZkL03/+5jyDXwppn27Hm3cI6OezZwhGy6d3GJutRr+AYjnFSW96j2PIcleoxcUy2PYJjCuFzmRMC725sksP6kCMYFz2fz2XMzx+P97uPX1ji3Q9QYpkTCZCgwH0UqwLPJtZ4vi6xicNumQ3PEd4AmU03qyDimnQ9DP/sKN8jwc+Qzj0SoSOetQei5/WZhsN9XOtwb8G5sIV53u0FSrglDsPDv9jn3sCigl8hsECUurKwjuD8BlnHIbJ6GdYVLp2vYcMl6gbW+Dnr3sPa6Pl9qmGh1NT8UVjmj2DKtQnr/CZsriOw83xu/jBZh5O4OAHBvMQqPFF4ed1HFp2H4HddIhCJU2ZZOl9Vrq9h2bnKa2H45/Orn03OOH9Ma3IdxSCFhp2HMSqxgXHXBsysk3PrsDjXMe1cI4dgVbC5gph1yswRp3OFdYU1CJfEMhaIe1dW4HFFEXmNx15+vnc++Onk9I5NbafjCARdsxvotR9G7+wq+kg/Mc0ekhh0HMLQbBAjduJYxrgjgDEyMSvww6IwZSeikmkyM7uEGQerYwm22UUJO5mV8Es4wpWvm+XrHHyPOBbMiXPH8tXJ1Tg2EhpmD6PRvoFmSrXY19FqX4WedFCg3b4Cg3UZ3dYAum0B9LD22pYxwGMJ6yJMNp/EiIRXYpTHo3avDM8neD5uF3ilOslq5nVRJ1ktdg9hlY5F9fEGeRV8mGadtnk+2YZSaAnGlc0cDlVYN1BhXUWV9RCqyQFy0BpE3cwKGinVaF1CE2me8aOFIm0zi9Bb/Wi3emCY9sEww2p1o2vGje6ZBfSw9rH2zcxL9JMBng9YF2AkJr52iOdDPB62LWDEKpiXGFXORwW2MG6MkXHrwoVhiyMu2iNmZE+vD+dMrSGX5FtWUWA5hMKpZRRZAighZaTcsoQKyyKqLT5UTflQy1o75cGBKTfqLQuoIw2kcWoezawtUy7iROvUHNqIflrgQAePOwU8N7AaLA50sfZE0SvhQN+0EwN8Xz9fP8DjcDXOuBzRHjtGsmUtIcW8hlTzIajNQaSbV5BBMicCyDIHoDX7oZtYRO6ED/kTXhRMeFA44SYLKDIvoNg8jzKzC5VmJ6rMcxLVEg7UTM5K1E7acXDShjrWetJktqKJ54Jmsw0tkwoWG/SkVap2iXbSYSaiWmblOmXnTZmFYdy2d0u+MLoWenlsFS+PHcIrYytIHAvgNfL62BKSxvxIHltEypiXuJExuoD0sQVoxlzIJNoxJ7TjTujGHNCNzyJ/zC5RwOPCcRuKx60oUSgfn0HF+LREpcQUqiemJQ6QWoUD5mnUs9axNpjl2mieuUjTpJU3YwatvDkt5plQtI80Hh9eS3hiKIiEwRU8ORTA0+SZIT+eI88P+ogXLwx58OKQW+LVwXkkDs4hcciB18jrww7sH55F8rAdacM2qIesSB+eIdPIGLYgk2glJpE9Molc1rwRwQTyhydQSIpGxlE0Ktdi1pIxwlrKWjZqRvmYGRWkUmIS1aRqfBK14xaJg2OWhGgv1UMDq6GHjYfwqDFIlvDLAT9+aVzEr4w+PG704gmjG/9lXMCTRhcSTHN4ivVpkwPPmWbxvNFGrHiRvGSy4mXyqmkarwxO47VBC14fNGO/aQL7h8aRMiiTJjGGDJI+xDo0iszBEWSxZkuMIIfohkd5E0aQJ9VRFAhGxlBIihSKR8dRyptROjoR3CF1tyEY/5PeFfy0dxn39QXwc0GvH/f3evFAr4e48WCfGw/1zePhPhce6ZvDowMO/GLAxhtgw2MDVjzRN43HB6aQQJ4csOCZfgue65/Es0Yzfm2c4A2YwG9Mo5QfwUsSw3hlYIQ3YBiJ5DXyunEISaZBJJuGKD+IVJMJatY0XksflNEMDiFzSCZraJgdIJPDYx1vgMZojL8odnv3sv4OwzLuNASIHz80LOKHXV5WL+INHtxtmMddBifu6XLi3q45/NTgwH1ddtzXbcWzIy689eFH+Pjjjz8X3v3w99BM8CYM9OHFgX7SxxvQj1eM/XiNx4nGPt6AfuwnSSbBAFKMA0gVmIxcAqaqi2I365dD+/QB/FO7nyziexJefL/djVs6FvAD8i8dTtzWPovbO+34104b7iQ/6rTi0Pl3Yyb3WVk+cwZP9vTi6Z5uPNXbjWfIs+S5vm48T37T38VqwAusL/X34OWBbsr3IlFg6rkgSd3YFNx3Q0sQN7QsI651Cde3LOLvW324odVDFnAT+XarE99pm8M/6B24WW/HPr2NTOOfycqbn7/Yxvnz+M/uLjzSbcCj5BfdnXiMPN5jwK96OvFEbwdpR0JPO8U7KN5B8Q78ureTdOHZbv0+lapuOfErDcv4i/oA/rxhifjxlw1e/FWDG3/TsICvNrjw141OfK3RQWZxXbMN32yy4uvNU4gjy2/8NmZie1Hg8kJjd8Vcj2b1zTdwb7seP+nQ4+cd7fhZpx73k/9QeNDQhoe69Hi4qxWPsD7a3SrxWLcej3e3Ub41UaU6uFylOhiA6uAS8RMf8UJV52adZ3WROajq7awCG49n8KUGC77cMInFc7uLnXv/9/hxjxmOk2cvXrutwwSd04OJY9v4Wf8g3vjgg5j3CYIUu13fgjvbBM2I17fi39pbcVd7C35M7mlvprSgkeJN+PdOwuP7DU14gDzY2aTnE2/QoaqhWDWlagQ+BbcC5WooVusglKoRTFNaMAnfLmJnKXVrlxl3dE1Q8EPpmv/ceVzT0CVVce2unkHc3W3icazc8hvncHNLE/a1NEp8j9zS2ohb2wRNuKOtgeL1+BHP41nvUrinvQH3djTgvo46bvsVKyFVBcUqmFjFIqFUuYeVUpULrE5WSlXOEpvCDFRVFt6MSXjO7hQ7/f5HuKljEt/tNEuC4etJfBK/rmXg4rkQuq3LSHkj3v+f/93xGX6KXdfYiK83NiCusQ43kL9rqsONzQdxE/kOubmljtIHcAv5QWutxK1ttZSupfQBPoWUrkBVsixTysRKKVbKViylVCnTKmUrllKujHJlbMUyK8WnFCbhOr1T7MyFj9iqI/hmmxmnLlwSu1E/jFf55H/pdR9gX3s/vtps4A3YmZrv3Fl2Qz2+VFeHL9cdZMsfwDX1tVzzNbi2sZbUULoG3yLXN1Xj201VpBrfba6mcCX+sbWKO2MRxYooVcjECilWRLEiJlbExIrmFdiKxUysmGLFTKyYiZUwsZJYMcHa27+D6sAQrmkel+Tmz5xnygaYj5+W/vwUpb7R1s8b0ImNd2J3Ve9ZitUepNwBUktqLlFH6ivxZ3WV+Ep9BYUruMFVULoC3yDfaqzA3zZVQKXKo1QeW1FHsTyK5bEd8yiXz8TyBBTLY2IFTCyfYvkUK6BYAddY4STmTsVOTLD6FuVqhjC6dQZPTfIm1V5qw+71YxQ38Abs/l73mXNsdQpVUaKqii1fzc9irank53DSteV8v6CMlFC4lMKCMgqXEl5T5VAqZ0mBYtkU01Esh6nlcEK5lMtlO+YxtVymlku5PLZjPuXyLHDsIRbJrb02JJjdMdf3Yv4MEyunWCWFKilUSZlqSlWJWi5TQ5FqUlu8kwMKqqzlEIEqi4JaimkppuUay6KYlmLZCwoUy2ZqOZTTMbUciuVYMBu6sth7//1/EtHX92Lu9Bmua0qVkXIKlVOonDLlTKiCMpUCplJJgSpSU0gKZKpFLeTmoQkEVRqmJUExDcUymJhGkcukXBbFsphaFsWyKKalmJapaadhPPJWzMQ+K8Nb21zHbMMSSpWUy7WUUqUUKqVQGWUqBEWUJZWUqSCVuTI1ufxFneZvV2UwrXSKpVMsnWLpPpkMymVQLoNiGRRL51rTkEzKZVIuk+us3IWlN9+PmdynZfYU11ddO9cvxQrZhoVMq4hSxRQsplgJhUqYUJlCOYXK8ymWRymdTEXOiEqVspSoUlMqTUAxNcVSiZpiaQLKpVEujZtImlMmg8lpKJfB1DRsSQ23fg13SY2ZshNklAwz3UFcr5+LmXxcB1+fo2dLt3LNtpAmrtcG1npW7ob5XF/5bMN8iuUzrQJKFTKpQkoVMaEi1mIKFVOomEIlrGWsZTmEYqVaPlIleeNVqUwshWIpFEtRxFIplUqpVI8CWzKVcqlMTk05NdecmnLpTC6dgumcbPokoVwG5TIopxnE19pinw2v1fNmaDu4ZtsI5bKbKdpIUYrp6ijIbV5HsdxKmTyK5ZMCCuVTrIAUUqaQMkVsvSLKlAiy5VqqjZd/t6QsXZClBBGCKZRLoVwKxVIolrIgIwkqcqlMT02xNE42bVqWSzPj2mYPfmYKYL9tM0Ysz30E9w158P1esV4pp22W5bKZWnadTA7lcpiYjmK6Clkul62YS6k8ppVPsXzWAsoVCLkcmeJs+WeLLMZ1lkyZHVAs2XeJi4KKXArlUpheCgVTOEG1XRGclp4xo2X2QlVhYtuyLTMplsWW1IblKJbNlsymXA7FcrjOdAK2pI5yuRTLpVQepfJ0MvlMrChbf0lMtGOMWKScV6kehXB6kXJMLiVCrojXih3y00qJeFqZUp5W2KplbNVStmoZ12FGJ2FbZrbJcplsyUy2ZBbltJTTchPRUk4r5EoVKKajmI5SuQIhxrTyKJarifpnuCT/hVixaMGwnDtCLlJwTpZLpZyacmmUUbM11RRRj/F8hAySAdJHetm6XUSR01AunWtOw9QyG2S5LKaWxfWmZUtmsx2zKZZdLMvlcFfUMTUdxXRCLGeXf4JLWsyOFdpLTiQoiFp7F+VmFTmuO7WQsyiC44RJqYcUuX5ZLq2bGCgl5PSKnEiOcpoIuSzKadmOWSWKHMWymZyWcjk5QjAhWkulSnRcc/nUIuXCranIxaSntKaQE4jWlATD6VEujW2YZpLl1JRT91CIcmmUS6Ochm2p4ZrT1MtymWE5tmSWkKOYlqlpKacVcrqQSqu9JlpLHkn8TouR2Y3o9KLlRHKCCDkpvXBy4daknFqRk1qTcmldsly6kFOSk+T4/ZbJ9ZZJuUzKZSrJZRXJaPMTonV2jmS/I1ZkN6J2zRi5cHIRrZka2ZpCTrRmeN0pciI5Sa5TkWvbKadhchpuJppKWS6Tay6zYJe1FT2S/fuu3JJ7CV5u3YU3FSEnWlPImeXkpNaM2FSEnFqsO8qltctyGdFy1Zfk1IVx0Rq7j0/ckpeTi0xOEJVcaji5sJxILrypiLYUm4qS3K5yNbJcRnli9PQvP/b7q2IFLoeQi9xclO+8XVsz8ishaseMlFOH153YMSmXLtpSbCjKbplefelffa9qJHl3eSK5HJFyEesu+QpyqdFyETtm+OtA2jHDctwxM+rbo6d7deOq5QTRm0p0csqOGSknbSqiLSPlBpTkhJz4OhAbCuUy2tqjp/npxlW3pSCyLXdbd9GbipAThJNTvg4uJhfeVDo+ZfvtNa74ZLIbu2wqoi2l1tyjLS9+kVMuNbzmKJfex18gPVe5UXzSofbG8ZdAKFbgcuwid9nkIr/IlbZMHwqqkge+gP/HmOxPuDrBXeR2bCiUE7/vLj5jKm2ZOsmUxv5AKe01RHri++4TC15JbkdbXlClW7JVicN7PPt9UUMkmLw0zMlf4YllNznxlCI9qfC9LocqyRof/fF/HEP8aJU2Goom+YOxspLcBVWSL6ja79arkjyJqiRHvPTr4k/jyuP/AeP6yXORcrMxAAAAAElFTkSuQmCC');
-			}
-
-			&.bullet-2 {
-				background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA3CAYAAABHGbl4AAAS20lEQVR4XtXaeXCj5X0H8LfNTP5IL6ZXpknTbhJK05aQLQwUSEPchCRcLZAWmBQCCxRIgCaG2fVtS/J9y5Zl+ZBlyZZvy5ZlyZasW5asy/Z617tee3fZ9YZwdEKI25ky7XSG+fb7vJJ2hWxgvUto+s58R7ZXY97PfH/P87zyIEkf9VXkPCAdmT0kFc6rpUKXVSp0r0kFvm2pIMhEUjkSDUgFcSujlgoSD0j5sQO5v+ZX4yoy50mFk2qpeGJbKp6BVDgLqWiOcTFufu+BVBBgFpkwEwFxTIyJMwkmSXDSyBzM/fUf/1VuOCQVDwak4mFIxWPMODNNjI0YB1+dzEIa5mdCWbClNE7ARJLZWWMO5f7nfvlXWVeeVNq9LZUZCBlgzASMpnGWFKzIzsynWivMbi0Dy7SWgcmt5Wb74wEW1R2QyjUBqawTxDG9kEqMKVjxCBGZ1qxp3PuNYySrtcw47motO8Zf3jpU1OVJ5a07Ulk7QR2MjunGpdaGslqb4tcz6dbEOIrWBMz3IeO4Z2uZbMsbzUd6ldUppIpGSOXNTCsxGlxqTcDYWskgASNp2AS/Fq1lNhFnahxlWDDd2l6byAe2lkrBsiL39q7sqiCqvJageqaJEAETrWnTrfUQ1Z9qrWQ4PY6ZtSZgmdayNxGBu6LWPiJcRRWbqoRUUUNUHdOQaq2s7VJrpWIc9e9da5nWxNZ/sbXstZbV2sVN5D1b/4fninGqMoWkrICkVEFSVBMnWhM4Acu0JtaaGEfRmoCJtZZpTWwiYq2JTSSz9WfWWtbWL8NyW9sDslf2jassPyRVElWpgKRSEldFHGEVHEd5rbWk15rAidYEjq0Vm5jMWhOwCVxaa5mtP7OJZFrL3vr32ZqMu9wNRVF0QKqu2JaqBIwolSrVmpLjqKhL4zKbSM5aK0u3ViQObLFDZh3YorXC3LX2QTvkHoi9s3N5R0FtuZUBcZCq2FilKo1ja0q2phQwrrUKtlYhYGKtCVhmh0y3dvFcm0i19mGPWVfT2pFkIJfx3quu5JBUT0wdUbVMNRurVqVwlVxnKjamIkwhYE2p1ioETLSWWWvcIUsyTyOZjSSz1nLPtb1ay97694H7wJFs5gg2EFRPUB2BNQLGXbFKhI1V1qRgSsIUhClEa2oCcw5seSMRrWU9Q8oHdlZrhRzJ3LW2C7cPmDjA97xauGG0ENVMUCNTr0qllqgaplrAqtM4wpSEKbnWFOrUSFZkDmyx1sS5xpFUTeDHnhNIvv423nrnv+UkX/933DWxDqlhMefQTrd28dDe91oTOZTLkiS1cltqZUMtTBPTWJlKHVNLVA1B1UwV11klW6skTCVgbWkYx7FCwNLnWp+TkP/Cu+++u2fO/vwdSO2xrJFMr7VdTyP7am3tvaimqjypnTevVqXSQkyzgLGhBqae/1ZXncYRVkVYFWGVhKlaUjiFJtVaOXGdlosA17k3IOm9/D1cXw3zuMtylKj/lP/t7Xf+h7j47tbkjSQbtg/c4VjeJVhnjVHq4E238+bbBJBpZVr4s0ZCGvhaL4D8upYbSA1h1YRVEVXJDURFmJLrTJlq7ewv/kO+ce3qGZ5xXGslQ7u2/86Vn6bgr7yds5Fkj+MVjWTbJZi2YVvS8oa1vPE2ItREtPJrNdPMNPHfGpkGguqZ2oZUqgmr4hqrZFQcR5UGN43Oyzf8CnFSDXfG0oHUA/LFjWQC8qOW0iWvOfHe3+1ZzWotdyQzsMtubSeF6q05+EldI8eHN6plOnjjmrpUBKyV37cwzSICyPfU8/11TC1HsYaNVQscW1NpcSSYlG92bOMCx7KPMaVaKyWyZCTdmkXG6VZ+Ir/3cfvp9EaSbu1IepfcdWhfNu6gdKCnKf9Adwt+v4s3KQM5Yh0CyGiIaePPWtNp5s+a+drI99Tz/XUihNUQVc3GqjvQs3ZKvtkjgRWuO24iFdz+KwZSsFLCSgRsAuLDaOfKBfm9+Z6z/D5ztl3xh9FLObycLx3sU7ddr1fji71qfIbAT3VxvHTNl4AaQtr5tZo/a2VaBJDfN/F9DUTVixBVy82jRoPeNKwwSJiKn7CVbE3Bc62MsDKutVKutRIBm2Jj22nYmfTZlrv9M5f3J4ScrBil20wdgVsNHfiKoQ1/QdwXetT4wwywkxAt08GvNUw7o2ZaRAhqZpqYBsIaCKvrgOFYClYUIqySMBUbU/JcU7C1CsLK2VopWyudhG41BXvZw1EUD8miNfG4tWv7z23tQ3AF3PbvMum2v9Hfia/2d0AAD/a1E9iOz3e34be6uXZ0okG+agnQ8lXDtDNqft/KEWwhqImwRg3umZrD0X/7mXyzvu3XUExcYXCVOYoC5kjgGA771pkTzAYP61/I71049xZuGVxJPW4V7/GZbdfZ9mG4lW3pfnMv7hvsxrdNXcgz6nBbvxa3GLS4oU+D63o1+OMeDX6vW4NP6njznYyWEA1f29pSaW2XcdrlNfkmryYvi5Es5qNWEWFFez1uZeM+CMad8XvD/Xh4SA8BvHegh8BuArtwu0GHm/p0uJ65VgZ24JouDX5Nx/Oqk7gOAeTX7Xxt60T41dS5dDUZ23iTsHRrAnfxbMvskpmzLYPbBbqUp8cGcWjEiH8m8J/Ml4DfIvAOYw8b1OHLhi58Sd+Jz/d2coPREsiDWMd0MlpGo0X01dd23eh+4zn3c649rrUSrrXidGtFmaf/9EgWZB8BH9DaCxPDeHbMjKdGB/D9YSNEgw8NGQg04O4BPYF6/K2xF3/T34ODhm4Cu7jBdOLT3Tr8Rpd4fGK0XYj99Oobk2FlfPovJayUrZXwUayQ238hR7IwG5e91t6nuQLL2PZLE6N4cXwEP5SBZjwxPIBHCPzHISPuHzTgHuZOYx+Beq6/Ho5nN67v7caf9PZy/fUQ2I3Ea1cP855/izsnnynLCSvnWitlayVsrTiQak7gCpdSrRWwtQLR2F4wbh5lFstakcWCgolxvDQxJgN/IIBjA3hs1MQGBziiRvzDoBF3D/bjmyYD7jDocXO/nhuMHtfp9fhcjx7J165+FH3bhCkJU3AcKxZSuDK2VkpYcTCFK4qkcQIWTyUXdzgZkKqsVlPltBWl01MomrLgsGUc+ZMjeF4GDssNPj4ySOAggSY2aMJdA0Z8w2jA7cwtBgO+0teP1ddf33Wj+41fwKr4YVTFcVRwE1EIHFsr4yZSFkoD2VoxYUWEFYoIHJsrWL6UI4kZqcnhyG+YsaNmxgYVgeVTBFomcXhqgkDR4CjXoAAOEWjmiJrx3aFB/L15QAb+nclIoBFrb1w9LHDhZ3wsY2NVbKySMBVHUklYBcexPJDGcYcsYWslXGfFTBFhhQImItaWCB+p1FZ7nsbuROvsHBpsdtRZbai0Ejg9jWI2WDA5yREdxwvMc2zxqdFhAocJHCZwiEAzvjM4gGNvvLHrRveb4AVuHrVsrIa4asKquIFUEqZiY0pGQVwFGytnY6Vsq1TgCCtKpCKAhWysKP2ZrHfOvdPlcEFjn5eBjTYH6mZmCZxhg9MoYYsFk/yYzwjgs2zx6bFRfH90FI+MjOC75mGcfPPNXTe634R+8lbqA2mdgyGslqNYTVwVG6skSsV1piKsgrAKwsoIK0mkUpxMZzn9sYWX0ek29c970TvvQZdjAR1sUG0XQDvqBXBaAK1scIpr0IJ8juoLRD43McFNZhyPjozCubm160b3m5GTr/L5k7CmefnTtlRPVC0bq+EGUs3GqgmrJExFmJIwBV/LiSsnrIyoUqaED8CZy+wM5A07Axhw+SEDHW50E6hli2q22MwG67kOKzmmSq7DEiKPWKY5olNscJIjasG/Ts3AvXkai+fOI/TKefgY79nzcJ9JxXVmG3OM4/R52Le2MbN1AdbNbUxtXsDUqQtojW9B6mFLbWyrhZtHM9dXowhx9WysjrAarrFqrrGqNE5BlIKjWEFYBUewnCnO+TPcpHtxZ3whiBFXEGYCTQTq2WDPnFsGtokxZYv1RFZbZ6EkMgW04uXJaTY4jR+MT+Hp0Uk8ynxvZBIPDk/hPrMF3x6cRJ7JgltNU7jZYMGX+yy4Vj+Nz/TO8EHbCqnLxicZri0t2+pgU+2MmqhWjmIzG2skrIGweo5jLWE1hFVzA6kiTkWUUoQo5eruP8HZPGHljCeCaU8YE+4QRgVwgUCnD31pYCdbVHNM5QZloB0KpnR6FoUWG4EzeGHcSuA0niLy0TEr16CVm4wATuFb5ml8bcCKrxqt+GvjNP6qz4Yv9s3ic72z+EQPm+pidEwnUR1MG9tScwxbCWshqomNNRJWT1gdR7GWjdUQVU1UJaPY489v1kDgGpcvuuPwLsHmjcDqXiRwEWMEDrFBMaYGZ2odauV16OJGM4/Gmbk00EGgnWehnUAbXpywcQ3O4HHmsTEbHhmdxQPDMwTOsEEbvsbcZrITaMdfGhz4M/0cPt07hz/gOP56N0dSR1QH29IQ1s622phWwlqIamIa2VYDx7CeqWNq+LShWLsm1yVfvkA83+2Pw+mLY84bwyyBosUpAscXQhhxBjHg9MPIFnvnPNCxxXaOacusE41Mjc0JlXUepdY5GZhvsePFSTvXoAOHmMfG7ATa8eCIHfea7QTakTcwj1uZG41OXN/vxAHDAj7b6+KjmodAojrZVidRHdw42glqY9REtbCxZjbWxMYa+Fmubo+2sq9gcDkQCCzD609ggch5bxQOAWSm3WJMFzFM5KArQKCfDfrQTWAHN5xWuxsNsy5UE6iYcaKcyEJ++My3zONF5rlxJ3fReTw2PoeHRudw/4gT9w7P406zE18fdBG4QKAbN/R78Od9Hny2z4ff6fXjE10cQx1hWo6hljDNUuqPrWqmlbCWld1rK/daCiQPLoWO7oSDKwgGk/D7k0SmW/RFOaZLXIcRWBYEcBFm0SLHVE+kjsj2OS+aHR40EFkz6+aIutmgC0em3Xhpyo0fTbrx7MQCnhx3EejiGlxggy7cM+TGN4c8BHpxy4AXN5m8uMEYwHWGIA70hjiii/hUF2E6ojrZVgdRGqLaEwJ4INex5xVfXMtPhNYQ48f5CD/eh4gULXoCCbh8osUYbL4YrGxzgi2OsMUhVwgmtqgnsotIDZGtDi8a7V5Uz/qgtLlRYvWgwOol0MsGPXiGyCcnPHiMeWjMiwdHvQT68B1zAF83+7kGA7hxIIjrDYu4ri+MP9WH8Uc9Efx2N1FdBOkYLR+f9nOthk+0HV1cRyJ0DPHwMURDq4iIFmVgEm6OqmjRzlg9UUy6Ixhlg0NEmojUM91ss30uiJa5EIE+NiiAfpTO+An046VpP4E+PGvx49BEgA0G8NC4nw2GcN9QCN9i8gbCuH0gghtNEY7oEq7tj+IL+hiBSfxmd/ZfffdxrYfWTcfDJyCAqwSKFqOhTIvL8AcTBCbh9Ca4DuNchzFYPEsYI3J4IcwRDcPAdDkjbDAENYH1jiCq7EEoZkMosgVxxBokMIjnp4IELuIJS5DARTw8toj7R8Ncg2ECo7jDHMVtgzHcbIrjoDGBL/XHTLn3u6/r5OIp03rkJARwTQAXj2NFtLh4VEbKY8r4/MtwETnnS3A3jRPIMWWG3EswMn0LERmonQ+jdT6C+rkIqhxhAsMoZg7PLCJ/Ooznp5fwzFQET05G8OhkFA+Px/DAWBT3jERx53ACeeYEbjVfJSpzbS2daju1dAobSydxMgu5QmRCjGn4KBaJDAZX4Q2syMB5ZpZjaiFy3BMjMAaTO05gDF0LUWhcS2iZjxIYRY0jCuVsFCW2JQKX8OOZGH5ojeHZqRietMQIjBOYIHAZd49c4fi933U2vKE8Hd3EZvQUTkU3cIJI0eQxIkWLyUUCmTAT5KbjI3CB69EhA5OwMKOeZQwzRk8CeneCwASBcQLjBMbYYBzl9jiK7Qkcnk3iR7YEnrcm8S/TSTwxtbzz6Fh8fxvF5V6bsc0D56Jb22eiW9gi8lRUtLghtygDw+sErrPB4zIwxDXpIdLFJh2E2vwrBK5ilBkk0OROQs9XnXuZwCRanMuon19GFVM2t0LgCoEreNG2svaM9WP4/xjPxDYPnYud3j4b28JpuUFmSbS4gWNErkROIElkjGMaJjLEVy+RTo7rHKE2/1EC1wg8SuAKjN5V9HpWCTyKdvcqmlyrqHWuQOVa2yl27HM7v9or1d6p/POxrW0icSYmWtySkesCyKwySY5sLLKOCKEhtujh2C4Q6QgehzVwHBb/MQLXMORdg9F3DL3eY+j0Httpca4qFdb3efb7uK5tNrgdP2s9Hz+9IwNjArjJBk/hOF+PRjaQWDpB4AmEmRCR3sWTHNF1OEInMMPXicDxnVH/esDoWcvL/f2/EtfZ2GbeuaVN5bml09at+NbaRvzMzsbSFo4TucokufHEwyd3wuGTa77IhtGzeDLfHj6RZw38H7fz/+X6X6NEzDYtOtoxAAAAAElFTkSuQmCC');
-			}
-
-			&.bullet-3 {
-				background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA3CAYAAABHGbl4AAATsElEQVR4XtXaeVCj930G8LfJNH+kl9umydRpkk3iOmnrOGsndm0ncYhjO1nbrR2nttvasdfxldieBGd2uUESSIhLCISQBEJIIEAcAgECBJLQgYQOzj1ZvOs16UzSmTZxiNsm/cvz9PnpWLSCPbAdJ31nnhHsMmt95vn+vu8rxpL0bl8lngPS0cnDUvGMViqedUnF3nWpaH5LKgox0XSOxoJSUcLFaKWi5ENSYfxA/j/zu3GV2Auk4hGtVDq8JZWOQyqehFQyzcwyXn7vg1QUZBaYCBMFcUycSTBJZongJStzMP+ff++vSsthqbQ3KJX2QyodZIaYMWImiJniq4eZy8ACTDgHtpjBCZjIUm7WmcP5/7nf/FVhLJDKTVtShYWQHsZOgCODc6ZhJW5mJt1acW5rWVi2tSws1Vp+tt4bYIn6gFSpC0oV7SCO6YRUZk3DSgeIyLbmyuAuNY7RnNay47irtdxYf3PnUKYukCqbt6WKVoLaGANjwk5rfTmtjfLr8UxrYhxFawI2f4Vx3LO1bLZSi+ZdvSrUMqmqAVJlE9NMjA47rQkYWyvrJWAgAxvm16K17BLxpMcxBQtlWttriVy2tXSKlmX5b+/tXVVEVdYSVMc0EiJgojV9prUOorrTrZX1Z8Yxe9YELNta7hIRuLfV2ruEq6phU9WQqlREqZn6dGsVLTutlYtxNF981rKtidV/obXcs5bT2oUlctHqv3LeNk5RIZPkVZDkCkgyJXGiNYETsGxr4qyJcRStCZg4a9nWxBIRZ00skezqz561nNWfguW3tgdkr+wbV115WKomqloGSSEnroY4wqo4jqmzpsmcNYETrQkcWyu1MdmzJmDD2Dlr2dWfXSLZ1nJX/z5bS+GudqHISg5IyqotqUbAiFIo0q3JOY4ydQaXXSJ5Z60i01qJuGGLDZlzwxatFeeftcttyD0Qe2f76m4FtZUuBsRBqmFj1YoMjq3J2ZpcwHjWqthalYCJsyZg2Q2Zae3CfW043VreY9ah4dO46DHrnbR2dCmYz7j4UpcdluqIURNVyyjZmFKRxlXznCnYmIIwmYA1plurEjDRWvascUOWZZ9Gsoske9bSG/KLvet46623LtFa7urfB+6yI9nEEawnqI4gNYEqAeNWrBFhY9WqNExOmIwwmWhNS2DeDTu1SERrOc+QqRs2W6sP4NzPf4Wln/4Su87aLtw+YOIGvuel4cLQENVEUANTp0inligVoxQwZQZHmJwwOc+aTJseyarsDVucNXFfEyPZlzlrO63Nnv9Zqq3Z197Iu2lnWrtw0973WRM5nM+SJK18S2pmQxqmkWmoTkfN1BKlIkjJ1PCcVbO1asIUAtaSgXEcqwQs976WaS2z/l/xb6RQIsrIj/MWSeas7Xoa2Vdr6xejGmsKpFa+ea0iHQ0xTQLGhuqZOv6dWpnBEVZDWA1h1YQpNGmcTJdurZK48kxr5aK1zFlrm7uAEnnSfSYNEzft/NZSiyQXtg/ckXjBDqxdZZXa+KZb+eZbBJBpZjT8swZC6vlaJ4D8upYLREWYkrAaoqq5QBSEyXnO5JnWKgWMrYn1X87WGsd5rv77IthNvSupRbLzNJJdJLnj+LZGsmUHpq/fkvR8w3q+8RYitEQ082st08Q08u8amHqC6pja+nSUhNXwjFUzCo6jgq3J2VoVx7GKH2kqRWs9MKyeuwiV2og6InIftS75gJyFXXVr22lUp+rgBwwNkNr5RvVMG9+4Tp2OgDXzew3TJCKA/Jk6/ryaqeUoqtiYUuDYmkKfhsmNGVgXfhRY24VKwVLPkZkH5FJx1gQu09rRzJbcddO+atxB6UBHY+EBkwYfMvJNpoAcsTYBZHTEtPDPmjNp4p818bWBP1PHn1eLEKYiSsnGlBzHakM6co6jdnAXSESM5c6H0cxzZGn2cSt7086OZP69bRdid44sF0oHu7QtN5i1+HSnFtcS+EEjx8vQtAPUEdLKr7X8s2ZGI4D8vpE/V09UnQhRtRxDFVMjYGyswYbXfvHmLpTI3Pn/SK///Kf/XeufubpfIeRlxSrdbmsL3mZpw+ctLfgb4j7VocWHs8B2QvRMG7/WMa2MltGIENTENDL1hNUTpWZjKo6iygTzsTO7QDuw/8Qh5xIOja7i0Mg6c4zLZDXdWuq85a///NaugCvi2v+mzbB1V3c7vtTdBgE82NVKYCs+aWrBH5l4dgyiQb7qCdDzVce0Mlp+38wR1BDUSFgDX+t5xtTteNEX2YW5UlSRrcxI7vGZbde97Uq4lS3pQXsnHug14V6bEQVWA27v1uNWix43dulwfacOf9Whw5+bdPiAgW++ndEToONrS0s6za1pXBPbamRbHXb84le/3vXGL5fX3vgf3tB51kqn04ukhLCSvR63cnGXg3Ez/kt/Nx7tM0MA7+/pINBEoBF3WAz4QpcBNzDXpYBtuMaow+8ZCGgnpE0A+XUrX1sIamY0emxtb+9645dLCtVETDk3ZJmAZVoTuAv3tuyWzN7bsrhdoJ08M9iLwwNW/CuB/2TfAd5D4J3WDjZowOcsRnzW3I5PdrZzwegJ5MgZmHZGz+iYFiNMq8d2vfEr5csOnp9KLpFKLpEKtlbOD6RlPGulmdZKsk//2WfJ3FvAZVp7abgfzw/a8V1HD77Tb4Vo8JE+C4EWHOoxE2jGl62d+PvuDhy0mAg0csG04yMmA/7AyO3XzuiZNhMKfQE0JZZRH19G3eIylLE11CyuIfxv/74LJFIW4mcyxQgfx/hhtIqrv5KtVbC1csLK2VqZn+eN67+YI1mci8s9a5dorsg5uPXKsAMvDw3g+ymgHU/19+AxAr/dZ8WDvRbcx9xt7SLQzPPXwfE04YZOEz7e2cnz10EgnzQMTDtvym18lGpltCJdHE8Lps7+eBfKtfkTbs9h3h4IU3D1K9iajKkirpKwSjGebK2MrZUG080JXPFiurUitlYkGtsLxuVR4XSulzidKBrm0/fwYAr4PQEc7METDhsb7OGIWvGPvVYc6u3G120W3Gkx45ZuMxeMGdebzfhYh5kNmvH7RkLaGT0/k7UxrUyLFdu//t+LUK9vvwnJyNFTD/H+R5iSsGqiFGxNTpiM41g1l8ZVsLVywkpDaVxJNIMTsEQ6+bgjS0GpxuWyVY+5UD42ipJRJ444h1A4MoAXU8D+VINPDvQS2EugjQ3a8M0eK+6yWnAHc6vFgs93dePTZgs+0WnBh418PjTy4dfAV303Hh7zXIQSSKmTgEZ+TqtnY3WMmjAln0RqiKshWMFxlHGJyASOrVVwiVSEM0C2VkpYCWHFIgLH5oqWd3I0OS41Tk0V1o+7oRqfgILAylECnSM4MjpMoGjQwTMogH0E2jmidjzc14t/sPekgF+zWQm0skErbrTY8JlOKxu04UMmfmQx9mB04+xFsPIwn+qbidIMEsfGGpwEMmrCVAQr2VgNG6smTMGRlBNWxXGsDGZw3JBlbK2M56yUKSGsWMBExNkS4SOV1uUu0Lk9aJ6cRv2EG2rXBKpdBI6NoZQNFo2McESH8BLzAlv8rqOfwH4C+wnsI9COb/T2oMDWgy9Ze/FFi50N9nJEewnsxU9+ufNY1Zo4yRElSse0ENXMaIhqZGMNhKkJq2VjKuKUhNVwgVQTpmBjckZGXBUbq2Rj5WyrXOAIK0mmI4DFbKwk85msc9q7bZyahc49kwI2TExBPT5J4DgbHEMZWywaGcYPGQF8ni0+M+jAdxwOPDYwgIft/bzJ97FBO77W08+nmH7c1N2Hx8emL6A2fvYG3mcc4BkcSqeNI6gjSss0cytqOIYNRNUTpebaVxNWy1FUElfDxqqJUvCcKQirIqyKsArCypLplC5lspz52MLL6vHaumf86JzxwTg1hzY2qHULoBt1AjgmgC42OMoz6EQhR/UlIl8YHuaSGcLjAw78c58D3+4fwAP2AdzbM4C7bIPoXTuRQv30zf/CfY5JXNvhwJ+aBgkkysCloSeqjW21EtbCxrSENRHWyFGsZ+qIqmVjKi4QJRtTElZNmIIwOWEycQ8krpKwCqLKmTI+AGcvuydY0O8Jomc2gBRwygsTgXq2qGWLTWywjuewmmMq5zksI/Koc4wjOsoGRziiTjw7OILHHUMc0SGO6CCBgzj/xs9TsGcnvLi5exh/1zWM68zD+HjHKP7MRJCBaSdKT5SOjbUS1cK2NFweTTxfDSLE1bExNWEqnjElz1hNBicjSsZRrCKsiiNYyZTm/RpuxLuwPTQXwsBsCHYCbQSa2WDHtDcFbBFjyhbriFS6JiEnMg104UcjY2xwDN8bGsUzDgEcwQ8m0mM4eOwU7u0d4Rl04jbbKG6xOPG5LieBY7i2c5wP2kQZebYMbEtPWBubamW0RDVzFJvYWMN86td2Uh3HsZYwFWFKLpAa4hREyUWIkq/u/hXchC8iH/dFMcYn82FvGA4BnCPQM4+uDLCdLWo5pqkGU0A3ZEz52CSKnRMEjuOlIReBY+jmE8jc5ms8gy42OMoGR3GPfQxf6XFxybhwk3WMDU7g012T+FjnJN7fwaaMjIFpJ6qNaWFbWo5hM2EaohrZWANhdYSpOYq1bExFlJKoaka2x6/fXMHgNbPzse0p/yIm/FG4vAsELmCQwD42KMbU4kmfQ33qHM5y0cygYXw6A5wi0M17oZvACbw8PMEzOI4nmScGJ/AYz9hD/eMEjrPBCXyFud3mJtCNv7VM4a/N0/hI5zT+osOD95m4OAxEtbEtHWGtbKuFaSZMQ1Qj08C26jmGdYyaUfFpQ7Z+Tb4rdc0HE4XeQAKe+QSm/XFMEihaHCVwaC6MAU8IPZ4ArGyxc9oHA1ts5ZhqJj1oYFQTHihcMyh3TaeAhU43Xh5x8wxO4TDzxKCbQDe+NeDG/XY3gW4U9MzgNuZmqwc3dHtwwDKHj3bO8lHNRyBR7Wyrnag2Lo5WgloYLVEaNtbExhrZWD3vjeo92sq9QqHlYDC4DH8giTkiZ/wxTAkgM+YVY7qAfiJ7Z4MEBtjgPEwEtnHhNLu9qJ+chZJA2bgHlUQWj04TOIOXmReGPNyiM3hiaBqPOKbx4IAH9/fP4G67B1/tnSVwjkAvbuz24TNdPny0ax5/0hnA+40cQwNheo6hnjAdYa1EaZlmwjQru89W/rUYXDq4GF7bjoRWEAotIRBYIjLT4nyMY7rIcxiFc04AF2AXLXJMzUQaiGyd9qNpyod6IlWTXo6olw3O4uiYF6+MevGDES+eH57D00OzBM7yDM6xwVnc1+fF1/t8BPpxa48fX7D5caM1iOstIRzoDHNEF/BBI2EGotrZVhtROqJakwJ4IN+x55VYWC9MhtcRD60hykegMJGiRV8widl50WIcE/NxuNjmMFscYIt9s2HY2KKZSCOROiKbp/xocPuhnJyHnCu/zOVDkctPoJ8N+vAckU8P+/AE88igH99y+AmcxzfsQXzVHuAZDOLmnhBusCzg+q4IPmGO4C87ovhjE1FGggyMno9P+7lWIydb1hZOIBk+hkTkGGLhVURFiyngErwcVdGim3H5YhjxRuFgg31E2og0Mya22TodgmY6TOA8GxTAAMrHAwQG8MpYgMB5PO8M4PBwkA0G8chQgA2G8UBfGPcwBT0R3NETxc22KEd0Edd1x/Apc5zAJfyhKfe3vvu4ToRP2I5HTkIAVwkULcbC2RaXEQglCVyCx5/kOUzwHMbh9C1ikMj+uQhHNAILY/RE2WAYWgLrpkKocYcgmwyjZCKEo64QgSG8OBoicAFPOUMELuDRwQU86IjwDEYIjOFOewy398Zxiy2Bg9YkPtsdt+W/331dpxY2bCeipyCA6wK4cBwrosWFtRQyNabMfGAZs0ROzye5TRMEckyZPu8irEzXXDQF1M9E0DwTRd10FDVTEQIjKGWOjC+gcCyCF8cW8dxoFE+PRPH4SAyPDsXx0GAM9w3EcHd/EgX2JG6zv0NU9tpc3GjZWNzA6cVTOJWDXCEyKcY0soYFIkOhVfiDKyngDDPJMXUSOeSLExiHzZsgMA7jXAy62UVoZmIExqCaikE+GUPZxCKBi/jheBzfd8Xx/GgcTzvjBCYITBK4jEMDb3P8LnWdi5yWvxo7gzOxDWzETuMkkaLJY0SKFpcWCGQiTIhLZ57AOZ7HqRRwCU7G4VtGP2P1JWH2JglMEpggMEFgnA0mUOlOoNSdxJHJJT6WJfGiawnPji3hqdHl7ccHE/tbFFd7nYmfOXA+trl1NraJTSI3YqLF06kWU8DICQJPsMHjKWCYZ9JH5CybnCJ0IrBC4CocTC+BNu8SzHw1eJcJXILGs4y6mWXUMBXTKwSuELiClydW1p9zvQf/H+PZ+JnD5+Ovbp2Lb+LVVIPMomjxNI4RuRI9iSUi4xzTCJFhvvqJ9HBcpwmdCKwRuE7gGoErsPpX0elbJXANrd5VNM6uotazAsXs+nbp1D7X+Tu90u1tFL4e39wiEmfjosXNFPKEADKrzBJHNh49gSihYbbo49jOETkVOg5X8DicgWMErqPPvw7r/DF0+o+h3X9sW+NZlctcl3j2e6+uLTa4lTjnej3x6nYKGBfAM2xwA8f5uhY9jeTiSQJPIsKEifQvnOKInsBU+CTG+TocPL7tCJwIWn3rBfn//u/EdS5+puD84hn5+cVXXZuJzfXTibPbpxc3cZzIVWaJiycRObUdiZxan4+etvoWThW6IycLXMHfcjv/X67/A1xuCNXBbL5KAAAAAElFTkSuQmCC');
-			}
+		.jp-connection__connect-screen-layout ol.migration-listing {
+			display: flex;
+			flex-direction: column;
+			gap: 12px;
 		}
 
 		.jp-connection__connect-screen-layout {

From cad58dc03fe0c502b474eb6d8ea8df2f7ba272cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nauris=20P=C5=AB=C4=B7is?= <hi@pyronaur.com>
Date: Fri, 17 Feb 2023 04:03:32 +0200
Subject: [PATCH 15/51] Boost: Refactor critical css notices (#28916)

* Extract logic from the presentation file

* Simplify functions

* Make dismissal error store private

* Group CSS Recommendations in a single file

* Move important providers

* Move CriticalCssErrorDetails

* Refactor the shape of initial issues

* failedProviderKeyCount

* Refactor recommendations

* Move type declarations up

* Remove "recommendations"

* activeRecommendations -> activeIssues

* Recommendations -> issues

* objectFilter no longer necessary

* Get rid of dismissed store

* Move "providers_errors" to "issues"

* Remove refactoring in progress comment

* Remove Recommendations class

* Fix method spelling issue

* Add changelog

* Remove Refactoring_Critical_CSS_Recommendations

* Remove empty file

* phpcs fix

* Fix a typo

* Fix reset

* phpcs fix

* ESLint

* Fix import type

* Fix undefined var call

* Add safety checks in case there are no issues provided yet

* Derive the issues store from criticalCssStatus

* Move issue updating to the main status store
---
 .../boost/app/assets/src/js/global.d.ts       |   7 +-
 .../elements/CriticalCssStatus.svelte         |   3 +-
 .../sections/AdvancedCriticalCss.svelte       |  63 ++----
 .../js/stores/critical-css-recommendations.ts | 192 +++++++++++-------
 .../src/js/stores/critical-css-status.ts      |  29 +--
 .../describe-critical-css-recommendations.ts  |   3 +-
 .../src/js/utils/generate-critical-css.ts     |   4 +-
 .../app/assets/src/js/utils/object-filter.ts  |  26 ---
 .../critical-css/Critical_CSS.php             |   8 -
 .../optimizations/critical-css/Generator.php  |  40 +++-
 .../lib/critical-css/Critical_CSS_State.php   |  20 ++
 .../app/lib/critical-css/Recommendations.php  |  32 ---
 .../rest-api/endpoints/Generator_Request.php  |   5 +-
 .../rest-api/endpoints/Generator_Success.php  |   7 +-
 .../endpoints/Recommendations_Dismiss.php     |   7 +-
 .../endpoints/Recommendations_Reset.php       |   6 +-
 .../changelog/boost-fix-critical-css-notices  |   5 +
 17 files changed, 225 insertions(+), 232 deletions(-)
 delete mode 100644 projects/plugins/boost/app/assets/src/js/utils/object-filter.ts
 delete mode 100644 projects/plugins/boost/app/lib/critical-css/Recommendations.php
 create mode 100644 projects/plugins/boost/changelog/boost-fix-critical-css-notices

diff --git a/projects/plugins/boost/app/assets/src/js/global.d.ts b/projects/plugins/boost/app/assets/src/js/global.d.ts
index fbdbbce565643..31a9c04d66a2c 100644
--- a/projects/plugins/boost/app/assets/src/js/global.d.ts
+++ b/projects/plugins/boost/app/assets/src/js/global.d.ts
@@ -2,6 +2,7 @@
  * Type definitions for the global namespace. i.e.: things we expect to find in window.
  */
 
+import { CriticalCssIssue } from './stores/critical-css-recommendations';
 import type { ConnectionStatus } from './stores/connection';
 import type { CriticalCssStatus } from './stores/critical-css-status';
 import type { Optimizations } from './stores/modules';
@@ -30,12 +31,14 @@ declare global {
 		connectionIframeOriginUrl: string;
 		connection: ConnectionStatus;
 		criticalCSS?: {
-			status: CriticalCssStatus;
+			status: CriticalCssStatus & {
+				issues?: CriticalCssIssue[];
+				provider_key_labels?: { [ name: string ]: string };
+			};
 			suggestRegenerate: boolean;
 		};
 		showRatingPromptNonce?: string;
 		showScorePromptNonce?: string;
-		criticalCssDismissedRecommendations: string[];
 		dismissedScorePrompts: string[];
 		superCache: {
 			pluginActive: boolean;
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/CriticalCssStatus.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/elements/CriticalCssStatus.svelte
index 1821a48697e5a..750ad8cfa29b3 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/CriticalCssStatus.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/elements/CriticalCssStatus.svelte
@@ -3,7 +3,8 @@
 	import { __, _n, sprintf } from '@wordpress/i18n';
 	import TemplatedString from '../../../elements/TemplatedString.svelte';
 	import TimeAgo from '../../../elements/TimeAgo.svelte';
-	import { criticalCssStatus, failedProviderKeyCount } from '../../../stores/critical-css-status';
+	import { failedProviderKeyCount } from '../../../stores/critical-css-recommendations';
+	import { criticalCssStatus } from '../../../stores/critical-css-status';
 	import InfoIcon from '../../../svg/info.svg';
 	import RefreshIcon from '../../../svg/refresh.svg';
 	import actionLinkTemplateVar from '../../../utils/action-link-template-var';
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
index 89cefc8edc89e..73597835ade8b 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
@@ -5,12 +5,12 @@
 	import CloseButton from '../../../elements/CloseButton.svelte';
 	import ErrorNotice from '../../../elements/ErrorNotice.svelte';
 	import {
-		dismissRecommendation,
-		activeRecommendations,
-		dismissedRecommendations,
-		clearDismissedRecommendations,
+		activeIssues,
+		dismissedIssues,
 		dismissalError,
-		setDismissalError,
+		showDismissedIssues,
+		dismissIssue,
+		groupErrorsByFrequency,
 	} from '../../../stores/critical-css-recommendations';
 	import { isFinished } from '../../../stores/critical-css-status';
 	import InfoIcon from '../../../svg/info.svg';
@@ -25,38 +25,12 @@
 		navigate( -1 );
 	}
 
-	/**
-	 * Dismisses a recommendation by key.
-	 *
-	 * @param {string} key Recommendation key to dismiss.
-	 */
-	async function dismiss( key ) {
-		try {
-			await dismissRecommendation( key );
-		} catch ( error ) {
-			setDismissalError( __( 'Failed to dismiss recommendation', 'jetpack-boost' ), error );
-		}
-	}
-	/**
-	 * Show the previously dismissed recommendations.
-	 */
-	async function showDismissedRecommendations() {
-		try {
-			await clearDismissedRecommendations();
-		} catch ( error ) {
-			setDismissalError(
-				__( 'Failed to show the dismissed recommendations', 'jetpack-boost' ),
-				error
-			);
-		}
-	}
-
 	/**
 	 * Figure out heading based on state.
 	 */
 	let heading: string;
 	$: heading =
-		$activeRecommendations.length === 0
+		$activeIssues.length === 0
 			? __( 'Congratulations, you have dealt with all the recommendations.', 'jetpack-boost' )
 			: __(
 					'While Jetpack Boost has been able to automatically generate optimized CSS for most of your important files & sections, we have identified a few more that require your attention.',
@@ -81,18 +55,18 @@
 		<section transition:slide|local>
 			<p>{heading}</p>
 
-			{#if $dismissedRecommendations.length > 0}
+			{#if $dismissedIssues.length > 0}
 				<p>
-					<button class="components-button is-link" on:click={showDismissedRecommendations}>
+					<button class="components-button is-link" on:click={showDismissedIssues}>
 						{sprintf(
 							/* translators: %d is a number of recommendations which were previously hidden by the user */
 							_n(
 								'Show %d hidden recommendation.',
 								'Show %d hidden recommendations.',
-								$dismissedRecommendations.length,
+								$dismissedIssues.length,
 								'jetpack-boost'
 							),
-							$dismissedRecommendations.length
+							$dismissedIssues.length
 						)}
 					</button>
 				</p>
@@ -104,20 +78,21 @@
 		<ErrorNotice title={$dismissalError.title} error={$dismissalError.error} />
 	{/if}
 
-	{#each $activeRecommendations as recommendation (recommendation.key)}
+	{#each $activeIssues as issue (issue.key)}
 		<div class="panel" transition:slide|local>
-			<CloseButton on:click={() => dismiss( recommendation.key )} />
+			<CloseButton on:click={() => dismissIssue( issue.key )} />
 
 			<h4>
 				<InfoIcon />
-				{recommendation.label}
+				{issue.provider_name}
 			</h4>
 
-			{#each [ recommendation.errors[ 0 ] ] as errorSet}
-				<div class="problem">
-					<CriticalCssErrorDescription {errorSet} on:retry={onRetry} />
-				</div>
-			{/each}
+			<div class="problem">
+				<CriticalCssErrorDescription
+					errorSet={groupErrorsByFrequency( issue )[ 0 ]}
+					on:retry={onRetry}
+				/>
+			</div>
 		</div>
 	{/each}
 </div>
diff --git a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
index d69092160c672..d154b1eaf102b 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
@@ -1,94 +1,110 @@
-import { writable, derived } from 'svelte/store';
+import { writable, derived, get } from 'svelte/store';
+import { __ } from '@wordpress/i18n';
 import api from '../api/api';
 import { castToString } from '../utils/cast-to-string';
-import { objectFilter } from '../utils/object-filter';
 import { sortByFrequency } from '../utils/sort-by-frequency';
-import { CriticalCssErrorDetails, criticalCssStatus } from './critical-css-status';
+import { criticalCssStatus, updateIssues } from './critical-css-status';
 import type { JSONObject } from '../utils/json-types';
 
-const importantProviders = [
-	'core_front_page',
-	'core_posts_page',
-	'singular_page',
-	'singular_post',
-];
+type Critical_CSS_Error_Type =
+	| 'SuccessTargetError'
+	| 'UrlError'
+	| 'HttpError'
+	| 'UnknownError'
+	| 'CrossDomainError'
+	| 'LoadTimeoutError'
+	| 'RedirectError'
+	| 'UrlVerifyError'
+	| 'EmptyCSSError'
+	| 'XFrameDenyError';
+
+export interface CriticalCssErrorDetails {
+	url: string;
+	message: string;
+	meta: JSONObject;
+	type: Critical_CSS_Error_Type;
+}
 
-const initialState = Jetpack_Boost.criticalCssDismissedRecommendations || [];
-const dismissed = writable< string[] >( initialState );
+export type CriticalCssIssue = {
+	provider_name: string;
+	key: string;
+	status: 'active' | 'dismissed';
+	errors: CriticalCssErrorDetails[];
+};
 
 /**
  * Specification for a set of errors that can appear as a part of a recommendation.
  * Every error in the set is of the same type.
  */
 export type ErrorSet = {
-	type: string; // Type of errors in this set.
+	type: Critical_CSS_Error_Type; // Type of errors in this set.
 	firstMeta: JSONObject; // Meta from the first error, for convenience.
 	byUrl: {
 		[ url: string ]: CriticalCssErrorDetails; // Each error keyed by URL.
 	};
 };
 
-/**
- * Specification of the Recommendation data structure used for display.
- */
-type Recommendation = {
-	key: string; // Provider Key associated with this recommendation.
-	label: string; // Label for the Provider Key.
-	errors: ErrorSet[]; // Sets of errors grouped for display. Mostly grouped by error type, but can also group by HTTP error code.
-};
+const issuesStore = derived( criticalCssStatus, $status => {
+	return $status.issues || [];
+} );
+
+const dismissalErrorStore = writable( null );
+export const dismissalError = { subscribe: dismissalErrorStore.subscribe };
 
 /**
- * Derived store containing Critical CSS recommendations based on Critical CSS
- * status and the provider key errors inside.
+ * Derived datastore: contains the number of provider keys which failed in the
+ * latest Critical CSS generation run.
  */
-export const recommendations = derived( criticalCssStatus, state => {
-	if ( ! state.providers_errors ) {
-		return [];
+export const failedProviderKeyCount = derived( issuesStore, $issues => {
+	if ( $issues.length === 0 ) {
+		return 0;
 	}
-
-	return Object.entries( state.providers_errors ).map< Recommendation >(
-		( [ key, urlErrors ] ) => ( {
-			key,
-			label: state.provider_key_labels[ key ] || key,
-			errors: groupErrorsByFrequency( urlErrors ),
-		} )
-	);
+	return $issues.reduce( ( acc, curr ) => ( curr.errors.length > 0 ? acc + 1 : acc ), 0 );
 } );
 
 /**
  * Store used to track Critical CSS Recommendations which have been dismissed.
  * Exported as a read-only store.
  */
-export const dismissedRecommendations = { subscribe: dismissed.subscribe };
+export const dismissedIssues = derived( issuesStore, $issues => {
+	if ( $issues.length === 0 ) {
+		return [];
+	}
+	return $issues.filter( r => r.status === 'dismissed' );
+} );
 
 /**
  * Derived store containing Critical CSS recommendations which have not been dismissed.
  */
-export const activeRecommendations = derived(
-	[ recommendations, dismissedRecommendations ],
-	( [ recommends, dismisses ] ) => recommends.filter( r => ! dismisses.includes( r.key ) )
-);
+export const activeIssues = derived( issuesStore, $issues => {
+	if ( $issues.length === 0 ) {
+		return [];
+	}
+	return $issues.filter( r => r.status === 'active' );
+} );
 
 /**
  * Derived datastore: Returns the most important Set of errors among the recommendations.
  * Used for displaying the most important error as a showstopper if no URLS succeeded.
  */
-export const primaryErrorSet = derived( recommendations, recommends => {
+export const primaryErrorSet = derived( issuesStore, $issues => {
+	const importantProviders = [
+		'core_front_page',
+		'core_posts_page',
+		'singular_page',
+		'singular_post',
+	];
+
 	for ( const key of importantProviders ) {
-		const recommendation = recommends.find( r => r.key === key );
-		if ( recommendation ) {
-			return recommendation.errors[ 0 ];
+		const issue = $issues.find( r => r.key === key );
+		if ( issue ) {
+			return groupErrorsByFrequency( issue );
 		}
 	}
 
 	return undefined;
 } );
 
-/**
- * Store used to track Critical CSS Recommendations dismissal error.
- */
-export const dismissalError = writable( null );
-
 /**
  * Set the dismissal error if something wrong occurred
  * during the event to dismiss a recommendation or the event
@@ -97,35 +113,27 @@ export const dismissalError = writable( null );
  * @param {string} title Error display title.
  * @param {Object} error Error.
  */
-export function setDismissalError( title: string, error: JSONObject ): void {
-	dismissalError.set( {
+function setDismissalError( title: string, error: JSONObject ): void {
+	dismissalErrorStore.set( {
 		title,
 		error,
 	} );
 }
 
-/**
- * Dismiss the recommendation associated with the given provider key. Calls the
- * API to update the back end in lock-step.
- *
- * @param {string} key Key of recommendation to dismiss.
- */
-export async function dismissRecommendation( key: string ): Promise< void > {
-	await api.post( '/recommendations/dismiss', {
-		providerKey: key,
-		nonce: Jetpack_Boost.nonces[ 'recommendations/dismiss' ],
-	} );
-	dismissed.update( keys => [ ...keys, key ] );
-}
-
 /**
  * Clear all the dismissed recommendations.
  */
-export async function clearDismissedRecommendations(): Promise< void > {
+export async function clearDismissedIssues(): Promise< void > {
 	await api.post( '/recommendations/reset', {
 		nonce: Jetpack_Boost.nonces[ 'recommendations/reset' ],
 	} );
-	dismissed.set( [] );
+	const issues = get( issuesStore );
+	updateIssues(
+		issues.map( issue => {
+			issue.status = 'active';
+			return issue;
+		} )
+	);
 }
 
 /**
@@ -133,16 +141,20 @@ export async function clearDismissedRecommendations(): Promise< void > {
  * a SortedErrorSet; an array which contains each type of error grouped. Also
  * groups things like HTTP errors by code.
  *
- * @param {Object} errors Errors in an object keyed by URL to group
+ * @param issue The recommendation the errors belong to.
  */
-function groupErrorsByFrequency( errors: {
-	[ url: string ]: CriticalCssErrorDetails;
-} ): ErrorSet[] {
-	const groupKeys = Object.values( errors ).map( groupKey );
+export function groupErrorsByFrequency( issue: CriticalCssIssue ): ErrorSet[] {
+	const { errors } = issue;
+	const groupKeys = errors.map( error => groupKey( error ) );
 	const groupOrder = sortByFrequency( groupKeys );
 
 	return groupOrder.map( group => {
-		const byUrl = objectFilter( errors, v => groupKey( v ) === group );
+		const byUrl = errors.reduce< { [ url: string ]: CriticalCssErrorDetails } >( ( acc, error ) => {
+			if ( groupKey( error ) === group ) {
+				acc[ error.url ] = error;
+			}
+			return acc;
+		}, {} );
 		const first = byUrl[ Object.keys( byUrl )[ 0 ] ];
 
 		return {
@@ -159,7 +171,7 @@ function groupErrorsByFrequency( errors: {
  *
  * @param {CriticalCssErrorDetails} error
  */
-function groupKey( error: CriticalCssErrorDetails ) {
+export function groupKey( error: CriticalCssErrorDetails ) {
 	if ( error.type === 'HttpError' ) {
 		return error.type + '-' + castToString( error.meta.code, '' );
 	}
@@ -170,3 +182,39 @@ function groupKey( error: CriticalCssErrorDetails ) {
 
 	return error.type;
 }
+
+/**
+ * Dismiss the recommendation associated with the given provider key. Calls the
+ * API to update the back end in lock-step.
+ *
+ * @param {string} key Key of recommendation to dismiss.
+ */
+export async function dismissIssue( key: string ): Promise< void > {
+	const issues = get( issuesStore );
+	const issue = issues.find( el => el.key === key );
+	if ( issue ) {
+		issue.status = 'dismissed';
+		updateIssues( issues );
+	}
+	try {
+		await api.post( '/recommendations/dismiss', {
+			providerKey: key,
+			nonce: Jetpack_Boost.nonces[ 'recommendations/dismiss' ],
+		} );
+	} catch ( error ) {
+		setDismissalError( __( 'Failed to dismiss recommendation', 'jetpack-boost' ), error );
+	}
+}
+/**
+ * Show the previously dismissed recommendations.
+ */
+export async function showDismissedIssues() {
+	try {
+		await clearDismissedIssues();
+	} catch ( error ) {
+		setDismissalError(
+			__( 'Failed to show the dismissed recommendations', 'jetpack-boost' ),
+			error
+		);
+	}
+}
diff --git a/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts b/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
index 5a3bf3b3f64fd..2de3244eaf680 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
@@ -1,16 +1,11 @@
 import { derived, writable } from 'svelte/store';
 import api from '../api/api';
 import { modules } from './modules';
+import type { CriticalCssIssue } from './critical-css-recommendations';
 import type { ProviderKeyUrls, ProvidersSuccessRatio } from '../utils/generate-critical-css';
 import type { JSONObject } from '../utils/json-types';
 import type { Viewport } from '../utils/types';
 
-export interface CriticalCssErrorDetails {
-	message: string;
-	type: string;
-	meta: JSONObject;
-}
-
 export interface CriticalCssStatus {
 	progress: number;
 	retried_show_stopper?: boolean;
@@ -24,15 +19,10 @@ export interface CriticalCssStatus {
 	core_providers?: string[];
 	core_providers_status?: string;
 	status_error?: Error | string;
-	providers_errors?: {
-		[ providerKey: string ]: {
-			[ url: string ]: CriticalCssErrorDetails;
-		};
-	};
-	provider_key_labels?: { [ name: string ]: string };
 	success_count?: number;
 	created?: number;
 	viewports?: Viewport[];
+	issues?: CriticalCssIssue[];
 }
 
 const SUCCESS = 'success';
@@ -58,14 +48,6 @@ export function getStatus() {
 	return status;
 }
 
-/**
- * Derived datastore: contains the number of provider keys which failed in the
- * latest Critical CSS generation run.
- */
-export const failedProviderKeyCount = derived( { subscribe }, state =>
-	state.providers_errors ? Object.keys( state.providers_errors ).length : 0
-);
-
 /**
  * Derived datastore: Returns true if the Critical CSS status indicates the process
  * is complete - i.e.: is success or fail.
@@ -210,6 +192,13 @@ export function setError(): void {
 	} ) );
 }
 
+export function updateIssues( issues: CriticalCssIssue[] ): void {
+	return update( state => ( {
+		...state,
+		issues,
+	} ) );
+}
+
 export const criticalCssStatus = {
 	subscribe,
 };
diff --git a/projects/plugins/boost/app/assets/src/js/utils/describe-critical-css-recommendations.ts b/projects/plugins/boost/app/assets/src/js/utils/describe-critical-css-recommendations.ts
index c6ba21ee30e1d..30cc04c4f9ba5 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/describe-critical-css-recommendations.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/describe-critical-css-recommendations.ts
@@ -1,8 +1,7 @@
 import { __, _n, sprintf } from '@wordpress/i18n';
 import UrlComponentsExample from '../pages/settings/elements/UrlComponentsExample.svelte';
 import { castToNumber } from './cast-to-number';
-import type { ErrorSet } from '../stores/critical-css-recommendations';
-import type { CriticalCssErrorDetails } from '../stores/critical-css-status';
+import type { CriticalCssErrorDetails, ErrorSet } from '../stores/critical-css-recommendations';
 import type { SvelteComponent } from 'svelte';
 
 type Suggestion = {
diff --git a/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts b/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
index 3c5e456d337e8..4d76c1bbe3c54 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { __ } from '@wordpress/i18n';
 import { hideRegenerateCriticalCssSuggestion } from '../stores/config';
-import { clearDismissedRecommendations } from '../stores/critical-css-recommendations';
+import { clearDismissedIssues } from '../stores/critical-css-recommendations';
 import {
 	requestGeneration,
 	sendGenerationResult,
@@ -73,7 +73,7 @@ export default async function generateCriticalCss(
 
 	try {
 		if ( reset ) {
-			await clearDismissedRecommendations();
+			await clearDismissedIssues();
 			updateGenerateStatus( { status: 'requesting', progress: 0 } );
 			hideRegenerateCriticalCssSuggestion();
 		}
diff --git a/projects/plugins/boost/app/assets/src/js/utils/object-filter.ts b/projects/plugins/boost/app/assets/src/js/utils/object-filter.ts
deleted file mode 100644
index 693718ca9f292..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/utils/object-filter.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO: Fix issue with @template causing an issue with eslint fix.
-/* eslint-disable */
-/**
- * Handy helper method to run filter on an Object. Similar to Array.filter,
- * but for objects.
- *
- * Usually templated ValueType can be auto-detected by TypeScript and won't
- * need to be specified.
- *
- * @template {*} ValueType - Type of object values.
- * @param { Object }   obj       - Object to map.
- * @param { Function } predicate - Callback to run on each object value.
- */
-/* eslint-enable */
-export function objectFilter< ValueType >(
-	obj: { [ name: string ]: ValueType },
-	predicate: ( value: ValueType, key?: string ) => boolean
-): { [ name: string ]: ValueType } {
-	return Object.entries( obj ).reduce( ( filtered, [ key, value ] ) => {
-		if ( predicate( value, key ) ) {
-			filtered[ key ] = value;
-		}
-
-		return filtered;
-	}, {} as { [ name: string ]: ValueType } );
-}
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
index 656abf7a163ea..ecdb301eb1c0c 100644
--- a/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
@@ -9,7 +9,6 @@
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_State;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_Storage;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Display_Critical_CSS;
-use Automattic\Jetpack_Boost\Lib\Critical_CSS\Recommendations;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Source_Providers\Source_Providers;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Has_Endpoints;
@@ -48,13 +47,6 @@ public function __construct() {
 	 * This is only run if Critical CSS module has been activated.
 	 */
 	public function setup() {
-		// Touch to setup the post type. This is a temporary hack.
-		// This should instantiate a new Post_Type_Storage class,
-		// so that Critical_CSS class is responsible
-		// for setting up the storage.
-		$recommendations = new Recommendations();
-		$recommendations->attach_hooks();
-
 		add_action( 'wp', array( $this, 'display_critical_css' ) );
 
 		if ( Generator::is_generating_critical_css() ) {
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Generator.php b/projects/plugins/boost/app/features/optimizations/critical-css/Generator.php
index 6bee4d5b6b074..bbc0eb733ebe1 100644
--- a/projects/plugins/boost/app/features/optimizations/critical-css/Generator.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Generator.php
@@ -61,20 +61,13 @@ public function get_critical_css_status() {
 			);
 		}
 
-		$providers_errors    = $this->state->get_providers_errors();
-		$provider_key_labels = array_combine(
-			array_keys( $providers_errors ),
-			array_map( array( $this, 'describe_provider_key' ), array_keys( $providers_errors ) )
-		);
-
 		return array(
 			'status'                => Critical_CSS_State::SUCCESS,
 			'progress'              => $this->state->get_percent_complete(),
 			'success_count'         => $this->state->get_providers_success_count(),
 			'core_providers'        => self::CORE_PROVIDER_KEYS,
 			'core_providers_status' => $this->state->get_core_providers_status( self::CORE_PROVIDER_KEYS ),
-			'providers_errors'      => $providers_errors,
-			'provider_key_labels'   => $provider_key_labels,
+			'issues'                => $this->get_issues(),
 			'created'               => $this->state->get_created_time(),
 			'updated'               => $this->state->get_updated_time(),
 		);
@@ -98,6 +91,36 @@ public function find_provider_for( $provider_key ) {
 		return false;
 	}
 
+	/**
+	 * Get providers errors.
+	 *
+	 * @return array
+	 */
+	public function get_issues() {
+
+		$providers_errors = $this->state->get_providers_errors();
+		$issue_status     = $this->state->get_provider_issue_status();
+		$issues           = array();
+		foreach ( $providers_errors as $provider => $url_errors ) {
+			$errors = array();
+			foreach ( $url_errors as $url => $error ) {
+				$error['url'] = $url;
+				$errors[]     = $error;
+			}
+			$label = $this->describe_provider_key( $provider );
+
+			$status   = ! empty( $issue_status[ $provider ] ) ? $issue_status[ $provider ] : 'active';
+			$issues[] = array(
+				'provider_name' => $label,
+				'key'           => $provider,
+				'status'        => $status,
+				'errors'        => $errors,
+			);
+		}
+
+		return $issues;
+	}
+
 	/**
 	 * Returns a descriptive label for a provider key, or the raw provider key
 	 * if none found.
@@ -154,6 +177,7 @@ public static function is_generating_critical_css() {
 
 		return $is_generating;
 	}
+
 	// phpcs:enable WordPress.Security.NonceVerification.Recommended
 
 	public function make_generation_request() {
diff --git a/projects/plugins/boost/app/lib/critical-css/Critical_CSS_State.php b/projects/plugins/boost/app/lib/critical-css/Critical_CSS_State.php
index 978aec0eede10..a795190869f9d 100644
--- a/projects/plugins/boost/app/lib/critical-css/Critical_CSS_State.php
+++ b/projects/plugins/boost/app/lib/critical-css/Critical_CSS_State.php
@@ -107,6 +107,26 @@ private function get_state_transient() {
 		);
 	}
 
+	public function get_provider_issue_status() {
+		return $this->collate_column( 'issue_status' );
+	}
+	public function set_provider_issue_status( $provider_key, $status ) {
+		$valid_statuses = array( 'dismissed', 'active' );
+		if ( ! in_array( $status, $valid_statuses, true ) ) {
+			return;
+		}
+
+		$this->sources[ $provider_key ]['issue_status'] = $status;
+		$this->save();
+	}
+
+	public function reset_provider_issue_status() {
+		foreach ( $this->sources as $provider_key => $source ) {
+			$this->sources[ $provider_key ]['issue_status'] = 'active';
+		}
+		$this->save();
+	}
+
 	public function maybe_set_status() {
 		if ( $this->get_total_providers_count() === $this->get_processed_providers_count() ) {
 			// Only consider the generation a success if at least one provider was successful
diff --git a/projects/plugins/boost/app/lib/critical-css/Recommendations.php b/projects/plugins/boost/app/lib/critical-css/Recommendations.php
deleted file mode 100644
index 367b528fd20b7..0000000000000
--- a/projects/plugins/boost/app/lib/critical-css/Recommendations.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace Automattic\Jetpack_Boost\Lib\Critical_CSS;
-
-use Automattic\Jetpack_Boost\Lib\Collection;
-
-class Recommendations {
-
-	protected $dismissed_recommendations;
-
-	public function __construct() {
-		$this->dismissed_recommendations = new Collection( 'jetpack_boost_dismissed_recommendations' );
-	}
-
-	public function attach_hooks() {
-		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_boost_js_constants' ) );
-	}
-
-	public function add_boost_js_constants( $constants ) {
-		$constants['criticalCssDismissedRecommendations'] = $this->dismissed_recommendations->get();
-
-		return $constants;
-	}
-
-	public function dismiss( $recommendation_for_provider ) {
-		$this->dismissed_recommendations->append( $recommendation_for_provider );
-	}
-
-	public function reset() {
-		$this->dismissed_recommendations->delete();
-	}
-
-}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php
index e583ae029fa7c..38df2616d8370 100644
--- a/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php
@@ -5,7 +5,6 @@
 use Automattic\Jetpack_Boost\Admin\Regenerate_Admin_Notice;
 use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generator;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_Storage;
-use Automattic\Jetpack_Boost\Lib\Critical_CSS\Recommendations;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
 
@@ -21,13 +20,11 @@ public function response( $request ) {
 		$generator = new Generator();
 
 		if ( $reset ) {
-			$storage         = new Critical_CSS_Storage();
-			$recommendations = new Recommendations();
+			$storage = new Critical_CSS_Storage();
 
 			// Create a new Critical CSS Request block to track creation request.
 			$storage->clear();
 			$generator->make_generation_request();
-			$recommendations->reset();
 			Regenerate_Admin_Notice::dismiss();
 		}
 
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php
index 5f2cf39190487..ad45704b96a18 100644
--- a/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php
@@ -6,7 +6,6 @@
 use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generator;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_State;
 use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_Storage;
-use Automattic\Jetpack_Boost\Lib\Critical_CSS\Recommendations;
 use Automattic\Jetpack_Boost\Lib\Nonce;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
@@ -70,13 +69,11 @@ public function response( $request ) {
 			);
 		}
 
-		$storage         = new Critical_CSS_Storage();
-		$recommendations = new Recommendations();
-		$generator       = new Generator();
+		$storage   = new Critical_CSS_Storage();
+		$generator = new Generator();
 
 		$storage->store_css( $cache_key, $params['data'] );
 		$generator->state->set_source_success( $cache_key );
-		$recommendations->reset();
 
 		Regenerate_Admin_Notice::dismiss();
 		Critical_CSS_State::set_fresh();
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php
index abacdb5eb6f59..6214315c81fba 100644
--- a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php
+++ b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php
@@ -2,7 +2,7 @@
 
 namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
 
-use Automattic\Jetpack_Boost\Lib\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_State;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Nonce;
@@ -19,8 +19,9 @@ public function response( $request ) {
 			wp_send_json_error();
 		}
 
-		$recommendations = new Recommendations();
-		$recommendations->dismiss( $provider_key );
+		$state = new Critical_CSS_State();
+		$state->set_provider_issue_status( $provider_key, 'dismissed' );
+
 		wp_send_json_success();
 	}
 
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php
index 963a8a43c4221..d362050c9fe3e 100644
--- a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php
+++ b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php
@@ -1,7 +1,7 @@
 <?php
 namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
 
-use Automattic\Jetpack_Boost\Lib\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\Lib\Critical_CSS\Critical_CSS_State;
 use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
 use Automattic\Jetpack_Boost\REST_API\Permissions\Nonce;
@@ -15,8 +15,8 @@ public function request_methods() {
 	// $request is required to adhere to the contract.
 	//phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 	public function response( $request ) {
-		$recommendations = new Recommendations();
-		$recommendations->reset();
+		$state = new Critical_CSS_State();
+		$state->reset_provider_issue_status();
 		wp_send_json_success();
 	}
 
diff --git a/projects/plugins/boost/changelog/boost-fix-critical-css-notices b/projects/plugins/boost/changelog/boost-fix-critical-css-notices
new file mode 100644
index 0000000000000..baf282852c170
--- /dev/null
+++ b/projects/plugins/boost/changelog/boost-fix-critical-css-notices
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: User non-facing refactor
+
+

From 4fd1cd0b51fa8a027bf53f566d4e8c4c312114e7 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <anomiex@users.noreply.github.com>
Date: Fri, 17 Feb 2023 00:54:36 -0500
Subject: [PATCH 16/51] tools: Strengthen report about old PHP in dev env check
 (#29003)

The note that "Version 8.0 or later is recommended" issued by
`check-development-environment.sh` when using PHP 7.4 is being read to
imply that 7.4 should work, which is not the case for our tooling (it
just should be ok for running plugins).

The message will now state "Version 8.0 or later is recommended. Tooling
may raise errors with earlier versions."
---
 tools/check-development-environment.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check-development-environment.sh b/tools/check-development-environment.sh
index d973a88197c3f..0095504c735e4 100755
--- a/tools/check-development-environment.sh
+++ b/tools/check-development-environment.sh
@@ -203,7 +203,7 @@ else
 	elif php -r "exit( version_compare( PHP_VERSION, '$PHP_VERSION', '>=' ) ? 0 : 1 );"; then
 		success "ok (version $VER)"
 	elif php -r "exit( version_compare( PHP_VERSION, '$MIN_PHP_VERSION', '>=' ) ? 0 : 1 );"; then
-		warning "ok (version $VER)" 'php' "Version $PHP_VERSION or later is recommended."
+		warning "ok (version $VER)" 'php' "Version $PHP_VERSION or later is recommended. Tooling may raise errors with earlier versions."
 	else
 		failure 'too old' 'php' "PHP at $BIN is version $VER. Version $MIN_PHP_VERSION or later is required; $PHP_VERSION or later is recommended."
 	fi

From 20b388c035e5a2a8010b4e47e15d030743540dd3 Mon Sep 17 00:00:00 2001
From: Francesco Bigiarini <francesco.bigiarini@gmail.com>
Date: Fri, 17 Feb 2023 09:07:25 +0100
Subject: [PATCH 17/51] Fix import hierarchies (#29012)

* Fix imported resources hierarchies

* changelog
---
 .../import/changelog/fix-import-hierarchies   |  4 ++
 .../import/src/endpoints/class-category.php   | 26 +------------
 .../import/src/endpoints/class-comment.php    | 38 ++++++++-----------
 .../import/src/endpoints/class-page.php       | 27 ++++++-------
 .../import/src/endpoints/class-post.php       | 26 +------------
 .../import/src/endpoints/class-tag.php        | 19 ----------
 .../import/src/endpoints/trait-import.php     | 15 --------
 7 files changed, 32 insertions(+), 123 deletions(-)
 create mode 100644 projects/packages/import/changelog/fix-import-hierarchies

diff --git a/projects/packages/import/changelog/fix-import-hierarchies b/projects/packages/import/changelog/fix-import-hierarchies
new file mode 100644
index 0000000000000..70edcc3cc2e91
--- /dev/null
+++ b/projects/packages/import/changelog/fix-import-hierarchies
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed various imported resources hierarchies
diff --git a/projects/packages/import/src/endpoints/class-category.php b/projects/packages/import/src/endpoints/class-category.php
index a96ee9f77551e..2ddcb7b202463 100644
--- a/projects/packages/import/src/endpoints/class-category.php
+++ b/projects/packages/import/src/endpoints/class-category.php
@@ -64,7 +64,7 @@ public function add_additional_fields_schema( $schema ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function create_item( $request ) {
-		if ( isset( $request['parent'] ) ) {
+		if ( ! empty( $request['parent'] ) ) {
 			$parent = get_term_by( 'slug', $request['parent'], 'category' );
 
 			// Overwrite the parent ID with the parent term ID found using the slug.
@@ -75,28 +75,4 @@ public function create_item( $request ) {
 
 		return $this->add_import_id_metadata( $request, $response );
 	}
-
-	/**
-	 * Update the category parent ID.
-	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
-	 */
-	protected function update_parent_id( $resource_id, $parent_import_id ) {
-		$categories = \get_categories( $this->get_import_db_query( $parent_import_id ) );
-
-		if ( is_array( $categories ) && count( $categories ) === 1 ) {
-			$parent_id = $categories[0];
-
-			return (bool) \wp_update_category(
-				array(
-					'cat_ID'          => $resource_id,
-					'category_parent' => $parent_id,
-				)
-			);
-		}
-
-		return false;
-	}
 }
diff --git a/projects/packages/import/src/endpoints/class-comment.php b/projects/packages/import/src/endpoints/class-comment.php
index b45e6e58c84f8..638cf5592ed04 100644
--- a/projects/packages/import/src/endpoints/class-comment.php
+++ b/projects/packages/import/src/endpoints/class-comment.php
@@ -24,7 +24,7 @@ public function __construct() {
 		parent::__construct();
 
 		// @see add_comment_meta
-		$this->import_id_meta_type = $this->rest_base;
+		$this->import_id_meta_type = 'comment';
 	}
 
 	/**
@@ -47,32 +47,24 @@ public function register_routes() {
 	 * @return WP_REST_Response|WP_Error Response object on success, or error object on failure.
 	 */
 	public function create_item( $request ) {
-		$response = parent::create_item( $request );
-
-		return $this->add_import_id_metadata( $request, $response );
-	}
+		// Resolve comment post ID.
+		if ( ! empty( $request['post'] ) ) {
+			$posts = \get_posts( $this->get_import_db_query( $request['post'] ) );
 
-	/**
-	 * Update the comment parent ID.
-	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
-	 */
-	protected function update_parent_id( $resource_id, $parent_import_id ) {
-		$comments = \get_comments( $this->get_import_db_query( $parent_import_id ) );
+			// Overwrite the comment parent post ID.
+			$request['post'] = is_array( $posts ) && count( $posts ) ? $posts[0] : 0;
+		}
 
-		if ( is_array( $comments ) && count( $comments ) === 1 ) {
-			$parent_id = $comments[0];
+		// Resolve comment parent ID.
+		if ( ! empty( $request['parent'] ) ) {
+			$comments = \get_comments( $this->get_import_db_query( $request['parent'] ) );
 
-			return (bool) \wp_update_comment(
-				array(
-					'comment_ID'     => $resource_id,
-					'comment_parent' => $parent_id,
-				)
-			);
+			// Overwrite the comment parent post ID.
+			$request['parent'] = is_array( $comments ) && count( $comments ) ? $comments[0] : 0;
 		}
 
-		return false;
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
 	}
 }
diff --git a/projects/packages/import/src/endpoints/class-page.php b/projects/packages/import/src/endpoints/class-page.php
index 84f6a82edaf17..8d10533339d4e 100644
--- a/projects/packages/import/src/endpoints/class-page.php
+++ b/projects/packages/import/src/endpoints/class-page.php
@@ -20,26 +20,21 @@ public function __construct() {
 	}
 
 	/**
-	 * Update the post parent ID.
+	 * Creates a single page.
 	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	protected function update_parent_id( $resource_id, $parent_import_id ) {
-		$pages = \get_pages( $this->get_import_db_query( $parent_import_id ) );
+	public function create_item( $request ) {
+		if ( ! empty( $request['parent'] ) ) {
+			$pages = \get_pages( $this->get_import_db_query( $request['parent'] ) );
 
-		if ( is_array( $pages ) && count( $pages ) === 1 ) {
-			$parent_id = $pages[0]->ID;
-
-			return (bool) \wp_update_post(
-				array(
-					'ID'          => $resource_id,
-					'post_parent' => $parent_id,
-				)
-			);
+			// Overwrite the page parent page ID.
+			$request['parent'] = is_array( $pages ) && count( $pages ) ? $pages[0]->ID : 0;
 		}
 
-		return false;
+		$response = parent::create_item( $request );
+
+		return $this->add_import_id_metadata( $request, $response );
 	}
 }
diff --git a/projects/packages/import/src/endpoints/class-post.php b/projects/packages/import/src/endpoints/class-post.php
index d41877d919396..5a3be46033790 100644
--- a/projects/packages/import/src/endpoints/class-post.php
+++ b/projects/packages/import/src/endpoints/class-post.php
@@ -64,7 +64,7 @@ public function add_additional_fields_schema( $schema ) {
 	}
 
 	/**
-	 * Creates a single post / page.
+	 * Creates a single post.
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -131,28 +131,4 @@ protected function extract_terms_ids( $request, $taxonomy ) {
 			return array();
 		}
 	}
-
-	/**
-	 * Update the post parent ID.
-	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
-	 */
-	protected function update_parent_id( $resource_id, $parent_import_id ) {
-		$posts = \get_posts( $this->get_import_db_query( $parent_import_id ) );
-
-		if ( is_array( $posts ) && count( $posts ) === 1 ) {
-			$parent_id = $posts[0];
-
-			return (bool) \wp_update_post(
-				array(
-					'ID'          => $resource_id,
-					'post_parent' => $parent_id,
-				)
-			);
-		}
-
-		return false;
-	}
 }
diff --git a/projects/packages/import/src/endpoints/class-tag.php b/projects/packages/import/src/endpoints/class-tag.php
index 78123c76dc223..154db4beb200e 100644
--- a/projects/packages/import/src/endpoints/class-tag.php
+++ b/projects/packages/import/src/endpoints/class-tag.php
@@ -39,23 +39,4 @@ public function register_routes() {
 			$this->get_route_options()
 		);
 	}
-
-	/**
-	 * Update the tag parent ID.
-	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
-	 */
-	protected function update_parent_id( $resource_id, $parent_import_id ) {
-		$terms = \get_terms( $this->get_import_db_query( $parent_import_id ) );
-
-		if ( is_array( $terms ) && count( $terms ) === 1 ) {
-			$parent_id = $terms[0];
-
-			return (bool) \wp_update_term( $resource_id, $this->import_id_meta_type, array( 'parent' => $parent_id ) );
-		}
-
-		return false;
-	}
 }
diff --git a/projects/packages/import/src/endpoints/trait-import.php b/projects/packages/import/src/endpoints/trait-import.php
index 77af714cbbb08..b6fc9a974ac1f 100644
--- a/projects/packages/import/src/endpoints/trait-import.php
+++ b/projects/packages/import/src/endpoints/trait-import.php
@@ -99,12 +99,6 @@ protected function add_import_id_metadata( $request, $response ) {
 		// Add the import unique ID to the resource metadata.
 		\add_metadata( $this->import_id_meta_type, $data['id'], $this->import_id_field_name, $request[ $this->import_id_field_name ], true );
 
-		// If the resource has a parent.
-		if ( $request[ $this->import_id_field_name ] !== 0 ) {
-			// Update the parent.
-			$this->update_parent_id( $data['id'], $request[ $this->import_id_field_name ] );
-		}
-
 		return $response;
 	}
 
@@ -168,13 +162,4 @@ protected function get_route_options() {
 			'schema'      => array( $this, 'get_public_item_schema' ),
 		);
 	}
-
-	/**
-	 * Update the resource parent ID.
-	 *
-	 * @param int $resource_id      The resource ID.
-	 * @param int $parent_import_id The parent ID.
-	 * @return bool True if updated.
-	 */
-	abstract protected function update_parent_id( $resource_id, $parent_import_id );
 }

From 65e69f634a81793959f2a547069e9917f63e4a9b Mon Sep 17 00:00:00 2001
From: Karen Attfield <karenlattfield@gmail.com>
Date: Fri, 17 Feb 2023 08:17:35 +0000
Subject: [PATCH 18/51] Jetpack Live Branches: Adding options to populate CRM
 and Woo data (#28873)

---
 .../jetpack-live-branches.user.js             | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/tools/jetpack-live-branches/jetpack-live-branches.user.js b/tools/jetpack-live-branches/jetpack-live-branches.user.js
index 67cf56772e464..ada1db104c9ee 100644
--- a/tools/jetpack-live-branches/jetpack-live-branches.user.js
+++ b/tools/jetpack-live-branches/jetpack-live-branches.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Jetpack Live Branches
 // @namespace    https://wordpress.com/
-// @version      1.26
+// @version      1.27
 // @description  Adds links to PRs pointing to Jurassic Ninja sites for live-testing a changeset
 // @grant        GM_xmlhttpRequest
 // @connect      jurassic.ninja
@@ -165,6 +165,14 @@
 									label: 'Pre-generate content',
 									name: 'content',
 								},
+								{
+									label: 'Pre-generate CRM data',
+									name: 'jpcrm-populate-crm-data',
+								},
+								{
+									label: 'Pre-generate CRM Woo data',
+									name: 'jpcrm-populate-woo-data',
+								},
 								{
 									label: '<code>xmlrpc.php</code> unavailable',
 									name: 'blockxmlrpc',
@@ -229,10 +237,6 @@
 									label: 'WP Job Manager',
 									name: 'wp-job-manager',
 								},
-								{
-									label: 'Jetpack CRM',
-									name: 'zero-bs-crm',
-								},
 								{
 									label: 'Jetpack Debug Helper',
 									name: 'jetpack-debug-helper',
@@ -325,11 +329,17 @@
 				if ( input.value ) {
 					query.push( encodeURIComponent( input.name ) + '=' + encodeURIComponent( input.value ) );
 				} else {
+					if (
+						input.name === 'jpcrm-populate-crm-data' ||
+						input.value === 'jpcrm-populate-woo-data'
+					) {
+						query.push( encodeURIComponent( 'jpcrm' ) );
+					}
 					query.push( encodeURIComponent( input.name ) );
 				}
 			} );
 			// prettier-ignore
-			return `${ host }/create?${ query.join( '&' ).replace( /%(2F|5[BD])/g, m => decodeURIComponent( m ) ) }`;
+			return [ `${ host }/create?${ query.join( '&' ).replace( /%(2F|5[BD])/g, m => decodeURIComponent( m ) ) }`, query ];
 		}
 
 		/**
@@ -420,10 +430,27 @@
 		 */
 		function updateLink() {
 			const $link = $( '#jetpack-beta-branch-link' );
-			const url = getLink();
+			const [ url, query ] = getLink();
 
 			if ( url.match( /[?&]branch(es\.[^&=]*)?=/ ) ) {
-				$link.attr( 'href', url ).text( url );
+				if (
+					query.includes( 'jpcrm-populate-crm-data' ) &&
+					! url.match( /[?&]branches\.zero-bs-crm/ )
+				) {
+					// /jpcrm-populate-crm-data/
+					$link
+						.attr( 'href', null )
+						.text( 'Select the Jetpack CRM plugin in order to populate with CRM data' );
+				} else if (
+					query.includes( 'jpcrm-populate-woo-data' ) &&
+					! query.includes( 'woocommerce' )
+				) {
+					$link
+						.attr( 'href', null )
+						.text( 'Select the WooCommerce plugin in order to populate with CRM Woo data' );
+				} else {
+					$link.attr( 'href', url ).text( url );
+				}
 			} else {
 				$link.attr( 'href', null ).text( 'Select at least one plugin to test' );
 			}

From fd06f842965fa55ccf1efff62d5e3d54e764024f Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Fri, 17 Feb 2023 10:30:10 +0100
Subject: [PATCH 19/51] General: enabled automated plugin releases for
 Migration (#29014)

---
 .../changelog/update-migration-enable-autoupdates          | 4 ++++
 projects/plugins/migration/composer.json                   | 7 ++++++-
 projects/plugins/migration/composer.lock                   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 projects/plugins/migration/changelog/update-migration-enable-autoupdates

diff --git a/projects/plugins/migration/changelog/update-migration-enable-autoupdates b/projects/plugins/migration/changelog/update-migration-enable-autoupdates
new file mode 100644
index 0000000000000..4a3ebbf015d16
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-migration-enable-autoupdates
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+General: enable automated plugin releases.
diff --git a/projects/plugins/migration/composer.json b/projects/plugins/migration/composer.json
index ff99960eccce9..65584e7fe5eee 100644
--- a/projects/plugins/migration/composer.json
+++ b/projects/plugins/migration/composer.json
@@ -59,9 +59,14 @@
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"extra": {
+		"autorelease": true,
+		"autotagger": {
+			"v": false
+		},
 		"mirror-repo": "Automattic/wpcom-migration",
 		"release-branch-prefix": "migration",
-		"wp-plugin-slug": "wpcom-migration"
+		"wp-plugin-slug": "wpcom-migration",
+		"wp-svn-autopublish": true
 	},
 	"config": {
 		"allow-plugins": {
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
index 1b8c778f1e502..ddcb8718da499 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1ddcdf6c42199ee2e81f1e3125bff4f1",
+    "content-hash": "1fd3765ca177131d6455d3228f5260a2",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",

From 773fb225a7b4e3a14e0d1d16c6c2ddc048dee9a0 Mon Sep 17 00:00:00 2001
From: ouikhuan <iverson0217@gmail.com>
Date: Fri, 17 Feb 2023 19:46:16 +0800
Subject: [PATCH 20/51] Update useAnalytics hook doc to including assets
 section (#29016)

* Adding a new section in README to describe including assets in backend

* changelog

* Fix version mismatch
---
 .../changelog/update-use-analytics-hook-doc   |  4 +++
 .../shared-extension-utils/package.json       |  2 +-
 .../src/hooks/readme.md                       | 35 +++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc

diff --git a/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc b/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc
new file mode 100644
index 0000000000000..cd088c0ff6475
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add a new section to describe including assets from backend
diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json
index 4d2733ef41195..78bede3a54602 100644
--- 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.8.4",
+	"version": "0.9.0-alpha",
 	"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/js-packages/shared-extension-utils/src/hooks/readme.md b/projects/js-packages/shared-extension-utils/src/hooks/readme.md
index 812c35c517144..492a6f3b5950c 100644
--- a/projects/js-packages/shared-extension-utils/src/hooks/readme.md
+++ b/projects/js-packages/shared-extension-utils/src/hooks/readme.md
@@ -10,6 +10,37 @@ use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
 wp_add_inline_script( 'your-app-script-handle-in-editor', Connection_Initial_State::render(), 'before' );
 ```
 
+Adding Tracks related class and including the check function in your admin ui page:
+```php
+use Automattic\Jetpack\Status as Status;
+use Automattic\Jetpack\Terms_Of_Service;
+use Automattic\Jetpack\Tracking;
+
+/**
+ * Returns whether we are in condition to track to use
+ * Analytics functionality like Tracks, MC, or GA.
+ */
+public static function can_use_analytics() {
+	$status     = new Status();
+	$connection = new Connection_Manager();
+	$tracking   = new Tracking( 'jetpack', $connection );
+
+	return $tracking->should_enable_tracking( new Terms_Of_Service(), $status );
+}
+```
+
+Then adding the assets in the `enqueue_admin_scripts` function after the `Assets::register_script` function:
+```php
+public function enqueue_admin_scripts() {
+	...
+	// Required for Analytics.
+	if ( self::can_use_analytics() ) {
+		Tracking::register_tracks_functions_scripts( true );
+	}
+	...
+}
+```
+
 ## Usage
 
 ```es6
@@ -23,7 +54,7 @@ tracks.recordEvent( 'jetpack_editor_block_upgrade_click', {
 ```
 
 The hook function also accepts parameters to record a "page view" event when the component renders.
-You can also import a wrapped version of `recordEvent` that checks for a Jetpack connected user before actually recording the event.  
+You can also import a wrapped version of `recordEvent` that checks for a Jetpack connected user before actually recording the event.
 
 ```es6
 const Component = () => {
@@ -33,7 +64,7 @@ const Component = () => {
 			pageViewSuffix: '',
 		} );
 	const recordClick = useCallback( () => { recordEvent( 'event_name', {} ) }, [] );
-	
+
 	return (
 		<Button
 			onClick={ recordClick }

From bb97fed0e132729b5189312f79c5a66579872696 Mon Sep 17 00:00:00 2001
From: MILLER/F <millerf@automattic.com>
Date: Fri, 17 Feb 2023 14:53:25 +0100
Subject: [PATCH 21/51] [AI] Better openAi prompt (#28565)

* [not verified] first try

* changelog

* Some cleanup, add retry button

* Some fix

* Some re-work

* More fixes

* Refactor logic

* Refactor logic

* Add animated text

* Fix issue when not enough characters are needed

* Use closures for createPrompt

* Rename state attributes that could be misleading

* Make containsAiUntriggeredParapgraph more readable

* Remove useless/wrong comment

* [not verified] implement Brent's feedback

* added useSelect dependencies

* Some fixes

* Small fixes

* Better wording for ShowLittleByLittle state vars

* Fix typo

* Fix issue when switching order

* Check length for the title

* Added comment

* Should display retry when the API errors

* Save line breaks as <br/>

* Remove isContentSet and use useEffect instead

* Save animationDone in the component data to prevent redrawing issues where animation would not be triggered.

* Use block name from index.js

* Transform to <br/> on setting the content

* [not verified] apply nl2br at the end of the process as content is being cleaned

* Fix issue when there is no content

* set content as HTML source and do the nl2br whenr eceiving the data

* escape br

* restart tests

* Romario's feedback

* Pleasing the crowd

* relaunch tests

* Rework create prompt to work for every situation but a totally empty post

* changelog

* Better checks

* Fix comments and prevents loops

* Added tests and trimmed prompt

* make use of a useSelect to simplify the code and state to be updated correctly, when content is emptied back, fo example

* Remove translators comment

* Re-add analytics

---------

Co-authored-by: artpi <artur.piszek@gmail.com>
---
 .../changelog/add-better-open-ai-prompt       |   4 +
 .../extensions/blocks/ai-paragraph/edit.js    | 146 +++++++++---------
 .../blocks/ai-paragraph/test/edit.js          |  54 +++++++
 3 files changed, 127 insertions(+), 77 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/add-better-open-ai-prompt
 create mode 100644 projects/plugins/jetpack/extensions/blocks/ai-paragraph/test/edit.js

diff --git a/projects/plugins/jetpack/changelog/add-better-open-ai-prompt b/projects/plugins/jetpack/changelog/add-better-open-ai-prompt
new file mode 100644
index 0000000000000..2e02d7df602bd
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-better-open-ai-prompt
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+createPrompt will now create a prompt for every case except when the post is totally empty
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-paragraph/edit.js b/projects/plugins/jetpack/extensions/blocks/ai-paragraph/edit.js
index 76b5cac8ed6fa..26bfafa884782 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-paragraph/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-paragraph/edit.js
@@ -9,14 +9,16 @@ import { useState, RawHTML, useEffect } from '@wordpress/element';
 import { sprintf, __ } from '@wordpress/i18n';
 import { name as aiParagraphBlockName } from './index';
 
-// Minimum number of characters needed in the prompt to send it to the backend
-const NUMBER_OF_CHARACTERS_NEEDED = 36;
-
 // Maximum number of characters we send from the content
-const MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT = 240;
+export const MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT = 240;
 
 // Creates the prompt that will eventually be sent to OpenAI. It uses the current post title, content (before the actual AI block) - or a slice of it if too long, and tags + categories names
-const createPrompt = ( postTitle, contentBeforeCurrentBlock, tagsAndCategoriesNames ) => {
+export const createPrompt = (
+	postTitle = '',
+	contentBeforeCurrentBlock = [],
+	categoriesNames = '',
+	tagsNames = ''
+) => {
 	const content = contentBeforeCurrentBlock
 		.filter( function ( block ) {
 			return block && block.attributes && block.attributes.content;
@@ -27,47 +29,39 @@ const createPrompt = ( postTitle, contentBeforeCurrentBlock, tagsAndCategoriesNa
 		.join( '\n' );
 	const shorter_content = content.slice( -1 * MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT );
 
-	// If title is not added, we will only complete.
-	if ( ! postTitle ) {
-		return shorter_content;
+	// We prevent a prompt if everything is empty
+	if ( ! postTitle && ! shorter_content && ! categoriesNames && ! tagsNames ) {
+		return false;
 	}
 
-	// Title, content and categories
-	if ( shorter_content && tagsAndCategoriesNames.length ) {
-		return sprintf(
-			/** translators: This will be a prompt to OpenAI to generate a post based on the post title, comma-seperated category names and the last MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT characters of content. */
-			__( "This is a post titled '%1$s', published in categories '%2$s':\n\n … %3$s", 'jetpack' ), // eslint-disable-line @wordpress/i18n-no-collapsible-whitespace
-			postTitle,
-			tagsAndCategoriesNames,
-			shorter_content
+	let prompt = '';
+	// We will generate the content
+	if ( postTitle ) {
+		prompt = sprintf(
+			/** translators: This will be the beginning of a prompt that will be sent to OpenAI based on the post title. */
+			__( "This is a post titled '%1$s' ", 'jetpack' ),
+			postTitle
 		);
+	} else {
+		prompt = __( 'This is a post', 'jetpack' );
 	}
 
-	// No content, only title and categories
-	if ( tagsAndCategoriesNames.length ) {
-		return sprintf(
-			/** translators: This will be a prompt to OpenAI to generate a post based on the post title, and comma-seperated category names. */
-			__( "This is a post titled '%1$s', published in categories '%2$s':\n", 'jetpack' ), // eslint-disable-line @wordpress/i18n-no-collapsible-whitespace
-			postTitle,
-			tagsAndCategoriesNames
-		);
+	if ( categoriesNames ) {
+		/** translators: This will be the follow up of a prompt that will be sent to OpenAI based on comma-seperated category names. */
+		prompt += sprintf( __( ", published in categories '%1$s'", 'jetpack' ), categoriesNames );
+	}
+
+	if ( tagsNames ) {
+		/** translators: This will be the follow up of a prompt that will be sent to OpenAI based on comma-seperated category names. */
+		prompt += sprintf( __( " and tagged '%1$s'", 'jetpack' ), tagsNames );
 	}
 
-	// Title and content
 	if ( shorter_content ) {
-		return sprintf(
-			/** translators: This will be a prompt to OpenAI to generate a post based on the post title, and the last MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT characters of content. */
-			__( "This is a post titled '%1$s':\n\n…%2$s", 'jetpack' ), // eslint-disable-line @wordpress/i18n-no-collapsible-whitespace
-			postTitle,
-			shorter_content
-		);
+		/** translators: This will be the end of a prompt that will be sent to OpenAI with the last MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT characters of content.*/
+		prompt += sprintf( __( ':\n\n … %s', 'jetpack' ), shorter_content ); // eslint-disable-line @wordpress/i18n-no-collapsible-whitespace
 	}
 
-	return sprintf(
-		/** translators: This will be a prompt to OpenAI to generate a post based on the post title */
-		__( 'Write content of a post titled "%s"', 'jetpack' ),
-		postTitle
-	);
+	return prompt.trim();
 };
 
 // This component displays the text word by word if show animation is true
@@ -108,8 +102,7 @@ function ShowLittleByLittle( { html, showAnimation, onAnimationDone } ) {
 export default function Edit( { attributes, setAttributes, clientId } ) {
 	const [ isLoadingCompletion, setIsLoadingCompletion ] = useState( false );
 	const [ isLoadingCategories, setIsLoadingCategories ] = useState( false );
-	const [ isWaitingForPreviousBlock, setIsWaitingForPreviousBlock ] = useState( false );
-	const [ needsMoreCharacters, setNeedsMoreCharacters ] = useState( 0 );
+	const [ needsMoreCharacters, setNeedsMoreCharacters ] = useState( false );
 	const [ showRetry, setShowRetry ] = useState( false );
 	const [ errorMessage, setErrorMessage ] = useState( false );
 	const { tracks } = useAnalytics();
@@ -119,8 +112,6 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 		select( 'core/editor' ).getEditedPostAttribute( 'title' )
 	);
 
-	const postId = useSelect( select => select( 'core/editor' ).getCurrentPostId() );
-
 	let loading = false;
 	const categories =
 		useSelect( select => select( 'core/editor' ).getEditedPostAttribute( 'categories' ) ) || [];
@@ -170,8 +161,13 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 		setIsLoadingCategories( loading );
 	}, [ loading ] );
 
-	const taxonomies = categoryObjects.filter( cat => cat.id !== 1 ).concat( tagObjects );
-	const categoryNames = taxonomies.map( ( { name } ) => name ).join( ', ' );
+	const postId = useSelect( select => select( 'core/editor' ).getCurrentPostId() );
+	const categoryNames = categoryObjects
+		.filter( cat => cat.id !== 1 )
+		.map( ( { name } ) => name )
+		.join( ', ' );
+	const tagNames = tagObjects.map( ( { name } ) => name ).join( ', ' );
+
 	const contentBefore = useSelect( select => {
 		const editor = select( 'core/block-editor' );
 		const index = editor.getBlockIndex( clientId );
@@ -193,14 +189,12 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 		}
 
 		setShowRetry( false );
-		setIsWaitingForPreviousBlock( false );
 		setErrorMessage( false );
-		setNeedsMoreCharacters( 0 );
+		setNeedsMoreCharacters( false );
 		setIsLoadingCompletion( true );
 
 		const data = {
-			content: createPrompt( currentPostTitle, contentBefore, categoryNames ),
-			post_id: postId,
+			content: createPrompt( currentPostTitle, contentBefore, categoryNames, tagNames ),
 		};
 
 		tracks.recordEvent( 'jetpack_ai_gpt3_completion', {
@@ -241,46 +235,44 @@ export default function Edit( { attributes, setAttributes, clientId } ) {
 	// We do nothing is we are waiting for stuff OR if the content is already loaded.
 	const noLogicNeeded = contentIsLoaded || isWaitingState;
 
-	if ( ! noLogicNeeded ) {
-		const prompt = createPrompt( currentPostTitle, contentBefore, categoryNames );
-		const nbCharactersNeeded = NUMBER_OF_CHARACTERS_NEEDED - prompt.length;
+	useSelect( () => {
+		if ( ! noLogicNeeded ) {
+			const prompt = createPrompt( currentPostTitle, contentBefore, categoryNames, tagNames );
 
-		if ( containsAiUntriggeredParagraph() ) {
-			if ( ! isWaitingForPreviousBlock ) {
+			if ( containsAiUntriggeredParagraph() ) {
 				setErrorMessage(
 					/** translators: This will be an error message when multiple Open AI paragraph blocks are triggered on the same page. */
 					__( 'Waiting for the previous AI paragraph block to finish', 'jetpack' )
 				);
-				setIsWaitingForPreviousBlock( true );
-			}
-		} else if (
-			prompt.length < NUMBER_OF_CHARACTERS_NEEDED &&
-			needsMoreCharacters !== nbCharactersNeeded
-		) {
-			setErrorMessage(
-				sprintf(
+			} else if ( ! prompt ) {
+				setErrorMessage(
 					/** translators: First placeholder is a number of more characters we need */
 					__(
-						'Please write a longer title or a few more words in the opening preceding the AI block. Our AI model needs %1$d more characters.',
+						'Please write a longer title or a few more words in the opening preceding the AI block. Our AI model needs some content.',
 						'jetpack'
-					),
-					nbCharactersNeeded
-				)
-			);
-			setIsWaitingForPreviousBlock( false );
-			setNeedsMoreCharacters( nbCharactersNeeded );
-		} else if ( needsMoreCharacters !== 0 && prompt.length >= NUMBER_OF_CHARACTERS_NEEDED ) {
-			setErrorMessage(
-				/** translators: This is to retry to complete the text */
-				__( 'Ready to retry', 'jetpack' )
-			);
-			setShowRetry( true );
-			setIsWaitingForPreviousBlock( false );
-			setNeedsMoreCharacters( 0 );
-		} else if ( needsMoreCharacters === 0 && ! showRetry ) {
-			getSuggestionFromOpenAI();
+					)
+				);
+				setNeedsMoreCharacters( true );
+			} else if ( needsMoreCharacters ) {
+				setErrorMessage(
+					/** translators: This is to retry to complete the text */
+					__( 'Ready to retry', 'jetpack' )
+				);
+				setShowRetry( true );
+				setNeedsMoreCharacters( false );
+			} else if ( ! needsMoreCharacters && ! showRetry ) {
+				getSuggestionFromOpenAI();
+			}
 		}
-	}
+	}, [
+		currentPostTitle,
+		contentBefore,
+		categoryNames,
+		tagNames,
+		noLogicNeeded,
+		needsMoreCharacters,
+		showRetry,
+	] );
 
 	return (
 		<div { ...useBlockProps() }>
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-paragraph/test/edit.js b/projects/plugins/jetpack/extensions/blocks/ai-paragraph/test/edit.js
new file mode 100644
index 0000000000000..f94d27f7e7823
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/ai-paragraph/test/edit.js
@@ -0,0 +1,54 @@
+import { createPrompt, MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT } from '../edit';
+
+describe( 'AIParagraphEdit', () => {
+	test( 'createPrompt', () => {
+		const fakeBlock = { attributes: { content: 'content' } };
+		const fakeBlockWithBr = { attributes: { content: 'content<br/>content2' } };
+		const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+		const charactersLength = characters.length;
+		let longContent = '';
+		for ( let i = 0; i < MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT + 10; i++ ) {
+			longContent += characters.charAt( Math.floor( Math.random() * charactersLength ) );
+		}
+		const fakeBlockWithVeryLongContent = { attributes: { content: longContent } };
+
+		// Test empty posts get falsy
+		expect( createPrompt() ).toBeFalsy();
+		expect( createPrompt( '', [], '', '' ) ).toBeFalsy();
+
+		// Test contents
+		expect( createPrompt( 'title', [], '', '' ) ).toBe( "This is a post titled 'title'" );
+		expect(
+			createPrompt( 'title', [ fakeBlock, { attributes: { whatever: 'content' } } ], '', '' )
+		).toBe( "This is a post titled 'title' :\n\n … content" );
+
+		// Test that <BR/> are being translated. And content trimmed
+		expect( createPrompt( 'title', [ fakeBlockWithBr ], '', '' ) ).toBe(
+			"This is a post titled 'title' :\n\n … content\ncontent2"
+		);
+
+		expect( createPrompt( 'title', [ fakeBlock, fakeBlock ], 'cat 1', '' ) ).toBe(
+			"This is a post titled 'title' , published in categories 'cat 1':\n\n … content\ncontent"
+		);
+
+		// Test MAX content length
+		expect( createPrompt( 'title', [ fakeBlockWithVeryLongContent ] ) ).toBe(
+			"This is a post titled 'title' :\n\n … " +
+				longContent.slice( -MAXIMUM_NUMBER_OF_CHARACTERS_SENT_FROM_CONTENT )
+		);
+
+		// Test only cats
+		expect( createPrompt( '', [ fakeBlock ], 'cat1', 'tag1' ) ).toBe(
+			"This is a post, published in categories 'cat1' and tagged 'tag1':\n\n … content"
+		);
+		expect( createPrompt( '', [ fakeBlock ], 'cat1, cat2', 'tag1' ) ).toBe(
+			"This is a post, published in categories 'cat1, cat2' and tagged 'tag1':\n\n … content"
+		);
+		expect( createPrompt( '', [], 'cat1, cat2', 'tag1' ) ).toBe(
+			"This is a post, published in categories 'cat1, cat2' and tagged 'tag1'"
+		);
+		expect( createPrompt( 'title', [], 'cat1, cat2', 'tag1' ) ).toBe(
+			"This is a post titled 'title' , published in categories 'cat1, cat2' and tagged 'tag1'"
+		);
+	} );
+} );

From 064f95cf06b27916adf581f83ed998be7ddec3ac Mon Sep 17 00:00:00 2001
From: Bogdan Nikolic <bogdan.nikolic87@gmail.com>
Date: Fri, 17 Feb 2023 15:07:17 +0100
Subject: [PATCH 22/51] Migration plugin: Add track events and fix font face
 (#28974)

* Add track events logic

* Define font face from the @automattic/typography package

---------

Co-authored-by: Wayne Wang <iverson0217@gmail.com>
---
 pnpm-lock.yaml                                |  6 ++++++
 .../changelog/migration-plugin-analytics      |  4 ++++
 projects/plugins/migration/package.json       |  3 +++
 .../migration/src/class-wpcom-migration.php   | 20 +++++++++++++++++++
 .../src/js/components/migration/index.tsx     |  7 ++++++-
 .../src/js/components/migration/progress.tsx  | 11 +++++++++-
 .../components/migration/styles.module.scss   |  2 ++
 7 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 projects/plugins/migration/changelog/migration-plugin-analytics

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 46d40236de500..e99808274664b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1966,11 +1966,14 @@ importers:
 
   projects/plugins/migration:
     specifiers:
+      '@automattic/jetpack-analytics': workspace:*
       '@automattic/jetpack-api': workspace:*
       '@automattic/jetpack-base-styles': workspace:*
       '@automattic/jetpack-components': workspace:*
       '@automattic/jetpack-connection': workspace:*
+      '@automattic/jetpack-shared-extension-utils': workspace:*
       '@automattic/jetpack-webpack-config': workspace:*
+      '@automattic/typography': 1.0.0
       '@babel/core': 7.20.12
       '@babel/preset-env': 7.20.2
       '@babel/register': 7.18.9
@@ -1989,10 +1992,13 @@ importers:
       webpack: 5.72.1
       webpack-cli: 4.9.1
     dependencies:
+      '@automattic/jetpack-analytics': link:../../js-packages/analytics
       '@automattic/jetpack-api': link:../../js-packages/api
       '@automattic/jetpack-base-styles': link:../../js-packages/base-styles
       '@automattic/jetpack-components': link:../../js-packages/components
       '@automattic/jetpack-connection': link:../../js-packages/connection
+      '@automattic/jetpack-shared-extension-utils': link:../../js-packages/shared-extension-utils
+      '@automattic/typography': 1.0.0
       '@wordpress/components': 23.3.0_pjwopsidmaokadturxaafygjp4
       '@wordpress/data': 8.3.0_react@18.2.0
       '@wordpress/date': 4.26.0
diff --git a/projects/plugins/migration/changelog/migration-plugin-analytics b/projects/plugins/migration/changelog/migration-plugin-analytics
new file mode 100644
index 0000000000000..f7d4d5281db27
--- /dev/null
+++ b/projects/plugins/migration/changelog/migration-plugin-analytics
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add track events logic for "Get started" and "Check your migration progress" buttons
diff --git a/projects/plugins/migration/package.json b/projects/plugins/migration/package.json
index 4d34038d1cb0e..08207dc20ed3a 100644
--- a/projects/plugins/migration/package.json
+++ b/projects/plugins/migration/package.json
@@ -25,10 +25,13 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
+		"@automattic/jetpack-analytics": "workspace:*",
 		"@automattic/jetpack-api": "workspace:*",
 		"@automattic/jetpack-base-styles": "workspace:*",
 		"@automattic/jetpack-components": "workspace:*",
 		"@automattic/jetpack-connection": "workspace:*",
+		"@automattic/jetpack-shared-extension-utils": "workspace:*",
+		"@automattic/typography": "1.0.0",
 		"@wordpress/components": "23.3.0",
 		"@wordpress/data": "8.3.0",
 		"@wordpress/date": "4.26.0",
diff --git a/projects/plugins/migration/src/class-wpcom-migration.php b/projects/plugins/migration/src/class-wpcom-migration.php
index 08322c74cb232..89a79d3801b87 100644
--- a/projects/plugins/migration/src/class-wpcom-migration.php
+++ b/projects/plugins/migration/src/class-wpcom-migration.php
@@ -16,7 +16,10 @@
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Connection\Rest_Authentication as Connection_Rest_Authentication;
 use Automattic\Jetpack\My_Jetpack\Initializer as My_Jetpack_Initializer;
+use Automattic\Jetpack\Status as Status;
 use Automattic\Jetpack\Sync\Data_Settings;
+use Automattic\Jetpack\Terms_Of_Service;
+use Automattic\Jetpack\Tracking;
 
 /**
  * Class WPCOM_Migration
@@ -79,6 +82,18 @@ public function admin_menu_hook_callback() {
 		add_action( 'load-' . $page_suffix, array( $this, 'admin_init' ) );
 	}
 
+	/**
+	 * Returns whether we are in condition to track to use
+	 * Analytics functionality like Tracks, MC, or GA.
+	 */
+	public static function can_use_analytics() {
+		$status     = new Status();
+		$connection = new Connection_Manager();
+		$tracking   = new Tracking( 'jetpack', $connection );
+
+		return $tracking->should_enable_tracking( new Terms_Of_Service(), $status );
+	}
+
 	/**
 	 * Initialize the admin resources.
 	 */
@@ -100,6 +115,11 @@ public function enqueue_admin_scripts() {
 			)
 		);
 		Assets::enqueue_script( 'wpcom-migration' );
+
+		// Required for Analytics.
+		if ( self::can_use_analytics() ) {
+			Tracking::register_tracks_functions_scripts( true );
+		}
 		// Initial JS state including JP Connection data.
 		wp_add_inline_script( 'wpcom-migration', Connection_Initial_State::render(), 'before' );
 		wp_add_inline_script( 'wpcom-migration', $this->render_initial_state(), 'before' );
diff --git a/projects/plugins/migration/src/js/components/migration/index.tsx b/projects/plugins/migration/src/js/components/migration/index.tsx
index 1a95bfc6cd81b..c7c351b798fb0 100644
--- a/projects/plugins/migration/src/js/components/migration/index.tsx
+++ b/projects/plugins/migration/src/js/components/migration/index.tsx
@@ -1,5 +1,6 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
 import { ConnectScreenLayout, useConnection } from '@automattic/jetpack-connection';
+import { useAnalytics } from '@automattic/jetpack-shared-extension-utils';
 import { Button, Notice } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
@@ -69,15 +70,19 @@ export function Migration( props: Props ) {
 
 	const buttonIsLoading = siteIsRegistering || userIsConnecting;
 	const isFullyConnected = isRegistered && isUserConnected;
+	const { tracks } = useAnalytics();
 
 	const onGetStartedClick = useCallback(
 		( e: Event ) => {
+			tracks.recordEvent( `jetpack_migration_get_started_click`, {
+				source_site_slug: sourceSiteSlug,
+			} );
 			// If it's fully connected, href attribute is the final destination
 			if ( ! isFullyConnected ) {
 				handleRegisterSite( e );
 			}
 		},
-		[ isFullyConnected, handleRegisterSite ]
+		[ isFullyConnected, handleRegisterSite, tracks, sourceSiteSlug ]
 	);
 
 	return (
diff --git a/projects/plugins/migration/src/js/components/migration/progress.tsx b/projects/plugins/migration/src/js/components/migration/progress.tsx
index 1c832447b7f6c..feabfa3d5e294 100644
--- a/projects/plugins/migration/src/js/components/migration/progress.tsx
+++ b/projects/plugins/migration/src/js/components/migration/progress.tsx
@@ -1,10 +1,11 @@
 import restApi from '@automattic/jetpack-api';
 import { getRedirectUrl } from '@automattic/jetpack-components';
 import { ConnectScreenLayout } from '@automattic/jetpack-connection';
+import { useAnalytics } from '@automattic/jetpack-shared-extension-utils';
 import { Button } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import { MIGRATION_HANDLER_ROUTE } from '../constants';
 import { WordPressLogo } from '../illustrations';
 import migrationImage2 from './../../../../images/migration-2.png';
@@ -23,12 +24,19 @@ interface Props {
  */
 export function MigrationProgress( props: Props ) {
 	const { apiRoot, apiNonce, sourceSiteSlug } = props;
+	const { tracks } = useAnalytics();
 
 	useEffect( () => {
 		restApi.setApiRoot( apiRoot );
 		restApi.setApiNonce( apiNonce );
 	}, [ apiRoot, apiNonce ] );
 
+	const onCheckProgressClick = useCallback( () => {
+		tracks.recordEvent( `jetpack_migration_check_progress_click`, {
+			source_site_slug: sourceSiteSlug,
+		} );
+	}, [ tracks, sourceSiteSlug ] );
+
 	return (
 		<ConnectScreenLayout
 			className={ 'wordpress-branding' }
@@ -48,6 +56,7 @@ export function MigrationProgress( props: Props ) {
 					isSecondary={ true }
 					target={ '_blank' }
 					href={ `${ MIGRATION_HANDLER_ROUTE }?from=${ sourceSiteSlug }` }
+					onClick={ onCheckProgressClick }
 				>
 					{ __( 'Check your migration progress', 'wpcom-migration' ) }
 				</Button>
diff --git a/projects/plugins/migration/src/js/components/migration/styles.module.scss b/projects/plugins/migration/src/js/components/migration/styles.module.scss
index 672210e72cf2e..b4913d0d9db08 100644
--- a/projects/plugins/migration/src/js/components/migration/styles.module.scss
+++ b/projects/plugins/migration/src/js/components/migration/styles.module.scss
@@ -1,3 +1,5 @@
+@import "@automattic/typography/styles/fonts";
+
 :global {
 	#wpcom-migration-root {
 		.jp-connection__connect-screen-layout ol.migration-listing {

From c128089c4a7de3db9eff056b0700f5ee79763f2e Mon Sep 17 00:00:00 2001
From: Karen Attfield <karenlattfield@gmail.com>
Date: Fri, 17 Feb 2023 14:11:30 +0000
Subject: [PATCH 23/51] CRM: Cleaning up PHPCS comments in
 ZeroBSCRM.FormatHelpers.php (#28996)

Mistakenly added in #28956
---
 .../crm/changelog/fix-crm-remove-phpcsdisable-leftover       | 5 +++++
 projects/plugins/crm/includes/ZeroBSCRM.FormatHelpers.php    | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 projects/plugins/crm/changelog/fix-crm-remove-phpcsdisable-leftover

diff --git a/projects/plugins/crm/changelog/fix-crm-remove-phpcsdisable-leftover b/projects/plugins/crm/changelog/fix-crm-remove-phpcsdisable-leftover
new file mode 100644
index 0000000000000..a3f37271c7fcc
--- /dev/null
+++ b/projects/plugins/crm/changelog/fix-crm-remove-phpcsdisable-leftover
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Removing phpcs comments
+
+
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.FormatHelpers.php b/projects/plugins/crm/includes/ZeroBSCRM.FormatHelpers.php
index f6344685127cc..2cff417f2685a 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.FormatHelpers.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.FormatHelpers.php
@@ -1148,7 +1148,6 @@ function zeroBSCRM_html_taskDate($task=array()){
 	    return $start_d . ' - ' . $end_d;
 	}
 
-	// phpcs:disable
 /* ======================================================
   /	Tasks
    ====================================================== */
@@ -1959,5 +1958,4 @@ function zeroBSCRM_format_migrationVersion($ver=''){
 
    		return $migrationName;
    		
-   }
-// phpcs: enable
\ No newline at end of file
+   }
\ No newline at end of file

From f3b2868a8594cd1838cb307fd19a088f0ef0b7ff Mon Sep 17 00:00:00 2001
From: Grant Kinney <creativecoder@users.noreply.github.com>
Date: Fri, 17 Feb 2023 09:43:01 -0600
Subject: [PATCH 24/51] Writing prompts: adds initial scaffolding for block
 (#29013)

---
 .../add-blogging-prompts-block-scaffolding    |  4 ++
 .../blocks/blogging-prompt/attributes.js      |  3 ++
 .../blogging-prompt/blogging-prompt.php       | 50 +++++++++++++++++
 .../extensions/blocks/blogging-prompt/edit.js | 42 +++++++++++++++
 .../blocks/blogging-prompt/editor.js          |  7 +++
 .../blocks/blogging-prompt/editor.scss        |  5 ++
 .../extensions/blocks/blogging-prompt/icon.js | 13 +++++
 .../blocks/blogging-prompt/index.js           | 54 +++++++++++++++++++
 .../plugins/jetpack/extensions/index.json     |  1 +
 9 files changed, 179 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/attributes.js
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/blogging-prompt.php
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.js
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.scss
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/icon.js
 create mode 100644 projects/plugins/jetpack/extensions/blocks/blogging-prompt/index.js

diff --git a/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding b/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
new file mode 100644
index 0000000000000..5bd8d037e39bc
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Writing prompts: adds initial scaffolding for block
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/attributes.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/attributes.js
new file mode 100644
index 0000000000000..edfdf8db56e5d
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/attributes.js
@@ -0,0 +1,3 @@
+export default {
+	// @TODO - Add block attributes here
+};
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/blogging-prompt.php b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/blogging-prompt.php
new file mode 100644
index 0000000000000..45ece826b2c59
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/blogging-prompt.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Blogging Prompts Block.
+ *
+ * @since 11.x
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack\Extensions\Blogging_Prompts;
+
+use Automattic\Jetpack\Blocks;
+use Jetpack_Gutenberg;
+
+const FEATURE_NAME = 'blogging-prompt';
+const BLOCK_NAME   = 'jetpack/' . FEATURE_NAME;
+
+/**
+ * Registers the block for use in Gutenberg
+ * This is done via an action so that we can disable
+ * registration if we need to.
+ */
+function register_block() {
+	Blocks::jetpack_register_block(
+		BLOCK_NAME,
+		array( 'render_callback' => __NAMESPACE__ . '\load_assets' )
+	);
+}
+add_action( 'init', __NAMESPACE__ . '\register_block' );
+
+/**
+ * Blogging Prompts block registration/dependency declaration.
+ *
+ * @param array  $attr    Array containing the Blogging Prompts block attributes.
+ * @param string $content String containing the Blogging Prompts block content.
+ *
+ * @return string
+ */
+function load_assets( $attr, $content ) {
+	/*
+	 * Enqueue necessary scripts and styles.
+	 */
+	Jetpack_Gutenberg::load_assets_as_required( FEATURE_NAME );
+
+	return sprintf(
+		'<div class="%1$s">%2$s</div>',
+		esc_attr( Blocks::classes( FEATURE_NAME, $attr ) ),
+		$content
+	);
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
new file mode 100644
index 0000000000000..7306f9ee7c27d
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/edit.js
@@ -0,0 +1,42 @@
+import { BlockIcon } from '@wordpress/block-editor';
+import { Placeholder } from '@wordpress/components';
+// import { useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import './editor.scss';
+import icon from './icon';
+
+function BloggingPromptsBetaEdit( {
+	// attributes,
+	className,
+	// noticeOperations,
+	noticeUI,
+	// setAttributes,
+} ) {
+	/**
+	 * Write the block editor UI.
+	 *
+	 * @returns {object} The UI displayed when user edits this block.
+	 */
+	// const [ notice, setNotice ] = useState();
+
+	/* Call this function when you want to show an error in the placeholder. */
+	// const setErrorNotice = () => {
+	// 	noticeOperations.removeAllNotices();
+	// 	noticeOperations.createErrorNotice( __( 'Put error message here.', 'jetpack' ) );
+	// };
+
+	return (
+		<div className={ className }>
+			<Placeholder
+				label={ __( 'Writing Prompts', 'jetpack' ) }
+				instructions={ __( 'Instructions go here.', 'jetpack' ) }
+				icon={ <BlockIcon icon={ icon } /> }
+				notices={ noticeUI }
+			>
+				{ __( 'User input goes here?', 'jetpack' ) }
+			</Placeholder>
+		</div>
+	);
+}
+
+export default BloggingPromptsBetaEdit;
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.js
new file mode 100644
index 0000000000000..d05f403942058
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.js
@@ -0,0 +1,7 @@
+/**
+ * Internal dependencies
+ */
+import registerJetpackBlock from '../../shared/register-jetpack-block';
+import { name, settings } from '.';
+
+registerJetpackBlock( name, settings );
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.scss b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.scss
new file mode 100644
index 0000000000000..60c36e56ab7e8
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/editor.scss
@@ -0,0 +1,5 @@
+/**
+ * Editor styles for Blogging Prompts
+ */
+
+.wp-block-jetpack-blogging-prompts-beta { }
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/icon.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/icon.js
new file mode 100644
index 0000000000000..f1a4e3f5c7931
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/icon.js
@@ -0,0 +1,13 @@
+/**
+ * External dependencies
+ */
+import { SVG, Path } from '@wordpress/components';
+
+export default (
+	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+		<Path
+			d="M14.3438 19.3438H9.65625C9.57031 19.3438 9.5 19.4141 9.5 19.5V20.125C9.5 20.4707 9.7793 20.75 10.125 20.75H13.875C14.2207 20.75 14.5 20.4707 14.5 20.125V19.5C14.5 19.4141 14.4297 19.3438 14.3438 19.3438ZM12 3.25C8.46289 3.25 5.59375 6.11914 5.59375 9.65625C5.59375 12.0273 6.88281 14.0977 8.79688 15.2051V17.4688C8.79688 17.8145 9.07617 18.0938 9.42188 18.0938H14.5781C14.9238 18.0938 15.2031 17.8145 15.2031 17.4688V15.2051C17.1172 14.0977 18.4062 12.0273 18.4062 9.65625C18.4062 6.11914 15.5371 3.25 12 3.25ZM14.498 13.9883L13.7969 14.3945V16.6875H10.2031V14.3945L9.50195 13.9883C7.96484 13.0996 7 11.4629 7 9.65625C7 6.89453 9.23828 4.65625 12 4.65625C14.7617 4.65625 17 6.89453 17 9.65625C17 11.4629 16.0352 13.0996 14.498 13.9883Z"
+			strokeWidth="0.1"
+		/>
+	</SVG>
+);
diff --git a/projects/plugins/jetpack/extensions/blocks/blogging-prompt/index.js b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/index.js
new file mode 100644
index 0000000000000..a75b1d8d3e210
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/blogging-prompt/index.js
@@ -0,0 +1,54 @@
+import { ExternalLink } from '@wordpress/components';
+import { Fragment } from '@wordpress/element';
+import { __, _x } from '@wordpress/i18n';
+import { getIconColor } from '../../shared/block-icons';
+import attributes from './attributes';
+import edit from './edit';
+import icon from './icon';
+
+/**
+ * Style dependencies
+ */
+import './editor.scss';
+
+export const name = 'blogging-prompt';
+export const title = __( 'Writing Prompt', 'jetpack' );
+export const settings = {
+	title,
+	description: (
+		<Fragment>
+			<p>{ __( 'Answer a new and inspiring writing prompt each day.', 'jetpack' ) }</p>
+			{ /* @TODO add link */ }
+			<ExternalLink href="#">{ __( 'Learn more.', 'jetpack' ) }</ExternalLink>
+		</Fragment>
+	),
+	icon: {
+		src: icon,
+		foreground: getIconColor(),
+	},
+	category: 'jetpack',
+	keywords: [
+		_x( 'writing', 'block search term', 'jetpack' ),
+		_x( 'blogging', 'block search term', 'jetpack' ),
+	],
+	supports: {
+		align: false,
+		alignWide: false,
+		anchor: false,
+		customClassName: true,
+		className: true,
+		html: false,
+		inserter: true,
+		multiple: false,
+		reusable: true,
+	},
+	edit,
+	/* @TODO Write the block editor output */
+	save: () => null,
+	attributes,
+	example: {
+		attributes: {
+			// @TODO: Add default values for block attributes, for generating the block preview.
+		},
+	},
+};
diff --git a/projects/plugins/jetpack/extensions/index.json b/projects/plugins/jetpack/extensions/index.json
index 85519c1bac58c..a12adf4dd02ef 100644
--- a/projects/plugins/jetpack/extensions/index.json
+++ b/projects/plugins/jetpack/extensions/index.json
@@ -47,6 +47,7 @@
 	],
 	"beta": [
 		"amazon",
+		"blogging-prompt",
 		"conversation",
 		"dialogue",
 		"google-docs-embed",

From d44dac5099caddc1e2fefd742e23e3060c548dbc Mon Sep 17 00:00:00 2001
From: Clemen <javacodia@gmail.com>
Date: Fri, 17 Feb 2023 15:52:00 +0000
Subject: [PATCH 25/51] Crm/fix/2641 disable frontend breaks jp connections
 (#28970)

* Check if it's a XMLRPC or REST request

* changelog

* Update changelog

* Remove comments (clean code: code is clear enough)
---
 .../crm-fix-disable-frontend-breaks-jp-connections |  4 ++++
 projects/plugins/crm/includes/ZeroBSCRM.Core.php   | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 projects/plugins/crm/changelog/crm-fix-disable-frontend-breaks-jp-connections

diff --git a/projects/plugins/crm/changelog/crm-fix-disable-frontend-breaks-jp-connections b/projects/plugins/crm/changelog/crm-fix-disable-frontend-breaks-jp-connections
new file mode 100644
index 0000000000000..15d43ab4e9210
--- /dev/null
+++ b/projects/plugins/crm/changelog/crm-fix-disable-frontend-breaks-jp-connections
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Before kill the frontend (when the option is enabled), skip it for XMLRPC or REST requests
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.Core.php b/projects/plugins/crm/includes/ZeroBSCRM.Core.php
index e70d56779bda0..f0aab37ff4e79 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.Core.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.Core.php
@@ -1819,10 +1819,16 @@ public function init() {
 
 			// } Catch front end loads :)
 			if ( $this->settings->get( 'killfrontend' ) == 1 ) {
-
-				// http://wordpress.stackexchange.com/questions/12863/check-if-were-on-the-wp-login-page
-				// } 2.0.2 also allow /wild stuff (e.g. welcome wiz)
-				if ( ! zeroBSCRM_isLoginPage() && ! zeroBSCRM_isWelcomeWizPage() && ! zeroBSCRM_isAPIRequest() ) {
+				global $pagenow;
+
+				if ( ! zeroBSCRM_isLoginPage()
+					&& ! zeroBSCRM_isWelcomeWizPage()
+					&& ! zeroBSCRM_isAPIRequest()
+					&& ! defined( 'XMLRPC_REQUEST' )
+					&& ! defined( 'REST_REQUEST' )
+					// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					&& ! ( 'index.php' === $pagenow && ! empty( $_GET['rest_route'] ) )
+				) {
 
 					zeroBSCRM_stopFrontEnd();
 

From fafa0c5a05a64b60eec8bc9ef3d343a209855fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Fri, 17 Feb 2023 13:09:16 -0300
Subject: [PATCH 26/51] Jetpack: tweak MediaButton component (#29027)

* [not verified] tweak extended media button

* changelog

* rollback allowing custom label

* fix button width in MediaPlaceholder context

* restore removed icon line
---
 .../update-jetpack-tweak-media-button         |  4 ++++
 .../shared/external-media/editor.scss         | 23 +++++++++++++++++++
 .../external-media/media-button/media-menu.js |  6 +++--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button

diff --git a/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button b/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button
new file mode 100644
index 0000000000000..1b3be433422e4
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Jetpack: tweak MediaButton component
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/editor.scss b/projects/plugins/jetpack/extensions/shared/external-media/editor.scss
index 73b4f239132ed..e50ac92582bc7 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/editor.scss
+++ b/projects/plugins/jetpack/extensions/shared/external-media/editor.scss
@@ -411,12 +411,35 @@ $grid-size: 8px;
 	justify-content: space-between;
 }
 
+.jetpack-external-media-button-menu__dropdown {
+	width: 100%;
+
+	.jetpack-external-media-button-menu {
+		width: 100%;
+		flex-direction: row;
+		text-align: left;
+		padding-left: 12px;
+		padding-right: 12px;
+	
+		.jetpack-external-media-button-menu__label {
+			flex-grow: 2;
+		}
+	}
+}
+
 // Reset placeholder button margin.
 .components-placeholder__fieldset,
 .editor-post-featured-image {
 	.components-dropdown .jetpack-external-media-button-menu {
+		width: auto;
 		margin-right: 8px;
 		margin-bottom: 1em;
+		padding-left: 6px;
+		padding-right: 6px;
+
+		> svg {
+			display: none;
+		}
 	}
 }
 
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/media-button/media-menu.js b/projects/plugins/jetpack/extensions/shared/external-media/media-button/media-menu.js
index 5e3225b216c8f..adb5b1edf3499 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/media-button/media-menu.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/media-button/media-menu.js
@@ -1,6 +1,6 @@
 import { Button, MenuItem, MenuGroup, Dropdown, NavigableMenu } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { media } from '@wordpress/icons';
+import { Icon, media } from '@wordpress/icons';
 import MediaSources from './media-sources';
 
 function MediaButtonMenu( props ) {
@@ -37,6 +37,7 @@ function MediaButtonMenu( props ) {
 		<>
 			<Dropdown
 				placement="bottom-start"
+				className="jetpack-external-media-button-menu__dropdown"
 				contentClassName="jetpack-external-media-button-menu__options"
 				renderToggle={ ( { isOpen, onToggle } ) => {
 					// override original button only when it's a simple button with text, or a featured image
@@ -55,7 +56,8 @@ function MediaButtonMenu( props ) {
 							aria-expanded={ isOpen }
 							onClick={ onToggle }
 						>
-							{ label }
+							<div className="jetpack-external-media-button-menu__label">{ label }</div>
+							<Icon icon={ media } />
 						</Button>
 					);
 				} }

From 2053cab08e7922b05316412ca976762b3cc46d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Fri, 17 Feb 2023 13:31:23 -0300
Subject: [PATCH 27/51] VideoPress: recognize admin actions to handle generated
 chapter (#28945)

* [not verified] add isAutogeneratedChapterFile() async helper fn

* [not verified] check autogenerated chapter in useVideoData() hook

* [not verified] update isAutogeneratedChapter in useSyncMedia()

* [not verified] delegate checking isAutogeneratedChapter to hook

* [not verified] rename var that allows overwrite chapter

* [not verified] allow upload auto-chapter when doesnt exist

* [not verified] add debug() line when when allowed overrite chapter

* [not verified] debug() lines

* [not verified] isAutogeneratedChapterFile() API accept token

* [not verified] changelog

* isAutogeneratedChapterFile() handles privacy

* move logic to detect autogen to useSyncMedia

* store the default auto-chapter in local state

* update chapter src once saves

* rely on attr to check autogen chapter
---
 ...ue-when-getting-autogenerated-chapter-file |  4 +
 .../client/block-editor/blocks/video/edit.tsx | 75 ++-----------------
 .../hooks/use-video-data-update/index.ts      | 45 ++++++++---
 .../hooks/use-video-data-update/types.ts      |  8 +-
 .../hooks/use-video-data/index.ts             |  2 +-
 .../src/client/lib/video-tracks/index.ts      | 55 ++++++++++++++
 6 files changed, 103 insertions(+), 86 deletions(-)
 create mode 100644 projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file

diff --git a/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file b/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file
new file mode 100644
index 0000000000000..890c4f23e116b
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+VideoPress: fix detecting auto-generated issue
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/edit.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/edit.tsx
index 890d60c4da200..813ad081fef4b 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/edit.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/edit.tsx
@@ -20,7 +20,6 @@ import debugFactory from 'debug';
  * Internal dependencies
  */
 import { isStandaloneActive, isVideoPressActive } from '../../../lib/connection';
-import getMediaToken from '../../../lib/get-media-token';
 import { buildVideoPressURL, getVideoPressUrl } from '../../../lib/url';
 import { useSyncMedia } from '../../hooks/use-video-data-update';
 import ConnectBanner from './components/banner/connect-banner';
@@ -117,7 +116,6 @@ export default function VideoPressEdit( {
 		align,
 		videoRatio,
 		tracks,
-		isPrivate,
 		src,
 		caption,
 		isExample,
@@ -139,75 +137,16 @@ export default function VideoPressEdit( {
 
 	// Get the redirect URI for the connection flow.
 	const [ isRedirectingToMyJetpack, setIsRedirectingToMyJetpack ] = useState( false );
-	/*
-	 * Request token when site is private
-	 */
-	const [ token, setToken ] = useState( null );
-	useEffect( () => {
-		if ( ! isPrivate ) {
-			return setToken( null );
-		}
-
-		getMediaToken( 'playback', { guid } ).then( tokenData => {
-			setToken( tokenData?.token );
-		} );
-	}, [ isPrivate ] );
-
-	// Store if the chapters file is auto-generated in a local state.
-	const [ isAutoGeneratedChapter, setIsAutoGeneratedChapter ] = useState( true );
 
 	// Detect if the chapter file is auto-generated.
 	const chapter = tracks?.filter( track => track.kind === 'chapters' )?.[ 0 ];
 
-	useEffect( () => {
-		if ( ! chapter || ! chapter.src ) {
-			return;
-		}
-
-		// Wait for the token when the video is private.
-		if ( isPrivate && ! token ) {
-			return;
-		}
-
-		let queryString = '';
-		if ( token ) {
-			queryString = '?' + new URLSearchParams( { metadata_token: token } ).toString();
-		}
-
-		const chapterUrl =
-			'https://videos.files.wordpress.com/' + guid + '/' + chapter.src + queryString;
-
-		try {
-			fetch( chapterUrl )
-				.then( function ( response ) {
-					response.text().then( function ( text ) {
-						if ( ! text ) {
-							return;
-						}
-
-						const isAutoGeneratedChaptersFile = /videopress-chapters-auto-generated/.test( text );
-						if ( isAutoGeneratedChaptersFile ) {
-							debug( 'Chapter %o auto-generated detected', chapter.src );
-						}
-						setIsAutoGeneratedChapter( isAutoGeneratedChaptersFile );
-					} );
-				} )
-				.catch( function ( error ) {
-					// eslint-disable-next-line no-console
-					console.error( error );
-				} );
-		} catch ( error ) {
-			throw new Error( error?.message ?? error );
-		}
-	}, [ chapter, guid, token, isPrivate ] );
-
-	const { videoData, isRequestingVideoData, error: syncError } = useSyncMedia(
-		attributes,
-		setAttributes,
-		{
-			isAutoGeneratedChapter,
-		}
-	);
+	const {
+		videoData,
+		isRequestingVideoData,
+		error: syncError,
+		isOverwriteChapterAllowed,
+	} = useSyncMedia( attributes, setAttributes );
 
 	const { filename, private_enabled_for_site: privateEnabledForSite } = videoData;
 
@@ -570,7 +509,7 @@ export default function VideoPressEdit( {
 				<DetailsPanel
 					filename={ filename }
 					chapter={ chapter }
-					isAutoGeneratedChapter={ isAutoGeneratedChapter }
+					isAutoGeneratedChapter={ isOverwriteChapterAllowed }
 					updateError={ syncError }
 					isRequestingVideoData={ isRequestingVideoData }
 					{ ...{ attributes, setAttributes } }
diff --git a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/index.ts b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/index.ts
index 7a1a2cd6892c3..e441a7a6d5e64 100644
--- a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/index.ts
+++ b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/index.ts
@@ -14,6 +14,7 @@ import debugFactory from 'debug';
  */
 import { getVideoPressUrl } from '../../../lib/url';
 import { uploadTrackForGuid } from '../../../lib/video-tracks';
+import { isAutogeneratedChapterFile } from '../../../lib/video-tracks';
 import { UploadTrackDataProps } from '../../../lib/video-tracks/types';
 import {
 	WPComV2VideopressGetMetaEndpointResponseProps,
@@ -30,7 +31,7 @@ import {
 } from '../../blocks/video/types';
 import useVideoData from '../use-video-data';
 import { VideoDataProps } from '../use-video-data/types';
-import { UseSyncMediaProps, UseSyncMediaOptionsProps, ArrangeTracksAttributesProps } from './types';
+import { UseSyncMediaProps, ArrangeTracksAttributesProps } from './types';
 
 const debug = debugFactory( 'videopress:video:use-sync-media' );
 
@@ -152,15 +153,13 @@ function arrangeTracksAttributes(
  * React hook to keep the data in-sync
  * between the media item and the block attributes.
  *
- * @param {object} attributes                - Block attributes.
- * @param {Function} setAttributes           - Block attributes setter.
- * @param {UseSyncMediaOptionsProps} options - Options.
- * @returns {UseSyncMediaProps}                Hook API object.
+ * @param {object} attributes      - Block attributes.
+ * @param {Function} setAttributes - Block attributes setter.
+ * @returns {UseSyncMediaProps}      Hook API object.
  */
 export function useSyncMedia(
 	attributes: VideoBlockAttributes,
-	setAttributes: VideoBlockSetAttributesProps,
-	options: UseSyncMediaOptionsProps
+	setAttributes: VideoBlockSetAttributesProps
 ): UseSyncMediaProps {
 	const { id, guid, isPrivate } = attributes;
 	const { videoData, isRequestingVideoData } = useVideoData( {
@@ -170,6 +169,8 @@ export function useSyncMedia(
 		maybeIsPrivate: isPrivate,
 	} );
 
+	const [ isOverwriteChapterAllowed, setIsOverwriteChapterAllowed ] = useState( false );
+
 	const isSaving = useSelect( select => select( editorStore ).isSavingPost(), [] );
 	const wasSaving = usePrevious( isSaving );
 	const invalidateResolution = useDispatch( coreStore ).invalidateResolution;
@@ -254,6 +255,29 @@ export function useSyncMedia(
 		setAttributes( attributesToUpdate );
 	}, [ videoData, isRequestingVideoData ] );
 
+	const chapterFileUrl = attributes.tracks.filter(
+		track => track.kind === 'chapters' && track.srcLang === 'en'
+	)[ 0 ]?.src;
+
+	useEffect( () => {
+		( async () => {
+			// Check if the (default) chapter file has been autogenerated.
+			if ( ! chapterFileUrl ) {
+				debug( 'Allow overwrite chapter: File does not exist' );
+				setIsOverwriteChapterAllowed( true );
+			} else {
+				const chapterUrl = 'https://videos.files.wordpress.com/' + guid + '/' + chapterFileUrl;
+				const isAutogenerated = await isAutogeneratedChapterFile( chapterUrl, { guid, isPrivate } );
+				debug(
+					'Chapter %o detected. Overwritable: %o',
+					chapterFileUrl,
+					isAutogenerated ? 'yes' : 'no'
+				);
+				setIsOverwriteChapterAllowed( isAutogenerated );
+			}
+		} )();
+	}, [ chapterFileUrl ] );
+
 	const updateMediaHandler = useMediaDataUpdate( id );
 
 	/*
@@ -329,12 +353,12 @@ export function useSyncMedia(
 				const chapters = extractVideoChapters( dataToUpdate?.description );
 
 				if (
-					options.isAutoGeneratedChapter &&
+					isOverwriteChapterAllowed &&
 					attributes?.guid &&
 					dataToUpdate?.description?.length &&
 					validateChapters( chapters )
 				) {
-					debug( 'Auto-generated chapter detected. Processing...' );
+					debug( 'Autogenerated chapter detected. Processing...' );
 					const track: UploadTrackDataProps = {
 						label: __( 'English (auto-generated)', 'jetpack-videopress-pkg' ),
 						srcLang: 'en',
@@ -342,7 +366,7 @@ export function useSyncMedia(
 						tmpFile: generateChaptersFile( dataToUpdate.description ),
 					};
 
-					debug( 'Auto-generated track: %o', track );
+					debug( 'Autogenerated track: %o', track );
 
 					uploadTrackForGuid( track, attributes.guid ).then( ( src: string ) => {
 						const autoGeneratedTrackIndex = attributes.tracks.findIndex(
@@ -403,5 +427,6 @@ export function useSyncMedia(
 		videoData,
 		isRequestingVideoData,
 		error,
+		isOverwriteChapterAllowed,
 	};
 }
diff --git a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/types.ts b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/types.ts
index ebc6fb5f950a3..8907f213dcf06 100644
--- a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/types.ts
+++ b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data-update/types.ts
@@ -2,18 +2,12 @@ import { WPComV2VideopressPostMetaEndpointBodyProps } from '../../../types';
 import { TrackProps } from '../../blocks/video/types';
 import { VideoDataProps } from '../use-video-data/types';
 
-export type UseSyncMediaOptionsProps = {
-	/*
-	 * Define if the chapters file is auto-generated
-	 */
-	isAutoGeneratedChapter: boolean;
-};
-
 export type UseSyncMediaProps = {
 	forceInitialState: ( data: WPComV2VideopressPostMetaEndpointBodyProps ) => void;
 	videoData: VideoDataProps;
 	isRequestingVideoData: boolean;
 	error: object | null;
+	isOverwriteChapterAllowed: boolean;
 };
 
 export type ArrangeTracksAttributesProps = [ Array< TrackProps >, boolean ];
diff --git a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data/index.ts b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data/index.ts
index 2de4371939009..74ab5f57d3e15 100644
--- a/projects/packages/videopress/src/client/block-editor/hooks/use-video-data/index.ts
+++ b/projects/packages/videopress/src/client/block-editor/hooks/use-video-data/index.ts
@@ -40,7 +40,7 @@ export default function useVideoData( {
 
 	useEffect( () => {
 		if ( ! isUserConnected ) {
-			debug( 'User is not connected ❌' );
+			debug( 'User is not connected' );
 			return;
 		}
 
diff --git a/projects/packages/videopress/src/client/lib/video-tracks/index.ts b/projects/packages/videopress/src/client/lib/video-tracks/index.ts
index 50576d57ab342..2f59379a43e72 100644
--- a/projects/packages/videopress/src/client/lib/video-tracks/index.ts
+++ b/projects/packages/videopress/src/client/lib/video-tracks/index.ts
@@ -7,6 +7,11 @@ import apiFetch from '@wordpress/api-fetch';
  */
 import getMediaToken from '../get-media-token';
 import { DeleteTrackDataProps, UploadTrackDataProps } from './types';
+/**
+ * Types
+ */
+import type { VideoGUID } from '../../block-editor/blocks/video/types';
+import type { MediaTokenProps } from '../get-media-token/types';
 
 export const TRACK_KIND_OPTIONS = [
 	'subtitles',
@@ -19,6 +24,56 @@ export const TRACK_KIND_OPTIONS = [
 const { siteType = '' } = window?.videoPressEditorState || {};
 const shouldUseJetpackVideoFetch = siteType !== 'simple';
 
+type isAutogeneratedChaterFileParamsProps = {
+	guid?: VideoGUID;
+	isPrivate?: boolean;
+};
+
+/**
+ * Load the file content, and check if it's autogenerated,
+ * based on the `videopress-chapters-auto-generated` comment.
+ * The function will try to anticipate the video privacy,
+ * based on the block attributes.
+ * If the first request fails, it will try again with the token.
+ *
+ * @param {string} fileUrl                              - the track file url
+ * @param {isAutogeneratedChaterFileParamsProps} params - function parameters
+ * @returns {Promise<boolean>}   true if the file is autogenerated.
+ */
+export async function isAutogeneratedChapterFile(
+	fileUrl: string,
+	params?: isAutogeneratedChaterFileParamsProps
+): Promise< boolean > {
+	if ( ! fileUrl ) {
+		return false;
+	}
+
+	let tokenData: null | MediaTokenProps;
+	let queryString = '';
+
+	// Try to anticipate the video privacy, based on the block attributes.
+	if ( params.isPrivate ) {
+		tokenData = await getMediaToken( 'playback', { guid: params.guid } );
+		queryString = '?' + new URLSearchParams( { metadata_token: tokenData?.token } ).toString();
+	}
+
+	let response = await fetch( fileUrl + queryString );
+
+	// If the file is private, and response is 403, try with the token.
+	if ( ! response.ok && response.status === 403 && params.guid ) {
+		tokenData = await getMediaToken( 'playback', { guid: params.guid } );
+		queryString = '?' + new URLSearchParams( { metadata_token: tokenData?.token } ).toString();
+		response = await fetch( fileUrl + queryString );
+	}
+
+	if ( ! response.ok ) {
+		return false;
+	}
+
+	const text = await response.text();
+	return /videopress-chapters-auto-generated/.test( text );
+}
+
 const videoPressUploadTrack = function ( track: UploadTrackDataProps, guid: string ) {
 	return new Promise( function ( resolve, reject ) {
 		const { kind, srcLang, label, tmpFile: vttFile } = track;

From 851cec8ddcb358277ba35b4bf4e5f237e7e9a544 Mon Sep 17 00:00:00 2001
From: Clemen <javacodia@gmail.com>
Date: Fri, 17 Feb 2023 18:05:40 +0000
Subject: [PATCH 28/51] CRM: Encode textarea fields produce HTML entities on
 views (#28941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [not verified] Don't encode textarea fields before store it in DB

* Add changelog

* Use sanitize_textarea_field instead the default sanitization

* Updating changelog

* Update projects/plugins/crm/changelog/fix-crm-html-entities-for-special-characters-in-textareas

Co-authored-by: André Kallehauge <3846700+kallehauge@users.noreply.github.com>

---------

Co-authored-by: André Kallehauge <3846700+kallehauge@users.noreply.github.com>
---
 ...m-html-entities-for-special-characters-in-textareas |  4 ++++
 .../plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php    | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 projects/plugins/crm/changelog/fix-crm-html-entities-for-special-characters-in-textareas

diff --git a/projects/plugins/crm/changelog/fix-crm-html-entities-for-special-characters-in-textareas b/projects/plugins/crm/changelog/fix-crm-html-entities-for-special-characters-in-textareas
new file mode 100644
index 0000000000000..713732c0e6442
--- /dev/null
+++ b/projects/plugins/crm/changelog/fix-crm-html-entities-for-special-characters-in-textareas
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Special characters in textarea fields (contacts, transactions, quotes) produce visible HTML entities
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php b/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php
index 28425589ebe96..b863df5d805bb 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Helpers.php
@@ -3112,12 +3112,10 @@ function zeroBS_buildObjArr($arraySource=array(),$startingArray=array(),$fieldPr
 		                        $retArray[$outputPrefix.$fK] = intval($retArray[$outputPrefix.$fK]);
 		                        break;
 
-
-		                    case 'textarea':
-
-		                        $retArray[$outputPrefix.$fK] = zeroBSCRM_textProcess($arraySource[$fieldPrefix.$fK]);
-
-		                        break;
+						case 'textarea':
+							// phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+							$retArray[ $outputPrefix . $fK ] = sanitize_textarea_field( $arraySource[ $fieldPrefix . $fK ] );
+							break;
 
 		                    case 'date':
 

From 72e79100af49b37d87a2753cc25f2b06bedd9cda Mon Sep 17 00:00:00 2001
From: Douglas Henri <dhasilva@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:07:25 -0300
Subject: [PATCH 29/51] VideoPress: Fix dashboard fatal mistake when reading
 malformed local video (#29011)

* fix issue with malformed local video

* changelog

* casting input to array for non-local files
---
 .../changelog/fix-videopress-local-library-fatal  |  4 ++++
 projects/packages/videopress/src/class-data.php   | 15 ++++++++++++---
 .../videopress/src/class-upload-exception.php     |  1 +
 .../client/admin/components/video-list/index.tsx  |  4 ++--
 .../videopress/src/client/state/constants.js      |  3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 projects/packages/videopress/changelog/fix-videopress-local-library-fatal

diff --git a/projects/packages/videopress/changelog/fix-videopress-local-library-fatal b/projects/packages/videopress/changelog/fix-videopress-local-library-fatal
new file mode 100644
index 0000000000000..62288ceff4286
--- /dev/null
+++ b/projects/packages/videopress/changelog/fix-videopress-local-library-fatal
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+VideoPress: Fix dashboard fatal mistake when reading malformed local video
diff --git a/projects/packages/videopress/src/class-data.php b/projects/packages/videopress/src/class-data.php
index 5317b20f1925c..89f2c9a003ff6 100644
--- a/projects/packages/videopress/src/class-data.php
+++ b/projects/packages/videopress/src/class-data.php
@@ -237,15 +237,23 @@ public static function get_initial_state() {
 		// Tweak local videos data.
 		$local_videos = array_map(
 			function ( $video ) {
+				$video              = (array) $video;
 				$id                 = $video['id'];
 				$media_details      = $video['media_details'];
 				$jetpack_videopress = $video['jetpack_videopress'];
+				$read_error         = null;
+
+				// In malformed files, the media_details or jetpack_videopress properties are not arrays.
+				if ( ! is_array( $media_details ) || ! is_array( $jetpack_videopress ) ) {
+					$media_details      = (array) $media_details;
+					$jetpack_videopress = (array) $jetpack_videopress;
+					$read_error         = Upload_Exception::ERROR_MALFORMED_FILE;
+				}
 
 				// Check if video is already uploaded to VideoPress or has some error.
 				try {
 					$uploader                  = new Uploader( $id );
 					$is_uploaded_to_videopress = $uploader->is_uploaded();
-					$read_error                = null;
 				} catch ( Upload_Exception $e ) {
 					$is_uploaded_to_videopress = false;
 					$read_error                = $e->getCode();
@@ -282,10 +290,11 @@ function ( $video ) {
 		// Tweak VideoPress videos data.
 		$videos = array_map(
 			function ( $video ) {
+				$video              = (array) $video;
 				$id                 = $video['id'];
 				$guid               = $video['jetpack_videopress_guid'];
-				$media_details      = $video['media_details'];
-				$jetpack_videopress = $video['jetpack_videopress'];
+				$media_details      = (array) $video['media_details'];
+				$jetpack_videopress = (array) $video['jetpack_videopress'];
 
 				$videopress_media_details = $media_details['videopress'];
 				$width                    = $media_details['width'];
diff --git a/projects/packages/videopress/src/class-upload-exception.php b/projects/packages/videopress/src/class-upload-exception.php
index b1ef0ebcb6b08..17db79ab618cd 100644
--- a/projects/packages/videopress/src/class-upload-exception.php
+++ b/projects/packages/videopress/src/class-upload-exception.php
@@ -14,4 +14,5 @@ class Upload_Exception extends \Exception {
 	const ERROR_INVALID_ATTACHMENT_ID   = 0;
 	const ERROR_FILE_NOT_FOUND          = 1;
 	const ERROR_MIME_TYPE_NOT_SUPPORTED = 2;
+	const ERROR_MALFORMED_FILE          = 3;
 }
diff --git a/projects/packages/videopress/src/client/admin/components/video-list/index.tsx b/projects/packages/videopress/src/client/admin/components/video-list/index.tsx
index 5fe15c5325873..4e4b15b78687d 100644
--- a/projects/packages/videopress/src/client/admin/components/video-list/index.tsx
+++ b/projects/packages/videopress/src/client/admin/components/video-list/index.tsx
@@ -11,7 +11,7 @@ import { useState } from 'react';
  * Internal dependencies
  */
 import {
-	ERROR_MIME_TYPE_NOT_SUPPORTED,
+	LOCAL_VIDEO_ERROR_MIME_TYPE_NOT_SUPPORTED,
 	VIDEO_PRIVACY_LEVELS,
 	VIDEO_PRIVACY_LEVEL_PRIVATE,
 } from '../../../state/constants';
@@ -162,7 +162,7 @@ export const LocalVideoList = ( {
 				<Tooltip
 					position="top center"
 					text={
-						video?.readError === ERROR_MIME_TYPE_NOT_SUPPORTED
+						video?.readError === LOCAL_VIDEO_ERROR_MIME_TYPE_NOT_SUPPORTED
 							? errorMessageMimeType
 							: errorMessageReadError
 					}
diff --git a/projects/packages/videopress/src/client/state/constants.js b/projects/packages/videopress/src/client/state/constants.js
index 4e13f11693c52..1284d59435d5b 100644
--- a/projects/packages/videopress/src/client/state/constants.js
+++ b/projects/packages/videopress/src/client/state/constants.js
@@ -91,7 +91,8 @@ export const VIDEO_PRIVACY_LEVELS = [
  */
 export const LOCAL_VIDEO_ERROR_INVALID_ATTACHMENT_ID = 0;
 export const LOCAL_VIDEO_ERROR_FILE_NOT_FOUND = 1;
-export const ERROR_MIME_TYPE_NOT_SUPPORTED = 2;
+export const LOCAL_VIDEO_ERROR_MIME_TYPE_NOT_SUPPORTED = 2;
+export const LOCAL_VIDEO_ERROR_MALFORMED_FILE = 3;
 
 export const VIDEO_RATING_G = 'G';
 export const VIDEO_RATING_PG_13 = 'PG-13';

From 0b2576fd72e9418ea8214cc9933cf3dee15bcc4c Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Fri, 17 Feb 2023 19:48:29 +0100
Subject: [PATCH 30/51] Reviews: allow Caribou to approve changes to the Import
 package (#29018)

---
 .github/files/required-review.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/files/required-review.yaml b/.github/files/required-review.yaml
index 317231b741f29..886f4af821007 100644
--- a/.github/files/required-review.yaml
+++ b/.github/files/required-review.yaml
@@ -35,6 +35,7 @@
    - '!projects/js-packages/svelte-data-sync-client/**'
    - '!projects/packages/wp-js-data-sync/**'
    - '!projects/packages/backup/**'
+   - '!projects/packages/import/**'
    - '!projects/packages/search/**'
    - '!projects/packages/stats/**'
    - '!projects/packages/stats-admin/**'
@@ -59,10 +60,11 @@
     - avengers
     - jetpack-approvers
 
-# The Caribou team reviews changes to the Migration plugin,
+# The Caribou team reviews changes to the Migration plugin and its Import package,
 # and can add dependencies to the monorepo's lock file.
 - name: Migration
   paths:
+    - 'projects/packages/import/**'
     - 'projects/plugins/migration/**'
     - '!projects/plugins/*/composer.lock'
     - '!projects/plugins/*/composer.json'

From cdcde6b0f8c149e2837e4ba65187a9444e2d44af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Fri, 17 Feb 2023 16:27:20 -0300
Subject: [PATCH 31/51] Jetpack: extend media button for VideoPress video block
 (#29032)

* [not verified] extend media button for videopress/video

* changelog
---
 ...ate-jetpack-extend-media-button-for-videopress-video-block | 4 ++++
 .../plugins/jetpack/extensions/shared/external-media/index.js | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block

diff --git a/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block b/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block
new file mode 100644
index 0000000000000..78000d3956308
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block
@@ -0,0 +1,4 @@
+Significance: minor
+Type: compat
+
+Jetpack: extend media button for VideoPress video block
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/index.js b/projects/plugins/jetpack/extensions/shared/external-media/index.js
index 5a9ff909aa8ba..62ab8d25283b1 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/index.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/index.js
@@ -31,6 +31,7 @@ if ( isCurrentUserConnected() && 'function' === typeof useBlockEditContext ) {
 			'jetpack/slideshow',
 			'jetpack/story',
 			'jetpack/tiled-gallery',
+			'videopress/video',
 		];
 
 		return allowedBlocks.indexOf( name ) > -1 && render.toString().indexOf( 'coblocks' ) === -1;

From b81cd67d0c04add7e8d07916b4e2c89ceb14026d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Fri, 17 Feb 2023 17:30:31 -0300
Subject: [PATCH 32/51] VideoPress: tweak poster control styles (#29033)

* [not verified] tweak uploading/replacing video poster

* [not verified] simplify media button text

* changelog
---
 .../update-jetpack-tweak-media-button         |  4 ++
 .../poster-image-block-control/index.tsx      | 48 ++++++++++++-------
 .../poster-image-block-control/types.ts       |  2 +-
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 projects/packages/videopress/changelog/update-jetpack-tweak-media-button

diff --git a/projects/packages/videopress/changelog/update-jetpack-tweak-media-button b/projects/packages/videopress/changelog/update-jetpack-tweak-media-button
new file mode 100644
index 0000000000000..4d46bb9acc0a1
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-jetpack-tweak-media-button
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+VideoPress: tweak poster control styles
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/index.tsx
index 92905b2e7c909..d94e0d06516fc 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/index.tsx
@@ -3,14 +3,19 @@
  */
 import { MediaUploadCheck, MediaUpload } from '@wordpress/block-editor';
 import { ToolbarButton, Dropdown, NavigableMenu, MenuItem } from '@wordpress/components';
+import { createInterpolateElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { linkOff, image as imageIcon } from '@wordpress/icons';
-import { VideoControlProps } from '../../types';
-import styles from './style.module.scss';
 /**
  * Internal dependencies
  */
-import { VideoPosterCardProsp } from './types';
+import styles from './style.module.scss';
+/**
+ * Types
+ */
+import type { VideoPosterCardProps } from './types';
+import type { AdminAjaxQueryAttachmentsResponseItemProps } from '../../../../../types';
+import type { VideoControlProps } from '../../types';
 import type React from 'react';
 
 const VIDEO_POSTER_ALLOWED_MEDIA_TYPES = [ 'image' ];
@@ -18,18 +23,28 @@ const VIDEO_POSTER_ALLOWED_MEDIA_TYPES = [ 'image' ];
 /**
  * Simple component that renders info about video poster.
  *
- * @param {VideoPosterCardProsp} props - Component props.
+ * @param {VideoPosterCardProps} props - Component props.
  * @returns {React.ReactElement}         VideoPosterCard component
  */
-function VideoPosterCard( { poster }: VideoPosterCardProsp ) {
-	const notes = __(
-		'No custom Poster image selected. You can upload or select an image from your media library to override the default video image.',
-		'jetpack-videopress-pkg'
+function VideoPosterCard( { poster }: VideoPosterCardProps ): React.ReactElement {
+	const notes = createInterpolateElement(
+		__(
+			'<strong>No custom Poster image selected.</strong> You can upload or select an image from your media library to override the default video image.',
+			'jetpack-videopress-pkg'
+		),
+		{
+			strong: <strong />,
+		}
 	);
 
-	const overridingNotes = __(
-		'You are currently overriding the default Poster image. Remove it if you want to use the default image generated by VideoPress.',
-		'jetpack-videopress-pkg'
+	const overridingNotes = createInterpolateElement(
+		__(
+			'<strong>You are currently overriding the default Poster image.</strong> Remove it if you want to use the default image generated by VideoPress.',
+			'jetpack-videopress-pkg'
+		),
+		{
+			strong: <strong />,
+		}
 	);
 
 	return <div className={ styles.current_media }>{ poster ? overridingNotes : notes }</div>;
@@ -45,9 +60,9 @@ export default function PosterImageBlockControl( {
 	attributes,
 	setAttributes,
 	clientId,
-}: VideoControlProps ) {
+}: VideoControlProps ): React.ReactElement {
 	const { poster } = attributes;
-	const onSelectPoster = image => {
+	const onSelectPoster = ( image: AdminAjaxQueryAttachmentsResponseItemProps ) => {
 		setAttributes( { poster: image.url } );
 	};
 
@@ -55,9 +70,6 @@ export default function PosterImageBlockControl( {
 		setAttributes( { poster: '' } );
 	};
 
-	const selectPosterLabel = __( 'Select Poster Image', 'jetpack-videopress-pkg' );
-	const replacePosterLabel = __( 'Replace Poster Image', 'jetpack-videopress-pkg' );
-
 	return (
 		<Dropdown
 			contentClassName={ styles.dropdown_content }
@@ -79,7 +91,7 @@ export default function PosterImageBlockControl( {
 							<MediaUploadCheck>
 								<MediaUpload
 									title={ __( 'Select Poster Image', 'jetpack-videopress-pkg' ) }
-									onSelect={ image => {
+									onSelect={ ( image: AdminAjaxQueryAttachmentsResponseItemProps ) => {
 										onSelectPoster( image );
 										onClose();
 									} }
@@ -90,7 +102,7 @@ export default function PosterImageBlockControl( {
 											onClick={ open }
 											aria-describedby={ videoPosterDescription }
 										>
-											{ ! poster ? selectPosterLabel : replacePosterLabel }
+											{ __( 'Open Media Library', 'jetpack-videopress-pkg' ) }
 											<p id={ videoPosterDescription } hidden>
 												{ poster
 													? sprintf(
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/types.ts b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/types.ts
index c510a8c0f7bd9..52a8acde2cdeb 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/types.ts
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/poster-image-block-control/types.ts
@@ -1,3 +1,3 @@
-export type VideoPosterCardProsp = {
+export type VideoPosterCardProps = {
 	poster: string;
 };

From 1e2ce39c5f5f8365bebeab35ba6accca7d86b167 Mon Sep 17 00:00:00 2001
From: gogdzl <37049295+gogdzl@users.noreply.github.com>
Date: Fri, 17 Feb 2023 18:15:18 -0300
Subject: [PATCH 33/51] CRM: Fields deleted if not included in CSV (#28886)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Populate customer data so the update does not erase missing fields

* changelog

---------

Co-authored-by: André Kallehauge <3846700+kallehauge@users.noreply.github.com>
---
 ...-fix-fields_deleted_if_not_included_in_csv |  4 +++
 .../crm/includes/ZeroBSCRM.CSVImporter.php    | 35 +++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 projects/plugins/crm/changelog/crm-fix-fields_deleted_if_not_included_in_csv

diff --git a/projects/plugins/crm/changelog/crm-fix-fields_deleted_if_not_included_in_csv b/projects/plugins/crm/changelog/crm-fix-fields_deleted_if_not_included_in_csv
new file mode 100644
index 0000000000000..346f822aaa5b0
--- /dev/null
+++ b/projects/plugins/crm/changelog/crm-fix-fields_deleted_if_not_included_in_csv
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Importing contacts using CSV files no longer erases fields that are missing
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.CSVImporter.php b/projects/plugins/crm/includes/ZeroBSCRM.CSVImporter.php
index 3e4e4e1a0a0c7..4812db6df7d3c 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.CSVImporter.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.CSVImporter.php
@@ -286,7 +286,7 @@ function jpcrm_csvimporter_lite_preflight_checks( $stage ) {
 		// Retrieve fields
 		$field_map          = array();
 		$mapped_field_count = 0;
-		for ( $fieldI = 1; $fieldI <= 30; $fieldI++ ) {
+		for ( $fieldI = 0; $fieldI <= 30; $fieldI++ ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 
 			// Default to ignore
 			$map_to = 'ignorezbs';
@@ -686,13 +686,14 @@ function zeroBSCRM_CSVImporterLitehtml_app() {
 										// } else use md5 of the line + Filename
 
 									// } If no STATUS have to add one!
+									$status_override_value = null;
 									if ( ! isset( $customerFields['zbsc_status'] ) ) {
 
 										// } Get from setting, if present
 										if ( isset( $settings['defaultcustomerstatus'] ) && ! empty( $settings['defaultcustomerstatus'] ) ) {
-											$customerFields['zbsc_status'] = $settings['defaultcustomerstatus'];
+											$status_override_value = $settings['defaultcustomerstatus'];
 										} else {
-											$customerFields['zbsc_status'] = 'Customer';
+											$status_override_value = 'Customer';
 										}
 									}
 
@@ -708,6 +709,34 @@ function zeroBSCRM_CSVImporterLitehtml_app() {
 										$existingOverwrites[] = $thisDupeRef;
 									}
 
+									if ( ! empty( $potentialCustomerID ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+										// We could modify `zeroBS_integrations_addOrUpdateCustomer`
+										// to touch only on the fields we are passing to the function,
+										// but that function is used in other places and this could
+										// result in unwanted side effects.
+										// Instead we are passing all original fields
+										// to the function, and overriding only the ones
+										// we want.
+										$original_contact = $zbs->DAL->contacts->getContact( // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+											$potentialCustomerID, // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+											array(
+												'withCustomFields' => true,
+												'ignoreowner' => true,
+											)
+										);
+										foreach ( $original_contact as $original_key => $original_value ) {
+											// We need to prefix all fields coming from the above function, because
+											// `zeroBS_integrations_addOrUpdateCustomer` expects the fields to be prefixed
+											// (this is an older function).
+											$original_contact[ 'zbsc_' . $original_key ] = $original_value;
+											unset( $original_contact[ $original_key ] );
+										}
+										$customerFields = array_merge( $original_contact, $customerFields ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+									} else {
+										// We should override the status only when adding a new contact.
+										$customerFields['zbsc_status'] = ! empty( $status_override_value ) ? $status_override_value : $customerFields['zbsc_status']; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+									}
+
 									// } Add customer
 									$newCustID = zeroBS_integrations_addOrUpdateCustomer( 'csv', $userUniqueID, $customerFields );
 

From a79856b905f55222fbe9cbb24d9911fbec4f1c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Fri, 17 Feb 2023 19:20:01 -0300
Subject: [PATCH 34/51] VideoPress: propagate custom CSS from VideoPress video
 block to core/embed when transforming block (#29035)

* TypeScriptify transform from/to core-embed/v6

* hack propagating class from v6 to embed block

* changelog

* increase delay to 100ms
---
 ...-css-classes-when-transforming-embed-block |  4 +++
 .../blocks/video/transforms/index.tsx         | 34 +++++++++++++++----
 .../client/block-editor/blocks/video/types.ts | 14 ++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block

diff --git a/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block b/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block
new file mode 100644
index 0000000000000..08e5847a2a98b
--- /dev/null
+++ b/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+VideoPress: propagate custom CSS from VideoPress video block to core/embed when transforming block
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/transforms/index.tsx b/projects/packages/videopress/src/client/block-editor/blocks/video/transforms/index.tsx
index bbff3f447c090..dda8eddcb77ad 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/transforms/index.tsx
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/transforms/index.tsx
@@ -1,17 +1,22 @@
 /**
  * External dependencies
  */
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { createBlock } from '@wordpress/blocks';
+import { dispatch, select } from '@wordpress/data';
+import classnames from 'classnames';
 /**
  * Internal dependencies
  */
 import { buildVideoPressURL, pickGUIDFromUrl } from '../../../../lib/url';
+import { CoreEmbedVideoPressVariationBlockAttributes, VideoBlockAttributes } from '../types';
 
 const transformFromCoreEmbed = {
 	type: 'block',
 	blocks: [ 'core/embed' ],
-	isMatch: attrs => attrs.providerNameSlug === 'videopress' && pickGUIDFromUrl( attrs?.url ),
-	transform: attrs => {
+	isMatch: ( attrs: CoreEmbedVideoPressVariationBlockAttributes ) =>
+		attrs.providerNameSlug === 'videopress' && pickGUIDFromUrl( attrs?.url ),
+	transform: ( attrs: CoreEmbedVideoPressVariationBlockAttributes ) => {
 		const { url: src, providerNameSlug } = attrs;
 		const guid = pickGUIDFromUrl( src );
 
@@ -38,9 +43,11 @@ const transformFromCoreEmbed = {
 const transformToCoreEmbed = {
 	type: 'block',
 	blocks: [ 'core/embed' ],
-	isMatch: attrs => attrs?.src || attrs?.guid,
-	transform: attrs => {
-		const { guid, src: srcFromAttr } = attrs;
+	isMatch: ( attrs: VideoBlockAttributes ) => attrs?.src || attrs?.guid,
+	transform: ( attrs: VideoBlockAttributes ) => {
+		const { updateBlockAttributes } = dispatch( blockEditorStore );
+		const { getBlockAttributes } = select( blockEditorStore );
+		const { guid, src: srcFromAttr, className } = attrs;
 
 		// Build the source (URL) in case it isn't defined.
 		const { url } = buildVideoPressURL( guid );
@@ -50,13 +57,28 @@ const transformToCoreEmbed = {
 			return createBlock( 'core/embed' );
 		}
 
-		return createBlock( 'core/embed', {
+		const block = createBlock( 'core/embed', {
 			allowResponsive: true,
 			providerNameSlug: 'videopress',
 			responsive: true,
 			type: 'video',
 			url,
 		} );
+
+		/*
+		 * Hack: It seems that core doesn't allow setting the className
+		 * attribute when creating a block.
+		 * So, we need to wait for the block to be created
+		 * and then update the className attribute, asynchronously.
+		 */
+		const { clientId } = block;
+		setTimeout( () => {
+			const { className: embedClassName } = getBlockAttributes( clientId ) || {};
+			const updatedClassName = classnames( className, embedClassName );
+			updateBlockAttributes( clientId, { className: updatedClassName } );
+		}, 100 );
+
+		return block;
 	},
 };
 
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/types.ts b/projects/packages/videopress/src/client/block-editor/blocks/video/types.ts
index 66f23597dfca2..3aae24d02c4e3 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/types.ts
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/types.ts
@@ -58,6 +58,20 @@ export type VideoBlockAttributes = VideoBlockColorAttributesProps & {
 	className?: string;
 };
 
+export type CoreEmbedBlockAttributes = {
+	className: string;
+	allowResponsive: boolean;
+	providerNameSlug: string;
+	responsive: boolean;
+	type: string;
+	url: string;
+};
+
+export type CoreEmbedVideoPressVariationBlockAttributes = CoreEmbedBlockAttributes & {
+	providerNameSlug: 'videopress';
+	type: 'video';
+};
+
 export type VideoBlockSetAttributesProps = ( attributes: VideoBlockAttributes ) => void;
 
 export type VideoControlProps = {

From 1a2838e8b67b766a4e19db9490561770ab283644 Mon Sep 17 00:00:00 2001
From: gogdzl <37049295+gogdzl@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:17:33 -0300
Subject: [PATCH 35/51] CRM: WooSync keeps changing status (#28908)

* Prevent WooSync from changing if the customer status is not the first from the list of statuses

* changelog
---
 .../crm/changelog/fix-crm-woosync-keeps-changing-status    | 4 ++++
 .../includes/class-woo-sync-background-sync-job.php        | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 projects/plugins/crm/changelog/fix-crm-woosync-keeps-changing-status

diff --git a/projects/plugins/crm/changelog/fix-crm-woosync-keeps-changing-status b/projects/plugins/crm/changelog/fix-crm-woosync-keeps-changing-status
new file mode 100644
index 0000000000000..420735298875f
--- /dev/null
+++ b/projects/plugins/crm/changelog/fix-crm-woosync-keeps-changing-status
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+WooSync now only changes status for contacts with the Lead status
diff --git a/projects/plugins/crm/modules/woo-sync/includes/class-woo-sync-background-sync-job.php b/projects/plugins/crm/modules/woo-sync/includes/class-woo-sync-background-sync-job.php
index a3bcc0856c9f4..dc15567a566d4 100644
--- a/projects/plugins/crm/modules/woo-sync/includes/class-woo-sync-background-sync-job.php
+++ b/projects/plugins/crm/modules/woo-sync/includes/class-woo-sync-background-sync-job.php
@@ -1125,6 +1125,7 @@ public function woocommerce_order_to_crm_objects(
 	    // crm contact custom fields to use the types...
 	    $custom_fields              = $zbs->DAL->getActiveCustomFields( array( 'objtypeid' => ZBS_TYPE_CONTACT ) );
 	    $is_status_mapping_enabled  = ( isset( $settings['enable_woo_status_mapping'] ) ? ( (int) $settings['enable_woo_status_mapping'] === 1 ) : true );
+		$contact_statuses          = zeroBSCRM_getCustomerStatuses( true );
 
 	    // initialise dates
 	    $contact_creation_date         = -1;
@@ -1312,7 +1313,11 @@ public function woocommerce_order_to_crm_objects(
 		if ( !empty( $contact_email ) ) {
 
 			if ( $is_status_mapping_enabled ) {
-				$data['contact']['status'] = $this->woosync()->woocommerce_order_status_to_contact_status( $order_status );
+				$contact_id = zeroBS_getCustomerIDWithEmail( $contact_email );
+				// If this is a new contact or the current status equals the first status (CRM's default value is 'Lead'), we are allowed to change it.
+				if ( empty( $contact_id ) || $zbs->DAL->contacts->getContactStatus( $contact_id ) === $contact_statuses[0] ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					$data['contact']['status'] = $this->woosync()->woocommerce_order_status_to_contact_status( $order_status );
+				}
 			}
 			$data['contact']['created']         = $contact_creation_date_uts;
 			$data['contact']['email']           = $contact_email;

From e131e6a50fb1f82c549d2956b780a20add572f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nauris=20P=C5=AB=C4=B7is?= <hi@pyronaur.com>
Date: Mon, 20 Feb 2023 08:13:35 +0200
Subject: [PATCH 36/51] Fix folding element (#29021)

* Fix the FoldingElement logic

* Fix the primaryErrorSet

* Add a changelog entry
---
 .../boost/app/assets/src/js/elements/FoldingElement.svelte  | 2 +-
 .../assets/src/js/stores/critical-css-recommendations.ts    | 6 +++---
 projects/plugins/boost/changelog/boost-fix-folding-element  | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 projects/plugins/boost/changelog/boost-fix-folding-element

diff --git a/projects/plugins/boost/app/assets/src/js/elements/FoldingElement.svelte b/projects/plugins/boost/app/assets/src/js/elements/FoldingElement.svelte
index 3eab5675320dd..c8f57dd2b488a 100644
--- a/projects/plugins/boost/app/assets/src/js/elements/FoldingElement.svelte
+++ b/projects/plugins/boost/app/assets/src/js/elements/FoldingElement.svelte
@@ -4,7 +4,7 @@
 	export let visible = false;
 
 	const toggle = () => ( visible = ! visible );
-	$: label = visible ? showLabel : hideLabel;
+	$: label = visible ? hideLabel : showLabel;
 </script>
 
 <button class="components-button is-link foldable-element-control" class:visible on:click={toggle}>
diff --git a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
index d154b1eaf102b..99bc51c9968b0 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
@@ -1,4 +1,4 @@
-import { writable, derived, get } from 'svelte/store';
+import { writable, derived, get, Readable } from 'svelte/store';
 import { __ } from '@wordpress/i18n';
 import api from '../api/api';
 import { castToString } from '../utils/cast-to-string';
@@ -87,7 +87,7 @@ export const activeIssues = derived( issuesStore, $issues => {
  * Derived datastore: Returns the most important Set of errors among the recommendations.
  * Used for displaying the most important error as a showstopper if no URLS succeeded.
  */
-export const primaryErrorSet = derived( issuesStore, $issues => {
+export const primaryErrorSet: Readable< ErrorSet > = derived( issuesStore, $issues => {
 	const importantProviders = [
 		'core_front_page',
 		'core_posts_page',
@@ -98,7 +98,7 @@ export const primaryErrorSet = derived( issuesStore, $issues => {
 	for ( const key of importantProviders ) {
 		const issue = $issues.find( r => r.key === key );
 		if ( issue ) {
-			return groupErrorsByFrequency( issue );
+			return groupErrorsByFrequency( issue )[ 0 ];
 		}
 	}
 
diff --git a/projects/plugins/boost/changelog/boost-fix-folding-element b/projects/plugins/boost/changelog/boost-fix-folding-element
new file mode 100644
index 0000000000000..6060785b05434
--- /dev/null
+++ b/projects/plugins/boost/changelog/boost-fix-folding-element
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Fixed the folding label
+
+

From c8207e1de7345adf0f339173d81d684eb0c4ef69 Mon Sep 17 00:00:00 2001
From: Dave Martin <davemart-in@users.noreply.github.com>
Date: Mon, 20 Feb 2023 03:26:04 -0500
Subject: [PATCH 37/51] Update "Official buttons" styles (#28961)

---
 .../changelog/update-official-button-styles   |  4 +
 .../modules/sharedaddy/admin-sharing.css      |  5 +-
 .../modules/sharedaddy/admin-sharing.js       |  9 ++
 .../jetpack/modules/sharedaddy/sharing.css    | 82 +++++++++----------
 4 files changed, 56 insertions(+), 44 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-official-button-styles

diff --git a/projects/plugins/jetpack/changelog/update-official-button-styles b/projects/plugins/jetpack/changelog/update-official-button-styles
new file mode 100644
index 0000000000000..a5ee1fa25e23b
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-official-button-styles
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Updating look and feel of sharing buttons when in "official" mode
diff --git a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css
index 6605f84c9a758..4ca7041d234c6 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css
+++ b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css
@@ -64,7 +64,6 @@ body.settings_page_sharing .services {
 }
 
 body.settings_page_sharing .services ul li {
-	float: left;
 	cursor: move;
 }
 
@@ -172,8 +171,9 @@ li.service.share-skype span:before {
  */
 
 body.settings_page_sharing ul.preview {
+	display: flex;
+	flex-wrap: wrap;
 	float: left;
-	margin: 0px;
 }
 
 body.settings_page_sharing ul.preview li.preview-item, body.settings_page_sharing ul.preview li.preview-item a {
@@ -314,6 +314,7 @@ body.settings_page_sharing .advanced input[type=submit] {
 	background-size: 85px 20px;
 	width:85px;
 	height:20px;
+	margin-left: -4px;
 }
 
 .preview-twitter .option-smart-on {
diff --git a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js
index 29c3955331235..5eff11fe910bd 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js
+++ b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js
@@ -95,6 +95,15 @@
 		function update_preview() {
 			var button_style = $( '#button_style' ).val();
 
+			// Toggle .sd-social-official class
+			var sharedaddy = $('.sharedaddy');
+			var oficialClass = 'sd-social-official';
+			if ( 'official' === button_style ) {
+				sharedaddy.addClass(oficialClass);
+			} else {
+				sharedaddy.removeClass(oficialClass);
+			}
+
 			// Clear the live preview
 			$( '#live-preview ul.preview li' ).remove();
 
diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharing.css b/projects/plugins/jetpack/modules/sharedaddy/sharing.css
index da4b465f0b0ba..cdf36698590fc 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/sharing.css
+++ b/projects/plugins/jetpack/modules/sharedaddy/sharing.css
@@ -26,15 +26,6 @@ div.sharedaddy h3.sd-title {
 	font-weight: bold;
 }
 
-div.sharedaddy h3.sd-title:before {
-	content: "";
-	display: block;
-	width: 100%;
-	min-width: 30px;
-	border-top: 1px solid #dcdcde;
-	margin-bottom: 1em;
-}
-
 body.highlander-light h3.sd-title:before {
 	border-top: 1px solid rgba(0,0,0,.2);
 }
@@ -110,7 +101,22 @@ body.highlander-dark h3.sd-title:before {
 	padding: 5px 11px 4px 9px;
 }
 
-.sd-social-text .sd-content ul li a.sd-button span,
+.sd-social-official .sd-content ul li a.sd-button,
+.sd-social-official .sd-content ul li.preview-item div.option.option-smart-off a {
+	align-items: center;
+	display: flex;
+	font-size: 12px;
+	line-height: 12px;
+	padding: 1px 6px 0px 5px;
+	min-height: 20px;
+}
+
+.sd-social-official .sd-content ul.preview li a.sd-button,
+.sd-social-official .sd-content ul.preview li.preview-item div.option.option-smart-off a {
+	position: relative;
+	top: 2px;
+}
+
 .sd-content ul li a.sd-button>span,
 .sd-content ul li .option a.share-ustom span,	/* Ugh. */
 .sd-content ul li.preview-item div.option.option-smart-off a span,
@@ -119,23 +125,20 @@ body.highlander-dark h3.sd-title:before {
 .sd-social-official .sd-content>ul>li>a.sd-button span,
 .sd-social-official .sd-content>ul>li .digg_button >a span {		/* official Digg button no longer works, needs cleaning */
 	line-height: 23px;
+	margin-left: 6px;
 }
 
-
-
-/* Our gray buttons should be smaller when seen with the official ones */
-.sd-social-official .sd-content>ul>li>a.sd-button,
-.sd-social-official .sd-content .sharing-hidden .inner>ul>li>a.sd-button,
-.sd-social-official .sd-content>ul>li .digg_button>a,
-.sd-social-official .sd-content .sharing-hidden .inner>ul>li .digg_button>a {
-	line-height: 17px;
-	box-shadow: none; /* No shadow on gray buttons between the official ones */
-	vertical-align: top;
+.sd-social-text .sd-content ul li a.sd-button span {
+	margin-left: 3px;
 }
 
-.sd-social-official .sd-content ul li a.sd-button>span {
-	line-height: 17px;
+.sd-social-official .sd-content ul li a.sd-button>span,
+.sd-social-official .sd-content ul li.preview-item div.option.option-smart-off a span {
+	line-height: 12px;
+	margin-left: 3px;
 }
+
+
 .sd-social-official .sd-content>ul>li>a.sd-button:before,
 .sd-social-official .sd-content>ul>li .digg_button>a:before,
 .sd-social-official .sd-content .sharing-hidden .inner>ul>li>a.sd-button:before,
@@ -199,19 +202,12 @@ body.highlander-dark h3.sd-title:before {
 }
 
 .sd-content ul li {
-	margin: 0 8px 8px 0;
+	margin: 0 8px 12px 0;
 	padding: 0;
 }
 /* Add more pading on touch devices */
 .jp-sharing-input-touch .sd-content ul li { padding-left: 10px; }
 
-/* Text + icon & Official */
-.sd-social-icon-text .sd-content ul li a span,
-.sd-social-official .sd-content ul li a.sd-button span,
-.sd-content ul li.preview-item a.sd-button span,
-.sd-content ul li.advanced .share-more span {
-	margin-left: 6px;
-}
 .sd-content ul li.preview-item.no-icon a.sd-button span {
 	margin-left: 0;
 }
@@ -386,16 +382,15 @@ body .sd-content ul li.share-custom.no-icon a span {
 	line-height: 1;
 }
 
-
-/* Official buttons */
-.sd-social-official .sd-content ul, .sd-social-official .sd-content ul li {
-	line-height: 25px !important;
-}
-
 .sd-social-official .sd-content>ul>li>a.sd-button span {
 	line-height: 1;
 }
 
+.sd-social-official .sd-content ul {
+	display: flex;
+	flex-wrap: wrap;
+}
+
 .sd-social-official .sd-content ul:after {
 	content: ".";
 	display: block;
@@ -409,10 +404,12 @@ body .sd-content ul li.share-custom.no-icon a span {
 }
 
 .sd-social-official .sd-content ul>li {
-	display: block;
-	float: left;
-	margin: 0 10px 5px 0 !important;
-	height: 25px;
+	display: flex;
+	max-height: 18px;
+}
+
+.sd-social-official .sd-content ul>li .option-smart-off {
+	margin-right: 8px;
 }
 
 .sd-social-official .fb-share-button > span {
@@ -438,7 +435,7 @@ body .sd-content ul li.share-custom.no-icon a span {
 }
 
 .sd-social-official .sd-content .share-skype {
-	width: 55px;
+	min-width: 55px;
 }
 
 body .sd-social-official li.share-print ,
@@ -554,6 +551,7 @@ body .sd-social-icon .sd-content li.share-custom a span {
 	width: auto;
 	height: auto;
 	margin-bottom: 0;
+	max-width: 32px;
 }
 
 .sd-social-icon .sd-content ul li[class*='share-'] a.sd-button>span,
@@ -698,7 +696,7 @@ body .sd-social-icon .sd-content li.share-custom a span {
 }
 
 .sd-content .share-customize-link {
-	margin-top: 0em;
+	margin-top: 8px;
 	line-height: 11px;
 }
 

From 8cc32461b2d3b7e3a4a391c033163e5ebc3822fa Mon Sep 17 00:00:00 2001
From: Brad Jorsch <anomiex@users.noreply.github.com>
Date: Mon, 20 Feb 2023 04:18:16 -0500
Subject: [PATCH 38/51] Remove remnants of automated code coverage support
 (#28982)

PR #28542 removed the calls to the coverage scripts (except for one
line), but didn't update the documentation, remove the scripts
themselves, or adjust `jetpack generate` to stop generating those
scripts. This does all that.

It does not remove the PHPUnit or Jest definitions of which files should
be looked at for coverage, or any `@codeCoverageIgnore` directives, or
the `test-coverage-html` script in packages/waf, as those may still be
useful for people manually looking at coverage locally.
---
 .github/actions/tool-setup/action.yml         |   5 +-
 .github/workflows/tests.yml                   |   1 -
 codecov.yml                                   |  17 --
 composer.lock                                 |  15 +-
 docs/monorepo.md                              |  12 -
 docs/quick-start.md                           |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../test-results-to-slack/package.json        |   3 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/analytics/composer.json  |   3 -
 projects/js-packages/analytics/package.json   |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/api/composer.json        |   3 -
 projects/js-packages/api/package.json         |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../composer.json                             |   3 -
 .../package.json                              |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/components/composer.json |   3 -
 projects/js-packages/components/package.json  |   3 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/config/composer.json     |   3 -
 projects/js-packages/config/package.json      |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/connection/composer.json |   3 -
 projects/js-packages/connection/package.json  |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../js-packages/eslint-changed/composer.json  |   3 -
 .../js-packages/eslint-changed/package.json   |   5 +-
 .../js-packages/eslint-changed/src/cli.js     |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../eslint-config-target-es/composer.json     |   3 -
 .../eslint-config-target-es/package.json      |   3 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../i18n-check-webpack-plugin/composer.json   |   3 -
 .../i18n-check-webpack-plugin/package.json    |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../i18n-loader-webpack-plugin/composer.json  |   3 -
 .../i18n-loader-webpack-plugin/package.json   |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../js-packages/image-guide/composer.json     |   3 -
 projects/js-packages/image-guide/package.json |   1 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/licensing/composer.json  |   3 -
 projects/js-packages/licensing/package.json   |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../js-packages/partner-coupon/composer.json  |   3 -
 .../js-packages/partner-coupon/package.json   |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../publicize-components/composer.json        |   3 -
 .../publicize-components/package.json         |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../remove-asset-webpack-plugin/composer.json |   3 -
 .../remove-asset-webpack-plugin/package.json  |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/js-packages/storybook/composer.json  |   3 +-
 projects/js-packages/storybook/package.json   |   3 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../svelte-data-sync-client/composer.json     |   3 -
 .../svelte-data-sync-client/package.json      |   1 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/a8c-mc-stats/composer.json  |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/abtest/composer.json        |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/action-bar/composer.json    |   3 -
 projects/packages/action-bar/package.json     |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/admin-ui/composer.json      |   3 -
 projects/packages/admin-ui/package.json       |   2 +-
 .../admin-ui/src/class-admin-menu.php         |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/assets/composer.json        |   4 -
 projects/packages/assets/package.json         |   1 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/autoloader/composer.json    |   4 -
 .../tests/php/bin/test-coverage.php           | 244 ------------------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/backup/composer.json        |   3 -
 .../backup/src/class-package-version.php      |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/blaze/composer.json         |   3 -
 projects/packages/blaze/package.json          |   2 +-
 projects/packages/blaze/src/class-blaze.php   |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/blocks/composer.json        |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/changelogger/composer.json  |   3 -
 .../packages/changelogger/src/Application.php |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/codesniffer/composer.json   |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/composer-plugin/composer.json    |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/connection/composer.json    |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/constants/composer.json     |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/device-detection/composer.json   |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/error/composer.json         |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/forms/composer.json         |   3 -
 projects/packages/forms/package.json          |   2 +-
 .../forms/src/class-jetpack-forms.php         |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../google-fonts-provider/composer.json       |   3 -
 .../google-fonts-provider/package.json        |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/identity-crisis/composer.json    |   3 -
 .../packages/identity-crisis/package.json     |   2 +-
 .../src/class-identity-crisis.php             |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/ignorefile/composer.json    |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/import/composer.json        |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/ip/composer.json            |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/jetpack-mu-wpcom/composer.json   |   3 -
 .../packages/jetpack-mu-wpcom/package.json    |   2 +-
 .../src/class-jetpack-mu-wpcom.php            |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/jitm/composer.json          |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/lazy-images/composer.json   |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/licensing/composer.json     |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/logo/composer.json          |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/my-jetpack/composer.json    |   4 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/partner/composer.json       |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/password-checker/composer.json   |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/phpcs-filter/composer.json  |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/plans/composer.json         |   3 -
 projects/packages/plans/package.json          |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../plugin-deactivation/composer.json         |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/plugins-installer/composer.json  |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/post-list/composer.json     |   3 -
 .../post-list/src/class-post-list.php         |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/publicize/composer.json     |   3 -
 projects/packages/publicize/package.json      |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/redirect/composer.json      |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/roles/composer.json         |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/search/composer.json        |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/stats-admin/composer.json   |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/stats/composer.json         |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/status/composer.json        |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/sync/composer.json          |   3 -
 .../sync/src/class-package-version.php        |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/transport-helper/composer.json   |   3 -
 .../packages/transport-helper/package.json    |   2 +-
 .../src/class-package-version.php             |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/videopress/composer.json    |   3 -
 projects/packages/videopress/package.json     |   3 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/waf/composer.json           |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/packages/wordads/composer.json       |   3 -
 projects/packages/wordads/package.json        |   2 +-
 .../packages/wordads/src/class-package.php    |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../packages/wp-js-data-sync/composer.json    |   3 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/backup/composer.lock         | 113 ++------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/beta/composer.lock           |  16 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/boost/composer.json          |   3 -
 projects/plugins/boost/composer.lock          | 103 ++------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/crm/composer.lock            |  16 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/debug-helper/composer.lock   |   5 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/jetpack/composer.json        |   4 -
 projects/plugins/jetpack/composer.lock        | 203 +++------------
 .../jetpack/tests/action-test-coverage.sh     |  30 ---
 .../jetpack/tests/jest.config.client.js       |   1 -
 .../jetpack/tests/jest.config.extensions.js   |   1 -
 .../plugins/jetpack/tests/jest.config.gui.js  |   1 -
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/migration/composer.json      |   3 -
 projects/plugins/migration/composer.lock      | 108 ++------
 ...remove-remnants-of-automated-code-coverage |   5 +
 .../plugins/mu-wpcom-plugin/composer.json     |   5 +-
 .../plugins/mu-wpcom-plugin/composer.lock     |  10 +-
 .../mu-wpcom-plugin/mu-wpcom-plugin.php       |   2 +-
 projects/plugins/mu-wpcom-plugin/package.json |   2 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/protect/composer.json        |   3 -
 projects/plugins/protect/composer.lock        | 123 ++-------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/search/composer.json         |   3 -
 projects/plugins/search/composer.lock         | 118 ++-------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/social/composer.json         |   3 -
 projects/plugins/social/composer.lock         | 118 ++-------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/starter-plugin/composer.json |   3 -
 projects/plugins/starter-plugin/composer.lock | 108 ++------
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/super-cache/composer.json    |   3 -
 projects/plugins/super-cache/composer.lock    |  10 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/vaultpress/composer.json     |   3 -
 projects/plugins/vaultpress/composer.lock     |  16 +-
 ...remove-remnants-of-automated-code-coverage |   5 +
 projects/plugins/videopress/composer.lock     | 118 ++-------
 tools/cli/commands/generate.js                |   3 -
 tools/cli/skeletons/common/composer.json      |   3 -
 229 files changed, 697 insertions(+), 1587 deletions(-)
 delete mode 100644 codecov.yml
 create mode 100644 projects/github-actions/test-results-to-slack/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/babel-plugin-replace-textdomain/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/eslint-changed/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/eslint-config-target-es/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/i18n-check-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/i18n-loader-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/image-guide/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/storybook/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/js-packages/svelte-data-sync-client/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/autoloader/tests/php/bin/test-coverage.php
 create mode 100644 projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/codesniffer/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/ignorefile/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/ip/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/phpcs-filter/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/plugin-deactivation/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/transport-helper/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/packages/wp-js-data-sync/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/backup/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/beta/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/boost/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/crm/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/debug-helper/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100755 projects/plugins/jetpack/tests/action-test-coverage.sh
 create mode 100644 projects/plugins/migration/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/protect/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/search/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/social/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/starter-plugin/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/super-cache/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/vaultpress/changelog/remove-remnants-of-automated-code-coverage
 create mode 100644 projects/plugins/videopress/changelog/remove-remnants-of-automated-code-coverage

diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml
index 09ab38d81c36a..12b36ca13474f 100644
--- a/.github/actions/tool-setup/action.yml
+++ b/.github/actions/tool-setup/action.yml
@@ -3,9 +3,6 @@ description: "Setup needed versions of PHP, Node, and Pnpm."
 inputs:
   php:
     description: "Override the PHP version, or set 'false' to skip setting up PHP."
-  coverage:
-    description: "Set the PHP coverage driver, e.g. 'none' or 'pcov'."
-    default: 'none'
   node:
     description: "Override the Node version, or set 'false' to skip setting up Node and Pnpm."
 runs:
@@ -65,7 +62,7 @@ runs:
         ini-values: error_reporting=E_ALL, display_errors=On, zend.assertions=1
         tools: composer:${{ steps.versions.outputs.composer-version }}
         extensions: mysql, imagick
-        coverage: ${{ inputs.coverage }}
+        coverage: none
 
     - name: Configure composer
       if: steps.versions.outputs.php-version != 'false'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 562a86a33a626..e93fa4da9dc9a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -101,7 +101,6 @@ jobs:
 
           EXIT=0
           mkdir artifacts
-          [[ "$TEST_SCRIPT" == "test-coverage" ]] && mkdir coverage
           for P in composer.json projects/*/*/composer.json; do
             if [[ "$P" == "composer.json" ]]; then
               DIR="."
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index 024b08de8937a..0000000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-comment: false
-coverage:
-  status:
-    project:
-      default:
-        target: auto
-        threshold: 3%
-
-ignore:
-  - tests
-
-github_checks:
-  annotations: false
-
-flag_management:
-  default_rules:
-    carryforward: true
diff --git a/composer.lock b/composer.lock
index 71c8cab9afb13..7bb8d5d9a7d53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13,7 +13,7 @@
             "dist": {
                 "type": "path",
                 "url": "projects/packages/ignorefile",
-                "reference": "a70b0aab252faa30c07064b7c076ead119064127"
+                "reference": "31f201510fb6b93e6dc48d090104ecb02ab14eed"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -40,9 +40,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -61,7 +58,7 @@
             "dist": {
                 "type": "path",
                 "url": "projects/packages/codesniffer",
-                "reference": "fa645eb94c212a4b8b636ecc6c7a9503b4c1a521"
+                "reference": "5ab1c381b42d86c04a07d55d196bc8789d2842bb"
             },
             "require": {
                 "automattic/vipwpcs": "^2.3",
@@ -99,9 +96,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "skip-test-php": [
                     "./tests/action-skip-test-php.sh"
                 ],
@@ -123,7 +117,7 @@
             "dist": {
                 "type": "path",
                 "url": "projects/packages/phpcs-filter",
-                "reference": "c7e65316a187ec27a41f994a55c420e5ef98719c"
+                "reference": "aa4cad3c64e699db37405b2528bc2f9dce1f7519"
             },
             "require": {
                 "automattic/ignorefile": "@dev",
@@ -148,9 +142,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
diff --git a/docs/monorepo.md b/docs/monorepo.md
index 62fbe1a23174f..07737eec03816 100644
--- a/docs/monorepo.md
+++ b/docs/monorepo.md
@@ -117,8 +117,6 @@ We use `composer.json` to hold metadata about projects. Much of our generic tool
 * `.repositories`: If you include a repository entry referencing monorepo packages, it must have `.options.monorepo` set to true. This allows the build tooling to recognize and remove it.
 * `.scripts.build-development`: If your project has a general build step, this must run the necessary commands. See [Building](#building) for details.
 * `.scripts.build-production`: If your project requires a production-specific build step, this must run the necessary commands. See [Building](#building) for details.
-* `.scripts.test-coverage`: If the package contains any tests, this must run the necessary commands to generate a coverage report. See [Code coverage](#code-coverage) for details.
-  * `.scripts.skip-test-coverage`: Run before `.scripts.test-coverage` in CI. If it exits with code 3, the test run will be skipped.
 * `.scripts.test-e2e`: If the package contains any E2E tests, this must run the necessary commands. See [E2E tests](#e2e-tests) for details.
 * `.scripts.test-js`: If the package contains any JavaScript tests, this must run the necessary commands. See [JavaScript tests](#javascript-tests) for details.
   * `.scripts.skip-test-js`: Run before `.scripts.test-js` in CI. If it exits with code 3, the test run will be skipped.
@@ -248,16 +246,6 @@ JavaScript tests should use `jest`, not `mocha`/`chai`/`sinon`. For React testin
 
 If a project contains end-to-end tests, it must define `.scripts.test-e2e` in `composer.json` to run the tests. If a build step is required before running tests, the necessary commands for that should also be included.
 
-### Code coverage
-
-If a project contains PHP or JavaScript tests, it should also define `.scripts.test-coverage` in `composer.json` to run the tests in a mode that will generate code coverage output. The CI environment will run `pnpm install` and `composer install` beforehand, but if a build step is required before running tests the necessary commands for that should also be included in `.scripts.test-coverage`.
-
-Output should be written to the path specified via the `COVERAGE_DIR` environment variable. Subdirectories of that path may be used as desired.
-
-For PHP tests, you'll probably run PHPUnit as `php -dpcov.directory=. "$(command -v phpunit)" --coverage-clover "$COVERAGE_DIR/clover.xml"`.
-
-There's no need to be concerned about collisions with other projects' coverage files, a separate directory is used per project. The coverage files are also automatically copied to `ARTIFACTS_DIR`.
-
 ## Mirror repositories
 
 Most projects in the monorepo should have a mirror repository holding a built version of the project, ready for deployment. Follow these steps to create the mirror repo and configure the monorepo tooling to push to it.
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 698e420559078..54e31671c82af 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -95,7 +95,7 @@ Running the script will tell you if you have your environment already set up and
 
 #### Running Tests
 
-To run PHP, JS, and coverage tests, you can use the Jetpack CLI: `jetpack test` and then choose the project and type of test you'd like to run.
+To run PHP and JS tests, you can use the Jetpack CLI: `jetpack test` and then choose the project and type of test you'd like to run.
 
 # Development Workflow
 
diff --git a/projects/github-actions/test-results-to-slack/changelog/remove-remnants-of-automated-code-coverage b/projects/github-actions/test-results-to-slack/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/github-actions/test-results-to-slack/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/github-actions/test-results-to-slack/package.json b/projects/github-actions/test-results-to-slack/package.json
index bc849bd2de860..66e8a58d7ef42 100644
--- a/projects/github-actions/test-results-to-slack/package.json
+++ b/projects/github-actions/test-results-to-slack/package.json
@@ -27,8 +27,7 @@
 	},
 	"scripts": {
 		"build": "ncc build src/index.js -o dist --source-map --license licenses.txt",
-		"test": "jest --config=tests/jest.config.js --verbose --runInBand",
-		"test-coverage": "jest --config=tests/jest.config.js --coverage --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest --config=tests/jest.config.js --verbose --runInBand"
 	},
 	"engines": {
 		"node": "^18.13.0",
diff --git a/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/analytics/composer.json b/projects/js-packages/analytics/composer.json
index eec9f17a2b4f2..43d658eeff7e1 100644
--- a/projects/js-packages/analytics/composer.json
+++ b/projects/js-packages/analytics/composer.json
@@ -11,9 +11,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/analytics/package.json b/projects/js-packages/analytics/package.json
index 54053201c3bbb..ada23704a9a91 100644
--- a/projects/js-packages/analytics/package.json
+++ b/projects/js-packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-analytics",
-	"version": "0.1.23",
+	"version": "0.1.24-alpha",
 	"description": "Jetpack Analytics Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -15,8 +15,7 @@
 		".": "./index.jsx"
 	},
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"engines": {
 		"node": "^18.13.0",
diff --git a/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/api/composer.json b/projects/js-packages/api/composer.json
index 6bc56db2150ad..f429c815aa746 100644
--- a/projects/js-packages/api/composer.json
+++ b/projects/js-packages/api/composer.json
@@ -9,9 +9,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
index 22b960532023d..abfb0a2cf0fdd 100644
--- a/projects/js-packages/api/package.json
+++ b/projects/js-packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-api",
-	"version": "0.15.0",
+	"version": "0.15.1-alpha",
 	"description": "Jetpack Api Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -19,8 +19,7 @@
 		".": "./index.jsx"
 	},
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"engines": {
 		"node": "^18.13.0",
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/babel-plugin-replace-textdomain/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/babel-plugin-replace-textdomain/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/composer.json b/projects/js-packages/babel-plugin-replace-textdomain/composer.json
index 4c425eed6ee1e..73fa611dfd6d0 100644
--- a/projects/js-packages/babel-plugin-replace-textdomain/composer.json
+++ b/projects/js-packages/babel-plugin-replace-textdomain/composer.json
@@ -10,9 +10,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/package.json b/projects/js-packages/babel-plugin-replace-textdomain/package.json
index cb67f27cd4d00..899593057b309 100644
--- a/projects/js-packages/babel-plugin-replace-textdomain/package.json
+++ b/projects/js-packages/babel-plugin-replace-textdomain/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/babel-plugin-replace-textdomain",
-	"version": "1.0.22",
+	"version": "1.0.23-alpha",
 	"description": "A Babel plugin to replace the textdomain in gettext-style function calls.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/babel-plugin-replace-textdomain/#readme",
 	"bugs": {
@@ -14,8 +14,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest tests",
-		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests"
 	},
 	"dependencies": {
 		"debug": "^4.3.2"
diff --git a/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/components/composer.json b/projects/js-packages/components/composer.json
index 3b6b5c16feb5a..c1f1bc7146040 100644
--- a/projects/js-packages/components/composer.json
+++ b/projects/js-packages/components/composer.json
@@ -15,9 +15,6 @@
 		],
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
index 775fea4841c2e..bda707a39d6d8 100644
--- a/projects/js-packages/components/package.json
+++ b/projects/js-packages/components/package.json
@@ -61,8 +61,7 @@
 	"scripts": {
 		"build": "pnpm run compile-ts",
 		"compile-ts": "tsc --pretty",
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"engines": {
 		"node": "^18.13.0",
diff --git a/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/config/composer.json b/projects/js-packages/config/composer.json
index bb9965e98aa19..b99f7176a87cf 100644
--- a/projects/js-packages/config/composer.json
+++ b/projects/js-packages/config/composer.json
@@ -15,9 +15,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/config/package.json b/projects/js-packages/config/package.json
index b25411bd793bf..b638444d09388 100644
--- a/projects/js-packages/config/package.json
+++ b/projects/js-packages/config/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-config",
-	"version": "0.1.18",
+	"version": "0.1.19-alpha",
 	"description": "Handles Jetpack global configuration shared across all packages",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/config/#readme",
 	"bugs": {
@@ -15,8 +15,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "jest"
 	},
 	"devDependencies": {
 		"jest": "29.3.1",
diff --git a/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/connection/composer.json b/projects/js-packages/connection/composer.json
index e99f94f5ed2d9..c87a2e5ebc981 100644
--- a/projects/js-packages/connection/composer.json
+++ b/projects/js-packages/connection/composer.json
@@ -9,9 +9,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
index 4ba18f01570da..f7043d33ee7d2 100644
--- a/projects/js-packages/connection/package.json
+++ b/projects/js-packages/connection/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.25.0",
+	"version": "0.25.1-alpha",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -47,8 +47,7 @@
 		"*.scss"
 	],
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"engines": {
 		"node": "^18.13.0",
diff --git a/projects/js-packages/eslint-changed/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/eslint-changed/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/eslint-changed/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/eslint-changed/composer.json b/projects/js-packages/eslint-changed/composer.json
index 38a7adb1ca91c..c4e9d133eccef 100644
--- a/projects/js-packages/eslint-changed/composer.json
+++ b/projects/js-packages/eslint-changed/composer.json
@@ -7,9 +7,6 @@
 		"automattic/jetpack-changelogger": "@dev"
 	},
 	"scripts": {
-		"test-coverage": [
-			"pnpm run test-coverage"
-		],
 		"test-js": [
 			"pnpm run test"
 		]
diff --git a/projects/js-packages/eslint-changed/package.json b/projects/js-packages/eslint-changed/package.json
index 85e5521d7f87c..257ba87e0df2b 100644
--- a/projects/js-packages/eslint-changed/package.json
+++ b/projects/js-packages/eslint-changed/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/eslint-changed",
-	"version": "2.0.5",
+	"version": "2.0.6-alpha",
 	"description": "Run eslint on files, but only report warnings and errors from lines that were changed.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/eslint-changed/#readme",
 	"type": "module",
@@ -18,8 +18,7 @@
 		"eslint-changed": "bin/eslint-changed.js"
 	},
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest --config=tests/jest.config.cjs",
-		"test-coverage": "NODE_OPTIONS=--experimental-vm-modules jest --config=tests/jest.config.cjs --coverage --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest --config=tests/jest.config.cjs"
 	},
 	"dependencies": {
 		"chalk": "5.0.1",
diff --git a/projects/js-packages/eslint-changed/src/cli.js b/projects/js-packages/eslint-changed/src/cli.js
index 2a01fc5dbd03b..6c3bc748324af 100755
--- a/projects/js-packages/eslint-changed/src/cli.js
+++ b/projects/js-packages/eslint-changed/src/cli.js
@@ -6,7 +6,7 @@ import { Command } from 'commander';
 import { ESLint } from 'eslint';
 import parseDiff from 'parse-diff';
 
-const APP_VERSION = '2.0.5';
+const APP_VERSION = '2.0.6-alpha';
 
 /**
  * Create a Commander instance.
diff --git a/projects/js-packages/eslint-config-target-es/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/eslint-config-target-es/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/eslint-config-target-es/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/eslint-config-target-es/composer.json b/projects/js-packages/eslint-config-target-es/composer.json
index f82794ffb44e4..338e96dad831d 100644
--- a/projects/js-packages/eslint-config-target-es/composer.json
+++ b/projects/js-packages/eslint-config-target-es/composer.json
@@ -9,9 +9,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/eslint-config-target-es/package.json b/projects/js-packages/eslint-config-target-es/package.json
index 63be46a21d14e..9d35506d94319 100644
--- a/projects/js-packages/eslint-config-target-es/package.json
+++ b/projects/js-packages/eslint-config-target-es/package.json
@@ -14,8 +14,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest tests",
-		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests"
 	},
 	"dependencies": {
 		"@mdn/browser-compat-data": "4.2.1",
diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/i18n-check-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/i18n-check-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/i18n-check-webpack-plugin/composer.json b/projects/js-packages/i18n-check-webpack-plugin/composer.json
index c9af29efda6b5..b759161d24319 100644
--- a/projects/js-packages/i18n-check-webpack-plugin/composer.json
+++ b/projects/js-packages/i18n-check-webpack-plugin/composer.json
@@ -10,9 +10,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/i18n-check-webpack-plugin/package.json b/projects/js-packages/i18n-check-webpack-plugin/package.json
index f0711dafc62c4..3fa183ff6fbe3 100644
--- a/projects/js-packages/i18n-check-webpack-plugin/package.json
+++ b/projects/js-packages/i18n-check-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/i18n-check-webpack-plugin",
-	"version": "1.0.28",
+	"version": "1.0.29-alpha",
 	"description": "A Webpack plugin to check that WordPress i18n hasn't been mangled by Webpack optimizations.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/i18n-check-webpack-plugin/#readme",
 	"bugs": {
@@ -14,8 +14,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest tests/",
-		"test-coverage": "jest tests/ --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests/"
 	},
 	"dependencies": {
 		"debug": "^4.3.2"
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/i18n-loader-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/i18n-loader-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/composer.json b/projects/js-packages/i18n-loader-webpack-plugin/composer.json
index 8081ad755abcd..866bfad39a9bc 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/composer.json
+++ b/projects/js-packages/i18n-loader-webpack-plugin/composer.json
@@ -10,9 +10,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/package.json b/projects/js-packages/i18n-loader-webpack-plugin/package.json
index 43157045e6cf6..e502e4740e2ba 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/package.json
+++ b/projects/js-packages/i18n-loader-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/i18n-loader-webpack-plugin",
-	"version": "2.0.26",
+	"version": "2.0.27-alpha",
 	"description": "A Webpack plugin to load WordPress i18n when Webpack lazy-loads a bundle.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/i18n-loader-webpack-plugin/#readme",
 	"bugs": {
@@ -14,8 +14,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest tests",
-		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests"
 	},
 	"dependencies": {
 		"debug": "^4.3.2"
diff --git a/projects/js-packages/image-guide/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/image-guide/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/image-guide/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/image-guide/composer.json b/projects/js-packages/image-guide/composer.json
index af01fc2db007f..abcbc9517ff73 100644
--- a/projects/js-packages/image-guide/composer.json
+++ b/projects/js-packages/image-guide/composer.json
@@ -26,9 +26,6 @@
 		],
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/image-guide/package.json b/projects/js-packages/image-guide/package.json
index fa2a0e0d65276..b9b95e0fb0075 100644
--- a/projects/js-packages/image-guide/package.json
+++ b/projects/js-packages/image-guide/package.json
@@ -19,7 +19,6 @@
 		"build": "pnpm run clean && webpack",
 		"clean": "rm -rf build/",
 		"watch": "pnpm run build && pnpm webpack watch",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover",
 		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"devDependencies": {
diff --git a/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/licensing/composer.json b/projects/js-packages/licensing/composer.json
index 1007c713dc607..eff1ffc429890 100644
--- a/projects/js-packages/licensing/composer.json
+++ b/projects/js-packages/licensing/composer.json
@@ -11,9 +11,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json
index 46d02cb183885..f2a2d083cc1d4 100644
--- a/projects/js-packages/licensing/package.json
+++ b/projects/js-packages/licensing/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-licensing",
-	"version": "0.7.6",
+	"version": "0.7.7-alpha",
 	"description": "Jetpack licensing flow",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/licensing/#readme",
 	"bugs": {
@@ -16,8 +16,7 @@
 	"author": "Automattic",
 	"type": "module",
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"dependencies": {
 		"@automattic/jetpack-analytics": "workspace:*",
diff --git a/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/partner-coupon/composer.json b/projects/js-packages/partner-coupon/composer.json
index d49fbe843db33..1ba90ae6938d5 100644
--- a/projects/js-packages/partner-coupon/composer.json
+++ b/projects/js-packages/partner-coupon/composer.json
@@ -11,9 +11,6 @@
 		"test-js": [
 			"pnpm run test"
 		],
-		"test-coverage": [
-			"pnpm run test-coverage"
-		],
 		"watch": [
 			"Composer\\Config::disableProcessTimeout",
 			"pnpm run watch"
diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json
index 4bf6a81b579c9..9afa6a14ef3ab 100644
--- 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.39",
+	"version": "0.2.40-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": {
@@ -16,8 +16,7 @@
 	"author": "Automattic",
 	"type": "module",
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"devDependencies": {
 		"@automattic/jetpack-analytics": "workspace:*",
diff --git a/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/publicize-components/composer.json b/projects/js-packages/publicize-components/composer.json
index 74a6d5baa72f3..a9d36388c9c9f 100644
--- a/projects/js-packages/publicize-components/composer.json
+++ b/projects/js-packages/publicize-components/composer.json
@@ -16,9 +16,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
index 5cc527875530b..ba065d31dd732 100644
--- a/projects/js-packages/publicize-components/package.json
+++ b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.16.0",
+	"version": "0.16.1-alpha",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {
@@ -15,8 +15,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "jest"
 	},
 	"dependencies": {
 		"@automattic/jetpack-analytics": "workspace:*",
diff --git a/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/remove-asset-webpack-plugin/composer.json b/projects/js-packages/remove-asset-webpack-plugin/composer.json
index 77b9d27e2cddb..0c0464cdf13e3 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/composer.json
+++ b/projects/js-packages/remove-asset-webpack-plugin/composer.json
@@ -10,9 +10,6 @@
 	"scripts": {
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/remove-asset-webpack-plugin/package.json b/projects/js-packages/remove-asset-webpack-plugin/package.json
index 85d8e4bd8461f..78a670ca46b1f 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/package.json
+++ b/projects/js-packages/remove-asset-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/remove-asset-webpack-plugin",
-	"version": "1.0.16",
+	"version": "1.0.17-alpha",
 	"description": "A Webpack plugin to remove assets from the build.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/remove-asset-webpack-plugin/README.md#readme",
 	"bugs": {
@@ -14,8 +14,7 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
-		"test": "jest tests",
-		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests"
 	},
 	"dependencies": {
 		"debug": "^4.3.2"
diff --git a/projects/js-packages/storybook/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/storybook/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/storybook/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/storybook/composer.json b/projects/js-packages/storybook/composer.json
index 5ee40ceac67c3..57ec7c51dd888 100644
--- a/projects/js-packages/storybook/composer.json
+++ b/projects/js-packages/storybook/composer.json
@@ -15,8 +15,7 @@
 	},
 	"scripts": {
 		"build-development": "pnpm run storybook:build",
-		"test-js": "pnpm run test",
-		"test-coverage": "pnpm run test-coverage"
+		"test-js": "pnpm run test"
 	},
 	"repositories": [
 		{
diff --git a/projects/js-packages/storybook/package.json b/projects/js-packages/storybook/package.json
index f3503741e017b..e7f2168e1ce58 100644
--- a/projects/js-packages/storybook/package.json
+++ b/projects/js-packages/storybook/package.json
@@ -18,8 +18,7 @@
 		"//": "# We set NODE_PATH here so postcss-loader can find its plugins with pnpm 7. See https://github.com/pnpm/pnpm/discussions/3536#discussioncomment-2688984",
 		"storybook:build": "NODE_PATH=\"$PWD/node_modules\" build-storybook -s ./public -c ./storybook -o ./docs",
 		"storybook:dev": "NODE_PATH=\"$PWD/node_modules\" start-storybook -c ./storybook -p 50240 -s ./public",
-		"test": "jest tests/",
-		"test-coverage": "jest tests/ --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
+		"test": "jest tests/"
 	},
 	"devDependencies": {
 		"@automattic/jetpack-components": "workspace:*",
diff --git a/projects/js-packages/svelte-data-sync-client/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/svelte-data-sync-client/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/js-packages/svelte-data-sync-client/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/js-packages/svelte-data-sync-client/composer.json b/projects/js-packages/svelte-data-sync-client/composer.json
index 86bf102f6f76d..ba168b3e015e8 100644
--- a/projects/js-packages/svelte-data-sync-client/composer.json
+++ b/projects/js-packages/svelte-data-sync-client/composer.json
@@ -26,9 +26,6 @@
 		],
 		"test-js": [
 			"pnpm run test"
-		],
-		"test-coverage": [
-			"pnpm run test-coverage"
 		]
 	},
 	"repositories": [
diff --git a/projects/js-packages/svelte-data-sync-client/package.json b/projects/js-packages/svelte-data-sync-client/package.json
index 0be1e06bd3fdd..cc1a25650d4da 100644
--- a/projects/js-packages/svelte-data-sync-client/package.json
+++ b/projects/js-packages/svelte-data-sync-client/package.json
@@ -22,7 +22,6 @@
 		"watch": "pnpm run build && pnpm webpack watch",
 		"reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./src/**/*.ts",
 		"lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint src --fix && echo '✔ prettier and eslint ran successfully.'",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover",
 		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"devDependencies": {
diff --git a/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/a8c-mc-stats/composer.json b/projects/packages/a8c-mc-stats/composer.json
index f8dfe454fddac..cad680b7792a9 100644
--- a/projects/packages/a8c-mc-stats/composer.json
+++ b/projects/packages/a8c-mc-stats/composer.json
@@ -17,9 +17,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/abtest/composer.json b/projects/packages/abtest/composer.json
index 5558261a7f427..932db966e896c 100644
--- a/projects/packages/abtest/composer.json
+++ b/projects/packages/abtest/composer.json
@@ -23,9 +23,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/action-bar/composer.json b/projects/packages/action-bar/composer.json
index f5b90ed745ae2..450a12169ad86 100644
--- a/projects/packages/action-bar/composer.json
+++ b/projects/packages/action-bar/composer.json
@@ -21,9 +21,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/action-bar/package.json b/projects/packages/action-bar/package.json
index 6254d0c9f035c..348487b16fdbe 100644
--- a/projects/packages/action-bar/package.json
+++ b/projects/packages/action-bar/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-action-bar",
-	"version": "0.1.11",
+	"version": "0.1.12-alpha",
 	"description": "An easy way for visitors to follow, like, and comment on your WordPress site.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/action-bar/#readme",
 	"bugs": {
diff --git a/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/admin-ui/composer.json b/projects/packages/admin-ui/composer.json
index ff4a33011d4cf..b5269ca590926 100644
--- a/projects/packages/admin-ui/composer.json
+++ b/projects/packages/admin-ui/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json
index d4bb95f63c851..31570b95850f5 100644
--- a/projects/packages/admin-ui/package.json
+++ b/projects/packages/admin-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-admin-ui",
-	"version": "0.2.16",
+	"version": "0.2.17-alpha",
 	"description": "Generic Jetpack wp-admin UI elements",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/admin-ui/#readme",
 	"bugs": {
diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php
index ec2e8eef18e68..5d65dd040be8e 100644
--- a/projects/packages/admin-ui/src/class-admin-menu.php
+++ b/projects/packages/admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.16';
+	const PACKAGE_VERSION = '0.2.17-alpha';
 
 	/**
 	 * Whether this class has been initialized
diff --git a/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/assets/composer.json b/projects/packages/assets/composer.json
index 631871e1f1ea6..6cb2dc60de5fb 100644
--- a/projects/packages/assets/composer.json
+++ b/projects/packages/assets/composer.json
@@ -30,10 +30,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-			"pnpm run test-coverage"
-		],
 		"test-js": [
 			"pnpm run test"
 		],
diff --git a/projects/packages/assets/package.json b/projects/packages/assets/package.json
index 0527459fc0e6b..3c74b47b08688 100644
--- a/projects/packages/assets/package.json
+++ b/projects/packages/assets/package.json
@@ -8,7 +8,6 @@
 		"build-production-js": "NODE_ENV=production BABEL_ENV=production pnpm run build-js",
 		"clean": "rm -rf build",
 		"test": "jest tests",
-		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover",
 		"validate": "pnpm exec validate-es build/"
 	},
 	"devDependencies": {
diff --git a/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/autoloader/composer.json b/projects/packages/autoloader/composer.json
index 3b3416f67601c..e8c213e54d26a 100644
--- a/projects/packages/autoloader/composer.json
+++ b/projects/packages/autoloader/composer.json
@@ -22,10 +22,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-			"php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/autoloader/tests/php/bin/test-coverage.php b/projects/packages/autoloader/tests/php/bin/test-coverage.php
deleted file mode 100644
index 4cc53b039cf53..0000000000000
--- a/projects/packages/autoloader/tests/php/bin/test-coverage.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * A utility for transforming a raw code coverage
- * report into a clover.xml file for consumption.
- *
- * @package automattic/jetpack-autoloader
- */
-
-use SebastianBergmann\CodeCoverage\Report\Clover;
-use SebastianBergmann\CodeCoverage\Version;
-
-// phpcs:disabled WordPress.Security.EscapeOutput.OutputNotEscaped
-
-define( 'ROOT_DIR', dirname( dirname( dirname( __DIR__ ) ) ) );
-
-require_once ROOT_DIR . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
-/**
- * Returns the path to the clover.xml output file.
- *
- * @return string The path to the output file.
- */
-function get_output_file() {
-	global $argc;
-	global $argv;
-
-	if ( $argc < 2 ) {
-		echo "Usage: test-coverage [clover.xml file]\n";
-		exit( -1 );
-	}
-
-	return $argv[1];
-}
-
-/**
- * Attempts to load the report from the tmp file we should have generated.
- *
- * @return SebastianBergmann\CodeCoverage\CodeCoverage The unserialized code coverage object.
- */
-function load_report() {
-	$coverage_report = implode( DIRECTORY_SEPARATOR, array( ROOT_DIR, 'tests', 'php', 'tmp', 'coverage-report.php' ) );
-	if ( ! file_exists( $coverage_report ) ) {
-		echo "There is no coverage report to process.\n";
-		exit( -1 );
-	}
-
-	return require_once $coverage_report;
-}
-
-/**
- * Evaluates the version of sebastianbergmann/php-code-coverage that we've generated the coverage report using.
- *
- * @return string The version for the code coverage package.
- */
-function get_coverage_version() {
-	return Version::id();
-}
-
-/**
- * Counts the number of lines in a file before the `class` keyword.
- *
- * @param string $file The file to check.
- * @return int|null The number of lines or null if there is no class keyword.
- */
-function count_lines_before_class_keyword( $file ) {
-	// Find the line that the `class` keyword occurs on so that we can use it to calculate an offset from the header.
-	$content = file_get_contents( $file );
-
-	// Find the class keyword and capture the number of characters in the string before this point.
-	if ( 0 === preg_match_all( '/^class /m', $content, $matches, PREG_OFFSET_CAPTURE ) ) {
-		return null;
-	}
-
-	// Count the line endings leading up to the `class` keyword.
-	$newlines = substr_count( $content, "\n", 0, $matches[0][0][1] );
-	if ( $newlines > 0 ) {
-		return $newlines + 1;
-	}
-
-	return null;
-}
-
-/**
- * Creates a map for converting file paths to src paths.
- *
- * @param string[] $report_file_paths An array containing all of the paths for the report.
- * @return array A map describing how to transform built files into src coverage.
- */
-function get_path_transformation_map( $report_file_paths ) {
-	// We're going to create a map describing how to transform files to src files.
-	// We're also going to store any metadata needed to perform the merge safetly.
-	$transformation_map = array();
-
-	// Scan the src directory so that we can create the map to convert between files.
-	$raw_src_files = scandir( ROOT_DIR . DIRECTORY_SEPARATOR . 'src' );
-	$src_file_map  = array();
-	foreach ( $raw_src_files as $file ) {
-		// Only PHP files will be copied.
-		if ( substr( $file, -4 ) !== '.php' ) {
-			continue;
-		}
-
-		$file = ROOT_DIR . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . $file;
-		if ( ! file_exists( $file ) ) {
-			continue;
-		}
-
-		// We need to use the class keyword to address the line offset from injecting the header.
-		$class_line = count_lines_before_class_keyword( $file );
-		if ( null === $class_line ) {
-			// The autoloader only has class files and so this is fine.
-			continue;
-		}
-
-		$src_file_map[ $file ] = array(
-			'file'       => $file,
-			'class_line' => $class_line,
-		);
-	}
-
-	// Create a map describing the file transformations.
-	foreach ( $report_file_paths as $report_file_path ) {
-		// We will use the class line from the report file to calculate the offset from the src file to apply to coverage lines.
-		$class_line = count_lines_before_class_keyword( $report_file_path );
-		if ( ! isset( $class_line ) ) {
-			continue;
-		}
-
-		// Attempt to find the original file.
-		// Note: This does not support nested directories!
-		$src_file_path = null;
-		foreach ( $src_file_map as $src_file ) {
-			// We don't need to perform any transformations if the file path is the same.
-			if ( $src_file['file'] === $report_file_path ) {
-				continue;
-			}
-
-			if ( basename( $src_file['file'] ) === basename( $report_file_path ) ) {
-				$src_file_path = $src_file['file'];
-				break;
-			}
-		}
-		if ( ! $src_file_path ) {
-			continue;
-		}
-
-		// We can finally calculate the line offset since we have the class line for both.
-		$line_offset = $class_line - $src_file_map[ $src_file_path ]['class_line'];
-
-		// Record the file in the transformation map.
-		$transformation_map[ $report_file_path ] = array(
-			'src'         => $src_file_path,
-			'line_offset' => $line_offset,
-		);
-	}
-
-	return $transformation_map;
-}
-
-/**
- * Processes a v9 CodeCoverage report.
- *
- * @param SebastianBergmann\CodeCoverage\CodeCoverage $report The report to process.
- * @return SebastianBergmann\CodeCoverage\CodeCoverage The processed report.
- */
-function process_coverage_9( $report ) {
-	$data      = $report->getData( true );
-	$classname = get_class( $data );
-
-	// We're going to merge the line coverage from compiled files into the src files.
-	$line_coverage   = $data->lineCoverage();
-	$transformations = get_path_transformation_map( array_keys( $line_coverage ) );
-
-	$removed_files = array();
-	foreach ( $line_coverage as $file => $lines ) {
-		if ( ! isset( $transformations[ $file ] ) ) {
-			continue;
-		}
-
-		// Prepare the transformations we are going to make.
-		$src_file    = $transformations[ $file ]['src'];
-		$line_offset = $transformations[ $file ]['line_offset'];
-
-		// Create a new line coverage mapped to the src file.
-		$new_coverage = array();
-		foreach ( $lines as $line => $coverage ) {
-			$new_coverage[ $src_file ][ $line - $line_offset ] = $coverage;
-		}
-
-		// Merge the coverage since multiple compiled files may map to a single src file.
-		$merge = new $classname();
-		$merge->setLineCoverage( $new_coverage );
-		$data->merge( $merge );
-
-		// Mark the file for removal from the original coverage.
-		$removed_files[] = $file;
-	}
-
-	// Remove all of the files that we've transformed from the coverage.
-	$line_coverage = $data->lineCoverage();
-	foreach ( $removed_files as $file ) {
-		// Make sure the uncovered file does not show up in the report.
-		$report->filter()->excludeFile( $file );
-		unset( $line_coverage[ $file ] );
-	}
-	$data->setLineCoverage( $line_coverage );
-
-	return $report;
-}
-
-/**
- * Processes the code coverage report and outputs a clover.xml file.
- */
-function process_coverage() {
-	echo "Aggregating compiled coverage into unified code coverage report\n";
-
-	// We're going to transform the code coverage object into a Clover XML report.
-	$output_file = get_output_file();
-
-	// Since there is no backwards compatibility guarantee in place for the code coverage
-	// object we need to handle it according to each major version independently.
-	$coverage_version = get_coverage_version();
-	$major_version    = substr( $coverage_version, 0, strpos( $coverage_version, '.' ) );
-
-	$function = 'process_coverage_' . $major_version;
-	if ( ! function_exists( $function ) ) {
-		echo "No handler defined for major version $major_version\n";
-		die( -1 );
-	}
-
-	// We can finally load the report that we're wanting to process.
-	$report = load_report();
-
-	// Process the report using the handler.
-	$report = call_user_func( $function, $report );
-
-	// Generate the XML file for the report.
-	$clover = new Clover();
-	$clover->process( $report, $output_file );
-	echo "Generated code coverage report in Clover format\n";
-}
-
-// Process the coverage report into the new output.
-process_coverage();
diff --git a/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/backup/composer.json b/projects/packages/backup/composer.json
index 332716374311c..5ed33dae5b9f9 100644
--- a/projects/packages/backup/composer.json
+++ b/projects/packages/backup/composer.json
@@ -31,9 +31,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-js": [
 			"pnpm run test"
 		],
diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
index b395684654cec..36024c192d7d1 100644
--- a/projects/packages/backup/src/class-package-version.php
+++ b/projects/packages/backup/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.12.3';
+	const PACKAGE_VERSION = '1.12.4-alpha';
 
 	const PACKAGE_SLUG = 'backup';
 
diff --git a/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/blaze/composer.json b/projects/packages/blaze/composer.json
index 5222ab0d6230c..74bc105a8271a 100644
--- a/projects/packages/blaze/composer.json
+++ b/projects/packages/blaze/composer.json
@@ -22,9 +22,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/blaze/package.json b/projects/packages/blaze/package.json
index 4619712547d2e..2b69ce5394c74 100644
--- a/projects/packages/blaze/package.json
+++ b/projects/packages/blaze/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-blaze",
-	"version": "0.5.3",
+	"version": "0.5.4-alpha",
 	"description": "Attract high-quality traffic to your site using Blaze. Using this service, you can advertise a post or page on some of the millions of pages across WordPress.com and Tumblr from just $5 per day.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/blaze/#readme",
 	"bugs": {
diff --git a/projects/packages/blaze/src/class-blaze.php b/projects/packages/blaze/src/class-blaze.php
index e9fd7d73bb7f5..6841d67969570 100644
--- a/projects/packages/blaze/src/class-blaze.php
+++ b/projects/packages/blaze/src/class-blaze.php
@@ -17,7 +17,7 @@
  */
 class Blaze {
 
-	const PACKAGE_VERSION = '0.5.3';
+	const PACKAGE_VERSION = '0.5.4-alpha';
 
 	/**
 	 * Script handle for the JS file we enqueue in the post editor.
diff --git a/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/blocks/composer.json b/projects/packages/blocks/composer.json
index 07a967f48461c..53587efa5630a 100644
--- a/projects/packages/blocks/composer.json
+++ b/projects/packages/blocks/composer.json
@@ -21,9 +21,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/changelogger/composer.json b/projects/packages/changelogger/composer.json
index 4dd5479f9274b..4e58b3f096dd3 100644
--- a/projects/packages/changelogger/composer.json
+++ b/projects/packages/changelogger/composer.json
@@ -32,9 +32,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php
index 14d4916ec138b..9f49bf5d57a0d 100644
--- a/projects/packages/changelogger/src/Application.php
+++ b/projects/packages/changelogger/src/Application.php
@@ -18,7 +18,7 @@
  */
 class Application extends SymfonyApplication {
 
-	const VERSION = '3.3.1';
+	const VERSION = '3.3.2-alpha';
 
 	/**
 	 * Constructor.
diff --git a/projects/packages/codesniffer/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/codesniffer/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/codesniffer/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/codesniffer/composer.json b/projects/packages/codesniffer/composer.json
index 22fcd84fce577..f64db823fdbda 100644
--- a/projects/packages/codesniffer/composer.json
+++ b/projects/packages/codesniffer/composer.json
@@ -28,9 +28,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"skip-test-php": [
 			"./tests/action-skip-test-php.sh"
 		],
diff --git a/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/composer-plugin/composer.json b/projects/packages/composer-plugin/composer.json
index c15eb3292048d..390db7b905a56 100644
--- a/projects/packages/composer-plugin/composer.json
+++ b/projects/packages/composer-plugin/composer.json
@@ -20,9 +20,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json
index bd9979837e76f..ecd5a3122be1e 100644
--- a/projects/packages/connection/composer.json
+++ b/projects/packages/connection/composer.json
@@ -36,9 +36,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/constants/composer.json b/projects/packages/constants/composer.json
index 38bf91087a79a..fe52e0d5932be 100644
--- a/projects/packages/constants/composer.json
+++ b/projects/packages/constants/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/device-detection/composer.json b/projects/packages/device-detection/composer.json
index 9eda72a293faf..af734942c3dfc 100644
--- a/projects/packages/device-detection/composer.json
+++ b/projects/packages/device-detection/composer.json
@@ -17,9 +17,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/error/composer.json b/projects/packages/error/composer.json
index b37c6505ef9a9..880887b8ffa8c 100644
--- a/projects/packages/error/composer.json
+++ b/projects/packages/error/composer.json
@@ -17,9 +17,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/forms/composer.json b/projects/packages/forms/composer.json
index 98f236c1ec687..f68d875166241 100644
--- a/projects/packages/forms/composer.json
+++ b/projects/packages/forms/composer.json
@@ -24,9 +24,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/forms/package.json b/projects/packages/forms/package.json
index 2c0c7a7285ee6..8e2440261e1f2 100644
--- a/projects/packages/forms/package.json
+++ b/projects/packages/forms/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-forms",
-	"version": "0.5.0",
+	"version": "0.5.1-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
index 31dfd31b4afbd..09851eaccac67 100644
--- a/projects/packages/forms/src/class-jetpack-forms.php
+++ b/projects/packages/forms/src/class-jetpack-forms.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Forms {
 
-	const PACKAGE_VERSION = '0.5.0';
+	const PACKAGE_VERSION = '0.5.1-alpha';
 
 	/**
 	 * Load the contact form module.
diff --git a/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/google-fonts-provider/composer.json b/projects/packages/google-fonts-provider/composer.json
index 9d4d96bd8ad8f..4e3afdf81424a 100644
--- a/projects/packages/google-fonts-provider/composer.json
+++ b/projects/packages/google-fonts-provider/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/google-fonts-provider/package.json b/projects/packages/google-fonts-provider/package.json
index 10145b152e7ea..7cd5bad21b3ea 100644
--- a/projects/packages/google-fonts-provider/package.json
+++ b/projects/packages/google-fonts-provider/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-google-fonts-provider",
-	"version": "0.5.0",
+	"version": "0.5.1-alpha",
 	"description": "WordPress Webfonts provider for Google Fonts",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/google-fonts-provider/#readme",
 	"bugs": {
diff --git a/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/identity-crisis/composer.json b/projects/packages/identity-crisis/composer.json
index 6445b6ee4e22f..92bae2eb1c63c 100644
--- a/projects/packages/identity-crisis/composer.json
+++ b/projects/packages/identity-crisis/composer.json
@@ -30,9 +30,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/identity-crisis/package.json b/projects/packages/identity-crisis/package.json
index 49ab64459e41b..c65506389c108 100644
--- a/projects/packages/identity-crisis/package.json
+++ b/projects/packages/identity-crisis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-identity-crisis",
-	"version": "0.8.37",
+	"version": "0.8.38-alpha",
 	"description": "Jetpack Identity Crisis",
 	"main": "_inc/admin.jsx",
 	"repository": {
diff --git a/projects/packages/identity-crisis/src/class-identity-crisis.php b/projects/packages/identity-crisis/src/class-identity-crisis.php
index 938df46301f4f..b3a5ce0724266 100644
--- a/projects/packages/identity-crisis/src/class-identity-crisis.php
+++ b/projects/packages/identity-crisis/src/class-identity-crisis.php
@@ -28,7 +28,7 @@ class Identity_Crisis {
 	/**
 	 * Package Version
 	 */
-	const PACKAGE_VERSION = '0.8.37';
+	const PACKAGE_VERSION = '0.8.38-alpha';
 
 	/**
 	 * Instance of the object.
diff --git a/projects/packages/ignorefile/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/ignorefile/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/ignorefile/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/ignorefile/composer.json b/projects/packages/ignorefile/composer.json
index f4c8df65a7854..bb72351e2f4a6 100644
--- a/projects/packages/ignorefile/composer.json
+++ b/projects/packages/ignorefile/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/import/composer.json b/projects/packages/import/composer.json
index 9e25faca16c03..95ecf8bf73eb5 100644
--- a/projects/packages/import/composer.json
+++ b/projects/packages/import/composer.json
@@ -20,9 +20,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/ip/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/ip/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/ip/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/ip/composer.json b/projects/packages/ip/composer.json
index 1bb0b3789b0c5..27d754f8be9bf 100644
--- a/projects/packages/ip/composer.json
+++ b/projects/packages/ip/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json
index f6927fb391ca9..3e07ab104869d 100644
--- a/projects/packages/jetpack-mu-wpcom/composer.json
+++ b/projects/packages/jetpack-mu-wpcom/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 317e22c9bdf06..8242ed8b6fa8e 100644
--- 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": "0.2.1",
+	"version": "0.2.2-alpha",
 	"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
index af6300e9f1156..7d1c539c97ca4 100644
--- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
+++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Mu_Wpcom {
 
-	const PACKAGE_VERSION = '0.2.1';
+	const PACKAGE_VERSION = '0.2.2-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 
 	/**
diff --git a/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json
index 26744020cdd07..28a30c03af74d 100644
--- a/projects/packages/jitm/composer.json
+++ b/projects/packages/jitm/composer.json
@@ -42,9 +42,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/lazy-images/composer.json b/projects/packages/lazy-images/composer.json
index 6aea8b5e4d1d6..d5bd2938dc7b8 100644
--- a/projects/packages/lazy-images/composer.json
+++ b/projects/packages/lazy-images/composer.json
@@ -29,9 +29,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/licensing/composer.json b/projects/packages/licensing/composer.json
index d395f333a297d..cf106cce7be69 100644
--- a/projects/packages/licensing/composer.json
+++ b/projects/packages/licensing/composer.json
@@ -22,9 +22,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/logo/composer.json b/projects/packages/logo/composer.json
index afba2d2895235..d8563a9c25b17 100644
--- a/projects/packages/logo/composer.json
+++ b/projects/packages/logo/composer.json
@@ -17,9 +17,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
index ce9bce15e9d1c..e32a389943e7d 100644
--- a/projects/packages/my-jetpack/composer.json
+++ b/projects/packages/my-jetpack/composer.json
@@ -29,10 +29,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-			"pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/partner/composer.json b/projects/packages/partner/composer.json
index 1bfa20c4ebe2f..e4237a00df4bf 100644
--- a/projects/packages/partner/composer.json
+++ b/projects/packages/partner/composer.json
@@ -24,9 +24,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/password-checker/composer.json b/projects/packages/password-checker/composer.json
index e37a09b3b8026..310b3dc4153a2 100644
--- a/projects/packages/password-checker/composer.json
+++ b/projects/packages/password-checker/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/phpcs-filter/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/phpcs-filter/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/phpcs-filter/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/phpcs-filter/composer.json b/projects/packages/phpcs-filter/composer.json
index 33bc7e4ff0866..51170ca7c86cf 100644
--- a/projects/packages/phpcs-filter/composer.json
+++ b/projects/packages/phpcs-filter/composer.json
@@ -20,9 +20,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/plans/composer.json b/projects/packages/plans/composer.json
index 1be33fed6761a..69dc88f98fdaf 100644
--- a/projects/packages/plans/composer.json
+++ b/projects/packages/plans/composer.json
@@ -21,9 +21,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/plans/package.json b/projects/packages/plans/package.json
index 7567932acdfb2..3e84c62ecf6e7 100644
--- a/projects/packages/plans/package.json
+++ b/projects/packages/plans/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-plans",
-	"version": "0.2.9",
+	"version": "0.2.10-alpha",
 	"description": "Fetch information about Jetpack Plans from wpcom",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/plans/#readme",
 	"bugs": {
diff --git a/projects/packages/plugin-deactivation/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/plugin-deactivation/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/plugin-deactivation/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/plugin-deactivation/composer.json b/projects/packages/plugin-deactivation/composer.json
index e176ecdd50466..6af9e4bdb7dae 100644
--- a/projects/packages/plugin-deactivation/composer.json
+++ b/projects/packages/plugin-deactivation/composer.json
@@ -19,9 +19,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/plugins-installer/composer.json b/projects/packages/plugins-installer/composer.json
index 0083d41246753..1ade7d53111ee 100644
--- a/projects/packages/plugins-installer/composer.json
+++ b/projects/packages/plugins-installer/composer.json
@@ -19,9 +19,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/post-list/composer.json b/projects/packages/post-list/composer.json
index 7d2c10265ad1f..1d88b6a6b5175 100644
--- a/projects/packages/post-list/composer.json
+++ b/projects/packages/post-list/composer.json
@@ -29,9 +29,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/post-list/src/class-post-list.php b/projects/packages/post-list/src/class-post-list.php
index 8503b67c63c67..bbea4aff558f0 100644
--- a/projects/packages/post-list/src/class-post-list.php
+++ b/projects/packages/post-list/src/class-post-list.php
@@ -12,7 +12,7 @@
  */
 class Post_List {
 
-	const PACKAGE_VERSION = '0.4.3';
+	const PACKAGE_VERSION = '0.4.4-alpha';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/publicize/composer.json b/projects/packages/publicize/composer.json
index efdd5d9336144..5a5439f02db26 100644
--- a/projects/packages/publicize/composer.json
+++ b/projects/packages/publicize/composer.json
@@ -24,9 +24,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
index 426b471adb94d..a71d32db3404b 100644
--- a/projects/packages/publicize/package.json
+++ b/projects/packages/publicize/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize",
-	"version": "0.19.4",
+	"version": "0.19.5-alpha",
 	"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme",
 	"bugs": {
diff --git a/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/redirect/composer.json b/projects/packages/redirect/composer.json
index 60af39562ca29..16a635f37bdde 100644
--- a/projects/packages/redirect/composer.json
+++ b/projects/packages/redirect/composer.json
@@ -20,9 +20,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/roles/composer.json b/projects/packages/roles/composer.json
index 72ed0ac08240f..efb1be83c7461 100644
--- a/projects/packages/roles/composer.json
+++ b/projects/packages/roles/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/search/composer.json b/projects/packages/search/composer.json
index e05b9decead81..17bcbfcb40ce4 100644
--- a/projects/packages/search/composer.json
+++ b/projects/packages/search/composer.json
@@ -35,9 +35,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-js": [
 			"pnpm run test"
 		],
diff --git a/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/stats-admin/composer.json b/projects/packages/stats-admin/composer.json
index efc906db2d618..9883c50adb8f3 100644
--- a/projects/packages/stats-admin/composer.json
+++ b/projects/packages/stats-admin/composer.json
@@ -24,9 +24,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/stats/composer.json b/projects/packages/stats/composer.json
index 5b623a9b0a133..065447744ddb9 100644
--- a/projects/packages/stats/composer.json
+++ b/projects/packages/stats/composer.json
@@ -22,9 +22,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/status/composer.json b/projects/packages/status/composer.json
index 92769ec894dc3..b1f464a421441 100644
--- a/projects/packages/status/composer.json
+++ b/projects/packages/status/composer.json
@@ -20,9 +20,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json
index 89632a5ff6083..c17e224f60898 100644
--- a/projects/packages/sync/composer.json
+++ b/projects/packages/sync/composer.json
@@ -25,9 +25,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php
index 1659bae5f263e..bfe4a04289480 100644
--- a/projects/packages/sync/src/class-package-version.php
+++ b/projects/packages/sync/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.47.1';
+	const PACKAGE_VERSION = '1.47.2-alpha';
 
 	const PACKAGE_SLUG = 'sync';
 
diff --git a/projects/packages/transport-helper/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/transport-helper/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/transport-helper/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/transport-helper/composer.json b/projects/packages/transport-helper/composer.json
index d98f21664bf7c..bf81207087935 100644
--- a/projects/packages/transport-helper/composer.json
+++ b/projects/packages/transport-helper/composer.json
@@ -23,9 +23,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/transport-helper/package.json b/projects/packages/transport-helper/package.json
index f6f89e900aa25..81a177fe4eed0 100644
--- a/projects/packages/transport-helper/package.json
+++ b/projects/packages/transport-helper/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-transport-helper",
-	"version": "0.1.3",
+	"version": "0.1.4-alpha",
 	"description": "Package to help transport server communication",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/transport-helper/#readme",
 	"bugs": {
diff --git a/projects/packages/transport-helper/src/class-package-version.php b/projects/packages/transport-helper/src/class-package-version.php
index dac9f3b3111ce..f1f822c640ce5 100644
--- a/projects/packages/transport-helper/src/class-package-version.php
+++ b/projects/packages/transport-helper/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '0.1.3';
+	const PACKAGE_VERSION = '0.1.4-alpha';
 
 	const PACKAGE_SLUG = 'transport-helper';
 
diff --git a/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/videopress/composer.json b/projects/packages/videopress/composer.json
index 3cfea589bc9a4..009cdf6121daf 100644
--- a/projects/packages/videopress/composer.json
+++ b/projects/packages/videopress/composer.json
@@ -24,9 +24,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
index 09b0b9d724074..8774b8a1a8c75 100644
--- a/projects/packages/videopress/package.json
+++ b/projects/packages/videopress/package.json
@@ -20,8 +20,7 @@
 		"clean": "rm -rf build/",
 		"validate": "pnpm exec validate-es build/",
 		"watch": "pnpm build && pnpm build-client --watch",
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest"
 	},
 	"devDependencies": {
 		"@automattic/calypso-color-schemes": "2.1.1",
diff --git a/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/waf/composer.json b/projects/packages/waf/composer.json
index 621ff038f5e53..146829152b36e 100644
--- a/projects/packages/waf/composer.json
+++ b/projects/packages/waf/composer.json
@@ -28,9 +28,6 @@
 		],
 		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-coverage-html": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
diff --git a/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/wordads/composer.json b/projects/packages/wordads/composer.json
index ad296c0980ae2..04392fe122a95 100644
--- a/projects/packages/wordads/composer.json
+++ b/projects/packages/wordads/composer.json
@@ -33,9 +33,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-js": [
 			"pnpm run test"
 		],
diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json
index d7a2990987530..ea48aa155b5cf 100644
--- a/projects/packages/wordads/package.json
+++ b/projects/packages/wordads/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-wordads",
-	"version": "0.2.31",
+	"version": "0.2.32-alpha",
 	"description": "Earn income by allowing Jetpack to display high quality ads.",
 	"main": "main.js",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/wordads/#readme",
diff --git a/projects/packages/wordads/src/class-package.php b/projects/packages/wordads/src/class-package.php
index 340927fbb8873..d9ef93376b272 100644
--- a/projects/packages/wordads/src/class-package.php
+++ b/projects/packages/wordads/src/class-package.php
@@ -11,7 +11,7 @@
  * WordAds package general information
  */
 class Package {
-	const VERSION = '0.2.31';
+	const VERSION = '0.2.32-alpha';
 	const SLUG    = 'wordads';
 
 	/**
diff --git a/projects/packages/wp-js-data-sync/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/wp-js-data-sync/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/packages/wp-js-data-sync/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/packages/wp-js-data-sync/composer.json b/projects/packages/wp-js-data-sync/composer.json
index 94ca6bf485c6e..eb5c266619553 100644
--- a/projects/packages/wp-js-data-sync/composer.json
+++ b/projects/packages/wp-js-data-sync/composer.json
@@ -18,9 +18,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/backup/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/backup/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/backup/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
index 6a2cd31b4c991..0ea528381874d 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/backup",
-                "reference": "17a1ae562cf963aa86c453beca4b6fa1f708a885"
+                "reference": "7eac7dc67fab9e82c19914a654006031c242bddf"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -283,9 +269,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -323,7 +306,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -355,9 +338,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -412,7 +392,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -466,9 +446,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -487,7 +464,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -514,9 +491,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -535,7 +509,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -561,9 +535,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -582,7 +553,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -626,9 +597,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -657,7 +625,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -704,9 +672,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -729,7 +694,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -766,9 +731,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -787,7 +749,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -813,9 +775,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -834,7 +793,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -877,10 +836,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -922,7 +877,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -960,9 +915,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -981,7 +933,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1009,9 +961,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1036,7 +985,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -1066,9 +1015,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1087,7 +1033,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1117,9 +1063,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1138,7 +1081,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1165,9 +1108,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1186,7 +1126,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1216,9 +1156,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1237,7 +1174,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1276,9 +1213,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1305,7 +1239,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1350,9 +1284,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/beta/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/beta/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/beta/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock
index 8acbb54132c34..9e645234a82b4 100644
--- a/projects/plugins/beta/composer.lock
+++ b/projects/plugins/beta/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -43,9 +43,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -70,7 +67,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -103,10 +100,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -258,7 +251,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -303,9 +296,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/boost/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/boost/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/boost/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index a5808cd664555..e712483759cd0 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -38,9 +38,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index ab5623968ea89..9ebd02c6af2c0 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -544,9 +518,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -569,7 +540,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/lazy-images",
-                "reference": "01d1171d36de7b2a2c4e2b59bfad3ea07b381dec"
+                "reference": "2cce37e3857b3d50421b1b2495b85dfba94f4917"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -613,9 +584,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -634,7 +602,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -671,9 +639,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -692,7 +657,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -718,9 +683,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -739,7 +701,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -782,10 +744,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -827,7 +785,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -865,9 +823,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -886,7 +841,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugin-deactivation",
-                "reference": "b1ba3b01571c6d505472b325f929ec61acb4e305"
+                "reference": "e6f00f3cf846b788f75e8a35a2e5144685741feb"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev"
@@ -919,9 +874,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -950,7 +902,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -980,9 +932,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1001,7 +950,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1031,9 +980,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1052,7 +998,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1079,9 +1025,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1100,7 +1043,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1130,9 +1073,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1314,7 +1254,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1359,9 +1299,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/crm/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/crm/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/crm/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock
index 7566ed407a4af..0695838ff3854 100644
--- a/projects/plugins/crm/composer.lock
+++ b/projects/plugins/crm/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -45,10 +45,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -67,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -99,9 +95,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -448,7 +441,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -493,9 +486,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/debug-helper/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/debug-helper/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/debug-helper/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock
index d345d94b9be00..bc702e56f8ac3 100644
--- a/projects/plugins/debug-helper/composer.lock
+++ b/projects/plugins/debug-helper/composer.lock
@@ -13,7 +13,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -58,9 +58,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..81712ec841851
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index 3757a2f4f2e8e..0020a2bc82616 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -67,10 +67,6 @@
 		"phpunit": [
 			"tests/action-phpunit.sh"
 		],
-		"test-coverage": [
-			"@php tools/build-module-headings-translations.php",
-			"tests/action-test-coverage.sh"
-		],
 		"test-js": [
 			"pnpm concurrently 'pnpm:test-adminpage' 'pnpm:test-extensions'"
 		],
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 09f77eb3eefc8..7ca9afa7aef26 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/abtest",
-                "reference": "63b7b475757259264351596e904fbe0b63ad07e0"
+                "reference": "2f9a4fb65e15081fd76dcaede5bccd14ee0354d9"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -96,9 +93,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/action-bar",
-                "reference": "f82c72df5cc7faad767ab52eedc80ecd643035a1"
+                "reference": "ccf0c7b1082e40ea518fc87ec0fdd074b772a620"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -149,9 +143,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -182,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -213,9 +204,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -240,7 +228,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -281,10 +269,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -306,7 +290,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -339,10 +323,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -361,7 +341,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/backup",
-                "reference": "17a1ae562cf963aa86c453beca4b6fa1f708a885"
+                "reference": "7eac7dc67fab9e82c19914a654006031c242bddf"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -406,9 +386,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -446,7 +423,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/blaze",
-                "reference": "1c22a742cbab3a4d93b36924128c400685325bd5"
+                "reference": "6febb5bbd7c02239c5c3d3730ecc292ee2308693"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -482,9 +459,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -519,7 +493,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/blocks",
-                "reference": "b4c81e9cfff38c4e6ace66062b5d5d539fa2913c"
+                "reference": "5c64a7d0b1ab40ddfdc6977f2a5d97701453df3f"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -553,9 +527,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -613,7 +584,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -645,9 +616,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +670,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -756,9 +724,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -777,7 +742,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -804,9 +769,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -825,7 +787,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -851,9 +813,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -872,7 +831,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/error",
-                "reference": "1dbd78e7a220156b3b921518179b3dc084980ffb"
+                "reference": "caf9a503c648fa5dd82d89816c6c26a992036859"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -898,9 +857,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -919,7 +875,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/forms",
-                "reference": "9da1f03bb949078304436c77f5b1229b286e1467"
+                "reference": "82af7f2fa186f320d807aad0d179a1d691318230"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -957,9 +913,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -994,7 +947,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/google-fonts-provider",
-                "reference": "e49376c36a49091aec7005815470ff21274171d5"
+                "reference": "1ada95b05b83be4b6bdbd02f729bee2ea9960e43"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1022,9 +975,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1043,7 +993,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1087,9 +1037,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1118,7 +1065,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/import",
-                "reference": "16a752dfdad19508820a3c080a3eb501ea07770d"
+                "reference": "dbd1e38ec065af14ccfc194b72d170f1aa90209a"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -1152,9 +1099,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1185,7 +1129,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -1232,9 +1176,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1257,7 +1198,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/lazy-images",
-                "reference": "01d1171d36de7b2a2c4e2b59bfad3ea07b381dec"
+                "reference": "2cce37e3857b3d50421b1b2495b85dfba94f4917"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1301,9 +1242,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1322,7 +1260,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -1359,9 +1297,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1380,7 +1315,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1406,9 +1341,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1427,7 +1359,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -1470,10 +1402,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1555,7 +1483,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1593,9 +1521,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1614,7 +1539,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1642,9 +1567,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1669,7 +1591,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plans",
-                "reference": "2c8de83a36fffad85959615188e11630ce6de73e"
+                "reference": "3c5be3ee25556e8b63c1a6cb2e5c84cc03ecb55b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -1700,9 +1622,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1733,7 +1652,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -1763,9 +1682,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1784,7 +1700,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/post-list",
-                "reference": "6eab711b2ebb34249dbca0c6281653562989f9d0"
+                "reference": "a48953e1a090c8db8c7c5590913cb9777d69a643"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev"
@@ -1818,9 +1734,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1845,7 +1758,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/publicize",
-                "reference": "a15743c92315940bb988e928858ecff8a53b4a89"
+                "reference": "d1d63872b7e42b99436423077f9de620cceacf65"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1880,9 +1793,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1913,7 +1823,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1943,9 +1853,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1964,7 +1871,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1991,9 +1898,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -2012,7 +1916,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/search",
-                "reference": "b35e687ae1136f9df017654899cc9fac32295364"
+                "reference": "121acc0673174b45cd30fc631a406dc7c1d9e472"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -2061,9 +1965,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -2095,7 +1996,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/stats",
-                "reference": "61a7f1afc319aa19a5d787a9e8b0cab7cb9f6080"
+                "reference": "43bb197f177b7d4f2fad5eacba92b0545c83009b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -2128,9 +2029,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -2155,7 +2053,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/stats-admin",
-                "reference": "3ee9d58e654a2110285175c45123c0774d4a6f27"
+                "reference": "3769ef9650f3ac60cd904e58cfe0422e90a96ffd"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev",
@@ -2190,9 +2088,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -2223,7 +2118,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -2253,9 +2148,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -2274,7 +2166,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -2313,9 +2205,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -2340,7 +2229,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/videopress",
-                "reference": "1992b5f3e03b0f92aca27c54941afdee6e5ffae1"
+                "reference": "f3ec72fb62e89cdd01e2ae70099f4a6066fae32f"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -2378,9 +2267,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -2418,7 +2304,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "ab08a17e5e6f9e04b5036ad4f3e64b041707386c"
+                "reference": "819c5345676b2830fad4ec956a3c680d44778d1b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -2461,9 +2347,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-coverage-html": [
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
@@ -2486,7 +2369,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/wordads",
-                "reference": "5503930995106964e2386cd69a61b4ca0f301d0a"
+                "reference": "044330ca5739da6e1ad7311b7aa1d06fee653e4f"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -2533,9 +2416,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -2732,7 +2612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -2777,9 +2657,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/jetpack/tests/action-test-coverage.sh b/projects/plugins/jetpack/tests/action-test-coverage.sh
deleted file mode 100755
index 6faf808627ecc..0000000000000
--- a/projects/plugins/jetpack/tests/action-test-coverage.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-PLUGINDIR="$PWD"
-
-cd "$MONOREPO_BASE/projects/plugins/jetpack"
-
-echo "::group::Jetpack Admimnpage coverage"
-pnpm run test-client --coverage --collectCoverageFrom='_inc/client/state/**/*.js' --coverageDirectory="$COVERAGE_DIR/client" --coverageReporters=clover
-pnpm run test-gui --coverage --collectCoverageFrom='_inc/client/**/*.js' --coverageDirectory="$COVERAGE_DIR/gui" --coverageReporters=clover
-echo "::endgroup::"
-
-echo "::group::Jetpack Extensions coverage"
-pnpm run test-extensions --coverage --collectCoverageFrom='extensions/**/*.js' --coverageDirectory="$COVERAGE_DIR/extensions" --coverageReporters=clover
-echo "::endgroup::"
-
-cd "$PLUGINDIR"
-
-echo "::group::Jetpack Backend coverage"
-php -dpcov.directory=. "$(command -v phpunit)" --coverage-clover "$COVERAGE_DIR/backend/clover.xml"
-echo "::endgroup::"
-
-echo "::group::Jetpack Legacy full sync coverage"
-LEGACY_FULL_SYNC=1 php -dpcov.directory=. "$(command -v phpunit)" --group=legacy-full-sync --coverage-clover "$COVERAGE_DIR/legacy-sync/clover.xml"
-echo "::endgroup::"
-
-echo "::group::Jetpack Multisite coverage"
-WP_MULTISITE=1 php -dpcov.directory=. "$(command -v phpunit)" -c tests/php.multisite.xml --coverage-clover "$COVERAGE_DIR/multisite/clover.xml"
-echo "::endgroup::"
diff --git a/projects/plugins/jetpack/tests/jest.config.client.js b/projects/plugins/jetpack/tests/jest.config.client.js
index d8103c0b02484..ae10e89c9ae4f 100644
--- a/projects/plugins/jetpack/tests/jest.config.client.js
+++ b/projects/plugins/jetpack/tests/jest.config.client.js
@@ -3,5 +3,4 @@ const baseConfig = require( './jest.config.base.js' );
 module.exports = {
 	...baseConfig,
 	roots: [ '<rootDir>/_inc/client/state/', '<rootDir>/_inc/client/lib/', '<rootDir>/modules/' ],
-	coverageDirectory: 'coverage/client',
 };
diff --git a/projects/plugins/jetpack/tests/jest.config.extensions.js b/projects/plugins/jetpack/tests/jest.config.extensions.js
index d829b7d55de27..b9a0b0f5a5509 100644
--- a/projects/plugins/jetpack/tests/jest.config.extensions.js
+++ b/projects/plugins/jetpack/tests/jest.config.extensions.js
@@ -3,7 +3,6 @@ const baseConfig = require( './jest.config.base.js' );
 module.exports = {
 	...baseConfig,
 	roots: [ '<rootDir>/extensions/' ],
-	coverageDirectory: 'coverage/extensions',
 	setupFiles: [ ...baseConfig.setupFiles, '<rootDir>/tests/jest-globals.extensions.js' ],
 	testPathIgnorePatterns: [
 		...baseConfig.testPathIgnorePatterns,
diff --git a/projects/plugins/jetpack/tests/jest.config.gui.js b/projects/plugins/jetpack/tests/jest.config.gui.js
index b5febd664dead..bd29dbe3accc8 100644
--- a/projects/plugins/jetpack/tests/jest.config.gui.js
+++ b/projects/plugins/jetpack/tests/jest.config.gui.js
@@ -6,5 +6,4 @@ module.exports = {
 	testMatch: [ '<rootDir>/_inc/client/test/main.js', '<rootDir>/_inc/client/**/test/component.js' ],
 	setupFilesAfterEnv: [ ...baseConfig.setupFilesAfterEnv, '<rootDir>/tests/jest-globals.gui.js' ],
 	transformIgnorePatterns: [ '/node_modules/(?!(.pnpm|@automattic)/)' ],
-	coverageDirectory: 'coverage/gui',
 };
diff --git a/projects/plugins/migration/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/migration/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/migration/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/migration/composer.json b/projects/plugins/migration/composer.json
index 65584e7fe5eee..e6de160d30aa4 100644
--- a/projects/plugins/migration/composer.json
+++ b/projects/plugins/migration/composer.json
@@ -28,9 +28,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
index ddcb8718da499..e29ed584c59b8 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -981,9 +933,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1002,7 +951,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1032,9 +981,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1053,7 +999,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1080,9 +1026,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1101,7 +1044,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1131,9 +1074,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1152,7 +1092,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1191,9 +1131,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1220,7 +1157,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1265,9 +1202,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
index 9de7dd28a66fb..a2ebb9c3ee5bc 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.json
+++ b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -19,9 +19,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
@@ -45,6 +42,6 @@
 		"release-branch-prefix": "jetpack"
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_0_4"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_0_5_alpha"
 	}
 }
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
index 7cd543ef6072e..5ffad8f16c796 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.lock
+++ b/projects/plugins/mu-wpcom-plugin/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jetpack-mu-wpcom",
-                "reference": "f4885e743f456cb0dc8b9de19393ce456b95a49e"
+                "reference": "ba69673cd5204a1aff0d2069a6ddeab5472c7be5"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -43,9 +43,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -78,7 +75,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -123,9 +120,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
index a14a1c2478ed5..9bc574ed7b774 100644
--- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
+++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 1.0.4
+ * Version: 1.0.5-alpha
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin
diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json
index 3d2174d9e3281..ad89eeb06b626 100644
--- a/projects/plugins/mu-wpcom-plugin/package.json
+++ b/projects/plugins/mu-wpcom-plugin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "1.0.4",
+	"version": "1.0.5-alpha",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/projects/plugins/protect/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/protect/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/protect/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/protect/composer.json b/projects/plugins/protect/composer.json
index 1168136cddbe1..7f9cea4fb4fca 100644
--- a/projects/plugins/protect/composer.json
+++ b/projects/plugins/protect/composer.json
@@ -33,9 +33,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index 12b07ab9a1b9d..f1673dc3dc064 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plans",
-                "reference": "2c8de83a36fffad85959615188e11630ce6de73e"
+                "reference": "3c5be3ee25556e8b63c1a6cb2e5c84cc03ecb55b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -982,9 +934,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1015,7 +964,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -1045,9 +994,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1066,7 +1012,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1096,9 +1042,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1117,7 +1060,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1144,9 +1087,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1165,7 +1105,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1195,9 +1135,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1216,7 +1153,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1255,9 +1192,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1282,7 +1216,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/transport-helper",
-                "reference": "c0026d4ca2f76daa6df6961e5eacfbd5a5fa08aa"
+                "reference": "a573cabd9c91ed95e56f48b629a780b1f8c26680"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -1319,9 +1253,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1352,7 +1283,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/waf",
-                "reference": "ab08a17e5e6f9e04b5036ad4f3e64b041707386c"
+                "reference": "819c5345676b2830fad4ec956a3c680d44778d1b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1395,9 +1326,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-coverage-html": [
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist",
                     "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist"
@@ -1473,7 +1401,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1518,9 +1446,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/search/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/search/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/search/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/search/composer.json b/projects/plugins/search/composer.json
index bbcb62d9c5eee..2680f956783f2 100644
--- a/projects/plugins/search/composer.json
+++ b/projects/plugins/search/composer.json
@@ -29,9 +29,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
index 4fe55dfe0cd78..b50e48a5355b1 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -981,9 +933,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1002,7 +951,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1032,9 +981,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1053,7 +999,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1080,9 +1026,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1101,7 +1044,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/search",
-                "reference": "b35e687ae1136f9df017654899cc9fac32295364"
+                "reference": "121acc0673174b45cd30fc631a406dc7c1d9e472"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1150,9 +1093,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -1184,7 +1124,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/stats",
-                "reference": "61a7f1afc319aa19a5d787a9e8b0cab7cb9f6080"
+                "reference": "43bb197f177b7d4f2fad5eacba92b0545c83009b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1217,9 +1157,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1244,7 +1181,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1274,9 +1211,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1295,7 +1229,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1334,9 +1268,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1363,7 +1294,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1408,9 +1339,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/social/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/social/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/social/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json
index 443e957af8707..ca254e5af5fea 100644
--- a/projects/plugins/social/composer.json
+++ b/projects/plugins/social/composer.json
@@ -32,9 +32,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index c1ed43faa3bbd..decfe503360aa 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plans",
-                "reference": "2c8de83a36fffad85959615188e11630ce6de73e"
+                "reference": "3c5be3ee25556e8b63c1a6cb2e5c84cc03ecb55b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -982,9 +934,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1015,7 +964,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -1045,9 +994,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1066,7 +1012,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/publicize",
-                "reference": "a15743c92315940bb988e928858ecff8a53b4a89"
+                "reference": "d1d63872b7e42b99436423077f9de620cceacf65"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1101,9 +1047,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1134,7 +1077,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1164,9 +1107,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1185,7 +1125,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1212,9 +1152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1233,7 +1170,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1263,9 +1200,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1284,7 +1218,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1323,9 +1257,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1400,7 +1331,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1445,9 +1376,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/starter-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/starter-plugin/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/starter-plugin/composer.json b/projects/plugins/starter-plugin/composer.json
index ac9f3083635f5..3579d7913b661 100644
--- a/projects/plugins/starter-plugin/composer.json
+++ b/projects/plugins/starter-plugin/composer.json
@@ -29,9 +29,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
index 677accac3a849..cbf7ad635d5b4 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -981,9 +933,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1002,7 +951,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1032,9 +981,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1053,7 +999,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1080,9 +1026,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1101,7 +1044,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1131,9 +1074,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1152,7 +1092,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1191,9 +1131,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1268,7 +1205,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1313,9 +1250,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/super-cache/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/super-cache/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/super-cache/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json
index a40dcf30675b3..008a1b5cd3226 100644
--- a/projects/plugins/super-cache/composer.json
+++ b/projects/plugins/super-cache/composer.json
@@ -19,9 +19,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		],
diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock
index b02655c9821e4..78b182bc407c7 100644
--- a/projects/plugins/super-cache/composer.lock
+++ b/projects/plugins/super-cache/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -61,7 +58,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -106,9 +103,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/vaultpress/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/vaultpress/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/vaultpress/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json
index 43b94059d2349..b02148c121938 100644
--- a/projects/plugins/vaultpress/composer.json
+++ b/projects/plugins/vaultpress/composer.json
@@ -19,9 +19,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]
diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock
index e522371dd0bda..d9e3773be491e 100644
--- a/projects/plugins/vaultpress/composer.lock
+++ b/projects/plugins/vaultpress/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -45,10 +45,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -67,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -93,9 +89,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -116,7 +109,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -161,9 +154,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/projects/plugins/videopress/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/videopress/changelog/remove-remnants-of-automated-code-coverage
new file mode 100644
index 0000000000000..085e2e863ddb4
--- /dev/null
+++ b/projects/plugins/videopress/changelog/remove-remnants-of-automated-code-coverage
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock
index 11307db2997ba..4735e51230bde 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/a8c-mc-stats",
-                "reference": "b1876d56110471dd79cc6790956d01519c7633da"
+                "reference": "6f0c1b4cf70e07951286c74a74352c56124e70e9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -38,9 +38,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -59,7 +56,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "9405b138a2b173706dd3f977c71ca2ea55e3710b"
+                "reference": "0fc44e6ac6bf9398add8198935f7a293323ed723"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -90,9 +87,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -117,7 +111,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "09690fa4f7f37e5c4332952983b3cb014f215c0e"
+                "reference": "14557ec7fcb46db1af2b0a11f3bd422e546e4799"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -158,10 +152,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
-                    "pnpm run test-coverage"
-                ],
                 "test-js": [
                     "pnpm run test"
                 ],
@@ -183,7 +173,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/autoloader",
-                "reference": "72fed2574397e08e77ab517fef1118444d56d50a"
+                "reference": "46e8df227c3deee5a1fb0e8f43fa4191e3db323a"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -216,10 +206,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"",
-                    "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -238,7 +224,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "29045282abaf0e8823b5585028d634b07601599a"
+                "reference": "aa7328bf97fb2ec9ef69857b79ad16215da07f8c"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -270,9 +256,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -327,7 +310,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection",
-                "reference": "ea20a733eaf9933db0f7f261c1fc8f0fe9f0e016"
+                "reference": "aa95f3bfbeebc54cd54265be8a87098f246102a7"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -381,9 +364,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -402,7 +382,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/constants",
-                "reference": "9852ec480f55504ae8cb5c8732560ad1f9edbef0"
+                "reference": "f1541ff1d4b84a403937905e480c22711e082518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -429,9 +409,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -450,7 +427,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "d72b5210e5eb379b9e2a6c05805eae99d49ca8af"
+                "reference": "1b49b50929473de584bf13533d09a6df683cc0dc"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -476,9 +453,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -497,7 +471,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "881965ec5eebf747320a2daac961845683dd2b47"
+                "reference": "9b84a2607b3bdc711d94e47fcc70c244a92f4ec1"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -541,9 +515,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -572,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "d49bbc0fba9e8a2964264a83da308a72223dee92"
+                "reference": "3fb97bc8e8e95a5f305c9e8065d9f070555cb0b4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev",
@@ -619,9 +590,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -644,7 +612,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/licensing",
-                "reference": "22510eb2242f50e2b419a764cc51da493595c3c3"
+                "reference": "2e8f4aec618532012f381550e89b4b77b7b7ddab"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -681,9 +649,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -702,7 +667,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/logo",
-                "reference": "70330dbf1e898f98c674fc6d50db347ace102e70"
+                "reference": "08e4add23362f34887f31d913b5c93bb6c97fa7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -728,9 +693,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -749,7 +711,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "eb4eefaa216570b48bdb99116b7b001a949e7ec4"
+                "reference": "5c154d90af8faaf107ce35a8aedbe1025e2313d4"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -792,10 +754,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/coverage.xml\"",
-                    "pnpm run test --coverageDirectory=\"$COVERAGE_DIR\" --coverage --coverageReporters=clover"
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -837,7 +795,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/partner",
-                "reference": "d74a6543d486c63a87992909895ad1cb5525ab07"
+                "reference": "0fa875358a1ac50a50ea28e9e95fb2299dbda058"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -875,9 +833,6 @@
                 "post-update-cmd": [
                     "WorDBless\\Composer\\InstallDropin::copy"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -896,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/password-checker",
-                "reference": "3283515f7402a2c486b811e7a26723632dccb7c3"
+                "reference": "68056d7d8b54caad2e147568afc0a5f435dd991d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -924,9 +879,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -951,7 +903,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plans",
-                "reference": "2c8de83a36fffad85959615188e11630ce6de73e"
+                "reference": "3c5be3ee25556e8b63c1a6cb2e5c84cc03ecb55b"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev"
@@ -982,9 +934,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1015,7 +964,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/plugins-installer",
-                "reference": "f1c1122267edde673ba53f562559c5923641afee"
+                "reference": "a6ac7149711088392feb33b2636fca1b4c5d392c"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "@dev"
@@ -1045,9 +994,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1066,7 +1012,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/redirect",
-                "reference": "c7634b719ccd7cf8ebe12abdc53a74ba310eca77"
+                "reference": "5a8773607453eafc9f40bda2d0955a798c4c7e6d"
             },
             "require": {
                 "automattic/jetpack-status": "@dev"
@@ -1096,9 +1042,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1117,7 +1060,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/roles",
-                "reference": "1ebccf029b8db3173a45a23ae4cec2ebdc0aa855"
+                "reference": "ba0e28e7126be8487b66f610a1550921191f49f3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -1144,9 +1087,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1165,7 +1105,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/status",
-                "reference": "c558b54d0365cf2d4dbe04ce0884afd1cf20d7a1"
+                "reference": "f6102cda899d35efbf6968177b500ccc4c24d7c6"
             },
             "require": {
                 "automattic/jetpack-constants": "@dev"
@@ -1195,9 +1135,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ]
@@ -1216,7 +1153,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "bf9eb3491de43cfa22638ce03c02d1a4e60ee11e"
+                "reference": "f909e0af647b5e08203392b25aa9baaa0fa99c26"
             },
             "require": {
                 "automattic/jetpack-connection": "@dev",
@@ -1255,9 +1192,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1282,7 +1216,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/videopress",
-                "reference": "1992b5f3e03b0f92aca27c54941afdee6e5ffae1"
+                "reference": "f3ec72fb62e89cdd01e2ae70099f4a6066fae32f"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -1320,9 +1254,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
@@ -1362,7 +1293,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/changelogger",
-                "reference": "902e0f17e8f54dd4b36f83e808a1385e4d001c72"
+                "reference": "6cf3c9cec0a7d620c0389859b50867317301ebba"
             },
             "require": {
                 "php": ">=5.6",
@@ -1407,9 +1338,6 @@
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
-                "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-                ],
                 "test-php": [
                     "@composer phpunit"
                 ],
diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js
index 5d359dff30a03..4db8c14383c9b 100644
--- a/tools/cli/commands/generate.js
+++ b/tools/cli/commands/generate.js
@@ -448,8 +448,6 @@ function createPackageJson( packageJson, answers ) {
 		};
 		packageJson.scripts = {
 			test: 'jest tests',
-			'test-coverage':
-				'jest tests --coverage --collectCoverageFrom=\'src/**/*.js\' --coverageDirectory="$COVERAGE_DIR" --coverageReporters=clover',
 		};
 
 		// Extract the version of jest currently in use for the dependency.
@@ -532,7 +530,6 @@ async function createComposerJson( composerJson, answers ) {
 		case 'js-package':
 			composerJson.scripts = {
 				'test-js': [ 'pnpm run test' ],
-				'test-coverage': [ 'pnpm run test-coverage' ],
 			};
 	}
 }
diff --git a/tools/cli/skeletons/common/composer.json b/tools/cli/skeletons/common/composer.json
index 42e0ee48291ca..d3a0917e07f3b 100644
--- a/tools/cli/skeletons/common/composer.json
+++ b/tools/cli/skeletons/common/composer.json
@@ -17,9 +17,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
-		],
 		"test-php": [
 			"@composer phpunit"
 		]

From 2e397899d21f2ab227272ddfc4d9512a48b7236a Mon Sep 17 00:00:00 2001
From: MILLER/F <millerf@automattic.com>
Date: Mon, 20 Feb 2023 10:30:16 +0100
Subject: [PATCH 39/51] [paid-newsletters] visibility selector & wording
 changes (#28690)

* [not verified] Fix newsletter visibility in pre-post setting

* [not verified] Fix positioning

* [not verified] Fix Panel name

* [not verified] Create add-newsletter-visibility-selector

* [not verified] Change wording

* [not verified] Remove social followers if number is 0

* Prevent issue if accessLevel is empty (on new posts)
---
 .../add-newsletter-visibility-selector        |   4 +
 .../blocks/subscriptions/paid-plan.js         |   2 +-
 .../extensions/blocks/subscriptions/panel.js  | 100 ++++++++----
 .../blocks/subscriptions/settings.js          | 154 ++++++++++--------
 .../extensions/blocks/subscriptions/utils.js  |   2 +-
 5 files changed, 162 insertions(+), 100 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/add-newsletter-visibility-selector

diff --git a/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector b/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector
new file mode 100644
index 0000000000000..7a39506871287
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Harmonize UI with stock Gutenberg menu
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/paid-plan.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/paid-plan.js
index 7316c362a89c2..ea2faa8f5229f 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/paid-plan.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/paid-plan.js
@@ -5,7 +5,7 @@ import { __, _x } from '@wordpress/i18n';
 import GetAddPaidPlanButton from './utils';
 
 function PaidPlanPanel( { hasNewsletterPlans } ) {
-	const title = __( 'Paid Newsletter', 'jetpack' );
+	const title = __( 'Newsletter', 'jetpack' );
 	const text = hasNewsletterPlans
 		? _x(
 				'Manage paid plan for readers to access your content.',
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/panel.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/panel.js
index 64cc3547a0ea2..570c7ed3b2038 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/panel.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/panel.js
@@ -16,7 +16,6 @@ import './panel.scss';
 import { META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS } from './constants';
 import { NewsletterAccess, accessOptions } from './settings';
 import { isNewsletterFeatureEnabled } from './utils';
-
 export default function SubscribePanels() {
 	const [ subscriberCount, setSubscriberCount ] = useState( null );
 	const [ postMeta = [], setPostMeta ] = useEntityProp( 'postType', 'post', 'meta' );
@@ -75,53 +74,92 @@ export default function SubscribePanels() {
 			<PluginPrePublishPanel
 				className="jetpack-subscribe-pre-publish-panel"
 				initialOpen
-				title={ __( 'Newsletter', 'jetpack' ) }
+				title={
+					<>
+						{ __( 'Newsletter:', 'jetpack' ) }
+						{ accessLevel && (
+							<span className={ 'editor-post-publish-panel__link' }>
+								{ accessOptions[ accessLevel ].label }
+							</span>
+						) }
+					</>
+				}
 				icon={ <JetpackLogo showText={ false } height={ 16 } logoColor="#1E1E1E" /> }
 			>
 				{ showNotices && (
 					<InspectorNotice>
 						{ createInterpolateElement(
-							sprintf(
-								/* translators: 1$s will be subscribers, %2$s will be social followers */
-								__( 'This post will reach <span>%1$s</span> and <span>%2$s</span>.', 'jetpack' ),
-								sprintf(
-									/* translators: %s will be a number of subscribers */
-									_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
-									numberFormat( subscriberCount )
-								),
-								sprintf(
-									/* translators: %s will be a number of social followers */
-									_n( '%s social follower', '%s social followers', followerCount, 'jetpack' ),
-									numberFormat( followerCount )
-								)
-							),
+							followerCount !== 0
+								? sprintf(
+										/* translators: 1$s will be subscribers, %2$s will be social followers */
+										__(
+											'This post will reach <span>%1$s</span> and <span>%2$s</span>.',
+											'jetpack'
+										),
+										sprintf(
+											/* translators: %s will be a number of subscribers */
+											_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
+											numberFormat( subscriberCount )
+										),
+										sprintf(
+											/* translators: %s will be a number of social followers */
+											_n( '%s social follower', '%s social followers', followerCount, 'jetpack' ),
+											numberFormat( followerCount )
+										)
+								  )
+								: sprintf(
+										/* translators: 1$s will be subscribers */
+										__( 'This post will reach <span>%1$s</span>.', 'jetpack' ),
+										sprintf(
+											/* translators: %s will be a number of subscribers */
+											_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
+											numberFormat( subscriberCount )
+										)
+								  ),
 							{ span: <span className="jetpack-subscribe-reader-count" /> }
 						) }
 					</InspectorNotice>
 				) }
 
 				{ isNewsletterFeatureEnabled() && (
-					<NewsletterAccess setPostMeta={ setPostMeta } accessLevel={ accessLevel } />
+					<NewsletterAccess
+						setPostMeta={ setPostMeta }
+						accessLevel={ accessLevel }
+						withModal={ false }
+					/>
 				) }
 			</PluginPrePublishPanel>
 			<PluginPostPublishPanel className="jetpack-subscribe-post-publish-panel" initialOpen>
 				{ showNotices && (
 					<InspectorNotice>
 						{ createInterpolateElement(
-							sprintf(
-								/* translators: 1$s will be subscribers, %2$s will be social followers */
-								__( 'This post was shared to <span>%1$s</span> and <span>%2$s</span>.', 'jetpack' ),
-								sprintf(
-									/* translators: %s will be a number of subscribers */
-									_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
-									numberFormat( subscriberCount )
-								),
-								sprintf(
-									/* translators: %s will be a number of social followers */
-									_n( '%s social follower', '%s social followers', followerCount, 'jetpack' ),
-									numberFormat( followerCount )
-								)
-							),
+							followerCount !== 0
+								? sprintf(
+										/* translators: 1$s will be subscribers, %2$s will be social followers */
+										__(
+											'This post was shared to <span>%1$s</span> and <span>%2$s</span>.',
+											'jetpack'
+										),
+										sprintf(
+											/* translators: %s will be a number of subscribers */
+											_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
+											numberFormat( subscriberCount )
+										),
+										sprintf(
+											/* translators: %s will be a number of social followers */
+											_n( '%s social follower', '%s social followers', followerCount, 'jetpack' ),
+											numberFormat( followerCount )
+										)
+								  )
+								: sprintf(
+										/* translators: 1$s will be subscribers */
+										__( 'This post was shared to <span>%1$s</span>.', 'jetpack' ),
+										sprintf(
+											/* translators: %s will be a number of subscribers */
+											_n( '%s subscriber', '%s subscribers', subscriberCount, 'jetpack' ),
+											numberFormat( subscriberCount )
+										)
+								  ),
 							{ span: <span className="jetpack-subscribe-reader-count" /> }
 						) }
 					</InspectorNotice>
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/settings.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/settings.js
index 711ebc795bce7..df7f800616457 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/settings.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/settings.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line wpcalypso/no-unsafe-wp-apis
 import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
-import { Button, PanelRow, Dropdown, VisuallyHidden } from '@wordpress/components';
+import { Button, PanelRow, Dropdown, VisuallyHidden, Flex, FlexBlock } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
 import { PostVisibilityCheck } from '@wordpress/editor';
 import { __, sprintf } from '@wordpress/i18n';
@@ -21,8 +21,46 @@ export const accessOptions = {
 	},
 };
 
-export function NewsletterAccess( { accessLevel, setPostMeta } ) {
-	const instanceId = useInstanceId( NewsletterAccess );
+function NewsletterAccessChoices( { accessLevel, onChange } ) {
+	const instanceId = useInstanceId( NewsletterAccessChoices );
+	return (
+		<fieldset className="editor-post-visibility__fieldset">
+			<VisuallyHidden as="legend">{ __( 'Audience', 'jetpack' ) } </VisuallyHidden>
+			{ Object.keys( accessOptions ).map( key => (
+				<div className="editor-post-visibility__choice" key={ key }>
+					<input
+						type="radio"
+						checked={ key === accessLevel }
+						name={ `editor-post-visibility__setting-${ instanceId }` }
+						value={ key }
+						id={ `editor-post-${ key }-${ instanceId }` }
+						aria-describedby={ `editor-post-${ key }-${ instanceId }-description` }
+						className="editor-post-visibility__radio"
+						onChange={ event => {
+							const obj = {};
+							obj[ META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS ] = event?.target?.value;
+							return onChange && onChange( obj );
+						} }
+					/>
+					<label
+						htmlFor={ `editor-post-${ key }-${ instanceId }` }
+						className="editor-post-visibility__label"
+					>
+						{ accessOptions[ key ].label }
+					</label>
+					<p
+						id={ `editor-post-${ key }-${ instanceId }-description` }
+						className="editor-post-visibility__info"
+					>
+						{ accessOptions[ key ].info }
+					</p>
+				</div>
+			) ) }
+		</fieldset>
+	);
+}
+
+export function NewsletterAccess( { accessLevel, setPostMeta, withModal = true } ) {
 	if ( ! accessLevel || ! Object.keys( accessOptions ).includes( accessLevel ) ) {
 		accessLevel = Object.keys( accessOptions )[ 0 ];
 	}
@@ -32,71 +70,53 @@ export function NewsletterAccess( { accessLevel, setPostMeta } ) {
 		<PostVisibilityCheck
 			render={ ( { canEdit } ) => (
 				<PanelRow className="edit-post-post-visibility">
-					<span>{ __( 'Access', 'jetpack' ) }</span>
-					{ ! canEdit && <span>{ accessLabel }</span> }
-					{ canEdit && (
-						<Dropdown
-							placement="bottom-end"
-							contentClassName="edit-post-post-visibility__dialog"
-							focusOnMount
-							renderToggle={ ( { isOpen, onToggle } ) => (
-								<Button
-									isTertiary
-									onClick={ onToggle }
-									aria-expanded={ isOpen }
-									aria-label={ sprintf(
-										// translators: %s: Current newsletter post access.
-										__( 'Select audience: %s', 'jetpack' ),
-										accessLabel
+					<Flex direction={ withModal ? 'row' : 'column' }>
+						{
+							<FlexBlock>
+								<span>{ __( 'Access', 'jetpack' ) }</span>
+							</FlexBlock>
+						}
+						{ ! canEdit && <span>{ accessLabel }</span> }
+						{ withModal && canEdit && (
+							<FlexBlock>
+								<Dropdown
+									placement="bottom-end"
+									contentClassName="edit-post-post-visibility__dialog"
+									focusOnMount
+									renderToggle={ ( { isOpen, onToggle } ) => (
+										<Button
+											isTertiary
+											onClick={ onToggle }
+											aria-expanded={ isOpen }
+											aria-label={ sprintf(
+												// translators: %s: Current newsletter post access.
+												__( 'Select audience: %s', 'jetpack' ),
+												accessLabel
+											) }
+										>
+											{ accessLabel }
+										</Button>
+									) }
+									renderContent={ ( { onClose } ) => (
+										<div className="editor-post-visibility">
+											<InspectorPopoverHeader
+												title={ __( 'Audience', 'jetpack' ) }
+												help={ __( 'Control how this newsletter is viewed.', 'jetpack' ) }
+												onClose={ onClose }
+											/>
+											<NewsletterAccessChoices onChange={ setPostMeta } />
+										</div>
 									) }
-								>
-									{ accessLabel }
-								</Button>
-							) }
-							renderContent={ ( { onClose } ) => (
-								<div className="editor-post-visibility">
-									<InspectorPopoverHeader
-										title={ __( 'Audience', 'jetpack' ) }
-										help={ __( 'Control how this newsletter is viewed.', 'jetpack' ) }
-										onClose={ onClose }
-									/>
-									<fieldset className="editor-post-visibility__fieldset">
-										<VisuallyHidden as="legend">{ __( 'Audience', 'jetpack' ) } </VisuallyHidden>
-										{ Object.keys( accessOptions ).map( key => (
-											<div className="editor-post-visibility__choice" key={ key }>
-												<input
-													type="radio"
-													checked={ key === accessLevel }
-													name={ `editor-post-visibility__setting-${ instanceId }` }
-													value={ key }
-													id={ `editor-post-${ key }-${ instanceId }` }
-													aria-describedby={ `editor-post-${ key }-${ instanceId }-description` }
-													className="editor-post-visibility__radio"
-													onChange={ event => {
-														const obj = {};
-														obj[ META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS ] = event?.target?.value;
-														return setPostMeta( obj );
-													} }
-												/>
-												<label
-													htmlFor={ `editor-post-${ key }-${ instanceId }` }
-													className="editor-post-visibility__label"
-												>
-													{ accessOptions[ key ].label }
-												</label>
-												<p
-													id={ `editor-post-${ key }-${ instanceId }-description` }
-													className="editor-post-visibility__info"
-												>
-													{ accessOptions[ key ].info }
-												</p>
-											</div>
-										) ) }
-									</fieldset>
-								</div>
-							) }
-						/>
-					) }
+								/>
+							</FlexBlock>
+						) }
+
+						{ ! withModal && canEdit && (
+							<FlexBlock>
+								<NewsletterAccessChoices accessLevel={ accessLevel } onChange={ setPostMeta } />
+							</FlexBlock>
+						) }
+					</Flex>
 				</PanelRow>
 			) }
 		/>
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/utils.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/utils.js
index 22ecdb63b0729..0356d1f091ab2 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/utils.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/utils.js
@@ -33,7 +33,7 @@ export const isNewsletterFeatureEnabled = () => {
 export default function GetAddPaidPlanButton( { context = 'other', hasNewsletterPlans } ) {
 	const addPaidPlanButtonText = hasNewsletterPlans
 		? _x( 'Manage plans', 'unused context to distinguish translations', 'jetpack' )
-		: __( 'Add paid plan', 'jetpack' );
+		: __( 'Add Payments', 'jetpack' );
 
 	if ( 'toolbar' === context ) {
 		return (

From f02bf404ddfbe38d9d9c6a2b35135995301facb5 Mon Sep 17 00:00:00 2001
From: ouikhuan <iverson0217@gmail.com>
Date: Mon, 20 Feb 2023 18:19:05 +0800
Subject: [PATCH 40/51] Update readme.txt for migration plugin (#29040)

* Update readme.txt for migration plugin
---
 .../changelog/update-migration-readme         |  4 ++
 projects/plugins/migration/readme.txt         | 63 ++++++-------------
 2 files changed, 23 insertions(+), 44 deletions(-)
 create mode 100644 projects/plugins/migration/changelog/update-migration-readme

diff --git a/projects/plugins/migration/changelog/update-migration-readme b/projects/plugins/migration/changelog/update-migration-readme
new file mode 100644
index 0000000000000..155f5189e78b0
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-migration-readme
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Update readme.txt for migration plugin
diff --git a/projects/plugins/migration/readme.txt b/projects/plugins/migration/readme.txt
index 4b07c350b1505..aa399e2d3464d 100644
--- a/projects/plugins/migration/readme.txt
+++ b/projects/plugins/migration/readme.txt
@@ -1,6 +1,6 @@
 === Move to WordPress.com ===
-Contributors: automattic,
-Tags: jetpack, stuff
+Contributors: automattic
+Tags: migrate, migration, backup, restore, transfer, move, copy, wordpress.com, automattic, import, importer, hosting
 Requires at least: 6.0
 Requires PHP: 5.6
 Tested up to: 6.1
@@ -8,61 +8,36 @@ Stable tag: 0.1.0-alpha
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Move to WordPress.com plugin
-
-== Description ==
-
 A WordPress plugin that helps users to migrate their sites to WordPress.com
 
-== Installation ==
-
-Installation instructions go here.
-
-== Frequently Asked Questions ==
-
-= A question that someone might have =
-
-An answer to that question.
-
-== Screenshots ==
+== Description ==
 
-1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is taken from
-the /assets directory or the directory that contains the stable readme.txt (tags or trunk). Screenshots in the /assets
-directory take precedence. For example, `/assets/screenshot-1.png` would win over `/tags/4.3/screenshot-1.png`
-(or jpg, jpeg, gif).
-2. This is the second screen shot
+### Move your site over to WordPress.com ###
 
-== Changelog ==
+This free plugin offers a simple way to migrate any site to WordPress.com managed hosting. Get the superior speed, performance, security, and support you need to take your site to the next level.
 
-<!-- When you do a release, use the monorepo script tools/plugin-changelog-to-readme.sh to copy from CHANGELOG.md to here. -->
+### It’s up to you ###
 
-== Arbitrary section ==
+Migrate just your site or bring your content and settings along with it, including blog posts, pages, themes, plugins, site styles, fonts, and colors.
 
-You may provide arbitrary sections, in the same format as the ones above.  This may be of use for extremely complicated
-plugins where more information needs to be conveyed that doesn't fit into the categories of "description" or
-"installation."  Arbitrary sections will be shown below the built-in sections outlined above.
+### Relax and let the plugin do the work ###
 
-== A brief Markdown Example ==
+The migration is automatic – set it in motion, walk away, and we’ll send you an email once it’s done.
 
-Ordered list:
+### The same, but better ###
 
-1. Some feature
-1. Another feature
-1. Something else about the plugin
+Thanks to the seamless transfer from your old site to the new one, your visitors will never notice you’ve switched. But once you see the improvement, you will.
 
-Unordered list:
+### You’re not alone ###
 
-* something
-* something else
-* third thing
+If you need a little help during or after the migration, you’ll have round-the-clock access to WordPress.com experts with email and live-chat support.
 
-Here's a link to [WordPress](https://wordpress.org/ "Your favorite software") and one to [Markdown's Syntax Documentation][markdown syntax].
-Titles are optional, naturally.
+== Installation ==
 
-[markdown syntax]: http://daringfireball.net/projects/markdown/syntax
-"Markdown is what the parser uses to process much of the readme file"
+1. To begin, click on the Plugins link in the left hand sidebar, then click Add New.
+2. Search for Move to WordPress.com. The latest version will be in the search results. Click the Install Now button.
+3. Next, click the Activate button. After activating, you can navigate to Move to WordPress.com in your admin area.
 
-Markdown uses email style notation for blockquotes and I've been told:
-> Asterisks for *emphasis*. Double it up  for **strong**.
+== Changelog ==
 
-`<?php code(); // goes in backticks ?>`
+<!-- When you do a release, use the monorepo script tools/plugin-changelog-to-readme.sh to copy from CHANGELOG.md to here. -->
\ No newline at end of file

From 5e92e1c63281227afe235030ae4f7957646f7021 Mon Sep 17 00:00:00 2001
From: MILLER/F <millerf@automattic.com>
Date: Mon, 20 Feb 2023 11:22:20 +0100
Subject: [PATCH 41/51] [Paid Newletters] tests for paid newsletters
 regressions (#28966)

* Fix function case in PaidNewletter tests

* Added premium-content test suite

* Added changelog

* First tests working

* Added phpunit tests

Can be run with
```
jetpack docker phpunit --  -c tests/php.multisite.xml --testsuite=premium-content
```

* Added test for regular subscriber

* Added tests for comments

* Enable jetpack_subscriptions_newsletter_feature_enabled and add comments tests

* Added test_comments_are_not_displaying_for_paid_subscribers_when_defaults_to_false

* Fix tests

* Moved tests to the right folder and added @covers

* Adding more @covers
---
 ...tests-add-tests-for-newsletter-regressions |   4 +
 .../premium-content/_inc/access-check.php     |   3 +-
 .../plugins/jetpack/tests/php.multisite.xml   |   3 +
 ...est-jetpack-token-subscription-service.php |  12 ++
 .../test_class.jetpack-premium-content.php    | 198 ++++++++++++++++++
 .../test_class.jetpack-subscriptions.php      |  72 ++++++-
 6 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
 create mode 100644 projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/class-test-jetpack-token-subscription-service.php
 create mode 100644 projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/test_class.jetpack-premium-content.php

diff --git a/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions b/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
new file mode 100644
index 0000000000000..ed77bf50d15b7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Tests for paid-newsletters regressions
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/access-check.php b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/access-check.php
index 5479d35142609..f4cb8f7fdcd5e 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/access-check.php
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/access-check.php
@@ -9,7 +9,7 @@
 
 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Token_Subscription_Service;
 
-require __DIR__ . '/subscription-service/include.php';
+require_once __DIR__ . '/subscription-service/include.php';
 
 /**
  * Determines if the memberships module is set up.
@@ -75,6 +75,7 @@ function current_visitor_can_access( $attributes, $block ) {
 	 * If the current WordPress install has as signed in user
 	 * they can see the content.
 	 */
+
 	if ( current_user_can_edit() ) {
 		return true;
 	}
diff --git a/projects/plugins/jetpack/tests/php.multisite.xml b/projects/plugins/jetpack/tests/php.multisite.xml
index d343207a6b6d0..0107be28d1a23 100644
--- a/projects/plugins/jetpack/tests/php.multisite.xml
+++ b/projects/plugins/jetpack/tests/php.multisite.xml
@@ -51,6 +51,9 @@
 		<testsuite name="subscriptions">
 			<directory prefix="test_" suffix=".php">php/modules/subscriptions</directory>
 		</testsuite>
+		<testsuite name="premium-content">
+			<directory prefix="test_" suffix=".php">php/extensions/blocks/premium-content</directory>
+		</testsuite>
 		<testsuite name="contact-form">
 			<directory prefix="test" suffix=".php">php/modules/contact-form</directory>
 		</testsuite>
diff --git a/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/class-test-jetpack-token-subscription-service.php b/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/class-test-jetpack-token-subscription-service.php
new file mode 100644
index 0000000000000..5484f43160dad
--- /dev/null
+++ b/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/class-test-jetpack-token-subscription-service.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Tests\Automattic\Jetpack\Extensions\Premium_Content;
+
+use \Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service;
+
+// Overrides the way Jetpack_Token_Subscription_Service get its JWT key
+class Test_Jetpack_Token_Subscription_Service extends Jetpack_Token_Subscription_Service {
+	public function get_key() {
+		return 'whatever';
+	}
+}
diff --git a/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/test_class.jetpack-premium-content.php b/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/test_class.jetpack-premium-content.php
new file mode 100644
index 0000000000000..ca6f6193bf9f7
--- /dev/null
+++ b/projects/plugins/jetpack/tests/php/extensions/blocks/premium-content/test_class.jetpack-premium-content.php
@@ -0,0 +1,198 @@
+<?php
+
+require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions.php';
+require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/access-check.php';
+require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
+require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
+require_once __DIR__ . '/class-test-jetpack-token-subscription-service.php';
+
+use Automattic\Jetpack\Extensions\Premium_Content\JWT;
+use \Tests\Automattic\Jetpack\Extensions\Premium_Content\Test_Jetpack_Token_Subscription_Service;
+use function Automattic\Jetpack\Extensions\Premium_Content\current_visitor_can_access;
+use function Automattic\Jetpack\Extensions\Premium_Content\subscription_service;
+use const Automattic\Jetpack\Extensions\Premium_Content\PAYWALL_FILTER;
+
+class WP_Test_Jetpack_Premium_Content extends WP_UnitTestCase {
+
+	protected $product_id = 1234;
+
+	public function set_up() {
+		parent::set_up();
+		Jetpack_Subscriptions::init();
+		add_filter( 'test_jetpack_is_supported_jetpack_recurring_payments', '__return_true' );
+
+		add_filter(
+			PAYWALL_FILTER,
+			function () {
+				return new Test_Jetpack_Token_Subscription_Service();
+			}
+		);
+	}
+
+	public function tear_down() {
+		// Clean up
+		remove_all_filters( 'earn_get_user_subscriptions_for_site_id' );
+		remove_all_filters( 'test_jetpack_is_supported_jetpack_recurring_payments' );
+		remove_all_filters( PAYWALL_FILTER );
+		parent::tear_down();
+	}
+
+	/**
+	 * Retrieves payload for JWT token
+	 *
+	 * @param bool     $is_subscribed
+	 * @param bool     $is_paid_subscriber
+	 * @param int|null $subscription_end_date
+	 * @return array
+	 */
+	private function get_payload( $is_subscribed, $is_paid_subscriber, $subscription_end_date = null, $status = null ) {
+		$subscriptions = ! $is_paid_subscriber ? array() : array(
+			$this->product_id => array(
+				'status'     => $status ? $status : 'active',
+				'end_date'   => $subscription_end_date ? $subscription_end_date : time() + HOUR_IN_SECONDS,
+				'product_id' => $this->product_id,
+			),
+		);
+
+		return array(
+			'blog_sub'      => $is_subscribed ? 'active' : 'inactive',
+			'subscriptions' => $subscriptions,
+		);
+	}
+
+	/**
+	 * Stubs WPCOM_Token_Subscription_Service in order to return the provided token.
+	 *
+	 * @param array $payload
+	 * @return mixed
+	 */
+	private function set_returned_token( $payload ) {
+		// We remove anything else
+		$service = subscription_service();
+		$this->assertTrue( is_a( $service, '\Tests\Automattic\Jetpack\Extensions\Premium_Content\Test_Jetpack_Token_Subscription_Service' ) );
+		$_GET['token'] = JWT::encode( $payload, $service->get_key() );
+	}
+
+	private function set_up_users_and_plans() {
+		// We create a paid subscriber
+		$paid_subscriber_id = $this->factory->user->create(
+			array(
+				'user_email' => 'test-paid@example.com',
+			)
+		);
+
+		$regular_subscriber_id = $this->factory->user->create(
+			array(
+				'user_email' => 'test-subscriber@example.com',
+			)
+		);
+
+		$non_subscriber_id = $this->factory->user->create(
+			array(
+				'user_email' => 'test@example.com',
+			)
+		);
+
+		// We create a plan
+		$plan_id = $this->factory->post->create(
+			array(
+				'post_type' => Jetpack_Memberships::$post_type_plan,
+			)
+		);
+		update_post_meta( $plan_id, 'jetpack_memberships_product_id', $this->product_id );
+		$this->factory->post->create();
+
+		// We set the plan to the paid_subscriber_id
+		add_filter(
+			'earn_get_user_subscriptions_for_site_id',
+			static function ( $subscriptions, $subscriber_id ) use ( $paid_subscriber_id, $plan_id ) {
+				if ( $subscriber_id === $paid_subscriber_id ) {
+					$subscriptions = array_merge( $subscriptions, array( $plan_id ) );
+				}
+
+				return $subscriptions;
+			},
+			10,
+			2
+		);
+
+		return array( $non_subscriber_id, $regular_subscriber_id, $paid_subscriber_id, $plan_id );
+	}
+
+	/**
+	 * Admin has access all the time
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Premium_Content\current_visitor_can_access
+	 *
+	 * @return void
+	 */
+	public function test_access_check_current_visitor_can_access_admin() {
+		$admin_user_id = $this->factory->user->create(
+			array(
+				'user_email' => 'test-admin@example.com',
+			)
+		);
+
+		get_user_by( 'id', $admin_user_id )->add_role( 'administrator' );
+		$post_id         = $this->factory->post->create();
+		$GLOBALS['post'] = get_post( $post_id );
+		wp_set_current_user( $admin_user_id );
+		$this->assertTrue( current_visitor_can_access( array(), array() ) );
+	}
+
+	/**
+	 * Test current_visitor_can_access works for different types of users
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Premium_Content\current_visitor_can_access
+	 *
+	 * @return void
+	 */
+	public function test_access_check_current_visitor_can_access_regular_users() {
+		$users_plans           = $this->set_up_users_and_plans();
+		$non_subscriber_id     = $users_plans[0];
+		$regular_subscriber_id = $users_plans[1];
+		$paid_subscriber_id    = $users_plans[2];
+		$plan_id               = $users_plans[3];
+
+		// We setup the token for the regular user
+		wp_set_current_user( $non_subscriber_id );
+		$payload = $this->get_payload( false, false );
+		$this->set_returned_token( $payload );
+		$this->assertFalse( current_visitor_can_access( array( 'selectedPlanId' => $plan_id ), array() ) );
+
+		// We setup the token for the regular subscriber
+		wp_set_current_user( $regular_subscriber_id );
+		$payload = $this->get_payload( true, false );
+		$this->set_returned_token( $payload );
+		$this->assertFalse( current_visitor_can_access( array( 'selectedPlanId' => $plan_id ), array() ) );
+
+		// We setup the token for the paid user
+		wp_set_current_user( $paid_subscriber_id );
+		$payload = $this->get_payload( true, true );
+		$this->set_returned_token( $payload );
+		$this->assertTrue( current_visitor_can_access( array( 'selectedPlanId' => $plan_id ), array() ) );
+	}
+
+	/**
+	 * Test that plan id can be passed 2 ways
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Premium_Content\current_visitor_can_access
+	 *
+	 * @return void
+	 */
+	public function test_access_check_current_visitor_can_access_passing_plan_id() {
+		$users_plans        = $this->set_up_users_and_plans();
+		$paid_subscriber_id = $users_plans[2];
+		$plan_id            = $users_plans[3];
+
+		wp_set_current_user( $paid_subscriber_id );
+		$payload = $this->get_payload( true, true );
+		$this->set_returned_token( $payload );
+		// We check it fails if the plan is not passed
+		$this->assertFalse( current_visitor_can_access( array(), array() ) );
+
+		// The plan id can be passed in 2 ways.
+		$this->assertTrue( current_visitor_can_access( array( 'selectedPlanId' => $plan_id ), array() ) );
+		$this->assertTrue( current_visitor_can_access( array(), (object) array( 'context' => array( 'premium-content/planId' => $plan_id ) ) ) );
+	}
+}
diff --git a/projects/plugins/jetpack/tests/php/modules/subscriptions/test_class.jetpack-subscriptions.php b/projects/plugins/jetpack/tests/php/modules/subscriptions/test_class.jetpack-subscriptions.php
index efc12e0cb1d45..2978491900aec 100644
--- a/projects/plugins/jetpack/tests/php/modules/subscriptions/test_class.jetpack-subscriptions.php
+++ b/projects/plugins/jetpack/tests/php/modules/subscriptions/test_class.jetpack-subscriptions.php
@@ -3,11 +3,13 @@
 require_once JETPACK__PLUGIN_DIR . 'modules/subscriptions.php';
 require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
 require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
+require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/subscriptions/subscriptions.php';
 
 use Automattic\Jetpack\Extensions\Premium_Content\JWT;
 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\WPCOM_Offline_Subscription_Service;
 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\WPCOM_Online_Subscription_Service;
 use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\WPCOM_Token_Subscription_Service;
+use function Automattic\Jetpack\Extensions\Subscriptions\register_block as register_subscription_block;
 
 define( 'EARN_JWT_SIGNING_KEY', 'whatever=' );
 
@@ -31,6 +33,8 @@ public function tear_down() {
 		// Clean up
 		remove_all_filters( 'earn_get_user_subscriptions_for_site_id' );
 		remove_all_filters( 'test_jetpack_is_supported_jetpack_recurring_payments' );
+		remove_all_filters( 'jetpack_subscriptions_newsletter_feature_enabled' );
+
 		parent::tear_down();
 	}
 
@@ -285,7 +289,7 @@ public function test_subscriber_access_level( $type_user_id, $logged, $token_set
 		$payload            = $this->get_payload( $is_blog_subscriber, $is_paid_subscriber, $subscription_end_date, $status );
 
 		$post_id = $this->setup_jetpack_paid_newsletters();
-		$this->setReturnedSubscriptions( $payload );
+		$this->set_returned_subscriptions( $payload );
 
 		$GLOBALS['post'] = get_post( $post_id );
 		update_post_meta( $post_id, '_jetpack_newsletter_access', $post_access_level );
@@ -324,6 +328,69 @@ public function test_subscriber_access_level( $type_user_id, $logged, $token_set
 		);
 	}
 
+	/**
+	 * Tests for regression from https://github.com/Automattic/jetpack/commit/e2c3b99c39047a15de02ca82f23893185916e2d9
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Subscriptions\maybe_close_comments
+	 *
+	 * @return void
+	 */
+	public function test_comments_are_not_displaying_on_not_pages() {
+		add_filter( 'jetpack_subscriptions_newsletter_feature_enabled', '__return_true' );
+		register_subscription_block();
+
+		// When no post id is set, the comments should default to whatever is passed as default
+		$this->assertFalse( apply_filters( 'comments_open', false, null ) );
+		$this->assertTrue( apply_filters( 'comments_open', true, null ) );
+	}
+
+	/**
+	 * Tests for regression from https://github.com/Automattic/jetpack/commit/e2c3b99c39047a15de02ca82f23893185916e2d9
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Subscriptions\maybe_close_comments
+	 *
+	 * @return void
+	 */
+	public function test_comments_are_displaying_on_not_accessible_pages() {
+		add_filter( 'jetpack_subscriptions_newsletter_feature_enabled', '__return_true' );
+		register_subscription_block();
+
+		// When post-id is passed, it should prevent access depending of the user access
+		$payload              = $this->get_payload( true, false, null, null );
+		$post_id              = $this->setup_jetpack_paid_newsletters();
+		$subscription_service = $this->set_returned_token( $payload );
+		$GLOBALS['post']      = get_post( $post_id );
+		$post_access_level    = 'paid_subscribers';
+		update_post_meta( $post_id, '_jetpack_newsletter_access', $post_access_level );
+		$this->assertFalse( $subscription_service->visitor_can_view_content( array( $this->plan_id ), $post_access_level ) );
+
+		$this->assertFalse( apply_filters( 'comments_open', true, $post_id ) );
+	}
+
+	/**
+	 * Tests for regression from https://github.com/Automattic/jetpack/commit/e2c3b99c39047a15de02ca82f23893185916e2d9
+	 *
+	 * @covers \Automattic\Jetpack\Extensions\Subscriptions\maybe_close_comments
+	 *
+	 * @return void
+	 */
+	public function test_comments_are_not_displaying_for_paid_subscribers_when_defaults_to_false() {
+		add_filter( 'jetpack_subscriptions_newsletter_feature_enabled', '__return_true' );
+		register_subscription_block();
+
+		// When post-id is passed, it should prevent access depending of the user access
+		$payload              = $this->get_payload( true, true, null, null );
+		$post_id              = $this->setup_jetpack_paid_newsletters();
+		$subscription_service = $this->set_returned_token( $payload );
+		$GLOBALS['post']      = get_post( $post_id );
+		$post_access_level    = 'paid_subscribers';
+		update_post_meta( $post_id, '_jetpack_newsletter_access', $post_access_level );
+		$this->assertTrue( $subscription_service->visitor_can_view_content( array( $this->plan_id ), $post_access_level ) );
+
+		// The user has access, BUT it still does NOT display comments if defaults to false
+		$this->assertFalse( apply_filters( 'comments_open', false, $post_id ) );
+	}
+
 	/**
 	 * Setup the newsletter post
 	 *
@@ -348,7 +415,7 @@ private function setup_jetpack_paid_newsletters() {
 	 * @param array $payload .
 	 * @return WPCOM_Online_Subscription_Service
 	 */
-	private function setReturnedSubscriptions( $payload ) {
+	private function set_returned_subscriptions( $payload ) {
 		remove_all_filters( 'earn_get_user_subscriptions_for_site_id' );
 		$paid_subscriber_id = $this->paid_subscriber_id;
 		add_filter(
@@ -367,5 +434,4 @@ static function ( $subscriptions, $subscriber_id ) use ( $paid_subscriber_id, $p
 
 		return new WPCOM_Online_Subscription_Service();
 	}
-
 }

From b46b19419a063b506f21eee56ca084d5a51a1a14 Mon Sep 17 00:00:00 2001
From: Karen Attfield <karenlattfield@gmail.com>
Date: Mon, 20 Feb 2023 13:37:40 +0000
Subject: [PATCH 42/51] CRM: Clean up - remove redundant eslintrc.js file
 (#28948)

---
 projects/plugins/crm/.eslintignore            |  3 +-
 projects/plugins/crm/.eslintrc.js             | 28 -------------------
 .../changelog/update-crm-remove-eslintrcjs    |  5 ++++
 3 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 projects/plugins/crm/.eslintrc.js
 create mode 100644 projects/plugins/crm/changelog/update-crm-remove-eslintrcjs

diff --git a/projects/plugins/crm/.eslintignore b/projects/plugins/crm/.eslintignore
index 7949bfd787430..4889d0764ba8c 100644
--- a/projects/plugins/crm/.eslintignore
+++ b/projects/plugins/crm/.eslintignore
@@ -4,4 +4,5 @@
 # They can be removed here as lint errors are addressed.
 /js/
 /modules/
-gulpfile.esm.js
\ No newline at end of file
+gulpfile.esm.js
+webpack.config.js
\ No newline at end of file
diff --git a/projects/plugins/crm/.eslintrc.js b/projects/plugins/crm/.eslintrc.js
deleted file mode 100644
index aababcc8f2a73..0000000000000
--- a/projects/plugins/crm/.eslintrc.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const loadIgnorePatterns = require( 'jetpack-js-tools/load-eslint-ignore.js' );
-
-module.exports = {
-	root: true,
-	extends: [
-		require.resolve( 'jetpack-js-tools/eslintrc/base' ),
-		require.resolve( 'jetpack-js-tools/eslintrc/wp-eslint-plugin/recommended' ),
-	],
-	ignorePatterns: loadIgnorePatterns( __dirname ),
-	rules: {
-		camelcase: 0,
-		'no-var': 0,
-		'prefer-const': 0,
-		'prettier/prettier': 0,
-		// This is not a react project.
-		'react-hooks/rules-of-hooks': 0,
-
-		// Don't require JSDoc on functions initially.
-		'jsdoc/check-tag-names': 0,
-		'jsdoc/require-jsdoc': 0,
-		'jsdoc/require-returns': 0,
-		'jsdoc/require-description': 0,
-		'jsdoc/require-property-description': 0,
-		'jsdoc/require-param-description': 0,
-		'jsdoc/require-param-type': 0,
-	},
-};
diff --git a/projects/plugins/crm/changelog/update-crm-remove-eslintrcjs b/projects/plugins/crm/changelog/update-crm-remove-eslintrcjs
new file mode 100644
index 0000000000000..ef5bcac2d1d4c
--- /dev/null
+++ b/projects/plugins/crm/changelog/update-crm-remove-eslintrcjs
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Tooling related - removing a redundant eslintrc.js file
+
+

From a1d8fbd4c8a97d1b8181b550aa92e48304467943 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Mon, 20 Feb 2023 19:11:16 +0100
Subject: [PATCH 43/51] General: add External link icon to external links
 (#28922)

---
 .../changelog/fix-missing-external-links           |  4 ++++
 .../components/components/pricing-table/index.tsx  |  9 +++------
 .../changelog/fix-missing-external-links           |  4 ++++
 .../connect-screen/basic/test/component.jsx        |  4 ++--
 .../components/connect-screen/basic/visual.jsx     |  9 +++------
 .../required-plan/test/component.jsx               |  4 ++--
 .../connect-screen/required-plan/visual.jsx        | 11 +++--------
 .../disconnect-dialog/steps/step-disconnect.jsx    | 14 +++++---------
 .../disconnect-dialog/test/step-disconnect.jsx     |  4 ++--
 .../components/manage-connection-dialog/index.jsx  | 14 +++++---------
 .../client/components/connect-button/index.jsx     | 13 +++----------
 .../_inc/client/components/footer/index.jsx        |  8 ++++++++
 .../_inc/client/components/footer/style.scss       |  4 ++++
 .../components/jetpack-notices/state-notices.jsx   |  5 ++---
 .../plugins/jetpack/_inc/client/traffic/ads.jsx    |  3 ++-
 .../jetpack/changelog/fix-missing-external-links   |  4 ++++
 .../social/changelog/fix-missing-external-links    |  4 ++++
 .../src/js/components/connection-screen/index.js   |  9 +++------
 18 files changed, 63 insertions(+), 64 deletions(-)
 create mode 100644 projects/js-packages/components/changelog/fix-missing-external-links
 create mode 100644 projects/js-packages/connection/changelog/fix-missing-external-links
 create mode 100644 projects/plugins/jetpack/changelog/fix-missing-external-links
 create mode 100644 projects/plugins/social/changelog/fix-missing-external-links

diff --git a/projects/js-packages/components/changelog/fix-missing-external-links b/projects/js-packages/components/changelog/fix-missing-external-links
new file mode 100644
index 0000000000000..911c3a1a6291c
--- /dev/null
+++ b/projects/js-packages/components/changelog/fix-missing-external-links
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Use External Link icons for external links
diff --git a/projects/js-packages/components/components/pricing-table/index.tsx b/projects/js-packages/components/components/pricing-table/index.tsx
index 4682ddec64d68..6d6abd90934c2 100644
--- a/projects/js-packages/components/components/pricing-table/index.tsx
+++ b/projects/js-packages/components/components/pricing-table/index.tsx
@@ -1,3 +1,4 @@
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { Icon, check, closeSmall } from '@wordpress/icons';
@@ -29,13 +30,9 @@ const ToS = createInterpolateElement(
 		'jetpack'
 	),
 	{
-		tosLink: <a href={ getRedirectUrl( 'wpcom-tos' ) } rel="noopener noreferrer" target="_blank" />,
+		tosLink: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 		shareDetailsLink: (
-			<a
-				href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) }
-				rel="noopener noreferrer"
-				target="_blank"
-			/>
+			<ExternalLink href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) } />
 		),
 	}
 );
diff --git a/projects/js-packages/connection/changelog/fix-missing-external-links b/projects/js-packages/connection/changelog/fix-missing-external-links
new file mode 100644
index 0000000000000..63ba68b0e295f
--- /dev/null
+++ b/projects/js-packages/connection/changelog/fix-missing-external-links
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Add External link icon to links at the bottom of the disconnect modal.
diff --git a/projects/js-packages/connection/components/connect-screen/basic/test/component.jsx b/projects/js-packages/connection/components/connect-screen/basic/test/component.jsx
index b8ae1f9e08b39..e60b572ba2ce5 100644
--- a/projects/js-packages/connection/components/connect-screen/basic/test/component.jsx
+++ b/projects/js-packages/connection/components/connect-screen/basic/test/component.jsx
@@ -32,14 +32,14 @@ describe( 'ConnectScreen', () => {
 
 	it( 'applies correct href to terms of service', () => {
 		render( <ConnectScreen { ...requiredProps } /> );
-		const terms = screen.getByRole( 'link', { name: 'Terms of Service' } );
+		const terms = screen.getByRole( 'link', { name: 'Terms of Service (opens in a new tab)' } );
 		expect( terms ).toHaveAttribute( 'href', 'https://jetpack.com/redirect/?source=wpcom-tos' );
 		expect( terms ).toHaveAttribute( 'target', '_blank' );
 	} );
 
 	it( 'applies correct href to share', () => {
 		render( <ConnectScreen { ...requiredProps } /> );
-		const share = screen.getByRole( 'link', { name: 'share details' } );
+		const share = screen.getByRole( 'link', { name: 'share details (opens in a new tab)' } );
 		expect( share ).toHaveAttribute(
 			'href',
 			'https://jetpack.com/redirect/?source=jetpack-support-what-data-does-jetpack-sync'
diff --git a/projects/js-packages/connection/components/connect-screen/basic/visual.jsx b/projects/js-packages/connection/components/connect-screen/basic/visual.jsx
index 255e99f45c5e5..9f98faa13def1 100644
--- a/projects/js-packages/connection/components/connect-screen/basic/visual.jsx
+++ b/projects/js-packages/connection/components/connect-screen/basic/visual.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl, ActionButton } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import PropTypes from 'prop-types';
@@ -12,13 +13,9 @@ export const ToS = createInterpolateElement(
 		'jetpack'
 	),
 	{
-		tosLink: <a href={ getRedirectUrl( 'wpcom-tos' ) } rel="noopener noreferrer" target="_blank" />,
+		tosLink: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 		shareDetailsLink: (
-			<a
-				href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) }
-				rel="noopener noreferrer"
-				target="_blank"
-			/>
+			<ExternalLink href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) } />
 		),
 	}
 );
diff --git a/projects/js-packages/connection/components/connect-screen/required-plan/test/component.jsx b/projects/js-packages/connection/components/connect-screen/required-plan/test/component.jsx
index 61ae1fd89c94c..61c1a9ae8f5a4 100644
--- a/projects/js-packages/connection/components/connect-screen/required-plan/test/component.jsx
+++ b/projects/js-packages/connection/components/connect-screen/required-plan/test/component.jsx
@@ -37,14 +37,14 @@ describe( 'ConnectScreenRequiredPlan', () => {
 
 	it( 'applies correct href to terms of service', () => {
 		render( <ConnectScreenRequiredPlan { ...requiredProps } /> );
-		const terms = screen.getByRole( 'link', { name: 'Terms of Service' } );
+		const terms = screen.getByRole( 'link', { name: 'Terms of Service (opens in a new tab)' } );
 		expect( terms ).toHaveAttribute( 'href', 'https://jetpack.com/redirect/?source=wpcom-tos' );
 		expect( terms ).toHaveAttribute( 'target', '_blank' );
 	} );
 
 	it( 'applies correct href to share', () => {
 		render( <ConnectScreenRequiredPlan { ...requiredProps } /> );
-		const share = screen.getByRole( 'link', { name: 'share details' } );
+		const share = screen.getByRole( 'link', { name: 'share details (opens in a new tab)' } );
 		expect( share ).toHaveAttribute(
 			'href',
 			'https://jetpack.com/redirect/?source=jetpack-support-what-data-does-jetpack-sync'
diff --git a/projects/js-packages/connection/components/connect-screen/required-plan/visual.jsx b/projects/js-packages/connection/components/connect-screen/required-plan/visual.jsx
index 9eef2ccbc0cf1..390bf7d3f825d 100644
--- a/projects/js-packages/connection/components/connect-screen/required-plan/visual.jsx
+++ b/projects/js-packages/connection/components/connect-screen/required-plan/visual.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl, PricingCard, ActionButton } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import PropTypes from 'prop-types';
@@ -36,15 +37,9 @@ const ConnectScreenRequiredPlanVisual = props => {
 			'jetpack'
 		),
 		{
-			tosLink: (
-				<a href={ getRedirectUrl( 'wpcom-tos' ) } rel="noopener noreferrer" target="_blank" />
-			),
+			tosLink: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 			shareDetailsLink: (
-				<a
-					href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) }
-					rel="noopener noreferrer"
-					target="_blank"
-				/>
+				<ExternalLink href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) } />
 			),
 		}
 	);
diff --git a/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx b/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
index 31e37acaae4ee..4bbbe95017b65 100644
--- a/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
+++ b/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
@@ -1,5 +1,5 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
-import { Button } from '@wordpress/components';
+import { Button, ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import PropTypes from 'prop-types';
@@ -129,7 +129,7 @@ const StepDisconnect = props => {
 
 			<div className="jp-connection__disconnect-dialog__actions">
 				<div className="jp-row">
-					<div className="lg-col-span-7 md-col-span-8 sm-col-span-4">
+					<div className="lg-col-span-8 md-col-span-9 sm-col-span-4">
 						<p>
 							{ createInterpolateElement(
 								__(
@@ -139,21 +139,17 @@ const StepDisconnect = props => {
 								{
 									strong: <strong></strong>,
 									jpConnectionInfoLink: (
-										<a
+										<ExternalLink
 											href={ getRedirectUrl(
 												'why-the-wordpress-com-connection-is-important-for-jetpack'
 											) }
-											rel="noopener noreferrer"
-											target="_blank"
 											className="jp-connection__disconnect-dialog__link"
 											onClick={ trackLearnClick }
 										/>
 									),
 									jpSupportLink: (
-										<a
+										<ExternalLink
 											href={ getRedirectUrl( 'jetpack-support' ) }
-											rel="noopener noreferrer"
-											target="_blank"
 											className="jp-connection__disconnect-dialog__link"
 											onClick={ trackSupportClick }
 										/>
@@ -162,7 +158,7 @@ const StepDisconnect = props => {
 							) }
 						</p>
 					</div>
-					<div className="jp-connection__disconnect-dialog__button-wrap lg-col-span-5 md-col-span-8 sm-col-span-4">
+					<div className="jp-connection__disconnect-dialog__button-wrap lg-col-span-4 md-col-span-7 sm-col-span-4">
 						<Button
 							variant="primary"
 							disabled={ isDisconnecting }
diff --git a/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx b/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
index 0adff37e3853a..5a500c8e8ec05 100644
--- a/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
+++ b/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
@@ -67,8 +67,8 @@ describe( 'StepDisconnect', () => {
 
 	describe( 'When help links are clicked', () => {
 		const links = [
-			[ 'Jetpack connection', 'jetpack_disconnect_dialog_click_learn_about' ],
-			[ 'contact Jetpack support', 'jetpack_disconnect_dialog_click_support' ],
+			[ 'Jetpack connection (opens in a new tab)', 'jetpack_disconnect_dialog_click_learn_about' ],
+			[ 'contact Jetpack support (opens in a new tab)', 'jetpack_disconnect_dialog_click_support' ],
 		];
 		it.each( links )( `should track the "%s" click with %s`, async ( text, event ) => {
 			const user = userEvent.setup();
diff --git a/projects/js-packages/connection/components/manage-connection-dialog/index.jsx b/projects/js-packages/connection/components/manage-connection-dialog/index.jsx
index d71cc938f293a..bffae3ecf1d4c 100644
--- a/projects/js-packages/connection/components/manage-connection-dialog/index.jsx
+++ b/projects/js-packages/connection/components/manage-connection-dialog/index.jsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { Button, getRedirectUrl, Text } from '@automattic/jetpack-components';
-import { Modal } from '@wordpress/components';
+import { ExternalLink, Modal } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Icon, chevronRight, external } from '@wordpress/icons';
@@ -143,7 +143,7 @@ const ManageConnectionActionCard = ( { title, onClick = () => null, link = '#',
 const HelpFooter = ( { onClose } ) => {
 	return (
 		<div className="jp-row jp-connection__manage-dialog__actions">
-			<div className="jp-connection__manage-dialog__text-wrap lg-col-span-8 md-col-span-6 sm-col-span-3">
+			<div className="jp-connection__manage-dialog__text-wrap lg-col-span-9 md-col-span-7 sm-col-span-3">
 				<Text>
 					{ createInterpolateElement(
 						__(
@@ -153,21 +153,17 @@ const HelpFooter = ( { onClose } ) => {
 						{
 							strong: <strong></strong>,
 							connectionInfoLink: (
-								<a
+								<ExternalLink
 									href={ getRedirectUrl(
 										'why-the-wordpress-com-connection-is-important-for-jetpack'
 									) }
-									rel="noopener noreferrer"
-									target="_blank"
 									className="jp-connection__manage-dialog__link"
 									// TODO add click track
 								/>
 							),
 							supportLink: (
-								<a
+								<ExternalLink
 									href={ getRedirectUrl( 'jetpack-support' ) }
-									rel="noopener noreferrer"
-									target="_blank"
 									className="jp-connection__manage-dialog__link"
 									// TODO add click track
 								/>
@@ -176,7 +172,7 @@ const HelpFooter = ( { onClose } ) => {
 					) }
 				</Text>
 			</div>
-			<div className="jp-connection__manage-dialog__button-wrap lg-col-span-4 md-col-span-2 sm-col-span-1">
+			<div className="jp-connection__manage-dialog__button-wrap lg-col-span-3 md-col-span-1 sm-col-span-1">
 				<Button
 					weight="regular"
 					variant="secondary"
diff --git a/projects/plugins/jetpack/_inc/client/components/connect-button/index.jsx b/projects/plugins/jetpack/_inc/client/components/connect-button/index.jsx
index 6f50c68d3f6b9..50916df8757dc 100644
--- a/projects/plugins/jetpack/_inc/client/components/connect-button/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/connect-button/index.jsx
@@ -1,5 +1,6 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
 import { DisconnectDialog } from '@automattic/jetpack-connection';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { getFragment } from '@wordpress/url';
@@ -214,18 +215,10 @@ export class ConnectButton extends React.Component {
 								'jetpack'
 							),
 							{
-								tosLink: (
-									<a
-										href={ getRedirectUrl( 'wpcom-tos' ) }
-										rel="noopener noreferrer"
-										target="_blank"
-									/>
-								),
+								tosLink: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 								shareDetailsLink: (
-									<a
+									<ExternalLink
 										href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) }
-										rel="noopener noreferrer"
-										target="_blank"
 									/>
 								),
 							}
diff --git a/projects/plugins/jetpack/_inc/client/components/footer/index.jsx b/projects/plugins/jetpack/_inc/client/components/footer/index.jsx
index 87944f8929b61..443a070cae3b8 100644
--- a/projects/plugins/jetpack/_inc/client/components/footer/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/footer/index.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl, JetpackFooter } from '@automattic/jetpack-components';
+import { Dashicon } from '@wordpress/components';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import classNames from 'classnames';
 import DevCard from 'components/dev-card';
@@ -189,6 +190,7 @@ export class Footer extends React.Component {
 										version
 								  )
 								: 'Jetpack' }
+							{ <Dashicon icon="external" /> }
 						</a>
 					</li>
 				);
@@ -211,10 +213,13 @@ export class Footer extends React.Component {
 						<a
 							onClick={ this.trackAboutClick }
 							href={ aboutPageUrl }
+							target={ this.props.siteConnectionStatus ? '_self' : '_blank' }
+							rel="noopener noreferrer"
 							className="jp-footer__link"
 							title={ __( 'About Jetpack', 'jetpack' ) }
 						>
 							{ _x( 'About', 'Link to learn more about Jetpack.', 'jetpack' ) }
+							{ ! this.props.siteConnectionStatus && <Dashicon icon="external" /> }
 						</a>
 					</li>
 					<li className="jp-footer__link-item">
@@ -227,17 +232,20 @@ export class Footer extends React.Component {
 							className="jp-footer__link"
 						>
 							{ _x( 'Terms', 'Shorthand for Terms of Service.', 'jetpack' ) }
+							{ <Dashicon icon="external" /> }
 						</a>
 					</li>
 					<li className="jp-footer__link-item">
 						<a
 							onClick={ this.trackPrivacyClick }
 							href={ privacyUrl }
+							target={ this.props.siteConnectionStatus ? '_self' : '_blank' }
 							rel="noopener noreferrer"
 							title={ __( "Automattic's Privacy Policy", 'jetpack' ) }
 							className="jp-footer__link"
 						>
 							{ _x( 'Privacy', 'Shorthand for Privacy Policy.', 'jetpack' ) }
+							{ ! this.props.siteConnectionStatus && <Dashicon icon="external" /> }
 						</a>
 					</li>
 					{ maybeShowModules() }
diff --git a/projects/plugins/jetpack/_inc/client/components/footer/style.scss b/projects/plugins/jetpack/_inc/client/components/footer/style.scss
index 51ce1811a88d8..04bd1bebbb200 100644
--- a/projects/plugins/jetpack/_inc/client/components/footer/style.scss
+++ b/projects/plugins/jetpack/_inc/client/components/footer/style.scss
@@ -73,6 +73,10 @@
 			border-bottom: none;
 		}
 	}
+
+	span {
+		padding: 0 0.1em;
+	}
 }
 
 .jp-footer__link__recommended {
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/state-notices.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/state-notices.jsx
index 044016506627d..5a8b9793e5440 100644
--- a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/state-notices.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/state-notices.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import SimpleNotice from 'components/notice';
@@ -84,9 +85,7 @@ class JetpackStateNotices extends React.Component {
 						'jetpack'
 					),
 					{
-						a: (
-							<a href={ getRedirectUrl( 'wpcom-tos' ) } rel="noopener noreferrer" target="_blank" />
-						),
+						a: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 					}
 				);
 				break;
diff --git a/projects/plugins/jetpack/_inc/client/traffic/ads.jsx b/projects/plugins/jetpack/_inc/client/traffic/ads.jsx
index f2b4ae6702eeb..95b37b1d8bb2f 100644
--- a/projects/plugins/jetpack/_inc/client/traffic/ads.jsx
+++ b/projects/plugins/jetpack/_inc/client/traffic/ads.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
 import Card from 'components/card';
@@ -175,7 +176,7 @@ export const Ads = withModuleSettingsFormHelpers(
 									),
 									{
 										link: (
-											<a
+											<ExternalLink
 												href={ getRedirectUrl( 'wpcom-automattic-ads-tos' ) }
 												target="_blank"
 												rel="noopener noreferrer"
diff --git a/projects/plugins/jetpack/changelog/fix-missing-external-links b/projects/plugins/jetpack/changelog/fix-missing-external-links
new file mode 100644
index 0000000000000..821095c257b98
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-missing-external-links
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+General: use external link icons for external links
diff --git a/projects/plugins/social/changelog/fix-missing-external-links b/projects/plugins/social/changelog/fix-missing-external-links
new file mode 100644
index 0000000000000..911c3a1a6291c
--- /dev/null
+++ b/projects/plugins/social/changelog/fix-missing-external-links
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Use External Link icons for external links
diff --git a/projects/plugins/social/src/js/components/connection-screen/index.js b/projects/plugins/social/src/js/components/connection-screen/index.js
index 925e59f8cf772..e1188bfda1280 100644
--- a/projects/plugins/social/src/js/components/connection-screen/index.js
+++ b/projects/plugins/social/src/js/components/connection-screen/index.js
@@ -1,5 +1,6 @@
 import { Dialog, ProductOffer, Text, getRedirectUrl } from '@automattic/jetpack-components';
 import { useConnection } from '@automattic/jetpack-connection';
+import { ExternalLink } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
@@ -15,13 +16,9 @@ const tos = createInterpolateElement(
 		'jetpack-social'
 	),
 	{
-		tosLink: <a href={ getRedirectUrl( 'wpcom-tos' ) } rel="noopener noreferrer" target="_blank" />,
+		tosLink: <ExternalLink href={ getRedirectUrl( 'wpcom-tos' ) } />,
 		shareDetailsLink: (
-			<a
-				href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) }
-				rel="noopener noreferrer"
-				target="_blank"
-			/>
+			<ExternalLink href={ getRedirectUrl( 'jetpack-support-what-data-does-jetpack-sync' ) } />
 		),
 	}
 );

From 3a03c682f594d5452f728b5d03906520302f782b Mon Sep 17 00:00:00 2001
From: Samiff <samiff@users.noreply.github.com>
Date: Mon, 20 Feb 2023 14:29:17 -0700
Subject: [PATCH 44/51] Jetpack: backport 11.9-a.5 changelog (#29056)

* Jetpack: 11.9-a.5 changelog

* Jetpack: init 11.9-a.6
---
 projects/js-packages/analytics/CHANGELOG.md   |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/analytics/package.json   |  2 +-
 projects/js-packages/api/CHANGELOG.md         |  4 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/api/package.json         |  2 +-
 projects/js-packages/components/CHANGELOG.md  |  5 ++++
 .../changelog/fix-missing-external-links      |  4 ----
 .../components/changelog/fix-wrong-version    |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/components/package.json  |  2 +-
 projects/js-packages/config/CHANGELOG.md      |  4 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/config/package.json      |  2 +-
 projects/js-packages/connection/CHANGELOG.md  |  4 ++++
 .../changelog/fix-missing-external-links      |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/connection/package.json  |  2 +-
 projects/js-packages/licensing/CHANGELOG.md   |  4 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/js-packages/licensing/package.json   |  2 +-
 .../js-packages/partner-coupon/CHANGELOG.md   |  4 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../js-packages/partner-coupon/package.json   |  2 +-
 .../publicize-components/CHANGELOG.md         |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../publicize-components/package.json         |  2 +-
 .../remove-asset-webpack-plugin/CHANGELOG.md  |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../remove-asset-webpack-plugin/package.json  |  2 +-
 .../shared-extension-utils/CHANGELOG.md       |  5 ++++
 .../changelog/update-use-analytics-hook-doc   |  4 ----
 .../shared-extension-utils/package.json       |  2 +-
 projects/packages/a8c-mc-stats/CHANGELOG.md   |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/abtest/CHANGELOG.md         |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/action-bar/CHANGELOG.md     |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/action-bar/package.json     |  2 +-
 projects/packages/admin-ui/CHANGELOG.md       |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/admin-ui/package.json       |  2 +-
 .../admin-ui/src/class-admin-menu.php         |  2 +-
 projects/packages/assets/CHANGELOG.md         |  8 +++++--
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/autoloader/CHANGELOG.md     |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/backup/CHANGELOG.md         |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../backup/src/class-package-version.php      |  2 +-
 projects/packages/blaze/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/blaze/package.json          |  2 +-
 projects/packages/blaze/src/class-blaze.php   |  2 +-
 projects/packages/blocks/CHANGELOG.md         |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/changelogger/CHANGELOG.md   |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../packages/changelogger/src/Application.php |  2 +-
 .../packages/composer-plugin/CHANGELOG.md     |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/config/CHANGELOG.md         |  5 ++++
 .../config/changelog/add-import-package       |  4 ----
 projects/packages/connection/CHANGELOG.md     |  5 ++++
 .../add-connection-licensing-method-check     |  5 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 ...update-move-delete-connection-owner-notice |  4 ----
 .../connection/src/class-package-version.php  |  2 +-
 projects/packages/constants/CHANGELOG.md      |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../packages/device-detection/CHANGELOG.md    |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/error/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/forms/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/forms/package.json          |  2 +-
 .../forms/src/class-jetpack-forms.php         |  2 +-
 .../google-fonts-provider/CHANGELOG.md        |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../google-fonts-provider/package.json        |  2 +-
 .../packages/identity-crisis/CHANGELOG.md     |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../packages/identity-crisis/package.json     |  2 +-
 .../src/class-identity-crisis.php             |  2 +-
 projects/packages/import/CHANGELOG.md         |  7 ++++++
 .../import/changelog/add-import-package       |  4 ----
 .../import/changelog/add-rest-endpoints       |  4 ----
 .../import/changelog/fix-import-hierarchies   |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/import/package.json         |  2 +-
 projects/packages/import/src/class-main.php   |  6 ++---
 .../packages/jetpack-mu-wpcom/CHANGELOG.md    |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../packages/jetpack-mu-wpcom/package.json    |  2 +-
 .../src/class-jetpack-mu-wpcom.php            |  2 +-
 projects/packages/jitm/CHANGELOG.md           |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 ...update-move-delete-connection-owner-notice |  4 ----
 projects/packages/jitm/src/class-jitm.php     |  2 +-
 projects/packages/lazy-images/CHANGELOG.md    |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/licensing/CHANGELOG.md      |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/logo/CHANGELOG.md           |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/my-jetpack/CHANGELOG.md     |  5 ++++
 .../changelog/fix-my-jetpack-add-security     |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/my-jetpack/package.json     |  2 +-
 .../my-jetpack/src/class-initializer.php      |  2 +-
 projects/packages/partner/CHANGELOG.md        |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../packages/password-checker/CHANGELOG.md    |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/plans/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/plans/package.json          |  2 +-
 .../packages/plugins-installer/CHANGELOG.md   |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/post-list/CHANGELOG.md      |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../post-list/src/class-post-list.php         |  2 +-
 projects/packages/publicize/CHANGELOG.md      |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/publicize/package.json      |  2 +-
 projects/packages/redirect/CHANGELOG.md       |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/roles/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/search/CHANGELOG.md         |  9 ++++++++
 .../fix-jetpack-search-multiple-authors       |  4 ----
 .../changelog/fix-unit-test-without-internet  |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../update-add-date-to-search-results         |  4 ----
 projects/packages/search/package.json         |  2 +-
 .../packages/search/src/class-package.php     |  2 +-
 projects/packages/stats-admin/CHANGELOG.md    |  5 ++++
 .../changelog/fix-decoding-wrong-varible      |  4 ----
 .../changelog/fix-unit-test-without-internet  |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/stats-admin/package.json    |  2 +-
 .../packages/stats-admin/src/class-main.php   |  2 +-
 projects/packages/stats/CHANGELOG.md          |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/status/CHANGELOG.md         |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/sync/CHANGELOG.md           |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../sync/src/class-package-version.php        |  2 +-
 projects/packages/videopress/CHANGELOG.md     | 16 +++++++++++++
 .../fix-videopress-local-library-fatal        |  4 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../update-jetpack-tweak-media-button         |  4 ----
 ...update-move-delete-connection-owner-notice |  4 ----
 ...ue-when-getting-autogenerated-chapter-file |  4 ----
 ...-css-classes-when-transforming-embed-block |  4 ----
 ...deopress-improve-getting-token-performance |  4 ----
 ...-and-support-is-retry-from-token-requester |  4 ----
 ...ss-register-and-enqueue-video-block-assets |  4 ----
 projects/packages/videopress/package.json     |  2 +-
 .../videopress/src/class-package-version.php  |  2 +-
 projects/packages/waf/CHANGELOG.md            |  6 +++++
 .../packages/waf/changelog/add-waf-wordbless  |  5 ----
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/wordads/CHANGELOG.md        |  5 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 projects/packages/wordads/package.json        |  2 +-
 .../packages/wordads/src/class-package.php    |  2 +-
 projects/plugins/jetpack/CHANGELOG.md         | 22 ++++++++++++++++++
 .../changelog/add-better-open-ai-prompt       |  4 ----
 .../add-blogging-prompts-block-scaffolding    |  4 ----
 .../jetpack/changelog/add-import-package      |  4 ----
 .../add-newsletter-visibility-selector        |  4 ----
 .../jetpack/changelog/add-waf-wordbless       |  5 ----
 .../jetpack/changelog/e2e-better_scoping      |  4 ----
 .../changelog/fix-missing-external-links      |  4 ----
 .../jetpack/changelog/init-release-cycle      |  2 +-
 ...remove-remnants-of-automated-code-coverage |  5 ----
 ...tests-add-tests-for-newsletter-regressions |  4 ----
 .../update-add-date-to-search-results         |  5 ----
 .../changelog/update-clean-jetpack-11.9-a.3   |  4 ----
 .../changelog/update-form-styles-improvement  |  4 ----
 .../update-form-styles-improvement#2          |  5 ----
 .../jetpack/changelog/update-import-package   |  5 ----
 .../changelog/update-jetpack-backport-11.8.4  |  5 ----
 ...nd-media-button-for-videopress-video-block |  4 ----
 .../update-jetpack-tweak-media-button         |  4 ----
 ...update-move-delete-connection-owner-notice |  5 ----
 ...date-move-delete-connection-owner-notice#2 |  5 ----
 .../changelog/update-official-button-styles   |  4 ----
 ...move-wp-components-dep-from-story-frontend |  4 ----
 .../update-videopress-allow-v5-v6-transforms  |  4 ----
 .../changelog/update-visa-stats-left-margin   |  4 ----
 projects/plugins/jetpack/composer.json        |  2 +-
 projects/plugins/jetpack/jetpack.php          |  4 ++--
 projects/plugins/jetpack/package.json         |  2 +-
 projects/plugins/jetpack/readme.txt           | 23 ++++++++-----------
 projects/plugins/mu-wpcom-plugin/CHANGELOG.md |  4 ++++
 ...remove-remnants-of-automated-code-coverage |  5 ----
 .../plugins/mu-wpcom-plugin/composer.json     |  2 +-
 .../mu-wpcom-plugin/mu-wpcom-plugin.php       |  2 +-
 projects/plugins/mu-wpcom-plugin/package.json |  2 +-
 204 files changed, 361 insertions(+), 529 deletions(-)
 delete mode 100644 projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/components/changelog/fix-missing-external-links
 delete mode 100644 projects/js-packages/components/changelog/fix-wrong-version
 delete mode 100644 projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/connection/changelog/fix-missing-external-links
 delete mode 100644 projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc
 delete mode 100644 projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/config/changelog/add-import-package
 delete mode 100644 projects/packages/connection/changelog/add-connection-licensing-method-check
 delete mode 100644 projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/connection/changelog/update-move-delete-connection-owner-notice
 delete mode 100644 projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/import/changelog/add-import-package
 delete mode 100644 projects/packages/import/changelog/add-rest-endpoints
 delete mode 100644 projects/packages/import/changelog/fix-import-hierarchies
 delete mode 100644 projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
 delete mode 100644 projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
 delete mode 100644 projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/search/changelog/fix-jetpack-search-multiple-authors
 delete mode 100644 projects/packages/search/changelog/fix-unit-test-without-internet
 delete mode 100644 projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/search/changelog/update-add-date-to-search-results
 delete mode 100644 projects/packages/stats-admin/changelog/fix-decoding-wrong-varible
 delete mode 100644 projects/packages/stats-admin/changelog/fix-unit-test-without-internet
 delete mode 100644 projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/videopress/changelog/fix-videopress-local-library-fatal
 delete mode 100644 projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/videopress/changelog/update-jetpack-tweak-media-button
 delete mode 100644 projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
 delete mode 100644 projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file
 delete mode 100644 projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block
 delete mode 100644 projects/packages/videopress/changelog/update-videopress-improve-getting-token-performance
 delete mode 100644 projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester
 delete mode 100644 projects/packages/videopress/changelog/update-videopress-register-and-enqueue-video-block-assets
 delete mode 100644 projects/packages/waf/changelog/add-waf-wordbless
 delete mode 100644 projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/plugins/jetpack/changelog/add-better-open-ai-prompt
 delete mode 100644 projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
 delete mode 100644 projects/plugins/jetpack/changelog/add-import-package
 delete mode 100644 projects/plugins/jetpack/changelog/add-newsletter-visibility-selector
 delete mode 100644 projects/plugins/jetpack/changelog/add-waf-wordbless
 delete mode 100644 projects/plugins/jetpack/changelog/e2e-better_scoping
 delete mode 100644 projects/plugins/jetpack/changelog/fix-missing-external-links
 delete mode 100644 projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
 delete mode 100644 projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
 delete mode 100644 projects/plugins/jetpack/changelog/update-add-date-to-search-results
 delete mode 100644 projects/plugins/jetpack/changelog/update-clean-jetpack-11.9-a.3
 delete mode 100644 projects/plugins/jetpack/changelog/update-form-styles-improvement
 delete mode 100644 projects/plugins/jetpack/changelog/update-form-styles-improvement#2
 delete mode 100644 projects/plugins/jetpack/changelog/update-import-package
 delete mode 100644 projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4
 delete mode 100644 projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block
 delete mode 100644 projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button
 delete mode 100644 projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
 delete mode 100644 projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
 delete mode 100644 projects/plugins/jetpack/changelog/update-official-button-styles
 delete mode 100644 projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend
 delete mode 100644 projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms
 delete mode 100644 projects/plugins/jetpack/changelog/update-visa-stats-left-margin
 delete mode 100644 projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage

diff --git a/projects/js-packages/analytics/CHANGELOG.md b/projects/js-packages/analytics/CHANGELOG.md
index 04865afdedb01..09682c8d69a5c 100644
--- a/projects/js-packages/analytics/CHANGELOG.md
+++ b/projects/js-packages/analytics/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 ### This is a list detailing changes for the Jetpack RNA Analytics package releases.
 
+## 0.1.24 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 0.1.23 - 2023-01-25
+### Changed
 - Minor internal updates.
 
 ## 0.1.22 - 2022-12-02
diff --git a/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/analytics/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/analytics/package.json b/projects/js-packages/analytics/package.json
index ada23704a9a91..0a1e476463fc9 100644
--- a/projects/js-packages/analytics/package.json
+++ b/projects/js-packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-analytics",
-	"version": "0.1.24-alpha",
+	"version": "0.1.24",
 	"description": "Jetpack Analytics Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/api/CHANGELOG.md b/projects/js-packages/api/CHANGELOG.md
index 0abf370e22d8f..1d5da0a0bd91c 100644
--- a/projects/js-packages/api/CHANGELOG.md
+++ b/projects/js-packages/api/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## 0.15.1 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 0.15.0 - 2023-02-15
 ### Added
 - Added fetchMigrationStatus get method [#28807]
diff --git a/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/api/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
index abfb0a2cf0fdd..a77ceeee3876d 100644
--- a/projects/js-packages/api/package.json
+++ b/projects/js-packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-api",
-	"version": "0.15.1-alpha",
+	"version": "0.15.1",
 	"description": "Jetpack Api Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
index 7634f09fa8da6..b42c243e712d4 100644
--- a/projects/js-packages/components/CHANGELOG.md
+++ b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## 0.27.7 - 2023-02-20
+### Fixed
+- Changed wrong version [#28824]
+- Use External Link icons for external links [#28922]
+
 ## 0.27.6 - 2023-02-15
 ### Changed
 - Editing changelog for Jetpack 11.9-a.3 [#28971]
diff --git a/projects/js-packages/components/changelog/fix-missing-external-links b/projects/js-packages/components/changelog/fix-missing-external-links
deleted file mode 100644
index 911c3a1a6291c..0000000000000
--- a/projects/js-packages/components/changelog/fix-missing-external-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Use External Link icons for external links
diff --git a/projects/js-packages/components/changelog/fix-wrong-version b/projects/js-packages/components/changelog/fix-wrong-version
deleted file mode 100644
index 599054c81e9b4..0000000000000
--- a/projects/js-packages/components/changelog/fix-wrong-version
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Changed wrong version
diff --git a/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/components/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
index bda707a39d6d8..17e4a6bcfba8f 100644
--- a/projects/js-packages/components/package.json
+++ b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.27.7-alpha",
+	"version": "0.27.7",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/config/CHANGELOG.md b/projects/js-packages/config/CHANGELOG.md
index be9915aa35408..22d6e55a1977f 100644
--- a/projects/js-packages/config/CHANGELOG.md
+++ b/projects/js-packages/config/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.1.19 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 0.1.18 - 2023-01-25
 ### Changed
 - Minor internal updates.
diff --git a/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/config/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/config/package.json b/projects/js-packages/config/package.json
index b638444d09388..564d39cec1409 100644
--- a/projects/js-packages/config/package.json
+++ b/projects/js-packages/config/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-config",
-	"version": "0.1.19-alpha",
+	"version": "0.1.19",
 	"description": "Handles Jetpack global configuration shared across all packages",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/config/#readme",
 	"bugs": {
diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md
index 76e6519bb7a47..b332b7cc6a2a4 100644
--- 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.25.1 - 2023-02-20
+### Fixed
+- Add External link icon to links at the bottom of the disconnect modal. [#28922]
+
 ## 0.25.0 - 2023-02-15
 ### Added
 - Export ConnectScreenLayout component [#28770]
diff --git a/projects/js-packages/connection/changelog/fix-missing-external-links b/projects/js-packages/connection/changelog/fix-missing-external-links
deleted file mode 100644
index 63ba68b0e295f..0000000000000
--- a/projects/js-packages/connection/changelog/fix-missing-external-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Add External link icon to links at the bottom of the disconnect modal.
diff --git a/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/connection/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
index f7043d33ee7d2..4f0bad9811a98 100644
--- a/projects/js-packages/connection/package.json
+++ b/projects/js-packages/connection/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.25.1-alpha",
+	"version": "0.25.1",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/licensing/CHANGELOG.md b/projects/js-packages/licensing/CHANGELOG.md
index 1720932bb9476..40385e1f3f112 100644
--- a/projects/js-packages/licensing/CHANGELOG.md
+++ b/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.7.7 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 0.7.6 - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
diff --git a/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/licensing/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json
index f2a2d083cc1d4..a0169f3047b53 100644
--- a/projects/js-packages/licensing/package.json
+++ b/projects/js-packages/licensing/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-licensing",
-	"version": "0.7.7-alpha",
+	"version": "0.7.7",
 	"description": "Jetpack licensing flow",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/licensing/#readme",
 	"bugs": {
diff --git a/projects/js-packages/partner-coupon/CHANGELOG.md b/projects/js-packages/partner-coupon/CHANGELOG.md
index 2e899c520b6b7..0b4ee2a009e65 100644
--- a/projects/js-packages/partner-coupon/CHANGELOG.md
+++ b/projects/js-packages/partner-coupon/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.2.40 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 0.2.39 - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
diff --git a/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/partner-coupon/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json
index 9afa6a14ef3ab..7712557022321 100644
--- 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.40-alpha",
+	"version": "0.2.40",
 	"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/publicize-components/CHANGELOG.md b/projects/js-packages/publicize-components/CHANGELOG.md
index eda3c6e9b54d7..83fefa038b1b6 100644
--- a/projects/js-packages/publicize-components/CHANGELOG.md
+++ b/projects/js-packages/publicize-components/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.16.1] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.16.0] - 2023-02-15
 ### Changed
 - Refactored media picker into seperate componetn [#28773]
@@ -197,6 +201,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#24470]
 
+[0.16.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.16.0...v0.16.1
 [0.16.0]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.15.2...v0.16.0
 [0.15.2]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.15.1...v0.15.2
 [0.15.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.15.0...v0.15.1
diff --git a/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/publicize-components/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
index ba065d31dd732..2ea217084c1a4 100644
--- a/projects/js-packages/publicize-components/package.json
+++ b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.16.1-alpha",
+	"version": "0.16.1",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {
diff --git a/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md b/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md
index 769c70f5f5d4f..7ac52631f31b5 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md
+++ b/projects/js-packages/remove-asset-webpack-plugin/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).
 
+## [1.0.17] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.0.16] - 2023-01-26
 ### Changed
 - Minor internal updates.
@@ -81,6 +85,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release.
 
+[1.0.17]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.16...v1.0.17
 [1.0.16]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.15...v1.0.16
 [1.0.15]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.14...v1.0.15
 [1.0.14]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.13...v1.0.14
diff --git a/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/js-packages/remove-asset-webpack-plugin/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/js-packages/remove-asset-webpack-plugin/package.json b/projects/js-packages/remove-asset-webpack-plugin/package.json
index 78a670ca46b1f..b49335045e8b3 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/package.json
+++ b/projects/js-packages/remove-asset-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/remove-asset-webpack-plugin",
-	"version": "1.0.17-alpha",
+	"version": "1.0.17",
 	"description": "A Webpack plugin to remove assets from the build.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/remove-asset-webpack-plugin/README.md#readme",
 	"bugs": {
diff --git a/projects/js-packages/shared-extension-utils/CHANGELOG.md b/projects/js-packages/shared-extension-utils/CHANGELOG.md
index a73d20f2545e3..15a3835e311be 100644
--- 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.9.0] - 2023-02-20
+### Added
+- Add a new section to describe including assets from backend [#29016]
+
 ## [0.8.4] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -169,6 +173,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Core: prepare utility for release
 
+[0.9.0]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.8.4...0.9.0
 [0.8.4]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.8.3...0.8.4
 [0.8.3]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.8.2...0.8.3
 [0.8.2]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.8.1...0.8.2
diff --git a/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc b/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc
deleted file mode 100644
index cd088c0ff6475..0000000000000
--- a/projects/js-packages/shared-extension-utils/changelog/update-use-analytics-hook-doc
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add a new section to describe including assets from backend
diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json
index 78bede3a54602..6f79e7305a0af 100644
--- 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.9.0-alpha",
+	"version": "0.9.0",
 	"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/a8c-mc-stats/CHANGELOG.md b/projects/packages/a8c-mc-stats/CHANGELOG.md
index afd2ec021d726..586349907da6e 100644
--- a/projects/packages/a8c-mc-stats/CHANGELOG.md
+++ b/projects/packages/a8c-mc-stats/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).
 
+## [1.4.19] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.4.18] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -111,6 +115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Creates the MC Stats package
 
+[1.4.19]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.18...v1.4.19
 [1.4.18]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.17...v1.4.18
 [1.4.17]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.16...v1.4.17
 [1.4.16]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.15...v1.4.16
diff --git a/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/a8c-mc-stats/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/abtest/CHANGELOG.md b/projects/packages/abtest/CHANGELOG.md
index d30e146c1f247..65c25b0018b84 100644
--- a/projects/packages/abtest/CHANGELOG.md
+++ b/projects/packages/abtest/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).
 
+## [1.10.12] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.10.11] - 2022-12-06
 ### Changed
 - Updated package dependencies. [#27688]
@@ -272,6 +276,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a simple A/B test package
 
+[1.10.12]: https://github.com/Automattic/jetpack-abtest/compare/v1.10.11...v1.10.12
 [1.10.11]: https://github.com/Automattic/jetpack-abtest/compare/v1.10.10...v1.10.11
 [1.10.10]: https://github.com/Automattic/jetpack-abtest/compare/v1.10.9...v1.10.10
 [1.10.9]: https://github.com/Automattic/jetpack-abtest/compare/v1.10.8...v1.10.9
diff --git a/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/abtest/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/action-bar/CHANGELOG.md b/projects/packages/action-bar/CHANGELOG.md
index 78938bdf76617..a037b6a6ae270 100644
--- a/projects/packages/action-bar/CHANGELOG.md
+++ b/projects/packages/action-bar/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.1.12] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.1.11] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -53,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Adds the Action Bar package and Jetpack plugin module for follows, likes, and comments. Just a scaffold to build on, for now. [#25447]
 
+[0.1.12]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.11...v0.1.12
 [0.1.11]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.10...v0.1.11
 [0.1.10]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.9...v0.1.10
 [0.1.9]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.8...v0.1.9
diff --git a/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/action-bar/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/action-bar/package.json b/projects/packages/action-bar/package.json
index 348487b16fdbe..050829bd1f1bc 100644
--- a/projects/packages/action-bar/package.json
+++ b/projects/packages/action-bar/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-action-bar",
-	"version": "0.1.12-alpha",
+	"version": "0.1.12",
 	"description": "An easy way for visitors to follow, like, and comment on your WordPress site.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/action-bar/#readme",
 	"bugs": {
diff --git a/projects/packages/admin-ui/CHANGELOG.md b/projects/packages/admin-ui/CHANGELOG.md
index 0f2fad6f52dfd..75db70d0c016e 100644
--- a/projects/packages/admin-ui/CHANGELOG.md
+++ b/projects/packages/admin-ui/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.2.17] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.16] - 2023-01-25
 ### Changed
 - Minor internal updates.
@@ -92,6 +96,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixing menu visibility issues.
 
+[0.2.17]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.16...0.2.17
 [0.2.16]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.15...0.2.16
 [0.2.15]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.14...0.2.15
 [0.2.14]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.13...0.2.14
diff --git a/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/admin-ui/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json
index 31570b95850f5..561573780a532 100644
--- a/projects/packages/admin-ui/package.json
+++ b/projects/packages/admin-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-admin-ui",
-	"version": "0.2.17-alpha",
+	"version": "0.2.17",
 	"description": "Generic Jetpack wp-admin UI elements",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/admin-ui/#readme",
 	"bugs": {
diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php
index 5d65dd040be8e..ef056a4be7067 100644
--- a/projects/packages/admin-ui/src/class-admin-menu.php
+++ b/projects/packages/admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.17-alpha';
+	const PACKAGE_VERSION = '0.2.17';
 
 	/**
 	 * Whether this class has been initialized
diff --git a/projects/packages/assets/CHANGELOG.md b/projects/packages/assets/CHANGELOG.md
index 60cae52301925..d1108ebe9834c 100644
--- a/projects/packages/assets/CHANGELOG.md
+++ b/projects/packages/assets/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).
 
+## [1.17.32] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.17.31] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -19,8 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.17.28] - 2022-12-02
 ### Changed
-- Updated package dependencies. [#27688]
-- Updated package dependencies. [#27696]
+- Updated package dependencies.
 
 ## [1.17.27] - 2022-11-28
 ### Changed
@@ -301,6 +304,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Statically access asset tools
 
+[1.17.32]: https://github.com/Automattic/jetpack-assets/compare/v1.17.31...v1.17.32
 [1.17.31]: https://github.com/Automattic/jetpack-assets/compare/v1.17.30...v1.17.31
 [1.17.30]: https://github.com/Automattic/jetpack-assets/compare/v1.17.29...v1.17.30
 [1.17.29]: https://github.com/Automattic/jetpack-assets/compare/v1.17.28...v1.17.29
diff --git a/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/assets/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/autoloader/CHANGELOG.md b/projects/packages/autoloader/CHANGELOG.md
index fbaf8b2a7a829..3cd26b180c517 100644
--- a/projects/packages/autoloader/CHANGELOG.md
+++ b/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).
 
+## [2.11.16] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [2.11.15] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -296,6 +300,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add Custom Autoloader
 
+[2.11.16]: https://github.com/Automattic/jetpack-autoloader/compare/v2.11.15...v2.11.16
 [2.11.15]: https://github.com/Automattic/jetpack-autoloader/compare/v2.11.14...v2.11.15
 [2.11.14]: https://github.com/Automattic/jetpack-autoloader/compare/v2.11.13...v2.11.14
 [2.11.13]: https://github.com/Automattic/jetpack-autoloader/compare/v2.11.12...v2.11.13
diff --git a/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/autoloader/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/backup/CHANGELOG.md b/projects/packages/backup/CHANGELOG.md
index 6f9a09fa6bb4b..caef1e368606c 100644
--- a/projects/packages/backup/CHANGELOG.md
+++ b/projects/packages/backup/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).
 
+## [1.12.4] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.12.3] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -347,6 +351,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add API endpoints and Jetpack Backup package for managing Help…
 
+[1.12.4]: https://github.com/Automattic/jetpack-backup/compare/v1.12.3...v1.12.4
 [1.12.3]: https://github.com/Automattic/jetpack-backup/compare/v1.12.2...v1.12.3
 [1.12.2]: https://github.com/Automattic/jetpack-backup/compare/v1.12.1...v1.12.2
 [1.12.1]: https://github.com/Automattic/jetpack-backup/compare/v1.12.0...v1.12.1
diff --git a/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/backup/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
index 36024c192d7d1..2c7dfeabfb640 100644
--- a/projects/packages/backup/src/class-package-version.php
+++ b/projects/packages/backup/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.12.4-alpha';
+	const PACKAGE_VERSION = '1.12.4';
 
 	const PACKAGE_SLUG = 'backup';
 
diff --git a/projects/packages/blaze/CHANGELOG.md b/projects/packages/blaze/CHANGELOG.md
index 72184e1b6781c..9e6940a10d059 100644
--- a/projects/packages/blaze/CHANGELOG.md
+++ b/projects/packages/blaze/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.5.4] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.5.3] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -86,6 +90,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#27906]
 
+[0.5.4]: https://github.com/automattic/jetpack-blaze/compare/v0.5.3...v0.5.4
 [0.5.3]: https://github.com/automattic/jetpack-blaze/compare/v0.5.2...v0.5.3
 [0.5.2]: https://github.com/automattic/jetpack-blaze/compare/v0.5.1...v0.5.2
 [0.5.1]: https://github.com/automattic/jetpack-blaze/compare/v0.5.0...v0.5.1
diff --git a/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/blaze/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/blaze/package.json b/projects/packages/blaze/package.json
index 2b69ce5394c74..e177c7ce35db9 100644
--- a/projects/packages/blaze/package.json
+++ b/projects/packages/blaze/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-blaze",
-	"version": "0.5.4-alpha",
+	"version": "0.5.4",
 	"description": "Attract high-quality traffic to your site using Blaze. Using this service, you can advertise a post or page on some of the millions of pages across WordPress.com and Tumblr from just $5 per day.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/blaze/#readme",
 	"bugs": {
diff --git a/projects/packages/blaze/src/class-blaze.php b/projects/packages/blaze/src/class-blaze.php
index 6841d67969570..828a2c74951e6 100644
--- a/projects/packages/blaze/src/class-blaze.php
+++ b/projects/packages/blaze/src/class-blaze.php
@@ -17,7 +17,7 @@
  */
 class Blaze {
 
-	const PACKAGE_VERSION = '0.5.4-alpha';
+	const PACKAGE_VERSION = '0.5.4';
 
 	/**
 	 * Script handle for the JS file we enqueue in the post editor.
diff --git a/projects/packages/blocks/CHANGELOG.md b/projects/packages/blocks/CHANGELOG.md
index 4e68ee5955509..39ead7a414780 100644
--- a/projects/packages/blocks/CHANGELOG.md
+++ b/projects/packages/blocks/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).
 
+## [1.4.20] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.4.19] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -132,6 +136,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Blocks: introduce new package for block management
 
+[1.4.20]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.19...v1.4.20
 [1.4.19]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.18...v1.4.19
 [1.4.18]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.17...v1.4.18
 [1.4.17]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.16...v1.4.17
diff --git a/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/blocks/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/changelogger/CHANGELOG.md b/projects/packages/changelogger/CHANGELOG.md
index 8f87be245d5f3..f2c5daf4067e9 100644
--- a/projects/packages/changelogger/CHANGELOG.md
+++ b/projects/packages/changelogger/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.2] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [3.3.1] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -143,6 +147,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 - Initial version.
 
+[3.3.2]: https://github.com/Automattic/jetpack-changelogger/compare/3.3.1...3.3.2
 [3.3.1]: https://github.com/Automattic/jetpack-changelogger/compare/3.3.0...3.3.1
 [3.3.0]: https://github.com/Automattic/jetpack-changelogger/compare/3.2.3...3.3.0
 [3.2.3]: https://github.com/Automattic/jetpack-changelogger/compare/3.2.2...3.2.3
diff --git a/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/changelogger/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php
index 9f49bf5d57a0d..ec995ab350031 100644
--- a/projects/packages/changelogger/src/Application.php
+++ b/projects/packages/changelogger/src/Application.php
@@ -18,7 +18,7 @@
  */
 class Application extends SymfonyApplication {
 
-	const VERSION = '3.3.2-alpha';
+	const VERSION = '3.3.2';
 
 	/**
 	 * Constructor.
diff --git a/projects/packages/composer-plugin/CHANGELOG.md b/projects/packages/composer-plugin/CHANGELOG.md
index 915f8bc598c55..df07a08f474db 100644
--- a/projects/packages/composer-plugin/CHANGELOG.md
+++ b/projects/packages/composer-plugin/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).
 
+## [1.1.10] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.1.9] - 2023-01-16
 ### Fixed
 - Ensure `jetpack_vendor/` exists before trying to write `jetpack_vendor/i18n-map.php`. [#28369]
@@ -70,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added the Jetpack Installer package.
 
+[1.1.10]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.1.9...v1.1.10
 [1.1.9]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.1.8...v1.1.9
 [1.1.8]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.1.7...v1.1.8
 [1.1.7]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.1.6...v1.1.7
diff --git a/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/composer-plugin/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/config/CHANGELOG.md b/projects/packages/config/CHANGELOG.md
index f0389d3d2dce7..cef72d972490d 100644
--- a/projects/packages/config/CHANGELOG.md
+++ b/projects/packages/config/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).
 
+## [1.14.0] - 2023-02-20
+### Added
+- Added the Import package. [#28824]
+
 ## [1.13.0] - 2023-01-02
 ### Added
 - Blaze package: Add config initialization, initialization checks for loading. [#28077]
@@ -164,6 +168,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Trying to add deterministic initialization.
 
+[1.14.0]: https://github.com/Automattic/jetpack-config/compare/v1.13.0...v1.14.0
 [1.13.0]: https://github.com/Automattic/jetpack-config/compare/v1.12.0...v1.13.0
 [1.12.0]: https://github.com/Automattic/jetpack-config/compare/v1.11.1...v1.12.0
 [1.11.1]: https://github.com/Automattic/jetpack-config/compare/v1.11.0...v1.11.1
diff --git a/projects/packages/config/changelog/add-import-package b/projects/packages/config/changelog/add-import-package
deleted file mode 100644
index 68054e25d828c..0000000000000
--- a/projects/packages/config/changelog/add-import-package
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added the Import package.
diff --git a/projects/packages/connection/CHANGELOG.md b/projects/packages/connection/CHANGELOG.md
index 8c1795f499ba9..7d46a65f00bbf 100644
--- a/projects/packages/connection/CHANGELOG.md
+++ b/projects/packages/connection/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).
 
+## [1.51.0] - 2023-02-20
+### Changed
+- Moving deleting connection owner notice from JITM to Connection package. [#28516]
+
 ## [1.50.1] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -761,6 +765,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[1.51.0]: https://github.com/Automattic/jetpack-connection/compare/v1.50.1...v1.51.0
 [1.50.1]: https://github.com/Automattic/jetpack-connection/compare/v1.50.0...v1.50.1
 [1.50.0]: https://github.com/Automattic/jetpack-connection/compare/v1.49.1...v1.50.0
 [1.49.1]: https://github.com/Automattic/jetpack-connection/compare/v1.49.0...v1.49.1
diff --git a/projects/packages/connection/changelog/add-connection-licensing-method-check b/projects/packages/connection/changelog/add-connection-licensing-method-check
deleted file mode 100644
index b4260168d17c5..0000000000000
--- a/projects/packages/connection/changelog/add-connection-licensing-method-check
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Tiny compatibility change that fixes something that isn't even broken.
-
-
diff --git a/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/connection/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/connection/changelog/update-move-delete-connection-owner-notice b/projects/packages/connection/changelog/update-move-delete-connection-owner-notice
deleted file mode 100644
index 819bafa1a1ee8..0000000000000
--- a/projects/packages/connection/changelog/update-move-delete-connection-owner-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Moving deleting connection owner notice from JITM to Connection package.
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
index 27a338e319998..43584cb7ee68d 100644
--- a/projects/packages/connection/src/class-package-version.php
+++ b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.51.0-alpha';
+	const PACKAGE_VERSION = '1.51.0';
 
 	const PACKAGE_SLUG = 'connection';
 
diff --git a/projects/packages/constants/CHANGELOG.md b/projects/packages/constants/CHANGELOG.md
index 0fa5a31ae34d9..e5b1775c4609f 100644
--- a/projects/packages/constants/CHANGELOG.md
+++ b/projects/packages/constants/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).
 
+## [1.6.21] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.6.20] - 2022-12-02
 ### Changed
 - Updated package dependencies. [#27688]
@@ -142,6 +146,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Finish the constants package
 
+[1.6.21]: https://github.com/Automattic/jetpack-constants/compare/v1.6.20...v1.6.21
 [1.6.20]: https://github.com/Automattic/jetpack-constants/compare/v1.6.19...v1.6.20
 [1.6.19]: https://github.com/Automattic/jetpack-constants/compare/v1.6.18...v1.6.19
 [1.6.18]: https://github.com/Automattic/jetpack-constants/compare/v1.6.17...v1.6.18
diff --git a/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/constants/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/device-detection/CHANGELOG.md b/projects/packages/device-detection/CHANGELOG.md
index 07279765f89cb..7b1fa7ca78928 100644
--- a/projects/packages/device-detection/CHANGELOG.md
+++ b/projects/packages/device-detection/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).
 
+## [1.4.24] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.4.23] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -147,6 +151,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Moving jetpack_is_mobile into a package
 
+[1.4.24]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.23...v1.4.24
 [1.4.23]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.22...v1.4.23
 [1.4.22]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.21...v1.4.22
 [1.4.21]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.20...v1.4.21
diff --git a/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/device-detection/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/error/CHANGELOG.md b/projects/packages/error/CHANGELOG.md
index 24b10411dbfbc..4062b232a47f6 100644
--- a/projects/packages/error/CHANGELOG.md
+++ b/projects/packages/error/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).
 
+## [1.3.19] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.3.18] - 2022-12-06
 ### Changed
 - Updated package dependencies. [#27688]
@@ -116,6 +120,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a jetpack-error package
 
+[1.3.19]: https://github.com/Automattic/jetpack-error/compare/v1.3.18...v1.3.19
 [1.3.18]: https://github.com/Automattic/jetpack-error/compare/v1.3.17...v1.3.18
 [1.3.17]: https://github.com/Automattic/jetpack-error/compare/v1.3.16...v1.3.17
 [1.3.16]: https://github.com/Automattic/jetpack-error/compare/v1.3.15...v1.3.16
diff --git a/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/error/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/forms/CHANGELOG.md b/projects/packages/forms/CHANGELOG.md
index 02d454ae16f44..4d9e587dab413 100644
--- a/projects/packages/forms/CHANGELOG.md
+++ b/projects/packages/forms/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.5.1] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.5.0] - 2023-02-15
 ### Changed
 - Update form-styles script to prevent blurred forms on slow loading pages [#28973]
@@ -43,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added a new jetpack/forms package [#28409]
 - Added a public load_contact_form method for initializing the contact form module. [#28416]
 
+[0.5.1]: https://github.com/automattic/jetpack-forms/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/automattic/jetpack-forms/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/automattic/jetpack-forms/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/automattic/jetpack-forms/compare/v0.2.0...v0.3.0
diff --git a/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/forms/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/forms/package.json b/projects/packages/forms/package.json
index 8e2440261e1f2..c3c45350e5347 100644
--- a/projects/packages/forms/package.json
+++ b/projects/packages/forms/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-forms",
-	"version": "0.5.1-alpha",
+	"version": "0.5.1",
 	"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
index 09851eaccac67..126a900cab182 100644
--- a/projects/packages/forms/src/class-jetpack-forms.php
+++ b/projects/packages/forms/src/class-jetpack-forms.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Forms {
 
-	const PACKAGE_VERSION = '0.5.1-alpha';
+	const PACKAGE_VERSION = '0.5.1';
 
 	/**
 	 * Load the contact form module.
diff --git a/projects/packages/google-fonts-provider/CHANGELOG.md b/projects/packages/google-fonts-provider/CHANGELOG.md
index c11f5eb76731d..64e3ba1490828 100644
--- a/projects/packages/google-fonts-provider/CHANGELOG.md
+++ b/projects/packages/google-fonts-provider/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.5.1] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.5.0] - 2023-01-30
 ### Added
 - Add support for new WP Fonts API in Google Fonts provider. [#28054]
@@ -70,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Adds a provider for Google Fonts using the new Webfonts API in Gutenberg
 
+[0.5.1]: https://github.com/Automattic/jetpack-google-fonts-provider/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-google-fonts-provider/compare/v0.4.2...v0.5.0
 [0.4.2]: https://github.com/Automattic/jetpack-google-fonts-provider/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/Automattic/jetpack-google-fonts-provider/compare/v0.4.0...v0.4.1
diff --git a/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/google-fonts-provider/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/google-fonts-provider/package.json b/projects/packages/google-fonts-provider/package.json
index 7cd5bad21b3ea..3cbe9015b942a 100644
--- a/projects/packages/google-fonts-provider/package.json
+++ b/projects/packages/google-fonts-provider/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-google-fonts-provider",
-	"version": "0.5.1-alpha",
+	"version": "0.5.1",
 	"description": "WordPress Webfonts provider for Google Fonts",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/google-fonts-provider/#readme",
 	"bugs": {
diff --git a/projects/packages/identity-crisis/CHANGELOG.md b/projects/packages/identity-crisis/CHANGELOG.md
index 51fdb5772b772..0bca67afeb1e3 100644
--- a/projects/packages/identity-crisis/CHANGELOG.md
+++ b/projects/packages/identity-crisis/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.8.38] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.8.37] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -324,6 +328,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Use Connection/Urls for home_url and site_url functions migrated from Sync.
 
+[0.8.38]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.37...v0.8.38
 [0.8.37]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.36...v0.8.37
 [0.8.36]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.35...v0.8.36
 [0.8.35]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.34...v0.8.35
diff --git a/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/identity-crisis/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/identity-crisis/package.json b/projects/packages/identity-crisis/package.json
index c65506389c108..e4f016330179e 100644
--- a/projects/packages/identity-crisis/package.json
+++ b/projects/packages/identity-crisis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-identity-crisis",
-	"version": "0.8.38-alpha",
+	"version": "0.8.38",
 	"description": "Jetpack Identity Crisis",
 	"main": "_inc/admin.jsx",
 	"repository": {
diff --git a/projects/packages/identity-crisis/src/class-identity-crisis.php b/projects/packages/identity-crisis/src/class-identity-crisis.php
index b3a5ce0724266..04bddff4dbab7 100644
--- a/projects/packages/identity-crisis/src/class-identity-crisis.php
+++ b/projects/packages/identity-crisis/src/class-identity-crisis.php
@@ -28,7 +28,7 @@ class Identity_Crisis {
 	/**
 	 * Package Version
 	 */
-	const PACKAGE_VERSION = '0.8.38-alpha';
+	const PACKAGE_VERSION = '0.8.38';
 
 	/**
 	 * Instance of the object.
diff --git a/projects/packages/import/CHANGELOG.md b/projects/packages/import/CHANGELOG.md
index 721294abd00ad..e48ef509d95c4 100644
--- a/projects/packages/import/CHANGELOG.md
+++ b/projects/packages/import/CHANGELOG.md
@@ -5,3 +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.1.0 - 2023-02-20
+### Added
+- Added import REST endpoints. [#28824]
+- Add new Jetpack Import package. [#28735]
+
+### Fixed
+- Fixed various imported resources hierarchies [#29012]
diff --git a/projects/packages/import/changelog/add-import-package b/projects/packages/import/changelog/add-import-package
deleted file mode 100644
index 13a202f8e9fd6..0000000000000
--- a/projects/packages/import/changelog/add-import-package
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add new Jetpack Import package.
diff --git a/projects/packages/import/changelog/add-rest-endpoints b/projects/packages/import/changelog/add-rest-endpoints
deleted file mode 100644
index 4458504769c25..0000000000000
--- a/projects/packages/import/changelog/add-rest-endpoints
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added import REST endpoints.
diff --git a/projects/packages/import/changelog/fix-import-hierarchies b/projects/packages/import/changelog/fix-import-hierarchies
deleted file mode 100644
index 70edcc3cc2e91..0000000000000
--- a/projects/packages/import/changelog/fix-import-hierarchies
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed various imported resources hierarchies
diff --git a/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/import/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/import/package.json b/projects/packages/import/package.json
index c97c68df71c08..3f7591026a2bc 100644
--- a/projects/packages/import/package.json
+++ b/projects/packages/import/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-import",
-	"version": "0.1.0-alpha",
+	"version": "0.1.0",
 	"description": "Set of REST API routes used in WPCOM Unified Importer.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/import/#readme",
 	"bugs": {
diff --git a/projects/packages/import/src/class-main.php b/projects/packages/import/src/class-main.php
index eee86ab88d9cd..828f61ac9670e 100644
--- a/projects/packages/import/src/class-main.php
+++ b/projects/packages/import/src/class-main.php
@@ -20,7 +20,7 @@ class Main {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '0.1.0-alpha';
+	const PACKAGE_VERSION = '0.1.0';
 
 	/**
 	 * A list of all the routes.
@@ -50,7 +50,7 @@ public static function configure() {
 		/**
 		 * Runs right after the Jetpack Import package is initialized.
 		 *
-		 * @since $$next-version$$
+		 * @since 0.1.0
 		*/
 		do_action( 'jetpack_import_initialized' );
 	}
@@ -75,7 +75,7 @@ public static function initialize_rest_api() {
 		/**
 		 * Allow other plugins to modify import routes.
 		 *
-		 * @since $$next-version$$
+		 * @since 0.1.0
 		 *
 		 * @param array $routes Array of import routes.
 		 */
diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
index cec475c9c4ce5..73a33278a3601 100644
--- a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
+++ b/projects/packages/jetpack-mu-wpcom/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.2.2] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.1] - 2023-02-15
 ### Fixed
 - Check array key exists before access. [#28931]
@@ -25,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[0.2.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v0.1.2...v0.2.0
 [0.1.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v0.1.1...v0.1.2
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 8242ed8b6fa8e..80fc4d2c393b0 100644
--- 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": "0.2.2-alpha",
+	"version": "0.2.2",
 	"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
index 7d1c539c97ca4..6f1aa08e6f9f9 100644
--- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
+++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Mu_Wpcom {
 
-	const PACKAGE_VERSION = '0.2.2-alpha';
+	const PACKAGE_VERSION = '0.2.2';
 	const PKG_DIR         = __DIR__ . '/../';
 
 	/**
diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
index b8c2144c673b7..fcddbf03f50af 100644
--- 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).
 
+## [2.3.0] - 2023-02-20
+### Changed
+- Moving deleting connection owner notice from JITM to Connection package. [#28516]
+
 ## [2.2.42] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -542,6 +546,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update Jetpack to use new JITM package
 
+[2.3.0]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.42...v2.3.0
 [2.2.42]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.41...v2.2.42
 [2.2.41]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.40...v2.2.41
 [2.2.40]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.39...v2.2.40
diff --git a/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/jitm/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice b/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
deleted file mode 100644
index 819bafa1a1ee8..0000000000000
--- a/projects/packages/jitm/changelog/update-move-delete-connection-owner-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Moving deleting connection owner notice from JITM to Connection package.
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index 4e309fb0321f5..18de98e1db895 100644
--- 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 = '2.3.0-alpha';
+	const PACKAGE_VERSION = '2.3.0';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/lazy-images/CHANGELOG.md b/projects/packages/lazy-images/CHANGELOG.md
index 8bede61574f69..4edd616dc5c56 100644
--- a/projects/packages/lazy-images/CHANGELOG.md
+++ b/projects/packages/lazy-images/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).
 
+## [2.1.32] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [2.1.31] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -289,6 +293,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Lazy Images: Move into a package
 
+[2.1.32]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.31...v2.1.32
 [2.1.31]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.30...v2.1.31
 [2.1.30]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.29...v2.1.30
 [2.1.29]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.28...v2.1.29
diff --git a/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/lazy-images/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/licensing/CHANGELOG.md b/projects/packages/licensing/CHANGELOG.md
index ca437cac44ee1..bfbe1bd42b139 100644
--- a/projects/packages/licensing/CHANGELOG.md
+++ b/projects/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).
 
+## [1.8.1] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.8.0] - 2023-02-08
 ### Added
 - After connection flow, load unattached licenses. If any of them match the product that's being connected, redirect users to the license activation page. [#28509]
@@ -234,6 +238,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Licensing: Add support for Jetpack licenses
 
+[1.8.1]: https://github.com/Automattic/jetpack-licensing/compare/v1.8.0...v1.8.1
 [1.8.0]: https://github.com/Automattic/jetpack-licensing/compare/v1.7.14...v1.8.0
 [1.7.14]: https://github.com/Automattic/jetpack-licensing/compare/v1.7.13...v1.7.14
 [1.7.13]: https://github.com/Automattic/jetpack-licensing/compare/v1.7.12...v1.7.13
diff --git a/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/licensing/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/logo/CHANGELOG.md b/projects/packages/logo/CHANGELOG.md
index 438f0bced600b..58fa22444882c 100644
--- a/projects/packages/logo/CHANGELOG.md
+++ b/projects/packages/logo/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).
 
+## [1.5.22] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.5.21] - 2023-01-30
 ### Changed
 - Updated styles for Just in Time Messages (notices) [#27515]
@@ -142,6 +146,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Add a basic Jetpack Logo package
 
+[1.5.22]: https://github.com/Automattic/jetpack-logo/compare/v1.5.21...v1.5.22
 [1.5.21]: https://github.com/Automattic/jetpack-logo/compare/v1.5.20...v1.5.21
 [1.5.20]: https://github.com/Automattic/jetpack-logo/compare/v1.5.19...v1.5.20
 [1.5.19]: https://github.com/Automattic/jetpack-logo/compare/v1.5.18...v1.5.19
diff --git a/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/logo/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/projects/packages/my-jetpack/CHANGELOG.md
index b5d4bbee50bcb..cb11786f3808e 100644
--- a/projects/packages/my-jetpack/CHANGELOG.md
+++ b/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).
 
+## [2.7.11] - 2023-02-20
+### Fixed
+- My Jetpack: Fix button to add bundle in product interstitial component [#28984]
+
 ## [2.7.10] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -750,6 +754,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[2.7.11]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.7.10...2.7.11
 [2.7.10]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.7.9...2.7.10
 [2.7.9]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.7.8...2.7.9
 [2.7.8]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.7.7...2.7.8
diff --git a/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security b/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
deleted file mode 100644
index 6c3e03c14d682..0000000000000
--- a/projects/packages/my-jetpack/changelog/fix-my-jetpack-add-security
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-My Jetpack: Fix button to add bundle in product interstitial component
diff --git a/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/my-jetpack/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 58ea139516870..f79675c05b12c 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "2.7.11-alpha",
+	"version": "2.7.11",
 	"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": {
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
index 9fc0d73b89353..d0ed08c3856c9 100644
--- a/projects/packages/my-jetpack/src/class-initializer.php
+++ b/projects/packages/my-jetpack/src/class-initializer.php
@@ -30,7 +30,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '2.7.11-alpha';
+	const PACKAGE_VERSION = '2.7.11';
 
 	/**
 	 * Initialize My Jetpack
diff --git a/projects/packages/partner/CHANGELOG.md b/projects/packages/partner/CHANGELOG.md
index 8e78e36e1b091..21da078ca76c3 100644
--- a/projects/packages/partner/CHANGELOG.md
+++ b/projects/packages/partner/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).
 
+## [1.7.22] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.7.21] - 2022-12-02
 ### Changed
 - Updated package dependencies. [#27688]
@@ -208,6 +212,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add partner subsidiary id to upgrade URLs.
 
+[1.7.22]: https://github.com/Automattic/jetpack-partner/compare/v1.7.21...v1.7.22
 [1.7.21]: https://github.com/Automattic/jetpack-partner/compare/v1.7.20...v1.7.21
 [1.7.20]: https://github.com/Automattic/jetpack-partner/compare/v1.7.19...v1.7.20
 [1.7.19]: https://github.com/Automattic/jetpack-partner/compare/v1.7.18...v1.7.19
diff --git a/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/partner/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/password-checker/CHANGELOG.md b/projects/packages/password-checker/CHANGELOG.md
index ff7a9833c5811..c892ad5c4c306 100644
--- a/projects/packages/password-checker/CHANGELOG.md
+++ b/projects/packages/password-checker/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.2.11] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.10] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -92,6 +96,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Use `composer update` rather than `install` in scripts, as composer.lock isn't checked in.
 
+[0.2.11]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.10...v0.2.11
 [0.2.10]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.9...v0.2.10
 [0.2.9]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.8...v0.2.9
 [0.2.8]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.7...v0.2.8
diff --git a/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/password-checker/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/plans/CHANGELOG.md b/projects/packages/plans/CHANGELOG.md
index 4c15357e28412..d674801a08381 100644
--- a/projects/packages/plans/CHANGELOG.md
+++ b/projects/packages/plans/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.2.10] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.9] - 2023-01-25
 ### Changed
 - Minor internal updates.
@@ -70,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 - Moved the options class into Connection. [#24095]
 
+[0.2.10]: https://github.com/Automattic/jetpack-plans/compare/v0.2.9...v0.2.10
 [0.2.9]: https://github.com/Automattic/jetpack-plans/compare/v0.2.8...v0.2.9
 [0.2.8]: https://github.com/Automattic/jetpack-plans/compare/v0.2.7...v0.2.8
 [0.2.7]: https://github.com/Automattic/jetpack-plans/compare/v0.2.6...v0.2.7
diff --git a/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/plans/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/plans/package.json b/projects/packages/plans/package.json
index 3e84c62ecf6e7..6fca3e165005e 100644
--- a/projects/packages/plans/package.json
+++ b/projects/packages/plans/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-plans",
-	"version": "0.2.10-alpha",
+	"version": "0.2.10",
 	"description": "Fetch information about Jetpack Plans from wpcom",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/plans/#readme",
 	"bugs": {
diff --git a/projects/packages/plugins-installer/CHANGELOG.md b/projects/packages/plugins-installer/CHANGELOG.md
index 2f8c169862c73..2cd5535619f7e 100644
--- a/projects/packages/plugins-installer/CHANGELOG.md
+++ b/projects/packages/plugins-installer/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.2.3] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.2] - 2022-12-02
 ### Changed
 - Updated package dependencies. [#27688]
@@ -44,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fix method logic
 
+[0.2.3]: https://github.com/Automattic/jetpack-plugins-installer/compare/v0.2.2...v0.2.3
 [0.2.2]: https://github.com/Automattic/jetpack-plugins-installer/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/Automattic/jetpack-plugins-installer/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-plugins-installer/compare/v0.1.4...v0.2.0
diff --git a/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/plugins-installer/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/post-list/CHANGELOG.md b/projects/packages/post-list/CHANGELOG.md
index d5101b5d1148b..3c3558d959a1f 100644
--- a/projects/packages/post-list/CHANGELOG.md
+++ b/projects/packages/post-list/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.4.4] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.4.3] - 2022-12-06
 ### Changed
 - Updated package dependencies. [#27688]
@@ -74,6 +78,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated the default columns displayed on the post and page list screens
 - Refactored thumbnail preview to function server side. All javascript removed.
 
+[0.4.4]: https://github.com/automattic/jetpack-post-list/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/automattic/jetpack-post-list/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/automattic/jetpack-post-list/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/automattic/jetpack-post-list/compare/v0.4.0...v0.4.1
diff --git a/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/post-list/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/post-list/src/class-post-list.php b/projects/packages/post-list/src/class-post-list.php
index bbea4aff558f0..a876f54767f43 100644
--- a/projects/packages/post-list/src/class-post-list.php
+++ b/projects/packages/post-list/src/class-post-list.php
@@ -12,7 +12,7 @@
  */
 class Post_List {
 
-	const PACKAGE_VERSION = '0.4.4-alpha';
+	const PACKAGE_VERSION = '0.4.4';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
index baa68f9994e85..b519a8b03b78a 100644
--- a/projects/packages/publicize/CHANGELOG.md
+++ b/projects/packages/publicize/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.19.5] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.19.4] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -226,6 +230,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Update package.json metadata.
 
+[0.19.5]: https://github.com/Automattic/jetpack-publicize/compare/v0.19.4...v0.19.5
 [0.19.4]: https://github.com/Automattic/jetpack-publicize/compare/v0.19.3...v0.19.4
 [0.19.3]: https://github.com/Automattic/jetpack-publicize/compare/v0.19.2...v0.19.3
 [0.19.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.19.1...v0.19.2
diff --git a/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/publicize/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
index a71d32db3404b..15bbe6488b37f 100644
--- a/projects/packages/publicize/package.json
+++ b/projects/packages/publicize/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize",
-	"version": "0.19.5-alpha",
+	"version": "0.19.5",
 	"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme",
 	"bugs": {
diff --git a/projects/packages/redirect/CHANGELOG.md b/projects/packages/redirect/CHANGELOG.md
index b9d6ca0299d88..85644768a2e7b 100644
--- a/projects/packages/redirect/CHANGELOG.md
+++ b/projects/packages/redirect/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).
 
+## [1.7.24] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.7.23] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -172,6 +176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Create Jetpack Redirect package
 
+[1.7.24]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.23...v1.7.24
 [1.7.23]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.22...v1.7.23
 [1.7.22]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.21...v1.7.22
 [1.7.21]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.20...v1.7.21
diff --git a/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/redirect/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/roles/CHANGELOG.md b/projects/packages/roles/CHANGELOG.md
index cc0b7998f738e..67f81bd26e6b9 100644
--- a/projects/packages/roles/CHANGELOG.md
+++ b/projects/packages/roles/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).
 
+## [1.4.22] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.4.21] - 2023-01-11
 ### Changed
 - Updated package dependencies.
@@ -139,6 +143,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Jetpack DNA: Introduce a Roles package
 
+[1.4.22]: https://github.com/Automattic/jetpack-roles/compare/v1.4.21...v1.4.22
 [1.4.21]: https://github.com/Automattic/jetpack-roles/compare/v1.4.20...v1.4.21
 [1.4.20]: https://github.com/Automattic/jetpack-roles/compare/v1.4.19...v1.4.20
 [1.4.19]: https://github.com/Automattic/jetpack-roles/compare/v1.4.18...v1.4.19
diff --git a/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/roles/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/search/CHANGELOG.md b/projects/packages/search/CHANGELOG.md
index 9fbd66dcbb217..6e2a59dfa3edb 100644
--- a/projects/packages/search/CHANGELOG.md
+++ b/projects/packages/search/CHANGELOG.md
@@ -5,6 +5,14 @@ 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.33.0] - 2023-02-20
+### Added
+- Adds a "show post date" selector to Search customberg, allows non-multisite sites to show the post date in the "expanded" search result format. [#28918]
+
+### Fixed
+- Fixed unit tests without internet [#28985]
+- Separated authors by comments if there are multiple authors in a search result [#28975]
+
 ## [0.32.0] - 2023-02-15
 ### Added
 - Search: Adds assigned post categories as classnames to search results [#28816]
@@ -662,6 +670,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't.
 
+[0.33.0]: https://github.com/Automattic/jetpack-search/compare/v0.32.0...v0.33.0
 [0.32.0]: https://github.com/Automattic/jetpack-search/compare/v0.31.7...v0.32.0
 [0.31.7]: https://github.com/Automattic/jetpack-search/compare/v0.31.6...v0.31.7
 [0.31.6]: https://github.com/Automattic/jetpack-search/compare/v0.31.5...v0.31.6
diff --git a/projects/packages/search/changelog/fix-jetpack-search-multiple-authors b/projects/packages/search/changelog/fix-jetpack-search-multiple-authors
deleted file mode 100644
index 88094bcbf03fb..0000000000000
--- a/projects/packages/search/changelog/fix-jetpack-search-multiple-authors
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Separated authors by comments if there are multiple authors in a search result
diff --git a/projects/packages/search/changelog/fix-unit-test-without-internet b/projects/packages/search/changelog/fix-unit-test-without-internet
deleted file mode 100644
index bd5d18e442a30..0000000000000
--- a/projects/packages/search/changelog/fix-unit-test-without-internet
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed unit tests without internet
diff --git a/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/search/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/search/changelog/update-add-date-to-search-results b/projects/packages/search/changelog/update-add-date-to-search-results
deleted file mode 100644
index 919fd63e04a29..0000000000000
--- a/projects/packages/search/changelog/update-add-date-to-search-results
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Adds a "show post date" selector to Search customberg, allows non-multisite sites to show the post date in the "expanded" search result format.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index 2477ebef20593..98f7b60c03f50 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-search",
-	"version": "0.33.0-alpha",
+	"version": "0.33.0",
 	"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
index 5308b26f45c56..6ea37d1660275 100644
--- 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.33.0-alpha';
+	const VERSION = '0.33.0';
 	const SLUG    = 'search';
 
 	/**
diff --git a/projects/packages/stats-admin/CHANGELOG.md b/projects/packages/stats-admin/CHANGELOG.md
index 6cc413267cee8..68455ee2bbb8b 100644
--- a/projects/packages/stats-admin/CHANGELOG.md
+++ b/projects/packages/stats-admin/CHANGELOG.md
@@ -5,6 +5,11 @@ 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.6.1 - 2023-02-20
+### Fixed
+- Fixed unit tests without internet [#28985]
+- Stats: fix broken request_as_blog_cached [#28992]
+
 ## 0.6.0 - 2023-02-15
 ### Added
 - Stats: Adds support for Notice control [#28857]
diff --git a/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible b/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible
deleted file mode 100644
index dc2de5a332dbc..0000000000000
--- a/projects/packages/stats-admin/changelog/fix-decoding-wrong-varible
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Stats: fix broken request_as_blog_cached
diff --git a/projects/packages/stats-admin/changelog/fix-unit-test-without-internet b/projects/packages/stats-admin/changelog/fix-unit-test-without-internet
deleted file mode 100644
index bd5d18e442a30..0000000000000
--- a/projects/packages/stats-admin/changelog/fix-unit-test-without-internet
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed unit tests without internet
diff --git a/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/stats-admin/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/stats-admin/package.json b/projects/packages/stats-admin/package.json
index ef4799f3e1c4c..fcd4ba532af72 100644
--- a/projects/packages/stats-admin/package.json
+++ b/projects/packages/stats-admin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-stats-admin",
-	"version": "0.6.1-alpha",
+	"version": "0.6.1",
 	"description": "Stats Dashboard",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/stats-admin/#readme",
 	"bugs": {
diff --git a/projects/packages/stats-admin/src/class-main.php b/projects/packages/stats-admin/src/class-main.php
index bc959e57fb124..45443d0dadcdf 100644
--- a/projects/packages/stats-admin/src/class-main.php
+++ b/projects/packages/stats-admin/src/class-main.php
@@ -18,7 +18,7 @@ class Main {
 	/**
 	 * Stats version.
 	 */
-	const VERSION = '0.6.1-alpha';
+	const VERSION = '0.6.1';
 
 	/**
 	 * Singleton Main instance.
diff --git a/projects/packages/stats/CHANGELOG.md b/projects/packages/stats/CHANGELOG.md
index 4c099dd51bff3..cb9d1d6e056c0 100644
--- a/projects/packages/stats/CHANGELOG.md
+++ b/projects/packages/stats/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.5.1] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.5.0] - 2023-02-15
 ### Added
 - Added new options to store the timestamp when Odyssey is enabled and disabled [#28794]
@@ -61,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixing static method which was called without self reference. [#26640]
 
+[0.5.1]: https://github.com/Automattic/jetpack-stats/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-stats/compare/v0.4.2...v0.5.0
 [0.4.2]: https://github.com/Automattic/jetpack-stats/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/Automattic/jetpack-stats/compare/v0.4.0...v0.4.1
diff --git a/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/stats/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/status/CHANGELOG.md b/projects/packages/status/CHANGELOG.md
index 19a7d6107c94f..bcd8c977db5a3 100644
--- a/projects/packages/status/CHANGELOG.md
+++ b/projects/packages/status/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).
 
+## [1.16.2] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.16.1] - 2023-01-23
 ### Added
 - Add new filters for the latest status methods [#28328]
@@ -236,6 +240,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a status package
 
+[1.16.2]: https://github.com/Automattic/jetpack-status/compare/v1.16.1...v1.16.2
 [1.16.1]: https://github.com/Automattic/jetpack-status/compare/v1.16.0...v1.16.1
 [1.16.0]: https://github.com/Automattic/jetpack-status/compare/v1.15.4...v1.16.0
 [1.15.4]: https://github.com/Automattic/jetpack-status/compare/v1.15.3...v1.15.4
diff --git a/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/status/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/sync/CHANGELOG.md b/projects/packages/sync/CHANGELOG.md
index 8d1bdf7fb89b9..29ade8703a0f4 100644
--- a/projects/packages/sync/CHANGELOG.md
+++ b/projects/packages/sync/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).
 
+## [1.47.2] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [1.47.1] - 2023-01-23
 ### Added
 - Close PHP Session if it's active when running a Dedicated Sync request. [#28515]
@@ -814,6 +818,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Move sync to a classmapped package
 
+[1.47.2]: https://github.com/Automattic/jetpack-sync/compare/v1.47.1...v1.47.2
 [1.47.1]: https://github.com/Automattic/jetpack-sync/compare/v1.47.0...v1.47.1
 [1.47.0]: https://github.com/Automattic/jetpack-sync/compare/v1.46.1...v1.47.0
 [1.46.1]: https://github.com/Automattic/jetpack-sync/compare/v1.46.0...v1.46.1
diff --git a/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/sync/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php
index bfe4a04289480..30c2146a2ebfa 100644
--- a/projects/packages/sync/src/class-package-version.php
+++ b/projects/packages/sync/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.47.2-alpha';
+	const PACKAGE_VERSION = '1.47.2';
 
 	const PACKAGE_SLUG = 'sync';
 
diff --git a/projects/packages/videopress/CHANGELOG.md b/projects/packages/videopress/CHANGELOG.md
index b07aa35471f1e..0d0479df717cb 100644
--- a/projects/packages/videopress/CHANGELOG.md
+++ b/projects/packages/videopress/CHANGELOG.md
@@ -5,6 +5,21 @@ 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.10.12] - 2023-02-20
+### Added
+- VideoPress: flush token when the requester retries [#28930]
+- VideoPress: improve requesting data for private videos [#28797]
+- VideoPress: propagate custom CSS from VideoPress video block to core/embed when transforming block [#29035]
+
+### Changed
+- Auto-formatting of some files. [#28516]
+- VideoPress: enqueue video block assets by using the Assets class [#28965]
+- VideoPress: fix detecting auto-generated issue [#28945]
+- VideoPress: tweak poster control styles [#29033]
+
+### Fixed
+- VideoPress: Fix dashboard fatal mistake when reading malformed local video [#29011]
+
 ## [0.10.11] - 2023-02-15
 ### Fixed
 - VideoPress: Disable local library upload button when video is already uploaded (mobile) [#28958]
@@ -712,6 +727,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created empty package [#24952]
 
+[0.10.12]: https://github.com/Automattic/jetpack-videopress/compare/v0.10.11...v0.10.12
 [0.10.11]: https://github.com/Automattic/jetpack-videopress/compare/v0.10.10...v0.10.11
 [0.10.10]: https://github.com/Automattic/jetpack-videopress/compare/v0.10.9...v0.10.10
 [0.10.9]: https://github.com/Automattic/jetpack-videopress/compare/v0.10.8...v0.10.9
diff --git a/projects/packages/videopress/changelog/fix-videopress-local-library-fatal b/projects/packages/videopress/changelog/fix-videopress-local-library-fatal
deleted file mode 100644
index 62288ceff4286..0000000000000
--- a/projects/packages/videopress/changelog/fix-videopress-local-library-fatal
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-VideoPress: Fix dashboard fatal mistake when reading malformed local video
diff --git a/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/videopress/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/videopress/changelog/update-jetpack-tweak-media-button b/projects/packages/videopress/changelog/update-jetpack-tweak-media-button
deleted file mode 100644
index 4d46bb9acc0a1..0000000000000
--- a/projects/packages/videopress/changelog/update-jetpack-tweak-media-button
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-VideoPress: tweak poster control styles
diff --git a/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice b/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
deleted file mode 100644
index 286356ac211bd..0000000000000
--- a/projects/packages/videopress/changelog/update-move-delete-connection-owner-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Auto-formatting of some files.
diff --git a/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file b/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file
deleted file mode 100644
index 890c4f23e116b..0000000000000
--- a/projects/packages/videopress/changelog/update-videopress-fix-issue-when-getting-autogenerated-chapter-file
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-VideoPress: fix detecting auto-generated issue
diff --git a/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block b/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block
deleted file mode 100644
index 08e5847a2a98b..0000000000000
--- a/projects/packages/videopress/changelog/update-videopress-handle-css-classes-when-transforming-embed-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-VideoPress: propagate custom CSS from VideoPress video block to core/embed when transforming block
diff --git a/projects/packages/videopress/changelog/update-videopress-improve-getting-token-performance b/projects/packages/videopress/changelog/update-videopress-improve-getting-token-performance
deleted file mode 100644
index 8f9e3bf34142e..0000000000000
--- a/projects/packages/videopress/changelog/update-videopress-improve-getting-token-performance
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-VideoPress: improve requesting data for private videos
diff --git a/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester b/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester
deleted file mode 100644
index cc902d7f7b16b..0000000000000
--- a/projects/packages/videopress/changelog/update-videopress-read-and-support-is-retry-from-token-requester
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-VideoPress: flush token when the requester retries
diff --git a/projects/packages/videopress/changelog/update-videopress-register-and-enqueue-video-block-assets b/projects/packages/videopress/changelog/update-videopress-register-and-enqueue-video-block-assets
deleted file mode 100644
index 51f41e2c0c224..0000000000000
--- a/projects/packages/videopress/changelog/update-videopress-register-and-enqueue-video-block-assets
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-VideoPress: enqueue video block assets by using the Assets class
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
index 8774b8a1a8c75..580838b696c48 100644
--- a/projects/packages/videopress/package.json
+++ b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-videopress",
-	"version": "0.10.12-alpha",
+	"version": "0.10.12",
 	"description": "VideoPress package",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
 	"bugs": {
diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php
index c21c0a2b0d6d1..7d2ee31135bac 100644
--- a/projects/packages/videopress/src/class-package-version.php
+++ b/projects/packages/videopress/src/class-package-version.php
@@ -11,7 +11,7 @@
  * The Package_Version class.
  */
 class Package_Version {
-	const PACKAGE_VERSION = '0.10.12-alpha';
+	const PACKAGE_VERSION = '0.10.12';
 
 	const PACKAGE_SLUG = 'videopress';
 
diff --git a/projects/packages/waf/CHANGELOG.md b/projects/packages/waf/CHANGELOG.md
index 181a110453729..1313e7b04cf1f 100644
--- a/projects/packages/waf/CHANGELOG.md
+++ b/projects/packages/waf/CHANGELOG.md
@@ -5,7 +5,12 @@ 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.9.3] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.9.2] - 2023-02-15
+### Changed
 - Minor internal updates.
 
 ## [0.9.1] - 2023-02-13
@@ -150,6 +155,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Core: do not ship .phpcs.dir.xml in production builds.
 
+[0.9.3]: https://github.com/Automattic/jetpack-waf/compare/v0.9.2...v0.9.3
 [0.9.2]: https://github.com/Automattic/jetpack-waf/compare/v0.9.1...v0.9.2
 [0.9.1]: https://github.com/Automattic/jetpack-waf/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/Automattic/jetpack-waf/compare/v0.8.3...v0.9.0
diff --git a/projects/packages/waf/changelog/add-waf-wordbless b/projects/packages/waf/changelog/add-waf-wordbless
deleted file mode 100644
index 295867884b189..0000000000000
--- a/projects/packages/waf/changelog/add-waf-wordbless
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: added
-Comment: Added the automattic/wordbless package.
-
-
diff --git a/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/waf/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/wordads/CHANGELOG.md b/projects/packages/wordads/CHANGELOG.md
index a28c95ba960ca..88e3c28b79e14 100644
--- a/projects/packages/wordads/CHANGELOG.md
+++ b/projects/packages/wordads/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.2.32] - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## [0.2.31] - 2023-02-15
 ### Changed
 - Update to React 18. [#28710]
@@ -157,6 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - PHPCS: Fix `WordPress.Security.ValidatedSanitizedInput`
 - Updated package dependencies.
 
+[0.2.32]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.31...v0.2.32
 [0.2.31]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.30...v0.2.31
 [0.2.30]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.29...v0.2.30
 [0.2.29]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.28...v0.2.29
diff --git a/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage b/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/packages/wordads/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json
index ea48aa155b5cf..c78ad41a7bc21 100644
--- a/projects/packages/wordads/package.json
+++ b/projects/packages/wordads/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-wordads",
-	"version": "0.2.32-alpha",
+	"version": "0.2.32",
 	"description": "Earn income by allowing Jetpack to display high quality ads.",
 	"main": "main.js",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/wordads/#readme",
diff --git a/projects/packages/wordads/src/class-package.php b/projects/packages/wordads/src/class-package.php
index d9ef93376b272..3542dd1b8787c 100644
--- a/projects/packages/wordads/src/class-package.php
+++ b/projects/packages/wordads/src/class-package.php
@@ -11,7 +11,7 @@
  * WordAds package general information
  */
 class Package {
-	const VERSION = '0.2.32-alpha';
+	const VERSION = '0.2.32';
 	const SLUG    = 'wordads';
 
 	/**
diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
index 1dbc979ee4b64..c188644342240 100644
--- a/projects/plugins/jetpack/CHANGELOG.md
+++ b/projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 ### This is a list detailing changes for all Jetpack releases.
 
+## 11.9-a.5 - 2023-02-20
+### Enhancements
+- Import: add new `automattic/jetpack-import` package. [#28824]
+- Jetpack: improve design of MediaButton component. [#29027]
+- Sharing: update look and feel of sharing buttons when in "official" mode. [#28961]
+
+### Improved compatibility
+- Stats: adjust margin for WordPress.com stats link in Jetpack dashboard. [#28976]
+- VideoPress: extend media button for VideoPress video block. [#29032]
+- VideoPress: restore v5/v6 transform for all platforms. [#28986]
+
+### Bug fixes
+- Form block: update form-styles script to prevent blurred forms on slow loading pages. [#28973]
+- Story block: remove dependency on wp-components from the frontend code. [#28743]
+
+### Other changes <!-- Non-user-facing changes go here. This section will not be copied to readme.txt. -->
+- General: use external link icons for external links. [#28922]
+- Remove `ci.targets` from package.json. Better scoping of e2e tests. [#28913]
+- Writing Prompts (beta): adds initial scaffolding for block. [#29013]
+- WPcom: adjust paid-newsletters UI, add regression tests. [#28690, #28966]
+- WPcom: adjust prompt for AI paragraph block. [#28565]
+
 ## 11.9-a.3 - 2023-02-15
 ### Enhancements
 - Site editor: display location-aware snackbar in edit mode. [#28810]
diff --git a/projects/plugins/jetpack/changelog/add-better-open-ai-prompt b/projects/plugins/jetpack/changelog/add-better-open-ai-prompt
deleted file mode 100644
index 2e02d7df602bd..0000000000000
--- a/projects/plugins/jetpack/changelog/add-better-open-ai-prompt
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-createPrompt will now create a prompt for every case except when the post is totally empty
diff --git a/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding b/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
deleted file mode 100644
index 5bd8d037e39bc..0000000000000
--- a/projects/plugins/jetpack/changelog/add-blogging-prompts-block-scaffolding
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Writing prompts: adds initial scaffolding for block
diff --git a/projects/plugins/jetpack/changelog/add-import-package b/projects/plugins/jetpack/changelog/add-import-package
deleted file mode 100644
index 961b9a3cf1ef4..0000000000000
--- a/projects/plugins/jetpack/changelog/add-import-package
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Added the Import package.
diff --git a/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector b/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector
deleted file mode 100644
index 7a39506871287..0000000000000
--- a/projects/plugins/jetpack/changelog/add-newsletter-visibility-selector
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-Harmonize UI with stock Gutenberg menu
diff --git a/projects/plugins/jetpack/changelog/add-waf-wordbless b/projects/plugins/jetpack/changelog/add-waf-wordbless
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/add-waf-wordbless
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/e2e-better_scoping b/projects/plugins/jetpack/changelog/e2e-better_scoping
deleted file mode 100644
index d420860280cb5..0000000000000
--- a/projects/plugins/jetpack/changelog/e2e-better_scoping
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Remove `ci.targets` from package.json. Better scoping of e2e tests.
diff --git a/projects/plugins/jetpack/changelog/fix-missing-external-links b/projects/plugins/jetpack/changelog/fix-missing-external-links
deleted file mode 100644
index 821095c257b98..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-missing-external-links
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-General: use external link icons for external links
diff --git a/projects/plugins/jetpack/changelog/init-release-cycle b/projects/plugins/jetpack/changelog/init-release-cycle
index 3594bc86249ea..107693b1001b6 100644
--- a/projects/plugins/jetpack/changelog/init-release-cycle
+++ b/projects/plugins/jetpack/changelog/init-release-cycle
@@ -1,5 +1,5 @@
 Significance: patch
 Type: other
-Comment: Init 11.9-a.4
+Comment: Init 11.9-a.6
 
 
diff --git a/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 81712ec841851..0000000000000
--- a/projects/plugins/jetpack/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions b/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
deleted file mode 100644
index ed77bf50d15b7..0000000000000
--- a/projects/plugins/jetpack/changelog/tests-add-tests-for-newsletter-regressions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Tests for paid-newsletters regressions
diff --git a/projects/plugins/jetpack/changelog/update-add-date-to-search-results b/projects/plugins/jetpack/changelog/update-add-date-to-search-results
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-add-date-to-search-results
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-clean-jetpack-11.9-a.3 b/projects/plugins/jetpack/changelog/update-clean-jetpack-11.9-a.3
deleted file mode 100644
index e01f58ec346b0..0000000000000
--- a/projects/plugins/jetpack/changelog/update-clean-jetpack-11.9-a.3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Edited changelog
diff --git a/projects/plugins/jetpack/changelog/update-form-styles-improvement b/projects/plugins/jetpack/changelog/update-form-styles-improvement
deleted file mode 100644
index 3fe286ff6d2b7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-form-styles-improvement
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Update form-styles script to prevent blurred forms on slow loading pages
diff --git a/projects/plugins/jetpack/changelog/update-form-styles-improvement#2 b/projects/plugins/jetpack/changelog/update-form-styles-improvement#2
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-form-styles-improvement#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-import-package b/projects/plugins/jetpack/changelog/update-import-package
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-import-package
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4 b/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4
deleted file mode 100644
index 9bc1cb9040a03..0000000000000
--- a/projects/plugins/jetpack/changelog/update-jetpack-backport-11.8.4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Jetpack: backport 11.8.4 changelog and stable tag
-
-
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block b/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block
deleted file mode 100644
index 78000d3956308..0000000000000
--- a/projects/plugins/jetpack/changelog/update-jetpack-extend-media-button-for-videopress-video-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: compat
-
-Jetpack: extend media button for VideoPress video block
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button b/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button
deleted file mode 100644
index 1b3be433422e4..0000000000000
--- a/projects/plugins/jetpack/changelog/update-jetpack-tweak-media-button
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-Jetpack: tweak MediaButton component
diff --git a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2 b/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/update-move-delete-connection-owner-notice#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-official-button-styles b/projects/plugins/jetpack/changelog/update-official-button-styles
deleted file mode 100644
index a5ee1fa25e23b..0000000000000
--- a/projects/plugins/jetpack/changelog/update-official-button-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Updating look and feel of sharing buttons when in "official" mode
diff --git a/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend b/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend
deleted file mode 100644
index 112c92d1c4ae2..0000000000000
--- a/projects/plugins/jetpack/changelog/update-remove-wp-components-dep-from-story-frontend
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-Story block: remove dependency on wp-components from the frontend code
diff --git a/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms b/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms
deleted file mode 100644
index a8aa9a6f4d1d1..0000000000000
--- a/projects/plugins/jetpack/changelog/update-videopress-allow-v5-v6-transforms
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-VideoPress: restore v5/v6 transform for all platforms
diff --git a/projects/plugins/jetpack/changelog/update-visa-stats-left-margin b/projects/plugins/jetpack/changelog/update-visa-stats-left-margin
deleted file mode 100644
index e0ff0aaff8847..0000000000000
--- a/projects/plugins/jetpack/changelog/update-visa-stats-left-margin
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-Set left-margin to 16px for View on WordPress.com stats link in Jetpack dashboard
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index 0020a2bc82616..e9ad5e1d9bcad 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -100,7 +100,7 @@
 		"platform": {
 			"ext-intl": "0.0.0"
 		},
-		"autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ11_9_a_4",
+		"autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ11_9_a_6",
 		"allow-plugins": {
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php
index bf9e3f305f475..8448b22a6e9f4 100644
--- a/projects/plugins/jetpack/jetpack.php
+++ b/projects/plugins/jetpack/jetpack.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
  * Author: Automattic
- * Version: 11.9-a.4
+ * Version: 11.9-a.6
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -32,7 +32,7 @@
 
 define( 'JETPACK__MINIMUM_WP_VERSION', '6.0' );
 define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' );
-define( 'JETPACK__VERSION', '11.9-a.4' );
+define( 'JETPACK__VERSION', '11.9-a.6' );
 
 /**
  * Constant used to fetch the connection owner token
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index 7c8e8ba9afc08..7e380b67386a5 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Jetpack",
-	"version": "11.9.0-a.4",
+	"version": "11.9.0-a.6",
 	"private": true,
 	"description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).",
 	"homepage": "https://jetpack.com",
diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt
index 99dedba647e2a..d930d31841950 100644
--- a/projects/plugins/jetpack/readme.txt
+++ b/projects/plugins/jetpack/readme.txt
@@ -244,25 +244,20 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file
 4. Promote your newest posts, pages, and products across your social media channels.
 
 == Changelog ==
-### 11.9-a.3 - 2023-02-15
+### 11.9-a.5 - 2023-02-20
 #### Enhancements
-- Site editor: display location-aware snackbar in edit mode.
-- Stats: adds filter to hide stats widget based on user capability.
-- Stats: added a notice with a link to a survey when the new stats interface is disabled.
-- Subscriptions: updated submit messages text for subscriptions.
-- Social: visual update to social buttons.
+- Import: add new `automattic/jetpack-import` package.
+- Jetpack: improve design of MediaButton component.
+- Sharing: update look and feel of sharing buttons when in "official" mode.
 
 #### Improved compatibility
-- Social: update icon font to remove support for older browsers (IE11-).
-- Themes: ensure redesigned sharing buttons look good in default themes (Twenty Nineteen, Twenty Sixteen).
+- Stats: adjust margin for WordPress.com stats link in Jetpack dashboard.
+- VideoPress: extend media button for VideoPress video block.
+- VideoPress: restore v5/v6 transform for all platforms.
 
 #### Bug fixes
-- Forms block: add filter to prevent contact-form-styles script from being concatenated.
-- Forms block: add new method to parse the form fields, fallback to old method.
-- Forms block: prevent blur effect on AMP pages.
-- Subscriptions: fix premium content block where it would only allow access to site subscribers.
-- Subscriptions: fix subscribe-block button to behave the same as in the fronted.
-- Widgets: fix GoodReads custom widget not finding the target HTML element and appending another after its script tag.
+- Form block: update form-styles script to prevent blurred forms on slow loading pages.
+- Story block: remove dependency on wp-components from the frontend code.
 
 --------
 
diff --git a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
index 2958abc0aa2fb..e6f7c2a9310f8 100644
--- a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
+++ b/projects/plugins/mu-wpcom-plugin/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).
 
+## 1.0.5 - 2023-02-20
+### Changed
+- Minor internal updates.
+
 ## 1.0.4 - 2023-02-15
 ### Changed
 - Updated package dependencies. [#28910]
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage b/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage
deleted file mode 100644
index 085e2e863ddb4..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/remove-remnants-of-automated-code-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove `test-coverage` scripts and other remnants of automated code coverage.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
index a2ebb9c3ee5bc..a8872bb538b7e 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.json
+++ b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -42,6 +42,6 @@
 		"release-branch-prefix": "jetpack"
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_0_5_alpha"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_0_5"
 	}
 }
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
index 9bc574ed7b774..d8e2f168329ed 100644
--- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
+++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 1.0.5-alpha
+ * Version: 1.0.5
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin
diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json
index ad89eeb06b626..44a60b6c06b65 100644
--- a/projects/plugins/mu-wpcom-plugin/package.json
+++ b/projects/plugins/mu-wpcom-plugin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "1.0.5-alpha",
+	"version": "1.0.5",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {

From af384638802bbfeeba1d79c3ee1f4ababd649eba Mon Sep 17 00:00:00 2001
From: Rustam Shaikh <rustamengg@gmail.com>
Date: Tue, 21 Feb 2023 05:37:28 +0530
Subject: [PATCH 45/51] Backup: Update component to use custom backup retention
 days if set (#28981)

* Updated backup storage UI to use custome retention period if set by the user

* changelog

* Sync version numbers

* Added unit tests

* Updated changelog

* Sync versions

* changelog

* Update changelog filename to branch name

* Deleted not required Videopress changelog file

* Removed not required chanaglog files

---------

Co-authored-by: Rafael Agostini <rafael.agostini@automattic.com>
---
 ...p-component-to-use-custom-retention-period |  3 ++
 .../backup/src/class-package-version.php      |  2 +-
 .../packages/backup/src/js/actions/index.js   |  1 +
 .../components/backup-storage-space/index.jsx |  6 ++--
 .../storage-usage-levels.ts                   |  6 ++--
 .../src/js/reducers/site-backup-size.js       |  2 ++
 .../src/js/reducers/test/site-backup-size.js  |  5 +++
 .../backup/src/js/selectors/site-backup.js    |  1 +
 .../src/js/selectors/test/site-backup-size.js | 35 +++++++++++++++++++
 9 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 projects/packages/backup/changelog/update-backup-component-to-use-custom-retention-period

diff --git a/projects/packages/backup/changelog/update-backup-component-to-use-custom-retention-period b/projects/packages/backup/changelog/update-backup-component-to-use-custom-retention-period
new file mode 100644
index 0000000000000..7ecf71b052b3b
--- /dev/null
+++ b/projects/packages/backup/changelog/update-backup-component-to-use-custom-retention-period
@@ -0,0 +1,3 @@
+Significance: patch
+Type: changed
+Comment: Updated backup storage UI to consider custom retention period
diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
index 2c7dfeabfb640..496954b822391 100644
--- a/projects/packages/backup/src/class-package-version.php
+++ b/projects/packages/backup/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.12.4';
+	const PACKAGE_VERSION = '1.12.5-alpha';
 
 	const PACKAGE_SLUG = 'backup';
 
diff --git a/projects/packages/backup/src/js/actions/index.js b/projects/packages/backup/src/js/actions/index.js
index b17a2adddf32d..52a30f77b36ac 100644
--- a/projects/packages/backup/src/js/actions/index.js
+++ b/projects/packages/backup/src/js/actions/index.js
@@ -25,6 +25,7 @@ const getSiteSize = () => ( { dispatch } ) => {
 				minDaysOfBackupsAllowed: res.min_days_of_backups_allowed,
 				daysOfBackupsAllowed: res.days_of_backups_allowed,
 				daysOfBackupsSaved: res.days_of_backups_saved,
+				retentionDays: res.retention_days,
 			};
 
 			dispatch( { type: SITE_BACKUP_SIZE_GET_SUCCESS, payload } );
diff --git a/projects/packages/backup/src/js/components/backup-storage-space/index.jsx b/projects/packages/backup/src/js/components/backup-storage-space/index.jsx
index ef38326b8389a..1b61b6c9cc5a9 100644
--- a/projects/packages/backup/src/js/components/backup-storage-space/index.jsx
+++ b/projects/packages/backup/src/js/components/backup-storage-space/index.jsx
@@ -23,6 +23,8 @@ const BackupStorageSpace = () => {
 	const showComponent = storageSize !== null && storageLimit > 0;
 
 	const usageLevel = useSelect( select => select( STORE_ID ).getStorageUsageLevel() );
+	const backupRetentionDays = useSelect( select => select( STORE_ID ).getBackupRetentionDays() );
+	const retentionDays = backupRetentionDays || planRetentionDays;
 
 	const dispatch = useDispatch( STORE_ID );
 
@@ -56,7 +58,7 @@ const BackupStorageSpace = () => {
 				storageLimit,
 				minDaysOfBackupsAllowed,
 				daysOfBackupsAllowed,
-				planRetentionDays,
+				retentionDays,
 				daysOfBackupsSaved
 			)
 		);
@@ -66,7 +68,7 @@ const BackupStorageSpace = () => {
 		storageLimit,
 		minDaysOfBackupsAllowed,
 		daysOfBackupsAllowed,
-		planRetentionDays,
+		retentionDays,
 		daysOfBackupsSaved,
 	] );
 
diff --git a/projects/packages/backup/src/js/components/backup-storage-space/storage-usage-levels.ts b/projects/packages/backup/src/js/components/backup-storage-space/storage-usage-levels.ts
index 7523952cdaa1c..c8d6ba1708b8c 100644
--- a/projects/packages/backup/src/js/components/backup-storage-space/storage-usage-levels.ts
+++ b/projects/packages/backup/src/js/components/backup-storage-space/storage-usage-levels.ts
@@ -24,7 +24,7 @@ export const getUsageLevel = (
 	available: number | undefined,
 	minDaysOfBackupsAllowed: number,
 	daysOfBackupsAllowed: number,
-	planRetentionDays: number,
+	retentionDays: number,
 	daysOfBackupsSaved: number
 ): StorageUsageLevelName | null => {
 	if ( available === undefined || used === undefined ) {
@@ -34,7 +34,7 @@ export const getUsageLevel = (
 	if (
 		!! minDaysOfBackupsAllowed &&
 		!! daysOfBackupsAllowed &&
-		!! planRetentionDays &&
+		!! retentionDays &&
 		!! daysOfBackupsSaved
 	) {
 		// if current days of backups saved is less than or equal to the minimum and storage is overlimit.
@@ -49,7 +49,7 @@ export const getUsageLevel = (
 
 		// if current allowed days of backups is less than plan's retention days, that means
 		// we discarded some backups to make other fit in current storage limit.
-		if ( daysOfBackupsAllowed < planRetentionDays ) {
+		if ( daysOfBackupsAllowed < retentionDays ) {
 			return StorageUsageLevels.BackupsDiscarded;
 		}
 	}
diff --git a/projects/packages/backup/src/js/reducers/site-backup-size.js b/projects/packages/backup/src/js/reducers/site-backup-size.js
index 9d63e9a6868d1..87d0c4a8b26ee 100644
--- a/projects/packages/backup/src/js/reducers/site-backup-size.js
+++ b/projects/packages/backup/src/js/reducers/site-backup-size.js
@@ -11,6 +11,7 @@ const initialState = {
 	minDaysOfBackupsAllowed: null,
 	daysOfBackupsAllowed: null,
 	daysOfBackupsSaved: null,
+	retentionDays: null,
 };
 
 const siteBackupSize = ( state = initialState, action ) => {
@@ -32,6 +33,7 @@ const siteBackupSize = ( state = initialState, action ) => {
 				minDaysOfBackupsAllowed: action.payload?.minDaysOfBackupsAllowed,
 				daysOfBackupsAllowed: action.payload?.daysOfBackupsAllowed,
 				daysOfBackupsSaved: action.payload?.daysOfBackupsSaved,
+				retentionDays: action.payload?.retentionDays,
 			};
 		}
 		case SITE_BACKUP_SIZE_GET_FAILED: {
diff --git a/projects/packages/backup/src/js/reducers/test/site-backup-size.js b/projects/packages/backup/src/js/reducers/test/site-backup-size.js
index ff9301985002f..a2121305008ca 100644
--- a/projects/packages/backup/src/js/reducers/test/site-backup-size.js
+++ b/projects/packages/backup/src/js/reducers/test/site-backup-size.js
@@ -15,6 +15,7 @@ describe( 'reducer', () => {
 			minDaysOfBackupsAllowed: null,
 			daysOfBackupsAllowed: null,
 			daysOfBackupsSaved: null,
+			retentionDays: null,
 		},
 		fetchingState: {
 			isFetching: true,
@@ -23,6 +24,7 @@ describe( 'reducer', () => {
 			minDaysOfBackupsAllowed: null,
 			daysOfBackupsAllowed: null,
 			daysOfBackupsSaved: null,
+			retentionDays: null,
 		},
 		failedState: {
 			isFetching: false,
@@ -31,6 +33,7 @@ describe( 'reducer', () => {
 			minDaysOfBackupsAllowed: null,
 			daysOfBackupsAllowed: null,
 			daysOfBackupsSaved: null,
+			retentionDays: null,
 		},
 	};
 
@@ -55,6 +58,7 @@ describe( 'reducer', () => {
 						minDaysOfBackupsAllowed: 7,
 						daysOfBackupsAllowed: 30,
 						daysOfBackupsSaved: 24,
+						retentionDays: 7,
 					},
 				},
 				expected: {
@@ -64,6 +68,7 @@ describe( 'reducer', () => {
 					minDaysOfBackupsAllowed: 7,
 					daysOfBackupsAllowed: 30,
 					daysOfBackupsSaved: 24,
+					retentionDays: 7,
 				},
 			},
 			{
diff --git a/projects/packages/backup/src/js/selectors/site-backup.js b/projects/packages/backup/src/js/selectors/site-backup.js
index 649f5a5feecaf..4dde27efeb3b7 100644
--- a/projects/packages/backup/src/js/selectors/site-backup.js
+++ b/projects/packages/backup/src/js/selectors/site-backup.js
@@ -5,6 +5,7 @@ const siteBackupSelectors = {
 	getMinDaysOfBackupsAllowed: state => state.siteBackupSize.minDaysOfBackupsAllowed ?? null,
 	getDaysOfBackupsAllowed: state => state.siteBackupSize.daysOfBackupsAllowed ?? null,
 	getDaysOfBackupsSaved: state => state.siteBackupSize.daysOfBackupsSaved ?? null,
+	getBackupRetentionDays: state => state.siteBackupSize.retentionDays ?? null,
 
 	// Policies
 	isFetchingBackupPolicies: state => state.siteBackupPolicies.isFetching ?? null,
diff --git a/projects/packages/backup/src/js/selectors/test/site-backup-size.js b/projects/packages/backup/src/js/selectors/test/site-backup-size.js
index 383f44eecd5be..fbba438d2f2ca 100644
--- a/projects/packages/backup/src/js/selectors/test/site-backup-size.js
+++ b/projects/packages/backup/src/js/selectors/test/site-backup-size.js
@@ -14,6 +14,7 @@ describe( 'siteBackupSizeSelectors', () => {
 				minDaysOfBackupsAllowed: null,
 				daysOfBackupsAllowed: null,
 				daysOfBackupsSaved: null,
+				retentionDays: null,
 			},
 		},
 		fetchingState: {
@@ -24,6 +25,7 @@ describe( 'siteBackupSizeSelectors', () => {
 				minDaysOfBackupsAllowed: null,
 				daysOfBackupsAllowed: null,
 				daysOfBackupsSaved: null,
+				retentionDays: null,
 			},
 		},
 		failedState: {
@@ -34,6 +36,7 @@ describe( 'siteBackupSizeSelectors', () => {
 				minDaysOfBackupsAllowed: null,
 				daysOfBackupsAllowed: null,
 				daysOfBackupsSaved: null,
+				retentionDays: null,
 			},
 		},
 		successState: {
@@ -44,6 +47,7 @@ describe( 'siteBackupSizeSelectors', () => {
 				minDaysOfBackupsAllowed: 7,
 				daysOfBackupsAllowed: 30,
 				daysOfBackupsSaved: 24,
+				retentionDays: 7,
 			},
 		},
 	};
@@ -199,4 +203,35 @@ describe( 'siteBackupSizeSelectors', () => {
 			}
 		);
 	} );
+
+	describe( 'getBackupRetentionDays()', () => {
+		it.each( [
+			{
+				state: fixtures.emptyObject,
+				expected: null,
+			},
+			{
+				state: fixtures.initialState,
+				expected: null,
+			},
+			{
+				state: fixtures.fetchingState,
+				expected: null,
+			},
+			{
+				state: fixtures.failedState,
+				expected: null,
+			},
+			{
+				state: fixtures.successState,
+				expected: 7,
+			},
+		] )(
+			'should return getBackupRetentionDays value if passed, null otherwise',
+			( { state, expected } ) => {
+				const output = selectors.getBackupRetentionDays( state );
+				expect( output ).toBe( expected );
+			}
+		);
+	} );
 } );

From 9d711465c9853999accc334b817615e2baef8a2d Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Tue, 21 Feb 2023 07:21:36 +0100
Subject: [PATCH 46/51] Admin Page: use external icons for external links in
 support card (#29050)

---
 .../client/components/agencies-card/index.tsx |  4 +-
 .../client/components/support-card/index.jsx  | 41 ++++++++++---------
 .../fix-external-link-jetpack-support-card    |  4 ++
 3 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-external-link-jetpack-support-card

diff --git a/projects/plugins/jetpack/_inc/client/components/agencies-card/index.tsx b/projects/plugins/jetpack/_inc/client/components/agencies-card/index.tsx
index 80e578565eae3..aec671b2e1147 100644
--- a/projects/plugins/jetpack/_inc/client/components/agencies-card/index.tsx
+++ b/projects/plugins/jetpack/_inc/client/components/agencies-card/index.tsx
@@ -70,13 +70,13 @@ const AgenciesCard: FC< Props > = ( {
 				</Button>
 				<div className="jp-agencies-card__contact">
 					<h3 className="jp-agencies-card__header">
-						{ __( "Manage your clients' sites with ease", 'jetpack' ) }
+						{ __( 'Manage your clients’ sites with ease', 'jetpack' ) }
 					</h3>
 					<p className="jp-agencies-card__description">
 						{ sprintf(
 							/* translators: %s is the percentage discount the users get in the agencies portal */
 							__(
-								`Manage your clients' sites with ease and get a %s discount with the Jetpack licensing platform.`,
+								'Manage your clients’ sites with ease and get a %s discount with the Jetpack licensing platform.',
 								'jetpack'
 							),
 							`${ discountPercentage }%`
diff --git a/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
index a263dd3880417..d2a4309615f32 100644
--- a/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
@@ -1,4 +1,5 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import classNames from 'classnames';
 import Button from 'components/button';
@@ -76,7 +77,7 @@ class SupportCard extends React.Component {
 			<div className={ classes }>
 				<Card className="jp-support-card__happiness">
 					<div className="jp-support-card__happiness-contact">
-						<h3 className="jp-support-card__header">{ __( "We're here to help", 'jetpack' ) }</h3>
+						<h3 className="jp-support-card__header">{ __( 'We’re here to help', 'jetpack' ) }</h3>
 						<p className="jp-support-card__description">
 							{ hasSupport
 								? sprintf(
@@ -90,25 +91,27 @@ class SupportCard extends React.Component {
 								  ) }
 						</p>
 						<p className="jp-support-card__description">
-							<Button
-								onClick={ this.trackGettingStartedClick }
-								href={
-									this.props.isAtomicSite
-										? getRedirectUrl( 'calypso-help' )
-										: getRedirectUrl( 'jetpack-support-getting-started' )
-								}
-							>
-								{ __( 'Getting started with Jetpack', 'jetpack' ) }
+							<Button onClick={ this.trackGettingStartedClick }>
+								<ExternalLink
+									href={
+										this.props.isAtomicSite
+											? getRedirectUrl( 'calypso-help' )
+											: getRedirectUrl( 'jetpack-support-getting-started' )
+									}
+								>
+									{ __( 'Getting started with Jetpack', 'jetpack' ) }
+								</ExternalLink>
 							</Button>
-							<Button
-								onClick={ this.trackSearchClick }
-								href={
-									this.props.isAtomicSite
-										? getRedirectUrl( 'calypso-help' )
-										: getRedirectUrl( 'jetpack-support' )
-								}
-							>
-								{ __( 'Search our support site', 'jetpack' ) }
+							<Button onClick={ this.trackSearchClick }>
+								<ExternalLink
+									href={
+										this.props.isAtomicSite
+											? getRedirectUrl( 'calypso-help' )
+											: getRedirectUrl( 'jetpack-support' )
+									}
+								>
+									{ __( 'Search our support site', 'jetpack' ) }
+								</ExternalLink>
 							</Button>
 						</p>
 					</div>
diff --git a/projects/plugins/jetpack/changelog/fix-external-link-jetpack-support-card b/projects/plugins/jetpack/changelog/fix-external-link-jetpack-support-card
new file mode 100644
index 0000000000000..130fdcef797b5
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-external-link-jetpack-support-card
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Admin Page: use external icons for external links in support card.

From df0304df2309e866ce00ae7b5d32c3eeee464a26 Mon Sep 17 00:00:00 2001
From: Karen Attfield <karenlattfield@gmail.com>
Date: Tue, 21 Feb 2023 08:32:51 +0000
Subject: [PATCH 47/51] CRM: Composer and version updates in prep for the next
 release (#29029)

---
 projects/plugins/crm/CHANGELOG.md                         | 4 ++--
 projects/plugins/crm/ZeroBSCRM.php                        | 2 +-
 projects/plugins/crm/changelog/init-release-cycle#2       | 5 +++++
 .../plugins/crm/changelog/update-crm-next-alpha-version   | 5 +++++
 projects/plugins/crm/composer.json                        | 8 +++++---
 projects/plugins/crm/composer.lock                        | 2 +-
 projects/plugins/crm/package.json                         | 2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 projects/plugins/crm/changelog/init-release-cycle#2
 create mode 100644 projects/plugins/crm/changelog/update-crm-next-alpha-version

diff --git a/projects/plugins/crm/CHANGELOG.md b/projects/plugins/crm/CHANGELOG.md
index b4cee90b13bce..04f0eb700f3aa 100644
--- a/projects/plugins/crm/CHANGELOG.md
+++ b/projects/plugins/crm/CHANGELOG.md
@@ -5,7 +5,7 @@
 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.5.4-alpha] - 2023-02-15
+## [5.5.4-a.1] - 2023-02-15
 ### Added
 - adds the necessary migration to move all files that were inside the zbscrm-store folder with a flat struture to the new jpcrm-storage folder that uses a hierarchical structure [#28350]
 - Copy tests from old repo. [#28354]
@@ -59,4 +59,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved: Security around phone numbers viewing
 - Improved: Added a migration to remove outdated AKA lines
 
-[5.5.4-alpha]: https://github.com/Automattic/zero-bs-crm/compare/v5.5.3...v5.5.4-alpha
+[5.5.4-a.1]: https://github.com/Automattic/jetpack-crm/compare/v5.5.3...v5.5.4-a.1
diff --git a/projects/plugins/crm/ZeroBSCRM.php b/projects/plugins/crm/ZeroBSCRM.php
index 683b2477f6948..cc073986a16fa 100644
--- a/projects/plugins/crm/ZeroBSCRM.php
+++ b/projects/plugins/crm/ZeroBSCRM.php
@@ -3,7 +3,7 @@
  * Plugin Name: Jetpack CRM
  * Plugin URI: https://jetpackcrm.com
  * Description: Jetpack CRM is the simplest CRM for WordPress. Self host your own Customer Relationship Manager using WP.
- * Version: 5.5.5-alpha
+ * Version: 5.5.4-a.2
  * Author: Automattic - Jetpack CRM team
  * Author URI: https://jetpackcrm.com
  * Text Domain: zero-bs-crm
diff --git a/projects/plugins/crm/changelog/init-release-cycle#2 b/projects/plugins/crm/changelog/init-release-cycle#2
new file mode 100644
index 0000000000000..5e88f22ac8a0a
--- /dev/null
+++ b/projects/plugins/crm/changelog/init-release-cycle#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Init 5.5.4-a.2
+
+
diff --git a/projects/plugins/crm/changelog/update-crm-next-alpha-version b/projects/plugins/crm/changelog/update-crm-next-alpha-version
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/crm/changelog/update-crm-next-alpha-version
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/crm/composer.json b/projects/plugins/crm/composer.json
index add2ec6fbc369..d9d5b9e112bc3 100644
--- a/projects/plugins/crm/composer.json
+++ b/projects/plugins/crm/composer.json
@@ -37,7 +37,7 @@
 		"platform": {
 			"php": "7.3"
 		},
-		"autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ5_5_5_alpha",
+		"autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ5_5_4_a_2",
 		"allow-plugins": {
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
@@ -65,10 +65,12 @@
 		},
 		"autorelease": true,
 		"mirror-repo": "Automattic/jetpack-crm",
+		"dev-releases": true,
 		"changelogger": {
-			"link-template": "https://github.com/Automattic/zero-bs-crm/compare/v${old}...v${new}"
+			"link-template": "https://github.com/Automattic/jetpack-crm/compare/v${old}...v${new}"
 		},
 		"release-branch-prefix": "crm",
-		"wp-plugin-slug": "zero-bs-crm"
+		"wp-plugin-slug": "zero-bs-crm",
+		"wp-svn-autopublish": true
 	}
 }
diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock
index 0695838ff3854..8f94a30c7498b 100644
--- a/projects/plugins/crm/composer.lock
+++ b/projects/plugins/crm/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3e27168b59f27ffa476536c99520a818",
+    "content-hash": "e4211adecf939624fad89bc9151c2017",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
diff --git a/projects/plugins/crm/package.json b/projects/plugins/crm/package.json
index afa4b4e72112b..30b21a76652c2 100644
--- a/projects/plugins/crm/package.json
+++ b/projects/plugins/crm/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-crm",
-	"version": "5.5.5-alpha",
+	"version": "5.5.4-a.2",
 	"description": "The CRM for WordPress",
 	"author": "Automattic",
 	"license": "GPL-2.0",

From e192292ddf61e1bf8fe156f09c5623cfde463dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gergely=20M=C3=A1rk=20Juh=C3=A1sz?=
 <36671565+gmjuhasz@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:04:54 +0100
Subject: [PATCH 48/51] Add SIG feature flag check to use-publicize-config
 (#29001)

* Add check for social image generator is enabled

* changelog

* Remove editor.js

* Fixup versions

* Update changelogs

* Fixup versions

* remove accidental change

* Remove commit linting of other file
---
 .../add-social-image-generator-feature-flag   |  4 ++++
 .../publicize-components/package.json         |  2 +-
 .../src/hooks/use-publicize-config/index.js   |  1 +
 .../add-social-image-generator-feature-flag   |  4 ++++
 projects/packages/publicize/composer.json     |  2 +-
 projects/packages/publicize/package.json      |  2 +-
 .../publicize/src/class-publicize-base.php    | 16 ++++++++++++++++
 .../add-social-image-generator-feature-flag   |  4 ++++
 .../add-social-image-generator-feature-flag#2 |  5 +++++
 .../jetpack/class.jetpack-gutenberg.php       |  7 ++++---
 projects/plugins/jetpack/composer.lock        |  4 ++--
 .../add-social-image-generator-feature-flag   |  4 ++++
 .../add-social-image-generator-feature-flag#2 |  5 +++++
 projects/plugins/social/composer.json         |  2 +-
 projects/plugins/social/composer.lock         |  4 ++--
 projects/plugins/social/jetpack-social.php    |  2 +-
 .../social/src/class-jetpack-social.php       | 19 ++++++++++---------
 17 files changed, 66 insertions(+), 21 deletions(-)
 create mode 100644 projects/js-packages/publicize-components/changelog/add-social-image-generator-feature-flag
 create mode 100644 projects/packages/publicize/changelog/add-social-image-generator-feature-flag
 create mode 100644 projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag
 create mode 100644 projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag#2
 create mode 100644 projects/plugins/social/changelog/add-social-image-generator-feature-flag
 create mode 100644 projects/plugins/social/changelog/add-social-image-generator-feature-flag#2

diff --git a/projects/js-packages/publicize-components/changelog/add-social-image-generator-feature-flag b/projects/js-packages/publicize-components/changelog/add-social-image-generator-feature-flag
new file mode 100644
index 0000000000000..8604656b25c53
--- /dev/null
+++ b/projects/js-packages/publicize-components/changelog/add-social-image-generator-feature-flag
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add Social Image Generator feature flag to Jetpack Social
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
index 2ea217084c1a4..e9ee8d9b9d811 100644
--- a/projects/js-packages/publicize-components/package.json
+++ b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.16.1",
+	"version": "0.17.0-alpha",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {
diff --git a/projects/js-packages/publicize-components/src/hooks/use-publicize-config/index.js b/projects/js-packages/publicize-components/src/hooks/use-publicize-config/index.js
index acda548c91547..faca6b26e386c 100644
--- a/projects/js-packages/publicize-components/src/hooks/use-publicize-config/index.js
+++ b/projects/js-packages/publicize-components/src/hooks/use-publicize-config/index.js
@@ -94,6 +94,7 @@ export default function usePublicizeConfig() {
 		numberOfSharesRemaining: sharesData.shares_remaining,
 		hasPaidPlan: !! getJetpackData()?.social?.hasPaidPlan,
 		isEnhancedPublishingEnabled: !! getJetpackData()?.social?.isEnhancedPublishingEnabled,
+		isSocialImageGeneratorEnabled: !! getJetpackData()?.social?.isSocialImageGeneratorEnabled,
 		connectionsAdminUrl: connectionsRootUrl + getSiteFragment(),
 		adminUrl: getJetpackData()?.social?.adminUrl,
 	};
diff --git a/projects/packages/publicize/changelog/add-social-image-generator-feature-flag b/projects/packages/publicize/changelog/add-social-image-generator-feature-flag
new file mode 100644
index 0000000000000..8604656b25c53
--- /dev/null
+++ b/projects/packages/publicize/changelog/add-social-image-generator-feature-flag
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add Social Image Generator feature flag to Jetpack Social
diff --git a/projects/packages/publicize/composer.json b/projects/packages/publicize/composer.json
index 5a5439f02db26..c0e3822e34805 100644
--- a/projects/packages/publicize/composer.json
+++ b/projects/packages/publicize/composer.json
@@ -55,7 +55,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "0.19.x-dev"
+			"dev-trunk": "0.20.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
index 15bbe6488b37f..7abb6d08be2b1 100644
--- a/projects/packages/publicize/package.json
+++ b/projects/packages/publicize/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize",
-	"version": "0.19.5",
+	"version": "0.20.0-alpha",
 	"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme",
 	"bugs": {
diff --git a/projects/packages/publicize/src/class-publicize-base.php b/projects/packages/publicize/src/class-publicize-base.php
index b7abd570f9a70..c92b32b37e320 100644
--- a/projects/packages/publicize/src/class-publicize-base.php
+++ b/projects/packages/publicize/src/class-publicize-base.php
@@ -1567,6 +1567,22 @@ public function is_enhanced_publishing_enabled( $blog_id ) {
 		return ! empty( $data['is_enhanced_publishing_enabled'] );
 	}
 
+	/**
+	 * Check if the social image generator is enabled.
+	 *
+	 * @param int $blog_id The blog ID for the current blog.
+	 * @return bool
+	 */
+	public function is_social_image_generator_enabled( $blog_id ) {
+		$data = $this->get_api_data( $blog_id );
+
+		if ( empty( $data ) ) {
+			return false;
+		}
+
+		return ! empty( $data['is_social_image_generator_enabled'] );
+	}
+
 	/**
 	 * Call the WPCOM REST API to calculate the scheduled shares.
 	 *
diff --git a/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag b/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag
new file mode 100644
index 0000000000000..680b5ccc7d45d
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Add Social Image Generator feature flag to Jetpack Social
diff --git a/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag#2 b/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag#2
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-social-image-generator-feature-flag#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/class.jetpack-gutenberg.php b/projects/plugins/jetpack/class.jetpack-gutenberg.php
index b3ef0e2ebb236..8ee5b937e10fb 100644
--- a/projects/plugins/jetpack/class.jetpack-gutenberg.php
+++ b/projects/plugins/jetpack/class.jetpack-gutenberg.php
@@ -705,9 +705,10 @@ public static function enqueue_block_editor_assets() {
 		if ( Jetpack::is_module_active( 'publicize' ) && function_exists( 'publicize_init' ) ) {
 			$publicize               = publicize_init();
 			$initial_state['social'] = array(
-				'sharesData'                  => $publicize->get_publicize_shares_info( $blog_id ),
-				'hasPaidPlan'                 => $publicize->has_paid_plan(),
-				'isEnhancedPublishingEnabled' => $publicize->is_enhanced_publishing_enabled( $blog_id ),
+				'sharesData'                    => $publicize->get_publicize_shares_info( $blog_id ),
+				'hasPaidPlan'                   => $publicize->has_paid_plan(),
+				'isEnhancedPublishingEnabled'   => $publicize->is_enhanced_publishing_enabled( $blog_id ),
+				'isSocialImageGeneratorEnabled' => $publicize->is_social_image_generator_enabled( $blog_id ),
 			);
 		}
 
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 7ca9afa7aef26..8050c9780ad59 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -1758,7 +1758,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/publicize",
-                "reference": "d1d63872b7e42b99436423077f9de620cceacf65"
+                "reference": "85b040fdaf32308620cf7db7268d782e96815504"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1781,7 +1781,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "0.19.x-dev"
+                    "dev-trunk": "0.20.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/social/changelog/add-social-image-generator-feature-flag b/projects/plugins/social/changelog/add-social-image-generator-feature-flag
new file mode 100644
index 0000000000000..8604656b25c53
--- /dev/null
+++ b/projects/plugins/social/changelog/add-social-image-generator-feature-flag
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add Social Image Generator feature flag to Jetpack Social
diff --git a/projects/plugins/social/changelog/add-social-image-generator-feature-flag#2 b/projects/plugins/social/changelog/add-social-image-generator-feature-flag#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/add-social-image-generator-feature-flag#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json
index ca254e5af5fea..3512f62a3909f 100644
--- a/projects/plugins/social/composer.json
+++ b/projects/plugins/social/composer.json
@@ -78,6 +78,6 @@
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
 		},
-		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ1_7_1_alpha"
+		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ1_8_0_alpha"
 	}
 }
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index decfe503360aa..41d18573514a6 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -1012,7 +1012,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/publicize",
-                "reference": "d1d63872b7e42b99436423077f9de620cceacf65"
+                "reference": "85b040fdaf32308620cf7db7268d782e96815504"
             },
             "require": {
                 "automattic/jetpack-assets": "@dev",
@@ -1035,7 +1035,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "0.19.x-dev"
+                    "dev-trunk": "0.20.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php
index 1d6216306e265..8ed78c6897343 100644
--- a/projects/plugins/social/jetpack-social.php
+++ b/projects/plugins/social/jetpack-social.php
@@ -4,7 +4,7 @@
  * Plugin Name: Jetpack Social
  * Plugin URI: https://wordpress.org/plugins/jetpack-social
  * Description: Share your site’s posts on several social media networks automatically when you publish a new post.
- * Version: 1.7.1-alpha
+ * Version: 1.8.0-alpha
  * Author: Automattic - Jetpack Social team
  * Author URI: https://jetpack.com/social/
  * License: GPLv2 or later
diff --git a/projects/plugins/social/src/class-jetpack-social.php b/projects/plugins/social/src/class-jetpack-social.php
index 38f59bca38194..588844f12e0bb 100644
--- a/projects/plugins/social/src/class-jetpack-social.php
+++ b/projects/plugins/social/src/class-jetpack-social.php
@@ -296,17 +296,18 @@ class_exists( 'Jetpack' ) ||
 			array(
 				'siteFragment' => ( new Status() )->get_site_suffix(),
 				'social'       => array(
-					'adminUrl'                    => esc_url_raw( admin_url( 'admin.php?page=jetpack-social' ) ),
-					'sharesData'                  => $publicize->get_publicize_shares_info( Jetpack_Options::get_option( 'id' ) ),
-					'reviewRequestDismissed'      => self::is_review_request_dismissed(),
-					'dismissReviewRequestPath'    => '/jetpack/v4/social/review-dismiss',
-					'connectionRefreshPath'       => '/jetpack/v4/publicize/connection-test-results',
-					'resharePath'                 => '/jetpack/v4/publicize/{postId}',
-					'publicizeConnectionsUrl'     => esc_url_raw(
+					'adminUrl'                      => esc_url_raw( admin_url( 'admin.php?page=jetpack-social' ) ),
+					'sharesData'                    => $publicize->get_publicize_shares_info( Jetpack_Options::get_option( 'id' ) ),
+					'reviewRequestDismissed'        => self::is_review_request_dismissed(),
+					'dismissReviewRequestPath'      => '/jetpack/v4/social/review-dismiss',
+					'connectionRefreshPath'         => '/jetpack/v4/publicize/connection-test-results',
+					'resharePath'                   => '/jetpack/v4/publicize/{postId}',
+					'publicizeConnectionsUrl'       => esc_url_raw(
 						'https://jetpack.com/redirect/?source=jetpack-social-connections-block-editor&site='
 					),
-					'hasPaidPlan'                 => $publicize->has_paid_plan(),
-					'isEnhancedPublishingEnabled' => $publicize->is_enhanced_publishing_enabled( Jetpack_Options::get_option( 'id' ) ),
+					'hasPaidPlan'                   => $publicize->has_paid_plan(),
+					'isEnhancedPublishingEnabled'   => $publicize->is_enhanced_publishing_enabled( Jetpack_Options::get_option( 'id' ) ),
+					'isSocialImageGeneratorEnabled' => $publicize->is_social_image_generator_enabled( Jetpack_Options::get_option( 'id' ) ),
 				),
 			)
 		);

From 79574e3cfe46ff494363d74d199eee3efacee088 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Tue, 21 Feb 2023 12:30:37 +0100
Subject: [PATCH 49/51] Admin Page: use external link icon for jetpack app link
 in card (#29048)

---
 .../jetpack/_inc/client/components/apps-card/index.jsx       | 5 ++---
 .../jetpack/changelog/fix-external-link-jetpack-app-card     | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-external-link-jetpack-app-card

diff --git a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
index fdc705b7d3892..ebd321c093494 100644
--- a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
@@ -1,5 +1,6 @@
 import { imagePath } from 'constants/urls';
 import { getRedirectUrl } from '@automattic/jetpack-components';
+import { ExternalLink } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import classNames from 'classnames';
@@ -78,11 +79,9 @@ class AppsCard extends React.Component {
 					),
 					{
 						a: (
-							<a
+							<ExternalLink
 								className="jp-apps-card__link"
 								href={ getRedirectUrl( 'jetpack-plugin-dashboard-apps-card' ) }
-								rel="noopener noreferrer"
-								target="_blank"
 								onClick={ this.trackAppLinkClick }
 							/>
 						),
diff --git a/projects/plugins/jetpack/changelog/fix-external-link-jetpack-app-card b/projects/plugins/jetpack/changelog/fix-external-link-jetpack-app-card
new file mode 100644
index 0000000000000..ee4e8eb04d4cc
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-external-link-jetpack-app-card
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Admin Page: update link in Jetpack App card to include external link icon.

From ca78ea5d1d878122210db5ee539c0890d15a706d Mon Sep 17 00:00:00 2001
From: Brad Jorsch <anomiex@users.noreply.github.com>
Date: Tue, 21 Feb 2023 07:16:04 -0500
Subject: [PATCH 50/51] tools: Allow selecting more than one but not all
 plugins in create-release-branch.sh (#29058)

Turns out this is something we're going to be doing a lot, releasing
Jetpack and mu-wpcom-plugin but not Backup or Social. So now we can
either list multiple plugins on the command line or be prompted for each
candidate plugin if only one is supplied.

Also, update the bash version check to require 4.3 (released 9 years
ago) instead of just 4.0, as this uses "unset" which was introduced in
that version.
---
 tools/check-development-environment.sh   |  4 +-
 tools/create-release-branch.sh           | 60 +++++++++++++++++++-----
 tools/includes/check-osx-bash-version.sh |  4 +-
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/tools/check-development-environment.sh b/tools/check-development-environment.sh
index 0095504c735e4..089e2c3ea7ce2 100755
--- a/tools/check-development-environment.sh
+++ b/tools/check-development-environment.sh
@@ -137,10 +137,10 @@ echo "==========="
 echo ""
 
 checking 'Usable version of bash'
-if [[ -n "${BASH_VERSINFO}" && -n "${BASH_VERSINFO[0]}" && ${BASH_VERSINFO[0]} -ge 4 ]]; then
+if [[ -n "${BASH_VERSINFO}" && -n "${BASH_VERSINFO[0]}" && ( ${BASH_VERSINFO[0]} -gt 4 || ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -ge 3 ) ]]; then
 	success "ok (version $BASH_VERSION)"
 else
-	failure "too old" '' "Bash at $BASH is $BASH_VERSION. Version 4 or later is required." "If you're on Mac OS, you can install an updated version of bash with ${CS}brew install bash${CE}"
+	failure "too old" '' "Bash at $BASH is $BASH_VERSION. Version 4.3 or later is required." "If you're on Mac OS, you can install an updated version of bash with ${CS}brew install bash${CE}"
 fi
 
 checking "Standard tools are available"
diff --git a/tools/create-release-branch.sh b/tools/create-release-branch.sh
index 71be2070b0208..8968098c4eda8 100755
--- a/tools/create-release-branch.sh
+++ b/tools/create-release-branch.sh
@@ -14,12 +14,12 @@ BASE=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 # Instructions
 function usage {
 	cat <<-EOH
-		usage: $0 [options] <prefix|plugin> [<version>]
+		usage: $0 [options] <prefix|plugin...> [<version>]
 
 		Create a new release branch for the specified prefix or plugin.
-		The <prefix|plugin> should be a release branch prefix used by at least one
-		monorepo plugin, but may also be the name of a directory in projects/plugins/
-		or a path to a plugin directory or file.
+		The <prefix|plugin...> should be a release branch prefix used by at least one
+		monorepo plugin, but may also be the name of one or more directories in
+		projects/plugins/ or paths to plugin directories or files.
 
 		If no <version> is specified (and we're not non-interactive), you will be
 		prompted. You'll also be prompted if more than one plugin matches the prefix.
@@ -60,10 +60,19 @@ if $INTERACTIVE && [[ ! -t 0 ]]; then
 	debug "Input is not a terminal, forcing --non-interactive."
 	INTERACTIVE=false
 fi
-if [[ ${#ARGS[@]} -ne 1 && ${#ARGS[@]} -ne 2 ]]; then
+if [[ ${#ARGS[@]} -lt 1 ]]; then
 	usage
 fi
 
+VERARG=
+if [[ ${#ARGS[@]} -gt 1 ]]; then
+	normalize_version_number "${ARGS[-1]}"
+	if [[ "$NORMALIZED_VERSION" =~ ^[0-9]+(\.[0-9]+)+(-.*)?$ ]]; then
+		VERARG=${ARGS[-1]}
+		unset 'ARGS[-1]'
+	fi
+fi
+
 # Collect available prefixes
 declare -A PREFIXES
 TMP=$(jq -r '.extra["release-branch-prefix"] // empty | [ ., input_filename ] | @tsv' "$BASE"/projects/plugins/*/composer.json)
@@ -72,7 +81,7 @@ while IFS=$'\t' read -r prefix file; do
 done <<<"$TMP"
 
 # If <prefix|plugin> is a known prefix, use the corresponding plugins. Otherwise, process it as a plugin arg.
-if [[ -n "${PREFIXES[${ARGS[0]}]}" ]]; then
+if [[ ${#ARGS[@]} -eq 1 && -n "${PREFIXES[${ARGS[0]}]}" ]]; then
 	PREFIX=${ARGS[0]}
 	mapfile -t DIRS <<<"${PREFIXES[$PREFIX]}"
 else
@@ -84,14 +93,41 @@ else
 	fi
 	DIRS=( "$PLUGIN_DIR" )
 
-	if [[ "${PREFIXES[$PREFIX]}" == *$'\n'* ]]; then
+	if [[ ${#ARGS[@]} -gt 1 ]]; then
+		process_plugin_arg "${ARGS[0]}"
+		PLUGIN_NAME=$(jq --arg n "${ARGS[0]}" -r '.name // $n' "$PLUGIN_DIR/composer.json")
+		PREFIX=$(jq -r '.extra["release-branch-prefix"] // ""' "$PLUGIN_DIR/composer.json")
+		if [[ -z "$PREFIX" ]]; then
+			die "Plugin $PLUGIN_NAME does not have a release branch prefix defined in composer.json. Aborting."
+		fi
+		DIRS=( "$PLUGIN_DIR" )
+
+		for ARG in "${ARGS[@]:1}"; do
+			process_plugin_arg "$ARG"
+			PLUGIN_NAME2=$(jq --arg n "${ARGS[0]}" -r '.name // $n' "$PLUGIN_DIR/composer.json")
+			PREFIX2=$(jq -r '.extra["release-branch-prefix"] // ""' "$PLUGIN_DIR/composer.json")
+			if [[ "$PREFIX" != "$PREFIX2" ]]; then
+				die "Plugin $PLUGIN_NAME2 does not use the same prefix as $PLUGIN_NAME ($PREFIX != $PREFIX2). Aborting."
+			fi
+			DIRS+=( "$PLUGIN_DIR" )
+		done
+	elif [[ "${PREFIXES[$PREFIX]}" == *$'\n'* ]]; then
 		info "Plugin $PLUGIN_NAME uses prefix $PREFIX, which is used in multiple plugins:"
 		echo "   ${PREFIXES[$PREFIX]//$'\n'/$'\n   '}"
 		# shellcheck disable=SC2310
 		if proceed_p '' 'Release all these plugins?'; then
 			mapfile -t DIRS <<<"${PREFIXES[$PREFIX]}"
 		else
-			proceed_p ' ' "Release only $PLUGIN_NAME?"
+			mapfile -t ASK <<<"${PREFIXES[$PREFIX]}"
+			for DIR in "${ASK[@]}"; do
+				if [[ "$DIR" != "$PLUGIN_DIR" ]] && proceed_p ' ' "Release ${DIR#"$BASE/projects/"} too?"; then
+					DIRS+=( "$DIR" )
+				fi
+			done
+			echo ''
+			echo 'Selected plugins:'
+			printf "  %s\n" "${DIRS[@]}"
+			proceed_p '' "Release these plugins?"
 		fi
 	fi
 fi
@@ -154,13 +190,13 @@ function check_ver {
 	return 0
 }
 VERSIONS=()
-if [[ -n "${ARGS[1]}" && ${#DIRS[@]} -gt 1 ]]; then
+if [[ -n "$VERARG" && ${#DIRS[@]} -gt 1 ]]; then
 	debug "Ignoring specified version since more than one plugin matches."
-	ARGS[1]=
+	VERARG=
 fi
-if [[ -n "${ARGS[1]}" ]]; then
+if [[ -n "$VERARG" ]]; then
 	# Check the version.
-	check_ver "${ARGS[1]}" 0
+	check_ver "$VERARG" 0
 	info "Using version number $NORMALIZED_VERSION for plugin ${NAMES[0]}"
 	VERSIONS+=( "$NORMALIZED_VERSION" )
 else
diff --git a/tools/includes/check-osx-bash-version.sh b/tools/includes/check-osx-bash-version.sh
index d3fef5fb65735..428cab2a0fbb4 100644
--- a/tools/includes/check-osx-bash-version.sh
+++ b/tools/includes/check-osx-bash-version.sh
@@ -4,12 +4,12 @@
 # like the one above, because poor OS X users will have the new bash at
 # /usr/local/bin/bash instead of /bin/bash like the rest of the world expects.
 
-if [[ -z "${BASH_VERSINFO}" || -z "${BASH_VERSINFO[0]}" || ${BASH_VERSINFO[0]} -lt 4 ]]; then
+if [[ -z "${BASH_VERSINFO}" || -z "${BASH_VERSINFO[0]}" || ${BASH_VERSINFO[0]} -lt 4 || ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 3 ]]; then
 	. "$(dirname "$BASH_SOURCE[0]")/chalk-lite.sh"
 
 	[[ "$BASH_VERSION" ]] && V=" You have $BASH_VERSION." || V=
 	error <<-EOM
-		This script requires Bash version >= 4.$V
+		This script requires Bash version >= 4.3.$V
 
 		If you're on Mac OS, you can install an updated version of bash with
 		  brew install bash

From bc5e94b2649b0c093ec09375d93d3a680321e892 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Tue, 21 Feb 2023 13:22:13 +0100
Subject: [PATCH 51/51] Protect: remove example full path from UI (#29037)

---
 .../plugins/protect/changelog/fix-protect-example-standalone  | 4 ++++
 .../protect/src/js/components/standalone-mode-modal/index.jsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 projects/plugins/protect/changelog/fix-protect-example-standalone

diff --git a/projects/plugins/protect/changelog/fix-protect-example-standalone b/projects/plugins/protect/changelog/fix-protect-example-standalone
new file mode 100644
index 0000000000000..0d4fee6a164c4
--- /dev/null
+++ b/projects/plugins/protect/changelog/fix-protect-example-standalone
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Admin: remove example full path from example in UI
diff --git a/projects/plugins/protect/src/js/components/standalone-mode-modal/index.jsx b/projects/plugins/protect/src/js/components/standalone-mode-modal/index.jsx
index 16a3f29a752d7..520eed1fe28d2 100644
--- a/projects/plugins/protect/src/js/components/standalone-mode-modal/index.jsx
+++ b/projects/plugins/protect/src/js/components/standalone-mode-modal/index.jsx
@@ -20,7 +20,7 @@ const StandaloneModeModal = () => {
 					<Text variant={ 'body-small' }>
 						{ createInterpolateElement(
 							__(
-								'To ensure the firewall can best protect your site, please update: <mark>auto_prepend_file</mark> PHP directive to point to <mark>src/users/user66501445/public/wp-content/jetpack-waf/bootstrap.php</mark> Typically this is set either in an .htaccess file or in the global PHP configuration; contact your host for further assistance.',
+								'To ensure the firewall can best protect your site, please update: <mark>auto_prepend_file</mark> PHP directive to point to <mark>wp-content/jetpack-waf/bootstrap.php</mark> Typically this is set either in an .htaccess file or in the global PHP configuration; contact your host for further assistance.',
 								'jetpack-protect'
 							),
 							{