Merge remote-tracking branch 'origin/trunk' into update/jetpack-ai-br…

…eve-production-10

projects/js-packages/publicize-components/changelog/remove-calypso-eslint

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Replace eslint disable of `wpcalypso/no-unsafe-wp-apis` with `@wordpress/no-unsafe-wp-apis`. No change to functionality.
+
+

projects/js-packages/publicize-components/src/components/connection-management/disconnect.tsx

@@ -1,6 +1,5 @@
 import { Button } from '@automattic/jetpack-components';
-// eslint-disable-next-line wpcalypso/no-unsafe-wp-apis
-import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
+import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components'; // eslint-disable-line @wordpress/no-unsafe-wp-apis
 import { useDispatch, useSelect } from '@wordpress/data';
 import { createInterpolateElement, useCallback, useReducer } from '@wordpress/element';
 import { __, _x, sprintf } from '@wordpress/i18n';

projects/js-packages/publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx

@@ -2,8 +2,7 @@ import { Button, useGlobalNotices } from '@automattic/jetpack-components';
 import {
 	BaseControl,
 	FlexBlock,
-	// eslint-disable-next-line wpcalypso/no-unsafe-wp-apis
-	__experimentalHStack as HStack,
+	__experimentalHStack as HStack, // eslint-disable-line @wordpress/no-unsafe-wp-apis
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useCallback, useMemo } from '@wordpress/element';

projects/js-packages/publicize-components/src/components/social-image-generator/panel/index.js

@@ -1,10 +1,9 @@
-/* eslint-disable wpcalypso/no-unsafe-wp-apis */
 import { useGlobalNotices } from '@automattic/jetpack-components';
 import {
 	PanelBody,
 	ToggleControl,
 	Button,
-	__experimentalHStack as HStack,
+	__experimentalHStack as HStack, // eslint-disable-line @wordpress/no-unsafe-wp-apis
 } from '@wordpress/components';
 import { useCallback, useState, Fragment } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';

projects/packages/explat/changelog/update-explat-experiment-fetching

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+ExPlat: add condition to prevent fetching the experiment assignment if there's not anon id (meaning that Tracks is likely disabled)

projects/packages/explat/src/client/assignment.ts

@@ -10,11 +10,16 @@ const fetchExperimentAssignment =
 		experimentName: string;
 		anonId: string | null;
 	} ): Promise< unknown > => {
+		if ( ! anonId ) {
+			throw new Error( `Tracking is disabled, can't fetch experimentAssignment` );
+		}
+
 		const params = {
 			experiment_name: experimentName,
 			anon_id: anonId ?? undefined,
 			as_connected_user: asConnectedUser,
 		};
+
 		const assignmentsRequestUrl = addQueryArgs( 'jetpack/v4/explat/assignments', params );
 
 		return await apiFetch( { path: assignmentsRequestUrl } );

projects/packages/forms/changelog/remove-calypso-eslint

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Replace eslint disable of `wpcalypso/no-unsafe-wp-apis` with `@wordpress/no-unsafe-wp-apis`. No change to functionality.
+
+

projects/packages/forms/changelog/remove-calypso-eslint#2

@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Remove `wpcalypso/jsx-classname-namespace` from eslint config, eslint-plugin-wpcalypso is being removed.
+
+

projects/packages/forms/src/blocks/.eslintrc.js

@@ -23,7 +23,6 @@ module.exports = {
 		'react/react-in-jsx-scope': 0,
 		'space-unary-ops': 0,
 		'space-before-function-paren': 0,
-		'wpcalypso/jsx-classname-namespace': 0,
 
 		// eslint 6.x migration
 		'react-hooks/rules-of-hooks': 1,

projects/packages/forms/src/blocks/contact-form/edit.js

@@ -9,8 +9,8 @@ import {
 	InnerBlocks,
 	InspectorControls,
 	URLInput,
-	__experimentalBlockVariationPicker as BlockVariationPicker, // eslint-disable-line wpcalypso/no-unsafe-wp-apis
-	__experimentalBlockPatternSetup as BlockPatternSetup, // eslint-disable-line wpcalypso/no-unsafe-wp-apis
+	__experimentalBlockVariationPicker as BlockVariationPicker, // eslint-disable-line @wordpress/no-unsafe-wp-apis
+	__experimentalBlockPatternSetup as BlockPatternSetup, // eslint-disable-line @wordpress/no-unsafe-wp-apis
 } from '@wordpress/block-editor';
 import { createBlock, registerBlockVariation } from '@wordpress/blocks';
 import {

projects/packages/jetpack-mu-wpcom/changelog/admin-bar-wpcom-logo

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Admin Bar: Adjust wpcom logo size on mobile

projects/packages/jetpack-mu-wpcom/changelog/remove-calypso-eslint

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Replace eslint disable of `wpcalypso/no-unsafe-wp-apis` with `@wordpress/no-unsafe-wp-apis`. No change to functionality.
+
+

projects/packages/jetpack-mu-wpcom/changelog/update-site-name-icon

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Always use house icon for site name in admin-bar.

projects/packages/jetpack-mu-wpcom/src/features/block-inserter-modifications/index.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line wpcalypso/no-unsafe-wp-apis
-import { __unstableInserterMenuExtension as InserterMenuExtension } from '@wordpress/block-editor';
+import { __unstableInserterMenuExtension as InserterMenuExtension } from '@wordpress/block-editor'; // eslint-disable-line @wordpress/no-unsafe-wp-apis
 import { useState } from '@wordpress/element';
 import { registerPlugin } from '@wordpress/plugins';
 import { debounce } from 'lodash';

projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.scss

@@ -36,11 +36,11 @@
 	top: 2px;
 
 	@media (max-width: 782px) {
-		width: 36px;
-		height: 36px;
-		margin: 0 8px;
+		width: 32px;
+		height: 32px;
+		margin: 0 10px;
 		mask-size: cover;
-		top: 5px;
+		top: 7px;
 	}
 }
 
@@ -100,7 +100,7 @@
 		float: none;
 		position: absolute;
 		right: 0;
-	
+
 		@media (max-width: 782px) {
 			#wp-admin-bar-help-center {
 				display: block !important;
@@ -115,18 +115,18 @@
 					}
 				}
 			}
-	
+
 			#wp-admin-bar-notes {
 				display: block !important;
 				width: 52px !important;
 				.ab-item {
 					justify-content: center;
-	
+
 					.noticon-bell {
 						width: 36px;
 						height: 46px;
 						top: 0;
-	
+
 						&:before {
 							background-position-y: bottom;
 							background-position-x: center;
@@ -137,7 +137,7 @@
 						}
 					}
 				}
-	
+
 				#wpnt-notes-panel2 {
 					top: 46px;
 				}
@@ -146,4 +146,9 @@
 	}
 }
 
-
+/**
+ * Always show the House icon by the site name.
+ */
+#wpadminbar #wp-admin-bar-site-name>.ab-item:before {
+  content: "\f102" !important;
+}

projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/event-countdown/edit.js

@@ -1,8 +1,7 @@
 import { useBlockProps } from '@wordpress/block-editor';
 import { Button, DateTimePicker, Dropdown, Placeholder } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
-// eslint-disable-next-line wpcalypso/no-unsafe-wp-apis
-import { dateI18n, __experimentalGetSettings } from '@wordpress/date';
+import { dateI18n, __experimentalGetSettings } from '@wordpress/date'; // eslint-disable-line @wordpress/no-unsafe-wp-apis
 import { __ } from '@wordpress/i18n';
 import clsx from 'clsx';
 import moment from 'moment';

projects/packages/my-jetpack/_inc/components/my-jetpack-screen/index.jsx

@@ -11,6 +11,7 @@ import {
 	useBreakpointMatch,
 	ActionButton,
 } from '@automattic/jetpack-components';
+import { useExperiment } from '@automattic/jetpack-explat';
 import clsx from 'clsx';
 import { useContext, useEffect, useLayoutEffect, useState } from 'react';
 /*
@@ -73,6 +74,7 @@ const GlobalNotice = ( { message, title, options } ) => {
  * @returns {object} The MyJetpackScreen component.
  */
 export default function MyJetpackScreen() {
+	useExperiment( 'explat_test_jetpack_implementation_aa_test' );
 	useNotificationWatcher();
 	const { redBubbleAlerts } = getMyJetpackWindowInitialState();
 	const { jetpackManage = {}, adminUrl } = getMyJetpackWindowInitialState();