From 37352fca946b60a142a4aea0cc19d0e056fc9285 Mon Sep 17 00:00:00 2001 From: Evan Mattson Date: Wed, 28 Jun 2023 21:52:03 -0400 Subject: [PATCH] Bump version to 1.104.0. --- .../datastore/user/user-input-settings.js | 2 +- .../adsense/datastore/ad-blocking-recovery.js | 2 +- google-site-kit.php | 4 +-- includes/Core/Authentication/Google_Proxy.php | 2 +- .../User_Input/REST_User_Input_Controller.php | 2 +- includes/Modules/AdSense.php | 4 +-- .../AdSense/Ad_Blocking_Recovery_Tag.php | 12 +++---- includes/Modules/Analytics_4.php | 4 +-- includes/Modules/Analytics_4/AMP_Tag.php | 8 ++--- readme.txt | 35 ++++++++++++++++++- tests/e2e/utils/setup-analytics.js | 2 +- 11 files changed, 55 insertions(+), 22 deletions(-) diff --git a/assets/js/googlesitekit/datastore/user/user-input-settings.js b/assets/js/googlesitekit/datastore/user/user-input-settings.js index 26a6c944573..c5308cb1dc2 100644 --- a/assets/js/googlesitekit/datastore/user/user-input-settings.js +++ b/assets/js/googlesitekit/datastore/user/user-input-settings.js @@ -157,7 +157,7 @@ const baseActions = { /** * Triggers user input survey if any of the answers is "Other". * - * @since n.e.x.t + * @since 1.104.0 * * @return {Object} Object with `response` and `error`. */ diff --git a/assets/js/modules/adsense/datastore/ad-blocking-recovery.js b/assets/js/modules/adsense/datastore/ad-blocking-recovery.js index f1d661ec865..ff0190c629b 100644 --- a/assets/js/modules/adsense/datastore/ad-blocking-recovery.js +++ b/assets/js/modules/adsense/datastore/ad-blocking-recovery.js @@ -38,7 +38,7 @@ const baseActions = { /** * Triggers an API request to sync Ad Blocking Recovery and Error Protection tags on the server. * - * @since n.e.x.t + * @since 1.104.0 * * @return {Object} Object with `response` and `error`. */ diff --git a/google-site-kit.php b/google-site-kit.php index 020183b4a4b..cf658b730e2 100644 --- 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.103.0 + * Version: 1.104.0 * Requires at least: 5.2 * Requires PHP: 5.6 * Author: Google @@ -26,7 +26,7 @@ } // Define most essential constants. -define( 'GOOGLESITEKIT_VERSION', '1.103.0' ); +define( 'GOOGLESITEKIT_VERSION', '1.104.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/Authentication/Google_Proxy.php b/includes/Core/Authentication/Google_Proxy.php index f076f196383..4e77b9e8d13 100644 --- a/includes/Core/Authentication/Google_Proxy.php +++ b/includes/Core/Authentication/Google_Proxy.php @@ -516,7 +516,7 @@ public function exchange_site_code( $site_code, $undelegated_code ) { * Gets remote features. * * @since 1.27.0 - * @since n.e.x.t Added `php_version` to request. + * @since 1.104.0 Added `php_version` to request. * * @param Credentials $credentials Credentials instance. * @return array|WP_Error Response of the wp_remote_post request. diff --git a/includes/Core/User_Input/REST_User_Input_Controller.php b/includes/Core/User_Input/REST_User_Input_Controller.php index a9106dfaecc..f9e9cc228a9 100644 --- a/includes/Core/User_Input/REST_User_Input_Controller.php +++ b/includes/Core/User_Input/REST_User_Input_Controller.php @@ -40,7 +40,7 @@ class REST_User_Input_Controller { /** * Survey_Queue instance. * - * @since n.e.x.t + * @since 1.104.0 * @var Survey_Queue */ protected $survey_queue; diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php index 5c8a822d354..8cc49af9c1f 100644 --- a/includes/Modules/AdSense.php +++ b/includes/Modules/AdSense.php @@ -81,7 +81,7 @@ final class AdSense extends Module /** * Ad_Blocking_Recovery_Tag instance. * - * @since n.e.x.t + * @since 1.104.0 * @var Ad_Blocking_Recovery_Tag */ protected $ad_blocking_recovery_tag; @@ -89,7 +89,7 @@ final class AdSense extends Module /** * Constructor. * - * @since n.e.x.t + * @since 1.104.0 * * @param Context $context Plugin context. * @param Options $options Optional. Option API instance. Default is a new instance. diff --git a/includes/Modules/AdSense/Ad_Blocking_Recovery_Tag.php b/includes/Modules/AdSense/Ad_Blocking_Recovery_Tag.php index 3898a4300cd..27868d9f51b 100644 --- a/includes/Modules/AdSense/Ad_Blocking_Recovery_Tag.php +++ b/includes/Modules/AdSense/Ad_Blocking_Recovery_Tag.php @@ -15,7 +15,7 @@ /** * Class for AdSense Ad Blocker Recovery Tag. * - * @since n.e.x.t + * @since 1.104.0 * @access private * @ignore */ @@ -26,7 +26,7 @@ class Ad_Blocking_Recovery_Tag extends Setting { /** * Gets ad blocking recovery tag. * - * @since n.e.x.t + * @since 1.104.0 * * @return array Array with tag and error protection code. */ @@ -43,7 +43,7 @@ public function get() { /** * Sets ad blocking recovery tag. * - * @since n.e.x.t + * @since 1.104.0 * * @param array $value Array with tag and error protection code. * @@ -60,7 +60,7 @@ public function set( $value ) { /** * Gets the expected value type. * - * @since n.e.x.t + * @since 1.104.0 * * @return string The type name. */ @@ -71,7 +71,7 @@ protected function get_type() { /** * Gets the default value. * - * @since n.e.x.t + * @since 1.104.0 * * @return array */ @@ -85,7 +85,7 @@ protected function get_default() { /** * Determines whether the given value is a valid tag object. * - * @since n.e.x.t + * @since 1.104.0 * * @param mixed $tag Tag object. * diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php index b731818561b..ef7e324f586 100644 --- a/includes/Modules/Analytics_4.php +++ b/includes/Modules/Analytics_4.php @@ -964,7 +964,7 @@ private function get_provisioning_redirect_uri() { * Registers the Analytics 4 tag. * * @since 1.31.0 - * @since n.e.x.t Added support for AMP tag. + * @since 1.104.0 Added support for AMP tag. */ private function register_tag() { if ( $this->context->is_amp() ) { @@ -1233,7 +1233,7 @@ private function get_tag_id() { /** * Gets the currently configured measurement ID. * - * @since n.e.x.t + * @since 1.104.0 * * @return string Google Analytics 4 measurement ID. */ diff --git a/includes/Modules/Analytics_4/AMP_Tag.php b/includes/Modules/Analytics_4/AMP_Tag.php index 72e8f13f22a..f016dabdf17 100644 --- a/includes/Modules/Analytics_4/AMP_Tag.php +++ b/includes/Modules/Analytics_4/AMP_Tag.php @@ -16,7 +16,7 @@ /** * Class for AMP tag. * - * @since n.e.x.t + * @since 1.104.0 * @access private * @ignore */ @@ -27,7 +27,7 @@ class AMP_Tag extends Analytics_AMP_Tag { /** * Registers tag hooks. * - * @since n.e.x.t + * @since 1.104.0 */ public function register() { parent::register(); @@ -41,7 +41,7 @@ public function register() { /** * Outputs gtag tag. * - * @since n.e.x.t + * @since 1.104.0 */ protected function render() { // Only render this tag if the UA AMP tag was not rendered to avoid multiple tags. @@ -55,7 +55,7 @@ protected function render() { /** * Extends gtag vars config with the GA4 tag config. * - * @since n.e.x.t + * @since 1.104.0 * * @param array $opt AMP gtag config. * @return array diff --git a/readme.txt b/readme.txt index 3f4ad1f997a..8897d1798e3 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Contributors: google Requires at least: 5.2 Tested up to: 6.2 Requires PHP: 5.6 -Stable tag: 1.103.0 +Stable tag: 1.104.0 License: Apache License 2.0 License URI: https://www.apache.org/licenses/LICENSE-2.0 Tags: google, search-console, analytics, adsense, pagespeed-insights, optimize, tag-manager, site-kit @@ -110,6 +110,39 @@ Please create a new topic on our [WordPress.org support forum](https://wordpress == Changelog == += 1.104.0 = + +**Added** + +* Add support for tagging with Google Analytics 4 in AMP mode. See [#7221](https://github.com/google/site-kit-wp/issues/7221). +* Complete Ad Blocking Recovery set up interface. See [#6966](https://github.com/google/site-kit-wp/issues/6966). +* Add infrastructure for fetching and storing the Ad Blocking Recovery tag. See [#6902](https://github.com/google/site-kit-wp/issues/6902). + +**Enhanced** + +* Add PHP version to requests for features. See [#7209](https://github.com/google/site-kit-wp/issues/7209). +* Add the Analytics dashboard type to Site Health information. See [#7119](https://github.com/google/site-kit-wp/issues/7119). +* Ensure the Universal Analytics controls are shown in the case where the connected property belongs to another Google account and permission has been removed. See [#7063](https://github.com/google/site-kit-wp/issues/7063). +* Add settings controls for Ad blocking recovery tags. See [#6962](https://github.com/google/site-kit-wp/issues/6962). +* Add ad blocking recovery state to the settings view for AdSense. See [#6961](https://github.com/google/site-kit-wp/issues/6961). +* Show the Ad Blocking Recovery Notification on the Dashboard. See [#6953](https://github.com/google/site-kit-wp/issues/6953). +* Rework the Dialog component to use dialog components from the `googlesitekit-components` library instead of `@material/react-dialog` directly. See [#6652](https://github.com/google/site-kit-wp/issues/6652). +* Show a “Connect AdSense CTA” Key Metrics tile if AdSense is disconnected after setting up AdSense-related Key Metrics. See [#6264](https://github.com/google/site-kit-wp/issues/6264). +* Add the Connect GA tile to Key Metrics widget. See [#6263](https://github.com/google/site-kit-wp/issues/6263). +* Create the "Top performing keywords" key metric widget tile. See [#6251](https://github.com/google/site-kit-wp/issues/6251). +* Create the "Most popular content by pageviews" key metric widget tile. See [#6247](https://github.com/google/site-kit-wp/issues/6247). +* Implement HaTS survey triggers for users who answers "Other" to any User Input question. See [#6180](https://github.com/google/site-kit-wp/issues/6180). +* Migrate `TextField` component to our GM2 component library. See [#6113](https://github.com/google/site-kit-wp/issues/6113). + +**Fixed** + +* Ensure Ad Blocking Recovery elements are only present when the feature is enabled. See [#7179](https://github.com/google/site-kit-wp/issues/7179). +* Restore notice width in setup and settings views. See [#7140](https://github.com/google/site-kit-wp/issues/7140). +* Fix the Optimize sunset banner re-appearing issue. See [#7138](https://github.com/google/site-kit-wp/issues/7138). +* Fix broken view-only dashboard when Analytics isn't shared. See [#7116](https://github.com/google/site-kit-wp/issues/7116). +* Fix notices about granting view-only access when changing module settings for modules that are not shared with any roles. See [#6633](https://github.com/google/site-kit-wp/issues/6633). +* Fix issue in the All Traffic widget/Google Charts pie charts that caused selected elements to become de-selected. See [#4589](https://github.com/google/site-kit-wp/issues/4589). + = 1.103.0 = **Added** diff --git a/tests/e2e/utils/setup-analytics.js b/tests/e2e/utils/setup-analytics.js index ce63e1df366..86f900e96cb 100644 --- a/tests/e2e/utils/setup-analytics.js +++ b/tests/e2e/utils/setup-analytics.js @@ -51,7 +51,7 @@ export async function setupAnalytics( settingsOverrides = {} ) { /** * Activates the Analytics module and completes the GA4 setup process. * - * @since n.e.x.t + * @since 1.104.0 * * @param {Object} settingsOverrides Optional settings to override the defaults. */