Merge branch 'main' of github.com:google/site-kit-wp.

.github/workflows/zips.yml

@@ -65,11 +65,6 @@ on:
         description: Release version
         required: false
         default: ''
-      dry_run:
-        type: boolean
-        description: Run the publishing process without committing.
-        required: false
-        default: false
 
 concurrency:
   group: zips-${{ github.event_name }}-${{ github.ref }}
@@ -223,6 +218,31 @@ jobs:
           edit-mode: replace
           body: Build files for ${{ github.event.pull_request.head.sha }} have been deleted.
 
+  dryrun-publish-to-wporg:
+    name: '[DRY RUN] Publish to WordPress.org'
+    runs-on: ubuntu-latest
+    # environment: do not define to omit SVN credentials + deployment protection rules for this dry-run.
+    if: github.event_name == 'workflow_dispatch' && ( github.ref_type == 'tag' || inputs.release_version != '' )
+    needs: build-zips
+    timeout-minutes: 20
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: zip-files
+          path: /tmp
+      - name: Extract
+        run: |
+          unzip /tmp/google-site-kit.zip
+      - uses: 10up/[email protected]
+        with:
+          dry-run: true
+        env:
+          BUILD_DIR: ./google-site-kit
+          SLUG: google-site-kit
+          SVN_PASSWORD: no-op-password
+          SVN_USERNAME: no-op-username
+          VERSION: ${{ inputs.release_version }}
+
   publish-to-wporg:
     name: Publish to WordPress.org
     runs-on: ubuntu-latest
@@ -239,8 +259,6 @@ jobs:
         run: |
           unzip /tmp/google-site-kit.zip
       - uses: 10up/[email protected]
-        with:
-          dry-run: ${{ inputs.dry_run }}
         env:
           BUILD_DIR: ./google-site-kit
           SLUG: google-site-kit

assets/js/components/KeyMetrics/shouldDisplayWidgetWithConversionEvent.js

@@ -10,7 +10,7 @@ import { MODULES_ANALYTICS_4 } from '../../modules/analytics-4/datastore/constan
  * has the `requiredConversionEventName` property.
  *
  * @since 1.136.0
- * @since n.e.x.t Moved function to its own file.
+ * @since 1.137.0 Moved function to its own file.
  *
  * @param {Function} select              Data store select function.
  * @param {boolean}  isViewOnlyDashboard Whether the current dashboard is view only.

assets/js/util/scroll.js

@@ -25,7 +25,7 @@ import { finiteNumberOrZero } from './finite-number-or-zero';
 /**
  * Gets the y coordinate to scroll to the top of a context element, taking the sticky admin bar, header and navigation height into account.
  *
- * @since n.e.x.t Renamed from getContextScrollTop to getNavigationalScrollTop.
+ * @since 1.137.0 Renamed from getContextScrollTop to getNavigationalScrollTop.
  *
  * @param {string} selector   Selector for the element to scroll to. The id (prepend #) or class (prepend .).
  * @param {string} breakpoint The current breakpoint.

changelog.txt

@@ -1,5 +1,44 @@
 == Changelog ==
 
+= 1.137.0 =
+
+**Added**
+
+* Add the `signInWithGoogleModule` feature flag for Sign in With Google. See [#9382](https://github.com/google/site-kit-wp/issues/9382).
+* Only show Analytics Conversion Reporting items in the dashboard when the feature flag is enabled. See [#9364](https://github.com/google/site-kit-wp/issues/9364).
+* Add Sign in with Google module. See [#9332](https://github.com/google/site-kit-wp/issues/9332).
+* Add Key Metric Widget for "Top traffic source driving leads". See [#9217](https://github.com/google/site-kit-wp/issues/9217).
+* Add the `Top traffic source driving purchases` widget. See [#9164](https://github.com/google/site-kit-wp/issues/9164).
+* Added the `Top cities driving purchases` widget. See [#9160](https://github.com/google/site-kit-wp/issues/9160).
+* Add the `Top traffic source driving add to cart` widget. See [#9158](https://github.com/google/site-kit-wp/issues/9158).
+* Add the `Top cities driving add to cart` widget. See [#9156](https://github.com/google/site-kit-wp/issues/9156).
+* Add a Key Metric widget for "Top pages driving leads" when Analytics Conversion Reporting is enabled. See [#9153](https://github.com/google/site-kit-wp/issues/9153).
+
+**Enhanced**
+
+* Update the Analytics + AdSense linking notification to use the new notifications datastore. See [#9280](https://github.com/google/site-kit-wp/issues/9280).
+* Ensure the "Top content" CTA for creating the `googlesitekit_post_type` custom dimension appears in the main dashboard when the corresponding report error indicates the missing custom dimension. See [#9218](https://github.com/google/site-kit-wp/issues/9218).
+* Ensure cached audiences are resynced when the No Audiences Banner is shown. See [#9214](https://github.com/google/site-kit-wp/issues/9214).
+* Add support for the "Temporary hidden" badge in the audience selection panel. See [#9096](https://github.com/google/site-kit-wp/issues/9096).
+* Update the Audience Selection Panel Error Notice buttons to use the new callout button styling. See [#9068](https://github.com/google/site-kit-wp/issues/9068).
+* Address formatting inconsistencies in subtle notifications by removing periods from `GA4AdSenseLinkedNotification` and `AudienceSegmentationSetupSuccessSubtleNotification`. See [#8747](https://github.com/google/site-kit-wp/issues/8747).
+* Remove legacy Analytics client services from the bundle, as they are no longer necessary following the removal of the UA module. See [#8459](https://github.com/google/site-kit-wp/issues/8459).
+* Add handling for audience sync errors in the audiences widget area. See [#8190](https://github.com/google/site-kit-wp/issues/8190).
+* Ensure the Audience Segmentation feature is effectively reset when changing the connected Analytics property. See [#8180](https://github.com/google/site-kit-wp/issues/8180).
+* Implement the unhappy path for the Settings Section Audience Segmentation setup flow, handling OAuth and API errors by displaying an Error Modal with options to retry, request access, or get help. See [#8179](https://github.com/google/site-kit-wp/issues/8179).
+* Ensure the Audience Segmentation Introductory Popup / Banner is only shown to to view-only users and secondary admins once the feature has been setup by the initial admin. See [#8172](https://github.com/google/site-kit-wp/issues/8172).
+* Add error handling in the Audience Segmentation selection panel audience creation notice. See [#8166](https://github.com/google/site-kit-wp/issues/8166).
+
+**Changed**
+
+* Remove the use of the non-existent `features` prop in stories using the `WithRegistrySetup` component. See [#9115](https://github.com/google/site-kit-wp/issues/9115).
+* Rename the `Migration_Conversion_ID` class to `Migration_1_129_0` for consistency with migration naming conventions. See [#8905](https://github.com/google/site-kit-wp/issues/8905).
+
+**Fixed**
+
+* Fix UX issues with the "Temporarily hidden" badge in the Audience Selection panel by ensuring the info icon only shows the tooltip without toggling the checkbox and improving tooltip behavior on mobile. See [#9421](https://github.com/google/site-kit-wp/issues/9421).
+* Fix conditions for showing the "Enable groups" and "Display visitor groups in dashboard" toggle on the Settings screen. See [#9366](https://github.com/google/site-kit-wp/issues/9366).
+
 = 1.136.0 =
 
 **Added**

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

includes/Modules/Analytics_4.php

@@ -156,7 +156,7 @@ final class Analytics_4 extends Module implements Module_With_Scopes, Module_Wit
 	/**
 	 * Reset_Audiences instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 * @var Reset_Audiences
 	 */
 	protected $reset_audiences;

includes/Modules/Analytics_4/Reset_Audiences.php

@@ -19,7 +19,7 @@
 /**
  * Class to reset Audience Segmentation Settings across multiple users.
  *
- * @since n.e.x.t
+ * @since 1.137.0
  * @access private
  * @ignore
  */
@@ -28,31 +28,31 @@ class Reset_Audiences {
 	/**
 	 * User_Options instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 * @var User_Options
 	 */
 	protected $user_options;
 
 	/**
 	 * Dismissed_Prompts instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 * @var Dismissed_Prompts
 	 */
 	protected $dismissed_prompts;
 
 	/**
 	 * Dismissed_Items instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 * @var Dismissed_Items
 	 */
 	protected $dismissed_items;
 
 	/**
 	 * Audience Settings instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 * @var Audience_Settings
 	 */
 	protected $audience_settings;
@@ -70,7 +70,7 @@ class Reset_Audiences {
 	/**
 	 * Constructor.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @param User_Options $user_options User option API.
 	 */
@@ -84,7 +84,7 @@ public function __construct( User_Options $user_options = null ) {
 	/**
 	 * Reset audience specific settings for all SK users.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 */
 	public function reset_audience_data() {
 		global $wpdb;

includes/Modules/Sign_In_With_Google.php

@@ -22,7 +22,7 @@
 /**
  * Class representing the Sign in With Google module.
  *
- * @since n.e.x.t
+ * @since 1.137.0
  * @access private
  * @ignore
  */
@@ -39,15 +39,15 @@ final class Sign_In_With_Google extends Module implements Module_With_Assets, Mo
 	/**
 	 * Registers functionality through WordPress hooks.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 */
 	public function register() {
 	}
 
 	/**
 	 * Cleans up when the module is deactivated.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 */
 	public function on_deactivation() {
 		$this->get_settings()->delete();
@@ -56,7 +56,7 @@ public function on_deactivation() {
 	/**
 	 * Sets up information about the module.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @return array Associative array of module info.
 	 */
@@ -73,7 +73,7 @@ protected function setup_info() {
 	/**
 	 * Sets up the module's assets to register.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @return Asset[] List of Asset objects.
 	 */
@@ -100,7 +100,7 @@ protected function setup_assets() {
 	/**
 	 * Sets up the module's settings instance.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @return Settings
 	 */

includes/Modules/Sign_In_With_Google/Settings.php

@@ -17,7 +17,7 @@
 /**
  * Class for Sign_In_With_Google settings.
  *
- * @since n.e.x.t
+ * @since 1.137.0
  * @access private
  * @ignore
  */
@@ -29,7 +29,7 @@ class Settings extends Module_Settings implements Setting_With_Owned_Keys_Interf
 	/**
 	 * Registers the setting in WordPress.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 */
 	public function register() {
 		parent::register();
@@ -39,7 +39,7 @@ public function register() {
 	/**
 	 * Gets the default value.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @return array An array of default settings values.
 	 */
@@ -50,7 +50,7 @@ protected function get_default() {
 	/**
 	 * Returns keys for owned settings.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.137.0
 	 *
 	 * @return array An array of keys for owned settings.
 	 */