From 1f728aa0e9c9decd6a3b47a305968eb99a9c9000 Mon Sep 17 00:00:00 2001
From: Noah Allen <noahtallen@gmail.com>
Date: Wed, 19 Jul 2023 14:17:26 -0700
Subject: [PATCH] Update wordpress packages to a recent version (#78711)

* Add script which updates package.json resolutions field

* Update @wordpress packages to latest versions in package.json resolutions

* Update all @wordpress packages to the latest version

* Update internal @wordpress/data peer dependency versions

* Resolve most peer dependency issues

* Use ComponentProps for some WP component type imports

* Rework submenu popover to remove legacy offset props

* Fix all Button variant type issues

* Remove uneeded button wrapper component in info-tooltip

* Fix type for close modal event in page pattern modal

* Add ts expect error for ExternalLink required children prop

* Add onChange type definition for CustomSelectControl for language-picker

* Remove unused @types/wordpress__ packages

* Remove uneeded entries in yarnrc.yml

* Change another case of isPrimary to variant

* Fix global styles package for new WordPress package versions (#78715)

* @automattic/global-styles: Replace @wordpress/edit-site apis with new ones

* Use fixed version of private-apis package to make __private symbol consistent

* Use ExperimentalBlockEditorProvider to initialize Iframe

* Fix unable to get fontFamilies

* Fix styles

* Fix style variation preview

* Fix types

* Replace mergeWith with deepmerge

* Get rid of isEmpty and mapValues in global-stypes pkg

* Add comments

* Revert some changes

* cleanEmptyObject: Fix type

* transformStyles: Fix type

* WP components: Fix types

* Move EditorStyles into the children of the Iframe

---------

Co-authored-by: arthur <arthur.chu@automattic.com>

* Delete several @wordpress module declarations that duplicate bundled types

* Remove uneeded HTMLElement override

* Remove Global Styles wp components type declaration override

* Remove manage purchases renew toggle wp components type override

* Add back html element hotfix

* Remove imports of deleted type patch files

* Fix type errors related to re-declaring Button prop types

* Fix type errors related to ExternalLink requiring children

* Fix type errors related to Modal isOpen prop

* Remove registerPlugin override

* Remove target blank from ExternalLink, because it isn't used by the component internally

* Fix several prop issues related to ExternalLink (remove target, include children)

* Add missing @types/wordpress__block-library package

* Fix type errors related to Modal open prop

* Remove size prop in a couple cases because it doesn't do anything

* Fix type errors related to importing component prop types

* Fix useState types for date time picker example

* yarn dedupe

* Fix type issue with NavigatorButton wrapper class name

* Remove another wp components type override file

* Update onNavigatorPathChange argument which is sometimes undefined

* Fix a type issue with global styles context

* Fix eslint issues with hooks in modified files

* Remove unused translate import

* Fix type issue where reader button couldn't be disabled

* Remove disabled from a Button instance which is a link

* Fix state type related to FontSizePicker

* Fix odd issue with query control types

* Fix issue with SlotFill not being typed

* Remove broken types from ToolbarGroup as it's just an example

* Fix issue with arr.includes undefined

* Fix issue with combobox onchange arg type

* Remove disabled from another button link

* Cast translateresult to string for input to label

* Cast string to more specific type for log tab

* Fix onChange type for another combobox

* Add missing onhover prop to component

* Fix issue with Token value types

* Add missing labels to notification toggles

* Remove useless wrapper component

* Add types to callback args

* Remove uneeded ts expect err and update component props for combobox control

* fix color type definition for global styles

* Remove uneeded types in callback

* Remove useless component wrapper

* Utilize useLocalizeUrl() where necessary

* Fix some test snapshots

* Fix composite checkout tests by introducing field reset

* dedupe

* Fix most of the remaining TS errors

* Remove uneeded wrapper components

* Add expect-error to incorrect .then error

* Assembler: Fix the main layout is broken (#79275)

* Comment out wrapperClassName which causes a type error

* Change a few HStack props from alignItems to alignment

* Assembler: Fix the styles of the navigator button (#79338)

* Lock file update

* Make Button variants more consistent with trunk

* Use better approach for picking anchor button types

---------

Co-authored-by: arthur <arthur.chu@automattic.com>
Co-authored-by: Marin Atanasov <tyxla@abv.bg>
---
 .yarnrc.yml                                   |   22 +-
 apps/blaze-dashboard/package.json             |    2 +-
 .../src/attach-sidebar.tsx                    |    5 +-
 .../src/components/create-page/index.tsx      |   11 +-
 .../src/components/nav-sidebar/index.tsx      |   13 +-
 .../toggle-sidebar-button/index.tsx           |    9 +-
 .../src/first-post-published-modal/index.tsx  |    4 +-
 .../src/nux-modal/index.tsx                   |    1 -
 .../src/sharing-modal/index.tsx               |    3 +-
 .../src/welcome-tour/tour-steps.tsx           |    5 +-
 apps/editing-toolkit/package.json             |   63 +-
 apps/happy-blocks/package.json                |   14 +-
 apps/o2-blocks/package.json                   |   28 +-
 apps/odyssey-stats/package.json               |    8 +-
 apps/wpcom-block-editor/package.json          |   40 +-
 bin/update-package-resolutions.mjs            |   50 +
 .../use-cookie-banner-content.tsx             |    7 +-
 client/blocks/data-center-picker/index.tsx    |    4 +-
 .../use-do-not-sell-content.tsx               |    4 +-
 client/blocks/editor-checkout-modal/index.tsx |    1 -
 .../import-light/capture/capture-input.tsx    |    4 +-
 .../blocks/import/capture/capture-input.tsx   |    4 +-
 .../importer/components/done-button/index.tsx |    5 +-
 client/blocks/reader-export-button/index.tsx  |   12 +-
 client/blocks/reader-import-button/index.tsx  |    7 +-
 .../reader-unsubscribed-feed-item.tsx         |    2 +-
 .../index.tsx                                 |    9 +-
 .../jetpack/threat-description/index.tsx      |    2 +-
 client/components/language-picker/modal.tsx   |    4 +-
 .../educational-content-step.tsx              |   21 +-
 .../step-components/upsell-step.tsx           |    5 +-
 .../components/theme-type-badge/tooltip.tsx   |    2 +-
 .../button-group.tsx                          |    4 +-
 .../wordpress-components-gallery/button.tsx   |   30 +-
 .../wordpress-components-gallery/card.tsx     |    4 +-
 .../clipboard-button.tsx                      |    3 +-
 .../color-palette.tsx                         |    2 +-
 .../date-time-picker.tsx                      |    2 +-
 .../dropdown-menu.tsx                         |    1 +
 .../font-size-picker.tsx                      |    2 +-
 .../form-file-upload.tsx                      |    3 +-
 .../form-token-field.tsx                      |    5 +-
 .../wordpress-components-gallery/guide.tsx    |    2 +-
 .../query-controls.tsx                        |    8 +-
 .../slot-fill.tsx                             |    2 +
 .../wordpress-components-gallery/toolbar.tsx  |    5 -
 .../dashboard-modal/index.tsx                 |    1 -
 .../form-content/email-notification.tsx       |    5 +
 .../form-content/mobile-push-notification.tsx |    5 +
 .../form-content/sms-notification.tsx         |   10 +-
 .../toggle-activate-monitoring/index.tsx      |    8 +-
 .../searchable-dropdown/index.tsx             |   10 +-
 .../sensei-step-container/index.tsx           |    2 +-
 .../design-setup/unified-design-picker.tsx    |    7 +-
 .../design-setup/upgrade-modal.tsx            |    2 +-
 .../launchpad/task-helper.tsx                 |    1 +
 .../pattern-assembler/notices/notices.tsx     |   14 +-
 .../pattern-large-preview.tsx                 |   10 +-
 .../pattern-assembler/screen-main.tsx         |    6 +-
 .../steps-repository/store-address/index.tsx  |    2 +-
 .../components/icons/search-icon.tsx          |    5 +-
 .../email-me-new-comments-toggle.tsx          |   10 +-
 .../email-me-new-posts-toggle.tsx             |   10 +-
 .../notify-me-of-new-posts-toggle.tsx         |   10 +-
 .../site-subscription-details.tsx             |    3 +-
 .../site-subscriptions-list/site-row.tsx      |    2 +-
 .../site-subscriptions-list.tsx               |    2 +-
 .../sort-controls/sort-controls.tsx           |    4 +
 .../account/toggle-sites-as-landing-page.tsx  |    8 +-
 .../auto-renew-toggle/index.tsx               |   30 +-
 .../payment-method-backup-toggle.tsx          |   38 +-
 .../backup/backup-contents-page/index.tsx     |    2 +-
 .../akismet-checkout-thank-you.tsx            |    2 +-
 .../masterbar-styled/default-contact.tsx      |    6 +-
 .../marketplace/use-thank-you-footer.tsx      |   14 +-
 .../masterbar-styled/default-contact.tsx      |    2 +-
 .../use-cached-domain-contact-details.ts      |    1 +
 .../assign-to-all-payment-methods.tsx         |   30 +-
 .../payment-methods/credit-card/store.ts      |    6 +
 .../payment-methods/credit-card/types.ts      |    3 +-
 .../payment-methods/netbanking.tsx            |    6 +
 .../composite-checkout/test/credit-card.tsx   |   12 +
 .../composite-checkout/test/netbanking.tsx    |   12 +
 client/my-sites/checkout/modal/index.tsx      |    1 -
 .../deployment-status-explanation.tsx         |    4 +-
 .../deployment-card/empty-deployments.tsx     |    2 +-
 .../github/github-connect-card/index.tsx      |    2 +-
 .../marketing/do-it-for-me/difm-landing.tsx   |    4 +-
 .../submission-success/signup-success.tsx     |    9 +-
 client/my-sites/pages/virtual-page/index.tsx  |    2 +-
 .../jetpack-plans/plans-filter-bar/index.tsx  |    1 +
 .../components/campaign-item/index.tsx        |    8 +-
 .../components/post-item/index.tsx            |    4 +-
 client/my-sites/promote-post-i2/main.tsx      |    2 +-
 .../components/campaign-item/index.tsx        |   10 +-
 .../components/post-item/index.tsx            |    2 +-
 .../components/site-logs-tab-panel/index.tsx  |    6 +-
 .../components/site-logs-toolbar/index.tsx    |    2 +-
 .../FeaturedImageEmailSetting.tsx             |   10 +-
 .../SubscribeModalSetting.tsx                 |   10 +-
 .../reading-newsletter-settings/index.tsx     |    2 +-
 .../site-settings/settings-reading/main.tsx   |    2 +-
 .../stats-purchase-personal.tsx               |    5 +-
 client/package.json                           |   34 +-
 client/reader/list-manage/index.jsx           |    2 +-
 .../recommended-sites/recommended-site.tsx    |    2 +-
 client/reader/tags/alphabetic-tags.tsx        |    2 +-
 .../steps/design-picker/let-us-choose.tsx     |    2 +-
 .../signup/steps/difm-site-picker/index.tsx   |    2 +-
 .../step-store-address/index.tsx              |    4 +-
 .../components/sites-ellipsis-menu.tsx        |    4 +-
 .../components/sites-sorting-dropdown.tsx     |    4 +
 .../__snapshots__/sites-grid-item.tsx.snap    |    6 +-
 client/wp-components-types.d.ts               |   35 -
 package.json                                  |  197 +-
 packages/block-renderer/package.json          |    8 +-
 .../components/block-renderer-container.tsx   |    2 +-
 .../components/block-renderer-provider.tsx    |    8 +-
 packages/block-renderer/src/global.d.ts       |    2 -
 packages/calypso-babel-config/package.json    |    2 +-
 packages/calypso-build/package.json           |    4 +-
 packages/calypso-e2e/package.json             |    2 +-
 packages/components/package.json              |   10 +-
 .../responsive-toolbar-group/swipe-group.tsx  |    3 +-
 .../components/src/submenu-popover/index.tsx  |   19 +-
 packages/composite-checkout/package.json      |    4 +-
 packages/data-stores/package.json             |   10 +-
 packages/design-carousel/package.json         |    2 +-
 packages/design-carousel/src/index.tsx        |    2 +-
 packages/design-picker/package.json           |    8 +-
 .../featured-picks-buttons/index.tsx          |    2 +-
 .../design-picker/src/components/index.tsx    |    4 +-
 .../src/patch-component-types.d.ts            |    5 -
 packages/design-preview/package.json          |   10 +-
 .../design-preview/src/components/index.tsx   |    4 +-
 .../design-preview/src/components/sidebar.tsx |    2 +-
 packages/domain-picker/package.json           |   12 +-
 .../suggestion-item.tsx                       |    2 +-
 .../domain-picker/src/components/index.tsx    |    4 +-
 .../src/components/info-tooltip/index.tsx     |    6 +-
 .../eslint-plugin-package-json/package.json   |    2 +-
 packages/global-styles/package.json           |   17 +-
 .../color-palette-variations/index.tsx        |   10 +-
 .../color-palette-variations/preview.tsx      |   28 +-
 .../font-pairing-variations/index.tsx         |   14 +-
 .../font-pairing-variations/preview.tsx       |   26 +-
 .../global-styles-provider/index.tsx          |   40 +-
 .../index.tsx                                 |    9 +-
 .../global-styles-variations/index.tsx        |   12 +-
 .../global-styles-variations/preview.tsx      |   31 +-
 packages/global-styles/src/global.d.ts        |   27 +-
 .../src/gutenberg-bridge/index.tsx            |   60 +
 .../use-get-global-styles-base-config.ts      |    2 +-
 .../use-sync-global-styles-user-config.ts     |    9 +-
 packages/global-styles/src/index.tsx          |    5 +-
 packages/help-center/package.json             |   12 +-
 .../components/help-center-contact-form.tsx   |   15 +-
 .../components/help-center-more-resources.tsx |    6 +-
 .../src/components/help-center-notice.tsx     |    2 +
 packages/i18n-calypso/package.json            |    2 +-
 packages/i18n-utils/package.json              |    4 +-
 packages/language-picker/package.json         |   10 +-
 .../language-picker/src/language-picker.tsx   |    8 +-
 packages/launchpad/package.json               |    2 +-
 packages/mini-cart/package.json               |    4 +-
 packages/onboarding/package.json              |   10 +-
 .../onboarding/src/action-buttons/index.tsx   |   25 +-
 .../src/navigator/navigator-buttons/index.tsx |    3 +-
 .../navigator/navigator-item-group/index.tsx  |    6 +-
 .../navigator/navigator-item-group/style.scss |   10 +-
 .../navigator/navigator-listener/index.tsx    |    3 +-
 .../navigator-screens/navigator-screens.tsx   |    2 +-
 .../onboarding/src/wp-components-types.d.ts   |   29 -
 packages/page-pattern-modal/package.json      |   14 +-
 .../src/components/page-pattern-modal.tsx     |   11 +-
 .../src/patch-component-types.d.ts            |    5 -
 packages/plans-grid/package.json              |   12 +-
 .../src/plans-feature-list/index.tsx          |    4 +-
 .../plans-grid/src/plans-table/plan-item.tsx  |   13 +-
 packages/plans-grid/src/types-patch.ts        |    7 -
 packages/search/package.json                  |   14 +-
 packages/search/src/types.d.ts                |    6 -
 packages/site-picker/package.json             |    8 +-
 packages/sites/package.json                   |    2 +-
 packages/social-previews/package.json         |    7 +-
 packages/state-utils/package.json             |    4 +-
 packages/subscriber/package.json              |   18 +-
 .../src/components/add-form/index.tsx         |   39 +-
 packages/tour-kit/package.json                |   18 +-
 .../wpcom-tour-kit-step-card-navigation.tsx   |    8 +-
 ...om-tour-kit-step-card-overlay-controls.tsx |    4 +-
 .../components/wpcom-tour-kit-step-card.tsx   |    2 +-
 packages/viewport-react/package.json          |    2 +-
 packages/whats-new/package.json               |   12 +-
 packages/whats-new/src/components/guide.tsx   |    4 +-
 packages/whats-new/src/whats-new-page.tsx     |    8 +-
 packages/whats-new/types.d.ts                 |   26 +-
 packages/wpcom-checkout/package.json          |    8 +-
 packages/wpcom-template-parts/package.json    |    4 +-
 yarn.lock                                     | 3262 ++++++++++-------
 200 files changed, 2962 insertions(+), 2269 deletions(-)
 create mode 100644 bin/update-package-resolutions.mjs
 delete mode 100644 client/wp-components-types.d.ts
 delete mode 100644 packages/design-picker/src/patch-component-types.d.ts
 create mode 100644 packages/global-styles/src/gutenberg-bridge/index.tsx
 delete mode 100644 packages/onboarding/src/wp-components-types.d.ts
 delete mode 100644 packages/page-pattern-modal/src/patch-component-types.d.ts
 delete mode 100644 packages/plans-grid/src/types-patch.ts

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 27d0c79980634..e0d1f195be0f0 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -43,7 +43,7 @@ logFilters:
   - level: discard
     pattern: "calypso@workspace:client provides +(react|react-dom) (*) with version 18.2.0, which doesn't satisfy what reakit and some of its descendants request"
   
-# TODO: Remove this once the react-easy-crop transitive dependency can be removed. (Likely after updating @wordpress/block-editor to a newer version.)
+# TODO: Remove this once the react-autosize-textarea transitive dependency has been fixed/updated to a version with React 18 support.
   - level: discard
     pattern: "calypso@workspace:client provides +(react|react-dom) (*) with version 18.2.0, which doesn't satisfy what @automattic/block-renderer and some of its descendants request"
 
@@ -62,21 +62,27 @@ packageExtensions:
   "@signal-noise/stylelint-scales@2.0.3":
     peerDependencies:
       postcss: "*"
-  "@types/wordpress__components@23.0.1":
+  "@wordpress/commands@0.6.2":
     peerDependencies:
-      react: "*"
-  "@types/wordpress__plugins@3.0.0":
+      react-dom: "*"
+  "@wordpress/core-commands@0.4.2":
     peerDependencies:
-      react: "*"
-  "@wordpress/data-controls@2.23.0":
+      react-dom: "*"
+  "@wordpress/data-controls@3.4.0":
     peerDependencies:
       react: "*"
-  "@wordpress/notices@3.23.0":
+  "@wordpress/notices@4.3.0":
     peerDependencies:
       react: "*"
-  "@wordpress/stylelint-config@21.6.0":
+  "@wordpress/plugins@6.3.0":
+    peerDependencies:
+      react-dom: "*"
+  "@wordpress/stylelint-config@21.19.0":
     peerDependencies:
       postcss: "*"
+  "deepsignal@1.3.3":
+    peerDependencies:
+      react: "*"
   fake-indexeddb@3.1.7:
     peerDependencies:
       core-js-bundle: "*"
diff --git a/apps/blaze-dashboard/package.json b/apps/blaze-dashboard/package.json
index 8572d689a51f5..6f7ba6b082133 100644
--- a/apps/blaze-dashboard/package.json
+++ b/apps/blaze-dashboard/package.json
@@ -53,7 +53,7 @@
 		"@automattic/webpack-extensive-lodash-replacement-plugin": "workspace:^",
 		"@automattic/webpack-inline-constant-exports-plugin": "workspace:^",
 		"@automattic/wp-babel-makepot": "workspace:^",
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.5.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^4.19.0",
 		"autoprefixer": "^10.2.5",
 		"gettext-parser": "^6.0.0",
 		"html-webpack-plugin": "^5.0.0-beta.4",
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/attach-sidebar.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/attach-sidebar.tsx
index 4a752e19bcccb..418f3674c763b 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/attach-sidebar.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/attach-sidebar.tsx
@@ -2,7 +2,7 @@ import { START_WRITING_FLOW, DESIGN_FIRST_FLOW } from '@automattic/onboarding';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __experimentalMainDashboardButton as MainDashboardButton } from '@wordpress/edit-post';
 import { useEffect, createPortal, useState } from '@wordpress/element';
-import { registerPlugin as originalRegisterPlugin, PluginSettings } from '@wordpress/plugins';
+import { registerPlugin } from '@wordpress/plugins';
 import useSiteIntent from '../../dotcom-fse/lib/site-intent/use-site-intent';
 import WpcomBlockEditorNavSidebar from './components/nav-sidebar';
 import ToggleSidebarButton from './components/toggle-sidebar-button';
@@ -11,9 +11,6 @@ type CoreEditPostPlaceholder = {
 	isFeatureActive: ( ...args: unknown[] ) => boolean;
 };
 
-const registerPlugin = ( name: string, settings: Omit< PluginSettings, 'icon' > ) =>
-	originalRegisterPlugin( name, settings as PluginSettings );
-
 if ( typeof MainDashboardButton !== 'undefined' ) {
 	registerPlugin( 'a8c-full-site-editing-nav-sidebar', {
 		render: function NavSidebar() {
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/create-page/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/create-page/index.tsx
index 19e16d1526082..4b2eaf15c3cf1 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/create-page/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/create-page/index.tsx
@@ -1,5 +1,5 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
-import { Button as OriginalButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { applyFilters } from '@wordpress/hooks';
 import { __ } from '@wordpress/i18n';
 import { plus } from '@wordpress/icons';
@@ -8,13 +8,6 @@ import { get } from 'lodash';
 
 import './style.scss';
 
-const Button = ( {
-	children,
-	...rest
-}: OriginalButton.Props & { icon?: unknown; iconSize?: number } ) => (
-	<OriginalButton { ...rest }>{ children }</OriginalButton>
-);
-
 interface Props {
 	postType: { slug: string };
 }
@@ -47,7 +40,7 @@ export default function CreatePage( { postType }: Props ) {
 			target={
 				applyFilters( 'a8c.WpcomBlockEditorNavSidebar.linkTarget', undefined ) as string | undefined
 			}
-			isPrimary
+			variant="primary"
 			className="wpcom-block-editor-nav-sidebar-create-page"
 			href={ url }
 			icon={ plus }
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx
index c914b08904137..5e2dee7a9dde4 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx
@@ -35,17 +35,8 @@ type CorePlaceholder = {
 };
 
 const Button = forwardRef(
-	(
-		{
-			children,
-			...rest
-		}: OriginalButton.Props & { icon?: unknown; iconSize?: number; showTooltip?: boolean },
-		ref
-	) => (
-		<OriginalButton
-			ref={ ref as string | ( ( instance: HTMLElement | null ) => void ) }
-			{ ...rest }
-		>
+	( { children, ...rest }: React.ComponentProps< typeof OriginalButton >, ref ) => (
+		<OriginalButton ref={ ref } { ...rest }>
 			{ children }
 		</OriginalButton>
 	)
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/toggle-sidebar-button/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/toggle-sidebar-button/index.tsx
index 1572a1e44567e..7847cf72f7c2e 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/toggle-sidebar-button/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/src/components/toggle-sidebar-button/index.tsx
@@ -1,5 +1,5 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
-import { Button as OriginalButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
@@ -7,13 +7,6 @@ import { store } from '../../store';
 import SiteIcon from '../site-icon';
 import './style.scss';
 
-const Button = ( {
-	children,
-	...rest
-}: OriginalButton.Props & { icon?: unknown; iconSize?: number; showTooltip?: boolean } ) => (
-	<OriginalButton { ...rest }>{ children }</OriginalButton>
-);
-
 export default function ToggleSidebarButton() {
 	const { toggleSidebar } = useDispatch( store );
 	const isSidebarOpen = useSelect( ( select ) => select( store ).isSidebarOpened(), [] );
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/first-post-published-modal/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/first-post-published-modal/index.tsx
index 1aa3a57d7d74f..c2ab12abfd23b 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/first-post-published-modal/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/first-post-published-modal/index.tsx
@@ -90,11 +90,11 @@ const FirstPostPublishedModal: React.FC = () => {
 			imageSrc={ postPublishedImage }
 			actionButtons={
 				<>
-					<Button isPrimary onClick={ handleViewPostClick }>
+					<Button variant="primary" onClick={ handleViewPostClick }>
 						{ __( 'View Post', 'full-site-editing' ) }
 					</Button>
 					{ launchpadScreenOption === 'full' && siteIntentOption === 'write' && (
-						<Button isSecondary onClick={ handleNextStepsClick }>
+						<Button variant="secondary" onClick={ handleNextStepsClick }>
 							{ __( 'Next Steps', 'full-site-editing' ) }
 						</Button>
 					) }
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/nux-modal/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/nux-modal/index.tsx
index 1099fe7d6ddca..aeb1ccf384123 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/nux-modal/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/nux-modal/index.tsx
@@ -42,7 +42,6 @@ const NuxModal: React.FC< Props > = ( {
 	return (
 		<Modal
 			className={ classnames( 'wpcom-block-editor-nux-modal', className ) }
-			open={ isOpen }
 			title=""
 			onRequestClose={ onRequestClose }
 		>
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/sharing-modal/index.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/sharing-modal/index.tsx
index 4c3e7dacefa2d..c0608e9d7466f 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/sharing-modal/index.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/sharing-modal/index.tsx
@@ -178,7 +178,6 @@ const SharingModal: React.FC = () => {
 	return (
 		<Modal
 			className="wpcom-block-editor-post-published-sharing-modal"
-			open={ isOpen }
 			title=""
 			onRequestClose={ closeModal }
 		>
@@ -195,9 +194,9 @@ const SharingModal: React.FC = () => {
 							{
 								a: (
 									<ExternalLink
+										children={ null }
 										href={ subscribersUrl }
 										onClick={ trackSubscribersClick }
-										target="_blank"
 									/>
 								),
 							}
diff --git a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/welcome-tour/tour-steps.tsx b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/welcome-tour/tour-steps.tsx
index 752c452dc1a3c..2ef221677ca0a 100644
--- a/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/welcome-tour/tour-steps.tsx
+++ b/apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/src/welcome-tour/tour-steps.tsx
@@ -99,6 +99,7 @@ function getTourSteps(
 										<ExternalLink
 											href={ siteEditorCourseUrl }
 											onClick={ onSiteEditorCourseLinkClick }
+											children={ null }
 										/>
 									),
 								}
@@ -322,7 +323,6 @@ function getTourSteps(
 									'https://wordpress.com/support/video-tutorials-add-payments-features-to-your-site-with-our-guides/#how-to-use-the-payments-block-video',
 									localeSlug
 								) }
-								target="_blank"
 								rel="noopener noreferrer"
 							>
 								{ __( 'Learn more', 'full-site-editing' ) }
@@ -359,6 +359,7 @@ function getTourSteps(
 													'https://wordpress.com/support/full-site-editing/',
 													localeSlug
 												) }
+												children={ null }
 											/>
 										),
 									}
@@ -396,6 +397,7 @@ function getTourSteps(
 										'https://wordpress.com/support/settings/privacy-settings/#launch-your-site',
 										localeSlug
 									) }
+									children={ null }
 								/>
 							),
 							link_to_editor_docs: (
@@ -404,6 +406,7 @@ function getTourSteps(
 										'https://wordpress.com/support/wordpress-editor/',
 										localeSlug
 									) }
+									children={ null }
 								/>
 							),
 						}
diff --git a/apps/editing-toolkit/package.json b/apps/editing-toolkit/package.json
index c538502f42528..04e77702a5b68 100644
--- a/apps/editing-toolkit/package.json
+++ b/apps/editing-toolkit/package.json
@@ -68,37 +68,37 @@
 		"@popperjs/core": "^2.10.2",
 		"@sentry/browser": "^7.54.0",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/a11y": "^3.23.0",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/data-controls": "^2.23.0",
-		"@wordpress/date": "^4.23.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.6.0",
-		"@wordpress/dom-ready": "^3.23.0",
-		"@wordpress/edit-post": "^7.0.0",
-		"@wordpress/element": "^5.0.0",
+		"@wordpress/a11y": "^3.36.0",
+		"@wordpress/api-fetch": "^6.33.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/data-controls": "^3.4.0",
+		"@wordpress/date": "^4.36.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^4.19.0",
+		"@wordpress/dom-ready": "^3.36.0",
+		"@wordpress/edit-post": "^7.12.0",
+		"@wordpress/element": "^5.13.0",
 		"@wordpress/env": "^8.3.0",
-		"@wordpress/escape-html": "^2.23.0",
-		"@wordpress/hooks": "^3.23.0",
-		"@wordpress/html-entities": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/interface": "^5.0.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/keycodes": "^3.23.0",
-		"@wordpress/notices": "^3.23.0",
+		"@wordpress/escape-html": "^2.36.0",
+		"@wordpress/hooks": "^3.36.0",
+		"@wordpress/html-entities": "^3.36.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/interface": "^5.12.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/keycodes": "^3.36.0",
+		"@wordpress/notices": "^4.3.0",
 		"@wordpress/nux": "^6.0.0",
-		"@wordpress/plugins": "^5.0.0",
-		"@wordpress/primitives": "^3.21.0",
-		"@wordpress/private-apis": "^0.9.0",
-		"@wordpress/rich-text": "^6.0.0",
-		"@wordpress/server-side-render": "^4.0.0",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/plugins": "^6.3.0",
+		"@wordpress/primitives": "^3.34.0",
+		"@wordpress/private-apis": "^0.18.0",
+		"@wordpress/rich-text": "^6.12.0",
+		"@wordpress/server-side-render": "^4.12.0",
+		"@wordpress/url": "^3.37.0",
 		"calypso": "workspace:^",
 		"classnames": "^2.3.1",
 		"eslint": "^8.34.0",
@@ -124,9 +124,8 @@
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^14.0.0",
 		"@types/node": "^18.11.18",
-		"@types/wordpress__plugins": "^3.0.0",
-		"@wordpress/eslint-plugin": "^13.7.0",
-		"@wordpress/readable-js-assets-webpack-plugin": "^2.6.0",
+		"@wordpress/eslint-plugin": "^14.8.0",
+		"@wordpress/readable-js-assets-webpack-plugin": "^2.19.0",
 		"babel-jest": "^29.6.1",
 		"eslint-filtered-fix": "^0.3.0",
 		"eslint-nibble": "^8.1.0",
diff --git a/apps/happy-blocks/package.json b/apps/happy-blocks/package.json
index 0c8f8cc4c27fa..4f6ecf96ae12f 100644
--- a/apps/happy-blocks/package.json
+++ b/apps/happy-blocks/package.json
@@ -33,12 +33,12 @@
 		"@automattic/wp-babel-makepot": "workspace:^",
 		"@automattic/wpcom-template-parts": "workspace:^",
 		"@emotion/styled": "^11.3.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
 		"classnames": "^2.3.2",
 		"glob": "^7.1.6",
 		"i18n-calypso": "workspace:^",
@@ -49,7 +49,7 @@
 		"@automattic/calypso-apps-builder": "workspace:^",
 		"@emotion/react": "^11.4.1",
 		"@testing-library/react": "^14.0.0",
-		"@wordpress/readable-js-assets-webpack-plugin": "^2.6.0",
+		"@wordpress/readable-js-assets-webpack-plugin": "^2.19.0",
 		"copy-webpack-plugin": "^10.1.0",
 		"glob": "^7.1.6",
 		"postcss": "^8.4.5",
diff --git a/apps/o2-blocks/package.json b/apps/o2-blocks/package.json
index a7fdeb0427dab..ad754b6b2c799 100644
--- a/apps/o2-blocks/package.json
+++ b/apps/o2-blocks/package.json
@@ -22,19 +22,19 @@
 	},
 	"dependencies": {
 		"@automattic/calypso-build": "workspace:^",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/editor": "^13.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/hooks": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/primitives": "^3.21.0",
+		"@wordpress/api-fetch": "^6.33.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/editor": "^13.12.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/hooks": "^3.36.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/primitives": "^3.34.0",
 		"classnames": "^2.3.1",
 		"lodash": "^4.17.21",
 		"moment": "^2.26.0",
@@ -46,7 +46,7 @@
 	"devDependencies": {
 		"@automattic/calypso-apps-builder": "workspace:^",
 		"@automattic/calypso-eslint-overrides": "workspace:^",
-		"@wordpress/readable-js-assets-webpack-plugin": "^2.6.0",
+		"@wordpress/readable-js-assets-webpack-plugin": "^2.19.0",
 		"postcss": "^8.4.5",
 		"webpack": "^5.68.0"
 	}
diff --git a/apps/odyssey-stats/package.json b/apps/odyssey-stats/package.json
index faea2036479ab..cbd30bad42404 100644
--- a/apps/odyssey-stats/package.json
+++ b/apps/odyssey-stats/package.json
@@ -33,9 +33,9 @@
 		"@automattic/calypso-url": "workspace:^",
 		"@automattic/components": "workspace:^",
 		"@tanstack/react-query": "4.29.1",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/icons": "^9.14.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/icons": "^9.26.0",
 		"calypso": "workspace:^",
 		"classnames": "^2.3.1",
 		"debug": "^4.3.4",
@@ -61,7 +61,7 @@
 		"@automattic/wp-babel-makepot": "workspace:^",
 		"@babel/core": "^7.17.5",
 		"@size-limit/file": "^8.2.4",
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.6.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^4.19.0",
 		"autoprefixer": "^10.2.5",
 		"babel-jest": "^29.6.1",
 		"gettext-parser": "^6.0.0",
diff --git a/apps/wpcom-block-editor/package.json b/apps/wpcom-block-editor/package.json
index ce4133ce97287..de719a356f194 100644
--- a/apps/wpcom-block-editor/package.json
+++ b/apps/wpcom-block-editor/package.json
@@ -24,25 +24,25 @@
 		"@automattic/calypso-url": "workspace:^",
 		"@automattic/typography": "workspace:^",
 		"@babel/runtime": "^7.17.2",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/dom-ready": "^3.23.0",
-		"@wordpress/edit-post": "^7.0.0",
-		"@wordpress/edit-site": "^5.0.0",
-		"@wordpress/editor": "^13.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/hooks": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/plugins": "^5.0.0",
-		"@wordpress/rich-text": "^6.0.0",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/api-fetch": "^6.33.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/dom-ready": "^3.36.0",
+		"@wordpress/edit-post": "^7.12.0",
+		"@wordpress/edit-site": "^5.12.0",
+		"@wordpress/editor": "^13.12.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/hooks": "^3.36.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/plugins": "^6.3.0",
+		"@wordpress/rich-text": "^6.12.0",
+		"@wordpress/url": "^3.37.0",
 		"debug": "^4.3.3",
 		"lodash": "^4.17.21",
 		"react": "^18.2.0",
@@ -54,7 +54,7 @@
 		"@automattic/calypso-apps-builder": "workspace:^",
 		"@automattic/calypso-build": "workspace:^",
 		"@automattic/calypso-eslint-overrides": "workspace:^",
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.6.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^4.19.0",
 		"npm-run-all": "^4.1.5",
 		"postcss": "^8.4.5",
 		"webpack": "^5.68.0"
diff --git a/bin/update-package-resolutions.mjs b/bin/update-package-resolutions.mjs
new file mode 100644
index 0000000000000..a49a122a2afe3
--- /dev/null
+++ b/bin/update-package-resolutions.mjs
@@ -0,0 +1,50 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+const packageJSONPath = path.resolve( process.cwd(), 'package.json' );
+const packageFile = fs.readFileSync( packageJSONPath, 'utf-8' );
+const packageJSON = JSON.parse( packageFile );
+
+if ( ! packageJSON.resolutions ) {
+	console.error( 'No resolutions found in package.json -- try running from the root directory.' );
+	process.exit( 1 );
+}
+
+const toUpdate = process.argv[ 2 ] ?? '@wordpress';
+let didUpdate = false;
+
+await Promise.all(
+	Object.entries( packageJSON.resolutions ).map( async ( [ pkg, version ] ) => {
+		if ( ! pkg.startsWith( toUpdate ) ) {
+			return;
+		}
+		const latestVersion = await getLatestVersion( pkg );
+
+		// Handle ^ and ~ prefixes for very basic semver support.
+		let currentVersion = version;
+		const startingChar = version.startsWith( '^' ) || version.startsWith( '~' ) ? version[ 0 ] : '';
+		if ( startingChar ) {
+			currentVersion = currentVersion.slice( 1 );
+		}
+
+		if ( latestVersion && latestVersion !== currentVersion ) {
+			console.log( `Updating ${ pkg } from ${ version } to ${ startingChar }${ latestVersion }` );
+			packageJSON.resolutions[ pkg ] = startingChar + latestVersion;
+			didUpdate = true;
+		}
+	} )
+);
+
+if ( didUpdate ) {
+	// Use tab for spacing and append a new line after the JSON content to match our prettier format.
+	fs.writeFileSync( packageJSONPath, JSON.stringify( packageJSON, null, '\t' ) + '\n' );
+	console.log( 'Updated package.json resolutions.' );
+} else {
+	console.log( 'No updates were found.' );
+}
+
+async function getLatestVersion( pkg ) {
+	const res = await fetch( `https://registry.npmjs.org/${ pkg }` );
+	const pkgInfo = await res.json();
+	return pkgInfo[ 'dist-tags' ].latest;
+}
diff --git a/client/blocks/cookie-banner/use-cookie-banner-content.tsx b/client/blocks/cookie-banner/use-cookie-banner-content.tsx
index 3b5d60ddbe33c..7a8ce0f7d5796 100644
--- a/client/blocks/cookie-banner/use-cookie-banner-content.tsx
+++ b/client/blocks/cookie-banner/use-cookie-banner-content.tsx
@@ -15,12 +15,13 @@ const LocalizedLink = ( { href, children }: LinkProps ) => {
 const Link = ( props: LinkProps ) => {
 	// useLocalizeUrl() does not support SSR yet, so we cannot use it on the server.
 	if ( isServer ) {
-		return <ExternalLink { ...props } />;
+		return <ExternalLink children={ null } { ...props } />;
 	}
 	return <LocalizedLink { ...props } />;
 };
 
 export const useCookieBannerContent = (): CookieBannerProps[ 'content' ] => {
+	const localizeUrl = useLocalizeUrl();
 	const translate = useTranslate();
 
 	return {
@@ -37,8 +38,8 @@ export const useCookieBannerContent = (): CookieBannerProps[ 'content' ] => {
 				{
 					components: {
 						strong: <strong />,
-						privacyPolicyLink: <Link href="https://automattic.com/privacy/" />,
-						cookiePolicyLink: <Link href="https://automattic.com/cookies/" />,
+						privacyPolicyLink: <Link href={ localizeUrl( 'https://automattic.com/privacy/' ) } />,
+						cookiePolicyLink: <Link href={ localizeUrl( 'https://automattic.com/cookies/' ) } />,
 					},
 				}
 			),
diff --git a/client/blocks/data-center-picker/index.tsx b/client/blocks/data-center-picker/index.tsx
index f3218bcfbe284..70a6b61b74d0e 100644
--- a/client/blocks/data-center-picker/index.tsx
+++ b/client/blocks/data-center-picker/index.tsx
@@ -241,7 +241,7 @@ const DataCenterPicker = ( {
 					</span>
 					&nbsp;
 					<Button
-						isTertiary={ true }
+						variant="tertiary"
 						onClick={ () => {
 							onClickShowPicker();
 							setIsFormShowing( ! isFormShowing );
@@ -256,7 +256,7 @@ const DataCenterPicker = ( {
 				<Form>
 					<FormHeadingContainer>
 						<FormHeading>{ translate( 'Pick your primary data center' ) }</FormHeading>
-						<Button isTertiary={ true } onClick={ onCancel }>
+						<Button variant="tertiary" onClick={ onCancel }>
 							{ translate( 'Cancel' ) }
 						</Button>
 					</FormHeadingContainer>
diff --git a/client/blocks/do-not-sell-dialog/use-do-not-sell-content.tsx b/client/blocks/do-not-sell-dialog/use-do-not-sell-content.tsx
index ddff1c4cdf001..a86b57b4dbcb1 100644
--- a/client/blocks/do-not-sell-dialog/use-do-not-sell-content.tsx
+++ b/client/blocks/do-not-sell-dialog/use-do-not-sell-content.tsx
@@ -7,10 +7,10 @@ export const useDoNotSellContent = () => {
 	const localizeUrl = useLocalizeUrl();
 
 	const cookiePolicyLink = (
-		<ExternalLink href={ localizeUrl( 'https://automattic.com/cookies/' ) } />
+		<ExternalLink children={ null } href={ localizeUrl( 'https://automattic.com/cookies/' ) } />
 	);
 	const privacyPolicyLink = (
-		<ExternalLink href={ localizeUrl( 'https://automattic.com/privacy/' ) } />
+		<ExternalLink children={ null } href={ localizeUrl( 'https://automattic.com/privacy/' ) } />
 	);
 	const contactLink = (
 		<ExternalLink href="mailto:contact@automattic.com">contact@automattic.com</ExternalLink>
diff --git a/client/blocks/editor-checkout-modal/index.tsx b/client/blocks/editor-checkout-modal/index.tsx
index 131c2fedc33af..2aca4b98e3bab 100644
--- a/client/blocks/editor-checkout-modal/index.tsx
+++ b/client/blocks/editor-checkout-modal/index.tsx
@@ -59,7 +59,6 @@ const EditorCheckoutModal: React.FunctionComponent< Props > = ( props ) => {
 
 	return isOpen ? (
 		<Modal
-			open={ isOpen }
 			overlayClassName="editor-checkout-modal"
 			onRequestClose={ onClose }
 			title={ String( translate( 'Checkout modal' ) ) }
diff --git a/client/blocks/import-light/capture/capture-input.tsx b/client/blocks/import-light/capture/capture-input.tsx
index a507a8bed64aa..ee543a7c38e7b 100644
--- a/client/blocks/import-light/capture/capture-input.tsx
+++ b/client/blocks/import-light/capture/capture-input.tsx
@@ -102,9 +102,7 @@ const CaptureInput: FunctionComponent< Props > = ( props ) => {
 				</FormSettingExplanation>
 			</FormFieldset>
 
-			<NextButton type="submit" size={ 0 }>
-				{ translate( 'Continue' ) }
-			</NextButton>
+			<NextButton type="submit">{ translate( 'Continue' ) }</NextButton>
 		</form>
 	);
 };
diff --git a/client/blocks/import/capture/capture-input.tsx b/client/blocks/import/capture/capture-input.tsx
index 236c29557310f..7f6c7143024ce 100644
--- a/client/blocks/import/capture/capture-input.tsx
+++ b/client/blocks/import/capture/capture-input.tsx
@@ -119,9 +119,7 @@ const CaptureInput: FunctionComponent< Props > = ( props ) => {
 				</FormSettingExplanation>
 			</FormFieldset>
 
-			<NextButton type="submit" size={ 0 }>
-				{ translate( 'Continue' ) }
-			</NextButton>
+			<NextButton type="submit">{ translate( 'Continue' ) }</NextButton>
 		</form>
 	);
 };
diff --git a/client/blocks/importer/components/done-button/index.tsx b/client/blocks/importer/components/done-button/index.tsx
index bd7ba785f922c..2c821b79e41a2 100644
--- a/client/blocks/importer/components/done-button/index.tsx
+++ b/client/blocks/importer/components/done-button/index.tsx
@@ -27,8 +27,6 @@ const DoneButton: React.FunctionComponent< Props > = ( props ) => {
 		isPrimary = true,
 	} = props;
 
-	const isSecondary = isPrimary ? false : true;
-
 	function onButtonClick() {
 		onSiteViewClick?.();
 		job && siteId && resetImport && resetImport( siteId, job?.importerId );
@@ -36,8 +34,7 @@ const DoneButton: React.FunctionComponent< Props > = ( props ) => {
 
 	return (
 		<NextButton
-			isPrimary={ isPrimary }
-			isSecondary={ isSecondary }
+			variant={ isPrimary ? 'primary' : 'secondary' }
 			className={ className }
 			onClick={ onButtonClick }
 		>
diff --git a/client/blocks/reader-export-button/index.tsx b/client/blocks/reader-export-button/index.tsx
index f4f3fb8b2f489..09cb19ed77b50 100644
--- a/client/blocks/reader-export-button/index.tsx
+++ b/client/blocks/reader-export-button/index.tsx
@@ -3,7 +3,7 @@ import { Button } from '@wordpress/components';
 import { useI18n } from '@wordpress/react-i18n';
 import { saveAs } from 'browser-filesaver';
 import { useTranslate } from 'i18n-calypso';
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useRef, useCallback, ComponentPropsWithoutRef } from 'react';
 import {
 	READER_EXPORT_TYPE_SUBSCRIPTIONS,
 	READER_EXPORT_TYPE_LIST,
@@ -21,24 +21,28 @@ type ExportResponse = {
 	opml: string;
 };
 
-type ReaderExportButtonProps = Button.ButtonProps & {
+type ReaderExportButtonProps = {
 	exportType?: ExportType;
 	filename?: string;
 	listId?: number;
 };
 
+// Note: since the Button must be disableable, it must not be a link. So we need to remove the link type variant from the accepted props.
+type RemoveAnchorButtonProps< T > = T extends { href: string } ? never : T;
+type AcceptedButtonProps = RemoveAnchorButtonProps< ComponentPropsWithoutRef< typeof Button > >;
+
 const ReaderExportButton = ( {
 	filename = 'reader-export.opml',
 	exportType = READER_EXPORT_TYPE_SUBSCRIPTIONS,
 	disabled,
 	listId,
 	...props
-}: ReaderExportButtonProps ) => {
+}: ReaderExportButtonProps & AcceptedButtonProps ) => {
 	const dispatch = useDispatch();
 	const translate = useTranslate();
 	const { hasTranslation } = useI18n();
 	const isMounted = useRef( false );
-	const [ isExportInProgress, setExportInProgress ] = useState( false );
+	const [ isExportInProgress, setExportInProgress ] = useState< boolean >( false );
 
 	useEffect( () => {
 		isMounted.current = true;
diff --git a/client/blocks/reader-import-button/index.tsx b/client/blocks/reader-import-button/index.tsx
index be858af8acbbb..059f67199365e 100644
--- a/client/blocks/reader-import-button/index.tsx
+++ b/client/blocks/reader-import-button/index.tsx
@@ -2,7 +2,7 @@ import { Gridicon } from '@automattic/components';
 import { Button } from '@wordpress/components';
 import { useI18n } from '@wordpress/react-i18n';
 import { useTranslate } from 'i18n-calypso';
-import { useState } from 'react';
+import { ComponentProps, useState } from 'react';
 import FilePicker from 'calypso/components/file-picker';
 import wpcom from 'calypso/lib/wp';
 import { useDispatch } from 'calypso/state';
@@ -12,10 +12,11 @@ import './style.scss';
 
 const noop = () => undefined;
 
+type ButtonProps = ComponentProps< typeof Button >;
 type ReaderImportButtonProps = {
 	onProgress?: () => void;
-	icon?: Button.ButtonProps[ 'icon' ];
-	iconSize?: Button.ButtonProps[ 'iconSize' ];
+	icon?: ButtonProps[ 'icon' ];
+	iconSize?: ButtonProps[ 'iconSize' ];
 };
 
 const ReaderImportButton: React.FC< ReaderImportButtonProps > = ( {
diff --git a/client/blocks/reader-unsubscribed-feeds-search-list/reader-unsubscribed-feed-item.tsx b/client/blocks/reader-unsubscribed-feeds-search-list/reader-unsubscribed-feed-item.tsx
index d9c35537525a1..17c7fd39ef208 100644
--- a/client/blocks/reader-unsubscribed-feeds-search-list/reader-unsubscribed-feed-item.tsx
+++ b/client/blocks/reader-unsubscribed-feeds-search-list/reader-unsubscribed-feed-item.tsx
@@ -44,7 +44,7 @@ const ReaderUnsubscribedFeedItem = ( {
 	const translate = useTranslate();
 	const filteredDisplayUrl = filterURLForDisplay( displayUrl );
 	return (
-		<HStack as="li" className="reader-unsubscribed-feed-item" alignItems="center" spacing={ 8 }>
+		<HStack as="li" className="reader-unsubscribed-feed-item" alignment="center" spacing={ 8 }>
 			<HStack className="reader-unsubscribed-feed-item__site-preview-h-stack" spacing={ 3 }>
 				{ isExternalLink ? (
 					<ExternalLink
diff --git a/client/components/jetpack-staging-sites-management/index.tsx b/client/components/jetpack-staging-sites-management/index.tsx
index f7d0e53c3e186..7545f07065860 100644
--- a/client/components/jetpack-staging-sites-management/index.tsx
+++ b/client/components/jetpack-staging-sites-management/index.tsx
@@ -68,12 +68,6 @@ const JetpackStagingSitesManagement: FunctionComponent = () => {
 		</svg>
 	);
 
-	const StagingToggleControl = ToggleControl as React.ComponentType<
-		ToggleControl.Props & {
-			disabled?: boolean;
-		}
-	>;
-
 	return (
 		<>
 			<QueryBackupStagingSite siteId={ siteId } />
@@ -85,7 +79,8 @@ const JetpackStagingSitesManagement: FunctionComponent = () => {
 				<Card className="setting-content">
 					<div className="setting-option">
 						<div className="setting-option__toggle">
-							<StagingToggleControl
+							<ToggleControl
+								label={ translate( 'Set staging site.' ) }
 								disabled={ isLoading }
 								checked={ isStaging }
 								onChange={ toggleStagingFlag }
diff --git a/client/components/jetpack/threat-description/index.tsx b/client/components/jetpack/threat-description/index.tsx
index 4df2a068c76f4..7007fc387b1b6 100644
--- a/client/components/jetpack/threat-description/index.tsx
+++ b/client/components/jetpack/threat-description/index.tsx
@@ -103,7 +103,7 @@ class ThreatDescription extends PureComponent< Props > {
 				{ source &&
 					this.renderTextOrNode(
 						<p className="threat-description__section-text">
-							<ExternalLink href={ source } rel="noopener noreferrer" target="_blank">
+							<ExternalLink href={ source } rel="noopener noreferrer">
 								{ translate( 'Learn more about this vulnerability' ) }
 							</ExternalLink>
 						</p>
diff --git a/client/components/language-picker/modal.tsx b/client/components/language-picker/modal.tsx
index 6c99630f983a4..d677b8a06c508 100644
--- a/client/components/language-picker/modal.tsx
+++ b/client/components/language-picker/modal.tsx
@@ -165,11 +165,11 @@ const LanguagePickerModal: React.FC< Props > = ( {
 	const buttons = [
 		<>{ checkboxes }</>,
 		<div className="language-picker__modal-buttons">
-			<Button isLink onClick={ onClose }>
+			<Button variant="link" onClick={ onClose }>
 				{ __( 'Cancel' ) }
 			</Button>
 			<Button
-				isSecondary
+				variant="secondary"
 				onClick={ () => {
 					onClose();
 					if ( selectedLanguage ) {
diff --git a/client/components/marketing-survey/cancel-purchase-form/step-components/educational-content-step.tsx b/client/components/marketing-survey/cancel-purchase-form/step-components/educational-content-step.tsx
index 162e901236ed6..5e7172ccd98cb 100644
--- a/client/components/marketing-survey/cancel-purchase-form/step-components/educational-content-step.tsx
+++ b/client/components/marketing-survey/cancel-purchase-form/step-components/educational-content-step.tsx
@@ -47,7 +47,7 @@ function Content( { image, ...props }: ContentProps ) {
 				<div className="cancel-purchase-form__edu-buttons">
 					<p>{ translate( 'Thanks, but this is not what I need' ) }</p>
 					<Button
-						isSecondary
+						variant="secondary"
 						onClick={ () => {
 							setIsBusy( true );
 							props.onDecline?.();
@@ -131,7 +131,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 											link: (
 												<Button
 													href={ localizeUrl( 'https://wordpress.com/support/site-speed/' ) }
-													isLink
+													variant="link"
 												/>
 											),
 										},
@@ -160,7 +160,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 								'Go to Upgrades → Domains and click {{link}}Add a Domain{{/link}} to register your plan’s free domain',
 								{
 									components: {
-										link: <Button href={ `/domains/add/${ site.slug }` } isLink />,
+										link: <Button href={ `/domains/add/${ site.slug }` } variant="link" />,
 									},
 								}
 							) }
@@ -191,7 +191,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 											href={ localizeUrl(
 												'https://wordpress.com/support/domains/register-domain/'
 											) }
-											isLink
+											variant="link"
 										/>
 									),
 								},
@@ -217,7 +217,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 											href={ localizeUrl(
 												'https://wordpress.com/support/domains/connect-existing-domain/#steps-to-connect-a-domain'
 											) }
-											isLink
+											variant="link"
 										/>
 									),
 								},
@@ -245,7 +245,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 												href={ localizeUrl(
 													'https://wordpress.com/support/domains/connect-existing-domain/'
 												) }
-												isLink
+												variant="link"
 											/>
 										),
 										chat: (
@@ -260,7 +260,7 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 														site.URL
 													);
 												} }
-												isLink
+												variant="link"
 											/>
 										),
 									},
@@ -335,11 +335,14 @@ export default function EducationalCotnentStep( { type, site, ...props }: StepPr
 											link: (
 												<Button
 													href={ localizeUrl( 'https://wordpress.com/support/seo/' ) }
-													isLink
+													variant="link"
 												/>
 											),
 											seo: (
-												<Button href="https://wordpress.com/learn/courses/intro-to-seo/" isLink />
+												<Button
+													href="https://wordpress.com/learn/courses/intro-to-seo/"
+													variant="link"
+												/>
 											),
 										},
 									}
diff --git a/client/components/marketing-survey/cancel-purchase-form/step-components/upsell-step.tsx b/client/components/marketing-survey/cancel-purchase-form/step-components/upsell-step.tsx
index fb721f461fb0c..75fc3543d20a4 100644
--- a/client/components/marketing-survey/cancel-purchase-form/step-components/upsell-step.tsx
+++ b/client/components/marketing-survey/cancel-purchase-form/step-components/upsell-step.tsx
@@ -46,19 +46,18 @@ function Upsell( { image, ...props }: UpsellProps ) {
 				<div className="cancel-purchase-form__upsell-text">{ props.children }</div>
 				<div className="cancel-purchase-form__upsell-buttons">
 					<Button
-						isPrimary
+						variant="primary"
 						href={ props.acceptButtonUrl }
 						onClick={ () => {
 							setBusyButton( 'accept' );
 							props.onAccept?.();
 						} }
 						isBusy={ busyButton === 'accept' }
-						disabled={ Boolean( busyButton && busyButton !== 'accept' ) }
 					>
 						{ props.acceptButtonText }
 					</Button>
 					<Button
-						isSecondary
+						variant="primary"
 						onClick={ () => {
 							setBusyButton( 'decline' );
 							props.onDecline?.();
diff --git a/client/components/theme-type-badge/tooltip.tsx b/client/components/theme-type-badge/tooltip.tsx
index 3bf783364b9ff..491c2b8a5dc75 100644
--- a/client/components/theme-type-badge/tooltip.tsx
+++ b/client/components/theme-type-badge/tooltip.tsx
@@ -54,7 +54,7 @@ const ThemeTypeBadgeTooltipUpgradeLink = ( {
 	};
 
 	return (
-		<LinkButton isLink onClick={ () => goToCheckout() }>
+		<LinkButton variant="link" onClick={ () => goToCheckout() }>
 			{ children }
 		</LinkButton>
 	);
diff --git a/client/devdocs/design/wordpress-components-gallery/button-group.tsx b/client/devdocs/design/wordpress-components-gallery/button-group.tsx
index 5fa01a12f6506..925b126d6b594 100644
--- a/client/devdocs/design/wordpress-components-gallery/button-group.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/button-group.tsx
@@ -4,10 +4,10 @@ const ButtonGroupExample = () => {
 	const style = { margin: '0 4px' };
 	return (
 		<ButtonGroup>
-			<Button isPrimary style={ style }>
+			<Button variant="primary" style={ style }>
 				Button 1
 			</Button>
-			<Button isPrimary style={ style }>
+			<Button variant="primary" style={ style }>
 				Button 2
 			</Button>
 		</ButtonGroup>
diff --git a/client/devdocs/design/wordpress-components-gallery/button.tsx b/client/devdocs/design/wordpress-components-gallery/button.tsx
index b96c9294616cf..99da560bc5c72 100644
--- a/client/devdocs/design/wordpress-components-gallery/button.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/button.tsx
@@ -1,7 +1,7 @@
 import { Button as InnerButton, Flex, FlexItem } from '@wordpress/components';
 import { more } from '@wordpress/icons';
 
-const Button = ( props: InnerButton.Props ) => (
+const Button = ( props: React.ComponentProps< typeof InnerButton > ) => (
 	<FlexItem>
 		<InnerButton { ...props } />
 	</FlexItem>
@@ -13,20 +13,20 @@ const ButtonExample = () => {
 			<h2>Small Buttons</h2>
 			<Flex gap={ 2 }>
 				<Button isSmall>Button</Button>
-				<Button isPrimary isSmall>
+				<Button variant="primary" isSmall>
 					Primary Button
 				</Button>
-				<Button isSecondary isSmall>
+				<Button variant="secondary" isSmall>
 					Secondary Button
 				</Button>
-				<Button isTertiary isSmall>
+				<Button variant="tertiary" isSmall>
 					Tertiary Button
 				</Button>
 				<Button isSmall icon={ more } />
-				<Button isSmall isPrimary icon={ more } />
-				<Button isSmall isSecondary icon={ more } />
-				<Button isSmall isTertiary icon={ more } />
-				<Button isSmall isPrimary icon={ more }>
+				<Button isSmall variant="primary" icon={ more } />
+				<Button isSmall variant="secondary" icon={ more } />
+				<Button isSmall variant="tertiary" icon={ more } />
+				<Button isSmall variant="primary" icon={ more }>
 					Icon & Text
 				</Button>
 			</Flex>
@@ -34,14 +34,14 @@ const ButtonExample = () => {
 			<h2>Regular Buttons</h2>
 			<Flex gap={ 4 }>
 				<Button>Button</Button>
-				<Button isPrimary>Primary Button</Button>
-				<Button isSecondary>Secondary Button</Button>
-				<Button isTertiary>Tertiary Button</Button>
+				<Button variant="primary">Primary Button</Button>
+				<Button variant="secondary">Secondary Button</Button>
+				<Button variant="tertiary">Tertiary Button</Button>
 				<Button icon={ more } />
-				<Button isPrimary icon={ more } />
-				<Button isSecondary icon={ more } />
-				<Button isTertiary icon={ more } />
-				<Button isPrimary icon={ more }>
+				<Button variant="primary" icon={ more } />
+				<Button variant="secondary" icon={ more } />
+				<Button variant="tertiary" icon={ more } />
+				<Button variant="primary" icon={ more }>
 					Icon & Text
 				</Button>
 			</Flex>
diff --git a/client/devdocs/design/wordpress-components-gallery/card.tsx b/client/devdocs/design/wordpress-components-gallery/card.tsx
index 4dc264e216df1..cdfa4779ad072 100644
--- a/client/devdocs/design/wordpress-components-gallery/card.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/card.tsx
@@ -14,7 +14,7 @@ const CardExample = () => (
 		<CardHeader isShady={ false }>
 			<FlexBlock>Header: Code is Poetry</FlexBlock>
 			<FlexItem>
-				<Button isLink>Dismiss</Button>
+				<Button variant="link">Dismiss</Button>
 			</FlexItem>
 		</CardHeader>
 
@@ -25,7 +25,7 @@ const CardExample = () => (
 		<CardFooter isShady={ false }>
 			<FlexBlock>Footer: Code is Poetry</FlexBlock>
 			<FlexItem>
-				<Button isPrimary>Action</Button>
+				<Button variant="primary">Action</Button>
 			</FlexItem>
 		</CardFooter>
 	</Card>
diff --git a/client/devdocs/design/wordpress-components-gallery/clipboard-button.tsx b/client/devdocs/design/wordpress-components-gallery/clipboard-button.tsx
index 51748cdf53c5d..9c1e0ff5138a6 100644
--- a/client/devdocs/design/wordpress-components-gallery/clipboard-button.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/clipboard-button.tsx
@@ -7,8 +7,9 @@ const ClipboardButtonExample = () => {
 	const text = 'Code is Poetry';
 	return (
 		<ClipboardButton
+			// @ts-expect-error The button props are passed into a Button component internally, but the types don't account that.
+			variant="primary"
 			text={ text }
-			isPrimary
 			onCopy={ () => setCopied( true ) }
 			onFinishCopy={ () => setCopied( false ) }
 		>
diff --git a/client/devdocs/design/wordpress-components-gallery/color-palette.tsx b/client/devdocs/design/wordpress-components-gallery/color-palette.tsx
index 0e027111e3ddb..8e9cdc94c7c7b 100644
--- a/client/devdocs/design/wordpress-components-gallery/color-palette.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/color-palette.tsx
@@ -2,7 +2,7 @@ import { ColorPalette } from '@wordpress/components';
 import { useState } from 'react';
 
 const ColorPaletteExample = () => {
-	const colors: ColorPalette.Color[] = [
+	const colors = [
 		{ name: 'red', color: '#f00' },
 		{ name: 'white', color: '#fff' },
 		{ name: 'blue', color: '#00f' },
diff --git a/client/devdocs/design/wordpress-components-gallery/date-time-picker.tsx b/client/devdocs/design/wordpress-components-gallery/date-time-picker.tsx
index eb1586be5a7d5..f837145e02e7c 100644
--- a/client/devdocs/design/wordpress-components-gallery/date-time-picker.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/date-time-picker.tsx
@@ -2,7 +2,7 @@ import { DateTimePicker } from '@wordpress/components';
 import { useState } from 'react';
 
 const DateTimePickerExample = () => {
-	const [ dateTime, setDateTime ] = useState( '' );
+	const [ dateTime, setDateTime ] = useState< string | null >( '' );
 
 	return <DateTimePicker currentDate={ dateTime } onChange={ setDateTime } />;
 };
diff --git a/client/devdocs/design/wordpress-components-gallery/dropdown-menu.tsx b/client/devdocs/design/wordpress-components-gallery/dropdown-menu.tsx
index 1c3ab4dbec010..4192261f1b2d8 100644
--- a/client/devdocs/design/wordpress-components-gallery/dropdown-menu.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/dropdown-menu.tsx
@@ -36,6 +36,7 @@ const DropdownMenuExample = () => {
 							] }
 							value={ mode }
 							onSelect={ setMode }
+							onHover={ () => undefined }
 						/>
 					</MenuGroup>
 				</Fragment>
diff --git a/client/devdocs/design/wordpress-components-gallery/font-size-picker.tsx b/client/devdocs/design/wordpress-components-gallery/font-size-picker.tsx
index e8313b874a1e6..5310adef61c29 100644
--- a/client/devdocs/design/wordpress-components-gallery/font-size-picker.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/font-size-picker.tsx
@@ -2,7 +2,7 @@ import { FontSizePicker } from '@wordpress/components';
 import { useState } from 'react';
 
 const FontSizePickerExample = () => {
-	const [ fontSize, setFontSize ] = useState< number | undefined >( 16 );
+	const [ fontSize, setFontSize ] = useState< string | number | undefined >( 16 );
 
 	return (
 		<FontSizePicker
diff --git a/client/devdocs/design/wordpress-components-gallery/form-file-upload.tsx b/client/devdocs/design/wordpress-components-gallery/form-file-upload.tsx
index d56b6cbc59349..99fd8eb40952e 100644
--- a/client/devdocs/design/wordpress-components-gallery/form-file-upload.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/form-file-upload.tsx
@@ -2,7 +2,8 @@ import { FormFileUpload } from '@wordpress/components';
 
 const FormFileUploadExample = () => (
 	<FormFileUpload
-		isPrimary
+		// @ts-expect-error The FormFileUpload components passes button props internally, but the types don't account for that.
+		variant="primary"
 		multiple
 		onChange={ ( event ) =>
 			window.alert( `${ event?.target?.files?.length ?? 0 } files uploaded!` )
diff --git a/client/devdocs/design/wordpress-components-gallery/form-token-field.tsx b/client/devdocs/design/wordpress-components-gallery/form-token-field.tsx
index 371c2372e9a10..e779af06cbf90 100644
--- a/client/devdocs/design/wordpress-components-gallery/form-token-field.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/form-token-field.tsx
@@ -1,6 +1,7 @@
 import { FormTokenField } from '@wordpress/components';
 import { withState } from '@wordpress/compose';
-import type { FormTokenField as FormTokenFieldType } from '@wordpress/components';
+
+type TokenValue = React.ComponentProps< typeof FormTokenField >[ 'value' ];
 
 const FormTokenFieldExample = withState( {
 	tokens: [],
@@ -21,7 +22,7 @@ const FormTokenFieldExample = withState( {
 	}: {
 		tokens: string[];
 		suggestions: string[];
-		setState: ( { tokens }: { tokens: readonly FormTokenFieldType.Value[] } ) => void;
+		setState: ( { tokens }: { tokens: TokenValue } ) => void;
 	} ) => (
 		<FormTokenField
 			value={ tokens }
diff --git a/client/devdocs/design/wordpress-components-gallery/guide.tsx b/client/devdocs/design/wordpress-components-gallery/guide.tsx
index 128e9f511c687..2dfaa12d41c51 100644
--- a/client/devdocs/design/wordpress-components-gallery/guide.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/guide.tsx
@@ -14,7 +14,7 @@ const GuideExample = () => {
 
 	return (
 		<>
-			<Button isSecondary onClick={ openGuide }>
+			<Button variant="secondary" onClick={ openGuide }>
 				Open Guide
 			</Button>
 			{ isOpen && (
diff --git a/client/devdocs/design/wordpress-components-gallery/query-controls.tsx b/client/devdocs/design/wordpress-components-gallery/query-controls.tsx
index a245230cff3d4..8087d6d5c6826 100644
--- a/client/devdocs/design/wordpress-components-gallery/query-controls.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/query-controls.tsx
@@ -3,8 +3,8 @@ import { withState } from '@wordpress/compose';
 
 interface StateProps {
 	category: number;
-	order: string;
-	orderBy: string;
+	order: 'asc' | 'desc';
+	orderBy: 'date' | 'title';
 	numberOfItems: number;
 }
 
@@ -48,7 +48,9 @@ const QueryControlsExample = withState( {
 			onOrderChange={ ( nextOrder ) => setState( { order: nextOrder } ) }
 			categoriesList={ categories }
 			selectedCategoryId={ category }
-			onCategoryChange={ ( nextCategory ) => setState( { category: nextCategory } ) }
+			onCategoryChange={ ( nextCategory: string ) =>
+				setState( { category: Number( nextCategory ) } )
+			}
 			onNumberOfItemsChange={ ( nextNumberOfItems ) =>
 				setState( { numberOfItems: nextNumberOfItems } )
 			}
diff --git a/client/devdocs/design/wordpress-components-gallery/slot-fill.tsx b/client/devdocs/design/wordpress-components-gallery/slot-fill.tsx
index 21b0bb403d88b..544afe579446b 100644
--- a/client/devdocs/design/wordpress-components-gallery/slot-fill.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/slot-fill.tsx
@@ -4,9 +4,11 @@ const SlotFillExample = () => (
 	<SlotFillProvider>
 		<h2>Profile</h2>
 		<p>
+			{ /* @ts-expect-error Slot is not typed correctly. */ }
 			Name: <Slot bubblesVirtually name="name" />
 		</p>
 		<p>
+			{ /* @ts-expect-error Slot is not typed correctly. */ }
 			Age: <Slot bubblesVirtually name="age" />
 		</p>
 		<Fill name="name">Grace</Fill>
diff --git a/client/devdocs/design/wordpress-components-gallery/toolbar.tsx b/client/devdocs/design/wordpress-components-gallery/toolbar.tsx
index 577a2c8cb9cdf..d34a4a5edd5f3 100644
--- a/client/devdocs/design/wordpress-components-gallery/toolbar.tsx
+++ b/client/devdocs/design/wordpress-components-gallery/toolbar.tsx
@@ -8,7 +8,6 @@ import {
 	formatItalic,
 	formatStrikethrough,
 	link,
-	more,
 	paragraph,
 } from '@wordpress/icons';
 
@@ -33,8 +32,6 @@ const ToolbarExample = () => (
 			<ToolbarButton icon={ link } label="Link" />
 			<ToolbarGroup
 				isCollapsed
-				icon={ undefined }
-				label="More rich text controls"
 				controls={ [
 					{ icon: code, title: 'Inline code' },
 					{ icon: <InlineImageIcon />, title: 'Inline image' },
@@ -46,8 +43,6 @@ const ToolbarExample = () => (
 			/>
 		</ToolbarGroup>
 		<ToolbarGroup
-			icon={ more }
-			label="Change text alignment"
 			isCollapsed
 			controls={ [
 				{
diff --git a/client/jetpack-cloud/sections/agency-dashboard/dashboard-modal/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/dashboard-modal/index.tsx
index ada2e1d06390e..83d2e003a2a0c 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/dashboard-modal/index.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/dashboard-modal/index.tsx
@@ -24,7 +24,6 @@ export default function DashboardModal( {
 	return (
 		<Modal
 			shouldCloseOnClickOutside={ shouldCloseOnClickOutside }
-			open={ true }
 			onRequestClose={ onClose }
 			title={ title }
 			className={ classNames( 'dashboard-modal', className ) }
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
index d0f8f25264537..04f7578d3f264 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
@@ -34,6 +34,11 @@ export default function EmailNotification( {
 			<div className="notification-settings__toggle-container">
 				<div className="notification-settings__toggle">
 					<ToggleControl
+						label={
+							enableEmailNotification
+								? translate( 'Disable email notifications' )
+								: translate( 'Enable email notifications' )
+						}
 						onChange={ ( isEnabled ) => {
 							recordEvent( isEnabled ? 'email_notification_enable' : 'email_notification_disable' );
 							setEnableEmailNotification( isEnabled );
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/mobile-push-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/mobile-push-notification.tsx
index 07cf7e683cd54..08e9c3ee5c6d8 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/mobile-push-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/mobile-push-notification.tsx
@@ -19,6 +19,11 @@ export default function MobilePushNotification( {
 		<div className="notification-settings__toggle-container">
 			<div className="notification-settings__toggle">
 				<ToggleControl
+					label={
+						enableMobileNotification
+							? translate( 'Disable mobile notifications' )
+							: translate( 'Enable mobile notifications' )
+					}
 					onChange={ ( isEnabled ) => {
 						recordEvent( isEnabled ? 'mobile_notification_enable' : 'mobile_notification_disable' );
 						setEnableMobileNotification( isEnabled );
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/sms-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/sms-notification.tsx
index 154d1f17a0baf..e31a157f153c1 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/sms-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/sms-notification.tsx
@@ -31,7 +31,15 @@ export default function SMSNotification( {
 		<>
 			<div className="notification-settings__toggle-container">
 				<div className="notification-settings__toggle">
-					<ToggleControl onChange={ handleToggleClick } checked={ enableSMSNotification } />
+					<ToggleControl
+						label={
+							enableSMSNotification
+								? translate( 'Disable SMS notifications' )
+								: translate( 'Enable SMS notifications' )
+						}
+						onChange={ handleToggleClick }
+						checked={ enableSMSNotification }
+					/>
 				</div>
 				<div className="notification-settings__toggle-content">
 					<div className="notification-settings__content-heading-with-beta">
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/index.tsx
index 1b2768a851205..7d2063d4eb596 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/index.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/index.tsx
@@ -1,5 +1,5 @@
 import { Button } from '@automattic/components';
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 import { ReactNode, useState, useRef } from 'react';
 import clockIcon from 'calypso/assets/images/jetpack/clock-icon.svg';
@@ -48,12 +48,6 @@ export default function ToggleActivateMonitoring( {
 		setShowTooltip( false );
 	};
 
-	const ToggleControl = OriginalToggleControl as React.ComponentType<
-		OriginalToggleControl.Props & {
-			disabled?: boolean;
-		}
-	>;
-
 	function handleToggleActivateMonitoring( checked: boolean ) {
 		recordEvent( checked ? 'enable_monitor_click' : 'disable_monitor_click' );
 		toggleActivateMonitor( checked );
diff --git a/client/jetpack-cloud/sections/partner-portal/searchable-dropdown/index.tsx b/client/jetpack-cloud/sections/partner-portal/searchable-dropdown/index.tsx
index ca8cbbac5509e..bf9212580afef 100644
--- a/client/jetpack-cloud/sections/partner-portal/searchable-dropdown/index.tsx
+++ b/client/jetpack-cloud/sections/partner-portal/searchable-dropdown/index.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 
 import './style.scss';
 
-type Props = ComboboxControl.Props & {
+type Props = React.ComponentProps< typeof ComboboxControl > & {
 	disabled?: boolean;
 };
 
@@ -16,13 +16,7 @@ export default function SearchableDropdown( props: Props ) {
 				'is-disabled': disabled,
 			} ) }
 		>
-			<Disabled
-				// TODO: The type definition for Disabled is incorrect, isDisabled actually exists. Upgrading the @wordpress/components
-				// which the latest version now ships with its own type definitions which fixes the issue.
-				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-				// @ts-ignore
-				isDisabled={ disabled }
-			>
+			<Disabled isDisabled={ disabled }>
 				<ComboboxControl { ...props } />
 			</Disabled>
 		</div>
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/components/sensei-step-container/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/components/sensei-step-container/index.tsx
index b3f861e2b1066..98e2f64ae2b4f 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/components/sensei-step-container/index.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/components/sensei-step-container/index.tsx
@@ -44,7 +44,7 @@ export const SenseiStepContainer: React.FC< SenseiStepContainerProps > = ( {
 						<Footer>
 							<FooterText>
 								{ createInterpolateElement( __( 'Hosted by <a>WordPress.com</a>' ), {
-									a: <ExternalLink href="https://wordpress.com" />,
+									a: <ExternalLink href="https://wordpress.com" children={ null } />,
 								} ) }
 							</FooterText>
 							<FooterText>
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/unified-design-picker.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/unified-design-picker.tsx
index 577c21c198827..0aa7053f69f23 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/unified-design-picker.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/unified-design-picker.tsx
@@ -19,7 +19,7 @@ import { useLocale } from '@automattic/i18n-utils';
 import { StepContainer } from '@automattic/onboarding';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useTranslate } from 'i18n-calypso';
-import { useRef, useState, useEffect } from 'react';
+import { useRef, useState, useEffect, useMemo } from 'react';
 import AsyncLoad from 'calypso/components/async-load';
 import { useQuerySiteFeatures } from 'calypso/components/data/query-site-features';
 import { useQuerySitePurchases } from 'calypso/components/data/query-site-purchases';
@@ -100,6 +100,7 @@ const UnifiedDesignPickerStep: Step = ( { navigation, flow, stepName } ) => {
 		if ( isAtomic ) {
 			exitFlow?.( `/site-editor/${ siteSlugOrId }` );
 		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ isAtomic ] );
 
 	const isPremiumThemeAvailable = Boolean(
@@ -153,7 +154,7 @@ const UnifiedDesignPickerStep: Step = ( { navigation, flow, stepName } ) => {
 		}
 	);
 
-	const designs = allDesigns?.designs || [];
+	const designs = useMemo( () => allDesigns?.designs ?? [], [ allDesigns?.designs ] );
 	const hasTrackedView = useRef( false );
 	useEffect( () => {
 		if ( ! hasTrackedView.current && designs.length > 0 ) {
@@ -614,7 +615,7 @@ const UnifiedDesignPickerStep: Step = ( { navigation, flow, stepName } ) => {
 					selectedFontVariation={ selectedFontVariation }
 					onSelectFontVariation={ setSelectedFontVariation }
 					onGlobalStylesChange={ setGlobalStyles }
-					onNavigatorPathChange={ ( path: string ) => setShouldHideActionButtons( path !== '/' ) }
+					onNavigatorPathChange={ ( path?: string ) => setShouldHideActionButtons( path !== '/' ) }
 				/>
 			</>
 		);
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/upgrade-modal.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/upgrade-modal.tsx
index 7ae574fa83bc8..c4fcf2f649890 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/upgrade-modal.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/upgrade-modal.tsx
@@ -112,7 +112,7 @@ const UpgradeModal = ( { slug, isOpen, closeModal, checkout }: UpgradeModalProps
 						'This theme comes bundled with {{link}}WooCommerce{{/link}} plugin. Upgrade to a Business plan to select this theme and unlock all its features. It’s %s per year with a 14-day money-back guarantee.',
 						{
 							components: {
-								link: <ExternalLink target="_blank" href="https://woocommerce.com/" />,
+								link: <ExternalLink children={ null } href="https://woocommerce.com/" />,
 							},
 							args: businessPlanPrice,
 						}
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/task-helper.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/task-helper.tsx
index 5984b26bb3fdf..f1d6478ece894 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/task-helper.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/launchpad/task-helper.tsx
@@ -177,6 +177,7 @@ export function getEnhancedTasks(
 							components: {
 								a: (
 									<ExternalLink
+										children={ null }
 										href={ localizeUrl(
 											'https://wordpress.com/support/using-styles/#reset-all-styles'
 										) }
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/notices/notices.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/notices/notices.tsx
index 50930c5ed0ef2..a2e6bd1ce0fc7 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/notices/notices.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/notices/notices.tsx
@@ -1,4 +1,4 @@
-import { NoticeList, SnackbarList } from '@wordpress/components';
+import { Notice, SnackbarList } from '@wordpress/components';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import i18n from 'i18n-calypso';
 import { ComponentType, ReactNode, ReactElement, useState } from 'react';
@@ -7,8 +7,10 @@ import './notices.scss';
 
 const NOTICE_TIMEOUT = 5000;
 
-type Notice = NoticeList.Notice & {
+type Notice = Omit< React.ComponentProps< typeof Notice >, 'children' > & {
 	timer?: ReturnType< typeof setTimeout >;
+	id: string;
+	content: string;
 };
 
 interface NoticeOperationsProps {
@@ -45,10 +47,10 @@ const withNotices = createHigherOrderComponent(
 					}, NOTICE_TIMEOUT ),
 				};
 
-				setNoticeList( ( current ) => [
-					...current.filter( ( notice ) => notice.id !== id ),
-					newNotice,
-				] );
+				setNoticeList(
+					( current ) =>
+						[ ...current.filter( ( notice ) => notice.id !== id ), newNotice ] as Notice[]
+				);
 			};
 
 			const noticeOperations: NoticeOperationsProps = {
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/pattern-large-preview.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/pattern-large-preview.tsx
index 2e97f8f2d3b41..b1e3e889d1859 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/pattern-large-preview.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/pattern-large-preview.tsx
@@ -1,6 +1,6 @@
 import { PatternRenderer } from '@automattic/block-renderer';
 import { Button, DeviceSwitcher } from '@automattic/components';
-import { useStyle } from '@automattic/global-styles';
+import { useGlobalStyle } from '@automattic/global-styles';
 import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
 import classnames from 'classnames';
 import { useTranslate } from 'i18n-calypso';
@@ -45,13 +45,15 @@ const PatternLargePreview = ( {
 	const navigator = useNavigator();
 	const hasSelectedPattern = header || sections.length || footer;
 	const shouldShowSelectPatternHint =
-		! hasSelectedPattern && STYLES_PATHS.includes( navigator.location.path );
+		! hasSelectedPattern &&
+		navigator.location.path &&
+		STYLES_PATHS.includes( navigator.location.path );
 	const frameRef = useRef< HTMLDivElement | null >( null );
 	const listRef = useRef< HTMLUListElement | null >( null );
 	const [ viewportHeight, setViewportHeight ] = useState< number | undefined >( 0 );
 	const [ device, setDevice ] = useState< string >( 'computer' );
-	const [ blockGap ] = useStyle( 'spacing.blockGap' );
-	const [ backgroundColor ] = useStyle( 'color.background' );
+	const [ blockGap ] = useGlobalStyle( 'spacing.blockGap' );
+	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
 	const [ patternLargePreviewStyle, setPatternLargePreviewStyle ] = useState( {
 		'--pattern-large-preview-block-gap': blockGap,
 		'--pattern-large-preview-background': backgroundColor,
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/screen-main.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/screen-main.tsx
index 73098b1ff4041..c5e7c393f3d02 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/screen-main.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/pattern-assembler/screen-main.tsx
@@ -5,7 +5,7 @@ import {
 	NavigatorItemGroup,
 } from '@automattic/onboarding';
 import {
-	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
 	__experimentalUseNavigator as useNavigator,
 } from '@wordpress/components';
 import { focus } from '@wordpress/dom';
@@ -97,7 +97,7 @@ const ScreenMain = ( {
 				hideBack
 			/>
 			<div className="screen-container__body" ref={ wrapperRef }>
-				<HStack direction="column" alignment="top" spacing="4" expanded={ false }>
+				<VStack spacing="4">
 					<NavigatorItemGroup title={ translate( 'Patterns' ) }>
 						<NavigationButtonAsItem
 							checked={ hasHeader }
@@ -149,7 +149,7 @@ const ScreenMain = ( {
 							</NavigationButtonAsItem>
 						</>
 					</NavigatorItemGroup>
-				</HStack>
+				</VStack>
 				{ ! surveyDismissed && <Survey setSurveyDismissed={ setSurveyDismissed } /> }
 			</div>
 			<div className="screen-container__footer">
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/store-address/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/store-address/index.tsx
index 0de64c869fbe4..64e25220a43af 100644
--- a/client/landing/stepper/declarative-flow/internals/steps-repository/store-address/index.tsx
+++ b/client/landing/stepper/declarative-flow/internals/steps-repository/store-address/index.tsx
@@ -260,7 +260,7 @@ const StoreAddress: Step = function StoreAddress( { navigation } ) {
 						<FormLabel htmlFor="store_postcode">{ __( 'Country / State' ) }</FormLabel>
 						<ComboboxControl
 							value={ getSettingsValue( 'store_country' ) }
-							onChange={ ( value: string | null ) => {
+							onChange={ ( value?: string | null ) => {
 								onChange( 'store_country', value || '' );
 							} }
 							options={ countriesAsOptions }
diff --git a/client/landing/subscriptions/components/icons/search-icon.tsx b/client/landing/subscriptions/components/icons/search-icon.tsx
index 9d30d54ad3ab4..b1640c2b463c6 100644
--- a/client/landing/subscriptions/components/icons/search-icon.tsx
+++ b/client/landing/subscriptions/components/icons/search-icon.tsx
@@ -1,4 +1,5 @@
 import { Icon } from '@wordpress/components';
+import type { ComponentProps } from 'react';
 
 const SearchSVG = (
 	<svg
@@ -26,6 +27,8 @@ const SearchSVG = (
 	</svg>
 );
 
-const SearchIcon = ( props: Icon.Props< never > ) => <Icon icon={ SearchSVG } { ...props } />;
+const SearchIcon = ( props: ComponentProps< typeof Icon > ) => (
+	<Icon icon={ SearchSVG } { ...props } />
+);
 
 export default SearchIcon;
diff --git a/client/landing/subscriptions/components/settings/site-settings/email-me-new-comments-toggle.tsx b/client/landing/subscriptions/components/settings/site-settings/email-me-new-comments-toggle.tsx
index cb39b9e84284a..d9cdb93fbf5b6 100644
--- a/client/landing/subscriptions/components/settings/site-settings/email-me-new-comments-toggle.tsx
+++ b/client/landing/subscriptions/components/settings/site-settings/email-me-new-comments-toggle.tsx
@@ -1,14 +1,6 @@
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 
-// This is a fix to get around the fact that the original ToggleControl component doesn't support the disabled prop.
-// TODO: Remove this when the original ToggleControl component supports the disabled prop.
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 type EmailMeNewCommentsToggleProps = {
 	value: boolean;
 	isUpdating: boolean;
diff --git a/client/landing/subscriptions/components/settings/site-settings/email-me-new-posts-toggle.tsx b/client/landing/subscriptions/components/settings/site-settings/email-me-new-posts-toggle.tsx
index 3ec5e2ddd5cf4..1c9cbcfb5baf6 100644
--- a/client/landing/subscriptions/components/settings/site-settings/email-me-new-posts-toggle.tsx
+++ b/client/landing/subscriptions/components/settings/site-settings/email-me-new-posts-toggle.tsx
@@ -1,14 +1,6 @@
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 
-// This is a fix to get around the fact that the original ToggleControl component doesn't support the disabled prop.
-// TODO: Remove this when the original ToggleControl component supports the disabled prop.
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 type EmailMeNewPostsToggleProps = {
 	value: boolean;
 	isUpdating: boolean;
diff --git a/client/landing/subscriptions/components/settings/site-settings/notify-me-of-new-posts-toggle.tsx b/client/landing/subscriptions/components/settings/site-settings/notify-me-of-new-posts-toggle.tsx
index d6037d36e2a5a..d740a1c459e7f 100644
--- a/client/landing/subscriptions/components/settings/site-settings/notify-me-of-new-posts-toggle.tsx
+++ b/client/landing/subscriptions/components/settings/site-settings/notify-me-of-new-posts-toggle.tsx
@@ -1,14 +1,6 @@
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 
-// This is a fix to get around the fact that the original ToggleControl component doesn't support the disabled prop.
-// TODO: Remove this when the original ToggleControl component supports the disabled prop.
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 type NotifyMeOfNewPostsToggleProps = {
 	value: boolean;
 	isUpdating: boolean;
diff --git a/client/landing/subscriptions/components/site-subscription-page/site-subscription-details.tsx b/client/landing/subscriptions/components/site-subscription-page/site-subscription-details.tsx
index f1bf988f11fb0..d0dd30833dd02 100644
--- a/client/landing/subscriptions/components/site-subscription-page/site-subscription-details.tsx
+++ b/client/landing/subscriptions/components/site-subscription-page/site-subscription-details.tsx
@@ -256,9 +256,8 @@ const SiteSubscriptionDetails = ( {
 						{ paymentPlans && !! paymentPlans.length && (
 							<Button
 								className="site-subscription-page__manage-button"
-								isPrimary
+								variant="primary"
 								href="/me/purchases"
-								disabled={ unsubscribing }
 							>
 								{ translate( 'Manage purchases' ) }
 							</Button>
diff --git a/client/landing/subscriptions/components/site-subscriptions-list/site-row.tsx b/client/landing/subscriptions/components/site-subscriptions-list/site-row.tsx
index b3b54f0dcc1e4..1680126a52477 100644
--- a/client/landing/subscriptions/components/site-subscriptions-list/site-row.tsx
+++ b/client/landing/subscriptions/components/site-subscriptions-list/site-row.tsx
@@ -195,7 +195,7 @@ const SiteRow = ( {
 	};
 
 	return ! isDeleted ? (
-		<HStack as="li" alignItems="center" className="row" role="row">
+		<HStack as="li" alignment="center" className="row" role="row">
 			<span className="title-cell" role="cell">
 				<Link
 					className="title-icon"
diff --git a/client/landing/subscriptions/components/site-subscriptions-list/site-subscriptions-list.tsx b/client/landing/subscriptions/components/site-subscriptions-list/site-subscriptions-list.tsx
index b4db3acf391e2..0e009885b3fe1 100644
--- a/client/landing/subscriptions/components/site-subscriptions-list/site-subscriptions-list.tsx
+++ b/client/landing/subscriptions/components/site-subscriptions-list/site-subscriptions-list.tsx
@@ -65,7 +65,7 @@ const SiteSubscriptionsList: React.FC< SiteSubscriptionsListProps > = ( {
 
 	return (
 		<ul className="site-subscriptions-list" role="table">
-			<HStack className="row header" role="row" as="li" alignItems="center">
+			<HStack className="row header" role="row" as="li" alignment="center">
 				<span className="title-cell" role="columnheader">
 					{ translate( 'Subscribed site' ) }
 				</span>
diff --git a/client/landing/subscriptions/components/sort-controls/sort-controls.tsx b/client/landing/subscriptions/components/sort-controls/sort-controls.tsx
index 6a14885a99020..70c9f4ad235d6 100644
--- a/client/landing/subscriptions/components/sort-controls/sort-controls.tsx
+++ b/client/landing/subscriptions/components/sort-controls/sort-controls.tsx
@@ -4,6 +4,9 @@ import { useTranslate } from 'i18n-calypso';
 import { ReactElement, useMemo } from 'react';
 import './styles.scss';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const noop = () => {};
+
 export type Option< T > = {
 	label: string;
 	value: T;
@@ -63,6 +66,7 @@ const SortControls: < T extends string >( props: SortControlsProps< T > ) => Rea
 							onClose();
 						} }
 						choices={ options }
+						onHover={ noop }
 					/>
 				</NavigableMenu>
 			) }
diff --git a/client/me/account/toggle-sites-as-landing-page.tsx b/client/me/account/toggle-sites-as-landing-page.tsx
index 51e2488c5f9c1..607c3825094a5 100644
--- a/client/me/account/toggle-sites-as-landing-page.tsx
+++ b/client/me/account/toggle-sites-as-landing-page.tsx
@@ -1,4 +1,4 @@
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 import { useDispatch, useSelector } from 'calypso/state';
 import { recordTracksEvent } from 'calypso/state/analytics/actions';
@@ -6,12 +6,6 @@ import { successNotice } from 'calypso/state/notices/actions';
 import { savePreference } from 'calypso/state/preferences/actions';
 import { getPreference, isSavingPreference } from 'calypso/state/preferences/selectors';
 
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 function ToggleSitesAsLandingPage() {
 	const translate = useTranslate();
 	const dispatch = useDispatch();
diff --git a/client/me/purchases/manage-purchase/auto-renew-toggle/index.tsx b/client/me/purchases/manage-purchase/auto-renew-toggle/index.tsx
index 8180f0fc0bb32..00164a01a18fd 100644
--- a/client/me/purchases/manage-purchase/auto-renew-toggle/index.tsx
+++ b/client/me/purchases/manage-purchase/auto-renew-toggle/index.tsx
@@ -1,4 +1,4 @@
-import { Button, ToggleControl, BaseControl } from '@wordpress/components';
+import { Button, ToggleControl } from '@wordpress/components';
 import { localize, LocalizeProps } from 'i18n-calypso';
 import page from 'page';
 import { Component } from 'react';
@@ -19,32 +19,6 @@ import AutoRenewPaymentMethodDialog from './auto-renew-payment-method-dialog';
 import type { GetChangePaymentMethodUrlFor, Purchase } from 'calypso/lib/purchases/types';
 import type { NoticeStatus, NoticeText, NoticeOptions } from 'calypso/state/notices/types';
 
-// The ToggleControl type is missing the `disabled` prop, but it is an allowed
-// prop so we override it here until the definition can be fixed.
-declare module '@wordpress/components' {
-	// eslint-disable-next-line @typescript-eslint/no-namespace
-	namespace ToggleControl {
-		interface Props extends BaseControl.ControlProps {
-			/**
-			 * If checked is `true` the toggle will be checked. If checked is
-			 * `false` the toggle will be unchecked. If no value is passed the
-			 * toggle will be unchecked.
-			 */
-			checked?: boolean | undefined;
-			/**
-			 * A function that receives the checked state as input.
-			 */
-			onChange?( isChecked: boolean ): void;
-			/**
-			 * Will disable the input if set.
-			 *
-			 * NOTE: this is missing from the actual ToggleControl props so we override it here.
-			 */
-			disabled?: boolean;
-		}
-	}
-}
-
 export interface AutoRenewToggleProps {
 	purchase: Purchase;
 	siteDomain: string;
@@ -266,7 +240,7 @@ class AutoRenewToggle extends Component<
 				'…'
 			) : (
 				<Button
-					isLink
+					variant="link"
 					className="is-link"
 					onClick={ this.onToggleAutoRenew }
 					disabled={ shouldDisable }
diff --git a/client/me/purchases/payment-methods/payment-method-backup-toggle.tsx b/client/me/purchases/payment-methods/payment-method-backup-toggle.tsx
index e0ce23736eac3..0fe624fb7561b 100644
--- a/client/me/purchases/payment-methods/payment-method-backup-toggle.tsx
+++ b/client/me/purchases/payment-methods/payment-method-backup-toggle.tsx
@@ -1,3 +1,4 @@
+import { useLocalizeUrl } from '@automattic/i18n-utils';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { CheckboxControl, Spinner } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
@@ -24,6 +25,7 @@ async function setIsBackup(
 
 export default function PaymentMethodBackupToggle( { card }: { card: StoredPaymentMethod } ) {
 	const translate = useTranslate();
+	const localizeUrl = useLocalizeUrl();
 	const storedDetailsId = card.stored_details_id;
 	const initialIsBackup = !! card.is_backup;
 	const queryClient = useQueryClient();
@@ -73,22 +75,26 @@ export default function PaymentMethodBackupToggle( { card }: { card: StoredPayme
 			<CheckboxControl
 				checked={ isBackup }
 				onChange={ toggleIsBackup }
-				label={ translate( 'Use as backup.{{supportLink /}}', {
-					components: {
-						supportLink: (
-							<InlineSupportLink
-								showText={ false }
-								supportContext="backup_payment_methods"
-								iconSize={ 16 }
-								supportLink={
-									isJetpackCloud()
-										? 'https://wordpress.com/support/payment/#backup-payment-methods'
-										: null
-								}
-							/>
-						),
-					},
-				} ) }
+				label={
+					translate( 'Use as backup.{{supportLink /}}', {
+						components: {
+							supportLink: (
+								<InlineSupportLink
+									showText={ false }
+									supportContext="backup_payment_methods"
+									iconSize={ 16 }
+									supportLink={
+										isJetpackCloud()
+											? localizeUrl(
+													'https://wordpress.com/support/payment/#backup-payment-methods'
+											  )
+											: null
+									}
+								/>
+							),
+						},
+					} ) as string
+				}
 			/>
 		</div>
 	);
diff --git a/client/my-sites/backup/backup-contents-page/index.tsx b/client/my-sites/backup/backup-contents-page/index.tsx
index a438eab5147f9..1333d40fd5085 100644
--- a/client/my-sites/backup/backup-contents-page/index.tsx
+++ b/client/my-sites/backup/backup-contents-page/index.tsx
@@ -44,7 +44,7 @@ const BackupContentsPage: FunctionComponent< OwnProps > = ( { rewindId, siteId }
 				<DocumentHead title={ translate( 'Backup contents' ) } />
 				{ isJetpackCloud() && <SidebarNavigation /> }
 				<Button
-					isLink
+					variant="link"
 					className="backup-contents-page__back-button is-borderless"
 					href={ backupMainPath( siteSlug ) }
 				>
diff --git a/client/my-sites/checkout/checkout-thank-you/akismet-checkout-thank-you.tsx b/client/my-sites/checkout/checkout-thank-you/akismet-checkout-thank-you.tsx
index d58688fcfb44f..4cd9fffe72fcc 100644
--- a/client/my-sites/checkout/checkout-thank-you/akismet-checkout-thank-you.tsx
+++ b/client/my-sites/checkout/checkout-thank-you/akismet-checkout-thank-you.tsx
@@ -104,7 +104,7 @@ const AkismetCheckoutThankYou: FunctionComponent< AkismetCheckoutThankYouProps >
 						'You’ve supercharged your spam protection by increasing your API limit! Make sure to cancel any existing plans that you don’t need on your <a>account page</a>.',
 						'akismet-thank-you'
 					),
-					{ a: <ExternalLink href="https://akismet.com/account/" /> }
+					{ a: <ExternalLink href="https://akismet.com/account/" children={ null } /> }
 				);
 			}
 		}
diff --git a/client/my-sites/checkout/checkout-thank-you/marketplace/masterbar-styled/default-contact.tsx b/client/my-sites/checkout/checkout-thank-you/marketplace/masterbar-styled/default-contact.tsx
index e04410f7ace33..f03db71067bf9 100644
--- a/client/my-sites/checkout/checkout-thank-you/marketplace/masterbar-styled/default-contact.tsx
+++ b/client/my-sites/checkout/checkout-thank-you/marketplace/masterbar-styled/default-contact.tsx
@@ -71,7 +71,11 @@ export function DefaultMasterbarContact() {
 	return (
 		<ContactContainer>
 			<label>{ translate( 'Need extra help?' ) }</label>
-			<Button className="marketplace-thank-you-help-center" isLink onClick={ toggleHelpCenter }>
+			<Button
+				className="marketplace-thank-you-help-center"
+				variant="link"
+				onClick={ toggleHelpCenter }
+			>
 				<Gridicon icon="help-outline" />
 				<span>{ translate( 'Visit Help Center' ) }</span>
 			</Button>
diff --git a/client/my-sites/checkout/checkout-thank-you/marketplace/use-thank-you-footer.tsx b/client/my-sites/checkout/checkout-thank-you/marketplace/use-thank-you-footer.tsx
index c3f7f61e54e01..7da559f658b80 100644
--- a/client/my-sites/checkout/checkout-thank-you/marketplace/use-thank-you-footer.tsx
+++ b/client/my-sites/checkout/checkout-thank-you/marketplace/use-thank-you-footer.tsx
@@ -1,5 +1,5 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
-import { useLocale } from '@automattic/i18n-utils';
+import { useLocale, useLocalizeUrl } from '@automattic/i18n-utils';
 import { Button } from '@wordpress/components';
 import { useI18n } from '@wordpress/react-i18n';
 import { useTranslate } from 'i18n-calypso';
@@ -48,6 +48,7 @@ export function useThankYouFoooter(
 }
 
 function usePluginSteps(): FooterStep[] {
+	const localizeUrl = useLocalizeUrl();
 	const translate = useTranslate();
 	const { hasTranslation } = useI18n();
 	const locale = useLocale();
@@ -68,7 +69,7 @@ function usePluginSteps(): FooterStep[] {
 			key: 'thank_you_footer_explore',
 			title: translate( 'Need help setting your plugin up?' ),
 			description: descriptionText,
-			link: `https://wordpress.com/support/plugins/use-your-plugins/`,
+			link: localizeUrl( 'https://wordpress.com/support/plugins/use-your-plugins/' ),
 			linkText: translate( 'Plugin setup guide' ),
 			eventKey: 'calypso_plugin_thank_you_explore_plugins_click',
 			blankTarget: false,
@@ -79,7 +80,7 @@ function usePluginSteps(): FooterStep[] {
 			description: translate(
 				`Unlock your plugin's potential with our comprehensive support documentation.`
 			),
-			link: 'https://wordpress.com/support/category/plugins-and-integrations/',
+			link: localizeUrl( 'https://wordpress.com/support/category/plugins-and-integrations/' ),
 			linkText: translate( 'Plugin documentation' ),
 			eventKey: 'calypso_plugin_thank_you_plugin_support_click',
 		},
@@ -87,6 +88,7 @@ function usePluginSteps(): FooterStep[] {
 }
 
 function useThemeSteps(): FooterStep[] {
+	const localizeUrl = useLocalizeUrl();
 	const translate = useTranslate();
 
 	return [
@@ -96,7 +98,7 @@ function useThemeSteps(): FooterStep[] {
 			description: translate(
 				'Check out our support documentation for step-by-step instructions and expert guidance on your theme set up.'
 			),
-			link: 'https://wordpress.com/support/themes/set-up-your-theme/',
+			link: localizeUrl( 'https://wordpress.com/support/themes/set-up-your-theme/' ),
 			linkText: translate( 'Get set up support' ),
 			eventKey: 'calypso_plugin_thank_you_theme_setup_guide_click',
 		},
@@ -106,7 +108,7 @@ function useThemeSteps(): FooterStep[] {
 			description: translate(
 				'Take a look at our comprehensive support documentation and learn more about themes.'
 			),
-			link: 'https://wordpress.com/support/themes/',
+			link: localizeUrl( 'https://wordpress.com/support/themes/' ),
 			linkText: translate( 'Learn more about themes' ),
 			eventKey: 'calypso_plugin_thank_you_theme_support_click',
 		},
@@ -138,7 +140,7 @@ function useNextSteps(
 			stepDescription: step.description,
 			stepCta: (
 				<Button
-					isLink
+					variant="link"
 					href={ step.link }
 					target={ step.blankTarget !== false ? '_blank' : undefined } // the default is to open in a new tab
 					onClick={ () => sendTrackEvent( step.eventKey ) }
diff --git a/client/my-sites/checkout/checkout-thank-you/redesign-v2/masterbar-styled/default-contact.tsx b/client/my-sites/checkout/checkout-thank-you/redesign-v2/masterbar-styled/default-contact.tsx
index d79b55e966bda..0b1326c7deda9 100644
--- a/client/my-sites/checkout/checkout-thank-you/redesign-v2/masterbar-styled/default-contact.tsx
+++ b/client/my-sites/checkout/checkout-thank-you/redesign-v2/masterbar-styled/default-contact.tsx
@@ -65,7 +65,7 @@ export function DefaultMasterbarContact() {
 	return (
 		<ContactContainer>
 			<label>{ translate( 'Need extra help?' ) }</label>
-			<Button className="thank-you-help-center" isLink onClick={ toggleHelpCenter }>
+			<Button className="thank-you-help-center" variant="link" onClick={ toggleHelpCenter }>
 				<Gridicon icon="help-outline" />
 				<span>{ translate( 'Visit Help Center' ) }</span>
 			</Button>
diff --git a/client/my-sites/checkout/composite-checkout/hooks/use-cached-domain-contact-details.ts b/client/my-sites/checkout/composite-checkout/hooks/use-cached-domain-contact-details.ts
index bb978ad4782ac..e350a21158096 100644
--- a/client/my-sites/checkout/composite-checkout/hooks/use-cached-domain-contact-details.ts
+++ b/client/my-sites/checkout/composite-checkout/hooks/use-cached-domain-contact-details.ts
@@ -91,6 +91,7 @@ function useCachedContactDetailsForCheckoutForm(
 			...cachedContactDetails,
 			postalCode: arePostalCodesSupported ? cachedContactDetails.postalCode : '',
 		} )
+			// @ts-expect-error Action creator return types are incorrect. This can be removed after https://github.com/WordPress/gutenberg/pull/52530 is available in @wordpress/data.
 			.then( () => {
 				if ( ! isMounted.current ) {
 					return false;
diff --git a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/assign-to-all-payment-methods.tsx b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/assign-to-all-payment-methods.tsx
index ea771cf6cee8e..e1b4a07e2b0f9 100644
--- a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/assign-to-all-payment-methods.tsx
+++ b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/assign-to-all-payment-methods.tsx
@@ -37,19 +37,23 @@ export default function AssignToAllPaymentMethods( {
 				disabled={ isDisabled }
 				checked={ isChecked }
 				onChange={ handleChangeEvent }
-				label={ translate(
-					'Use this payment method for all subscriptions on my account. {{link}}Learn more.{{/link}}',
-					{
-						components: {
-							link: (
-								<InlineSupportLink
-									supportContext="payment_method_all_subscriptions"
-									showIcon={ false }
-								/>
-							),
-						},
-					}
-				) }
+				label={
+					translate(
+						'Use this payment method for all subscriptions on my account. {{link}}Learn more.{{/link}}',
+						{
+							components: {
+								link: (
+									<InlineSupportLink
+										supportContext="payment_method_all_subscriptions"
+										showIcon={ false }
+									/>
+								),
+							},
+						}
+						// As far as I can tell, label will correctly render the
+						// component, so we cast to string to make the types work.
+					) as string
+				}
 			/>
 		</CheckboxWrapper>
 	);
diff --git a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/store.ts b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/store.ts
index a43902b4fb183..af426276bd583 100644
--- a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/store.ts
+++ b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/store.ts
@@ -36,6 +36,9 @@ export const actions = {
 	touchAllFields(): CardStoreAction {
 		return { type: 'TOUCH_ALL_FIELDS' };
 	},
+	resetFields(): CardStoreAction {
+		return { type: 'RESET_FIELDS' };
+	},
 };
 
 export const selectors = {
@@ -105,6 +108,9 @@ export function createCreditCardPaymentMethodStore( {
 					{}
 				);
 			}
+			case 'RESET_FIELDS': {
+				return {};
+			}
 			default:
 				return state;
 		}
diff --git a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/types.ts b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/types.ts
index c47797e37a94f..44d70394110fe 100644
--- a/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/types.ts
+++ b/client/my-sites/checkout/composite-checkout/payment-methods/credit-card/types.ts
@@ -39,7 +39,8 @@ export type CardStoreAction =
 	| { type: 'FIELD_VALUE_SET'; payload: { key: string; value: string } }
 	| { type: 'FIELD_ERROR_SET'; payload: { key: string; message: string } }
 	| { type: 'USE_FOR_ALL_SUBSCRIPTIONS_SET'; payload: boolean }
-	| { type: 'TOUCH_ALL_FIELDS' };
+	| { type: 'TOUCH_ALL_FIELDS' }
+	| { type: 'RESET_FIELDS' };
 
 export type StripeFieldChangeInput =
 	| {
diff --git a/client/my-sites/checkout/composite-checkout/payment-methods/netbanking.tsx b/client/my-sites/checkout/composite-checkout/payment-methods/netbanking.tsx
index fb04ee132f1a2..63c0d568189c4 100644
--- a/client/my-sites/checkout/composite-checkout/payment-methods/netbanking.tsx
+++ b/client/my-sites/checkout/composite-checkout/payment-methods/netbanking.tsx
@@ -58,6 +58,9 @@ const actions = {
 	touchAllFields() {
 		return { type: 'TOUCH_ALL_FIELDS' };
 	},
+	resetFields() {
+		return { type: 'RESET_FIELDS' };
+	},
 };
 
 const selectors: StoreSelectorsWithState< NounsInStore > & {
@@ -125,6 +128,9 @@ export function createNetBankingPaymentMethodStore(): NetBankingStore {
 							{}
 						),
 					};
+				case 'RESET_FIELDS': {
+					return { ...state, fields: {} };
+				}
 			}
 			return state;
 		},
diff --git a/client/my-sites/checkout/composite-checkout/test/credit-card.tsx b/client/my-sites/checkout/composite-checkout/test/credit-card.tsx
index cdb27d8f5f55e..6f25e0b8e581f 100644
--- a/client/my-sites/checkout/composite-checkout/test/credit-card.tsx
+++ b/client/my-sites/checkout/composite-checkout/test/credit-card.tsx
@@ -12,6 +12,8 @@ import {
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { useDispatch } from '@wordpress/data';
+import { useEffect } from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
 import {
 	createCreditCardPaymentMethodStore,
@@ -57,6 +59,13 @@ function getPaymentMethod( store: CardStoreType, additionalArgs = {} ) {
 	} );
 }
 
+function ResetCreditCardStoreFields() {
+	const { resetFields } = useDispatch( 'wpcom-credit-card' );
+	useEffect( () => {
+		resetFields();
+	} );
+}
+
 describe( 'Credit card payment method', () => {
 	it( 'renders a credit card option', async () => {
 		const store = createCreditCardPaymentMethodStore( {} );
@@ -113,6 +122,9 @@ describe( 'Credit card payment method', () => {
 				useForAllSubscriptions: false,
 			} );
 		} );
+
+		// Manually reset the `wpcom-credit-card` store fields.
+		render( <ResetCreditCardStoreFields /> );
 	} );
 
 	it( 'does not submit the data to the processor when the submit button is pressed if fields are missing', async () => {
diff --git a/client/my-sites/checkout/composite-checkout/test/netbanking.tsx b/client/my-sites/checkout/composite-checkout/test/netbanking.tsx
index 5779b803b9fa1..5eccde387c4ca 100644
--- a/client/my-sites/checkout/composite-checkout/test/netbanking.tsx
+++ b/client/my-sites/checkout/composite-checkout/test/netbanking.tsx
@@ -11,6 +11,8 @@ import {
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { useDispatch } from '@wordpress/data';
+import { useEffect } from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
 import {
 	createNetBankingMethod,
@@ -56,6 +58,13 @@ function getPaymentMethod( additionalArgs = {} ) {
 	} );
 }
 
+function ResetNetbankingStoreFields() {
+	const { resetFields } = useDispatch( 'netbanking' );
+	useEffect( () => {
+		resetFields();
+	} );
+}
+
 describe( 'Netbanking payment method', () => {
 	it( 'renders a netbanking option', async () => {
 		const paymentMethod = getPaymentMethod();
@@ -108,6 +117,9 @@ describe( 'Netbanking payment method', () => {
 				gstin,
 			} );
 		} );
+
+		// Manually reset the `netbanking` store fields.
+		render( <ResetNetbankingStoreFields /> );
 	} );
 
 	it( 'does not submit the data to the processor when the submit button is pressed if fields are missing', async () => {
diff --git a/client/my-sites/checkout/modal/index.tsx b/client/my-sites/checkout/modal/index.tsx
index acf6280701d77..b73a676bf23c6 100644
--- a/client/my-sites/checkout/modal/index.tsx
+++ b/client/my-sites/checkout/modal/index.tsx
@@ -94,7 +94,6 @@ const CheckoutModal: FunctionComponent< Props > = ( {
 
 	return (
 		<Modal
-			open
 			overlayClassName="checkout-modal"
 			bodyOpenClassName="has-checkout-modal"
 			title={ translate( 'Checkout modal' ) }
diff --git a/client/my-sites/hosting/github/deployment-card/deployment-status-explanation.tsx b/client/my-sites/hosting/github/deployment-card/deployment-status-explanation.tsx
index af8b761b440ab..e9b8b0a490f63 100644
--- a/client/my-sites/hosting/github/deployment-card/deployment-status-explanation.tsx
+++ b/client/my-sites/hosting/github/deployment-card/deployment-status-explanation.tsx
@@ -33,7 +33,7 @@ export const DeploymentStatusExplanation = ( {
 			'Failed to build. Please {{a}}check the logs{{/a}} for more information.',
 			{
 				components: {
-					a: <ExternalLink href={ deploymentLogsUrl } />,
+					a: <ExternalLink href={ deploymentLogsUrl } children={ null } />,
 				},
 			}
 		);
@@ -47,7 +47,7 @@ export const DeploymentStatusExplanation = ( {
 					totalFailures,
 				},
 				components: {
-					a: <ExternalLink href={ deploymentLogsUrl } />,
+					a: <ExternalLink href={ deploymentLogsUrl } children={ null } />,
 				},
 			}
 		);
diff --git a/client/my-sites/hosting/github/deployment-card/empty-deployments.tsx b/client/my-sites/hosting/github/deployment-card/empty-deployments.tsx
index 7c0c6db2cf362..5d1d020b54119 100644
--- a/client/my-sites/hosting/github/deployment-card/empty-deployments.tsx
+++ b/client/my-sites/hosting/github/deployment-card/empty-deployments.tsx
@@ -10,7 +10,7 @@ export const EmptyDeployments = () => {
 					'Push to the connected branch to trigger a deployment. {{a}}Learn more{{/a}}',
 					{
 						components: {
-							a: <ExternalLink href="#" />,
+							a: <ExternalLink href="#" children={ null } />,
 						},
 					}
 				) }
diff --git a/client/my-sites/hosting/github/github-connect-card/index.tsx b/client/my-sites/hosting/github/github-connect-card/index.tsx
index 8d63b98c585e0..a8ccdf025a360 100644
--- a/client/my-sites/hosting/github/github-connect-card/index.tsx
+++ b/client/my-sites/hosting/github/github-connect-card/index.tsx
@@ -78,7 +78,7 @@ export const GithubConnectCard = ( { connection }: GithubConnectCardProps ) => {
 			<div>
 				<p>
 					{ __( 'Changes pushed to the selected branch will be automatically deployed. ' ) }
-					<ExternalLink href="#" target="_blank" rel="noopener noreferrer">
+					<ExternalLink href="#" rel="noopener noreferrer">
 						{ __( 'Learn more' ) }
 					</ExternalLink>
 				</p>
diff --git a/client/my-sites/marketing/do-it-for-me/difm-landing.tsx b/client/my-sites/marketing/do-it-for-me/difm-landing.tsx
index 7d8b253f9ff53..adf5968975761 100644
--- a/client/my-sites/marketing/do-it-for-me/difm-landing.tsx
+++ b/client/my-sites/marketing/do-it-for-me/difm-landing.tsx
@@ -366,9 +366,7 @@ export default function DIFMLanding( {
 						) }
 					</p>
 					<CTASectionWrapper>
-						<NextButton onClick={ onSubmit } isPrimary={ true }>
-							{ translate( 'Get started' ) }
-						</NextButton>
+						<NextButton onClick={ onSubmit }>{ translate( 'Get started' ) }</NextButton>
 					</CTASectionWrapper>
 				</ContentSection>
 				<ImageSection>
diff --git a/client/my-sites/marketplace/pages/submission-success/signup-success.tsx b/client/my-sites/marketplace/pages/submission-success/signup-success.tsx
index 6f59d1a569460..86d1fca16b5eb 100644
--- a/client/my-sites/marketplace/pages/submission-success/signup-success.tsx
+++ b/client/my-sites/marketplace/pages/submission-success/signup-success.tsx
@@ -66,7 +66,10 @@ const SignupSuccess = () => {
 								<h2>{ translate( 'Learn More' ) }</h2>
 								<p>{ translate( 'Read more about selling on the WordPress.com marketplace.' ) }</p>
 							</div>
-							<Button isSecondary href="https://developer.wordpress.com/wordpress-com-marketplace/">
+							<Button
+								variant="secondary"
+								href="https://developer.wordpress.com/wordpress-com-marketplace/"
+							>
 								{ translate( 'Continue' ) }
 							</Button>
 						</div>
@@ -79,7 +82,7 @@ const SignupSuccess = () => {
 								<h2>{ translate( 'View the marketplace' ) }</h2>
 								<p>{ translate( 'Sign in to see what the marketplace has to offer.' ) }</p>
 							</div>
-							<Button isSecondary href="/plugins">
+							<Button variant="secondary" href="/plugins">
 								{ translate( 'Continue' ) }
 							</Button>
 						</div>
@@ -92,7 +95,7 @@ const SignupSuccess = () => {
 								<h2>{ translate( 'Developer Page' ) }</h2>
 								<p>{ translate( 'Learn more about building a WordPress.com integration.' ) }</p>
 							</div>
-							<Button isSecondary href="https://developer.wordpress.com">
+							<Button variant="secondary" href="https://developer.wordpress.com">
 								{ translate( 'Continue' ) }
 							</Button>
 						</div>
diff --git a/client/my-sites/pages/virtual-page/index.tsx b/client/my-sites/pages/virtual-page/index.tsx
index b797e5dadea15..c8fc61ae9f197 100644
--- a/client/my-sites/pages/virtual-page/index.tsx
+++ b/client/my-sites/pages/virtual-page/index.tsx
@@ -34,8 +34,8 @@ const HomepagePopover = ( { isAdmin, template }: HomepagePopoverProps ) => {
 	const learnMoreLink = (
 		<ExternalLink
 			href={ localizeUrl( 'https://wordpress.com/support/templates/#template-hierarchy' ) }
-			target="_blank"
 			rel="noopener noreferrer"
+			children={ null }
 		/>
 	);
 
diff --git a/client/my-sites/plans/jetpack-plans/plans-filter-bar/index.tsx b/client/my-sites/plans/jetpack-plans/plans-filter-bar/index.tsx
index 9461beef0de65..c08d390962743 100644
--- a/client/my-sites/plans/jetpack-plans/plans-filter-bar/index.tsx
+++ b/client/my-sites/plans/jetpack-plans/plans-filter-bar/index.tsx
@@ -100,6 +100,7 @@ const PlansFilterBar: React.FC< FilterBarProps > = ( {
 							className="plans-filter-bar__toggle-control"
 							checked={ durationChecked }
 							onChange={ () => setDurationChecked( ( prevState ) => ! prevState ) }
+							label={ undefined }
 						/>
 						<span className="plans-filter-bar__toggle-on-label">
 							{ translate( 'Bill yearly' ) }
diff --git a/client/my-sites/promote-post-i2/components/campaign-item/index.tsx b/client/my-sites/promote-post-i2/components/campaign-item/index.tsx
index 2a75ef0821331..aa65637faa79c 100644
--- a/client/my-sites/promote-post-i2/components/campaign-item/index.tsx
+++ b/client/my-sites/promote-post-i2/components/campaign-item/index.tsx
@@ -139,7 +139,11 @@ export default function CampaignItem( props: Props ) {
 				<div className="campaign-item__data-row campaign-item__data-row-mobile">
 					<div className="campaign-item__stats-mobile">{ getMobileStats() }</div>
 					<div className="campaign-item__actions-mobile">
-						<Button onClick={ navigateToDetailsPage } isLink className="campaign-item__view-link">
+						<Button
+							onClick={ navigateToDetailsPage }
+							variant="link"
+							className="campaign-item__view-link"
+						>
 							{ __( 'Open details' ) }
 						</Button>
 					</div>
@@ -164,7 +168,7 @@ export default function CampaignItem( props: Props ) {
 				<div>{ formatNumber( clicks_total ) }</div>
 			</td>
 			<td className="campaign-item__action">
-				<Button onClick={ navigateToDetailsPage } isLink icon={ chevronRight } />
+				<Button onClick={ navigateToDetailsPage } variant="link" icon={ chevronRight } />
 			</td>
 		</tr>
 	);
diff --git a/client/my-sites/promote-post-i2/components/post-item/index.tsx b/client/my-sites/promote-post-i2/components/post-item/index.tsx
index 1c46a3671ce47..26ea5e8127416 100644
--- a/client/my-sites/promote-post-i2/components/post-item/index.tsx
+++ b/client/my-sites/promote-post-i2/components/post-item/index.tsx
@@ -117,7 +117,7 @@ export default function PostItem( { post }: { post: BlazablePost } ) {
 							{ __( 'View' ) }
 						</a>
 						<Button
-							isPrimary
+							variant="primary"
 							isBusy={ loading }
 							disabled={ loading }
 							onClick={ onClickPromote }
@@ -141,7 +141,7 @@ export default function PostItem( { post }: { post: BlazablePost } ) {
 			</td>
 			<td className="post-item__post-promote">
 				<Button
-					isPrimary
+					variant="primary"
 					isBusy={ loading }
 					disabled={ loading }
 					onClick={ onClickPromote }
diff --git a/client/my-sites/promote-post-i2/main.tsx b/client/my-sites/promote-post-i2/main.tsx
index e0edac4a9d155..ed05b636b8bc2 100644
--- a/client/my-sites/promote-post-i2/main.tsx
+++ b/client/my-sites/promote-post-i2/main.tsx
@@ -244,7 +244,7 @@ export default function PromotedPosts( { tab }: Props ) {
 						showIcon={ false }
 						showSupportModal={ ! isRunningInJetpack }
 					/>
-					<Button isPrimary onClick={ onClickPromote }>
+					<Button variant="primary" onClick={ onClickPromote }>
 						{ translate( 'Promote' ) }
 					</Button>
 				</div>
diff --git a/client/my-sites/promote-post/components/campaign-item/index.tsx b/client/my-sites/promote-post/components/campaign-item/index.tsx
index a5654f598a578..a1144984d31b4 100644
--- a/client/my-sites/promote-post/components/campaign-item/index.tsx
+++ b/client/my-sites/promote-post/components/campaign-item/index.tsx
@@ -1,6 +1,7 @@
 import './style.scss';
 import { safeImageUrl } from '@automattic/calypso-url';
 import { Badge, Dialog, Gridicon } from '@automattic/components';
+import { useLocalizeUrl } from '@automattic/i18n-utils';
 import { Button, Notice } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useTranslate } from 'i18n-calypso';
@@ -37,6 +38,7 @@ export default function CampaignItem( { campaign, expanded, onClickCampaign }: P
 	const [ showDeleteDialog, setShowDeleteDialog ] = useState( false );
 	const [ showErrorDialog, setShowErrorDialog ] = useState( false );
 	const siteId = useSelector( getSelectedSiteId );
+	const localizeUrl = useLocalizeUrl();
 	const translate = useTranslate();
 
 	const { cancelCampaign } = useCancelCampaignMutation( () => setShowErrorDialog( true ) );
@@ -146,8 +148,7 @@ export default function CampaignItem( { campaign, expanded, onClickCampaign }: P
 			label: __( 'Contact support' ),
 			onClick: async () => {
 				setShowErrorDialog( false );
-				// eslint-disable-next-line wpcalypso/i18n-unlocalized-url
-				window.open( 'https://wordpress.com/support/', '_blank' );
+				window.open( localizeUrl( 'https://wordpress.com/support/' ), '_blank' );
 			},
 		},
 		{
@@ -301,7 +302,7 @@ export default function CampaignItem( { campaign, expanded, onClickCampaign }: P
 				</div>
 				<div className="campaign-item__payment-and-action">
 					{ canCancelCampaign( campaignStatus ) && (
-						<Button isLink isDestructive onClick={ () => setShowDeleteDialog( true ) }>
+						<Button variant="link" isDestructive onClick={ () => setShowDeleteDialog( true ) }>
 							{ cancelCampaignButtonText }
 						</Button>
 					) }
@@ -316,8 +317,7 @@ export default function CampaignItem( { campaign, expanded, onClickCampaign }: P
 								components: {
 									wpcomTos: (
 										<a
-											// eslint-disable-next-line wpcalypso/i18n-unlocalized-url
-											href="https://wordpress.com/tos/"
+											href={ localizeUrl( 'https://wordpress.com/tos/' ) }
 											target="_blank"
 											rel="noopener noreferrer"
 										/>
diff --git a/client/my-sites/promote-post/components/post-item/index.tsx b/client/my-sites/promote-post/components/post-item/index.tsx
index 6343a1eec9676..2c0d6793b988a 100644
--- a/client/my-sites/promote-post/components/post-item/index.tsx
+++ b/client/my-sites/promote-post/components/post-item/index.tsx
@@ -83,7 +83,7 @@ export default function PostItem( { post }: Props ) {
 
 			<div className="post-item__promote-link">
 				<Button
-					isPrimary={ true }
+					variant="primary"
 					isBusy={ loading }
 					disabled={ loading }
 					onClick={ onClickPromote }
diff --git a/client/my-sites/site-logs/components/site-logs-tab-panel/index.tsx b/client/my-sites/site-logs/components/site-logs-tab-panel/index.tsx
index 98c435256f916..e548f0068b033 100644
--- a/client/my-sites/site-logs/components/site-logs-tab-panel/index.tsx
+++ b/client/my-sites/site-logs/components/site-logs-tab-panel/index.tsx
@@ -11,7 +11,7 @@ export const tabs = [
 ];
 
 interface SiteLogsTabPanelProps {
-	children( tab: TabPanel.Tab ): JSX.Element;
+	children: React.ComponentProps< typeof TabPanel >[ 'children' ];
 	selectedTab?: SiteLogsTab;
 	className?: string;
 	onSelected?: ( tabName: SiteLogsTab ) => void;
@@ -28,8 +28,8 @@ export const SiteLogsTabPanel = ( {
 			initialTabName={ selectedTab }
 			className={ classnames( 'site-logs-tab-panel', className ) }
 			tabs={ tabs }
-			onSelect={ ( tabName: SiteLogsTab ) => {
-				updateLogTypeQueryParam( tabName );
+			onSelect={ ( tabName ) => {
+				updateLogTypeQueryParam( tabName as SiteLogsTab );
 				onSelected?.( tabName as SiteLogsTab );
 			} }
 		>
diff --git a/client/my-sites/site-logs/components/site-logs-toolbar/index.tsx b/client/my-sites/site-logs/components/site-logs-toolbar/index.tsx
index 12db7fafa93e7..b779b5f05431c 100644
--- a/client/my-sites/site-logs/components/site-logs-toolbar/index.tsx
+++ b/client/my-sites/site-logs/components/site-logs-toolbar/index.tsx
@@ -90,7 +90,7 @@ export const SiteLogsToolbar = ( {
 				<Button
 					disabled={ isDownloading }
 					isBusy={ isDownloading }
-					isPrimary
+					variant="primary"
 					onClick={ () => downloadLogs( { logType, startDateTime, endDateTime } ) }
 				>
 					{ translate( 'Download logs' ) }
diff --git a/client/my-sites/site-settings/reading-newsletter-settings/FeaturedImageEmailSetting.tsx b/client/my-sites/site-settings/reading-newsletter-settings/FeaturedImageEmailSetting.tsx
index c083aca9e18b5..d4d6c21b0b723 100644
--- a/client/my-sites/site-settings/reading-newsletter-settings/FeaturedImageEmailSetting.tsx
+++ b/client/my-sites/site-settings/reading-newsletter-settings/FeaturedImageEmailSetting.tsx
@@ -1,19 +1,13 @@
 import { localizeUrl } from '@automattic/i18n-utils';
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 import FormSettingExplanation from 'calypso/components/forms/form-setting-explanation';
 
 export const FEATURED_IMAGE_IN_EMAIL_OPTION = 'wpcom_featured_image_in_email';
 
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 type FeaturedImageEmailSettingProps = {
 	value?: boolean;
-	handleToggle: ( field: string ) => ( ( isChecked: boolean ) => void ) | undefined;
+	handleToggle: ( field: string ) => ( value: boolean ) => void;
 	disabled?: boolean;
 };
 
diff --git a/client/my-sites/site-settings/reading-newsletter-settings/SubscribeModalSetting.tsx b/client/my-sites/site-settings/reading-newsletter-settings/SubscribeModalSetting.tsx
index f304c9663ed1e..5660c6c08b070 100644
--- a/client/my-sites/site-settings/reading-newsletter-settings/SubscribeModalSetting.tsx
+++ b/client/my-sites/site-settings/reading-newsletter-settings/SubscribeModalSetting.tsx
@@ -1,4 +1,4 @@
-import { ToggleControl as OriginalToggleControl } from '@wordpress/components';
+import { ToggleControl } from '@wordpress/components';
 import { addQueryArgs } from '@wordpress/url';
 import { useTranslate } from 'i18n-calypso';
 import { useSelector } from 'react-redux';
@@ -9,15 +9,9 @@ import { getSelectedSite } from 'calypso/state/ui/selectors';
 
 export const SUBSCRIBE_MODAL_OPTION = 'sm_enabled';
 
-const ToggleControl = OriginalToggleControl as React.ComponentType<
-	OriginalToggleControl.Props & {
-		disabled?: boolean;
-	}
->;
-
 type SubscribeModalSettingProps = {
 	value?: boolean;
-	handleToggle: ( field: string ) => ( ( isChecked: boolean ) => void ) | undefined;
+	handleToggle: ( field: string ) => ( value: boolean ) => void;
 	disabled?: boolean;
 };
 
diff --git a/client/my-sites/site-settings/reading-newsletter-settings/index.tsx b/client/my-sites/site-settings/reading-newsletter-settings/index.tsx
index 3fb359714e072..3bbb74872a58b 100644
--- a/client/my-sites/site-settings/reading-newsletter-settings/index.tsx
+++ b/client/my-sites/site-settings/reading-newsletter-settings/index.tsx
@@ -19,7 +19,7 @@ type Fields = {
 
 type NewsletterSettingsSectionProps = {
 	fields: Fields;
-	handleToggle: ( field: string ) => ( ( isChecked: boolean ) => void ) | undefined;
+	handleToggle: ( field: string ) => ( value: boolean ) => void;
 	handleSubmitForm: ( event: React.FormEvent< HTMLFormElement > ) => void;
 	disabled?: boolean;
 	isSavingSettings: boolean;
diff --git a/client/my-sites/site-settings/settings-reading/main.tsx b/client/my-sites/site-settings/settings-reading/main.tsx
index 8ed022646fe06..ede377556fa61 100644
--- a/client/my-sites/site-settings/settings-reading/main.tsx
+++ b/client/my-sites/site-settings/settings-reading/main.tsx
@@ -102,7 +102,7 @@ type ReadingSettingsFormProps = {
 	fields: Fields;
 	onChangeField: ( field: string ) => ( event: React.ChangeEvent< HTMLInputElement > ) => void;
 	handleAutosavingToggle: ( field: string ) => () => void;
-	handleToggle: ( field: string ) => ( ( isChecked: boolean ) => void ) | undefined;
+	handleToggle: ( field: string ) => ( value: boolean ) => void;
 	handleSubmitForm: ( event: React.FormEvent< HTMLFormElement > ) => void;
 	isAtomic: boolean | null;
 	isRequestingSettings: boolean;
diff --git a/client/my-sites/stats/stats-purchase/stats-purchase-personal.tsx b/client/my-sites/stats/stats-purchase/stats-purchase-personal.tsx
index f9981c1673279..e91e9b284abc7 100644
--- a/client/my-sites/stats/stats-purchase/stats-purchase-personal.tsx
+++ b/client/my-sites/stats/stats-purchase/stats-purchase-personal.tsx
@@ -56,6 +56,9 @@ const PersonalPurchase = ( {
 		);
 	} ) as RenderThumbFunction;
 
+	const handleClick = ( e: React.MouseEvent< HTMLAnchorElement, MouseEvent > ) =>
+		handlePlanSwap( e );
+
 	return (
 		<div>
 			<div className={ `${ COMPONENT_CLASS_NAME }__notice` }>
@@ -63,7 +66,7 @@ const PersonalPurchase = ( {
 					'This plan is for personal sites only. If your site is used for a commercial activity, {{Button}}you will need to choose a commercial plan{{/Button}}.',
 					{
 						components: {
-							Button: <Button variant="link" href="#" onClick={ ( e ) => handlePlanSwap( e ) } />,
+							Button: <Button variant="link" href="#" onClick={ handleClick } />,
 						},
 					}
 				) }
diff --git a/client/package.json b/client/package.json
index 31867293d2d6c..dd27bb9476797 100644
--- a/client/package.json
+++ b/client/package.json
@@ -77,23 +77,23 @@
 		"@tanstack/react-query": "^4.29.1",
 		"@tanstack/react-query-devtools": "^4.29.1",
 		"@tanstack/react-query-persist-client": "^4.29.1",
-		"@wordpress/a11y": "^3.23.0",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/dom": "^3.23.0",
-		"@wordpress/edit-post": "^7.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/html-entities": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/react-i18n": "^3.21.0",
-		"@wordpress/url": "^3.24.0",
-		"@wordpress/warning": "^2.23.0",
+		"@wordpress/a11y": "^3.36.0",
+		"@wordpress/api-fetch": "^6.33.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/dom": "^3.36.0",
+		"@wordpress/edit-post": "^7.12.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/html-entities": "^3.36.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/react-i18n": "^3.33.0",
+		"@wordpress/url": "^3.37.0",
+		"@wordpress/warning": "^2.36.0",
 		"autosize": "^4.0.4",
 		"body-parser": "^1.19.0",
 		"browser-filesaver": "^1.1.1",
diff --git a/client/reader/list-manage/index.jsx b/client/reader/list-manage/index.jsx
index 72e5cbe4106f2..ba0d400c15efb 100644
--- a/client/reader/list-manage/index.jsx
+++ b/client/reader/list-manage/index.jsx
@@ -84,7 +84,7 @@ function Export( { list, listItems } ) {
 				exportType={ READER_EXPORT_TYPE_LIST }
 				listId={ list.ID }
 				disabled={ ! listItems?.length }
-				isPrimary
+				variant="primary"
 			/>
 		</Card>
 	);
diff --git a/client/reader/recommended-sites/recommended-site.tsx b/client/reader/recommended-sites/recommended-site.tsx
index 52c1010b01ac8..62270b2eaeeb6 100644
--- a/client/reader/recommended-sites/recommended-site.tsx
+++ b/client/reader/recommended-sites/recommended-site.tsx
@@ -241,7 +241,7 @@ const RecommendedSite = ( {
 			</HStack>
 			<p className="recommended-site__site-description">{ siteDescription }</p>
 			<Button
-				isPrimary
+				variant="primary"
 				isBusy={ isSubscribeLoading }
 				disabled={ isSubscribeLoading }
 				className="recommended-site__subscribe-button"
diff --git a/client/reader/tags/alphabetic-tags.tsx b/client/reader/tags/alphabetic-tags.tsx
index 82d888f6120f7..9647cbd056c5f 100644
--- a/client/reader/tags/alphabetic-tags.tsx
+++ b/client/reader/tags/alphabetic-tags.tsx
@@ -118,7 +118,7 @@ export default function AlphabeticTags( { alphabeticTags }: AlphabeticTagsProps
 						<div className="alphabetic-tags__tag-links">
 							{ Object.keys( tagTables ).map( ( letter: string ) => (
 								<Button
-									isLink
+									variant="link"
 									key={ 'alphabetic-tags-link-' + letter }
 									onClick={ () => scrollToLetter( letter ) }
 								>
diff --git a/client/signup/steps/design-picker/let-us-choose.tsx b/client/signup/steps/design-picker/let-us-choose.tsx
index 97d73b7693114..95ee3fceea7a0 100644
--- a/client/signup/steps/design-picker/let-us-choose.tsx
+++ b/client/signup/steps/design-picker/let-us-choose.tsx
@@ -56,7 +56,7 @@ const LetUsChoose = ( { flowName, designs, onSelect }: Props ) => {
 					"Can't decide? No problem, our experts can choose the perfect design for your site!"
 				) }
 			</div>
-			<LetUsChooseButton isSecondary onClick={ onClick }>
+			<LetUsChooseButton variant="secondary" onClick={ onClick }>
 				{ translate( 'Let us choose' ) }
 			</LetUsChooseButton>
 		</LetUsChooseContainer>
diff --git a/client/signup/steps/difm-site-picker/index.tsx b/client/signup/steps/difm-site-picker/index.tsx
index 161515a6ffad6..c922f7fd72530 100644
--- a/client/signup/steps/difm-site-picker/index.tsx
+++ b/client/signup/steps/difm-site-picker/index.tsx
@@ -59,7 +59,7 @@ export default function DIFMSitePickerStep( props: Props ) {
 			components: {
 				SupportLink: <a className="subtitle-link" rel="noopener noreferrer" href="/help/contact" />,
 				NewSiteLink: (
-					<Button isLink={ true } className="subtitle-link" onClick={ onNewSiteClicked } />
+					<Button variant="link" className="subtitle-link" onClick={ onNewSiteClicked } />
 				),
 			},
 		}
diff --git a/client/signup/steps/woocommerce-install/step-store-address/index.tsx b/client/signup/steps/woocommerce-install/step-store-address/index.tsx
index 04ef2255ddb8e..4ed20067ecf67 100644
--- a/client/signup/steps/woocommerce-install/step-store-address/index.tsx
+++ b/client/signup/steps/woocommerce-install/step-store-address/index.tsx
@@ -166,8 +166,8 @@ export default function StepStoreAddress( props: WooCommerceStoreAddressProps )
 						<ComboboxControl
 							label={ __( 'Country / State' ) }
 							value={ get( WOOCOMMERCE_DEFAULT_COUNTRY ) }
-							onChange={ ( value: string | null ) => {
-								update( WOOCOMMERCE_DEFAULT_COUNTRY, value || '' );
+							onChange={ ( value ) => {
+								update( WOOCOMMERCE_DEFAULT_COUNTRY, value ?? '' );
 								clearError( WOOCOMMERCE_DEFAULT_COUNTRY );
 							} }
 							options={ countriesAsOptions }
diff --git a/client/sites-dashboard/components/sites-ellipsis-menu.tsx b/client/sites-dashboard/components/sites-ellipsis-menu.tsx
index cc42453bbfd6e..f52119e99313b 100644
--- a/client/sites-dashboard/components/sites-ellipsis-menu.tsx
+++ b/client/sites-dashboard/components/sites-ellipsis-menu.tsx
@@ -49,7 +49,7 @@ interface SitesMenuItemProps {
 	onClick?: () => void;
 }
 
-interface MenuItemLinkProps extends Omit< CoreMenuItem.Props, 'href' > {
+interface MenuItemLinkProps extends Omit< React.ComponentProps< typeof CoreMenuItem >, 'href' > {
 	href?: string;
 }
 
@@ -311,7 +311,7 @@ function HostingConfigurationSubmenu( { site, recordTracks }: SitesMenuItemProps
 	const displayUpsell = ! hasFeatureSFTP;
 	const submenuItems = useSubmenuItems( site );
 	const submenuProps = useSubmenuPopoverProps< HTMLDivElement >( {
-		offsetTop: -8,
+		offset: -8,
 	} );
 
 	if ( submenuItems.length === 0 ) {
diff --git a/client/sites-dashboard/components/sites-sorting-dropdown.tsx b/client/sites-dashboard/components/sites-sorting-dropdown.tsx
index a7a237b352fb1..b247abbdf9b41 100644
--- a/client/sites-dashboard/components/sites-sorting-dropdown.tsx
+++ b/client/sites-dashboard/components/sites-sorting-dropdown.tsx
@@ -11,6 +11,9 @@ import {
 } from 'calypso/state/sites/hooks/use-sites-sorting';
 import { SMALL_MEDIA_QUERY } from '../utils';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const noop = () => {};
+
 const SortingButton = styled( Button )( {
 	alignSelf: 'stretch',
 	flexDirection: 'row-reverse',
@@ -101,6 +104,7 @@ export const SitesSortingDropdown = ( {
 							onClose();
 						} }
 						choices={ choices }
+						onHover={ noop }
 					/>
 				</NavigableMenu>
 			) }
diff --git a/client/sites-dashboard/components/test/__snapshots__/sites-grid-item.tsx.snap b/client/sites-dashboard/components/test/__snapshots__/sites-grid-item.tsx.snap
index bf2512357f9cd..0427670a85b44 100644
--- a/client/sites-dashboard/components/test/__snapshots__/sites-grid-item.tsx.snap
+++ b/client/sites-dashboard/components/test/__snapshots__/sites-grid-item.tsx.snap
@@ -90,7 +90,7 @@ exports[`<SitesGridItem> Custom render 1`] = `
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"
+            d="M19.5 4.5h-7V6h4.44l-5.97 5.97 1.06 1.06L18 7.06v4.44h1.5v-7Zm-13 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-3H17v3a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h3V5.5h-3Z"
           />
         </svg>
       </a>
@@ -183,7 +183,7 @@ exports[`<SitesGridItem> Custom render 2 1`] = `
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"
+            d="M19.5 4.5h-7V6h4.44l-5.97 5.97 1.06 1.06L18 7.06v4.44h1.5v-7Zm-13 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-3H17v3a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h3V5.5h-3Z"
           />
         </svg>
       </a>
@@ -289,7 +289,7 @@ exports[`<SitesGridItem> Default render 1`] = `
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"
+            d="M19.5 4.5h-7V6h4.44l-5.97 5.97 1.06 1.06L18 7.06v4.44h1.5v-7Zm-13 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-3H17v3a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h3V5.5h-3Z"
           />
         </svg>
       </a>
diff --git a/client/wp-components-types.d.ts b/client/wp-components-types.d.ts
deleted file mode 100644
index 10b9221ef2e69..0000000000000
--- a/client/wp-components-types.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import '@wordpress/components';
-
-declare module '@wordpress/components' {
-	interface Props {
-		[ key: string ]: unknown;
-	}
-
-	export const __experimentalDivider: React.ComponentType< Props >;
-	export const __experimentalHStack: React.ComponentType< Props >;
-	export const __experimentalVStack: React.ComponentType< Props >;
-	export const __experimentalSpacer: React.ComponentType< Props >;
-	export const __experimentalItem: React.ComponentType< Props >;
-	export const __experimentalItemGroup: React.ComponentType< Props >;
-	export const __experimentalNavigatorBackButton: React.ComponentType< Props >;
-	export const __experimentalNavigatorButton: React.ComponentType< Props >;
-	export const __experimentalNavigatorProvider: React.ComponentType< Props >;
-	export const __experimentalNavigatorScreen: React.ComponentType< Props >;
-	export const __unstableComposite: React.ComponentType< Props >;
-	export const __unstableUseCompositeState: ( props?: {
-		orientation?: 'horizontal' | 'vertical';
-	} ) => any;
-	export const __unstableCompositeItem: React.ComponentType< Props >;
-
-	interface NavigatorLocation {
-		path: string;
-		isInitial: boolean;
-		isBack: boolean;
-	}
-
-	export const __experimentalUseNavigator: () => {
-		location: NavigatorLocation;
-		goTo: ( path: string ) => void;
-		goBack: () => void;
-	};
-}
diff --git a/package.json b/package.json
index a0c28c2bfa529..45ef52bc24c43 100644
--- a/package.json
+++ b/package.json
@@ -169,17 +169,15 @@
 		"@types/uuid": "^8.3.4",
 		"@types/validator": "^13.7.1",
 		"@types/webpack-env": "^1.16.3",
-		"@types/wordpress__data-controls": "^2.30.0",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/jest-preset-default": "^10.4.0",
-		"@wordpress/primitives": "^3.21.0",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/primitives": "^3.34.0",
+		"@wordpress/url": "^3.37.0",
 		"browserslist": "^4.16.0",
 		"calypso": "workspace:^",
 		"calypso-codemods": "workspace:^",
@@ -225,11 +223,10 @@
 		"@types/gtag.js": "^0.0.10",
 		"@types/highlight-words-core": "^1.2.1",
 		"@types/superagent": "^4.1.15",
-		"@types/wordpress__components": "^23.0.1",
 		"@typescript-eslint/eslint-plugin": "^5.53.0",
 		"@typescript-eslint/parser": "^5.53.0",
-		"@wordpress/eslint-plugin": "^13.7.0",
-		"@wordpress/stylelint-config": "^21.6.0",
+		"@wordpress/eslint-plugin": "^14.8.0",
+		"@wordpress/stylelint-config": "^21.19.0",
 		"babel-loader": "^8.2.3",
 		"bunyan": "^1.8.15",
 		"chalk": "^4.1.2",
@@ -296,99 +293,95 @@
 	"resolutions": {
 		"@types/react": "^18.2",
 		"@types/wordpress__block-editor": "npm:noop-package@1.0.0",
-		"@types/wordpress__components": "23.0.1",
 		"@types/wordpress__editor": "npm:noop-package@1.0.0",
-		"@types/wordpress__notices": "npm:noop-package@1.0.0",
-		"@types/wordpress__rich-text": "npm:noop-package@1.0.0",
-		"@types/wordpress__data-controls/@wordpress/data": "npm:noop-package@1.0.0",
-		"@wordpress/private-apis": "^0.15.0",
 		"keytar@npm:7.7.0/node-addon-api": "3.1.0",
 		"lzma-native": "^8.0.5",
 		"node-abi": "3.35.0",
-		"@wordpress/a11y": "3.23.0",
-		"@wordpress/annotations": "2.23.0",
-		"@wordpress/api-fetch": "6.20.0",
-		"@wordpress/autop": "3.23.0",
-		"@wordpress/babel-plugin-import-jsx-pragma": "4.6.0",
-		"@wordpress/babel-plugin-makepot": "5.7.0",
-		"@wordpress/babel-preset-default": "7.7.0",
-		"@wordpress/base-styles": "4.14.0",
-		"@wordpress/blob": "3.23.0",
-		"@wordpress/block-directory": "4.0.0",
-		"@wordpress/block-editor": "11.0.0",
-		"@wordpress/block-library": "8.0.0",
-		"@wordpress/block-serialization-default-parser": "4.23.0",
-		"@wordpress/block-serialization-spec-parser": "4.23.0",
-		"@wordpress/blocks": "12.0.0",
-		"@wordpress/browserslist-config": "5.6.0",
-		"@wordpress/components": "23.0.0",
-		"@wordpress/compose": "6.0.0",
-		"@wordpress/core-data": "6.0.0",
-		"@wordpress/create-block-tutorial-template": "2.11.0",
-		"@wordpress/create-block": "4.7.0",
-		"@wordpress/custom-templated-path-webpack-plugin": "2.7.0",
-		"@wordpress/customize-widgets": "4.0.0",
-		"@wordpress/data-controls": "2.23.0",
-		"@wordpress/data": "8.0.0",
-		"@wordpress/date": "4.23.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "4.6.0",
-		"@wordpress/deprecated": "3.23.0",
-		"@wordpress/docgen": "1.32.0",
-		"@wordpress/dom-ready": "3.23.0",
-		"@wordpress/dom": "3.23.0",
-		"@wordpress/e2e-test-utils": "9.0.0",
-		"@wordpress/e2e-tests": "6.0.0",
-		"@wordpress/edit-post": "7.0.0",
-		"@wordpress/edit-site": "5.0.0",
-		"@wordpress/edit-widgets": "5.0.0",
-		"@wordpress/editor": "13.0.0",
-		"@wordpress/element": "5.0.0",
-		"@wordpress/escape-html": "2.23.0",
-		"@wordpress/eslint-plugin": "13.7.0",
-		"@wordpress/experiments": "0.5.0",
-		"@wordpress/format-library": "4.0.0",
-		"@wordpress/hooks": "3.23.0",
-		"@wordpress/html-entities": "3.23.0",
-		"@wordpress/i18n": "4.23.0",
-		"@wordpress/icons": "9.14.0",
-		"@wordpress/interface": "5.0.0",
-		"@wordpress/is-shallow-equal": "4.23.0",
-		"@wordpress/jest-console": "6.6.0",
-		"@wordpress/jest-preset-default": "10.4.0",
-		"@wordpress/jest-puppeteer-axe": "5.6.0",
-		"@wordpress/keyboard-shortcuts": "4.0.0",
-		"@wordpress/keycodes": "3.23.0",
-		"@wordpress/lazy-import": "1.10.0",
-		"@wordpress/library-export-default-webpack-plugin": "2.9.0",
-		"@wordpress/list-reusable-blocks": "4.0.0",
-		"@wordpress/media-utils": "4.14.0",
-		"@wordpress/notices": "3.23.0",
-		"@wordpress/npm-package-json-lint-config": "4.8.0",
+		"@wordpress/a11y": "3.36.0",
+		"@wordpress/annotations": "2.35.0",
+		"@wordpress/api-fetch": "6.33.0",
+		"@wordpress/autop": "3.36.0",
+		"@wordpress/babel-plugin-import-jsx-pragma": "4.19.0",
+		"@wordpress/babel-plugin-makepot": "5.20.0",
+		"@wordpress/babel-preset-default": "7.20.0",
+		"@wordpress/base-styles": "4.27.0",
+		"@wordpress/blob": "3.36.0",
+		"@wordpress/block-directory": "4.12.0",
+		"@wordpress/block-editor": "12.3.0",
+		"@wordpress/block-library": "8.12.0",
+		"@wordpress/block-serialization-default-parser": "4.36.0",
+		"@wordpress/block-serialization-spec-parser": "4.36.0",
+		"@wordpress/blocks": "12.12.0",
+		"@wordpress/browserslist-config": "5.19.0",
+		"@wordpress/components": "25.1.0",
+		"@wordpress/compose": "6.12.0",
+		"@wordpress/core-data": "6.12.0",
+		"@wordpress/create-block-tutorial-template": "2.24.0",
+		"@wordpress/create-block": "4.20.0",
+		"@wordpress/custom-templated-path-webpack-plugin": "2.13.0",
+		"@wordpress/customize-widgets": "4.12.0",
+		"@wordpress/data-controls": "3.4.0",
+		"@wordpress/data": "9.5.0",
+		"@wordpress/date": "4.36.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "4.19.0",
+		"@wordpress/deprecated": "3.36.0",
+		"@wordpress/docgen": "1.45.0",
+		"@wordpress/dom-ready": "3.36.0",
+		"@wordpress/dom": "3.36.0",
+		"@wordpress/e2e-test-utils": "10.6.0",
+		"@wordpress/e2e-tests": "7.6.0",
+		"@wordpress/edit-post": "7.12.0",
+		"@wordpress/edit-site": "5.12.0",
+		"@wordpress/edit-widgets": "5.12.0",
+		"@wordpress/editor": "13.12.0",
+		"@wordpress/element": "5.13.0",
+		"@wordpress/escape-html": "2.36.0",
+		"@wordpress/eslint-plugin": "14.8.0",
+		"@wordpress/experiments": "0.8.0",
+		"@wordpress/format-library": "4.12.0",
+		"@wordpress/hooks": "3.36.0",
+		"@wordpress/html-entities": "3.36.0",
+		"@wordpress/i18n": "4.36.0",
+		"@wordpress/icons": "9.26.0",
+		"@wordpress/interface": "5.12.0",
+		"@wordpress/is-shallow-equal": "4.36.0",
+		"@wordpress/jest-console": "7.7.0",
+		"@wordpress/jest-preset-default": "11.7.0",
+		"@wordpress/jest-puppeteer-axe": "6.7.0",
+		"@wordpress/keyboard-shortcuts": "4.12.0",
+		"@wordpress/keycodes": "3.36.0",
+		"@wordpress/lazy-import": "1.23.0",
+		"@wordpress/library-export-default-webpack-plugin": "2.14.0",
+		"@wordpress/list-reusable-blocks": "4.12.0",
+		"@wordpress/media-utils": "4.26.0",
+		"@wordpress/notices": "4.3.0",
+		"@wordpress/npm-package-json-lint-config": "4.21.0",
 		"@wordpress/nux": "6.0.0",
-		"@wordpress/plugins": "5.0.0",
-		"@wordpress/postcss-plugins-preset": "4.7.0",
-		"@wordpress/postcss-themes": "5.6.0",
-		"@wordpress/preferences-persistence": "1.15.0",
-		"@wordpress/preferences": "3.0.0",
-		"@wordpress/prettier-config": "2.6.0",
-		"@wordpress/primitives": "3.21.0",
-		"@wordpress/priority-queue": "2.23.0",
-		"@wordpress/project-management-automation": "1.22.0",
-		"@wordpress/react-i18n": "3.21.0",
-		"@wordpress/readable-js-assets-webpack-plugin": "2.6.0",
-		"@wordpress/redux-routine": "4.23.0",
-		"@wordpress/reusable-blocks": "4.0.0",
-		"@wordpress/rich-text": "6.0.0",
-		"@wordpress/server-side-render": "4.0.0",
-		"@wordpress/shortcode": "3.23.0",
-		"@wordpress/style-engine": "1.6.0",
-		"@wordpress/stylelint-config": "21.6.0",
-		"@wordpress/token-list": "2.23.0",
-		"@wordpress/url": "3.24.0",
-		"@wordpress/viewport": "5.0.0",
-		"@wordpress/warning": "2.23.0",
-		"@wordpress/widgets": "3.0.0",
-		"@wordpress/wordcount": "3.23.0"
+		"@wordpress/plugins": "6.3.0",
+		"@wordpress/postcss-plugins-preset": "4.20.0",
+		"@wordpress/postcss-themes": "5.19.0",
+		"@wordpress/preferences-persistence": "1.27.0",
+		"@wordpress/preferences": "3.12.0",
+		"@wordpress/prettier-config": "2.19.0",
+		"@wordpress/primitives": "3.34.0",
+		"@wordpress/priority-queue": "2.36.0",
+		"@wordpress/private-apis": "^0.18.0",
+		"@wordpress/project-management-automation": "1.35.0",
+		"@wordpress/react-i18n": "3.33.0",
+		"@wordpress/readable-js-assets-webpack-plugin": "2.19.0",
+		"@wordpress/redux-routine": "4.36.0",
+		"@wordpress/reusable-blocks": "4.12.0",
+		"@wordpress/rich-text": "6.12.0",
+		"@wordpress/server-side-render": "4.12.0",
+		"@wordpress/shortcode": "3.36.0",
+		"@wordpress/style-engine": "1.19.0",
+		"@wordpress/stylelint-config": "21.19.0",
+		"@wordpress/token-list": "2.36.0",
+		"@wordpress/url": "3.37.0",
+		"@wordpress/viewport": "5.12.0",
+		"@wordpress/warning": "2.36.0",
+		"@wordpress/widgets": "3.12.0",
+		"@wordpress/wordcount": "3.36.0"
 	},
 	"packageManager": "yarn@3.2.3",
 	"dependenciesMeta": {
diff --git a/packages/block-renderer/package.json b/packages/block-renderer/package.json
index 3886d84edf9d4..b947e68f5660b 100644
--- a/packages/block-renderer/package.json
+++ b/packages/block-renderer/package.json
@@ -29,10 +29,10 @@
 		"watch": "tsc --build ./tsconfig.json --watch"
 	},
 	"dependencies": {
+		"@automattic/global-styles": "workspace:^",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/edit-site": "^5.0.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/compose": "^6.12.0",
 		"classnames": "^2.3.1",
 		"tslib": "^2.3.0",
 		"utility-types": "^3.10.0",
@@ -45,7 +45,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3",
diff --git a/packages/block-renderer/src/components/block-renderer-container.tsx b/packages/block-renderer/src/components/block-renderer-container.tsx
index 236f887f2078d..10ea4b7e25fb9 100644
--- a/packages/block-renderer/src/components/block-renderer-container.tsx
+++ b/packages/block-renderer/src/components/block-renderer-container.tsx
@@ -132,7 +132,6 @@ const ScaledBlockRendererContainer = ( {
 			} }
 		>
 			<Iframe
-				head={ <EditorStyles styles={ editorStyles } /> }
 				contentRef={ contentRef }
 				aria-hidden
 				tabIndex={ -1 }
@@ -149,6 +148,7 @@ const ScaledBlockRendererContainer = ( {
 					opacity: isLoaded ? 1 : 0,
 				} }
 			>
+				<EditorStyles styles={ editorStyles } />
 				{ isLoaded ? contentResizeListener : null }
 				{
 					/* Filters need to be rendered before children to avoid Safari rendering issues. */
diff --git a/packages/block-renderer/src/components/block-renderer-provider.tsx b/packages/block-renderer/src/components/block-renderer-provider.tsx
index 47a7c4c5d0e71..1d8c0ea24961d 100644
--- a/packages/block-renderer/src/components/block-renderer-provider.tsx
+++ b/packages/block-renderer/src/components/block-renderer-provider.tsx
@@ -1,4 +1,7 @@
-import { useGlobalStylesOutput } from '@wordpress/edit-site/build-module/components/global-styles/use-global-styles-output';
+import {
+	useGlobalStylesOutput,
+	withExperimentalBlockEditorProvider,
+} from '@automattic/global-styles';
 import { useMemo } from 'react';
 import useBlockRendererSettings from '../hooks/use-block-renderer-settings';
 import BlockRendererContext from './block-renderer-context';
@@ -19,7 +22,6 @@ const useBlockRendererContext = (
 	const { data: settings } = useBlockRendererSettings( siteId, stylesheet, useInlineStyles );
 
 	const [ globalStyles ] = useGlobalStylesOutput();
-
 	const context = useMemo(
 		() => ( {
 			isReady: !! settings,
@@ -65,4 +67,4 @@ const BlockRendererProvider = ( {
 	);
 };
 
-export default BlockRendererProvider;
+export default withExperimentalBlockEditorProvider( BlockRendererProvider );
diff --git a/packages/block-renderer/src/global.d.ts b/packages/block-renderer/src/global.d.ts
index ad1394baa373c..214279e9f9307 100644
--- a/packages/block-renderer/src/global.d.ts
+++ b/packages/block-renderer/src/global.d.ts
@@ -8,5 +8,3 @@ declare module '@wordpress/block-editor' {
 	export const __unstableEditorStyles: React.ComponentType< Props >;
 	export const __unstablePresetDuotoneFilter: React.ComponentType< Props >;
 }
-
-declare module '@wordpress/edit-site/build-module/components/global-styles/use-global-styles-output';
diff --git a/packages/calypso-babel-config/package.json b/packages/calypso-babel-config/package.json
index 53fb0835618b1..d926071d9f95f 100644
--- a/packages/calypso-babel-config/package.json
+++ b/packages/calypso-babel-config/package.json
@@ -36,7 +36,7 @@
 		"@babel/register": "^7.17.0",
 		"@babel/runtime": "^7.17.2",
 		"@emotion/babel-plugin": "^11.3.0",
-		"@wordpress/babel-plugin-import-jsx-pragma": "^4.6.0",
+		"@wordpress/babel-plugin-import-jsx-pragma": "^4.19.0",
 		"babel-plugin-dynamic-import-node": "^2.3.3",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24"
 	}
diff --git a/packages/calypso-build/package.json b/packages/calypso-build/package.json
index 9775348856426..2f923d96a67c5 100644
--- a/packages/calypso-build/package.json
+++ b/packages/calypso-build/package.json
@@ -38,8 +38,8 @@
 		"@babel/compat-data": "^7.17.0",
 		"@babel/core": "^7.17.5",
 		"@types/webpack-env": "^1.16.3",
-		"@wordpress/browserslist-config": "^5.6.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.6.0",
+		"@wordpress/browserslist-config": "^5.19.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^4.19.0",
 		"autoprefixer": "^10.2.5",
 		"babel-loader": "^8.2.3",
 		"browserslist": "^4.8.2",
diff --git a/packages/calypso-e2e/package.json b/packages/calypso-e2e/package.json
index 1c9c00f64d687..0652ecb1aff47 100644
--- a/packages/calypso-e2e/package.json
+++ b/packages/calypso-e2e/package.json
@@ -34,7 +34,7 @@
 		"@jest/globals": "^29.5.0",
 		"@types/node": "^18.11.18",
 		"@types/node-fetch": "^2.6.1",
-		"@wordpress/i18n": "^4.23.0",
+		"@wordpress/i18n": "^4.36.0",
 		"asana-phrase": "^0.0.8",
 		"node-fetch": "^2.6.7",
 		"typescript": "^4.7.4"
diff --git a/packages/components/package.json b/packages/components/package.json
index 5b83ee9e8948d..375a4771109a9 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -32,10 +32,10 @@
 		"@automattic/data-stores": "workspace:^",
 		"@automattic/search": "workspace:^",
 		"@automattic/typography": "workspace:^",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.35.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"canvas-confetti": "^1.6.0",
 		"classnames": "^2.3.1",
 		"framer-motion": "6.2.8",
@@ -48,7 +48,7 @@
 		"utility-types": "^3.10.0"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
diff --git a/packages/components/src/responsive-toolbar-group/swipe-group.tsx b/packages/components/src/responsive-toolbar-group/swipe-group.tsx
index 87057156e299c..e38486f5e9122 100644
--- a/packages/components/src/responsive-toolbar-group/swipe-group.tsx
+++ b/packages/components/src/responsive-toolbar-group/swipe-group.tsx
@@ -6,7 +6,8 @@ import type { Button } from '@wordpress/components';
 import './style.scss';
 
 const ToolbarButton = BaseToolbarButton as React.ComponentType<
-	( BaseToolbarButton.Props & { href?: string } ) | Button.Props
+	| ( React.ComponentProps< typeof BaseToolbarButton > & { href?: string } )
+	| React.ComponentProps< typeof Button >
 >;
 
 export default function SwipeGroup( {
diff --git a/packages/components/src/submenu-popover/index.tsx b/packages/components/src/submenu-popover/index.tsx
index 235d909cf04e2..d850d04b41c4b 100644
--- a/packages/components/src/submenu-popover/index.tsx
+++ b/packages/components/src/submenu-popover/index.tsx
@@ -1,9 +1,16 @@
 import { Popover } from '@wordpress/components';
-import { LegacyRef, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import {
+	LegacyRef,
+	useCallback,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
+	ComponentProps,
+} from 'react';
 
-interface SubmenuPopoverProps extends Popover.Props {
+interface SubmenuPopoverProps extends ComponentProps< typeof Popover > {
 	isVisible?: boolean;
-	offset?: number | { mainAxis?: number; crossAxis?: number; alignmentAxis?: number | null };
 	placement?:
 		| 'top'
 		| 'top-start'
@@ -74,9 +81,9 @@ function useHasRightSpace( parentElement: HTMLElement | undefined, isVisible: bo
 }
 
 export function useSubmenuPopoverProps< T extends HTMLElement >(
-	options: { offsetTop?: number } = {}
+	options: { offset?: number } = {}
 ) {
-	const { offsetTop = 0 } = options;
+	const { offset = 0 } = options;
 	const [ isVisible, setIsVisible ] = useState( false );
 	const anchor = useRef< T >();
 	const parentElement = anchor?.current;
@@ -87,7 +94,7 @@ export function useSubmenuPopoverProps< T extends HTMLElement >(
 		isVisible,
 		placement: hasRightSpace ? 'right-start' : 'left-start',
 		anchorRect: anchor?.current?.getBoundingClientRect(),
-		offset: { crossAxis: offsetTop },
+		offset,
 		__unstableForcePosition: true,
 	};
 
diff --git a/packages/composite-checkout/package.json b/packages/composite-checkout/package.json
index 1107583927bde..0b05721677e12 100644
--- a/packages/composite-checkout/package.json
+++ b/packages/composite-checkout/package.json
@@ -38,8 +38,8 @@
 	"dependencies": {
 		"@emotion/react": "^11.4.1",
 		"@emotion/styled": "^11.3.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"debug": "^4.3.3",
 		"prop-types": "^15.7.2"
 	},
diff --git a/packages/data-stores/package.json b/packages/data-stores/package.json
index b938554eb6fa3..c73cfc0d2f114 100644
--- a/packages/data-stores/package.json
+++ b/packages/data-stores/package.json
@@ -35,10 +35,10 @@
 		"@automattic/format-currency": "workspace:^",
 		"@automattic/shopping-cart": "workspace:^",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/data-controls": "^2.23.0",
-		"@wordpress/deprecated": "^3.23.0",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/api-fetch": "^6.33.0",
+		"@wordpress/data-controls": "^3.4.0",
+		"@wordpress/deprecated": "^3.36.0",
+		"@wordpress/url": "^3.37.0",
 		"fast-json-stable-stringify": "^2.1.0",
 		"i18n-calypso": "workspace:^",
 		"qs": "^6.9.1",
@@ -49,7 +49,7 @@
 		"validator": "^13.5.2"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
diff --git a/packages/design-carousel/package.json b/packages/design-carousel/package.json
index 9f15460c1c674..ed0ec3403b764 100644
--- a/packages/design-carousel/package.json
+++ b/packages/design-carousel/package.json
@@ -50,7 +50,7 @@
 		"webpack": "^5.68.0"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3",
diff --git a/packages/design-carousel/src/index.tsx b/packages/design-carousel/src/index.tsx
index e796bc3e794a2..9ee91647b56a9 100644
--- a/packages/design-carousel/src/index.tsx
+++ b/packages/design-carousel/src/index.tsx
@@ -94,7 +94,7 @@ export default function DesignCarousel( {
 			<div className="design-carousel__cta">
 				<Button
 					className="design-carousel__select"
-					isPrimary
+					variant="primary"
 					onClick={ () => {
 						if ( swiperInstance.current && selectedDesigns ) {
 							onPick( selectedDesigns[ swiperInstance.current?.activeIndex ] );
diff --git a/packages/design-picker/package.json b/packages/design-picker/package.json
index 904d0f0c2ca3a..6921de72b9f54 100644
--- a/packages/design-picker/package.json
+++ b/packages/design-picker/package.json
@@ -37,9 +37,9 @@
 		"@automattic/typography": "workspace:^",
 		"@automattic/viewport": "workspace:^",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/react-i18n": "^3.21.0",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/react-i18n": "^3.33.0",
+		"@wordpress/url": "^3.37.0",
 		"classnames": "^2.3.1",
 		"react-intersection-observer": "^9.4.3",
 		"tslib": "^2.3.0",
@@ -60,7 +60,7 @@
 		"webpack": "^5.68.0"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3",
diff --git a/packages/design-picker/src/components/featured-picks-buttons/index.tsx b/packages/design-picker/src/components/featured-picks-buttons/index.tsx
index c9b97a70352c9..3ab0d4c7b8953 100644
--- a/packages/design-picker/src/components/featured-picks-buttons/index.tsx
+++ b/packages/design-picker/src/components/featured-picks-buttons/index.tsx
@@ -25,7 +25,7 @@ const FeaturedPicksButtons: React.FC< Props > = ( { className, designs, onSelect
 				<Button
 					key={ design.slug }
 					className={ classnames( 'featured-picks-buttons__button', className ) }
-					isSecondary
+					variant="secondary"
 					onClick={ () => onSelect( design ) }
 				>
 					{ isBlankCanvasDesign( design )
diff --git a/packages/design-picker/src/components/index.tsx b/packages/design-picker/src/components/index.tsx
index c06a7fee1f218..6b8fbf5b64969 100644
--- a/packages/design-picker/src/components/index.tsx
+++ b/packages/design-picker/src/components/index.tsx
@@ -111,7 +111,7 @@ const DesignButton: React.FC< DesignButtonProps > = ( {
 		if ( design.is_premium && shouldUpgrade ) {
 			text = (
 				<Button
-					isLink={ true }
+					variant="link"
 					className="design-picker__button-link"
 					onClick={ ( e: any ) => {
 						e.stopPropagation();
@@ -215,7 +215,7 @@ const DesignButtonCover: React.FC< DesignButtonCoverProps > = ( {
 			<div className="design-button-cover__button-groups">
 				<Button
 					className="design-button-cover__button"
-					isPrimary
+					variant="primary"
 					onClick={ () => ( shouldUpgrade ? onUpgrade?.( design ) : onSelect( design ) ) }
 				>
 					{ shouldUpgrade
diff --git a/packages/design-picker/src/patch-component-types.d.ts b/packages/design-picker/src/patch-component-types.d.ts
deleted file mode 100644
index 4f9ca5bf6dca8..0000000000000
--- a/packages/design-picker/src/patch-component-types.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module '@wordpress/components' {
-	export const VisuallyHidden: React.ComponentType< React.ComponentPropsWithRef< any > >;
-}
-
-export {};
diff --git a/packages/design-preview/package.json b/packages/design-preview/package.json
index ccb79d4d9af58..458c5805513c6 100644
--- a/packages/design-preview/package.json
+++ b/packages/design-preview/package.json
@@ -34,10 +34,10 @@
 		"@automattic/global-styles": "workspace:^",
 		"@automattic/i18n-utils": "workspace:^",
 		"@automattic/onboarding": "workspace:^",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/html-entities": "^3.37.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/html-entities": "^3.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"tslib": "^2.3.0"
 	},
@@ -50,7 +50,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3",
diff --git a/packages/design-preview/src/components/index.tsx b/packages/design-preview/src/components/index.tsx
index fb1323210bc12..54efc394ca4f9 100644
--- a/packages/design-preview/src/components/index.tsx
+++ b/packages/design-preview/src/components/index.tsx
@@ -34,7 +34,7 @@ interface DesignPreviewProps {
 	onGlobalStylesChange: ( globalStyles: GlobalStylesObject | null ) => void;
 	limitGlobalStyles: boolean;
 	globalStylesInPersonalPlan: boolean;
-	onNavigatorPathChange?: ( path: string ) => void;
+	onNavigatorPathChange?: ( path?: string ) => void;
 }
 
 // @todo Get the style variations of theme, and then combine the selected one with colors & fonts for consistency
@@ -93,7 +93,7 @@ const Preview: React.FC< DesignPreviewProps > = ( {
 
 	const isFullscreen = ! isDesktop && ( screens.length === 1 || ! isInitialScreen );
 
-	const handleNavigatorPathChange = ( path: string ) => {
+	const handleNavigatorPathChange = ( path?: string ) => {
 		setIsInitialScreen( path === '/' );
 		onNavigatorPathChange?.( path );
 	};
diff --git a/packages/design-preview/src/components/sidebar.tsx b/packages/design-preview/src/components/sidebar.tsx
index e795041e99e07..9f215ece64d07 100644
--- a/packages/design-preview/src/components/sidebar.tsx
+++ b/packages/design-preview/src/components/sidebar.tsx
@@ -36,7 +36,7 @@ interface SidebarProps {
 	screens: NavigatorScreenObject[];
 	actionButtons: React.ReactNode;
 	onClickCategory?: ( category: Category ) => void;
-	onNavigatorPathChange?: ( path: string ) => void;
+	onNavigatorPathChange?: ( path?: string ) => void;
 }
 
 const Sidebar: React.FC< SidebarProps > = ( {
diff --git a/packages/domain-picker/package.json b/packages/domain-picker/package.json
index b8a285e90b2b7..6ab6bb1669fad 100644
--- a/packages/domain-picker/package.json
+++ b/packages/domain-picker/package.json
@@ -35,11 +35,11 @@
 		"@automattic/i18n-utils": "workspace:^",
 		"@automattic/onboarding": "workspace:^",
 		"@automattic/typography": "workspace:^",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"lodash": "^4.17.21",
 		"tslib": "^2.3.0",
@@ -55,7 +55,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"react": "^18.2.0",
diff --git a/packages/domain-picker/src/components/domain-suggestion-item/suggestion-item.tsx b/packages/domain-picker/src/components/domain-suggestion-item/suggestion-item.tsx
index 1e2453eb75a37..db514f6e364cd 100644
--- a/packages/domain-picker/src/components/domain-suggestion-item/suggestion-item.tsx
+++ b/packages/domain-picker/src/components/domain-suggestion-item/suggestion-item.tsx
@@ -252,7 +252,7 @@ const DomainPickerSuggestionItem: React.FC< Props > = ( {
 					<div className="domain-picker__action">
 						<Button
 							ref={ buttonRef }
-							isSecondary
+							variant="secondary"
 							className={ classnames( 'domain-picker__suggestion-select-button', {
 								'is-selected': selected && ! isUnavailable,
 							} ) }
diff --git a/packages/domain-picker/src/components/index.tsx b/packages/domain-picker/src/components/index.tsx
index 17f08706fe51c..92b7444c90663 100644
--- a/packages/domain-picker/src/components/index.tsx
+++ b/packages/domain-picker/src/components/index.tsx
@@ -314,7 +314,7 @@ const DomainPicker: FunctionComponent< Props > = ( {
 							) }
 					</p>
 					<Button
-						isPrimary
+						variant="primary"
 						className="domain-picker__error-retry-btn"
 						onClick={ retryDomainSuggestionRequest }
 					>
@@ -436,7 +436,7 @@ const DomainPicker: FunctionComponent< Props > = ( {
 							allDomainSuggestions?.length &&
 							allDomainSuggestions?.length > quantity && (
 								<div className="domain-picker__show-more">
-									<Button onClick={ () => setIsExpanded( true ) } isLink>
+									<Button onClick={ () => setIsExpanded( true ) } variant="link">
 										{ __( 'View more results', __i18n_text_domain__ ) }
 									</Button>
 								</div>
diff --git a/packages/domain-picker/src/components/info-tooltip/index.tsx b/packages/domain-picker/src/components/info-tooltip/index.tsx
index 06eeaca3ae39f..017613d1152a7 100644
--- a/packages/domain-picker/src/components/info-tooltip/index.tsx
+++ b/packages/domain-picker/src/components/info-tooltip/index.tsx
@@ -40,10 +40,8 @@ const InfoTooltip: FunctionComponent< Props > = ( {
 		setShowTooltip( false );
 	};
 
-	const ButtonWithIcon = ( props: Button.Props & { icon: typeof info } ) => <Button { ...props } />;
-
 	return (
-		<ButtonWithIcon
+		<Button
 			icon={ info }
 			onClick={ handleClick }
 			className="info-tooltip"
@@ -60,7 +58,7 @@ const InfoTooltip: FunctionComponent< Props > = ( {
 					{ children }
 				</Popover>
 			) }
-		</ButtonWithIcon>
+		</Button>
 	);
 };
 
diff --git a/packages/eslint-plugin-package-json/package.json b/packages/eslint-plugin-package-json/package.json
index 302f941170e76..9f0805e5e6128 100644
--- a/packages/eslint-plugin-package-json/package.json
+++ b/packages/eslint-plugin-package-json/package.json
@@ -18,7 +18,7 @@
 	],
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@wordpress/npm-package-json-lint-config": "^4.8.0",
+		"@wordpress/npm-package-json-lint-config": "^4.21.0",
 		"eslint-plugin-json-es": "^1.5.7",
 		"esquery": "^1.4.0",
 		"npm-package-json-lint": "^5.4.2"
diff --git a/packages/global-styles/package.json b/packages/global-styles/package.json
index fd50e976fcc74..54d0f7315fc56 100644
--- a/packages/global-styles/package.json
+++ b/packages/global-styles/package.json
@@ -32,14 +32,16 @@
 		"@automattic/components": "workspace:^",
 		"@automattic/data-stores": "workspace:^",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/block-library": "^8.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/edit-site": "^5.0.0",
-		"@wordpress/keycodes": "^3.23.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/block-library": "^8.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/keycodes": "^3.36.0",
+		"@wordpress/private-apis": "^0.18.0",
 		"classnames": "^2.3.1",
+		"deepmerge": "^4.3.0",
 		"i18n-calypso": "workspace:^",
+		"is-plain-object": "^5.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intersection-observer": "^9.4.3",
@@ -47,13 +49,14 @@
 		"wpcom-proxy-request": "workspace:^"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3"
 	},
 	"devDependencies": {
 		"@automattic/calypso-typescript-config": "workspace:^",
+		"@types/wordpress__block-library": "^2.6.1",
 		"typescript": "^4.7.4"
 	},
 	"private": true
diff --git a/packages/global-styles/src/components/color-palette-variations/index.tsx b/packages/global-styles/src/components/color-palette-variations/index.tsx
index 59db22c65d4f7..b3f8f718c3603 100644
--- a/packages/global-styles/src/components/color-palette-variations/index.tsx
+++ b/packages/global-styles/src/components/color-palette-variations/index.tsx
@@ -4,12 +4,15 @@ import {
 	__unstableUseCompositeState as useCompositeState,
 	__unstableCompositeItem as CompositeItem,
 } from '@wordpress/components';
-import { GlobalStylesContext } from '@wordpress/edit-site/build-module/components/global-styles/context';
-import { mergeBaseAndUserConfigs } from '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
 import classnames from 'classnames';
 import { translate } from 'i18n-calypso';
 import { useMemo, useContext } from 'react';
 import { InView, IntersectionObserverProps } from 'react-intersection-observer';
+import {
+	GlobalStylesContext,
+	mergeBaseAndUserConfigs,
+	withExperimentalBlockEditorProvider,
+} from '../../gutenberg-bridge';
 import { useColorPaletteVariations } from '../../hooks';
 import ColorPaletteVariationPreview from './preview';
 import type { GlobalStylesObject } from '../../types';
@@ -44,7 +47,6 @@ const ColorPaletteVariation = ( {
 			merged: mergeBaseAndUserConfigs( base, colorPaletteVariation ),
 		};
 	}, [ colorPaletteVariation, base ] );
-
 	return (
 		<CompositeItem
 			role="option"
@@ -138,4 +140,4 @@ const ColorPaletteVariations = ( {
 	);
 };
 
-export default ColorPaletteVariations;
+export default withExperimentalBlockEditorProvider( ColorPaletteVariations );
diff --git a/packages/global-styles/src/components/color-palette-variations/preview.tsx b/packages/global-styles/src/components/color-palette-variations/preview.tsx
index b350035e68bf9..c626022cd7c82 100644
--- a/packages/global-styles/src/components/color-palette-variations/preview.tsx
+++ b/packages/global-styles/src/components/color-palette-variations/preview.tsx
@@ -3,16 +3,13 @@ import {
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useResizeObserver } from '@wordpress/compose';
-import {
-	useSetting,
-	useStyle,
-} from '@wordpress/edit-site/build-module/components/global-styles/hooks';
 import { translate } from 'i18n-calypso';
 import {
 	STYLE_PREVIEW_WIDTH,
 	STYLE_PREVIEW_HEIGHT,
 	STYLE_PREVIEW_COLOR_SWATCH_SIZE,
 } from '../../constants';
+import { useGlobalSetting, useGlobalStyle } from '../../gutenberg-bridge';
 import GlobalStylesVariationContainer from '../global-styles-variation-container';
 import type { Color } from '../../types';
 
@@ -21,20 +18,19 @@ interface Props {
 }
 
 const ColorPaletteVariationPreview = ( { title }: Props ) => {
-	const [ fontWeight ] = useStyle( 'typography.fontWeight' );
-	const [ fontFamily = 'serif' ] = useStyle( 'typography.fontFamily' );
-	const [ headingFontFamily = fontFamily ] = useStyle( 'elements.h1.typography.fontFamily' );
-	const [ headingFontWeight = fontWeight ] = useStyle( 'elements.h1.typography.fontWeight' );
-	const [ textColor = 'black' ] = useStyle( 'color.text' );
-	const [ headingColor = textColor ] = useStyle( 'elements.h1.color.text' );
-	const [ backgroundColor = 'white' ] = useStyle( 'color.background' );
-	const [ gradientValue ] = useStyle( 'color.gradient' );
-	const [ themeColors ] = useSetting( 'color.palette.theme' );
+	const [ fontWeight ] = useGlobalStyle( 'typography.fontWeight' );
+	const [ fontFamily = 'serif' ] = useGlobalStyle( 'typography.fontFamily' );
+	const [ headingFontFamily = fontFamily ] = useGlobalStyle( 'elements.h1.typography.fontFamily' );
+	const [ headingFontWeight = fontWeight ] = useGlobalStyle( 'elements.h1.typography.fontWeight' );
+	const [ textColor = 'black' ] = useGlobalStyle( 'color.text' );
+	const [ headingColor = textColor ] = useGlobalStyle( 'elements.h1.color.text' );
+	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
+	const [ gradientValue ] = useGlobalStyle( 'color.gradient' );
+	const [ themeColors ] = useGlobalSetting( 'color.palette.theme' );
 	const [ containerResizeListener, { width } ] = useResizeObserver();
 	const ratio = width ? width / STYLE_PREVIEW_WIDTH : 1;
 	const normalizedHeight = Math.ceil( STYLE_PREVIEW_HEIGHT * ratio );
 	const normalizedSwatchSize = STYLE_PREVIEW_COLOR_SWATCH_SIZE * ratio * 2;
-
 	const uniqueColors = [ ...new Set< string >( themeColors.map( ( { color }: Color ) => color ) ) ];
 	const highlightedColors = uniqueColors
 		.filter(
@@ -106,7 +102,9 @@ const ColorPaletteVariationPreview = ( { title }: Props ) => {
 									textAlign: 'center',
 								} }
 							>
-								{ translate( 'Default' ) }
+								{ translate( 'Default', {
+									comment: 'The default value of the color palette',
+								} ) }
 							</div>
 						</VStack>
 					) }
diff --git a/packages/global-styles/src/components/font-pairing-variations/index.tsx b/packages/global-styles/src/components/font-pairing-variations/index.tsx
index b7a95665f2946..40ff01b59b7c7 100644
--- a/packages/global-styles/src/components/font-pairing-variations/index.tsx
+++ b/packages/global-styles/src/components/font-pairing-variations/index.tsx
@@ -4,12 +4,15 @@ import {
 	__unstableUseCompositeState as useCompositeState,
 	__unstableCompositeItem as CompositeItem,
 } from '@wordpress/components';
-import { GlobalStylesContext } from '@wordpress/edit-site/build-module/components/global-styles/context';
-import { mergeBaseAndUserConfigs } from '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
 import classnames from 'classnames';
 import { translate } from 'i18n-calypso';
 import { useMemo, useContext } from 'react';
 import { InView, IntersectionObserverProps } from 'react-intersection-observer';
+import {
+	GlobalStylesContext,
+	mergeBaseAndUserConfigs,
+	withExperimentalBlockEditorProvider,
+} from '../../gutenberg-bridge';
 import { useFontPairingVariations } from '../../hooks';
 import FontPairingVariationPreview from './preview';
 import type { GlobalStylesObject } from '../../types';
@@ -41,10 +44,10 @@ const FontPairingVariation = ( {
 		return {
 			user: fontPairingVariation,
 			base,
-			merged: mergeBaseAndUserConfigs( base, fontPairingVariation ),
+			// When font paring isn't passed, it should be available on the base.
+			merged: ! fontPairingVariation ? base : mergeBaseAndUserConfigs( base, fontPairingVariation ),
 		};
 	}, [ fontPairingVariation, base ] );
-
 	return (
 		<CompositeItem
 			role="option"
@@ -90,7 +93,6 @@ const FontPairingVariations = ( {
 	// The theme font pairings don't include the default font pairing
 	const fontPairingVariations = useFontPairingVariations( siteId, stylesheet ) ?? [];
 	const composite = useCompositeState();
-
 	return (
 		<Composite
 			{ ...composite }
@@ -139,4 +141,4 @@ const FontPairingVariations = ( {
 	);
 };
 
-export default FontPairingVariations;
+export default withExperimentalBlockEditorProvider( FontPairingVariations );
diff --git a/packages/global-styles/src/components/font-pairing-variations/preview.tsx b/packages/global-styles/src/components/font-pairing-variations/preview.tsx
index 6a850cf43c51c..441867c0dbce7 100644
--- a/packages/global-styles/src/components/font-pairing-variations/preview.tsx
+++ b/packages/global-styles/src/components/font-pairing-variations/preview.tsx
@@ -3,10 +3,6 @@ import {
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useResizeObserver, useViewportMatch } from '@wordpress/compose';
-import {
-	useSetting,
-	useStyle,
-} from '@wordpress/edit-site/build-module/components/global-styles/hooks';
 import { useMemo, useState } from 'react';
 import {
 	FONT_PREVIEW_LARGE_WIDTH,
@@ -15,6 +11,7 @@ import {
 	FONT_PREVIEW_HEIGHT,
 	SYSTEM_FONT_SLUG,
 } from '../../constants';
+import { useGlobalSetting, useGlobalStyle } from '../../gutenberg-bridge';
 import GlobalStylesVariationContainer from '../global-styles-variation-container';
 import FontFamiliesLoader from './font-families-loader';
 import type { FontFamily } from '../../types';
@@ -26,21 +23,23 @@ const DEFAULT_LARGE_FONT_STYLES: React.CSSProperties = {
 };
 
 const FontPairingVariationPreview = () => {
-	const [ fontFamilies ] = useSetting( 'typography.fontFamilies' ) as [ FontFamily[] ];
+	const [ fontFamilies ] = useGlobalSetting( 'typography.fontFamilies.theme' ) as [ FontFamily[] ];
 
-	const [ textFontFamily = 'serif' ] = useStyle( 'typography.fontFamily' );
-	const [ textFontStyle = 'normal' ] = useStyle( 'typography.fontStyle' );
-	const [ textLetterSpacing = '-0.15px' ] = useStyle( 'typography.letterSpacing' );
-	const [ textFontWeight = 400 ] = useStyle( 'typography.fontWeight' );
+	const [ textFontFamily = 'serif' ] = useGlobalStyle( 'typography.fontFamily' );
+	const [ textFontStyle = 'normal' ] = useGlobalStyle( 'typography.fontStyle' );
+	const [ textLetterSpacing = '-0.15px' ] = useGlobalStyle( 'typography.letterSpacing' );
+	const [ textFontWeight = 400 ] = useGlobalStyle( 'typography.fontWeight' );
 
-	const [ headingFontFamily = textFontFamily ] = useStyle(
+	const [ headingFontFamily = textFontFamily ] = useGlobalStyle(
 		'elements.heading.typography.fontFamily'
 	);
-	const [ headingFontStyle = textFontStyle ] = useStyle( 'elements.heading.typography.fontStyle' );
-	const [ headingFontWeight = textFontWeight ] = useStyle(
+	const [ headingFontStyle = textFontStyle ] = useGlobalStyle(
+		'elements.heading.typography.fontStyle'
+	);
+	const [ headingFontWeight = textFontWeight ] = useGlobalStyle(
 		'elements.heading.typography.fontWeight'
 	);
-	const [ headingLetterSpacing = textLetterSpacing ] = useStyle(
+	const [ headingLetterSpacing = textLetterSpacing ] = useGlobalStyle(
 		'elements.heading.typography.letterSpacing'
 	);
 
@@ -52,7 +51,6 @@ const FontPairingVariationPreview = () => {
 	const normalizedHeight = Math.ceil( defaultHeight * ratio );
 	const externalFontFamilies = fontFamilies.filter( ( { slug } ) => slug !== SYSTEM_FONT_SLUG );
 	const [ isLoaded, setIsLoaded ] = useState( ! externalFontFamilies.length );
-
 	const getFontFamilyName = ( targetFontFamily: string ) => {
 		const fontFamily = fontFamilies.find( ( { fontFamily } ) => fontFamily === targetFontFamily );
 		return fontFamily?.name || fontFamily?.fontFamily || targetFontFamily;
diff --git a/packages/global-styles/src/components/global-styles-provider/index.tsx b/packages/global-styles/src/components/global-styles-provider/index.tsx
index 2652f7a53081a..1bb11b331c4e0 100644
--- a/packages/global-styles/src/components/global-styles-provider/index.tsx
+++ b/packages/global-styles/src/components/global-styles-provider/index.tsx
@@ -1,30 +1,30 @@
-import { GlobalStylesContext } from '@wordpress/edit-site/build-module/components/global-styles/context';
-import { mergeBaseAndUserConfigs } from '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
-import { isEmpty, mapValues } from 'lodash';
 import { useState, useMemo, useCallback } from 'react';
+import { GlobalStylesContext, mergeBaseAndUserConfigs } from '../../gutenberg-bridge';
 import { useGetGlobalStylesBaseConfig, useRegisterCoreBlocks } from '../../hooks';
 import type { GlobalStylesObject } from '../../types';
 
-const cleanEmptyObject = ( object: any ) => {
+const cleanEmptyObject = < T, >( object: T ) => {
 	if ( object === null || typeof object !== 'object' || Array.isArray( object ) ) {
 		return object;
 	}
-	const cleanedNestedObjects: any = Object.fromEntries(
-		Object.entries( mapValues( object, cleanEmptyObject ) ).filter( ( [ , value ] ) =>
-			Boolean( value )
-		)
+	const cleanedNestedObjects: T = Object.fromEntries(
+		Object.entries( object )
+			.map( ( [ key, value ] ) => [ key, cleanEmptyObject( value ) ] )
+			.filter( ( [ , value ] ) => value !== undefined )
 	);
-	return isEmpty( cleanedNestedObjects ) ? undefined : cleanedNestedObjects;
+
+	return Object.keys( cleanedNestedObjects ).length > 0 ? cleanedNestedObjects : undefined;
 };
 
-const useGlobalStylesUserConfig = () => {
+type SetConfig = ( callback: ( config: GlobalStylesObject ) => GlobalStylesObject ) => void;
+
+const useGlobalStylesUserConfig = (): [ boolean, GlobalStylesObject, SetConfig ] => {
 	const [ userConfig, setUserConfig ] = useState< GlobalStylesObject >( {
 		settings: {},
 		styles: {},
 	} );
-
-	const setConfig = useCallback(
-		( callback: ( config: GlobalStylesObject ) => GlobalStylesObject ) => {
+	const setConfig: SetConfig = useCallback(
+		( callback ) => {
 			setUserConfig( ( currentConfig ) => {
 				const updatedConfig = callback( currentConfig );
 				return {
@@ -35,28 +35,26 @@ const useGlobalStylesUserConfig = () => {
 		},
 		[ setUserConfig ]
 	);
-
-	return [ !! true, userConfig, setConfig ];
+	return [ true, userConfig, setConfig ];
 };
 
-const useGlobalStylesBaseConfig = ( siteId: number | string, stylesheet: string ) => {
+const useGlobalStylesBaseConfig = (
+	siteId: number | string,
+	stylesheet: string
+): [ boolean, GlobalStylesObject | undefined ] => {
 	const { data } = useGetGlobalStylesBaseConfig( siteId, stylesheet );
-
 	return [ !! data, data ];
 };
 
 const useGlobalStylesContext = ( siteId: number | string, stylesheet: string ) => {
 	const [ isUserConfigReady, userConfig, setUserConfig ] = useGlobalStylesUserConfig();
-
 	const [ isBaseConfigReady, baseConfig ] = useGlobalStylesBaseConfig( siteId, stylesheet );
-
 	const mergedConfig = useMemo( () => {
 		if ( ! baseConfig || ! userConfig ) {
 			return {};
 		}
 		return mergeBaseAndUserConfigs( baseConfig, userConfig );
 	}, [ userConfig, baseConfig ] );
-
 	const context = useMemo( () => {
 		return {
 			isReady: isUserConfigReady && isBaseConfigReady,
@@ -73,7 +71,6 @@ const useGlobalStylesContext = ( siteId: number | string, stylesheet: string ) =
 		isUserConfigReady,
 		isBaseConfigReady,
 	] );
-
 	return context;
 };
 
@@ -91,7 +88,6 @@ const GlobalStylesProvider = ( { siteId, stylesheet, children, placeholder = nul
 	if ( ! context.isReady || ! isBlocksRegistered ) {
 		return placeholder;
 	}
-
 	return (
 		<GlobalStylesContext.Provider value={ context }>{ children }</GlobalStylesContext.Provider>
 	);
diff --git a/packages/global-styles/src/components/global-styles-variation-container/index.tsx b/packages/global-styles/src/components/global-styles-variation-container/index.tsx
index a2d1068d223ec..85b90c9ef3050 100644
--- a/packages/global-styles/src/components/global-styles-variation-container/index.tsx
+++ b/packages/global-styles/src/components/global-styles-variation-container/index.tsx
@@ -3,8 +3,8 @@ import {
 	__unstableEditorStyles as EditorStyles,
 } from '@wordpress/block-editor';
 import { useRefEffect } from '@wordpress/compose';
-import { useGlobalStylesOutput } from '@wordpress/edit-site/build-module/components/global-styles/use-global-styles-output';
 import { useMemo } from 'react';
+import { useGlobalStylesOutput } from '../../gutenberg-bridge';
 import './style.scss';
 
 interface Props {
@@ -26,7 +26,6 @@ const GlobalStylesVariationContainer = ( {
 	...props
 }: Props ) => {
 	const [ styles ] = useGlobalStylesOutput();
-
 	// Reset leaked styles from WP common.css and remove main content layout padding and border.
 	const editorStyles = useMemo( () => {
 		if ( styles ) {
@@ -46,14 +45,11 @@ const GlobalStylesVariationContainer = ( {
 				},
 			];
 		}
-
 		return styles;
 	}, [ styles ] );
-
 	return (
 		<Iframe
 			className="global-styles-variation-container__iframe"
-			head={ <EditorStyles styles={ editorStyles } /> }
 			style={ {
 				height,
 				visibility: width ? 'visible' : 'hidden',
@@ -64,11 +60,9 @@ const GlobalStylesVariationContainer = ( {
 				// See https://github.com/WordPress/gutenberg/blob/aa8e1c52c7cb497e224a479673e584baaca97113/packages/block-editor/src/components/writing-flow/use-tab-nav.js#L136
 				const handleFocusOut = ( event: Event ) => {
 					event.stopImmediatePropagation();
-
 					// Explicitly call the focusOut handler, if available.
 					onFocusOut?.();
 				};
-
 				bodyElement.addEventListener( 'focusout', handleFocusOut );
 				return () => {
 					bodyElement.removeEventListener( 'focusout', handleFocusOut );
@@ -77,6 +71,7 @@ const GlobalStylesVariationContainer = ( {
 			scrolling="no"
 			{ ...props }
 		>
+			<EditorStyles styles={ editorStyles ?? [] } />
 			{ containerResizeListener }
 			{ children }
 		</Iframe>
diff --git a/packages/global-styles/src/components/global-styles-variations/index.tsx b/packages/global-styles/src/components/global-styles-variations/index.tsx
index b113893dedd0b..18d445373038a 100644
--- a/packages/global-styles/src/components/global-styles-variations/index.tsx
+++ b/packages/global-styles/src/components/global-styles-variations/index.tsx
@@ -1,11 +1,14 @@
-import { GlobalStylesContext } from '@wordpress/edit-site/build-module/components/global-styles/context';
-import { mergeBaseAndUserConfigs } from '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
 import { useState } from '@wordpress/element';
 import { ENTER } from '@wordpress/keycodes';
 import classnames from 'classnames';
 import { translate, TranslateResult } from 'i18n-calypso';
 import { useMemo, useContext } from 'react';
 import { DEFAULT_GLOBAL_STYLES_VARIATION_SLUG } from '../../constants';
+import {
+	GlobalStylesContext,
+	mergeBaseAndUserConfigs,
+	withExperimentalBlockEditorProvider,
+} from '../../gutenberg-bridge';
 import { useRegisterCoreBlocks } from '../../hooks';
 import GlobalStylesVariationPreview from './preview';
 import type { GlobalStylesObject } from '../../types';
@@ -52,14 +55,12 @@ const GlobalStylesVariation = ( {
 			inline_css: baseInlineCss + globalStylesVariationInlineCss,
 		};
 	}, [ globalStylesVariation, base ] );
-
 	const selectOnEnter = ( event: React.KeyboardEvent ) => {
 		if ( event.keyCode === ENTER ) {
 			event.preventDefault();
 			onSelect();
 		}
 	};
-
 	return (
 		<div
 			className={ classnames( 'global-styles-variations__item', {
@@ -124,7 +125,6 @@ const GlobalStylesVariations = ( {
 			) ?? ( {} as GlobalStylesObject ),
 		[ globalStylesVariations ]
 	);
-
 	const globalStylesVariationsWithoutDefault = useMemo(
 		() =>
 			globalStylesVariations.filter(
@@ -208,4 +208,4 @@ const GlobalStylesVariations = ( {
 	);
 };
 
-export default GlobalStylesVariations;
+export default withExperimentalBlockEditorProvider( GlobalStylesVariations );
diff --git a/packages/global-styles/src/components/global-styles-variations/preview.tsx b/packages/global-styles/src/components/global-styles-variations/preview.tsx
index 9521e314e1900..6a66cfcaacf31 100644
--- a/packages/global-styles/src/components/global-styles-variations/preview.tsx
+++ b/packages/global-styles/src/components/global-styles-variations/preview.tsx
@@ -4,11 +4,8 @@ import {
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useReducedMotion, useResizeObserver } from '@wordpress/compose';
-import {
-	useSetting,
-	useStyle,
-} from '@wordpress/edit-site/build-module/components/global-styles/hooks';
 import { useState } from '@wordpress/element';
+import { useGlobalSetting, useGlobalStyle } from '../../gutenberg-bridge';
 import GlobalStylesVariationContainer from '../global-styles-variation-container';
 import type { Color } from '../../types';
 
@@ -56,22 +53,21 @@ interface Props {
 }
 
 const GlobalStylesVariationPreview = ( { title, inlineCss, isFocused, onFocusOut }: Props ) => {
-	const [ fontWeight ] = useStyle( 'typography.fontWeight' );
-	const [ fontFamily = 'serif' ] = useStyle( 'typography.fontFamily' );
-	const [ headingFontFamily = fontFamily ] = useStyle( 'elements.h1.typography.fontFamily' );
-	const [ headingFontWeight = fontWeight ] = useStyle( 'elements.h1.typography.fontWeight' );
-	const [ textColor = 'black' ] = useStyle( 'color.text' );
-	const [ headingColor = textColor ] = useStyle( 'elements.h1.color.text' );
-	const [ backgroundColor = 'white' ] = useStyle( 'color.background' );
-	const [ gradientValue ] = useStyle( 'color.gradient' );
+	const [ fontWeight ] = useGlobalStyle( 'typography.fontWeight' );
+	const [ fontFamily = 'serif' ] = useGlobalStyle( 'typography.fontFamily' );
+	const [ headingFontFamily = fontFamily ] = useGlobalStyle( 'elements.h1.typography.fontFamily' );
+	const [ headingFontWeight = fontWeight ] = useGlobalStyle( 'elements.h1.typography.fontWeight' );
+	const [ textColor = 'black' ] = useGlobalStyle( 'color.text' );
+	const [ headingColor = textColor ] = useGlobalStyle( 'elements.h1.color.text' );
+	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
+	const [ gradientValue ] = useGlobalStyle( 'color.gradient' );
 	const disableMotion = useReducedMotion();
-	const [ coreColors ] = useSetting( 'color.palette.core' );
-	const [ themeColors ] = useSetting( 'color.palette.theme' );
-	const [ customColors ] = useSetting( 'color.palette.custom' );
+	const [ coreColors ] = useGlobalSetting( 'color.palette.core' );
+	const [ themeColors ] = useGlobalSetting( 'color.palette.theme' );
+	const [ customColors ] = useGlobalSetting( 'color.palette.custom' );
 	const [ isHovered, setIsHovered ] = useState( false );
 	const [ containerResizeListener, { width } ] = useResizeObserver();
 	const ratio = width ? width / normalizedWidth : 1;
-
 	const paletteColors = ( themeColors ?? [] )
 		.concat( customColors ?? [] )
 		.concat( coreColors ?? [] );
@@ -81,7 +77,6 @@ const GlobalStylesVariationPreview = ( { title, inlineCss, isFocused, onFocusOut
 			( { color }: { color: Color } ) => color !== backgroundColor && color !== headingColor
 		)
 		.slice( 0, 2 );
-
 	return (
 		<GlobalStylesVariationContainer
 			width={ width }
@@ -132,7 +127,7 @@ const GlobalStylesVariationPreview = ( { title, inlineCss, isFocused, onFocusOut
 						</motion.div>
 						<VStack spacing={ 4 * ratio }>
 							{ highlightedColors.map(
-								( { slug, color }: { slug: string; color: Color }, index: number ) => (
+								( { slug, color }: { slug: string; color: string }, index: number ) => (
 									<motion.div
 										key={ slug }
 										style={ {
diff --git a/packages/global-styles/src/global.d.ts b/packages/global-styles/src/global.d.ts
index 17cab0d6491a7..a37848d509086 100644
--- a/packages/global-styles/src/global.d.ts
+++ b/packages/global-styles/src/global.d.ts
@@ -5,30 +5,7 @@ declare module '@wordpress/block-editor' {
 
 	export const __unstableIframe: React.ComponentType< Props >;
 	export const __unstableEditorStyles: React.ComponentType< Props >;
-	export const transformStyles: ( styles: unknown[], wrapperClassName: string ) => string;
-}
-
-declare module '@wordpress/block-library' {
-	export const registerCoreBlocks: () => void;
-}
-
-declare module '@wordpress/components' {
-	interface Props {
-		[ key: string ]: unknown;
-	}
 
-	export const __unstableComposite: React.ComponentType< Props >;
-	export const __unstableCompositeItem: React.ComponentType< Props >;
-	export const __unstableMotion: React.ComponenType< Props >;
-	export const __unstableUseCompositeState: ( props?: {
-		orientation?: 'horizontal' | 'vertical';
-	} ) => any;
-	export const __experimentalHStack: React.ComponentType< Props >;
-	export const __experimentalVStack: React.ComponentType< Props >;
+	export const privateApis: unknown;
+	export const transformStyles: ( styles: unknown[], wrapperClassName: string ) => string;
 }
-
-declare module '@wordpress/edit-site/build-module/components/global-styles/context';
-declare module '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
-declare module '@wordpress/edit-site/build-module/components/global-styles/hooks';
-declare module '@wordpress/edit-site/build-module/components/global-styles/preview';
-declare module '@wordpress/edit-site/build-module/components/global-styles/use-global-styles-output';
diff --git a/packages/global-styles/src/gutenberg-bridge/index.tsx b/packages/global-styles/src/gutenberg-bridge/index.tsx
new file mode 100644
index 0000000000000..c30bc482f5915
--- /dev/null
+++ b/packages/global-styles/src/gutenberg-bridge/index.tsx
@@ -0,0 +1,60 @@
+/**
+ * Unlock the private apis for the global styles related functionalities and re-export them
+ * on our own as this kind of internal apis might be drastically changed from time to time.
+ * See https://github.com/Automattic/wp-calypso/issues/77048
+ */
+import { privateApis as blockEditorPrivateApis, transformStyles } from '@wordpress/block-editor';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+import deepmerge from 'deepmerge';
+import { isPlainObject } from 'is-plain-object';
+import type { GlobalStylesObject } from '../types';
+
+const { unlock } = __dangerousOptInToUnstableAPIsOnlyForCoreModules(
+	'I know using unstable features means my plugin or theme will inevitably break on the next WordPress release.',
+	'@wordpress/block-editor'
+);
+
+const {
+	cleanEmptyObject,
+	ExperimentalBlockEditorProvider,
+	GlobalStylesContext,
+	useGlobalStylesOutput,
+	useGlobalSetting,
+	useGlobalStyle,
+} = unlock( blockEditorPrivateApis );
+
+const mergeBaseAndUserConfigs = ( base: GlobalStylesObject, user: GlobalStylesObject ) => {
+	return deepmerge( base, user, { isMergeableObject: isPlainObject } );
+};
+
+const withExperimentalBlockEditorProvider = createHigherOrderComponent(
+	< OuterProps, >( InnerComponent: React.ComponentType< OuterProps > ) => {
+		// Use fake assets to eliminate the compatStyles without the id.
+		// See https://github.com/WordPress/gutenberg/blob/f77958cfc13c02b0c0e6b9b697b43bbcad4ba40b/packages/block-editor/src/components/iframe/index.js#L127
+		const settings = {
+			__unstableResolvedAssets: {
+				styles: '<style id="" />',
+			},
+		};
+
+		return ( props: OuterProps ) => (
+			<ExperimentalBlockEditorProvider settings={ settings }>
+				<InnerComponent { ...props } />
+			</ExperimentalBlockEditorProvider>
+		);
+	},
+	'withExperimentalBlockEditorProvider'
+);
+
+export {
+	cleanEmptyObject,
+	ExperimentalBlockEditorProvider,
+	GlobalStylesContext,
+	transformStyles,
+	useGlobalStylesOutput,
+	useGlobalSetting,
+	useGlobalStyle,
+	mergeBaseAndUserConfigs,
+	withExperimentalBlockEditorProvider,
+};
diff --git a/packages/global-styles/src/hooks/use-get-global-styles-base-config.ts b/packages/global-styles/src/hooks/use-get-global-styles-base-config.ts
index 573f9544aede2..23f261d7af83b 100644
--- a/packages/global-styles/src/hooks/use-get-global-styles-base-config.ts
+++ b/packages/global-styles/src/hooks/use-get-global-styles-base-config.ts
@@ -3,7 +3,7 @@ import wpcomRequest from 'wpcom-proxy-request';
 import type { GlobalStylesObject } from '../types';
 
 const useGetGlobalStylesBaseConfig = ( siteId: number | string, stylesheet: string ) => {
-	return useQuery< any, unknown, unknown >( {
+	return useQuery< any, unknown, GlobalStylesObject >( {
 		queryKey: [ 'global-styles-base-config', siteId, stylesheet ],
 		queryFn: async () =>
 			wpcomRequest< GlobalStylesObject >( {
diff --git a/packages/global-styles/src/hooks/use-sync-global-styles-user-config.ts b/packages/global-styles/src/hooks/use-sync-global-styles-user-config.ts
index 33781a5bbef69..9604cdc5e8a94 100644
--- a/packages/global-styles/src/hooks/use-sync-global-styles-user-config.ts
+++ b/packages/global-styles/src/hooks/use-sync-global-styles-user-config.ts
@@ -1,6 +1,5 @@
-import { GlobalStylesContext } from '@wordpress/edit-site/build-module/components/global-styles/context';
-import { mergeBaseAndUserConfigs } from '@wordpress/edit-site/build-module/components/global-styles/global-styles-provider';
 import { useContext, useEffect } from 'react';
+import { GlobalStylesContext, mergeBaseAndUserConfigs } from '../gutenberg-bridge';
 import type { GlobalStylesObject } from '../types';
 
 const useSyncGlobalStylesUserConfig = (
@@ -8,12 +7,14 @@ const useSyncGlobalStylesUserConfig = (
 	onChange?: ( globalStyle: GlobalStylesObject ) => void
 ) => {
 	const { user, setUserConfig } = useContext( GlobalStylesContext );
-
 	useEffect( () => {
 		setUserConfig( () =>
 			globalStyles
 				.filter( Boolean )
-				.reduce( ( prev, current ) => mergeBaseAndUserConfigs( prev, current ), {} )
+				.reduce(
+					( prev, current ) => mergeBaseAndUserConfigs( prev, current ),
+					{} as GlobalStylesObject
+				)
 		);
 	}, [ globalStyles ] );
 
diff --git a/packages/global-styles/src/index.tsx b/packages/global-styles/src/index.tsx
index 820f1a1fa7f89..48dce98afad3f 100644
--- a/packages/global-styles/src/index.tsx
+++ b/packages/global-styles/src/index.tsx
@@ -1,12 +1,9 @@
-// Re-export hooks from `@automattic/global-styles` to avoid calypso using `@wordpress/edit-site` directly
-export { useStyle } from '@wordpress/edit-site/build-module/components/global-styles/hooks';
-export { useGlobalStylesOutput } from '@wordpress/edit-site/build-module/components/global-styles/use-global-styles-output';
-export { transformStyles } from '@wordpress/block-editor';
 export * from './components';
 export {
 	DEFAULT_GLOBAL_STYLES_VARIATION_TITLE,
 	DEFAULT_GLOBAL_STYLES_VARIATION_SLUG,
 } from './constants';
+export * from './gutenberg-bridge';
 export {
 	useColorPaletteVariations,
 	useFontPairingVariations,
diff --git a/packages/help-center/package.json b/packages/help-center/package.json
index 141750126023b..4f3ef77122166 100644
--- a/packages/help-center/package.json
+++ b/packages/help-center/package.json
@@ -37,11 +37,11 @@
 		"@automattic/viewport-react": "workspace:^",
 		"@popperjs/core": "^2.10.2",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/primitives": "^3.21.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/primitives": "^3.34.0",
 		"classnames": "^2.3.1",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -57,7 +57,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
diff --git a/packages/help-center/src/components/help-center-contact-form.tsx b/packages/help-center/src/components/help-center-contact-form.tsx
index 80ff5ed09ee31..ef8ec0998bd70 100644
--- a/packages/help-center/src/components/help-center-contact-form.tsx
+++ b/packages/help-center/src/components/help-center-contact-form.tsx
@@ -523,23 +523,18 @@ export const HelpCenterContactForm = () => {
 						isBusy={ isFetchingGPTResponse }
 						disabled={ isCTADisabled() }
 						onClick={ handleCTA }
-						isPrimary={ ! showingGPTResponse || isGPTError }
-						isSecondary={ showingGPTResponse && ! isGPTError }
+						variant={ showingGPTResponse && ! isGPTError ? 'secondary' : 'primary' }
 						className="help-center-contact-form__site-picker-cta"
 					>
 						{ getCTALabel() }
 					</Button>
 					{ ! isFetchingGPTResponse && showingGPTResponse && ! hasSubmittingError && (
-						<Button
-							isPrimary={ ! isGPTError }
-							isSecondary={ isGPTError }
-							onClick={ handleGPTClose }
-						>
+						<Button variant={ isGPTError ? 'secondary' : 'primary' } onClick={ handleGPTClose }>
 							{ __( 'Close', __i18n_text_domain__ ) }
 						</Button>
 					) }
 					{ isFetchingGPTResponse && ! isGPTError && (
-						<Button isSecondary onClick={ handleGPTCancel }>
+						<Button variant="secondary" onClick={ handleGPTCancel }>
 							{ __( 'Cancel', __i18n_text_domain__ ) }
 						</Button>
 					) }
@@ -572,7 +567,7 @@ export const HelpCenterContactForm = () => {
 				<Button
 					disabled={ isCTADisabled() }
 					onClick={ handleCTA }
-					isPrimary
+					variant="primary"
 					className="help-center-contact-form__site-picker-cta"
 				>
 					{ getCTALabel() }
@@ -654,7 +649,7 @@ export const HelpCenterContactForm = () => {
 				<Button
 					disabled={ isCTADisabled() }
 					onClick={ handleCTA }
-					isPrimary
+					variant="primary"
 					className="help-center-contact-form__site-picker-cta"
 				>
 					{ getCTALabel() }
diff --git a/packages/help-center/src/components/help-center-more-resources.tsx b/packages/help-center/src/components/help-center-more-resources.tsx
index 2608bb5e4beb7..7fbd6828a12c5 100644
--- a/packages/help-center/src/components/help-center-more-resources.tsx
+++ b/packages/help-center/src/components/help-center-more-resources.tsx
@@ -157,7 +157,11 @@ export const HelpCenterMoreResources = () => {
 				</li>
 				<li className="inline-help__resource-item">
 					<div className="inline-help__resource-cell">
-						<Button isLink onClick={ handleWhatsNewClick } className="inline-help__new-releases">
+						<Button
+							variant="link"
+							onClick={ handleWhatsNewClick }
+							className="inline-help__new-releases"
+						>
 							<Icon icon={ <NewReleases /> } size={ 24 } />
 							<span>{ __( "What's new", __i18n_text_domain__ ) }</span>
 							{ showWhatsNewDot && (
diff --git a/packages/help-center/src/components/help-center-notice.tsx b/packages/help-center/src/components/help-center-notice.tsx
index 5a491c329d25f..6fa9ff866982b 100644
--- a/packages/help-center/src/components/help-center-notice.tsx
+++ b/packages/help-center/src/components/help-center-notice.tsx
@@ -38,9 +38,11 @@ function getResponses( siteName?: string ) {
 					),
 					{
 						hosted_on_our_services: (
+							// @ts-expect-error Children must be passed to External link. This is done by createInterpolateElement, but the types don't see that.
 							<ExternalLink href={ localizeUrl( 'https://wordpress.com/support/com-vs-org/' ) } />
 						),
 						wordpress_org_community_forums: (
+							// @ts-expect-error Children must be passed to External link. This is done by createInterpolateElement, but the types don't see that.
 							<ExternalLink href={ localizeUrl( 'https://wordpress.org/support/forums/' ) } />
 						),
 					}
diff --git a/packages/i18n-calypso/package.json b/packages/i18n-calypso/package.json
index d07ce9eca3739..258b4f88afb48 100644
--- a/packages/i18n-calypso/package.json
+++ b/packages/i18n-calypso/package.json
@@ -20,7 +20,7 @@
 		"@automattic/interpolate-components": "workspace:^",
 		"@babel/runtime": "^7.17.2",
 		"@tannin/sprintf": "^1.1.0",
-		"@wordpress/compose": "^6.0.0",
+		"@wordpress/compose": "^6.12.0",
 		"debug": "^4.3.3",
 		"events": "^3.0.0",
 		"hash.js": "^1.1.5",
diff --git a/packages/i18n-utils/package.json b/packages/i18n-utils/package.json
index d5c4ea84d78f6..fab40ee968b1c 100644
--- a/packages/i18n-utils/package.json
+++ b/packages/i18n-utils/package.json
@@ -30,8 +30,8 @@
 	"dependencies": {
 		"@automattic/calypso-url": "workspace:^",
 		"@automattic/languages": "workspace:^",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/i18n": "^4.23.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/i18n": "^4.36.0",
 		"react": "^18.2.0",
 		"tslib": "^2.3.0"
 	},
diff --git a/packages/language-picker/package.json b/packages/language-picker/package.json
index c77e4aebeb30c..d3d55929f703c 100644
--- a/packages/language-picker/package.json
+++ b/packages/language-picker/package.json
@@ -30,13 +30,13 @@
 		"@automattic/languages": "workspace:^",
 		"@automattic/search": "workspace:^",
 		"@babel/runtime": "^7.17.2",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/react-i18n": "^3.21.0"
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/react-i18n": "^3.33.0"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/language-picker/src/language-picker.tsx b/packages/language-picker/src/language-picker.tsx
index 4523ee44d5bdd..a8ef345c84938 100644
--- a/packages/language-picker/src/language-picker.tsx
+++ b/packages/language-picker/src/language-picker.tsx
@@ -166,7 +166,11 @@ function LanguagePicker< TLanguage extends Language >( {
 					hideLabelFromVision
 					value={ selectControlOptions.find( ( option ) => option.key === filter ) }
 					options={ selectControlOptions }
-					onChange={ ( { selectedItem } ) => selectedItem && setFilter( selectedItem.key ) }
+					onChange={ ( {
+						selectedItem,
+					}: {
+						selectedItem: ( typeof selectControlOptions )[ number ];
+					} ) => selectedItem && setFilter( selectedItem.key ) }
 				/>
 				<div className="language-picker-component__search-mobile">
 					<Search
@@ -208,7 +212,7 @@ function LanguagePicker< TLanguage extends Language >( {
 				<div className="language-picker-component__language-buttons">
 					{ languagesToRender.map( ( language ) => (
 						<Button
-							isPrimary={ selectedLanguage && language.langSlug === selectedLanguage.langSlug }
+							variant={ language.langSlug === selectedLanguage?.langSlug ? 'primary' : undefined }
 							className="language-picker-component__language-button"
 							key={ language.langSlug }
 							onClick={ () => onSelectLanguage( language ) }
diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json
index 2e479a051ffff..f873e8c35d252 100644
--- a/packages/launchpad/package.json
+++ b/packages/launchpad/package.json
@@ -48,7 +48,7 @@
 		"webpack": "^5.68.0"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"debug": "^4.3.3",
diff --git a/packages/mini-cart/package.json b/packages/mini-cart/package.json
index 701acccd03c4e..1bccc19afacbc 100644
--- a/packages/mini-cart/package.json
+++ b/packages/mini-cart/package.json
@@ -43,8 +43,8 @@
 		"@automattic/shopping-cart": "workspace:^",
 		"@automattic/wpcom-checkout": "workspace:^",
 		"@emotion/styled": "^11.3.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"debug": "^4.3.3"
 	},
 	"devDependencies": {
diff --git a/packages/onboarding/package.json b/packages/onboarding/package.json
index d72d372254d85..8d720bd8369f1 100644
--- a/packages/onboarding/package.json
+++ b/packages/onboarding/package.json
@@ -31,10 +31,10 @@
 	"dependencies": {
 		"@automattic/components": "workspace:^",
 		"@automattic/data-stores": "workspace:^",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"react-router-dom": "^6.10.0",
 		"tslib": "^2.5.0",
@@ -44,7 +44,7 @@
 		"@automattic/calypso-typescript-config": "workspace:^",
 		"@automattic/typography": "workspace:^",
 		"@testing-library/react": "^14.0.0",
-		"@wordpress/base-styles": "^4.14.0",
+		"@wordpress/base-styles": "^4.27.0",
 		"copyfiles": "^2.3.0",
 		"css-loader": "^3.6.0",
 		"react": "^18.2.0",
diff --git a/packages/onboarding/src/action-buttons/index.tsx b/packages/onboarding/src/action-buttons/index.tsx
index 93d2d858d0f7a..f1fc3ec9415da 100644
--- a/packages/onboarding/src/action-buttons/index.tsx
+++ b/packages/onboarding/src/action-buttons/index.tsx
@@ -35,7 +35,7 @@ const ActionButtons: React.FunctionComponent< ActionButtonsProps > = ( {
 
 export default ActionButtons;
 
-export const BackButton: React.FunctionComponent< Button.ButtonProps > = ( {
+export const BackButton: React.FunctionComponent< React.ComponentProps< typeof Button > > = ( {
 	className,
 	children,
 	...buttonProps
@@ -45,7 +45,7 @@ export const BackButton: React.FunctionComponent< Button.ButtonProps > = ( {
 	return (
 		<Button
 			className={ classnames( 'action_buttons__button action-buttons__back', className ) }
-			isLink
+			variant="link"
 			{ ...buttonProps }
 		>
 			{ children ||
@@ -55,7 +55,7 @@ export const BackButton: React.FunctionComponent< Button.ButtonProps > = ( {
 	);
 };
 
-export const NextButton: React.FunctionComponent< Button.ButtonProps > = ( {
+export const NextButton: React.FunctionComponent< React.ComponentProps< typeof Button > > = ( {
 	className,
 	children,
 	...buttonProps
@@ -65,7 +65,7 @@ export const NextButton: React.FunctionComponent< Button.ButtonProps > = ( {
 	return (
 		<Button
 			className={ classnames( 'button action_buttons__button action-buttons__next', className ) }
-			isPrimary
+			variant="primary"
 			{ ...buttonProps }
 		>
 			{ children ||
@@ -75,7 +75,7 @@ export const NextButton: React.FunctionComponent< Button.ButtonProps > = ( {
 	);
 };
 
-export const SkipButton: React.FunctionComponent< Button.ButtonProps > = ( {
+export const SkipButton: React.FunctionComponent< React.ComponentProps< typeof Button > > = ( {
 	className,
 	children,
 	...buttonProps
@@ -94,16 +94,11 @@ export const SkipButton: React.FunctionComponent< Button.ButtonProps > = ( {
 	);
 };
 
-interface ArrowButtonProps extends Button.ButtonProps {
-	arrow: 'left' | 'right';
-}
-
-export const ArrowButton: React.FunctionComponent< ArrowButtonProps > = ( {
-	className,
-	children,
-	arrow = 'right',
-	...buttonProps
-} ) => {
+export const ArrowButton: React.FunctionComponent<
+	React.ComponentProps< typeof Button > & {
+		arrow: 'left' | 'right';
+	}
+> = ( { className, children, arrow = 'right', ...buttonProps } ) => {
 	return (
 		<Button
 			className={ classnames(
diff --git a/packages/onboarding/src/navigator/navigator-buttons/index.tsx b/packages/onboarding/src/navigator/navigator-buttons/index.tsx
index 68bf06ba52274..3d69356a37705 100644
--- a/packages/onboarding/src/navigator/navigator-buttons/index.tsx
+++ b/packages/onboarding/src/navigator/navigator-buttons/index.tsx
@@ -13,7 +13,7 @@ interface Props {
 	path: string;
 	className?: string;
 	icon?: JSX.Element;
-	children: JSX.Element | string;
+	children: React.ReactNode;
 	onClick?: () => void;
 	checked?: boolean;
 }
@@ -55,7 +55,6 @@ export const NavigationButtonAsItem = ( { className, ...props }: Props ) => {
 		<NavigatorButton
 			as={ GenericButton }
 			className={ classnames( 'navigator-button', className ) }
-			wrapperClassName="navigator-button__wrapper"
 			{ ...props }
 		/>
 	);
diff --git a/packages/onboarding/src/navigator/navigator-item-group/index.tsx b/packages/onboarding/src/navigator/navigator-item-group/index.tsx
index b6f64230ff17a..fb8cbf0af84b5 100644
--- a/packages/onboarding/src/navigator/navigator-item-group/index.tsx
+++ b/packages/onboarding/src/navigator/navigator-item-group/index.tsx
@@ -1,5 +1,5 @@
 import {
-	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
 	__experimentalItemGroup as ItemGroup,
 } from '@wordpress/components';
 import './style.scss';
@@ -12,10 +12,10 @@ type Props = {
 const NavigatorItemGroup = ( { children, title }: Props ) => {
 	return (
 		<section className="navigator-item-group">
-			<HStack direction="column" alignment="top" spacing="0">
+			<VStack direction="column" justify="flex-start" alignment="stretch">
 				{ title && <h3 className="navigator-item-group__title">{ title }</h3> }
 				<ItemGroup>{ children }</ItemGroup>
-			</HStack>
+			</VStack>
 		</section>
 	);
 };
diff --git a/packages/onboarding/src/navigator/navigator-item-group/style.scss b/packages/onboarding/src/navigator/navigator-item-group/style.scss
index 3e45914052a77..9ec0545939065 100644
--- a/packages/onboarding/src/navigator/navigator-item-group/style.scss
+++ b/packages/onboarding/src/navigator/navigator-item-group/style.scss
@@ -3,14 +3,12 @@
 .navigator-item-group {
 	flex-shrink: 0;
 
-	.navigator-button__wrapper {
+	.components-item-group > div[role="listitem"] {
 		display: flex;
+	}
 
-		.navigator-button {
-			flex: 1;
-			// Expand sides out of wrapper in main screen
-			margin: 0 -11px;
-		}
+	.navigator-button {
+		flex-grow: 1;
 	}
 
 	&:nth-child(1 of &):nth-last-child(1 of &) {
diff --git a/packages/onboarding/src/navigator/navigator-listener/index.tsx b/packages/onboarding/src/navigator/navigator-listener/index.tsx
index c4b0ac74eff59..5d595bacd96eb 100644
--- a/packages/onboarding/src/navigator/navigator-listener/index.tsx
+++ b/packages/onboarding/src/navigator/navigator-listener/index.tsx
@@ -2,7 +2,7 @@ import { __experimentalUseNavigator as useNavigator } from '@wordpress/component
 import { useEffect } from 'react';
 
 interface Props {
-	onNavigatorPathChange: ( path: string ) => void;
+	onNavigatorPathChange: ( path?: string ) => void;
 }
 
 const NavigatorListener = ( { onNavigatorPathChange }: Props ) => {
@@ -10,6 +10,7 @@ const NavigatorListener = ( { onNavigatorPathChange }: Props ) => {
 
 	useEffect( () => {
 		onNavigatorPathChange( location.path );
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ location ] );
 
 	return null;
diff --git a/packages/onboarding/src/navigator/navigator-screens/navigator-screens.tsx b/packages/onboarding/src/navigator/navigator-screens/navigator-screens.tsx
index 2062f1d818f3a..a7e278ac9d730 100644
--- a/packages/onboarding/src/navigator/navigator-screens/navigator-screens.tsx
+++ b/packages/onboarding/src/navigator/navigator-screens/navigator-screens.tsx
@@ -11,7 +11,7 @@ interface Props {
 	children: JSX.Element;
 	screens: NavigatorScreenObject[];
 	initialPath?: string;
-	onNavigatorPathChange?: ( path: string ) => void;
+	onNavigatorPathChange?: ( path?: string ) => void;
 }
 
 const NavigatorScreens = ( {
diff --git a/packages/onboarding/src/wp-components-types.d.ts b/packages/onboarding/src/wp-components-types.d.ts
deleted file mode 100644
index dd89735ad3cdc..0000000000000
--- a/packages/onboarding/src/wp-components-types.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import '@wordpress/components';
-
-declare module '@wordpress/components' {
-	interface Props {
-		[ key: string ]: unknown;
-	}
-
-	export const __experimentalDivider: React.ComponentType< Props >;
-	export const __experimentalHStack: React.ComponentType< Props >;
-	export const __experimentalVStack: React.ComponentType< Props >;
-	export const __experimentalItem: React.ComponentType< Props >;
-	export const __experimentalItemGroup: React.ComponentType< Props >;
-	export const __experimentalNavigatorBackButton: React.ComponentType< Props >;
-	export const __experimentalNavigatorButton: React.ComponentType< Props >;
-	export const __experimentalNavigatorProvider: React.ComponentType< Props >;
-	export const __experimentalNavigatorScreen: React.ComponentType< Props >;
-
-	interface NavigatorLocation {
-		path: string;
-		isInitial: boolean;
-		isBack: boolean;
-	}
-
-	export const __experimentalUseNavigator: () => {
-		location: NavigatorLocation;
-		goTo: ( path: string ) => void;
-		goBack: () => void;
-	};
-}
diff --git a/packages/page-pattern-modal/package.json b/packages/page-pattern-modal/package.json
index 7d33a54f3d462..068e77084e2f4 100644
--- a/packages/page-pattern-modal/package.json
+++ b/packages/page-pattern-modal/package.json
@@ -29,12 +29,12 @@
 	"dependencies": {
 		"@automattic/onboarding": "workspace:^",
 		"@automattic/typography": "workspace:^",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
+		"@wordpress/block-editor": "^12.3.0",
+		"@wordpress/blocks": "^12.12.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
 		"classnames": "^2.3.1",
 		"debug": "^4.3.3",
 		"lodash": "^4.17.21"
@@ -49,7 +49,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"redux": "^4.1.2"
 	},
diff --git a/packages/page-pattern-modal/src/components/page-pattern-modal.tsx b/packages/page-pattern-modal/src/components/page-pattern-modal.tsx
index f7fb9399e7521..391696d679f79 100644
--- a/packages/page-pattern-modal/src/components/page-pattern-modal.tsx
+++ b/packages/page-pattern-modal/src/components/page-pattern-modal.tsx
@@ -12,7 +12,6 @@ import replacePlaceholders from '../utils/replace-placeholders';
 import { trackDismiss, trackSelection, trackView } from '../utils/tracking';
 import PatternSelectorControl from './pattern-selector-control';
 import type { PatternCategory, PatternDefinition, FormattedPattern } from '../pattern-definition';
-import type { KeyboardEvent, MouseEvent, FocusEvent } from 'react';
 
 interface PagePatternModalProps {
 	areTipsEnabled?: boolean;
@@ -33,8 +32,6 @@ interface PagePatternModalState {
 	selectedCategory: string | null;
 }
 
-type CloseModalEvent = KeyboardEvent | MouseEvent | FocusEvent;
-
 class PagePatternModal extends Component< PagePatternModalProps, PagePatternModalState > {
 	constructor( props: PagePatternModalProps ) {
 		super( props );
@@ -168,7 +165,9 @@ class PagePatternModal extends Component< PagePatternModalProps, PagePatternModa
 		this.setState( { selectedCategory } );
 	};
 
-	closeModal = ( event: CloseModalEvent ) => {
+	closeModal = (
+		event?: React.KeyboardEvent< HTMLDivElement > | React.SyntheticEvent< Element, Event >
+	) => {
 		// As of Gutenberg 13.1, the editor will auto-focus on the title block
 		// automatically. See: https://github.com/WordPress/gutenberg/pull/40195.
 		// This ends up triggering a `blur` event on the Modal that causes it
@@ -180,7 +179,7 @@ class PagePatternModal extends Component< PagePatternModalProps, PagePatternModa
 		// check what element triggered the `blur` (which doesn't work when the
 		// theme is block-based, as the title block DOM element is not directly
 		// accessible as it's inside the `editor-canvas` iframe).
-		if ( event.type === 'blur' ) {
+		if ( event?.type === 'blur' ) {
 			event.stopPropagation();
 			return;
 		}
@@ -354,7 +353,7 @@ class PagePatternModal extends Component< PagePatternModalProps, PagePatternModa
 						</p>
 						<div className="page-pattern-modal__button-container">
 							<Button
-								isSecondary
+								variant="secondary"
 								onClick={ () => this.setPattern( 'blank' ) }
 								className="page-pattern-modal__blank-button"
 							>
diff --git a/packages/page-pattern-modal/src/patch-component-types.d.ts b/packages/page-pattern-modal/src/patch-component-types.d.ts
deleted file mode 100644
index 4f9ca5bf6dca8..0000000000000
--- a/packages/page-pattern-modal/src/patch-component-types.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module '@wordpress/components' {
-	export const VisuallyHidden: React.ComponentType< React.ComponentPropsWithRef< any > >;
-}
-
-export {};
diff --git a/packages/plans-grid/package.json b/packages/plans-grid/package.json
index 0ba7bad392163..c5cc934e5e596 100644
--- a/packages/plans-grid/package.json
+++ b/packages/plans-grid/package.json
@@ -32,22 +32,22 @@
 		"@automattic/data-stores": "workspace:^",
 		"@automattic/i18n-utils": "workspace:^",
 		"@automattic/onboarding": "workspace:^",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"tslib": "^2.3.0"
 	},
 	"devDependencies": {
 		"@automattic/calypso-typescript-config": "workspace:^",
 		"@automattic/typography": "workspace:^",
-		"@wordpress/base-styles": "^4.14.0",
+		"@wordpress/base-styles": "^4.27.0",
 		"prop-types": "^15.7.2",
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"@wordpress/element": "^5.0.0",
 		"@wordpress/i18n": "^4.22.0",
 		"react": "^18.2.0",
diff --git a/packages/plans-grid/src/plans-feature-list/index.tsx b/packages/plans-grid/src/plans-feature-list/index.tsx
index d2354825928bc..c81171dcfeee4 100644
--- a/packages/plans-grid/src/plans-feature-list/index.tsx
+++ b/packages/plans-grid/src/plans-feature-list/index.tsx
@@ -6,8 +6,6 @@ import classnames from 'classnames';
 import * as React from 'react';
 import type { DomainSuggestions, Plans } from '@automattic/data-stores';
 
-import '../types-patch';
-
 import './style.scss';
 
 interface FeatureListItemContentWrapperProps {
@@ -210,7 +208,7 @@ const PlansFeatureList: React.FunctionComponent< PlansFeatureListProps > = ( {
 				<Button
 					className={ classnames( domainFeatureItem.wrapperClassName, className ) }
 					onClick={ onPickDomain }
-					isLink
+					variant="link"
 				>
 					{ children }
 				</Button>
diff --git a/packages/plans-grid/src/plans-table/plan-item.tsx b/packages/plans-grid/src/plans-table/plan-item.tsx
index babd0f95872b3..14442d047288f 100644
--- a/packages/plans-grid/src/plans-table/plan-item.tsx
+++ b/packages/plans-grid/src/plans-table/plan-item.tsx
@@ -12,9 +12,6 @@ import { PLANS_STORE } from '../stores';
 import type { CTAVariation, PopularBadgeVariation } from './types';
 import type { DomainSuggestions, Plans, PlansSelect } from '@automattic/data-stores';
 
-// TODO: remove when all needed core types are available
-/*#__PURE__*/ import '../types-patch';
-
 const TickIcon = <Icon icon={ check } size={ 17 } />;
 
 const ChevronDown = (
@@ -205,7 +202,7 @@ const PlanItem: React.FunctionComponent< Props > = ( {
 									onClick={ () => {
 										onSelect( planProduct?.productId );
 									} }
-									isPrimary
+									variant="primary"
 									disabled={ !! disabledLabel }
 								>
 									<span>{ disabledLabel ?? normalCtaLabelFallback }</span>
@@ -219,7 +216,7 @@ const PlanItem: React.FunctionComponent< Props > = ( {
 									onClick={ () => {
 										onSelect( planProduct?.productId );
 									} }
-									isPrimary={ isPopular }
+									variant={ isPopular ? 'primary' : undefined }
 									disabled={ !! disabledLabel }
 								>
 									<span>
@@ -256,7 +253,11 @@ const PlanItem: React.FunctionComponent< Props > = ( {
 			</div>
 
 			{ isPopular && ! isDesktop && (
-				<Button onClick={ onToggleExpandAll } className="plan-item__mobile-expand-all-plans" isLink>
+				<Button
+					onClick={ onToggleExpandAll }
+					className="plan-item__mobile-expand-all-plans"
+					variant="link"
+				>
 					{ allPlansExpanded ? expandToggleLabelExpanded : expandToggleLabelCollapsed }
 				</Button>
 			) }
diff --git a/packages/plans-grid/src/types-patch.ts b/packages/plans-grid/src/types-patch.ts
deleted file mode 100644
index d2b8181b6a1b3..0000000000000
--- a/packages/plans-grid/src/types-patch.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare module '@wordpress/compose' {
-	type breakpoint = 'huge' | 'wide' | 'large' | 'medium' | 'small' | 'mobile';
-	type operator = '>=' | '<';
-	export function useViewportMatch( viewport: breakpoint, operator?: operator ): boolean;
-}
-
-export {};
diff --git a/packages/search/package.json b/packages/search/package.json
index aba52b1125410..6ff5bfbc64d18 100644
--- a/packages/search/package.json
+++ b/packages/search/package.json
@@ -29,11 +29,11 @@
 	"dependencies": {
 		"@automattic/typography": "workspace:^",
 		"@babel/runtime": "^7.17.2",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"fuse.js": "^6.6.2",
 		"lodash": "^4.17.21",
@@ -55,8 +55,8 @@
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/is-shallow-equal": "^4.23.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"typescript": "^4.7.4",
diff --git a/packages/search/src/types.d.ts b/packages/search/src/types.d.ts
index c60aabf14ffde..e4d38b2ca9e4e 100644
--- a/packages/search/src/types.d.ts
+++ b/packages/search/src/types.d.ts
@@ -1,7 +1 @@
 declare const __i18n_text_domain__: string;
-
-declare module '@wordpress/compose' {
-	function useInstanceId( object: any, prefix: string ): string;
-
-	export { useInstanceId };
-}
diff --git a/packages/site-picker/package.json b/packages/site-picker/package.json
index 3b009dc27a846..e8aa12142d3e4 100644
--- a/packages/site-picker/package.json
+++ b/packages/site-picker/package.json
@@ -24,13 +24,13 @@
 	"bugs": "https://github.com/Automattic/wp-calypso/issues",
 	"dependencies": {
 		"@automattic/tour-kit": "workspace:^",
-		"@wordpress/dom": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
+		"@wordpress/dom": "^3.36.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
 		"classnames": "^2.3.1"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/sites/package.json b/packages/sites/package.json
index 5e133809e3ad6..474fb02440330 100644
--- a/packages/sites/package.json
+++ b/packages/sites/package.json
@@ -23,7 +23,7 @@
 	},
 	"bugs": "https://github.com/Automattic/wp-calypso/issues",
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/social-previews/package.json b/packages/social-previews/package.json
index a233ba7776f0d..43c2496602e8b 100644
--- a/packages/social-previews/package.json
+++ b/packages/social-previews/package.json
@@ -41,9 +41,9 @@
 	},
 	"dependencies": {
 		"@emotion/react": "^11.4.1",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.22.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
 		"classnames": "^2.3.1",
 		"prop-types": "^15.7.2",
 		"tslib": "^2.3.0"
@@ -53,7 +53,6 @@
 		"@automattic/calypso-typescript-config": "workspace:^",
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^14.0.0",
-		"@types/wordpress__components": "^23.0.1",
 		"postcss": "^8.4.5",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
diff --git a/packages/state-utils/package.json b/packages/state-utils/package.json
index 8df9183628735..de67d55c48441 100644
--- a/packages/state-utils/package.json
+++ b/packages/state-utils/package.json
@@ -30,8 +30,8 @@
 		"watch": "tsc --build ./tsconfig.json --watch"
 	},
 	"dependencies": {
-		"@wordpress/is-shallow-equal": "^4.23.0",
-		"@wordpress/warning": "^2.23.0",
+		"@wordpress/is-shallow-equal": "^4.36.0",
+		"@wordpress/warning": "^2.36.0",
 		"lodash": "^4.17.21",
 		"redux": "^4.2.1",
 		"redux-thunk": "^2.4.2",
diff --git a/packages/subscriber/package.json b/packages/subscriber/package.json
index 68050e30bfc43..f2aeaeeeebba0 100644
--- a/packages/subscriber/package.json
+++ b/packages/subscriber/package.json
@@ -34,14 +34,14 @@
 		"@automattic/viewport": "workspace:^",
 		"@automattic/viewport-react": "workspace:^",
 		"@popperjs/core": "^2.10.2",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/dom": "^3.23.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/primitives": "^3.21.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/dom": "^3.36.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/primitives": "^3.34.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"debug": "^4.3.4",
 		"react-popper": "^2.3.0"
@@ -52,7 +52,7 @@
 		"typescript": "^4.5.5"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/subscriber/src/components/add-form/index.tsx b/packages/subscriber/src/components/add-form/index.tsx
index c06bb6b596213..e1c6c567a2334 100644
--- a/packages/subscriber/src/components/add-form/index.tsx
+++ b/packages/subscriber/src/components/add-form/index.tsx
@@ -368,13 +368,15 @@ export const AddSubscriberForm: FunctionComponent< Props > = ( props ) => {
 							submitBtnName
 						),
 						{
-							Button: createElement( Button, {
-								isLink: true,
-								target: '_blank',
-								href: localizeUrl(
-									'https://wordpress.com/support/launch-a-newsletter/import-subscribers-to-a-newsletter/'
-								),
-							} ),
+							Button: (
+								<Button
+									variant="link"
+									target="_blank"
+									href={ localizeUrl(
+										'https://wordpress.com/support/launch-a-newsletter/import-subscribers-to-a-newsletter/'
+									) }
+								/>
+							),
 						}
 					) }
 				</p>
@@ -389,14 +391,16 @@ export const AddSubscriberForm: FunctionComponent< Props > = ( props ) => {
 
 		const interpolateElement = {
 			uploadBtn: formFileUploadElement,
-			Button: createElement( Button, {
-				isLink: true,
-				target: '_blank',
-				rel: 'noreferrer',
-				href: localizeUrl(
-					'https://wordpress.com/support/launch-a-newsletter/import-subscribers-to-a-newsletter/'
-				),
-			} ),
+			Button: (
+				<Button
+					variant="link"
+					target="_blank"
+					rel="noreferrer"
+					href={ localizeUrl(
+						'https://wordpress.com/support/launch-a-newsletter/import-subscribers-to-a-newsletter/'
+					) }
+				/>
+			),
 		};
 
 		const labelText = isSiteOnFreePlan
@@ -439,10 +443,7 @@ export const AddSubscriberForm: FunctionComponent< Props > = ( props ) => {
 						{
 							strong: createElement( 'strong' ),
 							uploadBtn: formFileUploadElement,
-							removeBtn: createElement( Button, {
-								isLink: true,
-								onClick: onFileRemoveClick,
-							} ),
+							removeBtn: <Button variant="link" onClick={ onFileRemoveClick } />,
 						}
 					) }
 				</label>
diff --git a/packages/tour-kit/package.json b/packages/tour-kit/package.json
index 93ac3a5f6a8e3..0c583f17f1ca4 100644
--- a/packages/tour-kit/package.json
+++ b/packages/tour-kit/package.json
@@ -34,14 +34,14 @@
 		"@automattic/viewport": "workspace:^",
 		"@automattic/viewport-react": "workspace:^",
 		"@popperjs/core": "^2.10.2",
-		"@wordpress/base-styles": "^4.14.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/dom": "^3.23.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/primitives": "^3.21.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/base-styles": "^4.27.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/dom": "^3.36.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/icons": "^9.26.0",
+		"@wordpress/primitives": "^3.34.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"debug": "^4.3.4",
 		"react-popper": "^2.3.0"
@@ -55,7 +55,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx
index 7e828cded4210..2dbf9e9e9f3e2 100644
--- a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx
+++ b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx
@@ -27,12 +27,12 @@ const WpcomTourKitStepCardNavigation: React.FunctionComponent< Props > = ( {
 			>
 				{ isFirstStep ? (
 					<div>
-						<Button isTertiary onClick={ onDismiss( 'no-thanks-btn' ) }>
+						<Button variant="tertiary" onClick={ onDismiss( 'no-thanks-btn' ) }>
 							{ __( 'Skip', __i18n_text_domain__ ) }
 						</Button>
 						<Button
 							className="wpcom-tour-kit-step-card-navigation__next-btn"
-							isPrimary
+							variant="primary"
 							onClick={ onNextStep }
 							ref={ setInitialFocusedElement }
 						>
@@ -41,12 +41,12 @@ const WpcomTourKitStepCardNavigation: React.FunctionComponent< Props > = ( {
 					</div>
 				) : (
 					<div>
-						<Button isTertiary onClick={ onPreviousStep }>
+						<Button variant="tertiary" onClick={ onPreviousStep }>
 							{ __( 'Back', __i18n_text_domain__ ) }
 						</Button>
 						<Button
 							className="wpcom-tour-kit-step-card-navigation__next-btn"
-							isPrimary
+							variant="primary"
 							onClick={ onNextStep }
 							ref={ setInitialFocusedElement }
 						>
diff --git a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx
index 20cdd91fea394..93d0af8b9ff49 100644
--- a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx
+++ b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx
@@ -20,7 +20,7 @@ const WpcomTourKitStepCardOverlayControls: React.FunctionComponent< Props > = (
 			<Flex>
 				<Button
 					label={ __( 'Minimize Tour', __i18n_text_domain__ ) }
-					isPrimary
+					variant="primary"
 					className="wpcom-tour-kit-step-card-overlay-controls__minimize-icon"
 					icon={ minimize }
 					iconSize={ 24 }
@@ -28,7 +28,7 @@ const WpcomTourKitStepCardOverlayControls: React.FunctionComponent< Props > = (
 				></Button>
 				<Button
 					label={ __( 'Close Tour', __i18n_text_domain__ ) }
-					isPrimary
+					variant="primary"
 					icon={ close }
 					iconSize={ 24 }
 					onClick={ onDismiss( 'close-btn' ) }
diff --git a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card.tsx b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card.tsx
index 4869395231c79..0c5b90c58f851 100644
--- a/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card.tsx
+++ b/packages/tour-kit/src/variants/wpcom/components/wpcom-tour-kit-step-card.tsx
@@ -81,7 +81,7 @@ const WpcomTourKitStepCard: React.FunctionComponent< WpcomTourStepRendererProps
 					{ isLastStep ? (
 						<Button
 							className="wpcom-tour-kit-step-card__description"
-							isTertiary
+							variant="tertiary"
 							onClick={ () => onGoToStep( 0 ) }
 							ref={ setInitialFocusedElement }
 						>
diff --git a/packages/viewport-react/package.json b/packages/viewport-react/package.json
index f5f3b59b0db5a..0fa87dfd83a09 100644
--- a/packages/viewport-react/package.json
+++ b/packages/viewport-react/package.json
@@ -18,7 +18,7 @@
 	"homepage": "https://github.com/Automattic/wp-calypso/tree/HEAD/packages/viewport-react#readme",
 	"dependencies": {
 		"@automattic/viewport": "workspace:^",
-		"@wordpress/compose": "^6.0.0"
+		"@wordpress/compose": "^6.12.0"
 	},
 	"peerDependencies": {
 		"react": "^18.2.0",
diff --git a/packages/whats-new/package.json b/packages/whats-new/package.json
index ba964ddf84fb2..bafba48d380ff 100644
--- a/packages/whats-new/package.json
+++ b/packages/whats-new/package.json
@@ -41,17 +41,17 @@
 		"@automattic/i18n-utils": "workspace:^",
 		"@automattic/typography": "workspace:^",
 		"@tanstack/react-query": "^4.29.1",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/keycodes": "^3.23.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/components": "^25.1.0",
+		"@wordpress/element": "^5.13.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/keycodes": "^3.36.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"classnames": "^2.3.1",
 		"wpcom": "workspace:^",
 		"wpcom-proxy-request": "workspace:^"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"redux": "^4.1.2"
diff --git a/packages/whats-new/src/components/guide.tsx b/packages/whats-new/src/components/guide.tsx
index 7146da29223c2..c82833f81ef7b 100644
--- a/packages/whats-new/src/components/guide.tsx
+++ b/packages/whats-new/src/components/guide.tsx
@@ -69,7 +69,7 @@ const Guide: React.FC< Props > = ( { children, className, onFinish } ) => {
 						>
 							<div className="guide__buttons">
 								{ currentPage > 0 && (
-									<Button className="guide__back-button" isTertiary onClick={ goBack }>
+									<Button className="guide__back-button" variant="tertiary" onClick={ goBack }>
 										{ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ }
 										{ /* @ts-ignore This is declared as a global variable and provided by webpack. */ }
 										{ __( 'Back', __i18n_text_domain__ ) }
@@ -78,7 +78,7 @@ const Guide: React.FC< Props > = ( { children, className, onFinish } ) => {
 								<Button
 									className="guide__forward-button"
 									autoFocus={ currentPage === 0 } // eslint-disable-line jsx-a11y/no-autofocus
-									isPrimary
+									variant="primary"
 									onClick={ goForward }
 								>
 									{ canGoForward ? __( 'Next' ) : __( 'Done' ) }
diff --git a/packages/whats-new/src/whats-new-page.tsx b/packages/whats-new/src/whats-new-page.tsx
index 61e29f6b707fb..c2f3ff9c1c418 100644
--- a/packages/whats-new/src/whats-new-page.tsx
+++ b/packages/whats-new/src/whats-new-page.tsx
@@ -37,13 +37,7 @@ const WhatsNewPage: React.FC< Props > = ( {
 					{ /* eslint-disable-next-line react/no-danger */ }
 					{ description && <p dangerouslySetInnerHTML={ { __html: description } } /> }
 					{ link && (
-						<Button
-							className="whats-new-page__link"
-							href={ link }
-							isTertiary
-							isLink
-							target="_blank"
-						>
+						<Button className="whats-new-page__link" href={ link } variant="link" target="_blank">
 							{ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ }
 							{ /* @ts-ignore This is declared as a global variable and provided by webpack. */ }
 							{ __( 'Learn more', __i18n_text_domain__ ) }
diff --git a/packages/whats-new/types.d.ts b/packages/whats-new/types.d.ts
index ef0588f8f2940..b46b9e8c7a56b 100644
--- a/packages/whats-new/types.d.ts
+++ b/packages/whats-new/types.d.ts
@@ -1,26 +1,8 @@
-declare module '@wordpress/notices' {
-	export type Status = 'error' | 'info' | 'success' | 'warning';
-	export const store: string;
+// TODO: Attempt removing after https://github.com/Automattic/wp-calypso/pull/78711
+// Fixed node_modules/@wordpress/components/build-types/dropdown-menu/types.d.ts(43,24): error TS2339: Property 'role' does not exist on type 'HTMLElement'.
+interface HTMLElement {
+	role: string;
 }
-
-declare module '@wordpress/rich-text' {
-	interface Format {
-		type: string;
-		attributes?: Record< string, string > | undefined;
-		unregisteredAttributes?: Record< string, string > | undefined;
-		object?: boolean | undefined;
-	}
-
-	export interface Value {
-		activeFormats?: readonly Format[] | undefined;
-		end?: number | undefined;
-		formats: ReadonlyArray< Format[] | undefined >;
-		replacements: ReadonlyArray< Format[] | undefined >;
-		start?: number | undefined;
-		text: string;
-	}
-}
-
 declare module '@automattic/whats-new' {
 	type FunctionProps = {
 		onClose: () => void;
diff --git a/packages/wpcom-checkout/package.json b/packages/wpcom-checkout/package.json
index 1c721f4639652..1807def685f3d 100644
--- a/packages/wpcom-checkout/package.json
+++ b/packages/wpcom-checkout/package.json
@@ -42,10 +42,10 @@
 		"@automattic/shopping-cart": "workspace:^",
 		"@emotion/styled": "^11.3.0",
 		"@stripe/stripe-js": "^1.53.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/react-i18n": "^3.21.0",
+		"@wordpress/compose": "^6.12.0",
+		"@wordpress/data": "^9.5.0",
+		"@wordpress/i18n": "^4.36.0",
+		"@wordpress/react-i18n": "^3.33.0",
 		"debug": "^4.3.3",
 		"i18n-calypso": "workspace:^",
 		"prop-types": "^15.7.2"
diff --git a/packages/wpcom-template-parts/package.json b/packages/wpcom-template-parts/package.json
index 129dee449ed07..6073f8a12c077 100644
--- a/packages/wpcom-template-parts/package.json
+++ b/packages/wpcom-template-parts/package.json
@@ -32,7 +32,7 @@
 	"dependencies": {
 		"@automattic/components": "workspace:^",
 		"@automattic/i18n-utils": "workspace:^",
-		"@wordpress/url": "^3.24.0",
+		"@wordpress/url": "^3.37.0",
 		"i18n-calypso": "workspace:^",
 		"social-logos": "^2.5.2"
 	},
@@ -42,7 +42,7 @@
 		"typescript": "^4.7.4"
 	},
 	"peerDependencies": {
-		"@wordpress/data": "^8.0.0",
+		"@wordpress/data": "^9.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	}
diff --git a/yarn.lock b/yarn.lock
index 8e3d83eeb07fa..e8500eea35fc6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -106,7 +106,7 @@ __metadata:
     "@automattic/webpack-inline-constant-exports-plugin": "workspace:^"
     "@automattic/wp-babel-makepot": "workspace:^"
     "@tanstack/react-query": ^4.29.1
-    "@wordpress/dependency-extraction-webpack-plugin": ^4.5.0
+    "@wordpress/dependency-extraction-webpack-plugin": ^4.19.0
     autoprefixer: ^10.2.5
     calypso: "workspace:^"
     classnames: ^2.3.1
@@ -138,10 +138,10 @@ __metadata:
   resolution: "@automattic/block-renderer@workspace:packages/block-renderer"
   dependencies:
     "@automattic/calypso-typescript-config": "workspace:^"
+    "@automattic/global-styles": "workspace:^"
     "@tanstack/react-query": ^4.29.1
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/edit-site": ^5.0.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/compose": ^6.12.0
     classnames: ^2.3.1
     react: ^18.2.0
     react-dom: ^18.2.0
@@ -150,7 +150,7 @@ __metadata:
     utility-types: ^3.10.0
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -222,7 +222,7 @@ __metadata:
     "@babel/register": ^7.17.0
     "@babel/runtime": ^7.17.2
     "@emotion/babel-plugin": ^11.3.0
-    "@wordpress/babel-plugin-import-jsx-pragma": ^4.6.0
+    "@wordpress/babel-plugin-import-jsx-pragma": ^4.19.0
     babel-plugin-dynamic-import-node: ^2.3.3
     babel-plugin-transform-react-remove-prop-types: ^0.4.24
   languageName: unknown
@@ -239,8 +239,8 @@ __metadata:
     "@babel/compat-data": ^7.17.0
     "@babel/core": ^7.17.5
     "@types/webpack-env": ^1.16.3
-    "@wordpress/browserslist-config": ^5.6.0
-    "@wordpress/dependency-extraction-webpack-plugin": ^4.6.0
+    "@wordpress/browserslist-config": ^5.19.0
+    "@wordpress/dependency-extraction-webpack-plugin": ^4.19.0
     autoprefixer: ^10.2.5
     babel-loader: ^8.2.3
     browserslist: ^4.8.2
@@ -321,7 +321,7 @@ __metadata:
     "@types/node": ^18.11.18
     "@types/node-fetch": ^2.6.1
     "@types/totp-generator": ^0.0.3
-    "@wordpress/i18n": ^4.23.0
+    "@wordpress/i18n": ^4.36.0
     asana-phrase: ^0.0.8
     form-data: ^4.0.0
     jest-docblock: ^29.4.3
@@ -484,10 +484,10 @@ __metadata:
     "@testing-library/react-hooks": 7.0.2
     "@types/canvas-confetti": ^1.6.0
     "@types/react-slider": ^1.3.1
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/react-i18n": ^3.35.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/react-i18n": ^3.33.0
     canvas-confetti: ^1.6.0
     classnames: ^2.3.1
     framer-motion: 6.2.8
@@ -502,7 +502,7 @@ __metadata:
     typescript: ^4.7.4
     utility-types: ^3.10.0
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
   languageName: unknown
@@ -523,8 +523,8 @@ __metadata:
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
     "@testing-library/user-event": ^14.4.3
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
     debug: ^4.3.3
     prop-types: ^15.7.2
     react: ^18.2.0
@@ -558,10 +558,10 @@ __metadata:
     "@remix-run/router": ^1.5.0
     "@tanstack/react-query": ^4.29.1
     "@types/validator": ^13.7.1
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/data-controls": ^2.23.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/api-fetch": ^6.33.0
+    "@wordpress/data-controls": ^3.4.0
+    "@wordpress/deprecated": ^3.36.0
+    "@wordpress/url": ^3.37.0
     fast-json-stable-stringify: ^2.1.0
     i18n-calypso: "workspace:^"
     jest-fetch-mock: ^3.0.3
@@ -577,7 +577,7 @@ __metadata:
     wait-for-expect: ^3.0.2
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
   languageName: unknown
@@ -605,7 +605,7 @@ __metadata:
     webpack: ^5.68.0
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -631,9 +631,9 @@ __metadata:
     "@tanstack/react-query": ^4.29.1
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/react-i18n": ^3.21.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/react-i18n": ^3.33.0
+    "@wordpress/url": ^3.37.0
     classnames: ^2.3.1
     jest: ^29.6.1
     postcss: ^8.4.5
@@ -646,7 +646,7 @@ __metadata:
     utility-types: ^3.10.0
     webpack: ^5.68.0
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -668,17 +668,17 @@ __metadata:
     "@automattic/onboarding": "workspace:^"
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/html-entities": ^3.37.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/html-entities": ^3.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     react: ^18.2.0
     react-dom: ^18.2.0
     tslib: ^2.3.0
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -701,11 +701,11 @@ __metadata:
     "@automattic/typography": "workspace:^"
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     lodash: ^4.17.21
     react: ^18.2.0
@@ -715,7 +715,7 @@ __metadata:
     use-debounce: ^3.1.0
     uuid: ^8.3.2
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     react: ^18.2.0
@@ -743,7 +743,7 @@ __metadata:
   dependencies:
     "@automattic/calypso-eslint-overrides": "workspace:^"
     "@automattic/calypso-typescript-config": "workspace:^"
-    "@wordpress/npm-package-json-lint-config": ^4.8.0
+    "@wordpress/npm-package-json-lint-config": ^4.21.0
     eslint-plugin-json-es: ^1.5.7
     esquery: ^1.4.0
     npm-package-json-lint: ^5.4.2
@@ -806,14 +806,17 @@ __metadata:
     "@automattic/components": "workspace:^"
     "@automattic/data-stores": "workspace:^"
     "@tanstack/react-query": ^4.29.1
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/block-library": ^8.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/edit-site": ^5.0.0
-    "@wordpress/keycodes": ^3.23.0
+    "@types/wordpress__block-library": ^2.6.1
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/block-library": ^8.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/keycodes": ^3.36.0
+    "@wordpress/private-apis": ^0.18.0
     classnames: ^2.3.1
+    deepmerge: ^4.3.0
     i18n-calypso: "workspace:^"
+    is-plain-object: ^5.0.0
     react: ^18.2.0
     react-dom: ^18.2.0
     react-intersection-observer: ^9.4.3
@@ -821,7 +824,7 @@ __metadata:
     typescript: ^4.7.4
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -845,18 +848,18 @@ __metadata:
     "@storybook/cli": ^7.0.18
     "@storybook/react": ^7.0.18
     "@tanstack/react-query": ^4.29.1
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/primitives": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/primitives": ^3.34.0
     classnames: ^2.3.1
     react: ^18.2.0
     react-dom: ^18.2.0
     react-draggable: ^4.4.4
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     react: ^18.2.0
     react-dom: ^18.2.0
@@ -875,8 +878,8 @@ __metadata:
     "@testing-library/react": ^14.0.0
     "@testing-library/react-hooks": 7.0.2
     "@types/react": ^18.2.6
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/i18n": ^4.23.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/i18n": ^4.36.0
     react: ^18.2.0
     react-dom: ^18.2.0
     react-test-renderer: ^18.2.0
@@ -930,13 +933,13 @@ __metadata:
     "@automattic/languages": "workspace:^"
     "@automattic/search": "workspace:^"
     "@babel/runtime": ^7.17.2
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -991,7 +994,7 @@ __metadata:
     webpack: ^5.68.0
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     debug: ^4.3.3
@@ -1032,8 +1035,8 @@ __metadata:
     "@emotion/styled": ^11.3.0
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
     debug: ^4.3.3
     react: ^18.2.0
     react-dom: ^18.2.0
@@ -1103,20 +1106,20 @@ __metadata:
     "@automattic/calypso-apps-builder": "workspace:^"
     "@automattic/calypso-build": "workspace:^"
     "@automattic/calypso-eslint-overrides": "workspace:^"
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/editor": ^13.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/readable-js-assets-webpack-plugin": ^2.6.0
+    "@wordpress/api-fetch": ^6.33.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/editor": ^13.12.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/hooks": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/primitives": ^3.34.0
+    "@wordpress/readable-js-assets-webpack-plugin": ^2.19.0
     classnames: ^2.3.1
     lodash: ^4.17.21
     moment: ^2.26.0
@@ -1149,10 +1152,10 @@ __metadata:
     "@babel/core": ^7.17.5
     "@size-limit/file": ^8.2.4
     "@tanstack/react-query": 4.29.1
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/dependency-extraction-webpack-plugin": ^4.6.0
-    "@wordpress/icons": ^9.14.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/dependency-extraction-webpack-plugin": ^4.19.0
+    "@wordpress/icons": ^9.26.0
     autoprefixer: ^10.2.5
     babel-jest: ^29.6.1
     calypso: "workspace:^"
@@ -1190,11 +1193,11 @@ __metadata:
     "@automattic/data-stores": "workspace:^"
     "@automattic/typography": "workspace:^"
     "@testing-library/react": ^14.0.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     copyfiles: ^2.3.0
     css-loader: ^3.6.0
@@ -1222,12 +1225,12 @@ __metadata:
     "@automattic/onboarding": "workspace:^"
     "@automattic/typography": "workspace:^"
     "@testing-library/react": ^14.0.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
     classnames: ^2.3.1
     debug: ^4.3.3
     jest: ^29.6.1
@@ -1237,7 +1240,7 @@ __metadata:
     resize-observer-polyfill: 1.5.1
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     redux: ^4.1.2
   languageName: unknown
@@ -1252,17 +1255,17 @@ __metadata:
     "@automattic/i18n-utils": "workspace:^"
     "@automattic/onboarding": "workspace:^"
     "@automattic/typography": "workspace:^"
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     prop-types: ^15.7.2
     tslib: ^2.3.0
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     "@wordpress/element": ^5.0.0
     "@wordpress/i18n": ^4.22.0
     react: ^18.2.0
@@ -1345,13 +1348,13 @@ __metadata:
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
     "@testing-library/user-event": ^14.4.3
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     fuse.js: ^6.6.2
     lodash: ^4.17.21
@@ -1390,13 +1393,13 @@ __metadata:
     "@automattic/tour-kit": "workspace:^"
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
+    "@wordpress/dom": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
     classnames: ^2.3.1
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -1412,7 +1415,7 @@ __metadata:
     "@testing-library/react": ^14.0.0
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -1428,10 +1431,9 @@ __metadata:
     "@emotion/react": ^11.4.1
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@types/wordpress__components": ^23.0.1
-    "@wordpress/components": ^23.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.22.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
     classnames: ^2.3.1
     postcss: ^8.4.5
     prop-types: ^15.7.2
@@ -1455,8 +1457,8 @@ __metadata:
   resolution: "@automattic/state-utils@workspace:packages/state-utils"
   dependencies:
     "@automattic/calypso-typescript-config": "workspace:^"
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/warning": ^2.23.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/warning": ^2.36.0
     lodash: ^4.17.21
     redux: ^4.2.1
     redux-thunk: ^2.4.2
@@ -1476,20 +1478,20 @@ __metadata:
     "@automattic/viewport": "workspace:^"
     "@automattic/viewport-react": "workspace:^"
     "@popperjs/core": ^2.10.2
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/dom": ^3.36.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/primitives": ^3.34.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     debug: ^4.3.4
     react-popper: ^2.3.0
     typescript: ^4.5.5
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -1509,20 +1511,20 @@ __metadata:
     "@popperjs/core": ^2.10.2
     "@storybook/cli": ^7.0.18
     "@storybook/react": ^7.0.18
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/dom": ^3.36.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/primitives": ^3.34.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     debug: ^4.3.4
     react-popper: ^2.3.0
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -1553,7 +1555,7 @@ __metadata:
   dependencies:
     "@automattic/calypso-typescript-config": "workspace:^"
     "@automattic/viewport": "workspace:^"
-    "@wordpress/compose": ^6.0.0
+    "@wordpress/compose": ^6.12.0
   peerDependencies:
     react: ^18.2.0
     react-dom: ^18.2.0
@@ -1629,16 +1631,16 @@ __metadata:
     "@automattic/i18n-utils": "workspace:^"
     "@automattic/typography": "workspace:^"
     "@tanstack/react-query": ^4.29.1
-    "@wordpress/components": ^23.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/keycodes": ^3.36.0
+    "@wordpress/react-i18n": ^3.33.0
     classnames: ^2.3.1
     wpcom: "workspace:^"
     wpcom-proxy-request: "workspace:^"
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
     redux: ^4.1.2
@@ -1681,26 +1683,26 @@ __metadata:
     "@automattic/calypso-url": "workspace:^"
     "@automattic/typography": "workspace:^"
     "@babel/runtime": ^7.17.2
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/dependency-extraction-webpack-plugin": ^4.6.0
-    "@wordpress/dom-ready": ^3.23.0
-    "@wordpress/edit-post": ^7.0.0
-    "@wordpress/edit-site": ^5.0.0
-    "@wordpress/editor": ^13.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/plugins": ^5.0.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/api-fetch": ^6.33.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/dependency-extraction-webpack-plugin": ^4.19.0
+    "@wordpress/dom-ready": ^3.36.0
+    "@wordpress/edit-post": ^7.12.0
+    "@wordpress/edit-site": ^5.12.0
+    "@wordpress/editor": ^13.12.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/hooks": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/plugins": ^6.3.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/url": ^3.37.0
     debug: ^4.3.3
     lodash: ^4.17.21
     npm-run-all: ^4.1.5
@@ -1727,10 +1729,10 @@ __metadata:
     "@stripe/stripe-js": ^1.53.0
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
     debug: ^4.3.3
     i18n-calypso: "workspace:^"
     prop-types: ^15.7.2
@@ -1775,40 +1777,39 @@ __metadata:
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^14.0.0
     "@types/node": ^18.11.18
-    "@types/wordpress__plugins": ^3.0.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/data-controls": ^2.23.0
-    "@wordpress/date": ^4.23.0
-    "@wordpress/dependency-extraction-webpack-plugin": ^4.6.0
-    "@wordpress/dom-ready": ^3.23.0
-    "@wordpress/edit-post": ^7.0.0
-    "@wordpress/element": ^5.0.0
+    "@wordpress/a11y": ^3.36.0
+    "@wordpress/api-fetch": ^6.33.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/data-controls": ^3.4.0
+    "@wordpress/date": ^4.36.0
+    "@wordpress/dependency-extraction-webpack-plugin": ^4.19.0
+    "@wordpress/dom-ready": ^3.36.0
+    "@wordpress/edit-post": ^7.12.0
+    "@wordpress/element": ^5.13.0
     "@wordpress/env": ^8.3.0
-    "@wordpress/escape-html": ^2.23.0
-    "@wordpress/eslint-plugin": ^13.7.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/interface": ^5.0.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/notices": ^3.23.0
+    "@wordpress/escape-html": ^2.36.0
+    "@wordpress/eslint-plugin": ^14.8.0
+    "@wordpress/hooks": ^3.36.0
+    "@wordpress/html-entities": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/interface": ^5.12.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/keycodes": ^3.36.0
+    "@wordpress/notices": ^4.3.0
     "@wordpress/nux": ^6.0.0
-    "@wordpress/plugins": ^5.0.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/private-apis": ^0.9.0
-    "@wordpress/readable-js-assets-webpack-plugin": ^2.6.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/server-side-render": ^4.0.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/plugins": ^6.3.0
+    "@wordpress/primitives": ^3.34.0
+    "@wordpress/private-apis": ^0.18.0
+    "@wordpress/readable-js-assets-webpack-plugin": ^2.19.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/server-side-render": ^4.12.0
+    "@wordpress/url": ^3.37.0
     babel-jest: ^29.6.1
     calypso: "workspace:^"
     classnames: ^2.3.1
@@ -1846,12 +1847,12 @@ __metadata:
     "@automattic/components": "workspace:^"
     "@automattic/i18n-utils": "workspace:^"
     "@types/social-logos": ^2.3.1
-    "@wordpress/url": ^3.24.0
+    "@wordpress/url": ^3.37.0
     i18n-calypso: "workspace:^"
     social-logos: ^2.5.2
     typescript: ^4.7.4
   peerDependencies:
-    "@wordpress/data": ^8.0.0
+    "@wordpress/data": ^9.5.0
     react: ^18.2.0
     react-dom: ^18.2.0
   languageName: unknown
@@ -1921,25 +1922,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.1.6, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.16.0, @babel/core@npm:^7.17.5, @babel/core@npm:^7.20.2, @babel/core@npm:^7.7.5":
+"@babel/core@npm:^7.1.6, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.16.0, @babel/core@npm:^7.17.5, @babel/core@npm:^7.20.2, @babel/core@npm:^7.7.5":
   version: 7.22.8
   resolution: "@babel/core@npm:7.22.8"
   dependencies:
     "@ampproject/remapping": ^2.2.0
     "@babel/code-frame": ^7.22.5
-    "@babel/generator": ^7.22.7
-    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/generator": ^7.22.5
+    "@babel/helper-compilation-targets": ^7.22.5
     "@babel/helper-module-transforms": ^7.22.5
-    "@babel/helpers": ^7.22.6
-    "@babel/parser": ^7.22.7
+    "@babel/helpers": ^7.22.5
+    "@babel/parser": ^7.22.5
     "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.8
+    "@babel/traverse": ^7.22.5
     "@babel/types": ^7.22.5
-    "@nicolo-ribaudo/semver-v6": ^6.3.3
     convert-source-map: ^1.7.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.2
+    semver: ^6.3.0
   checksum: d506ac42eaf2f7c3c190cc91a1413bb9ae5c067e06268fa962cb5fd0e67fc0feb48c7fa51527da378e3cc3a92a13a3420bae877df89207d880c839b6bb73e662
   languageName: node
   linkType: hard
@@ -1981,7 +1982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.21.5, @babel/generator@npm:^7.22.7, @babel/generator@npm:^7.7.2":
+"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.21.5, @babel/generator@npm:^7.22.5, @babel/generator@npm:^7.22.7, @babel/generator@npm:^7.7.2":
   version: 7.22.7
   resolution: "@babel/generator@npm:7.22.7"
   dependencies:
@@ -2023,7 +2024,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.21.5, @babel/helper-compilation-targets@npm:^7.22.6":
+"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.21.5, @babel/helper-compilation-targets@npm:^7.22.5":
   version: 7.22.6
   resolution: "@babel/helper-compilation-targets@npm:7.22.6"
   dependencies:
@@ -2250,7 +2251,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.17.2, @babel/helpers@npm:^7.21.5, @babel/helpers@npm:^7.22.6":
+"@babel/helpers@npm:^7.17.2, @babel/helpers@npm:^7.21.5, @babel/helpers@npm:^7.22.5":
   version: 7.22.6
   resolution: "@babel/helpers@npm:7.22.6"
   dependencies:
@@ -3377,7 +3378,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.8.4":
+"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.8.4":
   version: 7.22.8
   resolution: "@babel/traverse@npm:7.22.8"
   dependencies:
@@ -3775,17 +3776,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.20.1":
-  version: 0.20.1
-  resolution: "@es-joy/jsdoccomment@npm:0.20.1"
-  dependencies:
-    comment-parser: 1.3.0
-    esquery: ^1.4.0
-    jsdoc-type-pratt-parser: ~2.2.3
-  checksum: 1a4c53129e4a509714b8d92f094abafa022915678384897559827884e4b1df2b5043d681cb4819959e8ba9ec91143fd0e80011b86962e8424e4bf02c989f0eaa
-  languageName: node
-  linkType: hard
-
 "@es-joy/jsdoccomment@npm:~0.36.1":
   version: 0.36.1
   resolution: "@es-joy/jsdoccomment@npm:0.36.1"
@@ -3951,6 +3941,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint-community/eslint-utils@npm:^4.2.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: 7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^1.4.1":
   version: 1.4.1
   resolution: "@eslint/eslintrc@npm:1.4.1"
@@ -3982,24 +3983,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/dom@npm:^1.2.1":
-  version: 1.4.1
-  resolution: "@floating-ui/dom@npm:1.4.1"
+"@floating-ui/dom@npm:^1.0.0, @floating-ui/dom@npm:^1.3.0":
+  version: 1.4.2
+  resolution: "@floating-ui/dom@npm:1.4.2"
   dependencies:
     "@floating-ui/core": ^1.3.1
-  checksum: 362ee2c2b87f6efb02a9e179c39b626ed3d123870035c83efd647b461ec7e18ded81f298254af818594a7807ae26c1174d7437b010dbecf1b50bfdd08520aef0
+  checksum: 787fa40062c57395f839674ac52e2fbb03699bfd203596a37ff7fb6433fe495e4b8aecedbd7e43b04b781798c8758258b3f0d6539e5d79c76cd36da95b9e5af3
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom@npm:^1.0.0":
-  version: 1.3.0
-  resolution: "@floating-ui/react-dom@npm:1.3.0"
+"@floating-ui/react-dom@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/react-dom@npm:1.0.0"
+  dependencies:
+    "@floating-ui/dom": ^1.0.0
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 381f5747bf1a34e6ed55c80ed05cd3357803a576dd05c7b67af5c7f60365fb95a456190d80fdd9b9be337bdb55625f8612773101de7c367f590c0e47974c2850
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@floating-ui/react-dom@npm:2.0.1"
   dependencies:
-    "@floating-ui/dom": ^1.2.1
+    "@floating-ui/dom": ^1.3.0
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: bd9883660d216fdecca76a0b0ecef580d1914fb3d73775920569b641c9c3be552cff1ffa88ba6e7fbd8022d81ddfdf480b1ba81fa8e01366c4117576c5e315fb
+  checksum: 856c0c9de0a9117bcc69b1363fd9fa188133b9714394609db937903ab4330e9851becfd2a83453f40834de1a18377caf329b6b71afc1c69d7c5687f87da80ed4
   languageName: node
   linkType: hard
 
@@ -4266,29 +4279,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/transform@npm:27.5.1"
-  dependencies:
-    "@babel/core": ^7.1.0
-    "@jest/types": ^27.5.1
-    babel-plugin-istanbul: ^6.1.1
-    chalk: ^4.0.0
-    convert-source-map: ^1.4.0
-    fast-json-stable-stringify: ^2.0.0
-    graceful-fs: ^4.2.9
-    jest-haste-map: ^27.5.1
-    jest-regex-util: ^27.5.1
-    jest-util: ^27.5.1
-    micromatch: ^4.0.4
-    pirates: ^4.0.4
-    slash: ^3.0.0
-    source-map: ^0.6.1
-    write-file-atomic: ^3.0.0
-  checksum: 2d1819dad9621a562a1ff6eceefeb5ae0900063c50e982b9f08e48d7328a0c343520ba27ce291cb72c113d4f441ef4a95285b9d4ef6604cffd53740e951c99b6
-  languageName: node
-  linkType: hard
-
 "@jest/transform@npm:^29.6.1":
   version: 29.6.1
   resolution: "@jest/transform@npm:29.6.1"
@@ -4312,19 +4302,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "@jest/types@npm:27.5.1"
-  dependencies:
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^16.0.0
-    chalk: ^4.0.0
-  checksum: 4598b302398db0eb77168b75a6c58148ea02cc9b9f21c5d1bbe985c1c9257110a5653cf7b901c3cab87fba231e3fed83633687f1c0903b4bc6939ab2a8452504
-  languageName: node
-  linkType: hard
-
 "@jest/types@npm:^29.5.0, @jest/types@npm:^29.6.1":
   version: 29.6.1
   resolution: "@jest/types@npm:29.6.1"
@@ -4442,71 +4419,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@motionone/animation@npm:^10.15.1":
-  version: 10.15.1
-  resolution: "@motionone/animation@npm:10.15.1"
-  dependencies:
-    "@motionone/easing": ^10.15.1
-    "@motionone/types": ^10.15.1
-    "@motionone/utils": ^10.15.1
-    tslib: ^2.3.1
-  checksum: 0b34079d1f8bbc342baf94ce849175edbe36aaee83e7167343e5f4dc73c22b34cdb3ad6dba2fd65f27cc5a516ca759791ceaa549a0b4ee4f34e76a262896c853
-  languageName: node
-  linkType: hard
-
-"@motionone/dom@npm:^10.15.3":
-  version: 10.16.2
-  resolution: "@motionone/dom@npm:10.16.2"
-  dependencies:
-    "@motionone/animation": ^10.15.1
-    "@motionone/generators": ^10.15.1
-    "@motionone/types": ^10.15.1
-    "@motionone/utils": ^10.15.1
-    hey-listen: ^1.0.8
-    tslib: ^2.3.1
-  checksum: 820165454e5eec10b403897d109df3e378f17973ef68aeb76f915c5a1281d548affe03827eb2f7a5906b4a50cf59160c73bde27179c38e38cf83d6c2b33e8e96
-  languageName: node
-  linkType: hard
-
-"@motionone/easing@npm:^10.15.1":
-  version: 10.15.1
-  resolution: "@motionone/easing@npm:10.15.1"
-  dependencies:
-    "@motionone/utils": ^10.15.1
-    tslib: ^2.3.1
-  checksum: e7a8043b9a0d9673a725b1b6c49904582c5bbc34ee63ed36a04eff280f8d076ebbea5f0e269b36bad1a29a20d5843c8db0729764f98304b44a05f89958ef95e7
-  languageName: node
-  linkType: hard
-
-"@motionone/generators@npm:^10.15.1":
-  version: 10.15.1
-  resolution: "@motionone/generators@npm:10.15.1"
-  dependencies:
-    "@motionone/types": ^10.15.1
-    "@motionone/utils": ^10.15.1
-    tslib: ^2.3.1
-  checksum: 247478a225849ec6019092d61f04cd13defff7e63aff706087af6b12dd424fbc374f5277f8e3825b9b2ee7527003dddcb9a6d4214bcaf42be9904bd4420bb0c1
-  languageName: node
-  linkType: hard
-
-"@motionone/types@npm:^10.15.1":
-  version: 10.15.1
-  resolution: "@motionone/types@npm:10.15.1"
-  checksum: e1cf3c980c835d583190bf7d99e549b0523da14c797a07ccc82da932b7c3f2930cedd429d737ecd80da4df0290588e6c2c5bf3d14c9e77c45e2a3d92bd50ad8c
-  languageName: node
-  linkType: hard
-
-"@motionone/utils@npm:^10.15.1":
-  version: 10.15.1
-  resolution: "@motionone/utils@npm:10.15.1"
-  dependencies:
-    "@motionone/types": ^10.15.1
-    hey-listen: ^1.0.8
-    tslib: ^2.3.1
-  checksum: 6bb1cbc90593fe67d91c4c63ef2c2f33862e842fc8c7c51401adc5281d5267437604e8c396d3d9d033f544f61a9f0983113c9b1822abcd4250de974adc6ac65a
-  languageName: node
-  linkType: hard
-
 "@ndelangen/get-tarball@npm:^3.0.7":
   version: 3.0.7
   resolution: "@ndelangen/get-tarball@npm:3.0.7"
@@ -4686,74 +4598,788 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-spring/animated@npm:~9.7.1":
-  version: 9.7.1
-  resolution: "@react-spring/animated@npm:9.7.1"
+"@preact/signals-core@npm:^1.0.0, @preact/signals-core@npm:^1.2.3, @preact/signals-core@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@preact/signals-core@npm:1.3.0"
+  checksum: 428a289de5176aa89465fdfb8c6404d5b6ca205d7f636556184188f27a0f850971ab26d7aa7265c83b1562530f2c2d39afde7aa776ae1d651dc89aad3846aafb
+  languageName: node
+  linkType: hard
+
+"@preact/signals-react@npm:^1.0.0":
+  version: 1.3.2
+  resolution: "@preact/signals-react@npm:1.3.2"
   dependencies:
-    "@react-spring/shared": ~9.7.1
-    "@react-spring/types": ~9.7.1
+    "@preact/signals-core": ^1.3.0
+    use-sync-external-store: ^1.2.0
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: eca2c1c7049fe9ece233c8c723134e53ce5f0468046b34384d07bf3c0890c7d8fc374e8038e71851faa2c559674fe3702e2cdb469d9a78b1e70dad382913b31b
+    react: ^16.14.0 || 17.x || 18.x
+  checksum: 556c6dbaf6593a893917065bd917503d2b14969fe36d771dd041fee874e823e8b7078d5d761e2f180ddcfee40ddb44cb80cdef18de8c3b342dd7f58366f72a76
   languageName: node
   linkType: hard
 
-"@react-spring/core@npm:~9.7.1":
-  version: 9.7.1
-  resolution: "@react-spring/core@npm:9.7.1"
+"@preact/signals@npm:^1.0.0, @preact/signals@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@preact/signals@npm:1.1.3"
   dependencies:
-    "@react-spring/animated": ~9.7.1
-    "@react-spring/rafz": ~9.7.1
-    "@react-spring/shared": ~9.7.1
-    "@react-spring/types": ~9.7.1
+    "@preact/signals-core": ^1.2.3
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 6de4e1cf2628d3135cc2931a5b2c482daea83e030997c7211b1f24f33c42e0b79248bd1cf11deac0243e220d5f15cb27d1bcd30655c3174bd0d6158bab007738
+    preact: 10.x
+  checksum: 11d442df2860810f406181a7c4891b3053b46c8dc800b487d8077cb5981a155493857727200c2b65d7d4e7f4ffe56657b6d4c1e7268d6ee156a08466960f3b7b
   languageName: node
   linkType: hard
 
-"@react-spring/rafz@npm:~9.7.1":
-  version: 9.7.1
-  resolution: "@react-spring/rafz@npm:9.7.1"
-  checksum: 2ece611af1e0b7427c0f865204c76b2b44622dc0f31e8ee7a18d336ad4e14b7cb64c0b4034abf7e80342faa39079b2bf0b59c7f84244cacd24cf2ab67bf7b8c6
+"@radix-ui/primitive@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/primitive@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  checksum: 4b0a4bdbf312df2317c3a3c728b0d2249242220a93eedaffecd4207bc0b8d3f28498c4b15f16c8f60b8292302d6d28ef73d751f63e77ef9bf6a318f52c6dc19b
   languageName: node
   linkType: hard
 
-"@react-spring/shared@npm:~9.7.1":
-  version: 9.7.1
-  resolution: "@react-spring/shared@npm:9.7.1"
+"@radix-ui/primitive@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/primitive@npm:1.0.1"
   dependencies:
-    "@react-spring/rafz": ~9.7.1
-    "@react-spring/types": ~9.7.1
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 76158c671b9c01dae96d74523fdd3ea95405859d95878c49d09b42a2d96a3ff87f34f9ee9d3123ddd5124f391003893c0f9bce0274c30bc1382890bc998fe796
+    "@babel/runtime": ^7.13.10
+  checksum: 912216455537db3ca77f3e7f70174fb2b454fbd4a37a0acb7cfadad9ab6131abdfb787472242574460a3c301edf45738340cc84f6717982710082840fde7d916
   languageName: node
   linkType: hard
 
-"@react-spring/types@npm:~9.7.1":
-  version: 9.7.1
-  resolution: "@react-spring/types@npm:9.7.1"
-  checksum: 5e7134c244a86c687691bb3347d253a79e649f00752693bf32bb0ba8b3cf6fce19b1feea5c839d147612d94c0ba81161c5cf1e974f2e3d1f724c1a1f2a4b7b4e
+"@radix-ui/react-arrow@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-arrow@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-primitive": 1.0.3
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: c931f6d7e0bac50fd1654a0303a303aff74a68a13a33a851a43a7c88677b53a92ca6557920b9105144a3002f899ce888437d20ddd7803a5c716edac99587626d
   languageName: node
   linkType: hard
 
-"@react-spring/web@npm:^9.4.5":
-  version: 9.7.1
-  resolution: "@react-spring/web@npm:9.7.1"
+"@radix-ui/react-collection@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-collection@npm:1.0.3"
   dependencies:
-    "@react-spring/animated": ~9.7.1
-    "@react-spring/core": ~9.7.1
-    "@react-spring/shared": ~9.7.1
-    "@react-spring/types": ~9.7.1
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-context": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-slot": 1.0.2
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: a733d84d69a0c27199e943156c9838424863a6b377bbbec37d9fda5eb10d8a87f324e4615c2f892c94a4016919d8d0b39d330164aa0013178d53ba29936ca15d
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: cefa56383d7451ca79e4bd5a29aaeef6c205a04297213efd149aaead82fc8cde4fb8298e20e6b3613e5696e43f814fb4489805428f6604834fb31f73c6725fa8
   languageName: node
   linkType: hard
 
-"@redux-saga/core@npm:^1.2.2":
+"@radix-ui/react-compose-refs@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-compose-refs@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 449148920c1df82ffcdd78a68d3485036d198b41b9fcfc407b008df5dfefc8f1a60391f7b53e2bc69e0fdbbba846b0b79fede5f7ed35bca82af4eff6c56b8854
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-compose-refs@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-compose-refs@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: be06f8dab35b5a1bffa7a5982fb26218ddade1acb751288333e3b89d7b4a7dfb5a6371be83876dac0ec2ebe0866d295e8618b778608e1965342986ea448040ec
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-context@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-context@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 3744c8f6291d1c0645dfb2497e232b2084f8c62075258370987592e3533710dc84b8ae983489ca354c0567eff3f311230f6c696bc4536ba0e431068b79196b00
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-context@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-context@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 3de5761b32cc70cd61715527f29d8c699c01ab28c195ced972ccbc7025763a373a68f18c9f948c7a7b922e469fd2df7fee5f7536e3f7bad44ffc06d959359333
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-dialog@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-dialog@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.0
+    "@radix-ui/react-compose-refs": 1.0.0
+    "@radix-ui/react-context": 1.0.0
+    "@radix-ui/react-dismissable-layer": 1.0.0
+    "@radix-ui/react-focus-guards": 1.0.0
+    "@radix-ui/react-focus-scope": 1.0.0
+    "@radix-ui/react-id": 1.0.0
+    "@radix-ui/react-portal": 1.0.0
+    "@radix-ui/react-presence": 1.0.0
+    "@radix-ui/react-primitive": 1.0.0
+    "@radix-ui/react-slot": 1.0.0
+    "@radix-ui/react-use-controllable-state": 1.0.0
+    aria-hidden: ^1.1.1
+    react-remove-scroll: 2.5.4
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: af2afc8b88f6fc542d6e4d8594afcf038dff47baed76fccbc619e1ac99c7a6d0735ef736bfa1c89d64a56f0e0a70c01f8290ffc5c1e03dde7c643a09b6541b05
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-direction@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-direction@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: b1a45b4d1d5070ca3b5864b920f6c6210c962bdb519abb62b38b1baef9d06737dc3d8ecdb61860b7504a735235a539652f5977c7299ec021da84e6b0f64d988a
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-dismissable-layer@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-dismissable-layer@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.0
+    "@radix-ui/react-compose-refs": 1.0.0
+    "@radix-ui/react-primitive": 1.0.0
+    "@radix-ui/react-use-callback-ref": 1.0.0
+    "@radix-ui/react-use-escape-keydown": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: 4aec9216d85671ea1c22ac56f0bf98dde3ddc10d912bedc9bfdbc230057411c4567cdb014fc006495bcbffeffab904fbfa0622e1bbd8b30c9bb327e0304dea33
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-dismissable-layer@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@radix-ui/react-dismissable-layer@npm:1.0.4"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.1
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@radix-ui/react-use-escape-keydown": 1.0.3
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: a7b9695092cd4109a7b4a4a66b7f634c42d4f39aa0893621a8ee5e8bc90f8ae27e741df66db726c341a60d2115e3f813520fee1f5cc4fb05d77914b4ade3819f
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-dropdown-menu@npm:^2.0.4":
+  version: 2.0.5
+  resolution: "@radix-ui/react-dropdown-menu@npm:2.0.5"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.1
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-context": 1.0.1
+    "@radix-ui/react-id": 1.0.1
+    "@radix-ui/react-menu": 2.0.5
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-use-controllable-state": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: fdc163b07894101a88bd2b0a6a425838b5e4164fb0dcf306e215120ebe034c7f2c114f7d4c2b20eb48d90402fb1caefb61a22b2c2084b40d63fa551429fe6e86
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-focus-guards@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-focus-guards@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 3b6578b31ad042d06e00fc511cd465fb019cfc2726edcd9b56a6d47f22049c1c6f1aec203a099c9f1e1bb5870c47cfaf9a969a5448159b90346b47b8c24ceef7
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-focus-guards@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-focus-guards@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: d5fd4e5aa9d9a87c8ad490b3b4992d6f1d9eddf18e56df2a2bcf8744c4332b275d73377fd193df3e6ba0ad9608dc497709beca5c64de2b834d5f5350b3c9a272
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-focus-scope@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-focus-scope@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.0
+    "@radix-ui/react-primitive": 1.0.0
+    "@radix-ui/react-use-callback-ref": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: 0c4cad9c3db4cb7882435fac05ee7ae3b3e0244410d9b8d264370a1edf56b0c7285df6dffe556ba7939f4a3d887d0d5044acee8cb2f04818b91bcbe9b912c2a7
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-focus-scope@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-focus-scope@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-use-callback-ref": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: bfff46919666c122f5b812ee427494ae8408c0eebee30337bd2ce0eedf539f0feaa242f790304ef9df15425b837010ffc6061ce467bedd2c5fd9373bee2b95da
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-id@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-id@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-layout-effect": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 56e9817abdc209e0d5169ba2e6d3de477101650b02c04f7f1477800cfd3a9e8bc415bcd14760557a17de8cfcae571342e4f6a5ec182b05d613ae7d77309a861c
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-id@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-id@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-layout-effect": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: e2859ca58bea171c956098ace7ecf615cf9432f58a118b779a14720746b3adcf0351c36c75de131548672d3cd290ca238198acbd33b88dc4706f98312e9317ad
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-menu@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@radix-ui/react-menu@npm:2.0.5"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.1
+    "@radix-ui/react-collection": 1.0.3
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-context": 1.0.1
+    "@radix-ui/react-direction": 1.0.1
+    "@radix-ui/react-dismissable-layer": 1.0.4
+    "@radix-ui/react-focus-guards": 1.0.1
+    "@radix-ui/react-focus-scope": 1.0.3
+    "@radix-ui/react-id": 1.0.1
+    "@radix-ui/react-popper": 1.1.2
+    "@radix-ui/react-portal": 1.0.3
+    "@radix-ui/react-presence": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-roving-focus": 1.0.4
+    "@radix-ui/react-slot": 1.0.2
+    "@radix-ui/react-use-callback-ref": 1.0.1
+    aria-hidden: ^1.1.1
+    react-remove-scroll: 2.5.5
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 9b21a5fb159dc106ea7b45c64cf08487fb4cc1bba2e8696d70320f3e4173f2a0098eeeef16bc846391f569fd2abb5fe7b2ef40de929b9625e18a27f702743705
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-popper@npm:1.1.2":
+  version: 1.1.2
+  resolution: "@radix-ui/react-popper@npm:1.1.2"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@floating-ui/react-dom": ^2.0.0
+    "@radix-ui/react-arrow": 1.0.3
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-context": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@radix-ui/react-use-layout-effect": 1.0.1
+    "@radix-ui/react-use-rect": 1.0.1
+    "@radix-ui/react-use-size": 1.0.1
+    "@radix-ui/rect": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 4bd069b79f7046af2c0967b8e43f727cd09834cbd6df1e3d5a943c4f83428ff8b646882737fdf7593c22e261a1d13768a5c020138d79503862ae2e1729081bba
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-portal@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-portal@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-primitive": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: c7330e05d99cbb52bfc16c60c996edf2ace0d80b78eb3828dbce45fe53558a5474dfc347d152a956259740d37d92ec63a88638a22ab808c5f80681f1ad41a810
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-portal@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-portal@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-primitive": 1.0.3
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: baf295bbbf09ead37b64ee1dc025a6a540960f5e60552766d78f6065504c67d4bcf49fad5e2073617d9a3011daafad625aa3bd1da7a886c704833b22a49e888f
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-presence@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-presence@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.0
+    "@radix-ui/react-use-layout-effect": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: 2d696781e58f7acc45df2965b4756d5072a80704677cb6905a927754bd2076c87cd137820d3e58d8c2118a9b12aaa82fee79c6fef49b80012a12983002101fc5
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-presence@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-presence@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-use-layout-effect": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 90780618b265fe794a8f1ddaa5bfd3c71a1127fa79330a14d32722e6265b44452a9dd36efe4e769129d33e57f979f6b8713e2cbf2e2755326aa3b0f337185b6e
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-primitive@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-primitive@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-slot": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  checksum: a68b3afe6eb39e1c73d6cc162283ce071b2a5793e5c417547a0b43281654346be7474f51c7055b5d2636667efbab863eb76f785e8484e63c670b0a9d863684be
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-primitive@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-primitive@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-slot": 1.0.2
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 67a66ff8898a5e7739eda228ab6f5ce808858da1dce967014138d87e72b6bbfc93dc1467c706d98d1a2b93bf0b6e09233d1a24d31c78227b078444c1a69c42be
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-roving-focus@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@radix-ui/react-roving-focus@npm:1.0.4"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/primitive": 1.0.1
+    "@radix-ui/react-collection": 1.0.3
+    "@radix-ui/react-compose-refs": 1.0.1
+    "@radix-ui/react-context": 1.0.1
+    "@radix-ui/react-direction": 1.0.1
+    "@radix-ui/react-id": 1.0.1
+    "@radix-ui/react-primitive": 1.0.3
+    "@radix-ui/react-use-callback-ref": 1.0.1
+    "@radix-ui/react-use-controllable-state": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 61e3ddfd1647e64fba855434ff41e8e7ba707244fe8841f78c450fbdce525383b64259279475615d030dbf1625cbffd8eeebee72d91bf6978794f5dbcf887fc0
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-slot@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-slot@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: a02573ae7c637b16a72d8511d879db37f33cf35b34b8d2cfe507ba8312abbb8e4075b0cb8cd39c5ba89ce341045375f83634457113256321e7a4c3c3638d2955
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-slot@npm:1.0.2":
+  version: 1.0.2
+  resolution: "@radix-ui/react-slot@npm:1.0.2"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-compose-refs": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 3af6ea4891e6fa8091e666802adffe7718b3cd390a10fa9229a5f40f8efded9f3918ea01b046103d93923d41cc32119505ebb6bde76cad07a87b6cf4f2119347
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-callback-ref@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-use-callback-ref@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 91bf130d39cfbda61de83fd4a6893cf459b3d72ec01268e3761eafd3c709f70f82940a6b46676ba6fe06fc707fdefe580946b3b99bb2af5f59887aa203e56533
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-callback-ref@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-use-callback-ref@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 331b432be1edc960ca148637ae6087220873ee828ceb13bd155926ef8f49e862812de5b379129f6aaefcd11be53715f3237e6caa9a33d9c0abfff43f3ba58938
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-controllable-state@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-use-controllable-state@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-callback-ref": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: fa2ad3b70bec91b628883455152b7ce19d321199e3677051822c14aa3941901f5fd14cddec1c9ab0998e4061fd3b8397727aef856fec099c419d8e1e3d7f75de
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-controllable-state@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-use-controllable-state@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-callback-ref": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 29b069dbf09e48bca321af6272574ad0fc7283174e7d092731a10663fe00c0e6b4bde5e1b5ea67725fe48dcbe8026e7ff0d69d42891c62cbb9ca408498171fbe
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-escape-keydown@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-use-escape-keydown@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-callback-ref": 1.0.0
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: a64e8dbd0e37b53c6cb9f370923afbf29646d6c28dcadd2a7076451692b70263916b9926322ecd7cc3975b2a5111903ec5abcda7e389b35ef197eb1aba17be38
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-escape-keydown@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@radix-ui/react-use-escape-keydown@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-callback-ref": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 3c94c78902dcb40b60083ee2184614f45c95a189178f52d89323b467bd04bcf5fdb1bc4d43debecd7f0b572c3843c7e04edbcb56f40a4b4b43936fb2770fb8ad
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-layout-effect@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@radix-ui/react-use-layout-effect@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    react: ^16.8 || ^17.0 || ^18.0
+  checksum: 04bbcddbfaa2863cbd64978b70925d0a0b664131f8c33a518b0df2866966840b3d72302258b0f8cb7ed45b50b6d52d6cbdca00cc159c47f323eb8d7b70126d83
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-layout-effect@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-use-layout-effect@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 13cd0c38395c5838bc9a18238020d3bcf67fb340039e6d1cbf438be1b91d64cf6900b78121f3dc9219faeb40dcc7b523ce0f17e4a41631655690e5a30a40886a
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-rect@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-use-rect@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/rect": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 94c5ab31dfd3678c0cb77a30025e82b3a287577c1a8674b0d703a36d27434bc9c59790e0bebf57ed153f0b8e0d8c3b9675fc9787b9eac525a09abcda8fa9e7eb
+  languageName: node
+  linkType: hard
+
+"@radix-ui/react-use-size@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/react-use-size@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+    "@radix-ui/react-use-layout-effect": 1.0.1
+  peerDependencies:
+    "@types/react": "*"
+    react: ^16.8 || ^17.0 || ^18.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: b109a4b3781781c4dc641a1173f0a6fcb0b0f7b2d7cdba5848a46070c9fb4e518909a46c20a3c2efbc78737c64859c59ead837f2940e8c8394d1c503ef58773b
+  languageName: node
+  linkType: hard
+
+"@radix-ui/rect@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@radix-ui/rect@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.13.10
+  checksum: 4c5159661340acc31b11e1f2ebd87a1521d39bfa287544dd2cd75b399539a4b625d38a1501c90ceae21fcca18ed164b0c3735817ff140ae334098192c110e571
+  languageName: node
+  linkType: hard
+
+"@react-spring/animated@npm:~9.7.1":
+  version: 9.7.1
+  resolution: "@react-spring/animated@npm:9.7.1"
+  dependencies:
+    "@react-spring/shared": ~9.7.1
+    "@react-spring/types": ~9.7.1
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: eca2c1c7049fe9ece233c8c723134e53ce5f0468046b34384d07bf3c0890c7d8fc374e8038e71851faa2c559674fe3702e2cdb469d9a78b1e70dad382913b31b
+  languageName: node
+  linkType: hard
+
+"@react-spring/core@npm:~9.7.1":
+  version: 9.7.1
+  resolution: "@react-spring/core@npm:9.7.1"
+  dependencies:
+    "@react-spring/animated": ~9.7.1
+    "@react-spring/rafz": ~9.7.1
+    "@react-spring/shared": ~9.7.1
+    "@react-spring/types": ~9.7.1
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 6de4e1cf2628d3135cc2931a5b2c482daea83e030997c7211b1f24f33c42e0b79248bd1cf11deac0243e220d5f15cb27d1bcd30655c3174bd0d6158bab007738
+  languageName: node
+  linkType: hard
+
+"@react-spring/rafz@npm:~9.7.1":
+  version: 9.7.1
+  resolution: "@react-spring/rafz@npm:9.7.1"
+  checksum: 2ece611af1e0b7427c0f865204c76b2b44622dc0f31e8ee7a18d336ad4e14b7cb64c0b4034abf7e80342faa39079b2bf0b59c7f84244cacd24cf2ab67bf7b8c6
+  languageName: node
+  linkType: hard
+
+"@react-spring/shared@npm:~9.7.1":
+  version: 9.7.1
+  resolution: "@react-spring/shared@npm:9.7.1"
+  dependencies:
+    "@react-spring/rafz": ~9.7.1
+    "@react-spring/types": ~9.7.1
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 76158c671b9c01dae96d74523fdd3ea95405859d95878c49d09b42a2d96a3ff87f34f9ee9d3123ddd5124f391003893c0f9bce0274c30bc1382890bc998fe796
+  languageName: node
+  linkType: hard
+
+"@react-spring/types@npm:~9.7.1":
+  version: 9.7.1
+  resolution: "@react-spring/types@npm:9.7.1"
+  checksum: 5e7134c244a86c687691bb3347d253a79e649f00752693bf32bb0ba8b3cf6fce19b1feea5c839d147612d94c0ba81161c5cf1e974f2e3d1f724c1a1f2a4b7b4e
+  languageName: node
+  linkType: hard
+
+"@react-spring/web@npm:^9.4.5":
+  version: 9.7.1
+  resolution: "@react-spring/web@npm:9.7.1"
+  dependencies:
+    "@react-spring/animated": ~9.7.1
+    "@react-spring/core": ~9.7.1
+    "@react-spring/shared": ~9.7.1
+    "@react-spring/types": ~9.7.1
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: a733d84d69a0c27199e943156c9838424863a6b377bbbec37d9fda5eb10d8a87f324e4615c2f892c94a4016919d8d0b39d330164aa0013178d53ba29936ca15d
+  languageName: node
+  linkType: hard
+
+"@redux-saga/core@npm:^1.2.2":
   version: 1.2.2
   resolution: "@redux-saga/core@npm:1.2.2"
   dependencies:
@@ -6460,7 +7086,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/graceful-fs@npm:^4.1.2, @types/graceful-fs@npm:^4.1.3":
+"@types/graceful-fs@npm:^4.1.3":
   version: 4.1.6
   resolution: "@types/graceful-fs@npm:4.1.6"
   dependencies:
@@ -7035,13 +7661,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tinycolor2@npm:*":
-  version: 1.4.2
-  resolution: "@types/tinycolor2@npm:1.4.2"
-  checksum: e4116cf95e6f7c4d024f5250ac13d357f1a5f1f9d2a3ee9cf1ff85c11012f611fa1aa4d75880cc7620ba61436b945f556e9d779b9c221f7f03d7219fe87417c9
-  languageName: node
-  linkType: hard
-
 "@types/totp-generator@npm:^0.0.3":
   version: 0.0.3
   resolution: "@types/totp-generator@npm:0.0.3"
@@ -7108,51 +7727,14 @@ __metadata:
 "@types/webpack-env@npm:^1.16.3":
   version: 1.16.3
   resolution: "@types/webpack-env@npm:1.16.3"
-  checksum: 136ece45e58fbcb4d8e02fe7892213105d6874223a66209bccaf4a18ca78ab81a10d121ee9d0944904cfad1274ca730efc9643b9cd8444239f505676adee22a0
-  languageName: node
-  linkType: hard
-
-"@types/wordpress__components@npm:23.0.1":
-  version: 23.0.1
-  resolution: "@types/wordpress__components@npm:23.0.1"
-  dependencies:
-    "@types/react": "*"
-    "@types/tinycolor2": "*"
-    "@types/wordpress__components": "*"
-    "@types/wordpress__notices": "*"
-    "@types/wordpress__rich-text": "*"
-    "@wordpress/element": ^5.0.0
-    downshift: ^6.0.15
-    re-resizable: ^6.4.0
-  checksum: 3adce6d6350f790fb1f310fb40a4981a95a7b3b0fb63bc292afacf557095ddd3f33eea13485514f164c4125f06db9b40c82ee8cd0375dcc22c12c18a5db55586
-  languageName: node
-  linkType: hard
-
-"@types/wordpress__data-controls@npm:^2.30.0":
-  version: 2.30.0
-  resolution: "@types/wordpress__data-controls@npm:2.30.0"
-  dependencies:
-    "@wordpress/api-fetch": ^5.2.5
-    "@wordpress/data": ^9.0.0
-  checksum: 4880d7ba24db391e324ea229e4bd9568e32da724085254175f3dc5e867cf811d472e64199b1defea0b082bd67753f8b19cb073e5b86e9e6d02c93692079dde40
-  languageName: node
-  linkType: hard
-
-"@types/wordpress__notices@npm:noop-package@1.0.0, @types/wordpress__rich-text@npm:noop-package@1.0.0, @wordpress/data@npm:noop-package@1.0.0":
-  version: 1.0.0
-  resolution: "noop-package@npm:1.0.0"
-  checksum: f53edc897025b1c2c6d084607ec6588718ff5fc92b1549e97f87453b0404fa15acc12f3b1c7b4fa144f376b73b3bd40e3fe8da4fa89a944dfeb33343afbcf5b4
+  checksum: 136ece45e58fbcb4d8e02fe7892213105d6874223a66209bccaf4a18ca78ab81a10d121ee9d0944904cfad1274ca730efc9643b9cd8444239f505676adee22a0
   languageName: node
   linkType: hard
 
-"@types/wordpress__plugins@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/wordpress__plugins@npm:3.0.0"
-  dependencies:
-    "@types/react": "*"
-    "@types/wordpress__components": "*"
-    "@wordpress/element": ^3.0.0
-  checksum: 3b9003ed8eaa003b8ca8df3120bfe0895736c1608f86590459e5872f7ac3d4e69313d2024c67b0c5fce8660545db4e8524a6cbf6a2f44e5c9b86da97df4cf025
+"@types/wordpress__block-library@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@types/wordpress__block-library@npm:2.6.1"
+  checksum: bd007e3e36990e45111a0cbbf79eec9120cef69525773247d0c72db81a3870362fadb5224372410766a14902f1453119a0d8702e09aa3b5f6028d210d949dc90
   languageName: node
   linkType: hard
 
@@ -7172,15 +7754,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^16.0.0":
-  version: 16.0.5
-  resolution: "@types/yargs@npm:16.0.5"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 7b2824c749b6e28f5ee3248d13b244eaf7d3c5bb96089add774997572b5a10f1a0826d29a7bc797d64d29ca504b0b0d6ba2e74931b3fabae78ccbbcf07282f0c
-  languageName: node
-  linkType: hard
-
 "@types/yargs@npm:^17.0.1, @types/yargs@npm:^17.0.8":
   version: 17.0.24
   resolution: "@types/yargs@npm:17.0.24"
@@ -7266,6 +7839,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:5.60.1":
+  version: 5.60.1
+  resolution: "@typescript-eslint/scope-manager@npm:5.60.1"
+  dependencies:
+    "@typescript-eslint/types": 5.60.1
+    "@typescript-eslint/visitor-keys": 5.60.1
+  checksum: 50164675adb4850354a8e0297d498b59283eee961e10e0c00f9d664e03b464a9de4dc7a9d84c534c84df6ac3ea6f32238e2df9528374104bd66678b1ec9fbfec
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:5.7.0":
   version: 5.7.0
   resolution: "@typescript-eslint/scope-manager@npm:5.7.0"
@@ -7300,6 +7883,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:5.60.1":
+  version: 5.60.1
+  resolution: "@typescript-eslint/types@npm:5.60.1"
+  checksum: 4be7654356f9b79fb942ae22196b518f30e20b07588355df22c85dfdcdaafe02f312b473de67af34fbb2283182d0d337aa65312f1117c6f8bf635cc427944c23
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.7.0":
   version: 5.7.0
   resolution: "@typescript-eslint/types@npm:5.7.0"
@@ -7325,6 +7915,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:5.60.1":
+  version: 5.60.1
+  resolution: "@typescript-eslint/typescript-estree@npm:5.60.1"
+  dependencies:
+    "@typescript-eslint/types": 5.60.1
+    "@typescript-eslint/visitor-keys": 5.60.1
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.3.7
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 09933d3c1b1bacf7e043d33a7e134489650fca7b7b965b633a1c526453f20478b38c4aa9b7c6da269d2a43f26608110d4c129eec917c4561431149dae82c3b9d
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.7.0":
   version: 5.7.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.7.0"
@@ -7361,6 +7969,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:^5.10.0":
+  version: 5.60.1
+  resolution: "@typescript-eslint/utils@npm:5.60.1"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@types/json-schema": ^7.0.9
+    "@types/semver": ^7.3.12
+    "@typescript-eslint/scope-manager": 5.60.1
+    "@typescript-eslint/types": 5.60.1
+    "@typescript-eslint/typescript-estree": 5.60.1
+    eslint-scope: ^5.1.1
+    semver: ^7.3.7
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: cb408bd67dd5be3a3585b67ac19f60e9feb309a56782924b314077f7dc77cb10e690fdb4a7ac643784e8fab30bc04d6f23935c1aed6d08233f8dd8604782ac27
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.53.0":
   version: 5.53.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.53.0"
@@ -7371,6 +7997,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:5.60.1":
+  version: 5.60.1
+  resolution: "@typescript-eslint/visitor-keys@npm:5.60.1"
+  dependencies:
+    "@typescript-eslint/types": 5.60.1
+    eslint-visitor-keys: ^3.3.0
+  checksum: e70bd584ff0eef1c8739e3457e7402485acc06aba468ff8f191f4546aaed93ec91f309bb567a3d8bbd9a4aec030f3b73c8e8df085bb82cbb8ea9a0209c7355f8
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.7.0":
   version: 5.7.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.7.0"
@@ -7381,21 +8017,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@use-gesture/core@npm:10.2.26":
-  version: 10.2.26
-  resolution: "@use-gesture/core@npm:10.2.26"
-  checksum: b4b95d05f48f07676991014b1faf94ef40c6df4e28b66100d12f191744f3b7f074589f8267060c5d79f016badffc381833800e419ebff63a10b780400b86fb7f
+"@use-gesture/core@npm:10.2.27":
+  version: 10.2.27
+  resolution: "@use-gesture/core@npm:10.2.27"
+  checksum: b39ec3d248beaf103b2ad14d689e0f485262bf1456d38341986cc3f31ca3bfd818951a88c51963d2e4d77047c2f8e1c652a1f9319d26be78a2fde3f126be507e
   languageName: node
   linkType: hard
 
-"@use-gesture/react@npm:^10.2.6":
-  version: 10.2.26
-  resolution: "@use-gesture/react@npm:10.2.26"
+"@use-gesture/react@npm:^10.2.24":
+  version: 10.2.27
+  resolution: "@use-gesture/react@npm:10.2.27"
   dependencies:
-    "@use-gesture/core": 10.2.26
+    "@use-gesture/core": 10.2.27
   peerDependencies:
     react: ">= 16.8.0"
-  checksum: 0fc5cc27ca39c13b654bfd4680b14104d60a1b5b183888eb8e0072921babcda61ee4dc3cc464317d62120794ad6fe95e3b0ed74ded4ab903f3eb5990a8263f3b
+  checksum: 4735ae848e6b529d99afa6684cbcb76d59fc0ef6fa185ccd4942202d580e6ece4ba568b5a412400c5f62ebd9ddab88f2ee0dae94c69dc0a92ff3ceb57f659c49
   languageName: node
   linkType: hard
 
@@ -7583,49 +8219,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wordpress/a11y@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/a11y@npm:3.23.0"
+"@wordpress/a11y@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/a11y@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/dom-ready": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-  checksum: f1fb59ac30c31537ad5765519b6278252ab3175dd24236ec10d509d12e4a8b545436a4333d59bdf98b6623fa0d36a56d70621c9fdd9d96d5966d97ac09601b88
+    "@wordpress/dom-ready": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+  checksum: d2f0ffd254c9c5e4908618f6270ba3105c075368a8e0da3588ac8862bda407e73d7d87a2f9700a95c8d8e0b24573441b692cc72c8ac0ec916e8d6a8769bff424
   languageName: node
   linkType: hard
 
-"@wordpress/api-fetch@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@wordpress/api-fetch@npm:6.20.0"
+"@wordpress/api-fetch@npm:6.33.0":
+  version: 6.33.0
+  resolution: "@wordpress/api-fetch@npm:6.33.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/url": ^3.24.0
-  checksum: 4cd508fd3e56b94881ded1a000adbf585bb91cfdab7c9a1c99481b787889987d45450ef065cd4af82aeae90138e3319346b60848ae927018de2a7f6712a4eb5b
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/url": ^3.37.0
+  checksum: f78f329229de2a2eb8ee7c54cfcfbb671684b8c712bb182d64e600cebb867216e820317bdb495bb559d5ad71e11f8b5425ef7a0975084ddf385565886683f28c
   languageName: node
   linkType: hard
 
-"@wordpress/autop@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/autop@npm:3.23.0"
+"@wordpress/autop@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/autop@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 5401f17206871ac13108c588b49a8b0a172883b051ff1770866aae94bf578d030c33a8a67156b3d0d6617d079d8dfe5c294decfb940372894fae469f266d1d37
+  checksum: 13894ad6f62aa6dc8f45b132cf99edd4b819dcb3c7dc6af3cb4824f8336b8a3dfec83d4cc0a7da2b0dba60c24c6a64274d0771f8c81f67fd86322c4c29c6ebd5
   languageName: node
   linkType: hard
 
-"@wordpress/babel-plugin-import-jsx-pragma@npm:4.6.0":
-  version: 4.6.0
-  resolution: "@wordpress/babel-plugin-import-jsx-pragma@npm:4.6.0"
+"@wordpress/babel-plugin-import-jsx-pragma@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@wordpress/babel-plugin-import-jsx-pragma@npm:4.19.0"
   peerDependencies:
     "@babel/core": ^7.12.9
-  checksum: f14f55845f34e5d8343282ddbfdc80f4f2c69eb63a5eabd1ac29bd1be48b34f5926c40541398c9011d0d91b7d1f0ed576b569230456720472b77e2f2b2c3a933
+  checksum: 339dfae1d5751a971a21287e51b4f2c63e3de3f4a66632e3d5ea735d3ccb6df4f9c5d1c8a81fc2fb0333e1fbbf818e7e5dd6cb2a36ef31de22ed9df125f2ff24
   languageName: node
   linkType: hard
 
-"@wordpress/babel-preset-default@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@wordpress/babel-preset-default@npm:7.7.0"
+"@wordpress/babel-preset-default@npm:7.20.0":
+  version: 7.20.0
+  resolution: "@wordpress/babel-preset-default@npm:7.20.0"
   dependencies:
     "@babel/core": ^7.16.0
     "@babel/plugin-transform-react-jsx": ^7.16.0
@@ -7633,68 +8269,71 @@ __metadata:
     "@babel/preset-env": ^7.16.0
     "@babel/preset-typescript": ^7.16.0
     "@babel/runtime": ^7.16.0
-    "@wordpress/babel-plugin-import-jsx-pragma": ^4.6.0
-    "@wordpress/browserslist-config": ^5.6.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/warning": ^2.23.0
+    "@wordpress/babel-plugin-import-jsx-pragma": ^4.19.0
+    "@wordpress/browserslist-config": ^5.19.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/warning": ^2.36.0
     browserslist: ^4.17.6
     core-js: ^3.19.1
-  checksum: 9931d282fcc3c26b54df631293ac3f38f3efa8edb501060ca72fb9e4d9b78889d109b6fc29fbd9d954062aee1b43788d47a1a7fb7023b46856d353b3a352eac9
+  checksum: 42c0e93057077f839d022eaa922b896116729dd7c9dc5ffb677cbb0a5453e9db69c9a01a798383fec48298fba0714ffbac4281b07a6fc1e5d2bbeae7aa7c385c
   languageName: node
   linkType: hard
 
-"@wordpress/base-styles@npm:4.14.0":
-  version: 4.14.0
-  resolution: "@wordpress/base-styles@npm:4.14.0"
-  checksum: b279b81892f111dbe0dbb2ba8c00480b99bf4e6fd222f005a9536fa426da5adcd3386815fe129f903eeca86e851de9a6206758d2ee76088303696e7ec2f3301a
+"@wordpress/base-styles@npm:4.27.0":
+  version: 4.27.0
+  resolution: "@wordpress/base-styles@npm:4.27.0"
+  checksum: e340e06b16ef46ffd849a256540fa3fe8f3bce18b38c2d18b598f39cd7e22a5becaab8bceeb46895a5d4e74ad403cbd3829ff043992deb532c206096ed8a9c8d
   languageName: node
   linkType: hard
 
-"@wordpress/blob@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/blob@npm:3.23.0"
+"@wordpress/blob@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/blob@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: a0b3604a89cca6ad89fb4f4224c472d69048dd0d3480ef4c681ab1f08a2e0c6bebbb2ae2ff3f63e3d63c718c827980f77e18022bb124bea5d1e9f49438f998c0
+  checksum: e8d1e68b8dd229f6c37b2c828debc15df4e04f6b87095dafc4b84e65592ecab931eec497f7116e281909ce90f7ac9b09b71a26ce10d6bfe3a3de5db08c204e00
   languageName: node
   linkType: hard
 
-"@wordpress/block-editor@npm:11.0.0":
-  version: 11.0.0
-  resolution: "@wordpress/block-editor@npm:11.0.0"
+"@wordpress/block-editor@npm:12.3.0":
+  version: 12.3.0
+  resolution: "@wordpress/block-editor@npm:12.3.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     "@react-spring/web": ^9.4.5
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/blob": ^3.23.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/date": ^4.23.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/escape-html": ^2.23.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/keyboard-shortcuts": ^4.0.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/shortcode": ^3.23.0
-    "@wordpress/style-engine": ^1.6.0
-    "@wordpress/token-list": ^2.23.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/warning": ^2.23.0
-    "@wordpress/wordcount": ^3.23.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/blob": ^3.35.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/date": ^4.35.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/escape-html": ^2.35.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/keyboard-shortcuts": ^4.12.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/preferences": ^3.12.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/shortcode": ^3.35.0
+    "@wordpress/style-engine": ^1.18.0
+    "@wordpress/token-list": ^2.35.0
+    "@wordpress/url": ^3.36.0
+    "@wordpress/warning": ^2.35.0
+    "@wordpress/wordcount": ^3.35.0
     change-case: ^4.1.2
     classnames: ^2.3.1
     colord: ^2.7.0
+    deepmerge: ^4.3.0
     diff: ^4.0.2
     dom-scroll-into-view: ^1.2.1
     fast-deep-equal: ^3.1.3
@@ -7702,120 +8341,146 @@ __metadata:
     lodash: ^4.17.21
     react-autosize-textarea: ^7.1.0
     react-easy-crop: ^4.5.1
-    rememo: ^4.0.0
+    rememo: ^4.0.2
     remove-accents: ^0.4.2
     traverse: ^0.6.6
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: af2829ceca4386b4965ccb370098d21e907b277fd4b80792ae4a00e82792b5665251b126b478a6b858c5495d16d8db2f06706520e885036b8dcfef6cacd19e73
+  checksum: dfc5402acd70cb44a3d87df9aa1f162e947c45adaacaae2a2088e1b5b1915c939d65d4f7c9fb39f112cebfa30bb8728d862434bff829cd835ae8c9c23891f4c5
   languageName: node
   linkType: hard
 
-"@wordpress/block-library@npm:8.0.0":
-  version: 8.0.0
-  resolution: "@wordpress/block-library@npm:8.0.0"
+"@wordpress/block-library@npm:8.12.0":
+  version: 8.12.0
+  resolution: "@wordpress/block-library@npm:8.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/autop": ^3.23.0
-    "@wordpress/blob": ^3.23.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/core-data": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/date": ^4.23.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/escape-html": ^2.23.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/reusable-blocks": ^4.0.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/server-side-render": ^4.0.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/viewport": ^5.0.0
+    "@preact/signals": ^1.1.3
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/autop": ^3.35.0
+    "@wordpress/blob": ^3.35.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/date": ^4.35.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/escape-html": ^2.35.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/primitives": ^3.33.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/reusable-blocks": ^4.12.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/server-side-render": ^4.12.0
+    "@wordpress/url": ^3.36.0
+    "@wordpress/viewport": ^5.12.0
+    "@wordpress/wordcount": ^3.35.0
     change-case: ^4.1.2
     classnames: ^2.3.1
     colord: ^2.7.0
+    deepsignal: ^1.3.0
     escape-html: ^1.0.3
     fast-average-color: ^9.1.1
     fast-deep-equal: ^3.1.3
     lodash: ^4.17.21
-    memize: ^1.1.0
+    memize: ^2.1.0
     micromodal: ^0.4.10
+    preact: ^10.13.2
     remove-accents: ^0.4.2
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: ab27efdb5a77dca1a141a46976c03c1717168548f0782bc54643c38f370397fd56e3711e9c02ae756b3cd83e85caf6afa0777e1367657ac79b71cf0fd40d7e46
+  checksum: 977201b57e463f66622845c9911407e17c044f3acdecf73a14395eb01e2c849f5796ef9b26a128ab63894c0e3013c09c588658422b47cc9ca95e9d42a03ef373
   languageName: node
   linkType: hard
 
-"@wordpress/block-serialization-default-parser@npm:4.23.0":
-  version: 4.23.0
-  resolution: "@wordpress/block-serialization-default-parser@npm:4.23.0"
+"@wordpress/block-serialization-default-parser@npm:4.36.0":
+  version: 4.36.0
+  resolution: "@wordpress/block-serialization-default-parser@npm:4.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 0a2c1370afa84a00d129d12ae2bdcdc4ce6416379390c8bdd0a4c62269175ad389ba89ee20037085f8451f10e3503e1591fdbf8ed16440169cccc8b78e0b099c
+  checksum: 2fa7046473eab3f5c5c477894b6474f69b9e1767dcc4c4d63d10ff1c02d4ea7c1c321965810f63ce259a5acae157c6cff14e2f69249634bee9f4a37bbaec8891
   languageName: node
   linkType: hard
 
-"@wordpress/blocks@npm:12.0.0":
-  version: 12.0.0
-  resolution: "@wordpress/blocks@npm:12.0.0"
+"@wordpress/blocks@npm:12.12.0":
+  version: 12.12.0
+  resolution: "@wordpress/blocks@npm:12.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/autop": ^3.23.0
-    "@wordpress/blob": ^3.23.0
-    "@wordpress/block-serialization-default-parser": ^4.23.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/shortcode": ^3.23.0
+    "@wordpress/autop": ^3.35.0
+    "@wordpress/blob": ^3.35.0
+    "@wordpress/block-serialization-default-parser": ^4.35.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/shortcode": ^3.35.0
     change-case: ^4.1.2
     colord: ^2.7.0
     fast-deep-equal: ^3.1.3
     hpq: ^1.3.0
     is-plain-object: ^5.0.0
     lodash: ^4.17.21
-    memize: ^1.1.0
-    rememo: ^4.0.0
+    memize: ^2.1.0
+    rememo: ^4.0.2
     remove-accents: ^0.4.2
     showdown: ^1.9.1
     simple-html-tokenizer: ^0.5.7
     uuid: ^8.3.0
   peerDependencies:
     react: ^18.0.0
-  checksum: 57dc392aa53d190870d31e7f0782ee45fa9d09a4a98b311266962bbdc77878495296171933a78c914afebe7d71a364fb641f54c7ac215893dbd3c2b17d2f0b07
+  checksum: 4c270e4e144e5e15f5ca79c2c48d5800c3f1a83eaa23faa1060acf491fe6033eba7ec4f7a4d5174161005d9523fdf10570e7fdde548f13398099eb4923dc3554
   languageName: node
   linkType: hard
 
-"@wordpress/browserslist-config@npm:5.6.0":
-  version: 5.6.0
-  resolution: "@wordpress/browserslist-config@npm:5.6.0"
-  checksum: 0596177a260872d6a296c9e46f93e2a8b1952face947b08ae32d0b5793ed612f023e0dfe4e61d1e74c96217a437df061f22a4000ee8228bb6314c042995cc86d
+"@wordpress/browserslist-config@npm:5.19.0":
+  version: 5.19.0
+  resolution: "@wordpress/browserslist-config@npm:5.19.0"
+  checksum: c7ae2cfdc683e8ec785a7e410064b400f44cd004c332e403fffa5f96b46eed7eeed2c69b17fd74c6124401fa3d9e91c62a40125a88c4b6cbbbb942a6f6c68290
+  languageName: node
+  linkType: hard
+
+"@wordpress/commands@npm:^0.6.0, @wordpress/commands@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@wordpress/commands@npm:0.6.2"
+  dependencies:
+    "@babel/runtime": ^7.16.0
+    "@wordpress/components": ^25.1.2
+    "@wordpress/data": ^9.5.1
+    "@wordpress/element": ^5.12.1
+    "@wordpress/i18n": ^4.35.1
+    "@wordpress/icons": ^9.26.2
+    "@wordpress/keyboard-shortcuts": ^4.12.1
+    "@wordpress/private-apis": ^0.17.1
+    cmdk: ^0.2.0
+    rememo: ^4.0.2
+  peerDependencies:
+    react: ^18.0.0
+  checksum: ee6d29971cdb245f42edb9db53ab7ac40498ae066d58b79bec941e1a38727c63aa7ad264fcc9e14c8bb75f249217aef02cad2449e057830b3a1c97d72b213722
   languageName: node
   linkType: hard
 
-"@wordpress/components@npm:23.0.0":
-  version: 23.0.0
-  resolution: "@wordpress/components@npm:23.0.0"
+"@wordpress/components@npm:25.1.0":
+  version: 25.1.0
+  resolution: "@wordpress/components@npm:25.1.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     "@emotion/cache": ^11.7.1
@@ -7824,336 +8489,375 @@ __metadata:
     "@emotion/serialize": ^1.0.2
     "@emotion/styled": ^11.6.0
     "@emotion/utils": ^1.0.0
-    "@floating-ui/react-dom": ^1.0.0
-    "@use-gesture/react": ^10.2.6
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/date": ^4.23.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/escape-html": ^2.23.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/warning": ^2.23.0
+    "@floating-ui/react-dom": 1.0.0
+    "@radix-ui/react-dropdown-menu": ^2.0.4
+    "@use-gesture/react": ^10.2.24
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/date": ^4.35.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/escape-html": ^2.35.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/primitives": ^3.33.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/warning": ^2.35.0
     change-case: ^4.1.2
     classnames: ^2.3.1
     colord: ^2.7.0
     date-fns: ^2.28.0
+    deepmerge: ^4.3.0
     dom-scroll-into-view: ^1.2.1
     downshift: ^6.0.15
     fast-deep-equal: ^3.1.3
-    framer-motion: ^7.6.1
+    framer-motion: ^10.11.6
     gradient-parser: ^0.1.5
     highlight-words-core: ^1.2.2
-    lodash: ^4.17.21
-    memize: ^1.1.0
+    is-plain-object: ^5.0.0
+    memize: ^2.1.0
+    path-to-regexp: ^6.2.1
     re-resizable: ^6.4.0
     react-colorful: ^5.3.1
-    reakit: ^1.3.8
+    reakit: ^1.3.11
     remove-accents: ^0.4.2
     use-lilius: ^2.0.1
     uuid: ^8.3.0
-    valtio: ^1.7.0
+    valtio: 1.7.0
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: d4c14c6296bfa8eee386d196a690fe8a90af404dbbc5e467ead22094c1689e486a06f34fa342113ee42b166972142b10300193ac566a6351a45f24c5aeaa155f
+  checksum: d73e7e565e5d2bb387797a6af2de66f30688915fe4e8c02e9a3eb336333e5dba2fac3de4773b9a38bee146a081eb2e89d663ab02fe84fc45d245cdc9ed04ca92
   languageName: node
   linkType: hard
 
-"@wordpress/compose@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@wordpress/compose@npm:6.0.0"
+"@wordpress/compose@npm:6.12.0":
+  version: 6.12.0
+  resolution: "@wordpress/compose@npm:6.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     "@types/mousetrap": ^1.6.8
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/priority-queue": ^2.23.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/priority-queue": ^2.35.0
     change-case: ^4.1.2
     clipboard: ^2.0.8
     mousetrap: ^1.6.5
     use-memo-one: ^1.1.1
   peerDependencies:
     react: ^18.0.0
-  checksum: 12f179ef2ecc561ec49502542f252601fb426b2ee8b8540cabf566d4e733fca3cdae8ae6f619daba338c09caff88849ff8fbaa8825a3d5a4d12adee491d00d64
+  checksum: a86e1cfedd6eadaaeb8ecbe986d3f133cffe78a3f0f210f0371cd86b077761ea73e95273269734b1ff37b58cb063c508940ae83c3c0a65a3ab1b6f0d5b8dc90a
   languageName: node
   linkType: hard
 
-"@wordpress/core-data@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@wordpress/core-data@npm:6.0.0"
+"@wordpress/core-commands@npm:^0.4.0":
+  version: 0.4.2
+  resolution: "@wordpress/core-commands@npm:0.4.2"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/commands": ^0.6.2
+    "@wordpress/core-data": ^6.12.2
+    "@wordpress/data": ^9.5.1
+    "@wordpress/element": ^5.12.1
+    "@wordpress/i18n": ^4.35.1
+    "@wordpress/icons": ^9.26.2
+    "@wordpress/private-apis": ^0.17.1
+    "@wordpress/router": ^0.4.1
+    "@wordpress/url": ^3.36.1
+  peerDependencies:
+    react: ^18.0.0
+  checksum: 14f9f9c2fdb51b4b9f5ba27029c47201dd25d75d70022eda112a9b42920c2d406925959a66f1017d621ac7fe3fca4f6fdff96ce2a6336df58876cc704f7610eb
+  languageName: node
+  linkType: hard
+
+"@wordpress/core-data@npm:6.12.0":
+  version: 6.12.0
+  resolution: "@wordpress/core-data@npm:6.12.0"
+  dependencies:
+    "@babel/runtime": ^7.16.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/url": ^3.36.0
     change-case: ^4.1.2
     equivalent-key-map: ^0.2.2
     fast-deep-equal: ^3.1.3
-    lodash: ^4.17.21
-    memize: ^1.1.0
-    rememo: ^4.0.0
+    memize: ^2.1.0
+    rememo: ^4.0.2
     uuid: ^8.3.0
   peerDependencies:
     react: ^18.0.0
-  checksum: 11cf21bf3a41624fc0bb31480edd3c4836db0f3a1fb52c4a518d46d908c5951ae43e54a8dab18e16b66cd79865db50b00cc315d308d9bc48fc379018b6ac1d38
+  checksum: d08e114d9af05d17159629239400204e925f533da677b070f0c9035d998223fb53d3f5cadf0e0d38457c50f42cad3209c0100f79bb3a08e547a693bd879ea7de
   languageName: node
   linkType: hard
 
-"@wordpress/data-controls@npm:2.23.0":
-  version: 2.23.0
-  resolution: "@wordpress/data-controls@npm:2.23.0"
+"@wordpress/data-controls@npm:3.4.0":
+  version: 3.4.0
+  resolution: "@wordpress/data-controls@npm:3.4.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-  checksum: 0f2b0629d30e14d9bb11581dd89bf1ac1963a091497af459a95124a9e49b56ea3307bdd73b073ae9c678ead44da26e1572a0af338037a2466c9acae4451762b4
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+  checksum: f6e9490beee46a0815c9bcbc29eb68d216b785c152479e510fe23b1564adf2e97ec9a69942cd76cba4b3bf872f5e9e58f1d5a96972adecb02ce53d07b39751a9
   languageName: node
   linkType: hard
 
-"@wordpress/data@npm:8.0.0":
-  version: 8.0.0
-  resolution: "@wordpress/data@npm:8.0.0"
+"@wordpress/data@npm:9.5.0":
+  version: 9.5.0
+  resolution: "@wordpress/data@npm:9.5.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/priority-queue": ^2.23.0
-    "@wordpress/redux-routine": ^4.23.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    "@wordpress/priority-queue": ^2.35.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/redux-routine": ^4.35.0
+    deepmerge: ^4.3.0
     equivalent-key-map: ^0.2.2
     is-plain-object: ^5.0.0
     is-promise: ^4.0.0
-    lodash: ^4.17.21
     redux: ^4.1.2
     turbo-combine-reducers: ^1.0.2
     use-memo-one: ^1.1.1
   peerDependencies:
     react: ^18.0.0
-  checksum: 6c669d0a221ff7c8d18409d1898493c335f1feb2b238cd4ae91cde94117c70bfbd31d2350de0a04cf48573a2fd551e703feade1e66585ff5c01d3ed3b22bb38c
+  checksum: b47f30dd8bd22e783d26972687a0b3bb8d6027cd8ddf1e89a68a727c5a83f346bc165ebfad78b626099c304f4585a7a06ad433fd4267cd5713ccf3322da29a09
   languageName: node
   linkType: hard
 
-"@wordpress/date@npm:4.23.0":
-  version: 4.23.0
-  resolution: "@wordpress/date@npm:4.23.0"
+"@wordpress/date@npm:4.36.0":
+  version: 4.36.0
+  resolution: "@wordpress/date@npm:4.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/deprecated": ^3.23.0
-    moment: ^2.22.1
-    moment-timezone: ^0.5.31
-  checksum: a761c1905128cb9b77816c76427dc873fdd0060f5bebd22737f2dba565b63c87168e38bc5caef8df2ac0687939a62d071c1681e136839e986b5560ae6777b8d9
+    "@wordpress/deprecated": ^3.36.0
+    moment: ^2.29.4
+    moment-timezone: ^0.5.40
+  checksum: e4b1cbc6fe35a8f167abedd9a6b52d0c47cab2add9e4ef6ca7cc6b25c351daf0b4412f2e7bfc13f928146912be79681658873a43fa4a100e9ef43ec936f9d71b
   languageName: node
   linkType: hard
 
-"@wordpress/dependency-extraction-webpack-plugin@npm:4.6.0":
-  version: 4.6.0
-  resolution: "@wordpress/dependency-extraction-webpack-plugin@npm:4.6.0"
+"@wordpress/dependency-extraction-webpack-plugin@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@wordpress/dependency-extraction-webpack-plugin@npm:4.19.0"
   dependencies:
-    json2php: ^0.0.5
+    json2php: ^0.0.7
     webpack-sources: ^3.2.2
   peerDependencies:
     webpack: ^4.8.3 || ^5.0.0
-  checksum: 74691d26eafc6073f75043f3317e261d40546b954c5b18f546eada50697f509f5e920a2d3ed501893ea822ce6d065ef97930f64b568f45e9085f4ad07e11e73a
+  checksum: c95f6a86beb243960ab2d81f5b760e4831b8bda5489b6bc57b7870ace20b3c58a973faff105fe2b33be6f2b972ef02a743812f7fd3a4c169d999220c340ab9e4
   languageName: node
   linkType: hard
 
-"@wordpress/deprecated@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/deprecated@npm:3.23.0"
+"@wordpress/deprecated@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/deprecated@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/hooks": ^3.23.0
-  checksum: 1f7a051a424c279a7d112dcec15777c8ebbb5a5fd9249f88af0e863c30fb8b04b069e0ccefecc6bc91d5c9a660d75aa775153e4d41b768d65d4b67d82f230930
+    "@wordpress/hooks": ^3.36.0
+  checksum: e13ebacb56dd4da1722d8a4d1d71a4b06180023aaf959c03e0ed714b03b4e2294fe52da4f9f2fb82dad48e43309c6b095875a2d4229c57b0f523628b5b0b1619
   languageName: node
   linkType: hard
 
-"@wordpress/dom-ready@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/dom-ready@npm:3.23.0"
+"@wordpress/dom-ready@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/dom-ready@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 5d0d7989d2ae56d88ef59835d264d5d6f9f074d91526c9fbb01cc33e6ef40ecc9cc581e5e8eda0374a1991f1bde1dfdaeb172958a7faf0cadf7e4045c7ee6af8
+  checksum: fe5ce60abd138eb68f6dd359fd0fb546a0f7010cc38af99195fd117e19c9abfae9b7f1f6418cb24d43dbc54196bc0425b5baec293a5393e99fa04040b8182ad4
   languageName: node
   linkType: hard
 
-"@wordpress/dom@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/dom@npm:3.23.0"
+"@wordpress/dom@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/dom@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/deprecated": ^3.23.0
-  checksum: ad32c54fed924052be652ab0c89ca9b9b3b074010a9b5c7411f075eaf94c7c5ba637274c64eb136808acb7d641637103cc83e0b4a3ede08e0339919f93e74a65
+    "@wordpress/deprecated": ^3.36.0
+  checksum: 40e8966e4ec1f6212bd91f436811677e3ab95f1623b2489b28d218b4740a81df6d076e886dc65ede8a318148e7483306b6c7ad655b13af905d577b999dee9a5e
   languageName: node
   linkType: hard
 
-"@wordpress/edit-post@npm:7.0.0":
-  version: 7.0.0
-  resolution: "@wordpress/edit-post@npm:7.0.0"
+"@wordpress/edit-post@npm:7.12.0":
+  version: 7.12.0
+  resolution: "@wordpress/edit-post@npm:7.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/block-library": ^8.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/core-data": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/editor": ^13.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/interface": ^5.0.0
-    "@wordpress/keyboard-shortcuts": ^4.0.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/media-utils": ^4.14.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/plugins": ^5.0.0
-    "@wordpress/preferences": ^3.0.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/viewport": ^5.0.0
-    "@wordpress/warning": ^2.23.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/block-library": ^8.12.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/commands": ^0.6.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/core-commands": ^0.4.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/editor": ^13.12.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/interface": ^5.12.0
+    "@wordpress/keyboard-shortcuts": ^4.12.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/media-utils": ^4.26.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/plugins": ^6.3.0
+    "@wordpress/preferences": ^3.12.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/url": ^3.36.0
+    "@wordpress/viewport": ^5.12.0
+    "@wordpress/warning": ^2.35.0
+    "@wordpress/widgets": ^3.12.0
     classnames: ^2.3.1
-    lodash: ^4.17.21
-    memize: ^1.1.0
-    rememo: ^4.0.0
+    memize: ^2.1.0
+    rememo: ^4.0.2
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: ac999109db33dc1b23b98284da9a83caf8572886b7176d18b9c2c3ee0ada3661d7ae663fd316ff6758bd5696239982fc72b37a158d1273584ecbafc94779c451
+  checksum: f17e384695dba1a16f18e465b00c11cca3d07c8a3fce99ea82cc5e50be18d8bda7c55e0c553e81d737beba76e14d8e5f82af2e8e315b950832cd5349b56a3e7f
   languageName: node
   linkType: hard
 
-"@wordpress/edit-site@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@wordpress/edit-site@npm:5.0.0"
+"@wordpress/edit-site@npm:5.12.0":
+  version: 5.12.0
+  resolution: "@wordpress/edit-site@npm:5.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/block-library": ^8.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/core-data": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/editor": ^13.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/interface": ^5.0.0
-    "@wordpress/keyboard-shortcuts": ^4.0.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/media-utils": ^4.14.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/plugins": ^5.0.0
-    "@wordpress/preferences": ^3.0.0
-    "@wordpress/reusable-blocks": ^4.0.0
-    "@wordpress/style-engine": ^1.6.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/viewport": ^5.0.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/block-library": ^8.12.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/commands": ^0.6.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/core-commands": ^0.4.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/date": ^4.35.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/editor": ^13.12.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/escape-html": ^2.35.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/interface": ^5.12.0
+    "@wordpress/keyboard-shortcuts": ^4.12.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/media-utils": ^4.26.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/plugins": ^6.3.0
+    "@wordpress/preferences": ^3.12.0
+    "@wordpress/primitives": ^3.33.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/reusable-blocks": ^4.12.0
+    "@wordpress/router": ^0.4.0
+    "@wordpress/style-engine": ^1.18.0
+    "@wordpress/url": ^3.36.0
+    "@wordpress/viewport": ^5.12.0
+    "@wordpress/widgets": ^3.12.0
+    "@wordpress/wordcount": ^3.35.0
     classnames: ^2.3.1
     colord: ^2.9.2
     downloadjs: ^1.4.7
     fast-deep-equal: ^3.1.3
-    history: ^5.1.0
     lodash: ^4.17.21
+    memize: ^2.1.0
     react-autosize-textarea: ^7.1.0
-    rememo: ^4.0.0
+    rememo: ^4.0.2
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 461730d039f122ee008938777e62e14aeae1ccf33267d700a1c3947e65fe5553163a80d65bf363bda9f7ac56d1a015f0a3adb4c5b2e253397a3cdf4ce72ea710
+  checksum: 4038f950112e11ce3b47ada1a0c5ce74d2c5d6647d4ee47649c6043e2803d747cf1c3e56a603e4de3f5c7e6239afbb40d53efd5982c7f58e0615e6ac0d2d26a8
   languageName: node
   linkType: hard
 
-"@wordpress/editor@npm:13.0.0":
-  version: 13.0.0
-  resolution: "@wordpress/editor@npm:13.0.0"
+"@wordpress/editor@npm:13.12.0":
+  version: 13.12.0
+  resolution: "@wordpress/editor@npm:13.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/blob": ^3.23.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/core-data": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/date": ^4.23.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/keyboard-shortcuts": ^4.0.0
-    "@wordpress/keycodes": ^3.23.0
-    "@wordpress/media-utils": ^4.14.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/preferences": ^3.0.0
-    "@wordpress/reusable-blocks": ^4.0.0
-    "@wordpress/rich-text": ^6.0.0
-    "@wordpress/server-side-render": ^4.0.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/wordcount": ^3.23.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/blob": ^3.35.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/date": ^4.35.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/dom": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/html-entities": ^3.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/keyboard-shortcuts": ^4.12.0
+    "@wordpress/keycodes": ^3.35.0
+    "@wordpress/media-utils": ^4.26.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/preferences": ^3.12.0
+    "@wordpress/private-apis": ^0.17.0
+    "@wordpress/reusable-blocks": ^4.12.0
+    "@wordpress/rich-text": ^6.12.0
+    "@wordpress/server-side-render": ^4.12.0
+    "@wordpress/url": ^3.36.0
+    "@wordpress/wordcount": ^3.35.0
     classnames: ^2.3.1
     date-fns: ^2.28.0
     escape-html: ^1.0.3
-    lodash: ^4.17.21
-    memize: ^1.1.0
+    memize: ^2.1.0
     react-autosize-textarea: ^7.1.0
-    rememo: ^4.0.0
+    rememo: ^4.0.2
     remove-accents: ^0.4.2
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: dfcc04d2d2cc6c9086edaa1a14cc33df4b838f2fa07cc58d29ef4987fdef9aaab789f4cc56255531cbf313887d4530c9460a3eec6fc5a7d206deed80afe2e165
+  checksum: cfad2113ed9ed80ed1fa3908c4c8292613f9a81b27fc9050e00d4a8e5a3c9deddafb99a03057d1a3f64100cd1845f215dcf511d897a30d154ce9ae9d0c7d98f7
   languageName: node
   linkType: hard
 
-"@wordpress/element@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@wordpress/element@npm:5.0.0"
+"@wordpress/element@npm:5.13.0":
+  version: 5.13.0
+  resolution: "@wordpress/element@npm:5.13.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     "@types/react": ^18.0.21
     "@types/react-dom": ^18.0.6
-    "@wordpress/escape-html": ^2.23.0
+    "@wordpress/escape-html": ^2.36.0
     change-case: ^4.1.2
     is-plain-object: ^5.0.0
     react: ^18.2.0
     react-dom: ^18.2.0
-  checksum: c15da19d3c0409f7c5a5611f7432d2a24733c453953be5b765e45bb9ee2209de48dfd94df7d4d03a0b7195da6db34bedf7042b46a1c6aee4c1dc5bfa418cd7c0
+  checksum: c3742ab170fda0e6f85392be639f598c0a34200b9443d9dd1c91ce6068613fc8aa63ebceb32fd29d015c5f85e7204706466d33a362bb53befa5a302f59e5d560
   languageName: node
   linkType: hard
 
@@ -8179,29 +8883,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wordpress/escape-html@npm:2.23.0":
-  version: 2.23.0
-  resolution: "@wordpress/escape-html@npm:2.23.0"
+"@wordpress/escape-html@npm:2.36.0":
+  version: 2.36.0
+  resolution: "@wordpress/escape-html@npm:2.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 91686eaebad4a696e8d88db308da72114e50b676acf57cbcc5714e66348822382c16d3011924c74068536edf5fd84eb85ff0a98f84726cd262f8d067ae1cf192
+  checksum: 1500a2ffdb0e32849e0ea153624e2b197c1260d608bdf5c04687819567e393c1d1b31e066d6ecb36457a3effe829d3aa37c334dd79299350e7a11cb097e48203
   languageName: node
   linkType: hard
 
-"@wordpress/eslint-plugin@npm:13.7.0":
-  version: 13.7.0
-  resolution: "@wordpress/eslint-plugin@npm:13.7.0"
+"@wordpress/eslint-plugin@npm:14.8.0":
+  version: 14.8.0
+  resolution: "@wordpress/eslint-plugin@npm:14.8.0"
   dependencies:
     "@babel/eslint-parser": ^7.16.0
     "@typescript-eslint/eslint-plugin": ^5.3.0
     "@typescript-eslint/parser": ^5.3.0
-    "@wordpress/babel-preset-default": ^7.7.0
-    "@wordpress/prettier-config": ^2.6.0
+    "@wordpress/babel-preset-default": ^7.19.0
+    "@wordpress/prettier-config": ^2.18.0
     cosmiconfig: ^7.0.0
     eslint-config-prettier: ^8.3.0
     eslint-plugin-import: ^2.25.2
-    eslint-plugin-jest: ^25.2.3
-    eslint-plugin-jsdoc: ^37.0.3
+    eslint-plugin-jest: ^27.2.1
+    eslint-plugin-jsdoc: ^39.6.9
     eslint-plugin-jsx-a11y: ^6.5.1
     eslint-plugin-prettier: ^3.3.0
     eslint-plugin-react: ^7.27.0
@@ -8218,170 +8922,144 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 702ef65b28c57d6c30757b4af04d4c3db5576e25b85e4ca816c5c2ba5b8fe2b1f7288e597e8b1a4acc2e5bf5c6101ba466f00c9d89e14e7306bb1f95ca3385e2
+  checksum: 773997727d22451603a7730734c742e0a4c2532d26d24c27db09ab72703ec5276c300a665892fb1d45ef521ec0f60d5ca8bd39c270fddd475437da8ef1995e03
   languageName: node
   linkType: hard
 
-"@wordpress/hooks@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/hooks@npm:3.23.0"
+"@wordpress/hooks@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/hooks@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 3b5891dc1b86c17d70ccef84ad7c724c86c772fb991bdebe49f3c9b02ef0918947a615c7640f30192ec4c705c0be3a292777a2aeaf87249b9f04993a9031566f
+  checksum: b45f9b86cc0a0519895b75a0ed85b27feea52627a7e337739e476791749d2eaf2878b7b46d1c406e6798360f27ce9549445fdeba238e574f43fcd7ad9f312da9
   languageName: node
   linkType: hard
 
-"@wordpress/html-entities@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/html-entities@npm:3.23.0"
+"@wordpress/html-entities@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/html-entities@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: e6d92fdefd176b55fe2855459af4b480fbe9eeb2b5b81ab3c8d58ec780916f69b8f9824cf8a4f46808af00f8835683d2dd9f01845a37887961597e1bb0acf537
+  checksum: 5ffb97222a9a93b917a2e79c6758c1f8804c27a1f10da63fecf17c13afbbd6e30e2443f757e595a355e22aa9e11a77acb5ce2af54a47109a945d174faabf75d8
   languageName: node
   linkType: hard
 
-"@wordpress/i18n@npm:4.23.0":
-  version: 4.23.0
-  resolution: "@wordpress/i18n@npm:4.23.0"
+"@wordpress/i18n@npm:4.36.0":
+  version: 4.36.0
+  resolution: "@wordpress/i18n@npm:4.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/hooks": ^3.23.0
+    "@wordpress/hooks": ^3.36.0
     gettext-parser: ^1.3.1
-    memize: ^1.1.0
+    memize: ^2.1.0
     sprintf-js: ^1.1.1
     tannin: ^1.2.0
   bin:
     pot-to-php: tools/pot-to-php.js
-  checksum: 3353efcb241e2eb914bd009afcdbfac251cbd1769cd3edd3bfbce6cbffdad121772f182547f3d0506da00cb05610253da9be73229efc47b6209dd9436d06c309
+  checksum: 15ef24031c6ffb613d3476da3b8bdb61092625b9d0d467047fd5f69a08f19d3278c9faaf7a33f7166a41dacd0aa6f09b8e802b65d974c9a06fb2494fd85e3de5
   languageName: node
   linkType: hard
 
-"@wordpress/icons@npm:9.14.0":
-  version: 9.14.0
-  resolution: "@wordpress/icons@npm:9.14.0"
+"@wordpress/icons@npm:9.26.0":
+  version: 9.26.0
+  resolution: "@wordpress/icons@npm:9.26.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/primitives": ^3.21.0
-  checksum: 00570dceaceaf0867ba64710699d449460ee9d94ab62a7d7bdf0d71ad3cf9cd6df75b24af86f14b8d6ae1cad1b6b89aa2b2488340cf2b305c8b77122732e3da5
+    "@wordpress/element": ^5.12.0
+    "@wordpress/primitives": ^3.33.0
+  checksum: 4a45e975cfbfc7d0fbd38d28b4918d68e76ad8f548a9fe10bc9ab9b8395790c910cb16fdf656d1ed2218cc8f3e84c2802b01c44c889cf189cc60355a0f117a0f
   languageName: node
   linkType: hard
 
-"@wordpress/interface@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@wordpress/interface@npm:5.0.0"
+"@wordpress/interface@npm:5.12.0":
+  version: 5.12.0
+  resolution: "@wordpress/interface@npm:5.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/plugins": ^5.0.0
-    "@wordpress/preferences": ^3.0.0
-    "@wordpress/viewport": ^5.0.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/plugins": ^6.3.0
+    "@wordpress/preferences": ^3.12.0
+    "@wordpress/viewport": ^5.12.0
     classnames: ^2.3.1
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 54da16374c1708cc6f90fd710028a7effe427fadc04703894eee8b9e6d735a4f90fe95be43e4aba48426838e7e0bb9ddcd6453ceaa4e13ff5fb9656e7ee221a8
-  languageName: node
-  linkType: hard
-
-"@wordpress/is-shallow-equal@npm:4.23.0":
-  version: 4.23.0
-  resolution: "@wordpress/is-shallow-equal@npm:4.23.0"
-  dependencies:
-    "@babel/runtime": ^7.16.0
-  checksum: 74786bf862c0b6c9024be31fc3a82180018b664f72aca37916f8f598c445cd05e1452f95e300833a1643e77bb3901ddfef57cd497c20dbcc49873804ff430dc8
+  checksum: 59dbcf69d874aef8562a5374e2365f2abd93a93a67c56782a4def2ce48172a5b359826964c3e6935aa60f85946117da4295f816249cee7f08b69f7a6462a4fd1
   languageName: node
   linkType: hard
 
-"@wordpress/jest-console@npm:6.6.0":
-  version: 6.6.0
-  resolution: "@wordpress/jest-console@npm:6.6.0"
+"@wordpress/is-shallow-equal@npm:4.36.0":
+  version: 4.36.0
+  resolution: "@wordpress/is-shallow-equal@npm:4.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    jest-matcher-utils: ^27.4.2
-  peerDependencies:
-    jest: ">=27"
-  checksum: a67bfeaec543dae3a28cda5351e64511b8276c56ed69a92b974488018e095c3179e51d341bbb1b4ee9b2e5f54a096dc43b70ba4e143bc37f52ce3d8774f8ffb7
-  languageName: node
-  linkType: hard
-
-"@wordpress/jest-preset-default@npm:10.4.0":
-  version: 10.4.0
-  resolution: "@wordpress/jest-preset-default@npm:10.4.0"
-  dependencies:
-    "@wordpress/jest-console": ^6.6.0
-    babel-jest: ^27.4.5
-  peerDependencies:
-    "@babel/core": ">=7"
-    jest: ">=27"
-  checksum: 2053ce73dc401b1506f8c5db4ff3dc903b0467ee6e5bebccc553f66afd6145572a6c259519d840ff50dd3600a22977e5a362c046b6e42920d20d3fbfa776cada
+  checksum: 79b71693ae65227cb526c52fe7c00ef1b0726f88ae3f2be9eb5efc49a44d9fb8761e77024b5c3431032a3a2e1b0cacbdec07471661c7c463d1194c126cdd64ea
   languageName: node
   linkType: hard
 
-"@wordpress/keyboard-shortcuts@npm:4.0.0":
-  version: 4.0.0
-  resolution: "@wordpress/keyboard-shortcuts@npm:4.0.0"
+"@wordpress/keyboard-shortcuts@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@wordpress/keyboard-shortcuts@npm:4.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/keycodes": ^3.23.0
-    rememo: ^4.0.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/keycodes": ^3.35.0
+    rememo: ^4.0.2
   peerDependencies:
     react: ^18.0.0
-  checksum: 60aec720db7ca40056285c5119170562cdb63168bc66ce2cb888fbc81a123a8d1d62d18058311d82ca7d8bee7dd6df5ba78ce8bc2111d6f356ba6042d91d9a6e
+  checksum: 6db6be2fb90c7bf866700c49658802090d3b99729773df0d76ae1e97fb30292e6d3d86f081de29ebb84edef21faac6be45c928ef18b0c823505a1e6e2ae8b7bb
   languageName: node
   linkType: hard
 
-"@wordpress/keycodes@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/keycodes@npm:3.23.0"
+"@wordpress/keycodes@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/keycodes@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/i18n": ^4.23.0
+    "@wordpress/i18n": ^4.36.0
     change-case: ^4.1.2
-    lodash: ^4.17.21
-  checksum: ca91d3131e4d11a32a84d0d6dad0a97e10b799767a4624a6407032409f146e7830ca74d17715cc9c1db2c67dc949da3704c53319e602d6160a3803bee0684b8f
+  checksum: 4bd0ca8bb34cdb9831e9bd763a263ae9e9d080ca4c6ddf4cb08328dcc56da1bfbd6fca60bbcdac23cd487ccd9b984c20041df682036e316d2b455bf30f5721a3
   languageName: node
   linkType: hard
 
-"@wordpress/media-utils@npm:4.14.0":
-  version: 4.14.0
-  resolution: "@wordpress/media-utils@npm:4.14.0"
+"@wordpress/media-utils@npm:4.26.0":
+  version: 4.26.0
+  resolution: "@wordpress/media-utils@npm:4.26.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/blob": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-  checksum: 6ba5b43892148f9495fddee5d960e0d5ef46646b22c29a1d72b85202fade5a78b634176763a3a26d2dfd8b03edf9fc96584c20acc9476612a979b163d6e91b93
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/blob": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
+  checksum: e056be9bea37094ffc5b1ca74b3fa6c4313a8b2e77094a22cd36118d651e95e09b5c5ae2dade2c6ff33d780dfd1e98116f4a1ce523d0bbd791dd1ef27f0dd752
   languageName: node
   linkType: hard
 
-"@wordpress/notices@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/notices@npm:3.23.0"
+"@wordpress/notices@npm:4.3.0":
+  version: 4.3.0
+  resolution: "@wordpress/notices@npm:4.3.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/data": ^8.0.0
-  checksum: 5a66096f16ff8ab72eb866ace554d295255766f3677b7c0afc27bcf10eb8ff8f75b496a74403d17111d2b67ff5b46073ecbc25df2a356d5c2650e07c4dde6b23
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/data": ^9.5.0
+  checksum: 855bd2cae0e1eed3b5bfd65d764bb9e2affa5b24700e0c5d4405420996b62033f18c95932af02d52b61ceede9abd7ed57ffe90b8c71875ee6b5578d05a003d1c
   languageName: node
   linkType: hard
 
-"@wordpress/npm-package-json-lint-config@npm:4.8.0":
-  version: 4.8.0
-  resolution: "@wordpress/npm-package-json-lint-config@npm:4.8.0"
+"@wordpress/npm-package-json-lint-config@npm:4.21.0":
+  version: 4.21.0
+  resolution: "@wordpress/npm-package-json-lint-config@npm:4.21.0"
   peerDependencies:
     npm-package-json-lint: ">=3.6.0"
-  checksum: 1bc1a0ee29f73548bbb87072f1e22a75e742845a1f7789720f15368eb71d8be81d11fbc3eb7fcf6f01ee13b5bb6155096d107f5d69ef7cfd544f98d8b2ffff60
+  checksum: 5fe1459f0dc11580a56ffdfd2313b7d1ec396f676b7db1f7e9ba3de784054e7eb58685a98f7d06336ca69d1cc391b98916df8e5cab579c59e3f0b94d231ff4ab
   languageName: node
   linkType: hard
 
@@ -8405,103 +9083,105 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wordpress/plugins@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@wordpress/plugins@npm:5.0.0"
+"@wordpress/plugins@npm:6.3.0":
+  version: 6.3.0
+  resolution: "@wordpress/plugins@npm:6.3.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/hooks": ^3.23.0
-    "@wordpress/icons": ^9.14.0
-    memize: ^1.1.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/hooks": ^3.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.35.0
+    memize: ^2.0.1
   peerDependencies:
     react: ^18.0.0
-  checksum: 38ef6d3acf908a443ac838a0c6adb19d4ea3ecefc13dbd991c53d853ddf6d2d8534f773f98d6596f3b38c301bc280462d93c4984dce0c147074311d6e3179eef
+  checksum: 207c94bc3106c7b57e4fe3da997f49a32fdde7a7a07787400e01f9e96e7771d99ade10ca1aa100c5df9c1a81d1a50ebf0a501a4666af45d7303d2e47580f5c56
   languageName: node
   linkType: hard
 
-"@wordpress/preferences@npm:3.0.0":
-  version: 3.0.0
-  resolution: "@wordpress/preferences@npm:3.0.0"
+"@wordpress/preferences@npm:3.12.0":
+  version: 3.12.0
+  resolution: "@wordpress/preferences@npm:3.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
     classnames: ^2.3.1
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: dce7816d97560c77920bbe1e073df8f4102eeda0161ca254010299f63e3c24235024da92e08389e91bd0f23d60e86517b0008a9242be76e3bb47417b2444e7a1
+  checksum: 11c85974739741779ec82e53958b415f15cec3348a32f08a18cbea35edb4b3fe1e4f7717d9a0e9692af1e402b2685b0ffb62c9773cb68471b2ce7621c28a15af
   languageName: node
   linkType: hard
 
-"@wordpress/prettier-config@npm:2.6.0":
-  version: 2.6.0
-  resolution: "@wordpress/prettier-config@npm:2.6.0"
+"@wordpress/prettier-config@npm:2.19.0":
+  version: 2.19.0
+  resolution: "@wordpress/prettier-config@npm:2.19.0"
   peerDependencies:
     prettier: ">=2"
-  checksum: 2bc13de4db398e6513bf0e718df201c25c192aace5ed0fdc76cffb816489c1836f3aedf4fb6a83b559d8d7247283fc1f320925d265e4f52625f6c3991765a092
+  checksum: 52b96c43c656fd00c3991ffdc23aa75e56cb475e0c19f116674456cb75600d4bf1347ac3381a54377b58d6f221843b14f7ec80fc172b332789407534091c03ce
   languageName: node
   linkType: hard
 
-"@wordpress/primitives@npm:3.21.0":
-  version: 3.21.0
-  resolution: "@wordpress/primitives@npm:3.21.0"
+"@wordpress/primitives@npm:3.34.0":
+  version: 3.34.0
+  resolution: "@wordpress/primitives@npm:3.34.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/element": ^5.0.0
+    "@wordpress/element": ^5.13.0
     classnames: ^2.3.1
-  checksum: 4f9130ae34bece15d7dd453a36e570fd7330556674f60fe79933cd9a01129a5f216ba33d8f37af0d194b43b03ed113071564dcb63a706c02f8927663bc1368b3
+  checksum: 4c8050f891ac8e594af9601e828b0a467bcbc9f942616aa3013660bea47a3f88e00d72131361cf7e444fedf6b28a13456106a31e39f828f9622953f3f34abefd
   languageName: node
   linkType: hard
 
-"@wordpress/priority-queue@npm:2.23.0":
-  version: 2.23.0
-  resolution: "@wordpress/priority-queue@npm:2.23.0"
+"@wordpress/priority-queue@npm:2.36.0":
+  version: 2.36.0
+  resolution: "@wordpress/priority-queue@npm:2.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     requestidlecallback: ^0.3.0
-  checksum: 51a168913353401318b4acb739ce730d58540cc4853d8089fbb16d650ca2ff22291d1c389bf3a840f17d7b076ffbfd5dceabfb0bd1dfb972f95fb88d4616caae
+  checksum: 1694c44b8602bcfa5fed7bfcbada9f7f3ced1fb06bc90372cb570a8f9e8c8f232647b6e32483d0b72166652769e2b76162d4bd4c263709fdb4db1b6efd97f66d
   languageName: node
   linkType: hard
 
-"@wordpress/private-apis@npm:^0.15.0":
-  version: 0.15.0
-  resolution: "@wordpress/private-apis@npm:0.15.0"
+"@wordpress/private-apis@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@wordpress/private-apis@npm:0.18.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 410a62f76ed72c19467cea751bbf400368b7a4fa367b99e2a656980066da4cdd0eec4506e5dd9bae18fe8c89b46d53b5eed89583f65f08cc52c5e9d0756063fa
+  checksum: dfbf7fa94f5540d070fcd120ab364d9f74fa695a2fc46b51ba3750e5db2c33df8e0b539229f1b9615d729540ed0bd8d9303e460cbe0b40bf9d377ee4695dcaa0
   languageName: node
   linkType: hard
 
-"@wordpress/react-i18n@npm:3.21.0":
-  version: 3.21.0
-  resolution: "@wordpress/react-i18n@npm:3.21.0"
+"@wordpress/react-i18n@npm:3.33.0":
+  version: 3.33.0
+  resolution: "@wordpress/react-i18n@npm:3.33.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
     utility-types: ^3.10.0
-  checksum: 9dc4005a65d8f51bb629af64399bb39aeba4a684d39e441909941a418afde74b34601a0c9e826b0d71d5c40afaf9fefe6d97f031ff0c6cb29d3a2c745627b4b1
+  checksum: 079b5b5426eb48ea6744876ef264253df1dd7474b4da409da4bef5b468e8e33d4dafa64e3b66b840e032f66f7d2b216b2bbc8b1aeadf916a0fee4086a0e7078a
   languageName: node
   linkType: hard
 
-"@wordpress/readable-js-assets-webpack-plugin@npm:2.6.0":
-  version: 2.6.0
-  resolution: "@wordpress/readable-js-assets-webpack-plugin@npm:2.6.0"
+"@wordpress/readable-js-assets-webpack-plugin@npm:2.19.0":
+  version: 2.19.0
+  resolution: "@wordpress/readable-js-assets-webpack-plugin@npm:2.19.0"
   peerDependencies:
     webpack: ^4.8.3 || ^5.0.0
-  checksum: c286f178ef6db7dc6c4c7c4d6763951086eecf9cc59f53dd8067d53e981ceb10de5a326955fc5970fa120702e17e5b5f01f7da9ad2967508a91628a8e7f34cec
+  checksum: 7de274925aad0d033fdeefba3581a77b5454da22184035f626aecc7ef07c417c1904fc705bedb88dd04ac7577fafccb51651f03d4c8ac27905b16df210993859
   languageName: node
   linkType: hard
 
-"@wordpress/redux-routine@npm:4.23.0":
-  version: 4.23.0
-  resolution: "@wordpress/redux-routine@npm:4.23.0"
+"@wordpress/redux-routine@npm:4.36.0":
+  version: 4.36.0
+  resolution: "@wordpress/redux-routine@npm:4.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     is-plain-object: ^5.0.0
@@ -8509,152 +9189,190 @@ __metadata:
     rungen: ^0.3.2
   peerDependencies:
     redux: ">=4"
-  checksum: 646ebdf28a56fd38594d41021b893976772d8a9622379a7d53f5844d7983b744b5856d76a921b9662ccd8d7541dc8952d6b1056eeb7c31eed87b4f2800d25133
+  checksum: 88419044d0d5fc8df0fcd32609d559f39d497d8f0370a38db06458c25a6385f10b462d27fe6e1f1b308c3bdb9b3fc49cfc310d5fa42c171b0b1eac31ab705ecb
   languageName: node
   linkType: hard
 
-"@wordpress/reusable-blocks@npm:4.0.0":
-  version: 4.0.0
-  resolution: "@wordpress/reusable-blocks@npm:4.0.0"
-  dependencies:
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/core-data": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/notices": ^3.23.0
-    "@wordpress/url": ^3.24.0
+"@wordpress/reusable-blocks@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@wordpress/reusable-blocks@npm:4.12.0"
+  dependencies:
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/notices": ^4.3.0
+    "@wordpress/url": ^3.36.0
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 825ce2231be443b3979f6269fde2c7527fc9846c7b6a4373bb6d9cc955c53dd46a832c1b079bb4bcd7e0a84f54e340552c4fb7e03409d8f7b00be79a7a6ee23c
+  checksum: ba1967dd5f2284e786c1c5cc892059825e978902155340498ce7c7c8e6e51a4b51373121dd919001c1ec2fedcdaee9b4d621952908f5e6eb60f57d69fe0fd11f
   languageName: node
   linkType: hard
 
-"@wordpress/rich-text@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@wordpress/rich-text@npm:6.0.0"
+"@wordpress/rich-text@npm:6.12.0":
+  version: 6.12.0
+  resolution: "@wordpress/rich-text@npm:6.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/escape-html": ^2.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/keycodes": ^3.23.0
-    memize: ^1.1.0
-    rememo: ^4.0.0
+    "@wordpress/a11y": ^3.35.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/escape-html": ^2.35.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/keycodes": ^3.35.0
+    memize: ^2.1.0
+    rememo: ^4.0.2
   peerDependencies:
     react: ^18.0.0
-  checksum: fa67daee56b1fb995624a1d1587cc3ef4dd2384a33f0c23df98994d7352abedbb53e3a4e5eb1882bcd704aa96c22c4cf6e540757198dfda5a99e07b0f7d51e4a
+  checksum: 84112f2a16918cc8042a0e57befaa689ec4922455f5a4098aec3e47a310413f4d239e38d5f2eeb11aa18ec76ae51ecd8aeb332d225668c3fda246ef73593ea72
   languageName: node
   linkType: hard
 
-"@wordpress/server-side-render@npm:4.0.0":
-  version: 4.0.0
-  resolution: "@wordpress/server-side-render@npm:4.0.0"
+"@wordpress/router@npm:^0.4.0, @wordpress/router@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@wordpress/router@npm:0.4.1"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/deprecated": ^3.23.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/element": ^5.12.1
+    "@wordpress/private-apis": ^0.17.1
+    "@wordpress/url": ^3.36.1
+    history: ^5.1.0
+  peerDependencies:
+    react: ^18.0.0
+  checksum: 5bf73be5d74b0ef6093227d08c5445771327c7c9faca0e081b0bf0855ba5629aa327ddd650d4b76f697a3b47dff0f7e47e9a4bd2196452066e40550ccd584ee6
+  languageName: node
+  linkType: hard
+
+"@wordpress/server-side-render@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@wordpress/server-side-render@npm:4.12.0"
+  dependencies:
+    "@babel/runtime": ^7.16.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/deprecated": ^3.35.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/url": ^3.36.0
     fast-deep-equal: ^3.1.3
-    lodash: ^4.17.21
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: b316234c7583b1912d5906af906ba806e1ac6fc7b2969fb9be6db087c2c0e7b363621723657a749794f4d03d0dc0c514565275bd52adc441e61909a24125b4dc
+  checksum: a13d9e1efb3716314ab2da57ffa64e88fe1572d395cc776f0cc528dae934b79b09c0d0ad35432434af88c8b6bbe2503eab013b2cfcf8a77ef80187f84debf584
   languageName: node
   linkType: hard
 
-"@wordpress/shortcode@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/shortcode@npm:3.23.0"
+"@wordpress/shortcode@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/shortcode@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    memize: ^1.1.0
-  checksum: 0384acf47e6c6db7de803d35e306a16dcac35a8130a91ecf60e2240a7339b477a3053fb616d9edd38c25f625d9efc2523b34a5577da29eb8b4ccee01af2d019a
+    memize: ^2.0.1
+  checksum: 3e97c16f65eeee288811e9703c14f1f2edcc9a792e0fd3c8f6e4e716b0b1a97b86f6a9cca41194842f9c47529c2609cf622da3a4965a56a9d17694138705e760
   languageName: node
   linkType: hard
 
-"@wordpress/style-engine@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@wordpress/style-engine@npm:1.6.0"
+"@wordpress/style-engine@npm:1.19.0":
+  version: 1.19.0
+  resolution: "@wordpress/style-engine@npm:1.19.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     lodash: ^4.17.21
-  checksum: 47e4964f84ca5d3b41de66c01bbdcd92b55e4165207499175a23fa91b9d4fe4906cd288aa05d0a065520bf268d2eb9a347af928e3e4c47c83eceb30d1f279a9e
+  checksum: 333994e169231921def2e83572fe83673025d5c28fb38a2682f4b5acb9939178f11e66ba0a343a6cf6410aaf28fd6963f6446104dfc235114a2cfe7048de8044
   languageName: node
   linkType: hard
 
-"@wordpress/stylelint-config@npm:21.6.0":
-  version: 21.6.0
-  resolution: "@wordpress/stylelint-config@npm:21.6.0"
+"@wordpress/stylelint-config@npm:21.19.0":
+  version: 21.19.0
+  resolution: "@wordpress/stylelint-config@npm:21.19.0"
   dependencies:
     stylelint-config-recommended: ^6.0.0
     stylelint-config-recommended-scss: ^5.0.2
   peerDependencies:
     stylelint: ^14.2
-  checksum: 1ca921948b1e945a6996b559e8679ee7d5d534eb1be3643bdd6fec7a9eb4530e37a7b14b0e5738fdfc93483428fe95ab592358de1a7a92e3155e9639e1d2888e
+  checksum: 932ce0e523b45cb24a36d3d400c184309d0f2c7f9f19b08de2d670b4b3d15a2df6d6edd1ec9fe8f1fffd9dff7c8399ad72a37489d12ed80ac704f0560276e3dd
   languageName: node
   linkType: hard
 
-"@wordpress/token-list@npm:2.23.0":
-  version: 2.23.0
-  resolution: "@wordpress/token-list@npm:2.23.0"
+"@wordpress/token-list@npm:2.36.0":
+  version: 2.36.0
+  resolution: "@wordpress/token-list@npm:2.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 7e3c72d59ccb49204e3ca9cd8e90a6f7c5b95fac2a66c31e17e253cf55489ac211e92ccec38a47f7c2f78d9cb6c5116e5a0d7e962f4f6ac4bc0fa2136c7e51f3
+  checksum: cd12e801400d2b92a63324700488c9215e778e17374dc9d138c17744b92868991adff7174c3a6d0de0395f7050a19a61d2b3219355cd41b2c6f60954f18033d0
   languageName: node
   linkType: hard
 
-"@wordpress/url@npm:3.24.0":
-  version: 3.24.0
-  resolution: "@wordpress/url@npm:3.24.0"
+"@wordpress/url@npm:3.37.0":
+  version: 3.37.0
+  resolution: "@wordpress/url@npm:3.37.0"
   dependencies:
     "@babel/runtime": ^7.16.0
     remove-accents: ^0.4.2
-  checksum: deed707d350598bafc5ec775966a507fdc7046620585a24331f22c05a2234b55c4cff67680a38324745c11a410154abe6f2ef8ccfd816c96094dd94f173f1594
+  checksum: b032d18db91a83d562c50daacc416ac9dc8efda17f7bc8eba64e45fbf6c6c99453636bf084512d4b19daaaf4135584ecc4ee11491eaf5a5721b418e59df1fe52
   languageName: node
   linkType: hard
 
-"@wordpress/viewport@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@wordpress/viewport@npm:5.0.0"
+"@wordpress/viewport@npm:5.12.0":
+  version: 5.12.0
+  resolution: "@wordpress/viewport@npm:5.12.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+  peerDependencies:
+    react: ^18.0.0
+  checksum: cbaf7c167cfc1ba4912b74b2df2170f1c178ef1f872bb5f2238e2f781442b3afc4fe7d35cb97fb80a04151182a7fddfc3a9a6bb22de6ebc9b641a4c60466be23
+  languageName: node
+  linkType: hard
+
+"@wordpress/warning@npm:2.36.0":
+  version: 2.36.0
+  resolution: "@wordpress/warning@npm:2.36.0"
+  checksum: 2332d01c1a6550c00043aec85877c90a2c94078e4fe6bec1259e63a24cde4fe31a1de5e2ecc27d72e7ec175205d3dcbd6519116a192e6708df1a8d114b2dc872
+  languageName: node
+  linkType: hard
+
+"@wordpress/widgets@npm:3.12.0":
+  version: 3.12.0
+  resolution: "@wordpress/widgets@npm:3.12.0"
+  dependencies:
+    "@babel/runtime": ^7.16.0
+    "@wordpress/api-fetch": ^6.32.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/core-data": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/element": ^5.12.0
+    "@wordpress/i18n": ^4.35.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/notices": ^4.3.0
+    classnames: ^2.3.1
   peerDependencies:
     react: ^18.0.0
-  checksum: 2de2d0677e66313ddeefdb1c6011fbc71c76cf9927ac184d0e7560f1c67362f44a011ace23bddeeebfbcf3b424065523accee20ffef35523c915b8075c314955
-  languageName: node
-  linkType: hard
-
-"@wordpress/warning@npm:2.23.0":
-  version: 2.23.0
-  resolution: "@wordpress/warning@npm:2.23.0"
-  checksum: 9d1c5f7d06ad5791595d653bf1028b7027fbc56a27946ccab4974db32608e9d046b9afd8c94adb38e5cbf037a67bde61f4d0f74e3a1c5d3b1a618e899ca8951a
+    react-dom: ^18.0.0
+  checksum: ab04584945983f31049ae17599a32ab79a4cdb384e74dabfd666f99dd4f9e47310781461a8d63974a4699dbf8b671f394cb7e3069ea1c068a21dcc3896170557
   languageName: node
   linkType: hard
 
-"@wordpress/wordcount@npm:3.23.0":
-  version: 3.23.0
-  resolution: "@wordpress/wordcount@npm:3.23.0"
+"@wordpress/wordcount@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@wordpress/wordcount@npm:3.36.0"
   dependencies:
     "@babel/runtime": ^7.16.0
-  checksum: 8f2d4706741391cb3cd34acf7993eb0bb424fd4c695d0c8dcdbff41ef3a013cfa7312c64b71f9a5c7464b201fbd6d762e080b455f0ecd72d1e006beb052a7230
+  checksum: 117c416ac01f71933f911cc0c47beb378305d4e77792d217aa9debf0f396be5e9963ffb4c27ee85a9e5b1cf718d0b7f5b97bf446c6426b550f178b4801496de7
   languageName: node
   linkType: hard
 
@@ -9233,6 +9951,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-hidden@npm:^1.1.1":
+  version: 1.2.3
+  resolution: "aria-hidden@npm:1.2.3"
+  dependencies:
+    tslib: ^2.0.0
+  checksum: 46b07b7273167ad3fc2625f1ecbb43f8e6f73115c66785cbb5dcf1e2508133a43b6419d610c39676ceaeb563239efbd8974d5c0187695db8b3e8c3e11f549c2d
+  languageName: node
+  linkType: hard
+
 "aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":
   version: 5.1.3
   resolution: "aria-query@npm:5.1.3"
@@ -9676,24 +10403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^27.4.5":
-  version: 27.5.1
-  resolution: "babel-jest@npm:27.5.1"
-  dependencies:
-    "@jest/transform": ^27.5.1
-    "@jest/types": ^27.5.1
-    "@types/babel__core": ^7.1.14
-    babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^27.5.1
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    slash: ^3.0.0
-  peerDependencies:
-    "@babel/core": ^7.8.0
-  checksum: 3ec8fdabba150431e430ab98d31ba62a1e0bc0fb2fd8d9236cb7dffda740de99c0b04f24da54ff0b5814dce9f81ff0c35a61add53c0734775996a11a7ba38318
-  languageName: node
-  linkType: hard
-
 "babel-jest@npm:^29.6.1":
   version: 29.6.1
   resolution: "babel-jest@npm:29.6.1"
@@ -9768,18 +10477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "babel-plugin-jest-hoist@npm:27.5.1"
-  dependencies:
-    "@babel/template": ^7.3.3
-    "@babel/types": ^7.3.3
-    "@types/babel__core": ^7.0.0
-    "@types/babel__traverse": ^7.0.6
-  checksum: 2f08ebde32d9d2bffff75524bda44812995b3fcab6cbf259e1db52561b6c8d829f4688db77ef277054a362c9a61826e121a2a4853b0bf93d077ebb3b69685f8e
-  languageName: node
-  linkType: hard
-
 "babel-plugin-jest-hoist@npm:^29.5.0":
   version: 29.5.0
   resolution: "babel-plugin-jest-hoist@npm:29.5.0"
@@ -9909,18 +10606,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "babel-preset-jest@npm:27.5.1"
-  dependencies:
-    babel-plugin-jest-hoist: ^27.5.1
-    babel-preset-current-node-syntax: ^1.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: fc2f7fd03d8cddb36e0a07a94f1bb1826f7d7dae1f3519ed170c7a5e56c863aecbdb3fd2b034674a53210088478f000318b06415bad511bcf203c5729e5dd079
-  languageName: node
-  linkType: hard
-
 "babel-preset-jest@npm:^29.5.0":
   version: 29.5.0
   resolution: "babel-preset-jest@npm:29.5.0"
@@ -10664,23 +11349,23 @@ __metadata:
     "@testing-library/user-event": ^14.4.3
     "@types/react": ^18.2.14
     "@types/redux-mock-store": 1.0.3
-    "@wordpress/a11y": ^3.23.0
-    "@wordpress/api-fetch": ^6.20.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/compose": ^6.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/dom": ^3.23.0
-    "@wordpress/edit-post": ^7.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/html-entities": ^3.23.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/react-i18n": ^3.21.0
-    "@wordpress/url": ^3.24.0
-    "@wordpress/warning": ^2.23.0
+    "@wordpress/a11y": ^3.36.0
+    "@wordpress/api-fetch": ^6.33.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/compose": ^6.12.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/dom": ^3.36.0
+    "@wordpress/edit-post": ^7.12.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/html-entities": ^3.36.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/react-i18n": ^3.33.0
+    "@wordpress/url": ^3.37.0
+    "@wordpress/warning": ^2.36.0
     autoprefixer: ^10.2.5
     autosize: ^4.0.4
     body-parser: ^1.19.0
@@ -11417,6 +12102,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cmdk@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "cmdk@npm:0.2.0"
+  dependencies:
+    "@radix-ui/react-dialog": 1.0.0
+    command-score: 0.1.2
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: bd706c78fc933562acc5723bb4663bad68b34f4e065405de16d400a76ed4c36633de63ac3b6458e8aa93aba10ca5116563d1fc00b9fb298f6876175e190c3479
+  languageName: node
+  linkType: hard
+
 "co@npm:3.1.0":
   version: 3.1.0
   resolution: "co@npm:3.1.0"
@@ -11594,6 +12292,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"command-score@npm:0.1.2":
+  version: 0.1.2
+  resolution: "command-score@npm:0.1.2"
+  checksum: 0fe355e311f339c217befade6337e734c8e199eaf8442cf65233461134b6bac8a53c85c2c1c929f1b1b8c6125772a50d55991a27ea486cdd846e8c083c852706
+  languageName: node
+  linkType: hard
+
 "commander@npm:2.17.x":
   version: 2.17.1
   resolution: "commander@npm:2.17.1"
@@ -11659,13 +12364,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"comment-parser@npm:1.3.0":
-  version: 1.3.0
-  resolution: "comment-parser@npm:1.3.0"
-  checksum: d7747a9527f600e9334e0d260ec9aae026bb2e3a2cfba931c55956b3b570704bccf3cc224ced7af57170c3e2bb083df07bd29bf743eb76596d48617f9b540f9c
-  languageName: node
-  linkType: hard
-
 "comment-parser@npm:1.3.1":
   version: 1.3.1
   resolution: "comment-parser@npm:1.3.1"
@@ -11902,7 +12600,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"convert-source-map@npm:^1.1.0, convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
+"convert-source-map@npm:^1.1.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
   version: 1.7.0
   resolution: "convert-source-map@npm:1.7.0"
   dependencies:
@@ -12888,10 +13586,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.2.2":
-  version: 4.3.0
-  resolution: "deepmerge@npm:4.3.0"
-  checksum: 7ff5c6294b3316c1bc6bca9d3ef2193c1d7beec4e62252db8bcb8a6366d85b924850492eb1a746a5f33d609862e03dfb907ce9fa8769583300f65f20a337cec5
+"deepmerge@npm:^4.2.2, deepmerge@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
+  languageName: node
+  linkType: hard
+
+"deepsignal@npm:^1.3.0":
+  version: 1.3.3
+  resolution: "deepsignal@npm:1.3.3"
+  dependencies:
+    "@preact/signals": ^1.0.0
+    "@preact/signals-core": ^1.0.0
+    "@preact/signals-react": ^1.0.0
+  peerDependencies:
+    preact: 10.x
+  checksum: 8443c9d78bfe8faa32247d1311e98a0484e93f32472ff1ca2fa4c00d93949afcdfe42b007fdeb990ca29c564b7cb1f34ae18c3b1bc51b178f0ab90e30f6c34c1
   languageName: node
   linkType: hard
 
@@ -13091,6 +13802,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detect-node-es@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "detect-node-es@npm:1.1.0"
+  checksum: e562f00de23f10c27d7119e1af0e7388407eb4b06596a25f6d79a360094a109ff285de317f02b090faae093d314cf6e73ac3214f8a5bb3a0def5bece94557fbe
+  languageName: node
+  linkType: hard
+
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
@@ -13120,13 +13838,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "diff-sequences@npm:27.5.1"
-  checksum: a52566d891b89a666f48ba69f54262fa8293ae6264ae04da82c7bf3b6661cba75561de0729f18463179d56003cc0fd69aa09845f2c2cd7a353b1ec1e1a96beb9
-  languageName: node
-  linkType: hard
-
 "diff-sequences@npm:^29.4.3":
   version: 29.4.3
   resolution: "diff-sequences@npm:29.4.3"
@@ -14369,7 +15080,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:^25.2.3, eslint-plugin-jest@npm:^25.3.0, eslint-plugin-jest@npm:^25.3.4":
+"eslint-plugin-jest@npm:^25.3.0, eslint-plugin-jest@npm:^25.3.4":
   version: 25.7.0
   resolution: "eslint-plugin-jest@npm:25.7.0"
   dependencies:
@@ -14386,25 +15097,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^37.0.3":
-  version: 37.9.7
-  resolution: "eslint-plugin-jsdoc@npm:37.9.7"
+"eslint-plugin-jest@npm:^27.2.1":
+  version: 27.2.2
+  resolution: "eslint-plugin-jest@npm:27.2.2"
   dependencies:
-    "@es-joy/jsdoccomment": ~0.20.1
-    comment-parser: 1.3.0
-    debug: ^4.3.3
-    escape-string-regexp: ^4.0.0
-    esquery: ^1.4.0
-    regextras: ^0.8.0
-    semver: ^7.3.5
-    spdx-expression-parse: ^3.0.1
+    "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
+    "@typescript-eslint/eslint-plugin": ^5.0.0
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 8ea51ffc3717cd27522f6984419e17ab7eaf6c8f7ff1a5c9dafc032a7ecbb62833ca7b6af28b4dd66b8d0fcd0a725ff4716259b91583fdfa291dda0526a14f2c
+    jest: "*"
+  peerDependenciesMeta:
+    "@typescript-eslint/eslint-plugin":
+      optional: true
+    jest:
+      optional: true
+  checksum: 58afd3ef90fd2ad70f69cb757c3c8af96b3ab8f03215e59c7ca9596271b805168864eb9d82c3596cc32793308937ef99651554e7b51d955688fe128e56cf0e48
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^39.6.8":
+"eslint-plugin-jsdoc@npm:^39.6.8, eslint-plugin-jsdoc@npm:^39.6.9":
   version: 39.9.1
   resolution: "eslint-plugin-jsdoc@npm:39.9.1"
   dependencies:
@@ -15798,21 +16509,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"framer-motion@npm:^7.6.1":
-  version: 7.10.3
-  resolution: "framer-motion@npm:7.10.3"
+"framer-motion@npm:^10.11.6":
+  version: 10.12.17
+  resolution: "framer-motion@npm:10.12.17"
   dependencies:
     "@emotion/is-prop-valid": ^0.8.2
-    "@motionone/dom": ^10.15.3
-    hey-listen: ^1.0.8
-    tslib: 2.4.0
+    tslib: ^2.4.0
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
   dependenciesMeta:
     "@emotion/is-prop-valid":
       optional: true
-  checksum: c2127aedc2d4f6feba17305b2f67f931de3869eb8c87e16e3620f03cd9745f7091f8ecc974288525da20df205fa564573eddc937dfce4351330ca900973f87e6
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: d22f173d3de445ead6a784737803bd6316f6e3e78e8fba3cedc3b3f405471e966b190c0caff855f59905afc017c475225e26af69acb932180d0e4ac4d7c9fbdb
   languageName: node
   linkType: hard
 
@@ -16079,6 +16793,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-nonce@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "get-nonce@npm:1.0.1"
+  checksum: 2d7df55279060bf0568549e1ffc9b84bc32a32b7541675ca092dce56317cdd1a59a98dcc4072c9f6a980779440139a3221d7486f52c488e69dc0fd27b1efb162
+  languageName: node
+  linkType: hard
+
 "get-npm-tarball-url@npm:^2.0.3":
   version: 2.0.3
   resolution: "get-npm-tarball-url@npm:2.0.3"
@@ -16670,13 +17391,13 @@ __metadata:
     "@emotion/react": ^11.4.1
     "@emotion/styled": ^11.3.0
     "@testing-library/react": ^14.0.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/block-editor": ^11.0.0
-    "@wordpress/blocks": ^12.0.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/readable-js-assets-webpack-plugin": ^2.6.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/block-editor": ^12.3.0
+    "@wordpress/blocks": ^12.12.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/readable-js-assets-webpack-plugin": ^2.19.0
     classnames: ^2.3.2
     copy-webpack-plugin: ^10.1.0
     glob: ^7.1.6
@@ -17322,7 +18043,7 @@ __metadata:
     "@automattic/interpolate-components": "workspace:^"
     "@babel/runtime": ^7.17.2
     "@tannin/sprintf": ^1.1.0
-    "@wordpress/compose": ^6.0.0
+    "@wordpress/compose": ^6.12.0
     debug: ^4.3.3
     events: ^3.0.0
     hash.js: ^1.1.5
@@ -18709,18 +19430,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-diff@npm:27.5.1"
-  dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: 48f008c7b4ea7794108319eb61050315b1723e7391cb01e4377c072cadcab10a984cb09d2a6876cb65f100d06c970fd932996192e092b26006f885c00945e7ad
-  languageName: node
-  linkType: hard
-
 "jest-diff@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-diff@npm:29.6.1"
@@ -18800,13 +19509,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-get-type@npm:27.5.1"
-  checksum: 42ee0101336bccfc3c1cff598b603c6006db7876b6117e5bd4a9fb7ffaadfb68febdb9ae68d1c47bc3a4174b070153fc6cfb59df995dcd054e81ace5028a7269
-  languageName: node
-  linkType: hard
-
 "jest-get-type@npm:^29.4.3":
   version: 29.4.3
   resolution: "jest-get-type@npm:29.4.3"
@@ -18814,30 +19516,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-haste-map@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/graceful-fs": ^4.1.2
-    "@types/node": "*"
-    anymatch: ^3.0.3
-    fb-watchman: ^2.0.0
-    fsevents: ^2.3.2
-    graceful-fs: ^4.2.9
-    jest-regex-util: ^27.5.1
-    jest-serializer: ^27.5.1
-    jest-util: ^27.5.1
-    jest-worker: ^27.5.1
-    micromatch: ^4.0.4
-    walker: ^1.0.7
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 831ae476fddc6babe64ea3e7f91b4ccee0371c03ec88af5a615023711866abdd496b51344f47c4d02b6b47b433367ca41e9e42d79527b39afec767e8be9e8a63
-  languageName: node
-  linkType: hard
-
 "jest-haste-map@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-haste-map@npm:29.6.1"
@@ -18871,18 +19549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^27.4.2":
-  version: 27.5.1
-  resolution: "jest-matcher-utils@npm:27.5.1"
-  dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: a2f082062e8bedc9cfe2654177a894ca43768c6db4c0f4efc0d6ec195e305a99e3d868ff54cc61bcd7f1c810d8ee28c9ac6374de21715dc52f136876de739a73
-  languageName: node
-  linkType: hard
-
 "jest-matcher-utils@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-matcher-utils@npm:29.6.1"
@@ -18944,13 +19610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-regex-util@npm:27.5.1"
-  checksum: f9790d417b667b38155c4bbd58f2afc0ad9f774381e5358776df02df3f29564069d4773c7ba050db6826bad8a4cc7ef82c3b4c65bfa508e419fdd063a9682c42
-  languageName: node
-  linkType: hard
-
 "jest-regex-util@npm:^29.4.3":
   version: 29.4.3
   resolution: "jest-regex-util@npm:29.4.3"
@@ -19054,16 +19713,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-serializer@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-serializer@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    graceful-fs: ^4.2.9
-  checksum: 7a2b634a5a044b3ccf912a17032338309c90b50831a2e500f963b25e9a4ce9b550a1af1fb64f7c9a271ed6a1f951fca37bd0d61a0b286aefe197812193b0d825
-  languageName: node
-  linkType: hard
-
 "jest-snapshot@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-snapshot@npm:29.6.1"
@@ -19100,20 +19749,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-util@npm:27.5.1"
-  dependencies:
-    "@jest/types": ^27.5.1
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: 0f60cd2a2e09a6646ccd4ff489f1970282c0694724104979e897bd5164f91204726f5408572bf5e759d09e59d5c4e4dc65a643d2b630e06a10402bba07bf2a2e
-  languageName: node
-  linkType: hard
-
 "jest-util@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-util@npm:29.6.1"
@@ -19167,7 +19802,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^27.0.2, jest-worker@npm:^27.4.5, jest-worker@npm:^27.5.1":
+"jest-worker@npm:^27.0.2, jest-worker@npm:^27.4.5":
   version: 27.5.1
   resolution: "jest-worker@npm:27.5.1"
   dependencies:
@@ -19350,13 +19985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdoc-type-pratt-parser@npm:~2.2.3":
-  version: 2.2.5
-  resolution: "jsdoc-type-pratt-parser@npm:2.2.5"
-  checksum: 0ecd96f4b051fd600d3019ae7e5122731b8a856baee701966c0f37b060fb86a23296d22a39b49c593c50065978be5e4ffe0eeba931f3617ca8dd668cb40af6e6
-  languageName: node
-  linkType: hard
-
 "jsdoc-type-pratt-parser@npm:~3.1.0":
   version: 3.1.0
   resolution: "jsdoc-type-pratt-parser@npm:3.1.0"
@@ -19484,10 +20112,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json2php@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "json2php@npm:0.0.5"
-  checksum: 29033b529c7d7b9ed27d875fbf5c06ec794a228250307931bd72067f7bdee67e3fa87a083e6b9bb15e5b192447901cd6cc5143733a08525e386f6089246ce3e0
+"json2php@npm:^0.0.7":
+  version: 0.0.7
+  resolution: "json2php@npm:0.0.7"
+  checksum: b7ef04b9abe6f38b2b60b378b1272fd9b57cad2ecd6ca5485aee8f39b9ab63e50c5d73278f068de454ea1fff0243ae3c2b4029b7187275887e073ad903a038ab
   languageName: node
   linkType: hard
 
@@ -20693,10 +21321,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memize@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "memize@npm:1.1.0"
-  checksum: 3900a074751edac0363a8e80c27a35570855342ba900b75bfd8872611d3b68a84c253adfffda4bbe397ed7005a815ac5d01d5bc12b15fd525038ae174d2aecff
+"memize@npm:^2.0.1, memize@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "memize@npm:2.1.0"
+  checksum: 31259bdc943a08e2cc6483ef60b53460050d131cd68302a1e550fe39bb46ebcf77a80103ca14fa4ec74eca2463bda81c3460b908427c246d7e72ac8c39debcd7
   languageName: node
   linkType: hard
 
@@ -21382,7 +22010,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:^0.5.31, moment-timezone@npm:^0.5.40":
+"moment-timezone@npm:^0.5.40":
   version: 0.5.43
   resolution: "moment-timezone@npm:0.5.43"
   dependencies:
@@ -21391,7 +22019,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:^2.19.3, moment@npm:^2.22.1, moment@npm:^2.26.0, moment@npm:^2.29.4":
+"moment@npm:^2.19.3, moment@npm:^2.26.0, moment@npm:^2.29.4":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
   checksum: 844c6f3ce42862ac9467c8ca4f5e48a00750078682cc5bda1bc0e50cc7ca88e2115a0f932d65a06e4a90e26cb78892be9b3ca3dd6546ca2c4d994cebb787fc2b
@@ -22858,6 +23486,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-to-regexp@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "path-to-regexp@npm:6.2.1"
+  checksum: 7a73811ca703e5c199e5b50b9649ab8f6f7b458a37f7dff9ea338815203f5b1f95fe8cb24d4fdfe2eab5d67ce43562d92534330babca35cdf3231f966adb9360
+  languageName: node
+  linkType: hard
+
 "path-to-regexp@npm:~1.2.1":
   version: 1.2.1
   resolution: "path-to-regexp@npm:1.2.1"
@@ -23728,6 +24363,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"preact@npm:^10.13.2":
+  version: 10.15.1
+  resolution: "preact@npm:10.15.1"
+  checksum: 4eb7da6dbc560d517277043c0be83e19829ade595fac6eb009b7fcf0153ae471eae02deab9a2d73b1a4248df1cc6514c9d9a505fbf302bfbc254756a395a095c
+  languageName: node
+  linkType: hard
+
 "prebuild-install@npm:^6.0.0":
   version: 6.1.3
   resolution: "prebuild-install@npm:6.1.3"
@@ -23809,7 +24451,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1":
+"pretty-format@npm:^27.0.2":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
   dependencies:
@@ -23989,10 +24631,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-compare@npm:2.5.1":
-  version: 2.5.1
-  resolution: "proxy-compare@npm:2.5.1"
-  checksum: 116fc69ae9a6bb3654e6907fb09b73e84aa47c89275ca52648fc1d2ac8b35dbf54daa8bab078d7a735337c928e87eb52059e705434adf14989bbe6c5dcdd08fa
+"proxy-compare@npm:2.3.0":
+  version: 2.3.0
+  resolution: "proxy-compare@npm:2.3.0"
+  checksum: ee21a793ad0746d706a228fac85c0a02dda12e38599b0bc0542b61f65705df93a3e4e01600a37c53dd69187c6e567f74f0edd7e8fc7f3caf6c63e7627b1ed69d
   languageName: node
   linkType: hard
 
@@ -24590,6 +25232,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-remove-scroll-bar@npm:^2.3.3":
+  version: 2.3.4
+  resolution: "react-remove-scroll-bar@npm:2.3.4"
+  dependencies:
+    react-style-singleton: ^2.2.1
+    tslib: ^2.0.0
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 2262750dc1022c56d2c79e8d865c00045881c57bcaca74810ae8adac35cfdf723ff7d6b3b0e95c85eb9a0cff90bb4b1e0af801bd703ce8c0a2e35ab14ff1babb
+  languageName: node
+  linkType: hard
+
+"react-remove-scroll@npm:2.5.4":
+  version: 2.5.4
+  resolution: "react-remove-scroll@npm:2.5.4"
+  dependencies:
+    react-remove-scroll-bar: ^2.3.3
+    react-style-singleton: ^2.2.1
+    tslib: ^2.1.0
+    use-callback-ref: ^1.3.0
+    use-sidecar: ^1.1.2
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 8d5436c6738f4bf2ee56851280cf669202ccb4d796e29ce509549c57393ce21846840d5f9b747749192f122c404e3bd540fdb51aec14b1a5ce24126925ce45eb
+  languageName: node
+  linkType: hard
+
+"react-remove-scroll@npm:2.5.5":
+  version: 2.5.5
+  resolution: "react-remove-scroll@npm:2.5.5"
+  dependencies:
+    react-remove-scroll-bar: ^2.3.3
+    react-style-singleton: ^2.2.1
+    tslib: ^2.1.0
+    use-callback-ref: ^1.3.0
+    use-sidecar: ^1.1.2
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 4952657e6a7b9d661d4ad4dfcef81b9c7fa493e35164abff99c35c0b27b3d172ef7ad70c09416dc44dd14ff2e6b38a5ec7da27e27e90a15cbad36b8fd2fd8054
+  languageName: node
+  linkType: hard
+
 "react-router-dom@npm:^5.3.0":
   version: 5.3.4
   resolution: "react-router-dom@npm:5.3.4"
@@ -24673,6 +25369,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-style-singleton@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "react-style-singleton@npm:2.2.1"
+  dependencies:
+    get-nonce: ^1.0.0
+    invariant: ^2.2.4
+    tslib: ^2.0.0
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 6d66f3bdb65e1ec79089f80314da97c9a005087a04ee034255a5de129a4c0d9fd0bf99fa7bf642781ac2dc745ca687aae3de082bd8afdd0d117bc953241e15ad
+  languageName: node
+  linkType: hard
+
 "react-test-renderer@npm:^18.2.0":
   version: 18.2.0
   resolution: "react-test-renderer@npm:18.2.0"
@@ -24894,7 +25607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reakit@npm:^1.3.11, reakit@npm:^1.3.8":
+"reakit@npm:^1.3.11":
   version: 1.3.11
   resolution: "reakit@npm:1.3.11"
   dependencies:
@@ -25184,13 +25897,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regextras@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "regextras@npm:0.8.0"
-  checksum: f236d4778bdb2c69eb70241519ad6b9c9df996c76399abff4330cc49e41bb47c39cfcc03bd18597091e5f3abd3c28a59fd9a43376fb45ac4a2d2ebae1aaf21ce
-  languageName: node
-  linkType: hard
-
 "registry-auth-token@npm:^4.0.0":
   version: 4.2.2
   resolution: "registry-auth-token@npm:4.2.2"
@@ -25906,7 +26612,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rememo@npm:^4.0.0":
+"rememo@npm:^4.0.0, rememo@npm:^4.0.2":
   version: 4.0.2
   resolution: "rememo@npm:4.0.2"
   checksum: de253eda9eb8d4b9d8f7e0fce16eb7e2a2c547e59bdb332e7dde326b74482e8f1fb5bca793df699f6f6cccf67e480fdd7c6fc7b8d4d180e6670fbeb4b6371853
@@ -28783,14 +29489,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.4.0":
-  version: 2.4.0
-  resolution: "tslib@npm:2.4.0"
-  checksum: eb19bda3ae545b03caea6a244b34593468e23d53b26bf8649fbc20fce43e9b21a71127fd6d2b9662c0fe48ee6ff668ead48fd00d3b88b2b716b1c12edae25b5d
-  languageName: node
-  linkType: hard
-
-"tslib@npm:>=2.3.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
+"tslib@npm:>=2.3.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
   version: 2.5.3
   resolution: "tslib@npm:2.5.3"
   checksum: 4cb1817d34fae5b27d146e6c4a468d4155097d95c1335d0bc9690f11f33e63844806bf4ed6d97c30c72b8d85261b66cbbe16d871d9c594ac05701ec83e62a607
@@ -29545,6 +30244,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-callback-ref@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "use-callback-ref@npm:1.3.0"
+  dependencies:
+    tslib: ^2.0.0
+  peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 8a0867ffd441f358c66d79567970a745cc78ac2f98840a81c1fa749a525e8716116c645497d886a815e1dcf40ad81a107ebd6a7d15fd9ab5925c44a994a1d89a
+  languageName: node
+  linkType: hard
+
 "use-debounce@npm:^3.1.0":
   version: 3.1.0
   resolution: "use-debounce@npm:3.1.0"
@@ -29596,6 +30310,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-sidecar@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "use-sidecar@npm:1.1.2"
+  dependencies:
+    detect-node-es: ^1.1.0
+    tslib: ^2.0.0
+  peerDependencies:
+    "@types/react": ^16.9.0 || ^17.0.0 || ^18.0.0
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 89f0018fd9aee1fc17c85ac18c4bf8944d460d453d0d0e04ddbc8eaddf3fa591e9c74a1f8a438a1bff368a7a2417fab380bdb3df899d2194c4375b0982736de0
+  languageName: node
+  linkType: hard
+
 "use-subscription@npm:1.6.0":
   version: 1.6.0
   resolution: "use-subscription@npm:1.6.0"
@@ -29788,18 +30518,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"valtio@npm:^1.7.0":
-  version: 1.10.5
-  resolution: "valtio@npm:1.10.5"
+"valtio@npm:1.7.0":
+  version: 1.7.0
+  resolution: "valtio@npm:1.7.0"
   dependencies:
-    proxy-compare: 2.5.1
+    proxy-compare: 2.3.0
     use-sync-external-store: 1.2.0
   peerDependencies:
+    "@babel/helper-module-imports": ">=7.12"
+    "@babel/types": ">=7.13"
+    aslemammad-vite-plugin-macro: ">=1.0.0-alpha.1"
+    babel-plugin-macros: ">=3.0"
     react: ">=16.8"
+    vite: ">=2.8.6"
   peerDependenciesMeta:
+    "@babel/helper-module-imports":
+      optional: true
+    "@babel/types":
+      optional: true
+    aslemammad-vite-plugin-macro:
+      optional: true
+    babel-plugin-macros:
+      optional: true
     react:
       optional: true
-  checksum: f0ab44b408931bc611cf213414d4b513f9c0af5bc3540a15362f154471bfca2d103957df33d42672d5a1a90e1a7fc97d2371a800328936e0e886ef60e883fb05
+    vite:
+      optional: true
+  checksum: 9711413f793e2fc810dcb17fcfab8e9f5c6f757b3a27099a57eb5d1d328640858ddb3566f9ad55ff6c8ac0e2cadb2e83e60d1b27fa30b815cb8a665f8e071f06
   languageName: node
   linkType: hard
 
@@ -29907,7 +30652,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walker@npm:^1.0.7, walker@npm:^1.0.8":
+"walker@npm:^1.0.8":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
   dependencies:
@@ -30463,22 +31208,19 @@ __metadata:
     "@types/uuid": ^8.3.4
     "@types/validator": ^13.7.1
     "@types/webpack-env": ^1.16.3
-    "@types/wordpress__components": ^23.0.1
-    "@types/wordpress__data-controls": ^2.30.0
     "@typescript-eslint/eslint-plugin": ^5.53.0
     "@typescript-eslint/parser": ^5.53.0
-    "@wordpress/base-styles": ^4.14.0
-    "@wordpress/components": ^23.0.0
-    "@wordpress/data": ^8.0.0
-    "@wordpress/element": ^5.0.0
-    "@wordpress/eslint-plugin": ^13.7.0
-    "@wordpress/i18n": ^4.23.0
-    "@wordpress/icons": ^9.14.0
-    "@wordpress/is-shallow-equal": ^4.23.0
-    "@wordpress/jest-preset-default": ^10.4.0
-    "@wordpress/primitives": ^3.21.0
-    "@wordpress/stylelint-config": ^21.6.0
-    "@wordpress/url": ^3.24.0
+    "@wordpress/base-styles": ^4.27.0
+    "@wordpress/components": ^25.1.0
+    "@wordpress/data": ^9.5.0
+    "@wordpress/element": ^5.13.0
+    "@wordpress/eslint-plugin": ^14.8.0
+    "@wordpress/i18n": ^4.36.0
+    "@wordpress/icons": ^9.26.0
+    "@wordpress/is-shallow-equal": ^4.36.0
+    "@wordpress/primitives": ^3.34.0
+    "@wordpress/stylelint-config": ^21.19.0
+    "@wordpress/url": ^3.37.0
     babel-loader: ^8.2.3
     browserslist: ^4.16.0
     bunyan: ^1.8.15