Merge branch 'develop' of github.com:google/site-kit-wp into enhance/#…

…6215-ga4-admin-bar-sessions.

.storybook/preview-head-vrt.html

@@ -3,10 +3,16 @@
 	#root *,
 	#root *::before,
 	#root *::after {
-		animation-duration: 0ms !important;
 		transition-duration: 0ms !important;
 	}
 
+	/* We only want to override animation-duration if _not_ pausing the animations via the .googlesitekit-vrt-animation-paused class. */
+	#root:not( :has( .googlesitekit-vrt-animation-paused ) ) *,
+	#root:not( :has( .googlesitekit-vrt-animation-paused ) ) *::before,
+	#root:not( :has( .googlesitekit-vrt-animation-paused ) ) *::after {
+		animation-duration: 0ms !important;
+	}
+
 	/**
 	 * While the rules above set animation-duration to 0ms for VRT builds, there can be times where this is not appropriate.
 	 * For example if there is a constant animation in a story, it results in the animation running constantly at top speed and the VRT screengrab becomes somewhat undeterministic.
@@ -18,4 +24,15 @@
 		animation: none !important;
 		transition: none !important;
 	}
+
+	/**
+	 * An alternative scenario is that the VRT scenario does not render correctly unless the animation is active but paused.
+	 * In this case, we can apply the following .googlesitekit-vrt-animation-paused class to a story wrapper element to pause animations for a given story.
+	 * Please note, this only applies to animations and not transitions which don't have an equivalent paused state.
+	 */
+	#root .googlesitekit-vrt-animation-paused *,
+	#root .googlesitekit-vrt-animation-paused *::before,
+	#root .googlesitekit-vrt-animation-paused *::after {
+		animation-play-state: paused !important;
+	}
 </style>

.storybook/utils/resetGlobals.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep } from 'lodash';
 
 /**
  * Internal dependencies

.storybook/utils/zeroReports.js

@@ -19,7 +19,7 @@
 /**
  * Returns a copy of the provided Analytics report with all metric values replaced with zero.
  *
- * @since n.e.x.t
+ * @since 1.95.0
  *
  * @param {Array<Object>} report Array containing Analytics report object(s).
  * @return {Array<Object>} Array containing zeroed Analytics report object(s).
@@ -48,14 +48,14 @@ export function replaceValuesInAnalyticsReportWithZeroData( report ) {
  * Returns a copy of the provided Analytics 4 report with all values removed,
  * matching the format of an empty report.
  *
- * @since n.e.x.t
+ * @since 1.95.0
  *
  * @param {Object} report Analytics 4 report object.
  * @return {Object} Empty Analytics 4 report object.
  */
 export function replaceValuesInAnalytics4ReportWithZeroData( report ) {
-	// eslint-disable-next-line no-unused-vars -- Ignore `rows` since we're omitting it from the returned report object.
-	const { rows, ...reportWithoutRows } = report;
+	// eslint-disable-next-line no-unused-vars -- Ignore `rows` and `rowCount` since we're omitting them from the returned report object.
+	const { rows, rowCount, ...reportWithoutRows } = report;
 
 	return {
 		...reportWithoutRows,

assets/js/all-datastores.test.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import omit from 'lodash/omit';
+import { omit } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/components/Alert.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/DashboardNavigation/Navigation.js

@@ -19,10 +19,10 @@
 /**
  * External dependencies
  */
+import classnames from 'classnames';
+import { throttle } from 'lodash';
 import { useMount } from 'react-use';
 import { Chip } from '@material/react-chips';
-import classnames from 'classnames';
-import throttle from 'lodash/throttle';
 
 /**
  * WordPress dependencies

assets/js/components/EntityHeader.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import throttle from 'lodash/throttle';
+import { throttle } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/GoogleChart/utils.js

@@ -19,9 +19,7 @@
 /**
  * External dependencies
  */
-import set from 'lodash/set';
-import cloneDeep from 'lodash/cloneDeep';
-import merge from 'lodash/merge';
+import { set, cloneDeep, merge } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/components/ReportError.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import uniqWith from 'lodash/uniqWith';
+import { uniqWith } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/ReportTable.js

@@ -20,9 +20,9 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import get from 'lodash/get';
 import invariant from 'invariant';
 import PropTypes from 'prop-types';
+import { get } from 'lodash';
 
 /**
  * Internal dependencies.

assets/js/components/notifications/BannerNotification/index.js

@@ -21,7 +21,7 @@
  */
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import map from 'lodash/map';
+import { map } from 'lodash';
 import { useMount, useMountedState, useIntersection } from 'react-use';
 import { useWindowWidth } from '@react-hook/window-size/throttled';
 

assets/js/components/notifications/UnsatisfiedScopesAlert.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import unique from 'lodash/uniq';
+import { uniq } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -114,7 +114,7 @@ export default function UnsatisfiedScopesAlert() {
 		if ( ! moduleNames || moduleNames.some( ( name ) => name === false ) ) {
 			messageID = MESSAGE_GENERIC;
 		} else {
-			moduleNames = unique( moduleNames );
+			moduleNames = uniq( moduleNames );
 			messageID =
 				1 < moduleNames.length ? MESSAGE_MULTIPLE : MESSAGE_SINGULAR;
 		}

assets/js/components/settings/SettingsActiveModule/Footer.js

@@ -21,7 +21,7 @@
  */
 import PropTypes from 'prop-types';
 import { useHistory, useParams } from 'react-router-dom';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/surveys/SurveyQuestionMultiSelect.js

@@ -21,7 +21,7 @@
  */
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import keyBy from 'lodash/keyBy';
+import { keyBy } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/wp-dashboard/WPDashboardPopularPages.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/components/wp-dashboard/WPDashboardUniqueVisitorsChartWidget.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit-adminbar.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import once from 'lodash/once';
+import { once } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/data/create-fetch-store.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/data/create-fetch-store.test.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/data/create-settings-store.js

@@ -20,9 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
-import isEqual from 'lodash/isEqual';
-import pick from 'lodash/pick';
+import { isPlainObject, isEqual, pick } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/data/utils.js

@@ -20,8 +20,8 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import mapValues from 'lodash/mapValues';
 import memize from 'memize';
+import { mapValues } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/data/utils.test.js

@@ -19,7 +19,7 @@
 /**
  * External dependencies
  */
-import noop from 'lodash/noop';
+import { noop } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/datastore/forms/forms.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 const SET_FORM_VALUES = 'SET_FORM_VALUES';
 

assets/js/googlesitekit/datastore/site/errors.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/datastore/ui/ui.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/datastore/user/feature-tours.js

@@ -21,7 +21,7 @@
  */
 import compareVersions from 'compare-versions';
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/datastore/user/key-metrics.js

@@ -18,7 +18,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
+import { isPlainObject } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/datastore/user/surveys.js

@@ -19,8 +19,8 @@
 /**
  * External dependencies
  */
-import isPlainObject from 'lodash/isPlainObject';
 import invariant from 'invariant';
+import { isPlainObject } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/datastore/user/user-input-settings.js

@@ -20,9 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isPlainObject from 'lodash/isPlainObject';
-import isEqual from 'lodash/isEqual';
-import pick from 'lodash/pick';
+import { isPlainObject, isEqual, pick } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/modules/datastore/modules.js

@@ -20,18 +20,16 @@
  * External dependencies
  */
 import memize from 'memize';
-import defaults from 'lodash/defaults';
-import merge from 'lodash/merge';
-import isPlainObject from 'lodash/isPlainObject';
 import invariant from 'invariant';
-import { sprintf, __ } from '@wordpress/i18n';
+import { defaults, merge, isPlainObject } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 // This is used for JSDoc purposes.
 // eslint-disable-next-line no-unused-vars
 import { WPComponent } from '@wordpress/element';
+import { sprintf, __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -1348,7 +1346,7 @@ const baseSelectors = {
 	 *
 	 * Returns an Object/map of objects, keyed by slug as same as `getModules`.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.95.0
 	 *
 	 * @param {Object} state Data store's state.
 	 * @return {(Object|undefined)} Non-internal shareable modules available on the site; `undefined` if not loaded.

assets/js/googlesitekit/modules/datastore/sharing-settings.js

@@ -20,9 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import isEqual from 'lodash/isEqual';
-import isEmpty from 'lodash/isEmpty';
-import pick from 'lodash/pick';
+import { isEqual, isEmpty, pick } from 'lodash';
 
 /**
  * Internal dependencies

assets/js/googlesitekit/widgets/components/WidgetRenderer.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import intersection from 'lodash/intersection';
+import { intersection } from 'lodash';
 
 /**
  * WordPress dependencies

assets/js/googlesitekit/widgets/datastore/key-metrics.js

@@ -29,7 +29,7 @@ const selectors = {
 	/**
 	 * Gets the Key Metric widget slugs based on the user input settings.
 	 *
-	 * @since n.e.x.t
+	 * @since 1.95.0
 	 *
 	 * @return {Array<string>|undefined} An array of Key Metric widget slugs, or undefined if the user input settings are not loaded.
 	 */

assets/js/googlesitekit/widgets/datastore/widgets.js

@@ -20,7 +20,7 @@
  * External dependencies
  */
 import invariant from 'invariant';
-import intersection from 'lodash/intersection';
+import { intersection } from 'lodash';
 import { original } from 'immer';
 
 /**