Merge branch 'main' into develop.

google · Feb 21, 2024 · fd50e25 · fd50e25
2 parents 5e33079 + 1a5240e
commit fd50e25
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 47 deletions.
diff --git a/assets/js/components/KeyMetrics/key-metrics-widgets.js b/assets/js/components/KeyMetrics/key-metrics-widgets.js
@@ -60,7 +60,7 @@ import { isFeatureEnabled } from '../../features';
  *
  * For view-only dashboards, the widget will only be displayed if both modules are linked.
  *
- * @since n.e.x.t
+ * @since 1.121.0
  *
  * @param {Function} select              Data store select function.
  * @param {boolean}  isViewOnlyDashboard Whether the current dashboard is view only.

diff --git a/assets/js/googlesitekit/datastore/user/prompts.js b/assets/js/googlesitekit/datastore/user/prompts.js
@@ -76,7 +76,7 @@ const baseActions = {
 	/**
 	 * Dismisses the given prompt by slug.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {string} slug                       Prompt slug to dismiss.
 	 * @param {Object} options                    Dismiss prompt options.
@@ -118,7 +118,7 @@ const baseSelectors = {
 	/**
 	 * Gets the list of dismissed prompts.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state Data store's state.
 	 * @return {(string[]|undefined)} Array of dismissed prompt keys, `undefined` if there are none.
@@ -143,7 +143,7 @@ const baseSelectors = {
 	/**
 	 * Gets the count of a dismissed prompt.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state Data store's state.
 	 * @param {string} slug  Prompt slug.
@@ -160,7 +160,7 @@ const baseSelectors = {
 	/**
 	 * Determines whether the prompt is dismissed or not.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state Data store's state.
 	 * @param {string} slug  Prompt slug.
@@ -175,7 +175,7 @@ const baseSelectors = {
 	/**
 	 * Checks whether or not the prompt is being dismissed for the given slug.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state Data store's state.
 	 * @param {string} slug  Prompt slug.

diff --git a/assets/js/modules/analytics-4/utils/validation.js b/assets/js/modules/analytics-4/utils/validation.js
@@ -52,7 +52,7 @@ export function isValidAccountSelection( value ) {
  * Checks if the given account ID appears to be a valid Analytics account.
  *
  * @since 1.8.0
- * @since n.e.x.t Migrated from analytics to analytics-4.
+ * @since 1.121.0 Migrated from analytics to analytics-4.
  *
  * @param {(string|number)} accountID Account ID to test.
  * @return {boolean} Whether or not the given account ID is valid.
@@ -174,7 +174,7 @@ export function isValidGoogleTagContainerID( googleTagContainerID ) {
 /** Checks if the given ads conversion ID is valid.
  *
  * @since 1.32.0
- * @since n.e.x.t Migrated from analytics to analytics-4.
+ * @since 1.121.0 Migrated from analytics to analytics-4.
  *
  * @param {*} value Conversion ID to test.
  * @return {boolean} Whether or not the given ID is valid.

diff --git a/assets/js/modules/tagmanager/datastore/versions.js b/assets/js/modules/tagmanager/datastore/versions.js
@@ -233,7 +233,7 @@ const baseSelectors = {
 	/**
 	 * Gets the first Google Tag object within the current live container for the given account and internal container ID.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state               Data store's state.
 	 * @param {string} accountID           Account ID the container belongs to.
@@ -266,7 +266,7 @@ const baseSelectors = {
 	/**
 	 * Gets the first Google Tag ID within the live container for the given account and container ID.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param {Object} state               Data store's state.
 	 * @param {string} accountID           Account ID the container belongs to.
@@ -318,7 +318,7 @@ const baseSelectors = {
 	/**
 	 * Gets a Google Tag ID, if any, for the currently selected GTM account and container.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return {(string|null|undefined)} Google Tag ID string, or `null` if none, or `undefined` if not fully loaded.
 	 */

diff --git a/google-site-kit.php b/google-site-kit.php
@@ -11,7 +11,7 @@
  * Plugin Name:       Site Kit by Google
  * Plugin URI:        https://sitekit.withgoogle.com
  * Description:       Site Kit is a one-stop solution for WordPress users to use everything Google has to offer to make them successful on the web.
- * Version:           1.120.0
+ * Version:           1.121.0
  * Requires at least: 5.2
  * Requires PHP:      5.6
  * Author:            Google
@@ -26,7 +26,7 @@
 }
 
 // Define most essential constants.
-define( 'GOOGLESITEKIT_VERSION', '1.120.0' );
+define( 'GOOGLESITEKIT_VERSION', '1.121.0' );
 define( 'GOOGLESITEKIT_PLUGIN_MAIN_FILE', __FILE__ );
 define( 'GOOGLESITEKIT_PHP_MINIMUM', '5.6.0' );
 define( 'GOOGLESITEKIT_WP_MINIMUM', '5.2.0' );

diff --git a/includes/Core/Prompts/Dismissed_Prompts.php b/includes/Core/Prompts/Dismissed_Prompts.php
@@ -15,7 +15,7 @@
 /**
  * Class for representing a user's dismissed prompts.
  *
- * @since n.e.x.t
+ * @since 1.121.0
  * @access private
  * @ignore
  */
@@ -33,7 +33,7 @@ class Dismissed_Prompts extends User_Setting {
 	/**
 	 * Adds one prompt to the list of dismissed prompts or updates the triggered count.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param string $prompt             Prompt to dismiss.
 	 * @param int    $expires_in_seconds TTL for the prompt.
@@ -57,7 +57,7 @@ public function add( $prompt, $expires_in_seconds = self::DISMISS_PROMPT_PERMANE
 	/**
 	 * Removes one or more prompts from the list of dismissed prompts.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param string $prompt Item to remove.
 	 */
@@ -77,7 +77,7 @@ public function remove( $prompt ) {
 	/**
 	 * Gets the value of the setting.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return array Value set for the option, or default if not set.
 	 */
@@ -89,7 +89,7 @@ public function get() {
 	/**
 	 * Gets the expected value type.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return string The type name.
 	 */
@@ -100,7 +100,7 @@ protected function get_type() {
 	/**
 	 * Gets the default value.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return array The default value.
 	 */
@@ -111,7 +111,7 @@ protected function get_default() {
 	/**
 	 * Gets the callback for sanitizing the setting's value before saving.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return callable Sanitize callback.
 	 */

diff --git a/includes/Core/Prompts/Prompts.php b/includes/Core/Prompts/Prompts.php
@@ -16,7 +16,7 @@
 /**
  * Class for handling prompts.
  *
- * @since n.e.x.t
+ * @since 1.121.0
  * @access private
  * @ignore
  */
@@ -25,23 +25,23 @@ class Prompts {
 	/**
 	 * Dismissed_Prompts instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 * @var Dismissed_Prompts
 	 */
 	protected $dismissed_prompts;
 
 	/**
 	 * REST_Prompts_Controller instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 * @var REST_Prompts_Controller
 	 */
 	protected $rest_controller;
 
 	/**
 	 * Constructor.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param Context      $context Plugin context.
 	 * @param User_Options $user_options Optional. User option API. Default is a new instance.
@@ -54,7 +54,7 @@ public function __construct( Context $context, User_Options $user_options = null
 	/**
 	 * Gets the reference to the Dismissed_Prompts instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return Dismissed_Prompts An instance of the Dismissed_Prompts class.
 	 */
@@ -65,7 +65,7 @@ public function get_dismissed_prompts() {
 	/**
 	 * Registers functionality through WordPress hooks.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 */
 	public function register() {
 		$this->dismissed_prompts->register();

diff --git a/includes/Core/Prompts/REST_Prompts_Controller.php b/includes/Core/Prompts/REST_Prompts_Controller.php
@@ -21,7 +21,7 @@
 /**
  * Class for handling dismissed prompts rest routes.
  *
- * @since n.e.x.t
+ * @since 1.121.0
  * @access private
  * @ignore
  */
@@ -30,15 +30,15 @@ class REST_Prompts_Controller {
 	/**
 	 * Dismissed_Prompts instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 * @var Dismissed_Prompts
 	 */
 	protected $dismissed_prompts;
 
 	/**
 	 * Constructor.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @param Dismissed_Prompts $dismissed_prompts Dismissed prompts instance.
 	 */
@@ -49,7 +49,7 @@ public function __construct( Dismissed_Prompts $dismissed_prompts ) {
 	/**
 	 * Registers functionality through WordPress hooks.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 */
 	public function register() {
 		add_filter(
@@ -75,7 +75,7 @@ function ( $paths ) {
 	/**
 	 * Gets REST route instances.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return REST_Route[] List of REST_Route objects.
 	 */

diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php
@@ -1135,7 +1135,7 @@ protected function reset_analytics_adsense_linked_settings() {
 	/**
 	 * Resets the Ad Blocking Recovery notification.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 */
 	public function reset_ad_blocking_recovery_notification() {
 		$dismissed_prompts = ( new Dismissed_Prompts( $this->user_options ) );

diff --git a/includes/Modules/Ads.php b/includes/Modules/Ads.php
@@ -15,7 +15,7 @@
 /**
  * Class representing the Ads module.
  *
- * @since n.e.x.t
+ * @since 1.121.0
  * @access private
  * @ignore
  */
@@ -29,14 +29,14 @@ final class Ads extends Module {
 	/**
 	 * Registers functionality through WordPress hooks.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 */
 	public function register() {}
 
 	/**
 	 * Sets up information about the module.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return array Associative array of module info.
 	 */

diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
@@ -132,7 +132,7 @@ function( $old_value, $new_value ) {
 	/**
 	 * Gets Module public name.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return string Formatted module name.
 	 */

diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
@@ -336,7 +336,7 @@ public function on_deactivation() {
 	/**
 	 * Checks whether the AdSense module is connected.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.121.0
 	 *
 	 * @return bool True if AdSense is connected, false otherwise.
 	 */
@@ -596,7 +596,7 @@ private function create_webdatastream( $property_id, $options = array() ) {
 	 * E.g. via Tag Manager, etc.
 	 *
 	 * @since 1.5.0
-	 * @since n.e.x.t Migrated from the Analytics (UA) class and adapted to only work for GA4 properties.
+	 * @since 1.121.0 Migrated from the Analytics (UA) class and adapted to only work for GA4 properties.
 	 * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/user-opt-out
 	 */
 	private function print_tracking_opt_out() {
@@ -631,7 +631,7 @@ private function print_tracking_opt_out() {
 	 * Checks whether or not tracking snippet should be contextually disabled for this request.
 	 *
 	 * @since 1.1.0
-	 * @since n.e.x.t Migrated here from the Analytics (UA) class.
+	 * @since 1.121.0 Migrated here from the Analytics (UA) class.
 	 *
 	 * @return bool
 	 */
@@ -664,7 +664,7 @@ protected function is_tracking_disabled() {
 	 *
 	 * @since 1.9.0
 	 * @since 1.98.0 Extended to handle callback from Admin API (no UA entities).
-	 * @since n.e.x.t Migrated method from original Analytics class to Analytics_4 class.
+	 * @since 1.121.0 Migrated method from original Analytics class to Analytics_4 class.
 	 */
 	protected function handle_provisioning_callback() {
 		if ( defined( 'WP_CLI' ) && WP_CLI ) {

diff --git a/includes/Modules/Analytics_4/Advanced_Tracking.php b/includes/Modules/Analytics_4/Advanced_Tracking.php
@@ -21,7 +21,7 @@
  * Class for Google Analytics Advanced Event Tracking.
  *
  * @since 1.18.0.
- * @since n.e.x.t Migrated from the Analytics (UA) namespace.
+ * @since 1.121.0 Migrated from the Analytics (UA) namespace.
  * @access private
  * @ignore
  */

diff --git a/includes/Modules/Analytics_4/Advanced_Tracking/AMP_Config_Injector.php b/includes/Modules/Analytics_4/Advanced_Tracking/AMP_Config_Injector.php
@@ -23,7 +23,7 @@ final class AMP_Config_Injector {
 	 * Creates list of measurement event configurations and javascript to inject.
 	 *
 	 * @since 1.18.0.
-	 * @since n.e.x.t Migrated from the Analytics (UA) namespace.
+	 * @since 1.121.0 Migrated from the Analytics (UA) namespace.
 	 *
 	 * @param array $gtag_amp_opt gtag config options for AMP.
 	 * @param array $events       The map of Event objects, keyed by their unique ID.

diff --git a/includes/Modules/Analytics_4/Advanced_Tracking/Event.php b/includes/Modules/Analytics_4/Advanced_Tracking/Event.php
@@ -16,7 +16,7 @@
  * Class for representing a single tracking event that Advanced_Tracking tracks.
  *
  * @since 1.18.0.
- * @since n.e.x.t Migrated from the Analytics (UA) namespace.
+ * @since 1.121.0 Migrated from the Analytics (UA) namespace.
  * @access private
  * @ignore
  */

diff --git a/includes/Modules/Analytics_4/Advanced_Tracking/Event_List.php b/includes/Modules/Analytics_4/Advanced_Tracking/Event_List.php
@@ -14,7 +14,7 @@
  * Base class representing a tracking event list.
  *
  * @since 1.18.0.
- * @since n.e.x.t Migrated from the Analytics (UA) namespace.
+ * @since 1.121.0 Migrated from the Analytics (UA) namespace.
  * @access private
  * @ignore
  */