From 394288f5343b92738ab086b97f62e15262845a35 Mon Sep 17 00:00:00 2001
From: Akshat Kakkad <87222220+AKSHAT2802@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:23:49 +0530
Subject: [PATCH 01/20] Add __next40pxDefaultSize for files in editor 4
 (#65140)

* Add __next40pxDefaultSize in button for editor 3 files

* address feedback

Co-authored-by: AKSHAT2802 <akshat2802@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
Co-authored-by: mirka <0mirka00@git.wordpress.org>
---
 .../editor/src/components/start-template-options/index.js   | 3 +--
 packages/editor/src/components/table-of-contents/index.js   | 3 +--
 packages/editor/src/components/text-editor/index.js         | 3 +--
 packages/editor/src/components/text-editor/style.scss       | 2 +-
 packages/editor/src/dataviews/actions/reset-post.tsx        | 6 ++----
 packages/editor/src/dataviews/actions/trash-post.tsx        | 6 ++----
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/editor/src/components/start-template-options/index.js b/packages/editor/src/components/start-template-options/index.js
index e86531272b54f..3651c5c029a2c 100644
--- a/packages/editor/src/components/start-template-options/index.js
+++ b/packages/editor/src/components/start-template-options/index.js
@@ -156,8 +156,7 @@ function StartModal( { slug, isCustom, onClose, postType } ) {
 			>
 				<FlexItem>
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ onClose }
 					>
diff --git a/packages/editor/src/components/table-of-contents/index.js b/packages/editor/src/components/table-of-contents/index.js
index f2c79fb034744..6fd83557b13ab 100644
--- a/packages/editor/src/components/table-of-contents/index.js
+++ b/packages/editor/src/components/table-of-contents/index.js
@@ -30,8 +30,7 @@ function TableOfContents(
 			contentClassName="table-of-contents__popover"
 			renderToggle={ ( { isOpen, onToggle } ) => (
 				<Button
-					// TODO: Switch to `true` (40px size) if possible
-					__next40pxDefaultSize={ false }
+					__next40pxDefaultSize
 					{ ...props }
 					ref={ ref }
 					onClick={ hasBlocks ? onToggle : undefined }
diff --git a/packages/editor/src/components/text-editor/index.js b/packages/editor/src/components/text-editor/index.js
index 6bfe2a5375a35..fa0688859b5a6 100644
--- a/packages/editor/src/components/text-editor/index.js
+++ b/packages/editor/src/components/text-editor/index.js
@@ -40,8 +40,7 @@ export default function TextEditor( { autoFocus = false } ) {
 				<div className="editor-text-editor__toolbar">
 					<h2>{ __( 'Editing code' ) }</h2>
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ () => switchEditorMode( 'visual' ) }
 						shortcut={ shortcut }
diff --git a/packages/editor/src/components/text-editor/style.scss b/packages/editor/src/components/text-editor/style.scss
index c8589fed6de6e..9b2748e08fc5c 100644
--- a/packages/editor/src/components/text-editor/style.scss
+++ b/packages/editor/src/components/text-editor/style.scss
@@ -63,7 +63,7 @@
 	}
 
 	h2 {
-		line-height: $button-size;
+		line-height: $button-size-next-default-40px;
 		margin: 0 auto 0 0;
 		font-size: $default-font-size;
 		color: $gray-900;
diff --git a/packages/editor/src/dataviews/actions/reset-post.tsx b/packages/editor/src/dataviews/actions/reset-post.tsx
index 64396e45c392f..d0b5521a34833 100644
--- a/packages/editor/src/dataviews/actions/reset-post.tsx
+++ b/packages/editor/src/dataviews/actions/reset-post.tsx
@@ -114,8 +114,7 @@ const resetPost: Action< Post > = {
 				</Text>
 				<HStack justify="right">
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ closeModal }
 						disabled={ isBusy }
@@ -124,8 +123,7 @@ const resetPost: Action< Post > = {
 						{ __( 'Cancel' ) }
 					</Button>
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ async () => {
 							setIsBusy( true );
diff --git a/packages/editor/src/dataviews/actions/trash-post.tsx b/packages/editor/src/dataviews/actions/trash-post.tsx
index 1e2b3639dddc8..befbfb0ee7ffb 100644
--- a/packages/editor/src/dataviews/actions/trash-post.tsx
+++ b/packages/editor/src/dataviews/actions/trash-post.tsx
@@ -67,8 +67,7 @@ const trashPost: Action< PostWithPermissions > = {
 				</Text>
 				<HStack justify="right">
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ closeModal }
 						disabled={ isBusy }
@@ -77,8 +76,7 @@ const trashPost: Action< PostWithPermissions > = {
 						{ __( 'Cancel' ) }
 					</Button>
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ async () => {
 							setIsBusy( true );

From a76c4759f2989e9107984379bf3b61ae9bfd3c58 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Sep 2024 10:56:01 +0100
Subject: [PATCH 02/20] Close inserter on exiting Zoom Out to edit (#65194)

* Use experimental setting in single call location

* Close inserter on double click to exit Zoom Out

* Avoid additional store subscription
---
 .../use-block-props/use-zoom-out-mode-exit.js      | 14 +++++++++++++-
 .../src/components/block-tools/zoom-out-toolbar.js | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-zoom-out-mode-exit.js b/packages/block-editor/src/components/block-list/use-block-props/use-zoom-out-mode-exit.js
index bb6edd066f06f..1944cfde96c7f 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/use-zoom-out-mode-exit.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-zoom-out-mode-exit.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -16,6 +16,10 @@ import { unlock } from '../../../lock-unlock';
  * @param {string} clientId Block client ID.
  */
 export function useZoomOutModeExit( { editorMode } ) {
+	const getSettings = useSelect(
+		( select ) => select( blockEditorStore ).getSettings
+	);
+
 	const { __unstableSetEditorMode } = unlock(
 		useDispatch( blockEditorStore )
 	);
@@ -29,6 +33,14 @@ export function useZoomOutModeExit( { editorMode } ) {
 			function onDoubleClick( event ) {
 				if ( ! event.defaultPrevented ) {
 					event.preventDefault();
+
+					const { __experimentalSetIsInserterOpened } = getSettings();
+
+					if (
+						typeof __experimentalSetIsInserterOpened === 'function'
+					) {
+						__experimentalSetIsInserterOpened( false );
+					}
 					__unstableSetEditorMode( 'edit' );
 				}
 			}
diff --git a/packages/block-editor/src/components/block-tools/zoom-out-toolbar.js b/packages/block-editor/src/components/block-tools/zoom-out-toolbar.js
index 0d3df9e20dfc5..a3c46c4b4c970 100644
--- a/packages/block-editor/src/components/block-tools/zoom-out-toolbar.js
+++ b/packages/block-editor/src/components/block-tools/zoom-out-toolbar.js
@@ -31,7 +31,12 @@ export default function ZoomOutToolbar( { clientId, __unstableContentRef } ) {
 				getPreviousBlockClientId,
 				canRemoveBlock,
 				canMoveBlock,
+				getSettings,
 			} = select( blockEditorStore );
+
+			const { __experimentalSetIsInserterOpened: setIsInserterOpened } =
+				getSettings();
+
 			const { getBlockType } = select( blocksStore );
 			const { name } = getBlock( clientId );
 			const blockType = getBlockType( name );
@@ -63,6 +68,7 @@ export default function ZoomOutToolbar( { clientId, __unstableContentRef } ) {
 				isPrevBlockTemplatePart,
 				canRemove: canRemoveBlock( clientId ),
 				canMove: canMoveBlock( clientId ),
+				setIsInserterOpened,
 			};
 		},
 		[ clientId ]
@@ -75,6 +81,7 @@ export default function ZoomOutToolbar( { clientId, __unstableContentRef } ) {
 		isPrevBlockTemplatePart,
 		canRemove,
 		canMove,
+		setIsInserterOpened,
 	} = selected;
 
 	const { removeBlock, __unstableSetEditorMode } =
@@ -132,6 +139,10 @@ export default function ZoomOutToolbar( { clientId, __unstableContentRef } ) {
 					icon={ edit }
 					label={ __( 'Edit' ) }
 					onClick={ () => {
+						// Setting may be undefined.
+						if ( typeof setIsInserterOpened === 'function' ) {
+							setIsInserterOpened( false );
+						}
 						__unstableSetEditorMode( 'edit' );
 						__unstableContentRef.current?.focus();
 					} }

From 1a60dff84c2effe1a3461d582de8238a7cd0d81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Thu, 12 Sep 2024 12:30:27 +0200
Subject: [PATCH 03/20] Make `wordpress/fields` a private package (#65269)

Co-authored-by: oandregal <oandregal@git.wordpress.org>
Co-authored-by: gziolo <gziolo@git.wordpress.org>
---
 docs/manifest.json           | 6 ------
 packages/fields/package.json | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/manifest.json b/docs/manifest.json
index d7f74d47995b6..e4eba19d99fa2 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1697,12 +1697,6 @@
 		"markdown_source": "../packages/eslint-plugin/README.md",
 		"parent": "packages"
 	},
-	{
-		"title": "@wordpress/fields",
-		"slug": "packages-fields",
-		"markdown_source": "../packages/fields/README.md",
-		"parent": "packages"
-	},
 	{
 		"title": "@wordpress/format-library",
 		"slug": "packages-format-library",
diff --git a/packages/fields/package.json b/packages/fields/package.json
index 4d5d33a10e5ed..e953b34264901 100644
--- a/packages/fields/package.json
+++ b/packages/fields/package.json
@@ -9,6 +9,7 @@
 		"gutenberg",
 		"dataviews"
 	],
+	"private": true,
 	"homepage": "https://github.com/WordPress/gutenberg/tree/HEAD/packages/fields/README.md",
 	"repository": {
 		"type": "git",

From 9bdfebfa6760fcc9f1d11a185ecb2940d475fcb5 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Thu, 12 Sep 2024 12:33:24 +0200
Subject: [PATCH 04/20] Build Plugin: Simplify and improve zip contents
 (#65232)

Include all of /build directory. Behavior is largely unchanged but logic is simplified.
Exclude directory entries. Directory structure is preserved but irrelevant directory attributes are excluded.

---
Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
Co-authored-by: gziolo <gziolo@git.wordpress.org>
---
 bin/build-plugin-zip.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/bin/build-plugin-zip.sh b/bin/build-plugin-zip.sh
index ad627e05f0c69..c823ca6a8017f 100755
--- a/bin/build-plugin-zip.sh
+++ b/bin/build-plugin-zip.sh
@@ -78,26 +78,15 @@ npm run build
 php bin/generate-gutenberg-php.php > gutenberg.tmp.php
 mv gutenberg.tmp.php gutenberg.php
 
-build_files=$(
-	ls build/*/*.{js,js.map,css,asset.php} \
-	build/block-library/blocks/*.php \
-	build/block-library/blocks/*/block.json \
-	build/block-library/blocks/*/*.{js,js.map,css,asset.php} \
-	build/edit-widgets/blocks/*/block.json \
-	build/widgets/blocks/*.php \
-	build/widgets/blocks/*/block.json \
-	build/style-engine/*.php \
-)
-
-
 # Generate the plugin zip file.
 status "Creating archive... 🎁"
-zip -r gutenberg.zip \
+zip --recurse-paths --no-dir-entries \
+	gutenberg.zip \
 	gutenberg.php \
 	lib \
 	packages/block-serialization-default-parser/*.php \
 	post-content.php \
-	$build_files \
+	build \
 	build-module \
 	readme.txt \
 	changelog.txt \

From f88e6297fa3b3b9de3586e63f0fe12db88afb8eb Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Thu, 12 Sep 2024 12:57:58 +0200
Subject: [PATCH 05/20] A11y: Add Script Module (#65101)

Add a `@wordpress/a11y` WordPress Script Module. The script module has the same public API as the `wp-a11y` script.

- The `domReady` package should not be necessary. Since modules are deferred, setup can be called directly when the module is evaluated.
- There is no i18n script module at this time. The necessary string "Notifications" is translated on the server and passed to the package via script module data.
- Most of the changes here are moving some functions around so that the script and the module form of this package rely on the same underlying implementations.

---

Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
Co-authored-by: gziolo <gziolo@git.wordpress.org>
---
 lib/experimental/script-modules.php           | 27 +++++++
 packages/a11y/README.md                       |  2 +-
 packages/a11y/package.json                    |  1 +
 packages/a11y/src/index.js                    | 75 +----------------
 packages/a11y/src/index.native.js             |  2 +-
 packages/a11y/src/module/index.ts             | 25 ++++++
 .../a11y/src/{ => shared}/add-container.js    |  0
 .../add-intro-text.ts}                        | 10 +--
 packages/a11y/src/{ => shared}/clear.js       |  0
 .../a11y/src/{ => shared}/filter-message.js   |  0
 packages/a11y/src/shared/index.js             | 81 +++++++++++++++++++
 .../{ => shared}/test/add-container.test.js   |  0
 .../a11y/src/{ => shared}/test/clear.test.js  |  0
 .../{ => shared}/test/filter-message.test.js  |  0
 packages/a11y/src/test/index.test.js          |  8 +-
 .../lib/util.js                               |  7 +-
 16 files changed, 151 insertions(+), 87 deletions(-)
 create mode 100644 packages/a11y/src/module/index.ts
 rename packages/a11y/src/{ => shared}/add-container.js (100%)
 rename packages/a11y/src/{add-intro-text.js => shared/add-intro-text.ts} (83%)
 rename packages/a11y/src/{ => shared}/clear.js (100%)
 rename packages/a11y/src/{ => shared}/filter-message.js (100%)
 create mode 100644 packages/a11y/src/shared/index.js
 rename packages/a11y/src/{ => shared}/test/add-container.test.js (100%)
 rename packages/a11y/src/{ => shared}/test/clear.test.js (100%)
 rename packages/a11y/src/{ => shared}/test/filter-message.test.js (100%)

diff --git a/lib/experimental/script-modules.php b/lib/experimental/script-modules.php
index 5a14e1418ed6d..a113df02b9d75 100644
--- a/lib/experimental/script-modules.php
+++ b/lib/experimental/script-modules.php
@@ -200,3 +200,30 @@ function gutenberg_dequeue_module( $module_identifier ) {
 	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_dequeue_script_module' );
 	wp_script_modules()->dequeue( $module_identifier );
 }
+
+/**
+ * Registers Gutenberg Script Modules.
+ *
+ * @since 19.3
+ */
+function gutenberg_register_script_modules() {
+	// When in production, use the plugin's version as the default asset version;
+	// else (for development or test) default to use the current time.
+	$default_version = defined( 'GUTENBERG_VERSION' ) && ! SCRIPT_DEBUG ? GUTENBERG_VERSION : time();
+
+	wp_deregister_script_module( '@wordpress/a11y' );
+	wp_register_script_module(
+		'@wordpress/a11y',
+		gutenberg_url( 'build-module/a11y/index.min.js' ),
+		array(),
+		$default_version
+	);
+	add_filter(
+		'script_module_data_@wordpress/a11y',
+		function ( $data ) {
+			$data['i18n'] = array( 'Notifications' => __( 'Notifications', 'default' ) );
+			return $data;
+		}
+	);
+}
+add_action( 'init', 'gutenberg_register_script_modules' );
diff --git a/packages/a11y/README.md b/packages/a11y/README.md
index 0f40d9edd010e..755396d2bb8f0 100644
--- a/packages/a11y/README.md
+++ b/packages/a11y/README.md
@@ -39,7 +39,7 @@ speak( 'The message you want to send to the ARIA live region', 'assertive' );
 _Parameters_
 
 -   _message_ `string`: The message to be announced by assistive technologies.
--   _ariaLive_ `[string]`: The politeness level for aria-live; default: 'polite'.
+-   _ariaLive_ `['polite'|'assertive']`: The politeness level for aria-live; default: 'polite'.
 
 <!-- END TOKEN(Autogenerated API docs) -->
 
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 88123b3c6c712..327d6b9ff0716 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -28,6 +28,7 @@
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
+	"wpScriptModuleExports": "./build-module/module/index.js",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/dom-ready": "file:../dom-ready",
diff --git a/packages/a11y/src/index.js b/packages/a11y/src/index.js
index 957c76500c434..59e93da780bd8 100644
--- a/packages/a11y/src/index.js
+++ b/packages/a11y/src/index.js
@@ -2,87 +2,20 @@
  * WordPress dependencies
  */
 import domReady from '@wordpress/dom-ready';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
-import addIntroText from './add-intro-text';
-import addContainer from './add-container';
-import clear from './clear';
-import filterMessage from './filter-message';
+import { makeSetupFunction } from './shared/index';
+export { speak } from './shared/index';
 
 /**
  * Create the live regions.
  */
-export function setup() {
-	const introText = document.getElementById( 'a11y-speak-intro-text' );
-	const containerAssertive = document.getElementById(
-		'a11y-speak-assertive'
-	);
-	const containerPolite = document.getElementById( 'a11y-speak-polite' );
-
-	if ( introText === null ) {
-		addIntroText();
-	}
-
-	if ( containerAssertive === null ) {
-		addContainer( 'assertive' );
-	}
-
-	if ( containerPolite === null ) {
-		addContainer( 'polite' );
-	}
-}
+export const setup = makeSetupFunction( __( 'Notifications' ) );
 
 /**
  * Run setup on domReady.
  */
 domReady( setup );
-
-/**
- * Allows you to easily announce dynamic interface updates to screen readers using ARIA live regions.
- * This module is inspired by the `speak` function in `wp-a11y.js`.
- *
- * @param {string} message    The message to be announced by assistive technologies.
- * @param {string} [ariaLive] The politeness level for aria-live; default: 'polite'.
- *
- * @example
- * ```js
- * import { speak } from '@wordpress/a11y';
- *
- * // For polite messages that shouldn't interrupt what screen readers are currently announcing.
- * speak( 'The message you want to send to the ARIA live region' );
- *
- * // For assertive messages that should interrupt what screen readers are currently announcing.
- * speak( 'The message you want to send to the ARIA live region', 'assertive' );
- * ```
- */
-export function speak( message, ariaLive ) {
-	/*
-	 * Clear previous messages to allow repeated strings being read out and hide
-	 * the explanatory text from assistive technologies.
-	 */
-	clear();
-
-	message = filterMessage( message );
-
-	const introText = document.getElementById( 'a11y-speak-intro-text' );
-	const containerAssertive = document.getElementById(
-		'a11y-speak-assertive'
-	);
-	const containerPolite = document.getElementById( 'a11y-speak-polite' );
-
-	if ( containerAssertive && ariaLive === 'assertive' ) {
-		containerAssertive.textContent = message;
-	} else if ( containerPolite ) {
-		containerPolite.textContent = message;
-	}
-
-	/*
-	 * Make the explanatory text available to assistive technologies by removing
-	 * the 'hidden' HTML attribute.
-	 */
-	if ( introText ) {
-		introText.removeAttribute( 'hidden' );
-	}
-}
diff --git a/packages/a11y/src/index.native.js b/packages/a11y/src/index.native.js
index f6f53b6343adb..e17597a8b2747 100644
--- a/packages/a11y/src/index.native.js
+++ b/packages/a11y/src/index.native.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import filterMessage from './filter-message';
+import filterMessage from './shared/filter-message';
 
 /**
  * Update the ARIA live notification area text node.
diff --git a/packages/a11y/src/module/index.ts b/packages/a11y/src/module/index.ts
new file mode 100644
index 0000000000000..a2c87f397f487
--- /dev/null
+++ b/packages/a11y/src/module/index.ts
@@ -0,0 +1,25 @@
+/**
+ * Internal dependencies
+ */
+import { makeSetupFunction } from '../shared/index';
+export { speak } from '../shared/index';
+
+// Without an i18n Script Module, "Notifications" (the only localized text used in this module)
+// will be translated on the server and provided as script-module data.
+let notificationsText = 'Notifications';
+try {
+	const textContent = document.getElementById(
+		'wp-script-module-data-@wordpress/a11y'
+	)?.textContent;
+	if ( textContent ) {
+		const parsed = JSON.parse( textContent );
+		notificationsText = parsed?.i18n?.Notifications ?? notificationsText;
+	}
+} catch {}
+
+/**
+ * Create the live regions.
+ */
+export const setup = makeSetupFunction( notificationsText );
+
+setup();
diff --git a/packages/a11y/src/add-container.js b/packages/a11y/src/shared/add-container.js
similarity index 100%
rename from packages/a11y/src/add-container.js
rename to packages/a11y/src/shared/add-container.js
diff --git a/packages/a11y/src/add-intro-text.js b/packages/a11y/src/shared/add-intro-text.ts
similarity index 83%
rename from packages/a11y/src/add-intro-text.js
rename to packages/a11y/src/shared/add-intro-text.ts
index 2bcf453ec44c8..6bd97c887664d 100644
--- a/packages/a11y/src/add-intro-text.js
+++ b/packages/a11y/src/shared/add-intro-text.ts
@@ -1,22 +1,18 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
 /**
  * Build the explanatory text to be placed before the aria live regions.
  *
  * This text is initially hidden from assistive technologies by using a `hidden`
  * HTML attribute which is then removed once a message fills the aria-live regions.
  *
+ * @param {string} introTextContent The translated intro text content.
  * @return {HTMLParagraphElement} The explanatory text HTML element.
  */
-export default function addIntroText() {
+export default function addIntroText( introTextContent: string ) {
 	const introText = document.createElement( 'p' );
 
 	introText.id = 'a11y-speak-intro-text';
 	introText.className = 'a11y-speak-intro-text';
-	introText.textContent = __( 'Notifications' );
+	introText.textContent = introTextContent;
 
 	introText.setAttribute(
 		'style',
diff --git a/packages/a11y/src/clear.js b/packages/a11y/src/shared/clear.js
similarity index 100%
rename from packages/a11y/src/clear.js
rename to packages/a11y/src/shared/clear.js
diff --git a/packages/a11y/src/filter-message.js b/packages/a11y/src/shared/filter-message.js
similarity index 100%
rename from packages/a11y/src/filter-message.js
rename to packages/a11y/src/shared/filter-message.js
diff --git a/packages/a11y/src/shared/index.js b/packages/a11y/src/shared/index.js
new file mode 100644
index 0000000000000..a05f891f42856
--- /dev/null
+++ b/packages/a11y/src/shared/index.js
@@ -0,0 +1,81 @@
+/**
+ * Internal dependencies
+ */
+import addContainer from './add-container';
+import addIntroText from './add-intro-text';
+import clear from './clear';
+import filterMessage from './filter-message';
+
+/**
+ * Create the live regions.
+ * @param {string} introTextContent The intro text content.
+ */
+export function makeSetupFunction( introTextContent ) {
+	return function setup() {
+		const introText = document.getElementById( 'a11y-speak-intro-text' );
+		const containerAssertive = document.getElementById(
+			'a11y-speak-assertive'
+		);
+		const containerPolite = document.getElementById( 'a11y-speak-polite' );
+
+		if ( introText === null ) {
+			addIntroText( introTextContent );
+		}
+
+		if ( containerAssertive === null ) {
+			addContainer( 'assertive' );
+		}
+
+		if ( containerPolite === null ) {
+			addContainer( 'polite' );
+		}
+	};
+}
+
+/**
+ * Allows you to easily announce dynamic interface updates to screen readers using ARIA live regions.
+ * This module is inspired by the `speak` function in `wp-a11y.js`.
+ *
+ * @param {string}               message    The message to be announced by assistive technologies.
+ * @param {'polite'|'assertive'} [ariaLive] The politeness level for aria-live; default: 'polite'.
+ *
+ * @example
+ * ```js
+ * import { speak } from '@wordpress/a11y';
+ *
+ * // For polite messages that shouldn't interrupt what screen readers are currently announcing.
+ * speak( 'The message you want to send to the ARIA live region' );
+ *
+ * // For assertive messages that should interrupt what screen readers are currently announcing.
+ * speak( 'The message you want to send to the ARIA live region', 'assertive' );
+ * ```
+ */
+export function speak( message, ariaLive ) {
+	/*
+	 * Clear previous messages to allow repeated strings being read out and hide
+	 * the explanatory text from assistive technologies.
+	 */
+	clear();
+
+	message = filterMessage( message );
+
+	const introText = document.getElementById( 'a11y-speak-intro-text' );
+	const containerAssertive = document.getElementById(
+		'a11y-speak-assertive'
+	);
+	const containerPolite = document.getElementById( 'a11y-speak-polite' );
+
+	if ( containerAssertive && ariaLive === 'assertive' ) {
+		containerAssertive.textContent = message;
+	} else if ( containerPolite ) {
+		containerPolite.textContent = message;
+	}
+
+	/*
+	 * Make the explanatory text available to assistive technologies by removing
+	 * the 'hidden' HTML attribute.
+	 */
+	if ( introText ) {
+		introText.removeAttribute( 'hidden' );
+	}
+}
diff --git a/packages/a11y/src/test/add-container.test.js b/packages/a11y/src/shared/test/add-container.test.js
similarity index 100%
rename from packages/a11y/src/test/add-container.test.js
rename to packages/a11y/src/shared/test/add-container.test.js
diff --git a/packages/a11y/src/test/clear.test.js b/packages/a11y/src/shared/test/clear.test.js
similarity index 100%
rename from packages/a11y/src/test/clear.test.js
rename to packages/a11y/src/shared/test/clear.test.js
diff --git a/packages/a11y/src/test/filter-message.test.js b/packages/a11y/src/shared/test/filter-message.test.js
similarity index 100%
rename from packages/a11y/src/test/filter-message.test.js
rename to packages/a11y/src/shared/test/filter-message.test.js
diff --git a/packages/a11y/src/test/index.test.js b/packages/a11y/src/test/index.test.js
index 4815baa220504..0f6b9d0bd572e 100644
--- a/packages/a11y/src/test/index.test.js
+++ b/packages/a11y/src/test/index.test.js
@@ -7,10 +7,10 @@ import domReady from '@wordpress/dom-ready';
  * Internal dependencies
  */
 import { setup, speak } from '../';
-import clear from '../clear';
-import filterMessage from '../filter-message';
+import clear from '../shared/clear';
+import filterMessage from '../shared/filter-message';
 
-jest.mock( '../clear', () => {
+jest.mock( '../shared/clear', () => {
 	return jest.fn();
 } );
 jest.mock( '@wordpress/dom-ready', () => {
@@ -18,7 +18,7 @@ jest.mock( '@wordpress/dom-ready', () => {
 		callback();
 	} );
 } );
-jest.mock( '../filter-message', () => {
+jest.mock( '../shared/filter-message', () => {
 	return jest.fn( ( message ) => {
 		return message;
 	} );
diff --git a/packages/dependency-extraction-webpack-plugin/lib/util.js b/packages/dependency-extraction-webpack-plugin/lib/util.js
index fcc6e5a0ed173..cc99986024476 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/util.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/util.js
@@ -90,9 +90,10 @@ function defaultRequestToExternalModule( request ) {
 		return `module ${ request }`;
 	}
 
-	if ( request === '@wordpress/interactivity-router' ) {
-		// Assumes this is usually going to be used as a dynamic import.
-		return `import ${ request }`;
+	switch ( request ) {
+		case '@wordpress/interactivity-router':
+		case '@wordpress/a11y':
+			return `import ${ request }`;
 	}
 
 	const isWordPressScript = Boolean( defaultRequestToExternal( request ) );

From 92661e7b46ac01f7d7226764e18abafe2cf5d5d8 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:00:59 +0900
Subject: [PATCH 06/20] Build Tooling: Correctly generate PHP files for
 server-side rendering of blocks on Windows OS (#65248)

* Build Tooling: Correctly generate PHP files for server-side rendering of blocks on Windows OS

* Don't use  prefix

Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
---
 tools/webpack/blocks.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js
index fa0c6123dbcdb..a7866b61a6a1f 100644
--- a/tools/webpack/blocks.js
+++ b/tools/webpack/blocks.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-const { join, sep } = require( 'path' );
+const { join, sep, basename } = require( 'path' );
 const fastGlob = require( 'fast-glob' );
 const { realpathSync } = require( 'fs' );
 
@@ -135,7 +135,7 @@ module.exports = [
 						{
 							from: `${ from }/**/*.php`,
 							to( { absoluteFilename } ) {
-								const [ , dirname, basename ] =
+								const [ , dirname, fileBasename ] =
 									absoluteFilename.match(
 										new RegExp(
 											`([\\w-]+)${ escapeRegExp(
@@ -143,15 +143,18 @@ module.exports = [
 											) }([\\w-]+)\\.php$`
 										)
 									);
-
-								if ( basename === 'index' ) {
+								if ( fileBasename === 'index' ) {
 									return join( to, `${ dirname }.php` );
 								}
-								return join( to, dirname, `${ basename }.php` );
+								return join(
+									to,
+									dirname,
+									`${ fileBasename }.php`
+								);
 							},
 							filter: ( filepath ) => {
 								return (
-									filepath.endsWith( sep + 'index.php' ) ||
+									basename( filepath ) === 'index.php' ||
 									PhpFilePathsPlugin.paths.includes(
 										realpathSync( filepath ).replace(
 											/\\/g,

From 297e9cafba7e574e3c45f9c9fab91d2476ac9c10 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:08:23 +0900
Subject: [PATCH 07/20] Form Input: Don't use `flex-direction: row-reverse` for
 checkbox field (#64232)

* Form Input: Don't use `flex-direction: row-reverse` for checkbox field

* Don't create v2 variable

* Fix fixtures

* Update fixtures

* Split fixtures

* Integrate fixtures

* Remove unneccesary fixtures

* Add base fixtures for text-like inputs

All variations of the simple texts input field are added here to match the approach taken in the deprecation fixtures.

* Add base fixtures for checkbox, radio, and textarea inputs

* Add fallback style for old markup

---------

Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: aristath <aristath@git.wordpress.org>
Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
---
 .../src/form-input/deprecated.js              | 115 +++++++++++++++++-
 packages/block-library/src/form-input/edit.js |  28 +++--
 packages/block-library/src/form-input/save.js |  16 ++-
 .../block-library/src/form-input/style.scss   |  17 +--
 .../fixtures/blocks/core__form-input.html     |  17 +++
 .../fixtures/blocks/core__form-input.json     |  52 ++++++++
 .../blocks/core__form-input.parsed.json       |  72 +++++++++++
 .../blocks/core__form-input.serialized.html   |  16 +++
 .../blocks/core__form-input__checkbox.html    |   3 +
 .../blocks/core__form-input__checkbox.json    |  15 +++
 .../core__form-input__checkbox.parsed.json    |  14 +++
 ...core__form-input__checkbox.serialized.html |   3 +
 ...__form-input__checkbox__deprecated-v1.html |   7 ++
 ...__form-input__checkbox__deprecated-v1.json |  15 +++
 ...input__checkbox__deprecated-v1.parsed.json |  13 ++
 ...t__checkbox__deprecated-v1.serialized.html |   3 +
 ...__form-input__checkbox__deprecated-v2.html |   8 ++
 ...__form-input__checkbox__deprecated-v2.json |  15 +++
 ...input__checkbox__deprecated-v2.parsed.json |  13 ++
 ...t__checkbox__deprecated-v2.serialized.html |   3 +
 .../core__form-input__deprecated-v1.html      |  30 +++++
 .../core__form-input__deprecated-v1.json      |  52 ++++++++
 ...ore__form-input__deprecated-v1.parsed.json |  72 +++++++++++
 ..._form-input__deprecated-v1.serialized.html |  16 +++
 .../blocks/core__form-input__radio.html       |   3 +
 .../blocks/core__form-input__radio.json       |  15 +++
 .../core__form-input__radio.parsed.json       |  14 +++
 .../core__form-input__radio.serialized.html   |   3 +
 ...ore__form-input__radio__deprecated-v1.html |   7 ++
 ...ore__form-input__radio__deprecated-v1.json |  15 +++
 ...rm-input__radio__deprecated-v1.parsed.json |  13 ++
 ...nput__radio__deprecated-v1.serialized.html |   3 +
 ...ore__form-input__radio__deprecated-v2.html |   8 ++
 ...ore__form-input__radio__deprecated-v2.json |  15 +++
 ...rm-input__radio__deprecated-v2.parsed.json |  13 ++
 ...nput__radio__deprecated-v2.serialized.html |   3 +
 .../blocks/core__form-input__textarea.html    |   3 +
 .../blocks/core__form-input__textarea.json    |  15 +++
 .../core__form-input__textarea.parsed.json    |  13 ++
 ...core__form-input__textarea.serialized.html |   3 +
 ...__form-input__textarea__deprecated-v1.html |   6 +
 ...__form-input__textarea__deprecated-v1.json |  15 +++
 ...input__textarea__deprecated-v1.parsed.json |  13 ++
 ...t__textarea__deprecated-v1.serialized.html |   3 +
 44 files changed, 775 insertions(+), 23 deletions(-)
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html

diff --git a/packages/block-library/src/form-input/deprecated.js b/packages/block-library/src/form-input/deprecated.js
index 9cd49d5b0011b..451cc704a42d5 100644
--- a/packages/block-library/src/form-input/deprecated.js
+++ b/packages/block-library/src/form-input/deprecated.js
@@ -9,6 +9,7 @@ import removeAccents from 'remove-accents';
  */
 import {
 	RichText,
+	useBlockProps,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 } from '@wordpress/block-editor';
@@ -26,6 +27,118 @@ const getNameFromLabelV1 = ( content ) => {
 	);
 };
 
+const v2 = {
+	attributes: {
+		type: {
+			type: 'string',
+			default: 'text',
+		},
+		name: {
+			type: 'string',
+		},
+		label: {
+			type: 'string',
+			default: 'Label',
+			selector: '.wp-block-form-input__label-content',
+			source: 'html',
+			__experimentalRole: 'content',
+		},
+		inlineLabel: {
+			type: 'boolean',
+			default: false,
+		},
+		required: {
+			type: 'boolean',
+			default: false,
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'required',
+		},
+		placeholder: {
+			type: 'string',
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'placeholder',
+			__experimentalRole: 'content',
+		},
+		value: {
+			type: 'string',
+			default: '',
+			selector: 'input',
+			source: 'attribute',
+			attribute: 'value',
+		},
+		visibilityPermissions: {
+			type: 'string',
+			default: 'all',
+		},
+	},
+	supports: {
+		anchor: true,
+		reusable: false,
+		spacing: {
+			margin: [ 'top', 'bottom' ],
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalSkipSerialization: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	save( { attributes } ) {
+		const { type, name, label, inlineLabel, required, placeholder, value } =
+			attributes;
+
+		const borderProps = getBorderClassesAndStyles( attributes );
+		const colorProps = getColorClassesAndStyles( attributes );
+
+		const inputStyle = {
+			...borderProps.style,
+			...colorProps.style,
+		};
+
+		const inputClasses = clsx(
+			'wp-block-form-input__input',
+			colorProps.className,
+			borderProps.className
+		);
+		const TagName = type === 'textarea' ? 'textarea' : 'input';
+
+		const blockProps = useBlockProps.save();
+
+		if ( 'hidden' === type ) {
+			return <input type={ type } name={ name } value={ value } />;
+		}
+
+		return (
+			<div { ...blockProps }>
+				{ /* eslint-disable jsx-a11y/label-has-associated-control */ }
+				<label
+					className={ clsx( 'wp-block-form-input__label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+					<TagName
+						className={ inputClasses }
+						type={ 'textarea' === type ? undefined : type }
+						name={ name || getNameFromLabelV1( label ) }
+						required={ required }
+						aria-required={ required }
+						placeholder={ placeholder || undefined }
+						style={ inputStyle }
+					/>
+				</label>
+				{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
+			</div>
+		);
+	},
+};
+
 // Version without wrapper div in saved markup
 // See: https://github.com/WordPress/gutenberg/pull/56507
 const v1 = {
@@ -137,6 +250,6 @@ const v1 = {
 	},
 };
 
-const deprecated = [ v1 ];
+const deprecated = [ v2, v1 ];
 
 export default deprecated;
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 6939443011ee5..5f3713e83975f 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -31,6 +31,9 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		ref.current.focus();
 	}
 
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	const controls = (
 		<>
 			{ 'hidden' !== type && (
@@ -81,6 +84,18 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		</>
 	);
 
+	const content = (
+		<RichText
+			tagName="span"
+			className="wp-block-form-input__label-content"
+			value={ label }
+			onChange={ ( newLabel ) => setAttributes( { label: newLabel } ) }
+			aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
+			data-empty={ ! label }
+			placeholder={ __( 'Type the label for this input' ) }
+		/>
+	);
+
 	if ( 'hidden' === type ) {
 		return (
 			<>
@@ -111,17 +126,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					'is-label-inline': inlineLabel || 'checkbox' === type,
 				} ) }
 			>
-				<RichText
-					tagName="span"
-					className="wp-block-form-input__label-content"
-					value={ label }
-					onChange={ ( newLabel ) =>
-						setAttributes( { label: newLabel } )
-					}
-					aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
-					data-empty={ label ? false : true }
-					placeholder={ __( 'Type the label for this input' ) }
-				/>
+				{ ! isCheckboxOrRadio && content }
 				<TagName
 					type={ 'textarea' === type ? undefined : type }
 					className={ clsx(
@@ -147,6 +152,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						...colorProps.style,
 					} }
 				/>
+				{ isCheckboxOrRadio && content }
 			</span>
 		</div>
 	);
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index c408e06923ca9..941c23dc2014d 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -55,6 +55,9 @@ export default function save( { attributes } ) {
 
 	const blockProps = useBlockProps.save();
 
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	if ( 'hidden' === type ) {
 		return <input type={ type } name={ name } value={ value } />;
 	}
@@ -67,9 +70,11 @@ export default function save( { attributes } ) {
 					'is-label-inline': inlineLabel,
 				} ) }
 			>
-				<span className="wp-block-form-input__label-content">
-					<RichText.Content value={ label } />
-				</span>
+				{ ! isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
 				<TagName
 					className={ inputClasses }
 					type={ 'textarea' === type ? undefined : type }
@@ -79,6 +84,11 @@ export default function save( { attributes } ) {
 					placeholder={ placeholder || undefined }
 					style={ inputStyle }
 				/>
+				{ isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
 			</label>
 			{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
 		</div>
diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index f9e1753cf0a7b..7b1ac53cc89c0 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -15,16 +15,17 @@
 		}
 	}
 
-	/*
-	Small tweak to left-align the checkbox.
-	Even though `:has` is not currently supported in Firefox, this is a small tweak
-	and does not affect the functionality of the block or the user's experience.
-	There will be a minor inconsistency between browsers. However, it's more important to provide
-	a better experience for 80+% of users, until Firefox catches up and supports `:has`.
-	*/
 	&:has(input[type="checkbox"]) {
+		flex-direction: row;
 		width: fit-content;
-		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the row-reverse value. */
+
+		.wp-block-form-input__label-content {
+			margin: 0;
+		}
+	}
+
+	&:has(.wp-block-form-input__label-content + input[type="checkbox"]) {
+		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This style is required for old markup. */
 		flex-direction: row-reverse;
 	}
 }
diff --git a/test/integration/fixtures/blocks/core__form-input.html b/test/integration/fixtures/blocks/core__form-input.html
index 33f1fe88c2c6a..81ff6cf53534e 100644
--- a/test/integration/fixtures/blocks/core__form-input.html
+++ b/test/integration/fixtures/blocks/core__form-input.html
@@ -1,3 +1,20 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input.json b/test/integration/fixtures/blocks/core__form-input.json
index fee4df284f115..2d9865ef73556 100644
--- a/test/integration/fixtures/blocks/core__form-input.json
+++ b/test/integration/fixtures/blocks/core__form-input.json
@@ -11,5 +11,57 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.parsed.json b/test/integration/fixtures/blocks/core__form-input.parsed.json
index 5470c653c403b..439943df2841c 100644
--- a/test/integration/fixtures/blocks/core__form-input.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input.parsed.json
@@ -7,5 +7,77 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label></div>\n"
 		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.serialized.html b/test/integration/fixtures/blocks/core__form-input.serialized.html
index 33f1fe88c2c6a..d66cedcf9215b 100644
--- a/test/integration/fixtures/blocks/core__form-input.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input.serialized.html
@@ -1,3 +1,19 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.html b/test/integration/fixtures/blocks/core__form-input__checkbox.html
new file mode 100644
index 0000000000000..fd08525a17eb3
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.json b/test/integration/fixtures/blocks/core__form-input__checkbox.json
new file mode 100644
index 0000000000000..cc86ecd2a9080
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
new file mode 100644
index 0000000000000..60b7b7dd37b09
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
new file mode 100644
index 0000000000000..fd08525a17eb3
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
new file mode 100644
index 0000000000000..bd64e201e1918
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
new file mode 100644
index 0000000000000..162304dc84b0c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..2a2490e5c1260
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..6670593401970
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
new file mode 100644
index 0000000000000..3f1de1c602847
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
new file mode 100644
index 0000000000000..162304dc84b0c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..dfa57c0755f68
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..6670593401970
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
index 08ea661838620..5f043b0b2ef64 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
@@ -4,3 +4,33 @@
 	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
 </label>
 <!-- /wp:form-input -->
+
+
+<!-- wp:form-input {"type":"email"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
index fee4df284f115..2d9865ef73556 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
@@ -11,5 +11,57 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
index 645337cbfdb4a..963614974675d 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
@@ -7,5 +7,77 @@
 		"innerContent": [
 			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
 		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n\n",
+		"innerContent": [ "\n\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
index 33f1fe88c2c6a..d66cedcf9215b 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
@@ -1,3 +1,19 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.html b/test/integration/fixtures/blocks/core__form-input__radio.html
new file mode 100644
index 0000000000000..1e6c76424334f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.json b/test/integration/fixtures/blocks/core__form-input__radio.json
new file mode 100644
index 0000000000000..18cec11e3305b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
new file mode 100644
index 0000000000000..8dbb5b5a09942
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
new file mode 100644
index 0000000000000..1e6c76424334f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
new file mode 100644
index 0000000000000..8c41e02f10f04
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"radio"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
new file mode 100644
index 0000000000000..113ce01f7ab7e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..7433a6c7e9c50
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..be1ae98e02310
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
new file mode 100644
index 0000000000000..a1c1b58f9b7fc
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
new file mode 100644
index 0000000000000..113ce01f7ab7e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..14c7828b1c890
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..be1ae98e02310
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.html b/test/integration/fixtures/blocks/core__form-input__textarea.html
new file mode 100644
index 0000000000000..b39e1c8b51166
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.json b/test/integration/fixtures/blocks/core__form-input__textarea.json
new file mode 100644
index 0000000000000..62ae6f76a0e9d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
new file mode 100644
index 0000000000000..3f76a2194f27e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
new file mode 100644
index 0000000000000..b39e1c8b51166
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
new file mode 100644
index 0000000000000..8f7722f81ccc5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
new file mode 100644
index 0000000000000..398106d8de1ca
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..e5e11f26d9960
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..530403c4964fa
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea></label></div>
+<!-- /wp:form-input -->

From 33bdcbc97e4839e9bf69d01046f99b1490b28f66 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Thu, 12 Sep 2024 13:36:59 +0200
Subject: [PATCH 08/20] Remove babel from script-modules build (#65279)

Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
Co-authored-by: cbravobernal <cbravobernal@git.wordpress.org>
---
 tools/webpack/script-modules.js | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/tools/webpack/script-modules.js b/tools/webpack/script-modules.js
index 57652e0be28e2..18287c96d83c8 100644
--- a/tools/webpack/script-modules.js
+++ b/tools/webpack/script-modules.js
@@ -102,29 +102,6 @@ module.exports = {
 	resolve: {
 		extensions: [ '.js', '.ts', '.tsx' ],
 	},
-	module: {
-		rules: [
-			{
-				test: /\.(j|t)sx?$/,
-				exclude: /node_modules/,
-				use: [
-					{
-						loader: require.resolve( 'babel-loader' ),
-						options: {
-							cacheDirectory:
-								process.env.BABEL_CACHE_DIRECTORY || true,
-							babelrc: false,
-							configFile: false,
-							presets: [
-								'@babel/preset-typescript',
-								'@babel/preset-react',
-							],
-						},
-					},
-				],
-			},
-		],
-	},
 	plugins: [ ...plugins, new DependencyExtractionWebpackPlugin() ],
 	watchOptions: {
 		ignored: [ '**/node_modules' ],

From 33682989255dbceeab2ce67775b8f0c7a05b55de Mon Sep 17 00:00:00 2001
From: Jarda Snajdr <jsnajdr@gmail.com>
Date: Thu, 12 Sep 2024 14:04:35 +0200
Subject: [PATCH 09/20] Switch from UglifyJS to Terser to build the polyfill
 script (#65278)

Co-authored-by: jsnajdr <jsnajdr@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
Co-authored-by: sgomes <sergiomdgomes@git.wordpress.org>
---
 package-lock.json                          | 19 ++++++++++---------
 package.json                               |  2 +-
 packages/babel-preset-default/bin/index.js | 14 +++++++-------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32819be602f72..c3ae05f3a6bbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -245,9 +245,9 @@
 				"storybook-source-link": "2.0.9",
 				"strip-json-comments": "5.0.0",
 				"style-loader": "3.2.1",
+				"terser": "5.32.0",
 				"terser-webpack-plugin": "5.3.9",
 				"typescript": "5.5.3",
-				"uglify-js": "3.13.7",
 				"uuid": "9.0.1",
 				"webdriverio": "8.16.20",
 				"webpack": "5.88.2",
@@ -48431,10 +48431,9 @@
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.31.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.2.tgz",
-			"integrity": "sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==",
-			"license": "BSD-2-Clause",
+			"version": "5.32.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
+			"integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -49267,6 +49266,7 @@
 			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.7.tgz",
 			"integrity": "sha512-1Psi2MmnZJbnEsgJJIlfnd7tFlJfitusmR7zDI8lXlFI0ACD4/Rm/xdrU8bh6zF0i74aiVoBtkRiFulkrmh3AA==",
 			"dev": true,
+			"optional": true,
 			"bin": {
 				"uglifyjs": "bin/uglifyjs"
 			},
@@ -93531,9 +93531,9 @@
 			}
 		},
 		"terser": {
-			"version": "5.31.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.2.tgz",
-			"integrity": "sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==",
+			"version": "5.32.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
+			"integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
 			"requires": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -94155,7 +94155,8 @@
 			"version": "3.13.7",
 			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.7.tgz",
 			"integrity": "sha512-1Psi2MmnZJbnEsgJJIlfnd7tFlJfitusmR7zDI8lXlFI0ACD4/Rm/xdrU8bh6zF0i74aiVoBtkRiFulkrmh3AA==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"unbox-primitive": {
 			"version": "1.0.2",
diff --git a/package.json b/package.json
index 29e5f10b6f7a5..46d2b42f267ab 100644
--- a/package.json
+++ b/package.json
@@ -257,9 +257,9 @@
 		"storybook-source-link": "2.0.9",
 		"strip-json-comments": "5.0.0",
 		"style-loader": "3.2.1",
+		"terser": "5.32.0",
 		"terser-webpack-plugin": "5.3.9",
 		"typescript": "5.5.3",
-		"uglify-js": "3.13.7",
 		"uuid": "9.0.1",
 		"webdriverio": "8.16.20",
 		"webpack": "5.88.2",
diff --git a/packages/babel-preset-default/bin/index.js b/packages/babel-preset-default/bin/index.js
index 54c35564d43d7..0e0e66b450c1d 100755
--- a/packages/babel-preset-default/bin/index.js
+++ b/packages/babel-preset-default/bin/index.js
@@ -4,7 +4,7 @@
  * External dependencies
  */
 const builder = require( 'core-js-builder' );
-const { minify } = require( 'uglify-js' );
+const { minify } = require( 'terser' );
 const { writeFile } = require( 'fs' ).promises;
 
 builder( {
@@ -18,15 +18,15 @@ builder( {
 	targets: require( '@wordpress/browserslist-config' ),
 	filename: './build/polyfill.js',
 } )
-	.then( async ( code ) => {
-		const output = minify( code, {
+	.then( ( code ) =>
+		minify( code, {
 			output: {
 				comments: ( node, comment ) =>
-					comment.value.indexOf( 'License' ) >= 0,
+					comment.value.toLowerCase().includes( 'license' ),
 			},
-		} );
-		await writeFile( './build/polyfill.min.js', output.code );
-	} )
+		} )
+	)
+	.then( ( output ) => writeFile( './build/polyfill.min.js', output.code ) )
 	.catch( ( error ) => {
 		// eslint-disable-next-line no-console
 		console.log( error );

From 0cbc7be68742378b1dd3ef88d51ece2079ca88f0 Mon Sep 17 00:00:00 2001
From: Ilya Gayze <ilya.gayze@gmail.com>
Date: Thu, 12 Sep 2024 15:11:42 +0300
Subject: [PATCH 10/20] Fix typo in Slot Fills documentation (#65275)

Unlinked contributors: greenworld.

Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 docs/reference-guides/slotfills/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference-guides/slotfills/README.md b/docs/reference-guides/slotfills/README.md
index bab08dc34c40c..874a3a69096b8 100644
--- a/docs/reference-guides/slotfills/README.md
+++ b/docs/reference-guides/slotfills/README.md
@@ -166,7 +166,7 @@ import { __ } from '@wordpress/i18n';
  */
 const SiteEditorDocumentSettingPanel = () => {
 	// Retrieve information about the current post type.
-	const { isViewable } = useSelect( ( select ) => {
+	const isViewable = useSelect( ( select ) => {
 		const postTypeName = select( editorStore ).getCurrentPostType();
 		const postTypeObject = select( coreStore ).getPostType( postTypeName );
 

From a18d8310309bad51a39a8a99be66ffd36b056fe9 Mon Sep 17 00:00:00 2001
From: Akshat Kakkad <87222220+AKSHAT2802@users.noreply.github.com>
Date: Thu, 12 Sep 2024 18:28:42 +0530
Subject: [PATCH 11/20] Add props for buttons in editor 2 (#65083)

* Add __next40pxDefaultSize for editor 2 files

* Update packages/editor/src/components/post-publish-panel/index.js

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>

* update test snapshots

---------

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>

Co-authored-by: AKSHAT2802 <akshat2802@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
---
 packages/editor/src/components/post-format/index.js         | 3 +--
 packages/editor/src/components/post-last-revision/index.js  | 3 +--
 packages/editor/src/components/post-locked-modal/index.js   | 6 ++----
 packages/editor/src/components/post-publish-panel/index.js  | 3 +--
 .../post-publish-panel/maybe-post-format-panel.js           | 3 +--
 .../src/components/post-publish-panel/maybe-upload-media.js | 3 +--
 .../post-publish-panel/test/__snapshots__/index.js.snap     | 4 ++--
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/editor/src/components/post-format/index.js b/packages/editor/src/components/post-format/index.js
index 34e86a15b9d7f..8f7423239600f 100644
--- a/packages/editor/src/components/post-format/index.js
+++ b/packages/editor/src/components/post-format/index.js
@@ -100,8 +100,7 @@ export default function PostFormat() {
 				{ suggestion && suggestion.id !== postFormat && (
 					<p className="editor-post-format__suggestion">
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							variant="link"
 							onClick={ () =>
 								onUpdatePostFormat( suggestion.id )
diff --git a/packages/editor/src/components/post-last-revision/index.js b/packages/editor/src/components/post-last-revision/index.js
index b47ddb3acddd5..c0ce37198c951 100644
--- a/packages/editor/src/components/post-last-revision/index.js
+++ b/packages/editor/src/components/post-last-revision/index.js
@@ -36,8 +36,7 @@ function PostLastRevision() {
 	return (
 		<PostLastRevisionCheck>
 			<Button
-				// TODO: Switch to `true` (40px size) if possible
-				__next40pxDefaultSize={ false }
+				__next40pxDefaultSize
 				href={ addQueryArgs( 'revision.php', {
 					revision: lastRevisionId,
 				} ) }
diff --git a/packages/editor/src/components/post-locked-modal/index.js b/packages/editor/src/components/post-locked-modal/index.js
index afb0d48e1a133..7bfa2d23fd980 100644
--- a/packages/editor/src/components/post-locked-modal/index.js
+++ b/packages/editor/src/components/post-locked-modal/index.js
@@ -257,8 +257,7 @@ export default function PostLockedModal() {
 					>
 						{ ! isTakeover && (
 							<Button
-								// TODO: Switch to `true` (40px size) if possible
-								__next40pxDefaultSize={ false }
+								__next40pxDefaultSize
 								variant="tertiary"
 								href={ unlockUrl }
 							>
@@ -266,8 +265,7 @@ export default function PostLockedModal() {
 							</Button>
 						) }
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							variant="primary"
 							href={ allPostsUrl }
 						>
diff --git a/packages/editor/src/components/post-publish-panel/index.js b/packages/editor/src/components/post-publish-panel/index.js
index 3e411e91db472..f0e9a55eae060 100644
--- a/packages/editor/src/components/post-publish-panel/index.js
+++ b/packages/editor/src/components/post-publish-panel/index.js
@@ -78,8 +78,7 @@ export class PostPublishPanel extends Component {
 				<div className="editor-post-publish-panel__header">
 					{ isPostPublish ? (
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							size="compact"
 							onClick={ onClose }
 							icon={ closeSmall }
 							label={ __( 'Close panel' ) }
diff --git a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
index 6320390d9da5c..a81168808f1af 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
@@ -25,8 +25,7 @@ const PostFormatSuggestion = ( {
 	onUpdatePostFormat,
 } ) => (
 	<Button
-		// TODO: Switch to `true` (40px size) if possible
-		__next40pxDefaultSize={ false }
+		__next40pxDefaultSize
 		variant="link"
 		onClick={ () => onUpdatePostFormat( suggestedPostFormat ) }
 	>
diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
index 6b252b9f2b399..8c8d757c58339 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
@@ -256,8 +256,7 @@ export default function MaybeUploadMediaPanel() {
 					<Spinner />
 				) : (
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ uploadImages }
 					>
diff --git a/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap b/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
index 9331376d7f9c3..1dd75fffaa7b6 100644
--- a/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
+++ b/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
@@ -60,7 +60,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
     >
       <button
         aria-label="Close panel"
-        class="components-button has-icon"
+        class="components-button is-compact has-icon"
         type="button"
       >
         <svg
@@ -252,7 +252,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
     >
       <button
         aria-label="Close panel"
-        class="components-button has-icon"
+        class="components-button is-compact has-icon"
         type="button"
       >
         <svg

From 4c316952eb0d4bf23275a6c7d3bd2e50853bdd06 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Thu, 12 Sep 2024 16:13:00 +0200
Subject: [PATCH 12/20] Update: Remove unused css selectors. (#65276)

co-authored-by: jorgefilipecosta <jorgefilipecosta@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 packages/block-editor/src/components/inserter/style.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 289acecb5c1c3..e772a67a13138 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -155,15 +155,6 @@ $block-inserter-tabs-height: 44px;
 	text-align: right;
 }
 
-.block-editor-inserter__manage-reusable-blocks-container {
-	margin: auto $grid-unit-20 $grid-unit-20;
-}
-
-.block-editor-inserter__manage-reusable-blocks {
-	justify-content: center;
-	width: 100%;
-}
-
 .block-editor-inserter__no-results,
 .block-editor-inserter__patterns-loading {
 	padding: $grid-unit-40;

From 67fe7b00f49d77baccf58ba1ac4105b93396ee0a Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Sep 2024 15:17:57 +0100
Subject: [PATCH 13/20] Add Zoom Out toggle to editor header when experiment
 enabled (#65183)

* Add toggle when experiment active

* Add new square icon

* Use new icon

* Remove zoom out desktop 50% from device preview dropdown

* Fix console error for stroke-width to strokeWidth

---------

Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com>
Co-authored-by: getdave <get_dave@git.wordpress.org>
Co-authored-by: jeryj <jeryj@git.wordpress.org>
Co-authored-by: scruffian <scruffian@git.wordpress.org>
Co-authored-by: richtabor <richtabor@git.wordpress.org>
---
 .../editor/src/components/header/index.js     |   9 ++
 .../src/components/preview-dropdown/index.js  | 110 +++++-------------
 .../src/components/zoom-out-toggle/index.js   |  34 ++++++
 packages/icons/src/index.js                   |   1 +
 packages/icons/src/library/square.js          |  18 +++
 5 files changed, 88 insertions(+), 84 deletions(-)
 create mode 100644 packages/editor/src/components/zoom-out-toggle/index.js
 create mode 100644 packages/icons/src/library/square.js

diff --git a/packages/editor/src/components/header/index.js b/packages/editor/src/components/header/index.js
index 2e045ad732942..a838b95258ca6 100644
--- a/packages/editor/src/components/header/index.js
+++ b/packages/editor/src/components/header/index.js
@@ -22,6 +22,7 @@ import PostPublishButtonOrToggle from '../post-publish-button/post-publish-butto
 import PostSavedState from '../post-saved-state';
 import PostViewLink from '../post-view-link';
 import PreviewDropdown from '../preview-dropdown';
+import ZoomOutToggle from '../zoom-out-toggle';
 import { store as editorStore } from '../../store';
 
 const toolbarVariations = {
@@ -48,6 +49,9 @@ function Header( {
 	title,
 	icon,
 } ) {
+	const zoomOutExperimentEnabled =
+		window.__experimentalEnableZoomOutExperiment;
+
 	const isWideViewport = useViewportMatch( 'large' );
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const isTooNarrowForDocumentBar = useMediaQuery( '(max-width: 403px)' );
@@ -142,9 +146,13 @@ function Header( {
 					forceIsAutosaveable={ forceIsDirty }
 				/>
 				<PostViewLink />
+
+				{ zoomOutExperimentEnabled && <ZoomOutToggle /> }
+
 				{ ( isWideViewport || ! showIconLabels ) && (
 					<PinnedItems.Slot scope="core" />
 				) }
+
 				{ ! customSaveButton && (
 					<PostPublishButtonOrToggle
 						forceIsDirty={ forceIsDirty }
@@ -153,6 +161,7 @@ function Header( {
 						}
 					/>
 				) }
+
 				{ customSaveButton }
 				<MoreMenu />
 			</motion.div>
diff --git a/packages/editor/src/components/preview-dropdown/index.js b/packages/editor/src/components/preview-dropdown/index.js
index 5acaa351c9bb7..ecc5bc610a302 100644
--- a/packages/editor/src/components/preview-dropdown/index.js
+++ b/packages/editor/src/components/preview-dropdown/index.js
@@ -19,9 +19,7 @@ import { __ } from '@wordpress/i18n';
 import { desktop, mobile, tablet, external } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
-import { useEffect, useRef } from '@wordpress/element';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { ActionItem } from '@wordpress/interface';
 
 /**
@@ -31,49 +29,21 @@ import { store as editorStore } from '../../store';
 import PostPreviewButton from '../post-preview-button';
 
 export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
-	const {
-		deviceType,
-		editorMode,
-		homeUrl,
-		isTemplate,
-		isViewable,
-		showIconLabels,
-	} = useSelect( ( select ) => {
-		const { getDeviceType, getCurrentPostType } = select( editorStore );
-		const { getEntityRecord, getPostType } = select( coreStore );
-		const { get } = select( preferencesStore );
-		const { __unstableGetEditorMode } = select( blockEditorStore );
-		const _currentPostType = getCurrentPostType();
-		return {
-			deviceType: getDeviceType(),
-			editorMode: __unstableGetEditorMode(),
-			homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
-			isTemplate: _currentPostType === 'wp_template',
-			isViewable: getPostType( _currentPostType )?.viewable ?? false,
-			showIconLabels: get( 'core', 'showIconLabels' ),
-		};
-	}, [] );
+	const { deviceType, homeUrl, isTemplate, isViewable, showIconLabels } =
+		useSelect( ( select ) => {
+			const { getDeviceType, getCurrentPostType } = select( editorStore );
+			const { getEntityRecord, getPostType } = select( coreStore );
+			const { get } = select( preferencesStore );
+			const _currentPostType = getCurrentPostType();
+			return {
+				deviceType: getDeviceType(),
+				homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
+				isTemplate: _currentPostType === 'wp_template',
+				isViewable: getPostType( _currentPostType )?.viewable ?? false,
+				showIconLabels: get( 'core', 'showIconLabels' ),
+			};
+		}, [] );
 	const { setDeviceType } = useDispatch( editorStore );
-	const { __unstableSetEditorMode } = useDispatch( blockEditorStore );
-
-	/**
-	 * Save the original editing mode in a ref to restore it when we exit zoom out.
-	 */
-	const originalEditingModeRef = useRef( editorMode );
-	useEffect( () => {
-		if ( editorMode !== 'zoom-out' ) {
-			originalEditingModeRef.current = editorMode;
-		}
-
-		return () => {
-			if (
-				editorMode === 'zoom-out' &&
-				editorMode !== originalEditingModeRef.current
-			) {
-				__unstableSetEditorMode( originalEditingModeRef.current );
-			}
-		};
-	}, [ editorMode, __unstableSetEditorMode ] );
 
 	const isMobile = useViewportMatch( 'medium', '<' );
 	if ( isMobile ) {
@@ -112,44 +82,17 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 			label: __( 'Desktop' ),
 			icon: desktop,
 		},
+		{
+			value: 'Tablet',
+			label: __( 'Tablet' ),
+			icon: tablet,
+		},
+		{
+			value: 'Mobile',
+			label: __( 'Mobile' ),
+			icon: mobile,
+		},
 	];
-	if ( window.__experimentalEnableZoomOutExperiment ) {
-		choices.push( {
-			value: 'ZoomOut',
-			label: __( 'Desktop (50%)' ),
-			icon: desktop,
-		} );
-	}
-	choices.push( {
-		value: 'Tablet',
-		label: __( 'Tablet' ),
-		icon: tablet,
-	} );
-	choices.push( {
-		value: 'Mobile',
-		label: __( 'Mobile' ),
-		icon: mobile,
-	} );
-
-	const previewValue = editorMode === 'zoom-out' ? 'ZoomOut' : deviceType;
-
-	/**
-	 * Handles the selection of a device type.
-	 *
-	 * @param {string} value The device type.
-	 */
-	const onSelect = ( value ) => {
-		let newEditorMode = originalEditingModeRef.current;
-
-		if ( value === 'ZoomOut' ) {
-			newEditorMode = 'zoom-out';
-			setDeviceType( 'Desktop' );
-		} else {
-			setDeviceType( value );
-		}
-
-		__unstableSetEditorMode( newEditorMode );
-	};
 
 	return (
 		<DropdownMenu
@@ -161,7 +104,6 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 			toggleProps={ toggleProps }
 			menuProps={ menuProps }
 			icon={ deviceIcons[ deviceType.toLowerCase() ] }
-			text={ editorMode === 'zoom-out' ? __( '50%' ) : undefined }
 			label={ __( 'View' ) }
 			disableOpenOnArrowDown={ disabled }
 		>
@@ -170,8 +112,8 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 					<MenuGroup>
 						<MenuItemsChoice
 							choices={ choices }
-							value={ previewValue }
-							onSelect={ onSelect }
+							value={ deviceType }
+							onSelect={ setDeviceType }
 						/>
 					</MenuGroup>
 					{ isTemplate && (
diff --git a/packages/editor/src/components/zoom-out-toggle/index.js b/packages/editor/src/components/zoom-out-toggle/index.js
new file mode 100644
index 0000000000000..e8c7b1e50510a
--- /dev/null
+++ b/packages/editor/src/components/zoom-out-toggle/index.js
@@ -0,0 +1,34 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { square as zoomOutIcon } from '@wordpress/icons';
+
+const ZoomOutToggle = () => {
+	const { isZoomOutMode } = useSelect( ( select ) => ( {
+		isZoomOutMode:
+			select( blockEditorStore ).__unstableGetEditorMode() === 'zoom-out',
+	} ) );
+
+	const { __unstableSetEditorMode } = useDispatch( blockEditorStore );
+
+	const handleZoomOut = () => {
+		__unstableSetEditorMode( isZoomOutMode ? 'edit' : 'zoom-out' );
+	};
+
+	return (
+		<Button
+			onClick={ handleZoomOut }
+			icon={ zoomOutIcon }
+			label={ __( 'Toggle Zoom Out' ) }
+			isPressed={ isZoomOutMode }
+			size="compact"
+		/>
+	);
+};
+
+export default ZoomOutToggle;
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index 11b3da927f364..d60ca5a74eb5b 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -242,6 +242,7 @@ export { default as store } from './library/store';
 export { default as stretchFullWidth } from './library/stretch-full-width';
 export { default as styles } from './library/styles';
 export { default as shipping } from './library/shipping';
+export { default as square } from './library/square';
 export { default as stretchWide } from './library/stretch-wide';
 export { default as subscript } from './library/subscript';
 export { default as superscript } from './library/superscript';
diff --git a/packages/icons/src/library/square.js b/packages/icons/src/library/square.js
new file mode 100644
index 0000000000000..843a8d2d5261d
--- /dev/null
+++ b/packages/icons/src/library/square.js
@@ -0,0 +1,18 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const square = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+		<Path
+			fill="none"
+			d="M5.75 12.75V18.25H11.25M12.75 5.75H18.25V11.25"
+			stroke="currentColor"
+			strokeWidth="1.5"
+			strokeLinecap="square"
+		/>
+	</SVG>
+);
+
+export default square;

From eba5eb7c94125c2199930512ed0731675b36562b Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+cbravobernal@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:18:13 +0200
Subject: [PATCH 14/20] Block Bindings: Try gap 0 on attribute items. (#65277)

* Try gap 0

* Use vstack property

Co-authored-by: cbravobernal <cbravobernal@git.wordpress.org>
Co-authored-by: jasmussen <joen@git.wordpress.org>
---
 packages/block-editor/src/hooks/block-bindings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/hooks/block-bindings.js b/packages/block-editor/src/hooks/block-bindings.js
index 3b59de2238b96..be632cd4db3a2 100644
--- a/packages/block-editor/src/hooks/block-bindings.js
+++ b/packages/block-editor/src/hooks/block-bindings.js
@@ -98,7 +98,7 @@ function BlockBindingsAttribute( { attribute, binding } ) {
 		unlock( blocksPrivateApis ).getBlockBindingsSource( sourceName );
 	const isSourceInvalid = ! sourceProps;
 	return (
-		<VStack className="block-editor-bindings__item">
+		<VStack className="block-editor-bindings__item" spacing={ 0 }>
 			<Text truncate>{ attribute }</Text>
 			{ !! binding && (
 				<Text

From d329bfb23807f422d44731b8b031832e5afa8488 Mon Sep 17 00:00:00 2001
From: Luigi Teschio <gigitux@gmail.com>
Date: Thu, 12 Sep 2024 16:30:48 +0200
Subject: [PATCH 15/20] [Fields] Migrate store and actions from editor package
 to fields package (#65261)

Co-authored-by: gigitux <gigitux@git.wordpress.org>
Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
---
 package-lock.json                             | 46 +++++++++-
 packages/editor/package.json                  |  1 +
 .../src/dataviews/store/private-actions.ts    | 18 ++--
 packages/editor/tsconfig.json                 |  1 +
 packages/fields/README.md                     | 48 ++++++++++-
 packages/fields/package.json                  | 23 ++++-
 .../base-post}/duplicate-post.native.tsx      |  0
 .../src/actions/base-post}/duplicate-post.tsx |  6 +-
 .../fields/src/actions/base-post/index.ts     |  5 ++
 .../base-post}/reorder-page.native.tsx        |  0
 .../src/actions/base-post}/reorder-page.tsx   |  4 +-
 .../src/actions/base-post}/view-post.tsx      |  2 +-
 packages/fields/src/actions/common/index.ts   |  2 +
 .../common}/permanently-delete-post.tsx       |  4 +-
 .../actions/common}/view-post-revisions.tsx   |  2 +-
 packages/fields/src/actions/index.ts          |  3 +
 .../actions/pattern}/duplicate-pattern.tsx    |  2 +-
 .../pattern}/export-pattern.native.tsx        |  0
 .../src/actions/pattern}/export-pattern.tsx   |  4 +-
 packages/fields/src/actions/pattern/index.ts  |  3 +
 packages/fields/src/actions/utils.ts          | 66 ++++++++++++++
 packages/fields/src/fields/index.ts           |  2 +
 packages/fields/src/fields/order/index.ts     | 18 ++++
 packages/fields/src/fields/title/index.ts     | 21 +++++
 packages/fields/src/index.native.ts           |  2 +
 packages/fields/src/index.ts                  |  2 +
 packages/fields/src/lock-unlock.ts            |  9 ++
 packages/fields/src/types.ts                  | 85 +++++++++++++++++++
 packages/fields/src/wordpress-editor.d.ts     |  1 +
 packages/fields/tsconfig.json                 | 22 ++++-
 30 files changed, 376 insertions(+), 26 deletions(-)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/base-post}/duplicate-post.native.tsx (100%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/base-post}/duplicate-post.tsx (96%)
 create mode 100644 packages/fields/src/actions/base-post/index.ts
 rename packages/{editor/src/dataviews/actions => fields/src/actions/base-post}/reorder-page.native.tsx (100%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/base-post}/reorder-page.tsx (96%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/base-post}/view-post.tsx (92%)
 create mode 100644 packages/fields/src/actions/common/index.ts
 rename packages/{editor/src/dataviews/actions => fields/src/actions/common}/permanently-delete-post.tsx (96%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/common}/view-post-revisions.tsx (96%)
 create mode 100644 packages/fields/src/actions/index.ts
 rename packages/{editor/src/dataviews/actions => fields/src/actions/pattern}/duplicate-pattern.tsx (95%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/pattern}/export-pattern.native.tsx (100%)
 rename packages/{editor/src/dataviews/actions => fields/src/actions/pattern}/export-pattern.tsx (95%)
 create mode 100644 packages/fields/src/actions/pattern/index.ts
 create mode 100644 packages/fields/src/actions/utils.ts
 create mode 100644 packages/fields/src/fields/index.ts
 create mode 100644 packages/fields/src/fields/order/index.ts
 create mode 100644 packages/fields/src/fields/title/index.ts
 create mode 100644 packages/fields/src/index.native.ts
 create mode 100644 packages/fields/src/lock-unlock.ts
 create mode 100644 packages/fields/src/types.ts
 create mode 100644 packages/fields/src/wordpress-editor.d.ts

diff --git a/package-lock.json b/package-lock.json
index c3ae05f3a6bbe..49d1ad6b123b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53933,6 +53933,7 @@
 				"@wordpress/deprecated": "file:../deprecated",
 				"@wordpress/dom": "file:../dom",
 				"@wordpress/element": "file:../element",
+				"@wordpress/fields": "file:../fields",
 				"@wordpress/hooks": "file:../hooks",
 				"@wordpress/html-entities": "file:../html-entities",
 				"@wordpress/i18n": "file:../i18n",
@@ -54194,7 +54195,27 @@
 			"version": "0.0.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/blob": "file:../blob",
+				"@wordpress/blocks": "file:../blocks",
+				"@wordpress/components": "file:../components",
+				"@wordpress/compose": "file:../compose",
+				"@wordpress/core-data": "file:../core-data",
+				"@wordpress/data": "file:../data",
+				"@wordpress/dataviews": "file:../dataviews",
+				"@wordpress/element": "file:../element",
+				"@wordpress/hooks": "file:../hooks",
+				"@wordpress/html-entities": "file:../html-entities",
+				"@wordpress/i18n": "file:../i18n",
+				"@wordpress/icons": "file:../icons",
+				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
+				"@wordpress/primitives": "file:../primitives",
+				"@wordpress/private-apis": "file:../private-apis",
+				"@wordpress/url": "file:../url",
+				"@wordpress/warning": "file:../warning",
+				"change-case": "4.1.2",
+				"client-zip": "^2.4.5"
 			},
 			"engines": {
 				"node": ">=18.12.0",
@@ -68738,6 +68759,7 @@
 				"@wordpress/deprecated": "file:../deprecated",
 				"@wordpress/dom": "file:../dom",
 				"@wordpress/element": "file:../element",
+				"@wordpress/fields": "file:../fields",
 				"@wordpress/hooks": "file:../hooks",
 				"@wordpress/html-entities": "file:../html-entities",
 				"@wordpress/i18n": "file:../i18n",
@@ -68919,7 +68941,27 @@
 		"@wordpress/fields": {
 			"version": "file:packages/fields",
 			"requires": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/blob": "file:../blob",
+				"@wordpress/blocks": "file:../blocks",
+				"@wordpress/components": "file:../components",
+				"@wordpress/compose": "file:../compose",
+				"@wordpress/core-data": "file:../core-data",
+				"@wordpress/data": "file:../data",
+				"@wordpress/dataviews": "file:../dataviews",
+				"@wordpress/element": "file:../element",
+				"@wordpress/hooks": "file:../hooks",
+				"@wordpress/html-entities": "file:../html-entities",
+				"@wordpress/i18n": "file:../i18n",
+				"@wordpress/icons": "file:../icons",
+				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
+				"@wordpress/primitives": "file:../primitives",
+				"@wordpress/private-apis": "file:../private-apis",
+				"@wordpress/url": "file:../url",
+				"@wordpress/warning": "file:../warning",
+				"change-case": "4.1.2",
+				"client-zip": "^2.4.5"
 			}
 		},
 		"@wordpress/format-library": {
diff --git a/packages/editor/package.json b/packages/editor/package.json
index a9d486b74e79c..2e01aff3a0aa5 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -47,6 +47,7 @@
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/dom": "file:../dom",
 		"@wordpress/element": "file:../element",
+		"@wordpress/fields": "file:../fields",
 		"@wordpress/hooks": "file:../hooks",
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
diff --git a/packages/editor/src/dataviews/store/private-actions.ts b/packages/editor/src/dataviews/store/private-actions.ts
index a9101e57dd08b..e685493641f3b 100644
--- a/packages/editor/src/dataviews/store/private-actions.ts
+++ b/packages/editor/src/dataviews/store/private-actions.ts
@@ -8,22 +8,24 @@ import { doAction } from '@wordpress/hooks';
 /**
  * Internal dependencies
  */
-import deletePost from '../actions/delete-post';
-import duplicatePattern from '../actions/duplicate-pattern';
 import duplicateTemplatePart from '../actions/duplicate-template-part';
-import exportPattern from '../actions/export-pattern';
 import resetPost from '../actions/reset-post';
 import trashPost from '../actions/trash-post';
-import permanentlyDeletePost from '../actions/permanently-delete-post';
 import renamePost from '../actions/rename-post';
-import reorderPage from '../actions/reorder-page';
 import restorePost from '../actions/restore-post';
 import type { PostType } from '../types';
 import { store as editorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import duplicatePost from '../actions/duplicate-post';
-import viewPostRevisions from '../actions/view-post-revisions';
-import viewPost from '../actions/view-post';
+import {
+	viewPost,
+	viewPostRevisions,
+	duplicatePost,
+	duplicatePattern,
+	reorderPage,
+	exportPattern,
+	permanentlyDeletePost,
+} from '@wordpress/fields';
+import deletePost from '../actions/delete-post';
 
 export function registerEntityAction< Item >(
 	kind: string,
diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json
index 55d79babd1dac..3c45fbcb10db3 100644
--- a/packages/editor/tsconfig.json
+++ b/packages/editor/tsconfig.json
@@ -20,6 +20,7 @@
 		{ "path": "../deprecated" },
 		{ "path": "../dom" },
 		{ "path": "../element" },
+		{ "path": "../fields" },
 		{ "path": "../hooks" },
 		{ "path": "../html-entities" },
 		{ "path": "../i18n" },
diff --git a/packages/fields/README.md b/packages/fields/README.md
index c5044d1e9fdd2..842fab02606af 100644
--- a/packages/fields/README.md
+++ b/packages/fields/README.md
@@ -14,7 +14,53 @@ npm install @wordpress/fields --save
 
 <!-- START TOKEN(Autogenerated API docs) -->
 
-Nothing to document.
+### duplicatePattern
+
+Undocumented declaration.
+
+### duplicatePost
+
+Undocumented declaration.
+
+### duplicatePostNative
+
+Undocumented declaration.
+
+### exportPattern
+
+Undocumented declaration.
+
+### exportPatternNative
+
+Undocumented declaration.
+
+### orderField
+
+Undocumented declaration.
+
+### permanentlyDeletePost
+
+Undocumented declaration.
+
+### reorderPage
+
+Undocumented declaration.
+
+### reorderPageNative
+
+Undocumented declaration.
+
+### titleField
+
+Undocumented declaration.
+
+### viewPost
+
+Undocumented declaration.
+
+### viewPostRevisions
+
+Undocumented declaration.
 
 <!-- END TOKEN(Autogenerated API docs) -->
 
diff --git a/packages/fields/package.json b/packages/fields/package.json
index e953b34264901..2e417c9f4de57 100644
--- a/packages/fields/package.json
+++ b/packages/fields/package.json
@@ -25,13 +25,34 @@
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
+	"react-native": "src/index",
 	"types": "build-types",
 	"sideEffects": [
 		"build-style/**",
 		"src/**/*.scss"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "^7.16.0",
+		"@wordpress/blob": "file:../blob",
+		"@wordpress/blocks": "file:../blocks",
+		"@wordpress/components": "file:../components",
+		"@wordpress/compose": "file:../compose",
+		"@wordpress/core-data": "file:../core-data",
+		"@wordpress/data": "file:../data",
+		"@wordpress/dataviews": "file:../dataviews",
+		"@wordpress/element": "file:../element",
+		"@wordpress/hooks": "file:../hooks",
+		"@wordpress/html-entities": "file:../html-entities",
+		"@wordpress/i18n": "file:../i18n",
+		"@wordpress/icons": "file:../icons",
+		"@wordpress/notices": "file:../notices",
+		"@wordpress/patterns": "file:../patterns",
+		"@wordpress/primitives": "file:../primitives",
+		"@wordpress/private-apis": "file:../private-apis",
+		"@wordpress/url": "file:../url",
+		"@wordpress/warning": "file:../warning",
+		"change-case": "4.1.2",
+		"client-zip": "^2.4.5"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
diff --git a/packages/editor/src/dataviews/actions/duplicate-post.native.tsx b/packages/fields/src/actions/base-post/duplicate-post.native.tsx
similarity index 100%
rename from packages/editor/src/dataviews/actions/duplicate-post.native.tsx
rename to packages/fields/src/actions/base-post/duplicate-post.native.tsx
diff --git a/packages/editor/src/dataviews/actions/duplicate-post.tsx b/packages/fields/src/actions/base-post/duplicate-post.tsx
similarity index 96%
rename from packages/editor/src/dataviews/actions/duplicate-post.tsx
rename to packages/fields/src/actions/base-post/duplicate-post.tsx
index 0979d30da3951..0035a40c00934 100644
--- a/packages/editor/src/dataviews/actions/duplicate-post.tsx
+++ b/packages/fields/src/actions/base-post/duplicate-post.tsx
@@ -18,9 +18,9 @@ import type { Action } from '@wordpress/dataviews';
 /**
  * Internal dependencies
  */
-import { getItemTitle } from '../../dataviews/actions/utils';
-import type { CoreDataError, BasePost } from '../types';
-import { titleField } from '../fields';
+import { titleField } from '../../fields';
+import type { BasePost, CoreDataError } from '../../types';
+import { getItemTitle } from '../utils';
 
 const fields = [ titleField ];
 const formDuplicateAction = {
diff --git a/packages/fields/src/actions/base-post/index.ts b/packages/fields/src/actions/base-post/index.ts
new file mode 100644
index 0000000000000..7541be86c48b1
--- /dev/null
+++ b/packages/fields/src/actions/base-post/index.ts
@@ -0,0 +1,5 @@
+export { default as viewPost } from './view-post';
+export { default as reorderPage } from './reorder-page';
+export { default as reorderPageNative } from './reorder-page.native';
+export { default as duplicatePost } from './duplicate-post';
+export { default as duplicatePostNative } from './duplicate-post.native';
diff --git a/packages/editor/src/dataviews/actions/reorder-page.native.tsx b/packages/fields/src/actions/base-post/reorder-page.native.tsx
similarity index 100%
rename from packages/editor/src/dataviews/actions/reorder-page.native.tsx
rename to packages/fields/src/actions/base-post/reorder-page.native.tsx
diff --git a/packages/editor/src/dataviews/actions/reorder-page.tsx b/packages/fields/src/actions/base-post/reorder-page.tsx
similarity index 96%
rename from packages/editor/src/dataviews/actions/reorder-page.tsx
rename to packages/fields/src/actions/base-post/reorder-page.tsx
index 1820884d8d8c7..7f3bca59c471c 100644
--- a/packages/editor/src/dataviews/actions/reorder-page.tsx
+++ b/packages/fields/src/actions/base-post/reorder-page.tsx
@@ -17,8 +17,8 @@ import type { Action, RenderModalProps } from '@wordpress/dataviews';
 /**
  * Internal dependencies
  */
-import type { CoreDataError, BasePost } from '../types';
-import { orderField } from '../fields';
+import type { CoreDataError, BasePost } from '../../types';
+import { orderField } from '../../fields';
 
 const fields = [ orderField ];
 const formOrderAction = {
diff --git a/packages/editor/src/dataviews/actions/view-post.tsx b/packages/fields/src/actions/base-post/view-post.tsx
similarity index 92%
rename from packages/editor/src/dataviews/actions/view-post.tsx
rename to packages/fields/src/actions/base-post/view-post.tsx
index 187faffafb5d3..8c581877e473b 100644
--- a/packages/editor/src/dataviews/actions/view-post.tsx
+++ b/packages/fields/src/actions/base-post/view-post.tsx
@@ -8,7 +8,7 @@ import type { Action } from '@wordpress/dataviews';
 /**
  * Internal dependencies
  */
-import type { BasePost } from '../types';
+import type { BasePost } from '../../types';
 
 const viewPost: Action< BasePost > = {
 	id: 'view-post',
diff --git a/packages/fields/src/actions/common/index.ts b/packages/fields/src/actions/common/index.ts
new file mode 100644
index 0000000000000..3590b2e270892
--- /dev/null
+++ b/packages/fields/src/actions/common/index.ts
@@ -0,0 +1,2 @@
+export { default as viewPostRevisions } from './view-post-revisions';
+export { default as permanentlyDeletePost } from './permanently-delete-post';
diff --git a/packages/editor/src/dataviews/actions/permanently-delete-post.tsx b/packages/fields/src/actions/common/permanently-delete-post.tsx
similarity index 96%
rename from packages/editor/src/dataviews/actions/permanently-delete-post.tsx
rename to packages/fields/src/actions/common/permanently-delete-post.tsx
index afbb84ae12c74..e0c1de96871f1 100644
--- a/packages/editor/src/dataviews/actions/permanently-delete-post.tsx
+++ b/packages/fields/src/actions/common/permanently-delete-post.tsx
@@ -10,8 +10,8 @@ import { trash } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { getItemTitle, isTemplateOrTemplatePart } from './utils';
-import type { CoreDataError, PostWithPermissions } from '../types';
+import { getItemTitle, isTemplateOrTemplatePart } from '../utils';
+import type { CoreDataError, PostWithPermissions } from '../../types';
 
 const permanentlyDeletePost: Action< PostWithPermissions > = {
 	id: 'permanently-delete',
diff --git a/packages/editor/src/dataviews/actions/view-post-revisions.tsx b/packages/fields/src/actions/common/view-post-revisions.tsx
similarity index 96%
rename from packages/editor/src/dataviews/actions/view-post-revisions.tsx
rename to packages/fields/src/actions/common/view-post-revisions.tsx
index 875b925b94f07..617a5263a707d 100644
--- a/packages/editor/src/dataviews/actions/view-post-revisions.tsx
+++ b/packages/fields/src/actions/common/view-post-revisions.tsx
@@ -8,7 +8,7 @@ import type { Action } from '@wordpress/dataviews';
 /**
  * Internal dependencies
  */
-import type { Post } from '../types';
+import type { Post } from '../../types';
 
 const viewPostRevisions: Action< Post > = {
 	id: 'view-post-revisions',
diff --git a/packages/fields/src/actions/index.ts b/packages/fields/src/actions/index.ts
new file mode 100644
index 0000000000000..cf4fd6833f3fb
--- /dev/null
+++ b/packages/fields/src/actions/index.ts
@@ -0,0 +1,3 @@
+export * from './base-post';
+export * from './common';
+export * from './pattern';
diff --git a/packages/editor/src/dataviews/actions/duplicate-pattern.tsx b/packages/fields/src/actions/pattern/duplicate-pattern.tsx
similarity index 95%
rename from packages/editor/src/dataviews/actions/duplicate-pattern.tsx
rename to packages/fields/src/actions/pattern/duplicate-pattern.tsx
index 98f43a27c3628..7c71a271997f1 100644
--- a/packages/editor/src/dataviews/actions/duplicate-pattern.tsx
+++ b/packages/fields/src/actions/pattern/duplicate-pattern.tsx
@@ -10,7 +10,7 @@ import type { Action } from '@wordpress/dataviews';
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
-import type { Pattern } from '../types';
+import type { Pattern } from '../../types';
 
 // Patterns.
 const { CreatePatternModalContents, useDuplicatePatternProps } =
diff --git a/packages/editor/src/dataviews/actions/export-pattern.native.tsx b/packages/fields/src/actions/pattern/export-pattern.native.tsx
similarity index 100%
rename from packages/editor/src/dataviews/actions/export-pattern.native.tsx
rename to packages/fields/src/actions/pattern/export-pattern.native.tsx
diff --git a/packages/editor/src/dataviews/actions/export-pattern.tsx b/packages/fields/src/actions/pattern/export-pattern.tsx
similarity index 95%
rename from packages/editor/src/dataviews/actions/export-pattern.tsx
rename to packages/fields/src/actions/pattern/export-pattern.tsx
index b6be83eeda84b..b0f6c3335544c 100644
--- a/packages/editor/src/dataviews/actions/export-pattern.tsx
+++ b/packages/fields/src/actions/pattern/export-pattern.tsx
@@ -15,8 +15,8 @@ import type { Action } from '@wordpress/dataviews';
 /**
  * Internal dependencies
  */
-import type { Pattern } from '../types';
-import { getItemTitle } from './utils';
+import type { Pattern } from '../../types';
+import { getItemTitle } from '../utils';
 
 function getJsonFromItem( item: Pattern ) {
 	return JSON.stringify(
diff --git a/packages/fields/src/actions/pattern/index.ts b/packages/fields/src/actions/pattern/index.ts
new file mode 100644
index 0000000000000..827c2ce365c2c
--- /dev/null
+++ b/packages/fields/src/actions/pattern/index.ts
@@ -0,0 +1,3 @@
+export { default as duplicatePattern } from './duplicate-pattern';
+export { default as exportPattern } from './export-pattern';
+export { default as exportPatternNative } from './export-pattern.native';
diff --git a/packages/fields/src/actions/utils.ts b/packages/fields/src/actions/utils.ts
new file mode 100644
index 0000000000000..14e8edae4be04
--- /dev/null
+++ b/packages/fields/src/actions/utils.ts
@@ -0,0 +1,66 @@
+/**
+ * WordPress dependencies
+ */
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import type { Post, TemplatePart, Template } from '../types';
+
+export const TEMPLATE_POST_TYPE = 'wp_template';
+export const TEMPLATE_PART_POST_TYPE = 'wp_template_part';
+export const TEMPLATE_ORIGINS = {
+	custom: 'custom',
+	theme: 'theme',
+	plugin: 'plugin',
+};
+
+export function isTemplate( post: Post ): post is Template {
+	return post.type === TEMPLATE_POST_TYPE;
+}
+
+export function isTemplatePart( post: Post ): post is TemplatePart {
+	return post.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function isTemplateOrTemplatePart(
+	p: Post
+): p is Template | TemplatePart {
+	return p.type === TEMPLATE_POST_TYPE || p.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function getItemTitle( item: Post ) {
+	if ( typeof item.title === 'string' ) {
+		return decodeEntities( item.title );
+	}
+	if ( 'rendered' in item.title ) {
+		return decodeEntities( item.title.rendered );
+	}
+	if ( 'raw' in item.title ) {
+		return decodeEntities( item.title.raw );
+	}
+	return '';
+}
+
+/**
+ * Check if a template is removable.
+ *
+ * @param template The template entity to check.
+ * @return Whether the template is removable.
+ */
+export function isTemplateRemovable( template: Template | TemplatePart ) {
+	if ( ! template ) {
+		return false;
+	}
+	// In patterns list page we map the templates parts to a different object
+	// than the one returned from the endpoint. This is why we need to check for
+	// two props whether is custom or has a theme file.
+	return (
+		[ template.source, template.source ].includes(
+			TEMPLATE_ORIGINS.custom
+		) &&
+		! Boolean( template.type === 'wp_template' && template?.plugin ) &&
+		! template.has_theme_file
+	);
+}
diff --git a/packages/fields/src/fields/index.ts b/packages/fields/src/fields/index.ts
new file mode 100644
index 0000000000000..63ff87842fa4c
--- /dev/null
+++ b/packages/fields/src/fields/index.ts
@@ -0,0 +1,2 @@
+export { default as titleField } from './title';
+export { default as orderField } from './order';
diff --git a/packages/fields/src/fields/order/index.ts b/packages/fields/src/fields/order/index.ts
new file mode 100644
index 0000000000000..2fc0a216dcfa0
--- /dev/null
+++ b/packages/fields/src/fields/order/index.ts
@@ -0,0 +1,18 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+import { __ } from '@wordpress/i18n';
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+
+const orderField: Field< BasePost > = {
+	type: 'integer',
+	id: 'menu_order',
+	label: __( 'Order' ),
+	description: __( 'Determines the order of pages.' ),
+};
+
+export default orderField;
diff --git a/packages/fields/src/fields/title/index.ts b/packages/fields/src/fields/title/index.ts
new file mode 100644
index 0000000000000..5332f476f8ff5
--- /dev/null
+++ b/packages/fields/src/fields/title/index.ts
@@ -0,0 +1,21 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import { getItemTitle } from '../../actions/utils';
+
+const titleField: Field< BasePost > = {
+	type: 'text',
+	id: 'title',
+	label: __( 'Title' ),
+	placeholder: __( 'No title' ),
+	getValue: ( { item } ) => getItemTitle( item ),
+};
+
+export default titleField;
diff --git a/packages/fields/src/index.native.ts b/packages/fields/src/index.native.ts
new file mode 100644
index 0000000000000..e4d3134d72f84
--- /dev/null
+++ b/packages/fields/src/index.native.ts
@@ -0,0 +1,2 @@
+export * from './actions/base-post/duplicate-post.native';
+export * from './actions/base-post/reorder-page.native';
diff --git a/packages/fields/src/index.ts b/packages/fields/src/index.ts
index e69de29bb2d1d..4c721b85b61a4 100644
--- a/packages/fields/src/index.ts
+++ b/packages/fields/src/index.ts
@@ -0,0 +1,2 @@
+export * from './fields';
+export * from './actions';
diff --git a/packages/fields/src/lock-unlock.ts b/packages/fields/src/lock-unlock.ts
new file mode 100644
index 0000000000000..2b5dcc4a50631
--- /dev/null
+++ b/packages/fields/src/lock-unlock.ts
@@ -0,0 +1,9 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/fields'
+	);
diff --git a/packages/fields/src/types.ts b/packages/fields/src/types.ts
new file mode 100644
index 0000000000000..664c2dd417201
--- /dev/null
+++ b/packages/fields/src/types.ts
@@ -0,0 +1,85 @@
+type PostStatus =
+	| 'published'
+	| 'draft'
+	| 'pending'
+	| 'private'
+	| 'future'
+	| 'auto-draft'
+	| 'trash';
+
+export interface CommonPost {
+	status?: PostStatus;
+	title: string | { rendered: string } | { raw: string };
+	content: string | { raw: string; rendered: string };
+	type: string;
+	id: string | number;
+	blocks?: Object[];
+	_links?: Links;
+}
+
+interface Links {
+	'predecessor-version'?: { href: string; id: number }[];
+	'version-history'?: { href: string; count: number }[];
+	[ key: string ]: { href: string }[] | undefined;
+}
+
+export interface BasePost extends CommonPost {
+	comment_status?: 'open' | 'closed';
+	excerpt?: string | { raw: string; rendered: string };
+	meta?: Record< string, any >;
+	parent?: number;
+	password?: string;
+	template?: string;
+	format?: string;
+	featured_media?: number;
+	menu_order?: number;
+	ping_status?: 'open' | 'closed';
+	link?: string;
+}
+
+export interface Template extends CommonPost {
+	type: 'wp_template';
+	is_custom: boolean;
+	source: string;
+	origin: string;
+	plugin?: string;
+	has_theme_file: boolean;
+	id: string;
+}
+
+export interface TemplatePart extends CommonPost {
+	type: 'wp_template_part';
+	source: string;
+	origin: string;
+	has_theme_file: boolean;
+	id: string;
+	area: string;
+}
+
+export interface Pattern extends CommonPost {
+	slug: string;
+	title: { raw: string };
+	wp_pattern_sync_status: string;
+}
+
+export type Post = Template | TemplatePart | Pattern | BasePost;
+
+export type PostWithPermissions = Post & {
+	permissions: {
+		delete: boolean;
+		update: boolean;
+	};
+};
+
+export interface PostType {
+	slug: string;
+	viewable: boolean;
+	supports?: {
+		'page-attributes'?: boolean;
+		title?: boolean;
+		revisions?: boolean;
+	};
+}
+
+// Will be unnecessary after typescript 5.0 upgrade.
+export type CoreDataError = { message?: string; code?: string };
diff --git a/packages/fields/src/wordpress-editor.d.ts b/packages/fields/src/wordpress-editor.d.ts
new file mode 100644
index 0000000000000..915dacd5f05a9
--- /dev/null
+++ b/packages/fields/src/wordpress-editor.d.ts
@@ -0,0 +1 @@
+declare module '@wordpress/editor';
diff --git a/packages/fields/tsconfig.json b/packages/fields/tsconfig.json
index 79aa09d0ad56e..c55be59acf40f 100644
--- a/packages/fields/tsconfig.json
+++ b/packages/fields/tsconfig.json
@@ -6,6 +6,24 @@
 		"declarationDir": "build-types",
 		"checkJs": false
 	},
-	"references": [],
-	"include": [ "src" ]
+	"references": [
+		{ "path": "../components" },
+		{ "path": "../compose" },
+		{ "path": "../data" },
+		{ "path": "../element" },
+		{ "path": "../i18n" },
+		{ "path": "../icons" },
+		{ "path": "../primitives" },
+		{ "path": "../private-apis" },
+		{ "path": "../warning" },
+		{ "path": "../url" },
+		{ "path": "../notices" },
+		{ "path": "../dataviews" },
+		{ "path": "../blob" },
+		{ "path": "../core-data" },
+		{ "path": "../hooks" },
+		{ "path": "../html-entities" }
+	],
+	"include": [ "src" ],
+	"exclude": [ "@wordpress/editor" ]
 }

From fb4ba2613f2c9c21fa64f7d9b3b9cd160a238d71 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 12 Sep 2024 16:29:00 +0100
Subject: [PATCH 16/20] Align popover alt variant styling with block toolbar
 (#65263)

Co-authored-by: jameskoster <jameskoster@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
---
 packages/components/CHANGELOG.md           | 1 +
 packages/components/src/popover/style.scss | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 67a63b8b65646..a04f7e3f276b9 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 -   `Tabs`: indicator positioning under RTL direction ([#64926](https://github.com/WordPress/gutenberg/pull/64926)).
+-   `Popover`: Update `toolbar` variant radius to match block toolbar ([#65263](https://github.com/WordPress/gutenberg/pull/65263)).
 
 ### Deprecations
 
diff --git a/packages/components/src/popover/style.scss b/packages/components/src/popover/style.scss
index 01b0eb9116142..bfab8978864b3 100644
--- a/packages/components/src/popover/style.scss
+++ b/packages/components/src/popover/style.scss
@@ -27,9 +27,10 @@ $shadow-popover-border-top-only-alternate: 0 #{-$border-width} 0 $gray-900;
 	box-sizing: border-box;
 	width: min-content;
 
-	// Alternate treatment for popovers that put them at elevation zero with high contrast.
+	// Alternate treatment for popovers that put them at elevation zero with high contrast and smaller radius.
 	.is-alternate & {
 		box-shadow: $shadow-popover-border-default-alternate;
+		border-radius: $radius-small;
 	}
 
 	// A style that gives the popover no visible ui.

From 6d32f4fc128b88431c63faa64889fcdc5b7c0a91 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Fri, 13 Sep 2024 00:57:48 +0900
Subject: [PATCH 17/20] BoxControl: Fix critical error when null value is
 passed (#65287)

* BoxControl: Fix critical error when null value is passed

* Add Changelog entry

* Update packages/components/src/box-control/utils.ts

Co-authored-by: Marin Atanasov <8436925+tyxla@users.noreply.github.com>

---------

Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
---
 packages/components/CHANGELOG.md             | 1 +
 packages/components/src/box-control/utils.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index a04f7e3f276b9..04858e448da7f 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -29,6 +29,7 @@
 -   `Tabs`: improved performance of the indicator animation ([#64926](https://github.com/WordPress/gutenberg/pull/64926)).
 -   `Composite`: Remove from private APIs ([#63569](https://github.com/WordPress/gutenberg/pull/63569)).
 -   use local copy of `use-lilius` instead of `npm` dependency ([#65097](https://github.com/WordPress/gutenberg/pull/65097)).
+-   `BoxControl`: Fix critical error when null value is passed ([#65287](https://github.com/WordPress/gutenberg/pull/65287)).
 
 ## 28.7.0 (2024-09-05)
 
diff --git a/packages/components/src/box-control/utils.ts b/packages/components/src/box-control/utils.ts
index e480c9a9f4674..73c7f4a6a46cf 100644
--- a/packages/components/src/box-control/utils.ts
+++ b/packages/components/src/box-control/utils.ts
@@ -179,7 +179,7 @@ export function isValuesMixed(
  */
 export function isValuesDefined( values?: BoxControlValue ) {
 	return (
-		values !== undefined &&
+		values &&
 		Object.values( values ).filter(
 			// Switching units when input is empty causes values only
 			// containing units. This gives false positive on mixed values

From a89527495af5969b7a5670e6814a06682543ae14 Mon Sep 17 00:00:00 2001
From: Akshat Kakkad <87222220+AKSHAT2802@users.noreply.github.com>
Date: Fri, 13 Sep 2024 01:44:38 +0530
Subject: [PATCH 18/20] Add props for buttons in editor 1 (#65068)

* Add props for buttons in editor 1

* Address feedback

* remove extra class name and extra styles

Co-authored-by: AKSHAT2802 <akshat2802@git.wordpress.org>
Co-authored-by: mirka <0mirka00@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
Co-authored-by: tyxla <tyxla@git.wordpress.org>
---
 packages/editor/src/components/block-manager/index.js    | 3 +--
 packages/editor/src/components/editor-history/redo.js    | 3 +--
 packages/editor/src/components/editor-history/undo.js    | 3 +--
 packages/editor/src/components/error-boundary/index.js   | 7 +------
 packages/editor/src/components/post-excerpt/panel.js     | 4 +---
 .../editor/src/components/post-featured-image/index.js   | 9 +++------
 .../editor/src/components/post-featured-image/style.scss | 6 +-----
 7 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/packages/editor/src/components/block-manager/index.js b/packages/editor/src/components/block-manager/index.js
index 0f70812e268de..b3bc1c6f9b0e8 100644
--- a/packages/editor/src/components/block-manager/index.js
+++ b/packages/editor/src/components/block-manager/index.js
@@ -67,8 +67,7 @@ function BlockManager( {
 						numberOfHiddenBlocks
 					) }
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
+						__next40pxDefaultSize
 						variant="link"
 						onClick={ () => enableAllBlockTypes( blockTypes ) }
 					>
diff --git a/packages/editor/src/components/editor-history/redo.js b/packages/editor/src/components/editor-history/redo.js
index ef46ff6bc78e2..46a263bb89926 100644
--- a/packages/editor/src/components/editor-history/redo.js
+++ b/packages/editor/src/components/editor-history/redo.js
@@ -25,8 +25,7 @@ function EditorHistoryRedo( props, ref ) {
 	const { redo } = useDispatch( editorStore );
 	return (
 		<Button
-			// TODO: Switch to `true` (40px size) if possible
-			__next40pxDefaultSize={ false }
+			__next40pxDefaultSize
 			{ ...props }
 			ref={ ref }
 			icon={ ! isRTL() ? redoIcon : undoIcon }
diff --git a/packages/editor/src/components/editor-history/undo.js b/packages/editor/src/components/editor-history/undo.js
index 0c28f8c8231f8..6ba6055706e99 100644
--- a/packages/editor/src/components/editor-history/undo.js
+++ b/packages/editor/src/components/editor-history/undo.js
@@ -21,8 +21,7 @@ function EditorHistoryUndo( props, ref ) {
 	const { undo } = useDispatch( editorStore );
 	return (
 		<Button
-			// TODO: Switch to `true` (40px size) if possible
-			__next40pxDefaultSize={ false }
+			__next40pxDefaultSize
 			{ ...props }
 			ref={ ref }
 			icon={ ! isRTL() ? undoIcon : redoIcon }
diff --git a/packages/editor/src/components/error-boundary/index.js b/packages/editor/src/components/error-boundary/index.js
index 30cc6b970f306..d43af5a556b67 100644
--- a/packages/editor/src/components/error-boundary/index.js
+++ b/packages/editor/src/components/error-boundary/index.js
@@ -29,12 +29,7 @@ function getContent() {
 function CopyButton( { text, children } ) {
 	const ref = useCopyToClipboard( text );
 	return (
-		<Button
-			// TODO: Switch to `true` (40px size) if possible
-			__next40pxDefaultSize={ false }
-			variant="secondary"
-			ref={ ref }
-		>
+		<Button __next40pxDefaultSize variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
diff --git a/packages/editor/src/components/post-excerpt/panel.js b/packages/editor/src/components/post-excerpt/panel.js
index 9a37e9134775a..9c09796f46704 100644
--- a/packages/editor/src/components/post-excerpt/panel.js
+++ b/packages/editor/src/components/post-excerpt/panel.js
@@ -198,9 +198,7 @@ function PrivateExcerpt() {
 				ref={ setPopoverAnchor }
 				renderToggle={ ( { onToggle } ) => (
 					<Button
-						// TODO: Switch to `true` (40px size) if possible
-						__next40pxDefaultSize={ false }
-						className="editor-post-excerpt__dropdown__trigger"
+						__next40pxDefaultSize
 						onClick={ onToggle }
 						variant="link"
 					>
diff --git a/packages/editor/src/components/post-featured-image/index.js b/packages/editor/src/components/post-featured-image/index.js
index b6d44bd668cf7..9907eb5dd0f22 100644
--- a/packages/editor/src/components/post-featured-image/index.js
+++ b/packages/editor/src/components/post-featured-image/index.js
@@ -160,8 +160,7 @@ function PostFeaturedImage( {
 						render={ ( { open } ) => (
 							<div className="editor-post-featured-image__container">
 								<Button
-									// TODO: Switch to `true` (40px size) if possible
-									__next40pxDefaultSize={ false }
+									__next40pxDefaultSize
 									ref={ toggleRef }
 									className={
 										! featuredImageId
@@ -202,8 +201,7 @@ function PostFeaturedImage( {
 								{ !! featuredImageId && (
 									<HStack className="editor-post-featured-image__actions">
 										<Button
-											// TODO: Switch to `true` (40px size) if possible
-											__next40pxDefaultSize={ false }
+											__next40pxDefaultSize
 											className="editor-post-featured-image__action"
 											onClick={ open }
 											aria-haspopup="dialog"
@@ -211,8 +209,7 @@ function PostFeaturedImage( {
 											{ __( 'Replace' ) }
 										</Button>
 										<Button
-											// TODO: Switch to `true` (40px size) if possible
-											__next40pxDefaultSize={ false }
+											__next40pxDefaultSize
 											className="editor-post-featured-image__action"
 											onClick={ () => {
 												onRemoveImage();
diff --git a/packages/editor/src/components/post-featured-image/style.scss b/packages/editor/src/components/post-featured-image/style.scss
index 3a537471b42f2..a14c2ea73a63c 100644
--- a/packages/editor/src/components/post-featured-image/style.scss
+++ b/packages/editor/src/components/post-featured-image/style.scss
@@ -53,7 +53,7 @@
 }
 
 .editor-post-featured-image__preview {
-	height: auto;
+	height: auto !important;
 	outline: $border-width solid rgba($black, 0.1);
 
 	.editor-post-featured-image__preview-image {
@@ -65,10 +65,6 @@
 }
 
 .editor-post-featured-image__toggle {
-	height: 100%;
-	line-height: 20px;
-	padding: $grid-unit-10 0;
-	text-align: center;
 	box-shadow: inset 0 0 0 $border-width $gray-400;
 }
 

From 1664022139daa11353788a3ef59686fa7f58b262 Mon Sep 17 00:00:00 2001
From: Rohit Mathur <62138457+rohitmathur-7@users.noreply.github.com>
Date: Fri, 13 Sep 2024 08:12:39 +0530
Subject: [PATCH 19/20] Grid: In RTL languages, the resize handles point in the
 opposite direction  (#64995)

* Fixed the RTL resizing issue

* Removed comment, fix spacing

* Added else condition

* Revert "Fixed the RTL resizing issue"

This reverts commit 39cfde5052c71712e4d0f6337f39c523e3830785.

* Updated left and right values for justification

Co-authored-by: rohitmathur-7 <rohitmathur7@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
---
 .../block-editor/src/components/grid/grid-item-resizer.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/grid/grid-item-resizer.js b/packages/block-editor/src/components/grid/grid-item-resizer.js
index da3eb824fe92e..1277ac2a23953 100644
--- a/packages/block-editor/src/components/grid/grid-item-resizer.js
+++ b/packages/block-editor/src/components/grid/grid-item-resizer.js
@@ -73,8 +73,8 @@ function GridItemResizerInner( {
 	}, [ blockElement, rootBlockElement ] );
 
 	const justification = {
-		right: 'flex-start',
-		left: 'flex-end',
+		right: 'left',
+		left: 'right',
 	};
 
 	const alignment = {

From 632d8d62e8f8621c2771b266c1d2a68477bb3ca1 Mon Sep 17 00:00:00 2001
From: Madhu Dollu <madhusudhan.dollu@gmail.com>
Date: Fri, 13 Sep 2024 12:09:33 +0530
Subject: [PATCH 20/20] Spacing control: Replace sides dropdwon with link
 button (#65193)

* replace sides dropdown with link button for spacing control

* remove sides dropdown

* lowercase the link button tooltip

* fix unit tests
---
 .../components/spacing-sizes-control/index.js | 23 ++---
 .../spacing-sizes-control/linked-button.js    | 32 +++++++
 .../sides-dropdown/index.js                   | 91 -------------------
 .../spacing-sizes-control/test/utils.js       | 29 +++---
 .../components/spacing-sizes-control/utils.js | 23 +----
 5 files changed, 61 insertions(+), 137 deletions(-)
 create mode 100644 packages/block-editor/src/components/spacing-sizes-control/linked-button.js
 delete mode 100644 packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js

diff --git a/packages/block-editor/src/components/spacing-sizes-control/index.js b/packages/block-editor/src/components/spacing-sizes-control/index.js
index 6886670f54115..6ca143d14706a 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/index.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/index.js
@@ -7,7 +7,7 @@ import {
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
-import { __, _x, sprintf } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -15,7 +15,7 @@ import { __, _x, sprintf } from '@wordpress/i18n';
 import AxialInputControls from './input-controls/axial';
 import SeparatedInputControls from './input-controls/separated';
 import SingleInputControl from './input-controls/single';
-import SidesDropdown from './sides-dropdown';
+import LinkedButton from './linked-button';
 import useSpacingSizes from './hooks/use-spacing-sizes';
 import {
 	ALL_SIDES,
@@ -47,6 +47,10 @@ export default function SpacingSizesControl( {
 
 	const [ view, setView ] = useState( getInitialView( inputValues, sides ) );
 
+	const toggleLinked = () => {
+		setView( view === VIEWS.axial ? VIEWS.custom : VIEWS.axial );
+	};
+
 	const handleOnChange = ( nextValue ) => {
 		const newValues = { ...values, ...nextValue };
 		onChange( newValues );
@@ -91,12 +95,6 @@ export default function SpacingSizesControl( {
 		sideLabel
 	).trim();
 
-	const dropdownLabelText = sprintf(
-		// translators: %s: The current spacing property e.g. "Padding", "Margin".
-		_x( '%s options', 'Button label to reveal side configuration options' ),
-		labelProp
-	);
-
 	return (
 		<fieldset className="spacing-sizes-control">
 			<HStack className="spacing-sizes-control__header">
@@ -107,11 +105,10 @@ export default function SpacingSizesControl( {
 					{ label }
 				</BaseControl.VisualLabel>
 				{ ! hasOneSide && ! hasOnlyAxialSides && (
-					<SidesDropdown
-						label={ dropdownLabelText }
-						onChange={ setView }
-						sides={ sides }
-						value={ view }
+					<LinkedButton
+						label={ labelProp }
+						onClick={ toggleLinked }
+						isLinked={ view === VIEWS.axial }
 					/>
 				) }
 			</HStack>
diff --git a/packages/block-editor/src/components/spacing-sizes-control/linked-button.js b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
new file mode 100644
index 0000000000000..e9ca68aaa2b31
--- /dev/null
+++ b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
@@ -0,0 +1,32 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, Tooltip } from '@wordpress/components';
+import { link, linkOff } from '@wordpress/icons';
+import { __, sprintf } from '@wordpress/i18n';
+
+export default function LinkedButton( { isLinked, ...props } ) {
+	const label = isLinked
+		? sprintf(
+				// translators: 1. Type of spacing being modified (padding, margin, etc).
+				__( 'Unlink %1$s' ),
+				props.label.toLowerCase()
+		  ).trim()
+		: sprintf(
+				// translators: 1. Type of spacing being modified (padding, margin, etc).
+				__( 'Link %1$s' ),
+				props.label.toLowerCase()
+		  ).trim();
+
+	return (
+		<Tooltip text={ label }>
+			<Button
+				{ ...props }
+				size="small"
+				icon={ isLinked ? link : linkOff }
+				iconSize={ 24 }
+				aria-label={ label }
+			/>
+		</Tooltip>
+	);
+}
diff --git a/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js b/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js
deleted file mode 100644
index e399efa5b4467..0000000000000
--- a/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { DropdownMenu, Icon, MenuGroup, MenuItem } from '@wordpress/components';
-import { check } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { getSupportedMenuItems, VIEWS } from '../utils';
-
-const checkIcon = <Icon icon={ check } size={ 24 } />;
-
-export default function SidesDropdown( {
-	label: labelProp,
-	onChange,
-	sides,
-	value,
-} ) {
-	if ( ! sides || ! sides.length ) {
-		return;
-	}
-
-	const supportedItems = getSupportedMenuItems( sides );
-	const sideIcon = supportedItems[ value ].icon;
-	const { custom: customItem, ...menuItems } = supportedItems;
-
-	return (
-		<DropdownMenu
-			icon={ sideIcon }
-			label={ labelProp }
-			className="spacing-sizes-control__dropdown"
-			toggleProps={ { size: 'small' } }
-		>
-			{ ( { onClose } ) => {
-				return (
-					<>
-						<MenuGroup>
-							{ Object.entries( menuItems ).map(
-								( [ slug, { label, icon } ] ) => {
-									const isSelected = value === slug;
-									return (
-										<MenuItem
-											key={ slug }
-											icon={ icon }
-											iconPosition="left"
-											isSelected={ isSelected }
-											role="menuitemradio"
-											onClick={ () => {
-												onChange( slug );
-												onClose();
-											} }
-											suffix={
-												isSelected
-													? checkIcon
-													: undefined
-											}
-										>
-											{ label }
-										</MenuItem>
-									);
-								}
-							) }
-						</MenuGroup>
-						{ !! customItem && (
-							<MenuGroup>
-								<MenuItem
-									icon={ customItem.icon }
-									iconPosition="left"
-									isSelected={ value === VIEWS.custom }
-									role="menuitemradio"
-									onClick={ () => {
-										onChange( VIEWS.custom );
-										onClose();
-									} }
-									suffix={
-										value === VIEWS.custom
-											? checkIcon
-											: undefined
-									}
-								>
-									{ customItem.label }
-								</MenuItem>
-							</MenuGroup>
-						) }
-					</>
-				);
-			} }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/block-editor/src/components/spacing-sizes-control/test/utils.js b/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
index a631cbfcff3ef..22191b4e1a8de 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
@@ -373,8 +373,8 @@ describe( 'getInitialView', () => {
 				getInitialView( { top: '1em', right: '10px' }, ALL_SIDES )
 			).toBe( VIEWS.custom );
 		} );
-		it( 'should not return custom view if there is only a single side value', () => {
-			expect( getInitialView( { top: '1em' }, ALL_SIDES ) ).not.toBe(
+		it( 'should return custom view if there is only a single side value', () => {
+			expect( getInitialView( { top: '1em' }, ALL_SIDES ) ).toBe(
 				VIEWS.custom
 			);
 		} );
@@ -387,20 +387,19 @@ describe( 'getInitialView', () => {
 			);
 		} );
 
-		it( 'should return the single side view if there is only a single side value set and supported sides > 1', () => {
-			expect( getInitialView( { top: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.top
-			);
-			expect( getInitialView( { right: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.right
-			);
-			expect( getInitialView( { bottom: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.bottom
-			);
-			expect( getInitialView( { left: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.left
-			);
+		it( 'should return single side when only single side supported and no value defined', () => {
+			expect( getInitialView( {}, [ 'top' ] ) ).toBe( VIEWS.top );
+		} );
+
+		it( 'should return single side when only single side supported and all values defined', () => {
+			expect(
+				getInitialView(
+					{ top: '1em', right: '2em', bottom: '1em', left: '2em' },
+					[ 'top' ]
+				)
+			).toBe( VIEWS.top );
 		} );
+
 		it( 'should return single side view when only one side is supported', () => {
 			expect( getInitialView( { top: '1em' }, [ 'top' ] ) ).toBe(
 				VIEWS.top
diff --git a/packages/block-editor/src/components/spacing-sizes-control/utils.js b/packages/block-editor/src/components/spacing-sizes-control/utils.js
index 91c5a91934f6e..df2da0d93d060 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/utils.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/utils.js
@@ -364,6 +364,11 @@ export function getInitialView( values = {}, sides ) {
 	const hasNoValuesAndBalancedSides =
 		! sideValues.length && hasBalancedSidesSupport( sides );
 
+	// Only single side supported and no value defined.
+	if ( sides?.length === 1 ) {
+		return sides[ 0 ];
+	}
+
 	if (
 		hasAxisSupport( sides ) &&
 		( hasMatchingAxialValues || hasNoValuesAndBalancedSides )
@@ -371,24 +376,6 @@ export function getInitialView( values = {}, sides ) {
 		return VIEWS.axial;
 	}
 
-	// Single side.
-	// - Ensure the side returned is the first side that has a value.
-	if ( sideValues.length === 1 ) {
-		let side;
-
-		Object.entries( values ).some( ( [ key, value ] ) => {
-			side = key;
-			return value !== undefined;
-		} );
-
-		return side;
-	}
-
-	// Only single side supported and no value defined.
-	if ( sides?.length === 1 && ! sideValues.length ) {
-		return sides[ 0 ];
-	}
-
 	// Default to the Custom (separated sides) view.
 	return VIEWS.custom;
 }