Limited Global Styles: Port feature from ETK to jetpack-mu-wpcom

.phan/config.base.php

@@ -63,6 +63,7 @@ function make_phan_config( $dir, $options = array() ) {
 	$extra_stubs    = array();
 	$global_stubs   = array();
 	$internal_stubs = array();
+
 	foreach ( array_merge( $options['stubs'], $options['+stubs'] ) as $stub ) {
 		switch ( $stub ) {
 			case 'akismet':
@@ -104,6 +105,7 @@ function make_phan_config( $dir, $options = array() ) {
 				$stubs[] = "$root/.phan/stubs/wpcom-stubs.php";
 				if ( $dir !== "$root/projects/plugins/wpcomsh" ) {
 					$extra_stubs[] = "$root/projects/plugins/wpcomsh/feature-plugins/nav-redesign.php";
+					$extra_stubs[] = "$root/projects/plugins/wpcomsh/feature-plugins/masterbar.php";
 					$extra_stubs[] = "$root/projects/plugins/wpcomsh/footer-credit/footer-credit/customizer.php";
 					$extra_stubs[] = "$root/projects/plugins/wpcomsh/footer-credit/theme-optimizations.php";
 					$extra_stubs[] = "$root/projects/plugins/wpcomsh/lib/require-lib.php";

.phan/stubs/akismet-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from Akismet 5.3.2
+ * Stubs automatically generated from Akismet 5.3.3
  * using the definition file `tools/stubs/akismet-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/amp-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from AMP 2.5.3 and AMP for WP 1.0.96.1
+ * Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.96.1
  * using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/full-site-editing-stubs.php

@@ -1,55 +1,31 @@
 <?php
 /**
- * Stubs automatically generated from WordPress.com Editing Toolkit 4.27610
+ * Stubs automatically generated from WordPress.com Editing Toolkit 4.28277
  * using the definition file `tools/stubs/full-site-editing-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
  */
 
-namespace {
-    /**
-     * Limit Global Styles on WP.com to paid plans.
-     *
-     * @package full-site-editing-plugin
-     */
-    /**
-     * Checks if Global Styles should be limited on the given site.
-     *
-     * @param  int $blog_id Blog ID.
-     * @return bool Whether Global Styles are limited.
-     */
-    function wpcom_should_limit_global_styles($blog_id = 0)
-    {
-    }
-    /**
-     * Checks if the current blog has custom styles in use.
-     *
-     * @return bool Returns true if custom styles are in use.
-     */
-    function wpcom_global_styles_in_use()
-    {
-    }
+namespace A8C\FSE;
+
+/**
+ * Whether or not FSE is active.
+ * If false, FSE functionality should be disabled.
+ *
+ * @returns bool True if FSE is active, false otherwise.
+ * @phan-return mixed Dummy doc for stub.
+ */
+function is_full_site_editing_active()
+{
 }
-namespace A8C\FSE {
-    /**
-     * Whether or not FSE is active.
-     * If false, FSE functionality should be disabled.
-     *
-     * @returns bool True if FSE is active, false otherwise.
-     * @phan-return mixed Dummy doc for stub.
-     */
-    function is_full_site_editing_active()
-    {
-    }
-    /**
-     * Whether or not the site is eligible for FSE. This is essentially a feature
-     * gate to disable FSE on some sites which could theoretically otherwise use it.
-     *
-     * By default, sites should not be eligible.
-     *
-     * @return bool True if current site is eligible for FSE, false otherwise.
-     */
-    function is_site_eligible_for_full_site_editing()
-    {
-    }
+/**
+ * Whether or not the site is eligible for FSE. This is essentially a feature
+ * gate to disable FSE on some sites which could theoretically otherwise use it.
+ *
+ * By default, sites should not be eligible.
+ *
+ * @return bool True if current site is eligible for FSE, false otherwise.
+ */
+function is_site_eligible_for_full_site_editing()
+{
 }

.phan/stubs/phpunit-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from PHPUnit 9.6.19
+ * Stubs automatically generated from PHPUnit 9.6.20
  * using the definition file `tools/stubs/phpunit-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/woocommerce-internal-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooCommerce 9.0.2
+ * Stubs automatically generated from WooCommerce 9.1.1
  * using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/woocommerce-payments-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooPayments 7.8.1
+ * Stubs automatically generated from WooPayments 7.9.1
  * using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

projects/packages/jetpack-mu-wpcom/changelog/add-wpcom-global-styles

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Limited Global Styles: Port feature from ETK

projects/packages/jetpack-mu-wpcom/composer.json

@@ -62,7 +62,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.45.x-dev"
+			"dev-trunk": "5.46.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

projects/packages/jetpack-mu-wpcom/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.45.0",
+	"version": "5.46.0-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": {
@@ -51,12 +51,14 @@
 		"@automattic/typography": "1.0.0",
 		"@preact/signals": "^1.2.2",
 		"@sentry/browser": "7.80.1",
+		"@tanstack/react-query": "^5.15.5",
 		"@wordpress/api-fetch": "7.2.0",
 		"@wordpress/base-styles": "5.2.0",
 		"@wordpress/blocks": "13.2.0",
 		"@wordpress/components": "28.2.0",
 		"@wordpress/data": "10.2.0",
 		"@wordpress/dom-ready": "^4.0.0",
+		"@wordpress/element": "6.2.0",
 		"@wordpress/hooks": "4.2.0",
 		"@wordpress/i18n": "5.2.0",
 		"@wordpress/plugins": "7.2.0",

projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.45.0';
+	const PACKAGE_VERSION = '5.46.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;
@@ -160,6 +160,7 @@ public static function load_etk_features() {
 		require_once __DIR__ . '/features/wpcom-blocks/event-countdown/event-countdown.php';
 		require_once __DIR__ . '/features/wpcom-blocks/timeline/timeline.php';
 		require_once __DIR__ . '/features/wpcom-documentation-links/wpcom-documentation-links.php';
+		require_once __DIR__ . '/features/wpcom-global-styles/index.php';
 		require_once __DIR__ . '/features/wpcom-whats-new/wpcom-whats-new.php';
 	}
 

projects/packages/jetpack-mu-wpcom/src/common/index.php

@@ -8,6 +8,12 @@
 
 namespace Automattic\Jetpack\Jetpack_Mu_Wpcom\Common;
 
+use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
+use Automattic\Jetpack\Status;
+use Automattic\Jetpack\Terms_Of_Service;
+use Automattic\Jetpack\Tracking;
+
 /**
  * Returns ISO 639 conforming locale string.
  *
@@ -39,3 +45,21 @@ function determine_iso_639_locale() {
 	$locale = get_user_locale();
 	return get_iso_639_locale( $locale );
 }
+
+/**
+ * Enqueue the tracking scripts for the given script handle.
+ *
+ * @param string $handle A script handle.
+ */
+function wpcom_enqueue_tracking_scripts( string $handle ) {
+	Connection_Initial_State::render_script( $handle );
+
+	$status            = new Status();
+	$connection        = new Connection_Manager();
+	$tracking          = new Tracking( 'jetpack-mu-wpcom', $connection );
+	$can_use_analytics = $tracking->should_enable_tracking( new Terms_Of_Service(), $status );
+
+	if ( $can_use_analytics ) {
+		Tracking::register_tracks_functions_scripts( true );
+	}
+}

projects/packages/jetpack-mu-wpcom/src/common/tracks.js

@@ -0,0 +1,27 @@
+/* global JP_CONNECTION_INITIAL_STATE */
+
+export const wpcomTrackEvent = (
+	eventName,
+	eventProperties = {},
+	eventUserId = null,
+	eventUsername = null
+) => {
+	const currentUser = JP_CONNECTION_INITIAL_STATE?.userConnectionData?.currentUser ?? {};
+
+	const userId = eventUserId ?? currentUser.id;
+	const username = eventUsername ?? currentUser.username;
+	const blogId = eventProperties.blogId ?? currentUser.blogId;
+
+	window._tkq = window._tkq || [];
+	if ( username && userId ) {
+		window._tkq.push( [ 'identifyUser', userId, username ] );
+	}
+	window._tkq.push( [
+		'recordEvent',
+		eventName,
+		{
+			...eventProperties,
+			blog_id: blogId,
+		},
+	] );
+};

projects/packages/jetpack-mu-wpcom/src/features/tags-education/tags-education.php

@@ -5,12 +5,8 @@
  * @package automattic/jetpack-mu-wpcom
  */
 
-use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
-use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Jetpack_Mu_Wpcom;
-use Automattic\Jetpack\Status;
-use Automattic\Jetpack\Terms_Of_Service;
-use Automattic\Jetpack\Tracking;
+use Automattic\Jetpack\Jetpack_Mu_Wpcom\Common;
 
 define( 'MU_WPCOM_TAGS_EDUCATION', true );
 
@@ -34,16 +30,7 @@ function wpcom_enqueue_tags_education_assets() {
 		array( 'actionText' => __( 'Build your audience with tags', 'jetpack-mu-wpcom' ) )
 	);
 
-	Connection_Initial_State::render_script( 'wpcom-tags-education-script' );
-
-	$status            = new Status();
-	$connection        = new Connection_Manager();
-	$tracking          = new Tracking( 'jetpack-mu-wpcom', $connection );
-	$can_use_analytics = $tracking->should_enable_tracking( new Terms_Of_Service(), $status );
-
-	if ( $can_use_analytics ) {
-		Tracking::register_tracks_functions_scripts( true );
-	}
+	Common\wpcom_enqueue_tracking_scripts( 'wpcom-tags-education-script' );
 }
 
 add_action( 'enqueue_block_editor_assets', 'wpcom_enqueue_tags_education_assets', 100 );

projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-description-links/wpcom-block-description-links.php

@@ -5,12 +5,8 @@
  * @package automattic/jetpack-mu-wpcom
  */
 
-use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
-use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Jetpack_Mu_Wpcom;
-use Automattic\Jetpack\Status;
-use Automattic\Jetpack\Terms_Of_Service;
-use Automattic\Jetpack\Tracking;
+use Automattic\Jetpack\Jetpack_Mu_Wpcom\Common;
 
 define( 'MU_WPCOM_BLOCK_DESCRIPTION_LINKS', true );
 
@@ -28,16 +24,7 @@ function wpcom_enqueue_block_description_links_assets() {
 		true
 	);
 
-	Connection_Initial_State::render_script( 'wpcom-block-description-links-script' );
-
-	$status            = new Status();
-	$connection        = new Connection_Manager();
-	$tracking          = new Tracking( 'jetpack-mu-wpcom', $connection );
-	$can_use_analytics = $tracking->should_enable_tracking( new Terms_Of_Service(), $status );
-
-	if ( $can_use_analytics ) {
-		Tracking::register_tracks_functions_scripts( true );
-	}
+	Common\wpcom_enqueue_tracking_scripts( 'wpcom-block-description-links-script' );
 }
 
 add_action( 'enqueue_block_editor_assets', 'wpcom_enqueue_block_description_links_assets', 100 );

projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/README.md

@@ -0,0 +1,9 @@
+# WP.com Global Styles
+
+Functionality that limits the Global Styles feature on WordPress.com sites to paid plans.
+
+## Highlights
+
+- The site editor displays a modal after opening the Global Styles panel to alert customers that it is a paid feature.
+- When the site's plan isn't a paid plan we will override the Global Styles loaded and will return the default Global Styles for the active theme.
+- The pre-save panel of the site editor displays a notice to alert customers that any Global Styles change won't be public.