Merged in feature/117-dev-dev01 (pull request #8)

auto-patch  117-dev-dev01-2023-12-15T16_09_06

* auto-patch  117-dev-dev01-2023-12-15T16_09_06

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php

@@ -13,7 +13,7 @@ namespace Automattic\Jetpack\Admin_UI;
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.23';
+	const PACKAGE_VERSION = '0.2.25';
 
 	/**
 	 * Whether this class has been initialized
@@ -49,7 +49,7 @@ class Admin_Menu {
 	 * we use this method to move the menu item.
 	 */
 	private static function handle_akismet_menu() {
-		if ( ! class_exists( 'Jetpack' ) && class_exists( 'Akismet_Admin' ) ) {
+		if ( class_exists( 'Akismet_Admin' ) ) {
 			// Prevent Akismet from adding a menu item.
 			add_action(
 				'admin_menu',

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-connection/dist/tracks-callables.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'a96178e4d62fb695caa0');
+<?php return array('dependencies' => array(), 'version' => 'd9dbf909a3d10fb26f39');

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-connection/dist/tracks-callables.js

@@ -1 +1 @@
-!function(){var e={775:function(e){let n;window._tkq=window._tkq||[];const t=console.error;const o={initialize:function(e,n){o.setUser(e,n),o.identifyUser()},mc:{bumpStat:function(e,n){const t=function(e,n){let t="";if("object"==typeof e)for(const n in e)t+="&x_"+encodeURIComponent(n)+"="+encodeURIComponent(e[n]);else t="&x_"+encodeURIComponent(e)+"="+encodeURIComponent(n);return t}(e,n);(new Image).src=document.location.protocol+"//pixel.wp.com/g.gif?v=wpcom-no-pv"+t+"&t="+Math.random()}},tracks:{recordEvent:function(e,n){n=n||{},0===e.indexOf("jetpack_")?window._tkq.push(["recordEvent",e,n]):t('- Event name must be prefixed by "jetpack_"')},recordPageView:function(e){o.tracks.recordEvent("jetpack_page_view",{path:e})}},setUser:function(e,t){n={ID:e,username:t}},identifyUser:function(){n&&window._tkq.push(["identifyUser",n.ID,n.username])},clearedIdentity:function(){window._tkq.push(["clearIdentity"])}};e.exports=o}},n={};var t=function t(o){var r=n[o];if(void 0!==r)return r.exports;var i=n[o]={exports:{}};return e[o](i,i.exports,t),i.exports}(775);window.analytics=t}();
+(()=>{var e={775:e=>{let n;window._tkq=window._tkq||[];const t=console.error;const o={initialize:function(e,n){o.setUser(e,n),o.identifyUser()},mc:{bumpStat:function(e,n){const t=function(e,n){let t="";if("object"==typeof e)for(const n in e)t+="&x_"+encodeURIComponent(n)+"="+encodeURIComponent(e[n]);else t="&x_"+encodeURIComponent(e)+"="+encodeURIComponent(n);return t}(e,n);(new Image).src=document.location.protocol+"//pixel.wp.com/g.gif?v=wpcom-no-pv"+t+"&t="+Math.random()}},tracks:{recordEvent:function(e,n){n=n||{},0===e.indexOf("jetpack_")?window._tkq.push(["recordEvent",e,n]):t('- Event name must be prefixed by "jetpack_"')},recordPageView:function(e){o.tracks.recordEvent("jetpack_page_view",{path:e})}},setUser:function(e,t){n={ID:e,username:t}},identifyUser:function(){n&&window._tkq.push(["identifyUser",n.ID,n.username])},clearedIdentity:function(){window._tkq.push(["clearIdentity"])}};e.exports=o}},n={};var t=function t(o){var r=n[o];if(void 0!==r)return r.exports;var i=n[o]={exports:{}};return e[o](i,i.exports,t),i.exports}(775);window.analytics=t})();

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-connection/src/class-manager.php

@@ -1916,6 +1916,7 @@ class Manager {
 				'site_created'          => $this->get_assumed_site_creation_date(),
 				'allow_site_connection' => ! $this->has_connected_owner(),
 				'calypso_env'           => ( new Host() )->get_calypso_env(),
+				'source'                => ( new Host() )->get_source_query(),
 			)
 		);
 
@@ -2558,4 +2559,18 @@ class Manager {
 		}
 		return (int) $site_id;
 	}
+
+	/**
+	 * Check if Jetpack is ready for uninstall cleanup.
+	 *
+	 * @param string $current_plugin_slug The current plugin's slug.
+	 *
+	 * @return bool
+	 */
+	public static function is_ready_for_cleanup( $current_plugin_slug ) {
+		$active_plugins = get_option( Plugin_Storage::ACTIVE_PLUGINS_OPTION_NAME );
+
+		return empty( $active_plugins ) || ! is_array( $active_plugins )
+			|| ( count( $active_plugins ) === 1 && array_key_exists( $current_plugin_slug, $active_plugins ) );
+	}
 }

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-connection/src/class-package-version.php

@@ -12,7 +12,7 @@ namespace Automattic\Jetpack\Connection;
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.58.1';
+	const PACKAGE_VERSION = '1.60.1';
 
 	const PACKAGE_SLUG = 'connection';
 

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-connection/src/class-urls.php

@@ -90,6 +90,7 @@ class Urls {
 		$option_key = self::HTTPS_CHECK_OPTION_PREFIX . $callable;
 
 		$parsed_url = wp_parse_url( $new_value );
+
 		if ( ! $parsed_url ) {
 			return $new_value;
 		}
@@ -98,7 +99,12 @@ class Urls {
 		} else {
 			$scheme = '';
 		}
-		$scheme_history   = get_option( $option_key, array() );
+		$scheme_history = get_option( $option_key, array() );
+
+		if ( ! is_array( $scheme_history ) ) {
+			$scheme_history = array();
+		}
+
 		$scheme_history[] = $scheme;
 
 		// Limit length to self::HTTPS_CHECK_HISTORY.

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/vendor/automattic/jetpack-status/src/class-host.php

@@ -119,4 +119,19 @@ class Host {
 
 		return '';
 	}
+
+	/**
+	 * Return source query param value from the URL if exists in the allowed sources list.
+	 *
+	 * @return string "source" query param value
+	 */
+	public function get_source_query() {
+		// phpcs:disable WordPress.Security.NonceVerification.Recommended
+		$allowed_sources = array( 'jetpack-manage' );
+		if ( isset( $_GET['source'] ) && in_array( $_GET['source'], $allowed_sources, true ) ) {
+			return sanitize_key( $_GET['source'] );
+		}
+
+		return '';
+	}
 }