Update wordpress monorepo (#39176)

* Update wordpress monorepo * js-packages/components: ToggleControl: Update styles for WordPress/gutenberg#63490 That change started setting a height on the control itself (versus just the stuff inside it), so update our styles to override that too. * Add `__nextHasNoMarginBottom` all over the place The vast majority are inside a `PanelBody`, which already overrides margins. Had to fix one margin on the simple-payments block. --------- Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com>
Automattic · Sep 3, 2024 · fe2a3d1 · fe2a3d1
1 parent ea5eeb0
commit fe2a3d1
Show file tree

Hide file tree

Showing 121 changed files with 2,297 additions and 2,020 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/ai-client/changelog/renovate-wordpress-monorepo b/projects/js-packages/ai-client/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json
@@ -50,15 +50,15 @@
 		"@microsoft/fetch-event-source": "2.0.1",
 		"@types/react": "18.3.3",
 		"@types/wordpress__block-editor": "11.5.15",
-		"@wordpress/api-fetch": "7.5.0",
-		"@wordpress/blob": "4.5.0",
-		"@wordpress/block-editor": "14.0.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/compose": "7.5.0",
-		"@wordpress/data": "10.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/icons": "10.5.0",
+		"@wordpress/api-fetch": "7.6.0",
+		"@wordpress/blob": "4.6.0",
+		"@wordpress/block-editor": "14.1.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/compose": "7.6.0",
+		"@wordpress/data": "10.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/icons": "10.6.0",
 		"clsx": "2.1.1",
 		"debug": "4.3.4",
 		"markdown-it": "14.0.0",

diff --git a/projects/js-packages/api/changelog/renovate-wordpress-monorepo b/projects/js-packages/api/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
@@ -15,7 +15,7 @@
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
 		"@automattic/jetpack-config": "workspace:*",
-		"@wordpress/url": "4.5.0"
+		"@wordpress/url": "4.6.0"
 	},
 	"devDependencies": {
 		"jest": "29.7.0",

diff --git a/projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo b/projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/base-styles/package.json b/projects/js-packages/base-styles/package.json
@@ -20,6 +20,6 @@
 		"build-production-js": "echo 'Not implemented.'"
 	},
 	"devDependencies": {
-		"@wordpress/base-styles": "5.5.0"
+		"@wordpress/base-styles": "5.6.0"
 	}
 }
diff --git a/projects/js-packages/boost-score-api/changelog/renovate-wordpress-monorepo b/projects/js-packages/boost-score-api/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/boost-score-api/package.json b/projects/js-packages/boost-score-api/package.json
@@ -20,7 +20,7 @@
 		"test": "jest tests"
 	},
 	"dependencies": {
-		"@wordpress/i18n": "5.5.0",
+		"@wordpress/i18n": "5.6.0",
 		"zod": "3.22.3"
 	},
 	"devDependencies": {

diff --git a/projects/js-packages/components/changelog/renovate-wordpress-monorepo b/projects/js-packages/components/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/components/changelog/renovate-wordpress-monorepo#2 b/projects/js-packages/components/changelog/renovate-wordpress-monorepo#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+ToggleControl: Update styles for WordPress/gutenberg#63490.
diff --git a/projects/js-packages/components/components/toggle-control/index.tsx b/projects/js-packages/components/components/toggle-control/index.tsx
@@ -56,6 +56,7 @@ const ToggleControl: React.FC< ToggleControlProps > = ( {
 
 	return (
 		<WPToggleControl
+			__nextHasNoMarginBottom={ true }
 			checked={ showChecked }
 			className={ clsx( styles.toggle, className, {
 				[ styles[ 'is-toggling' ] ]: toggling,

diff --git a/projects/js-packages/components/components/toggle-control/styles.module.scss b/projects/js-packages/components/components/toggle-control/styles.module.scss
@@ -16,6 +16,7 @@
 	:global {
 		.components-form-toggle {
 			--wp-admin-theme-color: var( --jp-green-40 );
+			height: calc( var(--base-width) * 3 );
 
 
 			&__input:focus + .components-form-toggle__track {

diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
@@ -17,15 +17,15 @@
 		"@automattic/format-currency": "1.0.1",
 		"@automattic/jetpack-boost-score-api": "workspace:*",
 		"@babel/runtime": "^7",
-		"@wordpress/browserslist-config": "6.5.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/compose": "7.5.0",
-		"@wordpress/data": "10.5.0",
-		"@wordpress/date": "5.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/icons": "10.5.0",
-		"@wordpress/notices": "5.5.0",
+		"@wordpress/browserslist-config": "6.6.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/compose": "7.6.0",
+		"@wordpress/data": "10.6.0",
+		"@wordpress/date": "5.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/icons": "10.6.0",
+		"@wordpress/notices": "5.6.0",
 		"clsx": "2.1.1",
 		"prop-types": "^15.7.2",
 		"qrcode.react": "3.1.0",

diff --git a/projects/js-packages/connection/changelog/renovate-wordpress-monorepo b/projects/js-packages/connection/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
@@ -19,13 +19,13 @@
 		"@automattic/jetpack-components": "workspace:*",
 		"@automattic/jetpack-config": "workspace:*",
 		"@automattic/jetpack-script-data": "workspace:*",
-		"@wordpress/base-styles": "5.5.0",
-		"@wordpress/browserslist-config": "6.5.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/data": "10.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/icons": "10.5.0",
+		"@wordpress/base-styles": "5.6.0",
+		"@wordpress/browserslist-config": "6.6.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/data": "10.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/icons": "10.6.0",
 		"clsx": "2.1.1",
 		"debug": "4.3.4",
 		"prop-types": "^15.7.2"

diff --git a/projects/js-packages/eslint-config-target-es/changelog/renovate-wordpress-monorepo b/projects/js-packages/eslint-config-target-es/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/eslint-config-target-es/package.json b/projects/js-packages/eslint-config-target-es/package.json
@@ -23,7 +23,7 @@
 		"semver": "^7.3.5"
 	},
 	"devDependencies": {
-		"@wordpress/browserslist-config": "6.5.0",
+		"@wordpress/browserslist-config": "6.6.0",
 		"eslint": "8.57.0",
 		"eslint-plugin-es-x": "7.8.0",
 		"globals": "15.4.0",

diff --git a/projects/js-packages/i18n-loader-webpack-plugin/changelog/renovate-wordpress-monorepo b/projects/js-packages/i18n-loader-webpack-plugin/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/package.json b/projects/js-packages/i18n-loader-webpack-plugin/package.json
@@ -20,8 +20,8 @@
 		"debug": "^4.3.2"
 	},
 	"devDependencies": {
-		"@wordpress/dependency-extraction-webpack-plugin": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
 		"jest": "29.7.0",
 		"webpack": "5.94.0",
 		"webpack-cli": "4.9.1"

diff --git a/projects/js-packages/idc/changelog/renovate-wordpress-monorepo b/projects/js-packages/idc/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json
@@ -9,13 +9,13 @@
 		"@automattic/jetpack-api": "workspace:*",
 		"@automattic/jetpack-base-styles": "workspace:*",
 		"@automattic/jetpack-components": "workspace:*",
-		"@wordpress/base-styles": "5.5.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/compose": "7.5.0",
-		"@wordpress/data": "10.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/url": "4.5.0",
+		"@wordpress/base-styles": "5.6.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/compose": "7.6.0",
+		"@wordpress/data": "10.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/url": "4.6.0",
 		"prop-types": "^15.7.2"
 	},
 	"devDependencies": {

diff --git a/projects/js-packages/licensing/changelog/renovate-wordpress-monorepo b/projects/js-packages/licensing/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/licensing/components/activation-screen-controls/index.jsx b/projects/js-packages/licensing/components/activation-screen-controls/index.jsx
@@ -24,6 +24,7 @@ const ManualLicenseKeyInput = props => {
 
 	return (
 		<TextControl
+			__nextHasNoMarginBottom={ true }
 			className={ className }
 			label={ __( 'License key', 'jetpack' ) }
 			value={ value }
@@ -97,6 +98,7 @@ const SelectableLicenseKeyInput = props => {
 	return (
 		<>
 			<SelectControl
+				__nextHasNoMarginBottom={ true }
 				className={ className }
 				disabled={ disabled }
 				label={ __( 'Select a license key', 'jetpack' ) }
@@ -107,6 +109,7 @@ const SelectableLicenseKeyInput = props => {
 
 			{ ! isFetching && ! selectedOption && (
 				<TextControl
+					__nextHasNoMarginBottom={ true }
 					className={ className }
 					label={ __( 'Input a license key', 'jetpack' ) }
 					value={ value }

diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json
@@ -22,11 +22,11 @@
 		"@automattic/jetpack-analytics": "workspace:*",
 		"@automattic/jetpack-api": "workspace:*",
 		"@automattic/jetpack-components": "workspace:*",
-		"@wordpress/api-fetch": "7.5.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/icons": "10.5.0",
+		"@wordpress/api-fetch": "7.6.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/icons": "10.6.0",
 		"clsx": "2.1.1",
 		"prop-types": "15.7.2"
 	},
@@ -39,7 +39,7 @@
 		"@testing-library/dom": "10.1.0",
 		"@testing-library/react": "15.0.7",
 		"@testing-library/user-event": "14.5.2",
-		"@wordpress/babel-plugin-import-jsx-pragma": "5.5.0",
+		"@wordpress/babel-plugin-import-jsx-pragma": "5.6.0",
 		"babel-jest": "29.7.0",
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",

diff --git a/projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo b/projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json
@@ -26,8 +26,8 @@
 		"@testing-library/dom": "10.1.0",
 		"@testing-library/react": "15.0.7",
 		"@testing-library/user-event": "14.5.2",
-		"@wordpress/base-styles": "5.5.0",
-		"@wordpress/data": "10.5.0",
+		"@wordpress/base-styles": "5.6.0",
+		"@wordpress/data": "10.6.0",
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",
 		"jest-extended": "4.0.2",
@@ -41,7 +41,7 @@
 	"dependencies": {
 		"@automattic/jetpack-components": "workspace:*",
 		"@automattic/jetpack-connection": "workspace:*",
-		"@wordpress/i18n": "5.5.0",
+		"@wordpress/i18n": "5.6.0",
 		"clsx": "2.1.1",
 		"prop-types": "15.7.2"
 	},

diff --git a/projects/js-packages/publicize-components/changelog/renovate-wordpress-monorepo b/projects/js-packages/publicize-components/changelog/renovate-wordpress-monorepo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
@@ -25,23 +25,23 @@
 		"@automattic/jetpack-shared-extension-utils": "workspace:*",
 		"@automattic/popup-monitor": "1.0.2",
 		"@automattic/social-previews": "2.1.0-beta.6",
-		"@wordpress/annotations": "3.5.0",
-		"@wordpress/api-fetch": "7.5.0",
-		"@wordpress/block-editor": "14.0.0",
-		"@wordpress/blocks": "13.5.0",
-		"@wordpress/components": "28.5.0",
-		"@wordpress/compose": "7.5.0",
-		"@wordpress/data": "10.5.0",
-		"@wordpress/date": "5.5.0",
-		"@wordpress/edit-post": "8.5.0",
-		"@wordpress/editor": "14.5.0",
-		"@wordpress/element": "6.5.0",
-		"@wordpress/hooks": "4.5.0",
-		"@wordpress/html-entities": "4.5.0",
-		"@wordpress/i18n": "5.5.0",
-		"@wordpress/icons": "10.5.0",
-		"@wordpress/media-utils": "5.5.0",
-		"@wordpress/notices": "5.5.0",
+		"@wordpress/annotations": "3.6.0",
+		"@wordpress/api-fetch": "7.6.0",
+		"@wordpress/block-editor": "14.1.0",
+		"@wordpress/blocks": "13.6.0",
+		"@wordpress/components": "28.6.0",
+		"@wordpress/compose": "7.6.0",
+		"@wordpress/data": "10.6.0",
+		"@wordpress/date": "5.6.0",
+		"@wordpress/edit-post": "8.6.1",
+		"@wordpress/editor": "14.6.0",
+		"@wordpress/element": "6.6.0",
+		"@wordpress/hooks": "4.6.0",
+		"@wordpress/html-entities": "4.6.0",
+		"@wordpress/i18n": "5.6.0",
+		"@wordpress/icons": "10.6.0",
+		"@wordpress/media-utils": "5.6.0",
+		"@wordpress/notices": "5.6.0",
 		"clsx": "2.1.1",
 		"prop-types": "15.8.1",
 		"react-page-visibility": "7.0.0",
@@ -62,8 +62,8 @@
 		"@types/react": "18.3.3",
 		"@types/wordpress__editor": "13.6.8",
 		"@types/wordpress__media-utils": "4.14.4",
-		"@wordpress/babel-plugin-import-jsx-pragma": "5.5.0",
-		"@wordpress/core-data": "7.5.0",
+		"@wordpress/babel-plugin-import-jsx-pragma": "5.6.0",
+		"@wordpress/core-data": "7.6.0",
 		"babel-jest": "29.4.3",
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",

diff --git a/projects/js-packages/publicize-components/src/components/generated-image-preview/index.js b/projects/js-packages/publicize-components/src/components/generated-image-preview/index.js
@@ -113,7 +113,10 @@ export default function GeneratedImagePreview( {
 
 	return (
 		<ThemeProvider>
-			<BaseControl label={ _x( 'Preview', 'Heading for the generated preview image', 'jetpack' ) }>
+			<BaseControl
+				__nextHasNoMarginBottom={ true }
+				label={ _x( 'Preview', 'Heading for the generated preview image', 'jetpack' ) }
+			>
 				<div className={ styles.container }>
 					<img
 						className={ clsx( {

diff --git a/.../publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx b/.../publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx
@@ -240,6 +240,7 @@ export function ConfirmationForm( { keyringResult, onComplete, isAdmin }: Confir
 
 						{ isAdmin ? (
 							<BaseControl
+								__nextHasNoMarginBottom={ true }
 								id="mark-connection-as-shared"
 								help={ `${ __(
 									'If enabled, the connection will be available to all administrators, editors, and authors.',

diff --git a/projects/js-packages/publicize-components/src/components/media-section/index.js b/projects/js-packages/publicize-components/src/components/media-section/index.js
@@ -68,7 +68,11 @@ export default function MediaSection( {
 
 	return (
 		<ThemeProvider>
-			<BaseControl label={ __( 'Attached Media', 'jetpack' ) } className={ styles.wrapper }>
+			<BaseControl
+				__nextHasNoMarginBottom={ true }
+				label={ __( 'Attached Media', 'jetpack' ) }
+				className={ styles.wrapper }
+			>
 				{ renderHeaderSection() }
 				<MediaWrapper { ...mediaWrapperProps }>
 					<MediaPicker

diff --git a/...cts/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js b/...cts/js-packages/publicize-components/src/components/social-image-generator/panel/modal.js
@@ -93,7 +93,11 @@ const SocialImageGeneratorSettingsModal = ( { onClose } ) => {
 						'jetpack'
 					) }
 				/>
-				<BaseControl label={ __( 'Templates', 'jetpack' ) } className={ styles.templateControl }>
+				<BaseControl
+					__nextHasNoMarginBottom={ true }
+					label={ __( 'Templates', 'jetpack' ) }
+					className={ styles.templateControl }
+				>
 					<TemplatePicker value={ localTemplate } onTemplateSelected={ setEditedTemplate } />
 				</BaseControl>
 				<Button onClick={ onClose } variant="tertiary">

diff --git a/projects/js-packages/scan/changelog/renovate-wordpress-monorepo#12 b/projects/js-packages/scan/changelog/renovate-wordpress-monorepo#12
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.