Merge remote-tracking branch 'origin/trunk' into dotcom-14866-remove-calypsoify

jeherve · jeherve · commit 6827929753b3 · 2025-10-06T11:09:37.000+02:00
diff --git a/projects/js-packages/charts/changelog/charts-103-add-legend-margin-and-styling-customization-props b/projects/js-packages/charts/changelog/charts-103-add-legend-margin-and-styling-customization-props
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Charts: add legendItemClassName prop for custom legend item styling
diff --git a/projects/js-packages/charts/src/components/bar-chart/bar-chart.tsx b/projects/js-packages/charts/src/components/bar-chart/bar-chart.tsx
@@ -84,6 +84,7 @@ const BarChartInternal: FC< BarChartProps > = ( {
 	legendAlignment = 'center',
 	legendMaxWidth,
 	legendTextOverflow = 'wrap',
+	legendItemClassName,
 	legendShape = 'rect',
 	gridVisibility: gridVisibilityProp,
 	renderTooltip,
@@ -385,6 +386,7 @@ const BarChartInternal: FC< BarChartProps > = ( {
 						alignment={ legendAlignment }
 						maxWidth={ legendMaxWidth }
 						textOverflow={ legendTextOverflow }
+						legendItemClassName={ legendItemClassName }
 						className={ styles[ 'bar-chart__legend' ] }
 						shape={ legendShape }
 						ref={ legendRef }
diff --git a/projects/js-packages/charts/src/components/legend/private/base-legend.tsx b/projects/js-packages/charts/src/components/legend/private/base-legend.tsx
@@ -78,6 +78,7 @@ export const BaseLegend: ForwardRefExoticComponent<
 			itemMargin = '0',
 			itemDirection = 'row',
 			legendLabelProps,
+			legendItemClassName,
 			...legendItemProps
 		},
 		ref
@@ -120,7 +121,11 @@ export const BaseLegend: ForwardRefExoticComponent<
 					>
 						{ labels.map( ( label, i ) => (
 							<LegendItem
-								className={ clsx( 'visx-legend-item', styles[ 'legend-item' ] ) }
+								className={ clsx(
+									'visx-legend-item',
+									styles[ 'legend-item' ],
+									legendItemClassName
+								) }
 								data-testid="legend-item"
 								key={ `legend-${ label.text }-${ i }` }
 								margin={ itemMargin }
diff --git a/projects/js-packages/charts/src/components/legend/test/legend.test.tsx b/projects/js-packages/charts/src/components/legend/test/legend.test.tsx
@@ -43,6 +43,20 @@ describe( 'BaseLegend', () => {
 		expect( legendItems ).toHaveLength( 0 );
 	} );
 
+	test( 'applies legendItemClassName to legend items', () => {
+		render(
+			<BaseLegend
+				items={ defaultItems }
+				orientation="horizontal"
+				legendItemClassName="custom-legend-item"
+			/>
+		);
+		const legendItems = screen.getAllByTestId( 'legend-item' );
+		legendItems.forEach( item => {
+			expect( item ).toHaveClass( 'custom-legend-item' );
+		} );
+	} );
+
 	test( 'handles missing values', () => {
 		const itemsWithoutValues = [
 			{ label: 'Item 1', color: '#ff0000', value: undefined },
diff --git a/projects/js-packages/charts/src/components/legend/types.ts b/projects/js-packages/charts/src/components/legend/types.ts
@@ -24,6 +24,11 @@ export type BaseLegendProps = Omit< LegendOrdinalProps, 'shapeStyle' > & {
 	 * - 'wrap': Wrap text to multiple lines (default, ideal for larger displays)
 	 */
 	textOverflow?: 'ellipsis' | 'wrap';
+	/**
+	 * Additional CSS class name for legend items.
+	 * This allows consumers to customize individual legend item styling.
+	 */
+	legendItemClassName?: string;
 };
 
 export type LegendProps = Omit< BaseLegendProps, 'items' > & {
diff --git a/projects/js-packages/charts/src/components/line-chart/line-chart.tsx b/projects/js-packages/charts/src/components/line-chart/line-chart.tsx
@@ -214,6 +214,7 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 			legendPosition = 'bottom',
 			legendMaxWidth,
 			legendTextOverflow = 'wrap',
+			legendItemClassName,
 			renderGlyph = defaultRenderGlyph,
 			glyphStyle = {},
 			legendShape = 'line',
@@ -531,6 +532,7 @@ const LineChartInternal = forwardRef< SingleChartRef, LineChartProps >(
 							position={ legendPosition }
 							maxWidth={ legendMaxWidth }
 							textOverflow={ legendTextOverflow }
+							legendItemClassName={ legendItemClassName }
 							className={ styles[ 'line-chart-legend' ] }
 							shape={ legendShape }
 							chartId={ chartId }
diff --git a/projects/js-packages/charts/src/components/pie-chart/pie-chart.tsx b/projects/js-packages/charts/src/components/pie-chart/pie-chart.tsx
@@ -138,6 +138,7 @@ const PieChartInternal = ( {
 	legendAlignment = 'center',
 	legendMaxWidth,
 	legendTextOverflow = 'wrap',
+	legendItemClassName,
 	legendShape = 'circle',
 	size,
 	thickness = 1,
@@ -367,6 +368,7 @@ const PieChartInternal = ( {
 						alignment={ legendAlignment }
 						maxWidth={ legendMaxWidth }
 						textOverflow={ legendTextOverflow }
+						legendItemClassName={ legendItemClassName }
 						className={ styles[ 'pie-chart-legend' ] }
 						shape={ legendShape }
 						ref={ legendRef }
diff --git a/projects/js-packages/charts/src/components/pie-semi-circle-chart/pie-semi-circle-chart.tsx b/projects/js-packages/charts/src/components/pie-semi-circle-chart/pie-semi-circle-chart.tsx
@@ -130,6 +130,7 @@ const PieSemiCircleChartInternal: FC< PieSemiCircleChartProps > = ( {
 	legendAlignment = 'center',
 	legendMaxWidth,
 	legendTextOverflow = 'wrap',
+	legendItemClassName,
 	legendShape = 'circle',
 	legendValueDisplay = 'percentage',
 	label,
@@ -355,6 +356,7 @@ const PieSemiCircleChartInternal: FC< PieSemiCircleChartProps > = ( {
 						alignment={ legendAlignment }
 						maxWidth={ legendMaxWidth }
 						textOverflow={ legendTextOverflow }
+						legendItemClassName={ legendItemClassName }
 						shape={ legendShape }
 						ref={ legendRef }
 						chartId={ chartId }
diff --git a/projects/js-packages/charts/src/stories/legend-config.tsx b/projects/js-packages/charts/src/stories/legend-config.tsx
@@ -52,4 +52,10 @@ export const legendArgTypes = {
 		description:
 			'Controls how text behaves when it exceeds legendMaxWidth. "ellipsis" truncates with ... (ideal for widgets), "wrap" allows text to wrap to multiple lines.',
 	},
+	legendItemClassName: {
+		control: { type: 'text' as const },
+		table: { category: 'Legend' },
+		description:
+			'Additional CSS class name for legend items. This allows consumers to customize individual legend item styling.',
+	},
 };
diff --git a/projects/js-packages/charts/src/types.ts b/projects/js-packages/charts/src/types.ts
@@ -355,6 +355,11 @@ export type BaseChartProps< T = DataPoint | DataPointDate | LeaderboardEntry > =
 	 * - 'wrap': Wrap text to multiple lines (default, ideal for larger displays)
 	 */
 	legendTextOverflow?: 'ellipsis' | 'wrap';
+	/**
+	 * Additional CSS class name for legend items.
+	 * This allows consumers to customize individual legend item styling.
+	 */
+	legendItemClassName?: string;
 	/**
 	 * Grid visibility. x is default when orientation is vertical. y is default when orientation is horizontal.
 	 */
diff --git a/projects/packages/autoloader/changelog/fix-testing-replace_RunClassInSeparateProcess_with_RunTestsInSeparateProcesses b/projects/packages/autoloader/changelog/fix-testing-replace_RunClassInSeparateProcess_with_RunTestsInSeparateProcesses
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Tests: Replace deprecated RunClassInSeparateProcess attribute with errantly-equivalent RunTestsInSeparateProcesses. 
diff --git a/projects/packages/autoloader/tests/php/tests/unit/AutoloaderHandlerTest.php b/projects/packages/autoloader/tests/php/tests/unit/AutoloaderHandlerTest.php
@@ -9,16 +9,16 @@
 namespace Automattic\Jetpack\Autoloader\jpCurrent;
 
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the Autoloader handler.
  *
- * @runClassInSeparateProcess
+ * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  */
-#[RunClassInSeparateProcess]
+#[RunTestsInSeparateProcesses]
 #[PreserveGlobalState( false )]
 class AutoloaderHandlerTest extends TestCase {
 
diff --git a/projects/packages/autoloader/tests/php/tests/unit/PluginLocatorTest.php b/projects/packages/autoloader/tests/php/tests/unit/PluginLocatorTest.php
@@ -9,16 +9,16 @@
 namespace Automattic\Jetpack\Autoloader\jpCurrent;
 
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the Autoloader part that handles active plugin guessing.
  *
- * @runClassInSeparateProcess
+ * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  */
-#[RunClassInSeparateProcess]
+#[RunTestsInSeparateProcesses]
 #[PreserveGlobalState( false )]
 class PluginLocatorTest extends TestCase {
 
diff --git a/projects/packages/forms/changelog/add-forms-integrations-loading-state b/projects/packages/forms/changelog/add-forms-integrations-loading-state
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Forms: add loading spinner for integrations.
diff --git a/projects/packages/forms/changelog/fix-forms-endpoints-preloading b/projects/packages/forms/changelog/fix-forms-endpoints-preloading
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Forms: improve preloading for endpoints.
diff --git a/projects/packages/forms/changelog/fix-forms-integrations-bottom-border b/projects/packages/forms/changelog/fix-forms-integrations-bottom-border
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: fix integrations bottom border.
diff --git a/projects/packages/forms/changelog/remove-forms-integration-spinner b/projects/packages/forms/changelog/remove-forms-integration-spinner
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: remove integrations loading spinner.
diff --git a/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php b/projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php
@@ -807,7 +807,9 @@ public static function load_editor_scripts() {
 	 */
 	public static function preload_endpoints( $paths ) {
 		$paths[] = array( '/wp/v2/feedback/config', 'GET' );
+		$paths[] = array( '/wp/v2/feedback/config?_locale=user', 'GET' );
 		$paths[] = array( '/wp/v2/feedback/integrations?version=2', 'GET' );
+		$paths[] = array( '/wp/v2/feedback/integrations?version=2&_locale=user', 'GET' );
 		return $paths;
 	}
 
diff --git a/projects/packages/forms/src/dashboard/class-dashboard.php b/projects/packages/forms/src/dashboard/class-dashboard.php
@@ -85,7 +85,9 @@ public function load_admin_scripts() {
 		// Preload Forms endpoints needed in dashboard context.
 		$preload_paths = array(
 			'/wp/v2/feedback/config',
+			'/wp/v2/feedback/config?_locale=user',
 			'/wp/v2/feedback/integrations?version=2',
+			'/wp/v2/feedback/integrations?version=2&_locale=user',
 		);
 		$preload_data  = array_reduce( $preload_paths, 'rest_preload_api_request', array() );
 		wp_add_inline_script(
diff --git a/projects/packages/forms/src/dashboard/integrations/index.tsx b/projects/packages/forms/src/dashboard/integrations/index.tsx
@@ -134,7 +134,6 @@ const Integrations = () => {
 							onToggle={ handleToggleCreativeMail }
 							data={ creativeMailData }
 							refreshStatus={ refreshIntegrations }
-							borderBottom={ false }
 						/>
 					) }
 				</div>
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/domain-upsell-launchpad-redirects-to-domain-and-plan-flow b/projects/packages/jetpack-mu-wpcom/changelog/domain-upsell-launchpad-redirects-to-domain-and-plan-flow
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Launchpad: Link to domain-and-plan flow within domain_upsell task
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-remove-rdv-logic b/projects/packages/jetpack-mu-wpcom/changelog/update-remove-rdv-logic
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Clean-up the code for quick switcher after RDV
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php
@@ -102,7 +102,7 @@ function wpcom_launchpad_get_task_definitions() {
 						return '/domains/manage/' . $data['site_slug_encoded'];
 				}
 
-				return '/setup/domain-upsell/domains?siteSlug=' . $data['site_slug_encoded'];
+				return '/setup/domain-and-plan/domains?siteSlug=' . $data['site_slug_encoded'];
 			},
 		),
 		'first_post_published'            => array(
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-interface/wpcom-admin-interface.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-interface/wpcom-admin-interface.php
@@ -220,21 +220,6 @@ function () {
 	},
 	PHP_INT_MAX
 );
-/**
- * Hides the "View" switcher on WP Admin screens that have been untangled.
- */
-function wpcom_duplicate_views_hide_view_switcher() {
-	$admin_menu_class = wpcom_get_custom_admin_menu_class();
-	if ( $admin_menu_class ) {
-		$admin_menu = $admin_menu_class::get_instance();
-
-		$current_screen = wpcom_admin_get_current_screen();
-		if ( in_array( $current_screen, WPCOM_DUPLICATED_VIEW, true ) ) {
-			remove_filter( 'in_admin_header', array( $admin_menu, 'add_dashboard_switcher' ) );
-		}
-	}
-}
-add_action( 'admin_init', 'wpcom_duplicate_views_hide_view_switcher' );
 
 /**
  * Determines whether the admin interface has been recently changed by checking the presence of the `admin-interface-changed` query param.
diff --git a/projects/packages/masterbar/changelog/update-remove-rdv-logic b/projects/packages/masterbar/changelog/update-remove-rdv-logic
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Clean-up the code for quick switcher after RDV
diff --git a/projects/packages/masterbar/src/admin-menu/menu-mappings.php b/projects/packages/masterbar/src/admin-menu/menu-mappings.php
@@ -6,27 +6,7 @@
  */
 
 $common_mappings = array(
-	'upload.php'                             => 'https://wordpress.com/media/',
-	'edit.php'                               => 'https://wordpress.com/posts/',
-	'edit-comments.php'                      => 'https://wordpress.com/comments/',
-	'import.php'                             => 'https://wordpress.com/import/',
-	'edit.php?post_type=page'                => 'https://wordpress.com/pages/',
-	'edit.php?post_type=post'                => 'https://wordpress.com/posts/',
-	'users.php'                              => 'https://wordpress.com/people/team/',
-	'options-general.php'                    => 'https://wordpress.com/settings/general/',
-	'options-discussion.php'                 => 'https://wordpress.com/settings/discussion/',
-	'options-reading.php'                    => 'https://wordpress.com/settings/reading/',
-	'options-writing.php'                    => 'https://wordpress.com/settings/writing/',
-	'themes.php'                             => 'https://wordpress.com/themes/',
-	'edit-tags.php?taxonomy=category'        => 'https://wordpress.com/settings/taxonomies/category/',
-	'edit-tags.php?taxonomy=post_tag'        => 'https://wordpress.com/settings/taxonomies/post_tag/',
-	'edit.php?post_type=jetpack-portfolio'   => 'https://wordpress.com/types/jetpack-portfolio/',
-	'edit.php?post_type=jetpack-testimonial' => 'https://wordpress.com/types/jetpack-testimonial/',
+	'users.php' => 'https://wordpress.com/people/team/',
 );
 
-if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
-	// WPCOM Specific mappings.
-	$common_mappings['export.php'] = 'https://wordpress.com/export/';
-}
-
 return $common_mappings;
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php
@@ -380,7 +380,7 @@ private function is_allowed_plugin_handle( $handle ) {
 	 * @return string The absolute URL.
 	 */
 	public function make_url_absolute( $src ) {
-		if ( ! empty( $src ) && strpos( $src, '/' ) === 0 && strpos( $src, '//' ) !== 0 ) {
+		if ( ! empty( $src ) && str_starts_with( $src, '/' ) && ! str_starts_with( $src, '//' ) ) {
 			return site_url( $src );
 		}
 		return $src;
diff --git a/projects/plugins/jetpack/changelog/fix-forms-endpoints-preloading b/projects/plugins/jetpack/changelog/fix-forms-endpoints-preloading
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Forms: improve preloading for endpoints.
diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-direct_access_fatals_part_8 b/projects/plugins/jetpack/changelog/fix-jetpack-direct_access_fatals_part_8
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Prevent PHP errors by limiting direct access to files.
+
+
diff --git a/projects/plugins/jetpack/changelog/fix-legacy-cookie-consent-i18n b/projects/plugins/jetpack/changelog/fix-legacy-cookie-consent-i18n
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Cookie Consent Widget: ensure the default widget text can be translated.
diff --git a/projects/plugins/jetpack/changelog/improve-tiled-gallery-img-loading-animation-perf b/projects/plugins/jetpack/changelog/improve-tiled-gallery-img-loading-animation-perf
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Tiled Gallery: Improve editor animation performance by removing loading animations when possible.
diff --git a/projects/plugins/jetpack/changelog/refactor-optimize-editor-assets-url-processing b/projects/plugins/jetpack/changelog/refactor-optimize-editor-assets-url-processing
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Editor assets endpoint: optimize URL processing
diff --git a/projects/plugins/jetpack/extensions/blocks/contact-form/contact-form.php b/projects/plugins/jetpack/extensions/blocks/contact-form/contact-form.php
@@ -7,6 +7,10 @@
 
 namespace Automattic\Jetpack\Extensions\Contact_Form;
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit( 0 );
+}
+
 // Register the block
 add_action( 'init', array( Contact_Form_Block::class, 'register_block' ), 9 );
 
diff --git a/projects/plugins/jetpack/extensions/blocks/paypal-payment-buttons/paypal-payment-buttons.php b/projects/plugins/jetpack/extensions/blocks/paypal-payment-buttons/paypal-payment-buttons.php
@@ -9,6 +9,10 @@
 
 use Automattic\Jetpack\PaypalPayments\PayPal_Payment_Buttons;
 
+if ( ! defined( 'ABSPATH' ) ) {
+	exit( 0 );
+}
+
 // Register the block.
 add_action( 'init', array( PayPal_Payment_Buttons::class, 'register_block' ), 9 );
 
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/editor.scss b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/editor.scss
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
diff --git a/projects/plugins/jetpack/extensions/plugins/seo/seo.php b/projects/plugins/jetpack/extensions/plugins/seo/seo.php
diff --git a/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php b/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/dotcom-14866-remove-calypsoify#2 b/projects/plugins/mu-wpcom-plugin/changelog/dotcom-14866-remove-calypsoify#2
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-abandon-calypsoify-45356 b/projects/plugins/mu-wpcom-plugin/changelog/update-abandon-calypsoify-45356
diff --git a/projects/plugins/wpcomsh/changelog/a4a-sync-changes-from-wpcom-features-3 b/projects/plugins/wpcomsh/changelog/a4a-sync-changes-from-wpcom-features-3
diff --git a/projects/plugins/wpcomsh/changelog/dotcom-14866-remove-calypsoify#2 b/projects/plugins/wpcomsh/changelog/dotcom-14866-remove-calypsoify#2
diff --git a/projects/plugins/wpcomsh/changelog/update-abandon-calypsoify-45356 b/projects/plugins/wpcomsh/changelog/update-abandon-calypsoify-45356
diff --git a/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php b/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php
