Merge branch 'main' into develop.

google · Jun 26, 2024 · 9d806a5 · 9d806a5
2 parents ebed6cd + 3a678be
commit 9d806a5
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 55 deletions.
diff --git a/assets/js/googlesitekit/data/index.js b/assets/js/googlesitekit/data/index.js
@@ -54,7 +54,7 @@ import { createReducer } from './create-reducer';
  * access parts of the registry.
  *
  * @since 1.3.0 Data registry introduced.
- * @since n.e.x.t Deprecated for general use in favor of named exports from `googlesitekit-data` package.
+ * @since 1.130.0 Deprecated for general use in favor of named exports from `googlesitekit-data` package.
  * @deprecated
  */
 const Data = createRegistry( {}, global.wp?.data );

diff --git a/assets/js/googlesitekit/datastore/user/date-range.js b/assets/js/googlesitekit/datastore/user/date-range.js
@@ -205,7 +205,7 @@ export const selectors = {
 	 * Returns the current reference date, typically today.
 	 *
 	 * @since 1.22.0
-	 * @since n.e.x.t Added options to allow getting the reference date as a Date instance.
+	 * @since 1.130.0 Added options to allow getting the reference date as a Date instance.
 	 *
 	 * @param {Object} state            The current data store's state.
 	 * @param {Object} [options]        Options parameter. Default is: {}.

diff --git a/...ules/analytics-4/components/audience-segmentation/dashboard/InfoNoticeWidget/constants.js b/...ules/analytics-4/components/audience-segmentation/dashboard/InfoNoticeWidget/constants.js
@@ -24,15 +24,15 @@ import { __ } from '@wordpress/i18n';
 /**
  * Slug for audience segmentation info notice.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @private
  */
 export const AUDIENCE_INFO_NOTICE_SLUG = 'audience-segmentation-info-notice';
 
 /**
  * List of info notices for audiences.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @private
  */
 export const AUDIENCE_INFO_NOTICES = [

diff --git a/assets/js/modules/analytics-4/datastore/pivot-report.js b/assets/js/modules/analytics-4/datastore/pivot-report.js
@@ -77,7 +77,7 @@ const baseSelectors = {
 	/**
 	 * Gets an Analytics pivot report for the given options.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param {Object}         state                      Data store's state.
 	 * @param {Object}         options                    Options for generating the report.

diff --git a/assets/js/modules/analytics-4/datastore/properties.js b/assets/js/modules/analytics-4/datastore/properties.js
@@ -596,7 +596,7 @@ const baseActions = {
 	 * Sets if GA4 has mismatched Google Tag ID.
 	 *
 	 * @since 1.96.0
-	 * @since n.e.x.t Updated to send value to the endpoint.
+	 * @since 1.130.0 Updated to send value to the endpoint.
 	 *
 	 * @param {boolean} hasMismatchedTag If GA4 has mismatched Google Tag.
 	 */
@@ -609,7 +609,7 @@ const baseActions = {
 	/**
 	 * Sets if GA4 has mismatched Google Tag ID.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param {boolean} hasMismatchedTag If GA4 has mismatched Google Tag.
 	 * @return {Object} Redux-style action.

diff --git a/assets/js/modules/analytics-4/utils/data-mock.js b/assets/js/modules/analytics-4/utils/data-mock.js
@@ -719,7 +719,7 @@ export function provideAnalytics4MockReport( registry, options ) {
 /**
  * Creates all combinations of pivot dimension values that we expect in a pivot report response.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Array.<string>} dimensionValues An array of valid dimension names.
  * @return {Array.<Array>} An array of all possible combinations of dimension values.
@@ -738,7 +738,7 @@ function createPivotDimensionCombinations( dimensionValues ) {
 /**
  * Sorts pivot report rows and returns them.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Array.<Object>} rows    Array of rows to sort.
  * @param {Array.<Object>} metrics Array of report metrics.
@@ -788,7 +788,7 @@ export function sortPivotRows( rows, metrics, pivots ) {
 /**
  * Generates mock data for Analytics 4 pivot reports.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Object} options Report options.
  * @return {Array.<Object>} An array with generated report.
@@ -1006,7 +1006,7 @@ export function getAnalytics4MockPivotResponse( options ) {
 /**
  * Generates mock response for Analytics 4 pivot reports.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {wp.data.registry} registry Registry with all available stores registered.
  * @param {Object}           options  Pivot report options.

diff --git a/assets/js/modules/analytics-4/utils/report-pivots-validation.js b/assets/js/modules/analytics-4/utils/report-pivots-validation.js
@@ -32,7 +32,7 @@ import { isValidOrders } from './report-validation';
  * and an optional "orderby" property. The "orderby" property should be a valid
  * order definition using the `isValidOrders` function.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Object[]} pivots The pivots object to check.
  * @return {boolean} TRUE if pivot definitions are valid, otherwise FALSE.

diff --git a/assets/js/modules/analytics-4/utils/validation.js b/assets/js/modules/analytics-4/utils/validation.js
@@ -196,7 +196,7 @@ export function isValidGoogleTagContainerID( googleTagContainerID ) {
 /**
  * Checks whether a given report options object is valid.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Object} options The options for the report.
  */
@@ -254,7 +254,7 @@ export function validateReport( options ) {
 /**
  * Checks whether a given pivot report options object is valid.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  *
  * @param {Object} options The options for the pivot report.
  */

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,32 @@
 == Changelog ==
 
+= 1.130.0 =
+
+**Enhanced**
+
+* Added events tracking to the conversion tracking toggle. See [#8894](https://github.com/google/site-kit-wp/issues/8894).
+* Add support for Easy Digital Downloads "add to cart" event in Analytics enhanced tracking. See [#8801](https://github.com/google/site-kit-wp/issues/8801).
+* Add conversion events tracking for the Ninja Forms plugin. See [#8799](https://github.com/google/site-kit-wp/issues/8799).
+* Add foundation for new Reader Revenue Manager feature (PHP). See [#8785](https://github.com/google/site-kit-wp/issues/8785).
+* Add the Subscribe with Google PHP client library. See [#8783](https://github.com/google/site-kit-wp/issues/8783).
+* Ensure that Audiences are listed in the correct order, both in the Audience Tiles Widget and the Selection Panel. See [#8519](https://github.com/google/site-kit-wp/issues/8519).
+* Add support for pivot reports from Analytics to improve report request efficiency. See [#8484](https://github.com/google/site-kit-wp/issues/8484).
+* Update Analytics and AdSense modules to check the linked status as soon as one of these modules is connected. See [#8463](https://github.com/google/site-kit-wp/issues/8463).
+* Add a fallback mechanism to obtain user count for Site Kit audiences in the partial data state. See [#8160](https://github.com/google/site-kit-wp/issues/8160).
+* Show a notice in the Audience Selection Panel when it's opened with a single audience in the selection. See [#8159](https://github.com/google/site-kit-wp/issues/8159).
+* Add a CTA banner in the audiences widget area to reconnect Analytics if disconnected. See [#8156](https://github.com/google/site-kit-wp/issues/8156).
+* Show an Audience Tile in a zero-data state, and allow it to be temporarily hidden. See [#8143](https://github.com/google/site-kit-wp/issues/8143).
+* Update audiences widget area to show multiple notices in sequence. See [#8139](https://github.com/google/site-kit-wp/issues/8139).
+* Navigate to the OAuth flow as needed when setting up Audience Segmentation from the Setup CTA Banner. See [#8132](https://github.com/google/site-kit-wp/issues/8132).
+* Update the `url` parameter used in creating a new AdSense account not to contain subdomain information. See [#8124](https://github.com/google/site-kit-wp/issues/8124).
+* Update the Google Tag Mismatch notification to persist until a user dismisses it. See [#6819](https://github.com/google/site-kit-wp/issues/6819).
+* Add error boundary to widgets to prevent errors in an individual widget from crashing the entire dashboard. See [#6695](https://github.com/google/site-kit-wp/issues/6695).
+
+**Fixed**
+
+* Fix the problem with sticky header when the admin menu tooltip is shown. See [#8764](https://github.com/google/site-kit-wp/issues/8764).
+* Fix Analytics data inconsistency for Arabic language pages. See [#8184](https://github.com/google/site-kit-wp/issues/8184).
+
 = 1.129.1 =
 
 **Fixed**

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.129.1
+ * Version:           1.130.0
  * Requires at least: 5.2
  * Requires PHP:      7.4
  * Author:            Google
@@ -26,7 +26,7 @@
 }
 
 // Define most essential constants.
-define( 'GOOGLESITEKIT_VERSION', '1.129.1' );
+define( 'GOOGLESITEKIT_VERSION', '1.130.0' );
 define( 'GOOGLESITEKIT_PLUGIN_MAIN_FILE', __FILE__ );
 define( 'GOOGLESITEKIT_PHP_MINIMUM', '7.4.0' );
 define( 'GOOGLESITEKIT_WP_MINIMUM', '5.2.0' );

diff --git a/includes/Core/Conversion_Tracking/Conversion_Event_Providers/Easy_Digital_Downloads.php b/includes/Core/Conversion_Tracking/Conversion_Event_Providers/Easy_Digital_Downloads.php
@@ -16,7 +16,7 @@
 /**
  * Class for handling Easy Digital Downloads conversion events.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @access private
  * @ignore
  */
@@ -27,7 +27,7 @@ class Easy_Digital_Downloads extends Conversion_Events_Provider {
 	/**
 	 * Checks if the Easy Digital Downloads plugin is active.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return bool True if Easy Digital Downloads is active, false otherwise.
 	 */
@@ -38,7 +38,7 @@ public function is_active() {
 	/**
 	 * Gets the conversion event names that are tracked by this provider.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return array List of event names.
 	 */
@@ -49,7 +49,7 @@ public function get_event_names() {
 	/**
 	 * Registers the script for the provider.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return Script Script instance.
 	 */

diff --git a/includes/Core/Conversion_Tracking/Conversion_Event_Providers/Ninja_Forms.php b/includes/Core/Conversion_Tracking/Conversion_Event_Providers/Ninja_Forms.php
@@ -16,7 +16,7 @@
 /**
  * Class for handling Ninja Forms conversion events.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @access private
  * @ignore
  */
@@ -27,7 +27,7 @@ class Ninja_Forms extends Conversion_Events_Provider {
 	/**
 	 * Checks if the Ninja Forms plugin is active.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return bool True if Ninja Forms is active, false otherwise.
 	 */
@@ -38,7 +38,7 @@ public function is_active() {
 	/**
 	 * Gets the conversion event names that are tracked by this provider.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return array List of event names.
 	 */
@@ -49,7 +49,7 @@ public function get_event_names() {
 	/**
 	 * Registers the script for the provider.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @return Script Script instance.
 	 */

diff --git a/includes/Core/Conversion_Tracking/Conversion_Tracking.php b/includes/Core/Conversion_Tracking/Conversion_Tracking.php
@@ -59,7 +59,7 @@ class Conversion_Tracking {
 	 * Supported conversion event providers.
 	 *
 	 * @since 1.126.0
-	 * @since n.e.x.t Added Ninja Forms class.
+	 * @since 1.130.0 Added Ninja Forms class.
 	 * @var array
 	 */
 	public static $providers = array(

diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
@@ -2326,7 +2326,7 @@ private function inline_custom_dimensions_data( $modules_data ) {
 	/**
 	 * Populates tag ID mismatch value to pass to JS via _googlesitekitModulesData.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param array $modules_data Inline modules data.
 	 * @return array Inline modules data.

diff --git a/includes/Modules/Analytics_4/PivotReport.php b/includes/Modules/Analytics_4/PivotReport.php
@@ -18,7 +18,7 @@
 /**
  * The base class for Analytics 4 pivot reports.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @access private
  * @ignore
  */
@@ -27,15 +27,15 @@ class PivotReport extends ReportParsers {
 	/**
 	 * Plugin context.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 * @var Context
 	 */
 	protected $context;
 
 	/**
 	 * Constructor.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param Context $context Plugin context.
 	 */
@@ -46,7 +46,7 @@ public function __construct( Context $context ) {
 	/**
 	 * Parses the pivots value of the data request into an array of AnalyticsData Pivot object instances.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param Data_Request $data Data request object.
 	 * @return Google_Service_AnalyticsData_Pivot[] An array of AnalyticsData Pivot objects.

diff --git a/includes/Modules/Analytics_4/Report/PivotRequest.php b/includes/Modules/Analytics_4/Report/PivotRequest.php
@@ -20,7 +20,7 @@
 /**
  * Class for Analytics 4 pivot report requests.
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @access private
  * @ignore
  */
@@ -29,7 +29,7 @@ class PivotRequest extends PivotReport {
 	/**
 	 * Creates and executes a new Analytics 4 pivot report request.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.130.0
 	 *
 	 * @param Data_Request $data           Data request object.
 	 * @param bool         $is_shared_request Determines whether the current request is shared or not.

diff --git a/includes/Modules/Analytics_4/Report/ReportParsers.php b/includes/Modules/Analytics_4/Report/ReportParsers.php
@@ -21,7 +21,7 @@
 /**
  * A class with helper methods to parse report properties
  *
- * @since n.e.x.t
+ * @since 1.130.0
  * @access private
  * @ignore
  */
@@ -31,7 +31,7 @@ class ReportParsers {
 	 * Parses report dimensions received in the request params.
 	 *
 	 * @since 1.99.0
-	 * @since n.e.x.t Moved into ReportParsers for shared used between Report and PivotReport.
+	 * @since 1.130.0 Moved into ReportParsers for shared used between Report and PivotReport.
 	 *
 	 * @param Data_Request $data Data request object.
 	 * @return Google_Service_AnalyticsData_Dimension[] An array of AnalyticsData Dimension objects.
@@ -74,7 +74,7 @@ function ( $dimension_def ) {
 	 * Parses report date ranges received in the request params.
 	 *
 	 * @since 1.99.0
-	 * @since n.e.x.t Moved into ReportParsers for shared used between Report and PivotReport.
+	 * @since 1.130.0 Moved into ReportParsers for shared used between Report and PivotReport.
 	 *
 	 * @param Data_Request $data Data request object.
 	 * @return Google_Service_AnalyticsData_DateRange[] An array of AnalyticsData DateRange objects.
@@ -118,7 +118,7 @@ function ( $date_range ) {
 	 * Parses the orderby value of the data request into an array of AnalyticsData OrderBy object instances.
 	 *
 	 * @since 1.99.0
-	 * @since n.e.x.t Moved into ReportParsers for shared used between Report and PivotReport.
+	 * @since 1.130.0 Moved into ReportParsers for shared used between Report and PivotReport.
 	 *
 	 * @param Data_Request $data Data request object.
 	 * @return Google_Service_AnalyticsData_OrderBy[] An array of AnalyticsData OrderBy objects.