Merge branch 'trunk' into update/social-move-admin-page-code-to-package

projects/js-packages/ai-client/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.25.7] - 2025-01-27
+### Changed
+- Internal updates.
+
 ## [0.25.6] - 2025-01-20
 ### Changed
 - Updated package dependencies. [#41099]
@@ -506,6 +510,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - AI Client: stop using smart document visibility handling on the fetchEventSource library, so it does not restart the completion when changing tabs. [#32004]
 - Updated package dependencies. [#31468] [#31659] [#31785]
 
+[0.25.7]: https://github.com/Automattic/jetpack-ai-client/compare/v0.25.6...v0.25.7
 [0.25.6]: https://github.com/Automattic/jetpack-ai-client/compare/v0.25.5...v0.25.6
 [0.25.5]: https://github.com/Automattic/jetpack-ai-client/compare/v0.25.4...v0.25.5
 [0.25.4]: https://github.com/Automattic/jetpack-ai-client/compare/v0.25.3...v0.25.4

projects/js-packages/ai-client/package.json

@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.25.6",
+	"version": "0.25.7",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {

projects/js-packages/boost-score-api/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/boost-score-api/package.json

@@ -30,7 +30,7 @@
 		"jest-environment-jsdom": "29.7.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"exports": {
 		".": {

projects/js-packages/charts/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/charts/changelog/update-auto-margin-for-axis-labels

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Automatic margin for axis labels

projects/js-packages/charts/changelog/update-x-axis-tick-style

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Line chart: draw x-axis and ticks

projects/js-packages/charts/package.json

@@ -113,7 +113,7 @@
 		"tsconfig-paths-webpack-plugin": "4.2.0",
 		"typescript": "5.7.2",
 		"webpack": "^5.88.0",
-		"webpack-cli": "^5.1.0"
+		"webpack-cli": "^6.0.0"
 	},
 	"peerDependencies": {
 		"react": "^17.0.0 || ^18.0.0",

projects/js-packages/charts/src/components/line-chart/line-chart.tsx

@@ -97,7 +97,7 @@ const LineChart: FC< LineChartProps > = ( {
 	width,
 	height,
 	className,
-	margin = {},
+	margin,
 	withTooltips = true,
 	showLegend = false,
 	legendOrientation = 'horizontal',
@@ -110,15 +110,25 @@ const LineChart: FC< LineChartProps > = ( {
 		const seriesColors =
 			data?.map( series => series.options?.stroke ?? '' ).filter( Boolean ) ?? [];
 		return buildChartTheme( {
-			backgroundColor: providerTheme.backgroundColor,
+			...providerTheme,
 			colors: [ ...seriesColors, ...providerTheme.colors ],
-			gridStyles: providerTheme.gridStyles,
-			tickLength: providerTheme?.tickLength || 0,
-			gridColor: providerTheme?.gridColor || '',
-			gridColorDark: providerTheme?.gridColorDark || '',
 		} );
 	}, [ providerTheme, data ] );
 
+	margin = useMemo( () => {
+		// Auto-margin unless specified to make room for axis labels.
+		// Default margin is for bottom and left axis labels.
+		let defaultMargin = { top: 0, right: 0, bottom: 40, left: 40 };
+		if ( options.axis?.y?.orientation === 'right' ) {
+			defaultMargin = { ...defaultMargin, right: 40, left: 0 };
+		}
+		if ( options.axis?.x?.orientation === 'top' ) {
+			defaultMargin = { ...defaultMargin, top: 40, bottom: 0 };
+		}
+		// Merge default margin with user-specified margin.
+		return { ...defaultMargin, ...margin };
+	}, [ margin, options ] );
+
 	const error = validateData( data );
 	if ( error ) {
 		return <div className={ clsx( 'line-chart', styles[ 'line-chart' ] ) }>{ error }</div>;
@@ -147,7 +157,7 @@ const LineChart: FC< LineChartProps > = ( {
 				theme={ theme }
 				width={ width }
 				height={ height }
-				margin={ { top: 20, right: 20, bottom: 40, left: 40, ...margin } }
+				margin={ margin }
 				xScale={ { type: 'time', ...options?.xScale } }
 				yScale={ { type: 'linear', nice: true, zero: false, ...options?.yScale } }
 			>

projects/js-packages/charts/src/components/line-chart/stories/index.stories.tsx

@@ -109,6 +109,7 @@ FixedDimensions.parameters = {
 export const GridientFilled: StoryObj< typeof LineChart > = Template.bind( {} );
 GridientFilled.args = {
 	...Default.args,
+	margin: undefined,
 	data: webTrafficData,
 	withGradientFill: true,
 	options: {

projects/js-packages/charts/src/providers/theme/themes.ts

@@ -8,12 +8,14 @@ const defaultTheme: ChartTheme = {
 	labelBackgroundColor: '#FFFFFF', // label background color
 	colors: [ '#98C8DF', '#006DAB', '#A6DC80', '#1F9828', '#FF8C8F' ],
 	gridStyles: {
-		stroke: '#787C82',
+		stroke: '#DCDCDE',
 		strokeWidth: 1,
 	},
-	tickLength: 0,
+	tickLength: 4,
 	gridColor: '',
 	gridColorDark: '',
+	xTickLineStyles: { stroke: 'black' },
+	xAxisLineStyles: { stroke: '#DCDCDE', strokeWidth: 1 },
 };
 
 /**
@@ -24,12 +26,14 @@ const jetpackTheme: ChartTheme = {
 	labelBackgroundColor: '#FFFFFF', // label background color
 	colors: [ '#98C8DF', '#006DAB', '#A6DC80', '#1F9828', '#FF8C8F' ],
 	gridStyles: {
-		stroke: '#787C82',
+		stroke: '#DCDCDE',
 		strokeWidth: 1,
 	},
-	tickLength: 0,
+	tickLength: 4,
 	gridColor: '',
 	gridColorDark: '',
+	xTickLineStyles: { stroke: 'black' },
+	xAxisLineStyles: { stroke: '#DCDCDE', strokeWidth: 1 },
 };
 
 /**
@@ -43,9 +47,11 @@ const wooTheme: ChartTheme = {
 		stroke: '#787C82',
 		strokeWidth: 1,
 	},
-	tickLength: 0,
+	tickLength: 4,
 	gridColor: '',
 	gridColorDark: '',
+	xTickLineStyles: { stroke: 'black' },
+	xAxisLineStyles: { stroke: '#DCDCDE', strokeWidth: 1 },
 };
 
 export { defaultTheme, jetpackTheme, wooTheme };

projects/js-packages/charts/src/types.ts

@@ -1,5 +1,6 @@
 import { Orientation } from '@visx/axis';
 import { ScaleType } from '@visx/scale';
+import { LineStyles } from '@visx/xychart';
 import type { CSSProperties } from 'react';
 
 type ValueOf< T > = T[ keyof T ];
@@ -70,6 +71,10 @@ export type ChartTheme = {
 	gridColor: string;
 	/** Color of the grid lines in dark mode */
 	gridColorDark: string;
+	/** Styles for x-axis tick lines */
+	xTickLineStyles?: LineStyles;
+	/** Styles for x-axis line */
+	xAxisLineStyles?: LineStyles;
 };
 
 declare type AxisOptions = {

projects/js-packages/components/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/components/package.json

@@ -61,7 +61,7 @@
 		"ts-dedent": "2.2.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",

projects/js-packages/critical-css-gen/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/critical-css-gen/package.json

@@ -42,7 +42,7 @@
 		"tslib": "2.5.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1",
+		"webpack-cli": "6.0.1",
 		"webpack-dev-middleware": "5.3.4"
 	},
 	"exports": {

projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/i18n-check-webpack-plugin/package.json

@@ -25,7 +25,7 @@
 		"@babel/core": "7.26.0",
 		"jest": "29.7.0",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"peerDependencies": {
 		"@babel/core": "^7.0.0",

projects/js-packages/i18n-loader-webpack-plugin/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/i18n-loader-webpack-plugin/package.json

@@ -25,7 +25,7 @@
 		"@wordpress/i18n": "5.16.0",
 		"jest": "29.7.0",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"peerDependencies": {
 		"webpack": "^5.94.0"

projects/js-packages/image-guide/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/image-guide/package.json

@@ -54,7 +54,7 @@
 		"tslib": "2.5.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"exports": {
 		".": {

projects/js-packages/react-data-sync-client/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/react-data-sync-client/package.json

@@ -29,7 +29,7 @@
 		"tslib": "2.5.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1",
+		"webpack-cli": "6.0.1",
 		"zod": "3.22.3"
 	},
 	"exports": {

projects/js-packages/remove-asset-webpack-plugin/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/remove-asset-webpack-plugin/package.json

@@ -23,7 +23,7 @@
 	"devDependencies": {
 		"jest": "29.7.0",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"peerDependencies": {
 		"webpack": "^5.94.0"

projects/js-packages/storybook/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/storybook/package.json

@@ -68,7 +68,7 @@
 		"ts-dedent": "2.2.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"dependencies": {
 		"@wordpress/api-fetch": "7.16.0"

projects/js-packages/svelte-data-sync-client/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/svelte-data-sync-client/package.json

@@ -29,7 +29,7 @@
 		"tslib": "2.5.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1",
+		"webpack-cli": "6.0.1",
 		"zod": "3.22.3"
 	},
 	"exports": {

projects/js-packages/videopress-core/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/videopress-core/package.json

@@ -29,7 +29,7 @@
 		"tslib": "2.5.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"exports": {
 		".": "./index.jsx",

projects/js-packages/webpack-config/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/js-packages/webpack-config/package.json

@@ -46,7 +46,7 @@
 		"@babel/runtime": "7.26.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"peerDependencies": {
 		"@babel/core": "^7.0.0",

projects/packages/assets/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/packages/assets/package.json

@@ -22,6 +22,6 @@
 		"jest": "29.7.0",
 		"md5-es": "1.8.2",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	}
 }

projects/packages/backup/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/packages/backup/package.json

@@ -62,6 +62,6 @@
 		"sass-loader": "12.4.0",
 		"typescript": "5.0.4",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	}
 }

projects/packages/blaze/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.

projects/packages/blaze/package.json

@@ -45,7 +45,7 @@
 		"sass": "1.64.1",
 		"sass-loader": "12.4.0",
 		"webpack": "5.94.0",
-		"webpack-cli": "4.9.1"
+		"webpack-cli": "6.0.1"
 	},
 	"browserslist": [
 		"extends @wordpress/browserslist-config"

projects/packages/calypsoify/changelog/renovate-webpack-cli-6.x

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.