From d2e3b2b6cf8e681938403817422bbfa57c95a97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Ribari=C4=87?=
 <43731400+ribaricplusplus@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:28:04 +0200
Subject: [PATCH 01/53] Docs: fix block-editor typo (#30401)

---
 .../block-editor/src/components/alignment-control/README.md     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/alignment-control/README.md b/packages/block-editor/src/components/alignment-control/README.md
index f78cd0299095c1..258cc9ea113c41 100644
--- a/packages/block-editor/src/components/alignment-control/README.md
+++ b/packages/block-editor/src/components/alignment-control/README.md
@@ -1,6 +1,6 @@
 ## Alignment Control
 
-The `AlignmentControl` component renders a dropdown mmmenu that displays alignment options for the selected block.
+The `AlignmentControl` component renders a dropdown menu that displays alignment options for the selected block.
 
 This component is mostly used for blocks that display text, such as Heading, Paragraph, Post Author, Post Comments, Verse, Quote, Post Title, etc... And the available alignment options are `left`, `center` or `right` alignment.
 

From 0eb76dcbdb22ef198c690ade215acb56604edd00 Mon Sep 17 00:00:00 2001
From: Joen A <1204802+jasmussen@users.noreply.github.com>
Date: Wed, 31 Mar 2021 11:19:58 +0200
Subject: [PATCH 02/53] Use shorter writing prompt. (#29611)

This change aims at improving the clarity of the writing prompt that guides people to use the slash inserter
---
 docs/how-to-guides/designers/block-design.md                 | 2 +-
 .../src/components/default-block-appender/index.js           | 3 +--
 .../default-block-appender/test/__snapshots__/index.js.snap  | 4 ++--
 packages/block-library/src/paragraph/edit.js                 | 5 +----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/how-to-guides/designers/block-design.md b/docs/how-to-guides/designers/block-design.md
index c054e34da1fa7b..fdc6abb4369bdf 100644
--- a/docs/how-to-guides/designers/block-design.md
+++ b/docs/how-to-guides/designers/block-design.md
@@ -158,7 +158,7 @@ The most basic unit of the editor. The Paragraph block is a simple input field.
 
 ### Placeholder:
 
-- Simple placeholder text that reads “Start writing or type / to choose a block”. The placeholder disappears when the block is selected.
+- Simple placeholder text that reads “Type / to choose a block”. The placeholder disappears when the block is selected.
 
 ### Selected state:
 
diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js
index 992c641b9a5d44..db1f249d393bf6 100644
--- a/packages/block-editor/src/components/default-block-appender/index.js
+++ b/packages/block-editor/src/components/default-block-appender/index.js
@@ -31,8 +31,7 @@ export function DefaultBlockAppender( {
 	}
 
 	const value =
-		decodeEntities( placeholder ) ||
-		__( 'Start writing or type / to choose a block' );
+		decodeEntities( placeholder ) || __( 'Type / to choose a block' );
 
 	// The appender "button" is in-fact a text field so as to support
 	// transitions by WritingFlow occurring by arrow key press. WritingFlow
diff --git a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap
index 46ad0b2eee8ac8..4ec195a23acb80 100644
--- a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap
@@ -23,7 +23,7 @@ exports[`DefaultBlockAppender should append a default block when input focused 1
     }
     readOnly={true}
     role="button"
-    value="Start writing or type / to choose a block"
+    value="Type / to choose a block"
   />
   <WithSelect(WithDispatch(IfCondition(Inserter)))
     __experimentalIsQuick={true}
@@ -44,7 +44,7 @@ exports[`DefaultBlockAppender should match snapshot 1`] = `
     onFocus={[MockFunction]}
     readOnly={true}
     role="button"
-    value="Start writing or type / to choose a block"
+    value="Type / to choose a block"
   />
   <WithSelect(WithDispatch(IfCondition(Inserter)))
     __experimentalIsQuick={true}
diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index 86c3af60c36721..e7f5d0eda47abe 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -134,10 +134,7 @@ function ParagraphBlock( {
 						  )
 				}
 				data-empty={ content ? false : true }
-				placeholder={
-					placeholder ||
-					__( 'Start writing or type / to choose a block' )
-				}
+				placeholder={ placeholder || __( 'Type / to choose a block' ) }
 				__unstableEmbedURLOnPaste
 				__unstableAllowPrefixTransformations
 			/>

From a58e519b18eac1140390105de9fbb85e5581b7ca Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 31 Mar 2021 10:55:09 +0100
Subject: [PATCH 03/53] Fix the archives block frontend/editor parity (#30141)

---
 lib/client-assets.php                  |  2 +-
 packages/block-library/src/common.scss | 31 +++++++++++++++++++
 packages/block-library/src/reset.scss  | 43 +++++++++++++++++++++-----
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/lib/client-assets.php b/lib/client-assets.php
index 6bcfff4f67124b..6ffb733fc6a9b2 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -370,7 +370,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-reset-editor-styles',
 		gutenberg_url( 'build/block-library/reset.css' ),
-		array(),
+		array( 'common', 'forms' ), // Make sure the reset is loaded after the default WP Adminn styles.
 		$version
 	);
 	$styles->add_data( 'wp-reset-editor-styles', 'rtl', 'replace' );
diff --git a/packages/block-library/src/common.scss b/packages/block-library/src/common.scss
index 0e96cb1eb63cad..4cd25f750d5223 100644
--- a/packages/block-library/src/common.scss
+++ b/packages/block-library/src/common.scss
@@ -81,3 +81,34 @@
 .items-justified-space-between {
 	justify-content: space-between;
 }
+
+.screen-reader-text {
+	border: 0;
+	clip: rect(1px, 1px, 1px, 1px);
+	-webkit-clip-path: inset(50%);
+	clip-path: inset(50%);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+	word-wrap: normal !important;
+}
+
+.screen-reader-text:focus {
+	background-color: $gray-300;
+	clip: auto !important;
+	clip-path: none;
+	color: #444;
+	display: block;
+	font-size: 1em;
+	height: auto;
+	left: 5px;
+	line-height: normal;
+	padding: 15px 23px 14px;
+	text-decoration: none;
+	top: 5px;
+	width: auto;
+	z-index: 100000;
+}
diff --git a/packages/block-library/src/reset.scss b/packages/block-library/src/reset.scss
index 41c4affb36325d..2890fde40b8a0d 100644
--- a/packages/block-library/src/reset.scss
+++ b/packages/block-library/src/reset.scss
@@ -61,6 +61,8 @@
 	ol {
 		margin: revert;
 		padding: revert;
+		list-style-type: revert;
+		box-sizing: revert;
 
 		// Remove bottom margin from nested lists.
 		ul,
@@ -73,14 +75,6 @@
 		}
 	}
 
-	ul {
-		list-style-type: revert;
-	}
-
-	ol {
-		list-style-type: revert;
-	}
-
 	ul ul,
 	ol ul {
 		list-style-type: revert;
@@ -98,4 +92,37 @@
 		line-height: revert;
 		font-weight: revert;
 	}
+
+	select {
+		font-family: system-ui;
+		-webkit-appearance: revert;
+		color: revert;
+		border: revert;
+		border-radius: revert;
+		background: revert;
+		box-shadow: revert;
+		text-shadow: revert;
+		outline: revert;
+		cursor: revert;
+		transform: revert;
+		font-size: revert;
+		line-height: revert;
+		padding: revert;
+		margin: revert;
+		min-height: revert;
+		max-width: revert;
+		vertical-align: revert;
+		font-weight: revert;
+	}
+
+	select:disabled,
+	select:focus {
+		color: revert;
+		border-color: revert;
+		background: revert;
+		box-shadow: revert;
+		text-shadow: revert;
+		cursor: revert;
+		transform: revert;
+	}
 }

From 84b989d1ce8d806e79d2edb0ad5708c820ff504c Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 31 Mar 2021 12:52:40 +0200
Subject: [PATCH 04/53] Add padding support to template parts (#29779)

* Add padding support to template parts

* linting

* Update docs

* linting

* Try to resolve merge conflicts

Try to resolve merge conflicts
Remove spacing visualizer which is not working in the site editor

* Update index.php
---
 packages/block-library/src/template-part/block.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json
index 8ffb9be3fe1ce0..c66bed73d33d7f 100644
--- a/packages/block-library/src/template-part/block.json
+++ b/packages/block-library/src/template-part/block.json
@@ -23,6 +23,9 @@
 			"gradients": true,
 			"link": true
 		},
+		"spacing": {
+			"padding": true
+		},
 		"__experimentalLayout": true
 	},
 	"editorStyle": "wp-block-template-part-editor"

From cbe077334ad59a443eebf4a17718bedd8180f811 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Wed, 31 Mar 2021 13:16:13 +0200
Subject: [PATCH 05/53] [RNMobile] Fix editor launch freeze in debug mode when
 packager isn't running (#29859)

---
 .../react-native-bridge/ios/Gutenberg.swift   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/react-native-bridge/ios/Gutenberg.swift b/packages/react-native-bridge/ios/Gutenberg.swift
index f31662db1c424e..669e89741aa9de 100644
--- a/packages/react-native-bridge/ios/Gutenberg.swift
+++ b/packages/react-native-bridge/ios/Gutenberg.swift
@@ -1,4 +1,5 @@
 import UIKit
+import Network
 import Aztec
 
 // IMPORTANT: if you're seeing a warning with this import, keep in mind it's marked as a Swift
@@ -45,15 +46,6 @@ public class Gutenberg: NSObject {
         return !bridge.isLoading
     }
 
-    public var logThreshold: LogLevel {
-        get {
-            return LogLevel(RCTGetLogThreshold())
-        }
-        set {
-            RCTSetLogThreshold(RCTLogLevel(newValue))
-        }
-    }
-
     private let bridgeModule = RNReactNativeGutenbergBridge()
     private unowned let dataSource: GutenbergBridgeDataSource
 
@@ -104,7 +96,6 @@ public class Gutenberg: NSObject {
         self.extraModules = extraModules
         super.init()
         bridgeModule.dataSource = dataSource
-        logThreshold = isPackagerRunning ? .trace : .error
     }
 
     public func invalidate() {
@@ -193,11 +184,6 @@ public class Gutenberg: NSObject {
         bridgeModule.sendEventIfNeeded(.setFocusOnTitle, body: nil)
     }
 
-    private var isPackagerRunning: Bool {
-        let url = sourceURL(for: bridge)
-        return !(url?.isFileURL ?? true)
-    }
-
     public func updateTheme(_ editorTheme: GutenbergEditorTheme?) {
 
         var themeUpdates = [String : Any]()
@@ -220,6 +206,22 @@ public class Gutenberg: NSObject {
 
 extension Gutenberg: RCTBridgeDelegate {
     public func sourceURL(for bridge: RCTBridge!) -> URL! {
+        #if DEBUG
+        var isOnCellularNetwork = false
+        let monitor = NWPathMonitor()
+        let semaphore = DispatchSemaphore(value: 0)
+        monitor.pathUpdateHandler = { path in
+            isOnCellularNetwork = path.isExpensive
+            semaphore.signal()
+        }
+        let monitorQueue = DispatchQueue(label: "org.wordpress.network-path-monitor")
+        monitor.start(queue: monitorQueue)
+        semaphore.wait(timeout: .distantFuture)
+        monitor.cancel()
+        if isOnCellularNetwork {
+            return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+        }
+        #endif
         return RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index", fallbackResource: "")
     }
 

From 3f0f8f97aee217ab99b1e834660388329957ff4a Mon Sep 17 00:00:00 2001
From: sarayourfriend <sarayourfriend@fastmail.com>
Date: Wed, 31 Mar 2021 06:23:29 -0700
Subject: [PATCH 06/53] Components: Simplify ScrollLock, adding types (#29634)

* Components: Fix scroll-lock types

* Refactor scroll lock to a simple function component

* Add inline documentation

* Remove unnecessary null check and update tests

* Share previousScrollTop between instances

* Move setLocked to module level function

* Move comment and fix deps array

* Remove ability to pass className
---
 packages/components/src/scroll-lock/index.js  | 131 ++++++------------
 .../components/src/scroll-lock/test/index.js  |  23 +--
 packages/components/tsconfig.json             |   1 +
 3 files changed, 45 insertions(+), 110 deletions(-)

diff --git a/packages/components/src/scroll-lock/index.js b/packages/components/src/scroll-lock/index.js
index 85613c86a05a0c..5ae82e8a61ddee 100644
--- a/packages/components/src/scroll-lock/index.js
+++ b/packages/components/src/scroll-lock/index.js
@@ -1,114 +1,61 @@
 /**
  * WordPress dependencies
  */
-import { Component } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 
-/**
- * Creates a ScrollLock component bound to the specified document.
- *
- * This function creates a ScrollLock component for the specified document
- * and is exposed so we can create an isolated component for unit testing.
+/*
+ * Setting `overflow: hidden` on html and body elements resets body scroll in iOS.
+ * Save scroll top so we can restore it after locking scroll.
  *
- * @param {Object} args Keyword args.
- * @param {HTMLDocument} args.htmlDocument The document to lock the scroll for.
- * @param {string} args.className The name of the class used to lock scrolling.
- * @return {WPComponent} The bound ScrollLock component.
+ * NOTE: It would be cleaner and possibly safer to find a localized solution such
+ * as preventing default on certain touchmove events.
  */
-export function createScrollLockComponent( {
-	htmlDocument,
-	className = 'lockscroll',
-} = {} ) {
-	if ( ! htmlDocument && typeof document !== 'undefined' ) {
-		htmlDocument = document;
-	}
+let previousScrollTop = 0;
 
-	let lockCounter = 0;
-
-	/*
-	 * Setting `overflow: hidden` on html and body elements resets body scroll in iOS.
-	 * Save scroll top so we can restore it after locking scroll.
-	 *
-	 * NOTE: It would be cleaner and possibly safer to find a localized solution such
-	 * as preventing default on certain touchmove events.
-	 */
-	let previousScrollTop = 0;
-
-	/**
-	 * Locks and unlocks scroll depending on the boolean argument.
-	 *
-	 * @param {boolean} locked Whether or not scroll should be locked.
-	 */
-	function setLocked( locked ) {
-		const scrollingElement =
-			htmlDocument.scrollingElement || htmlDocument.body;
+/**
+ * @param {boolean} locked
+ */
+function setLocked( locked ) {
+	const scrollingElement = document.scrollingElement || document.body;
 
-		if ( locked ) {
-			previousScrollTop = scrollingElement.scrollTop;
-		}
+	if ( locked ) {
+		previousScrollTop = scrollingElement.scrollTop;
+	}
 
-		const methodName = locked ? 'add' : 'remove';
-		scrollingElement.classList[ methodName ]( className );
+	const methodName = locked ? 'add' : 'remove';
+	scrollingElement.classList[ methodName ]( 'lockscroll' );
 
-		// Adding the class to the document element seems to be necessary in iOS.
-		htmlDocument.documentElement.classList[ methodName ]( className );
+	// Adding the class to the document element seems to be necessary in iOS.
+	document.documentElement.classList[ methodName ]( 'lockscroll' );
 
-		if ( ! locked ) {
-			scrollingElement.scrollTop = previousScrollTop;
-		}
+	if ( ! locked ) {
+		scrollingElement.scrollTop = previousScrollTop;
 	}
+}
+
+let lockCounter = 0;
 
-	/**
-	 * Requests scroll lock.
-	 *
-	 * This function tracks requests for scroll lock. It locks scroll on the first
-	 * request and counts each request so `releaseLock` can unlock scroll when
-	 * all requests have been released.
-	 */
-	function requestLock() {
+/**
+ * A component that will lock scrolling when it is mounted and unlock scrolling when it is unmounted.
+ *
+ * @return {null} Render nothing.
+ */
+export default function ScrollLock() {
+	useEffect( () => {
 		if ( lockCounter === 0 ) {
 			setLocked( true );
 		}
 
 		++lockCounter;
-	}
 
-	/**
-	 * Releases a request for scroll lock.
-	 *
-	 * This function tracks released requests for scroll lock. When all requests
-	 * have been released, it unlocks scroll.
-	 */
-	function releaseLock() {
-		if ( lockCounter === 1 ) {
-			setLocked( false );
-		}
+		return () => {
+			if ( lockCounter === 1 ) {
+				setLocked( false );
+			}
 
-		--lockCounter;
-	}
+			--lockCounter;
+		};
+	}, [] );
 
-	return class ScrollLock extends Component {
-		/**
-		 * Requests scroll lock on mount.
-		 */
-		componentDidMount() {
-			requestLock();
-		}
-		/**
-		 * Releases scroll lock before unmount.
-		 */
-		componentWillUnmount() {
-			releaseLock();
-		}
-
-		/**
-		 * Render nothing as this component is merely a way to declare scroll lock.
-		 *
-		 * @return {null} Render nothing by returning `null`.
-		 */
-		render() {
-			return null;
-		}
-	};
+	return null;
 }
-
-export default createScrollLockComponent();
diff --git a/packages/components/src/scroll-lock/test/index.js b/packages/components/src/scroll-lock/test/index.js
index c5f602239a247f..6a7257af0254b3 100644
--- a/packages/components/src/scroll-lock/test/index.js
+++ b/packages/components/src/scroll-lock/test/index.js
@@ -6,39 +6,25 @@ import { mount } from 'enzyme';
 /**
  * Internal dependencies
  */
-import { createScrollLockComponent } from '..';
+import ScrollLock from '..';
 
 describe( 'scroll-lock', () => {
-	const lockingClassName = 'test-lock-scroll';
+	const lockingClassName = 'lockscroll';
 
 	// Use a separate document to reduce the risk of test side-effects.
-	let testDocument = null;
-	let ScrollLock = null;
 	let wrapper = null;
 
 	function expectLocked( locked ) {
 		expect(
-			testDocument.documentElement.classList.contains( lockingClassName )
+			document.documentElement.classList.contains( lockingClassName )
 		).toBe( locked );
 		// Assert against `body` because `scrollingElement` does not exist on our test DOM implementation.
-		expect( testDocument.body.classList.contains( lockingClassName ) ).toBe(
+		expect( document.body.classList.contains( lockingClassName ) ).toBe(
 			locked
 		);
 	}
 
-	beforeEach( () => {
-		testDocument = document.implementation.createHTMLDocument(
-			'Test scroll-lock'
-		);
-		ScrollLock = createScrollLockComponent( {
-			htmlDocument: testDocument,
-			className: lockingClassName,
-		} );
-	} );
-
 	afterEach( () => {
-		testDocument = null;
-
 		if ( wrapper && wrapper.length ) {
 			wrapper.unmount();
 			wrapper = null;
@@ -50,6 +36,7 @@ describe( 'scroll-lock', () => {
 		wrapper = mount( <ScrollLock /> );
 		expectLocked( true );
 	} );
+
 	it( 'unlocks when unmounted', () => {
 		wrapper = mount( <ScrollLock /> );
 		expectLocked( true );
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index 67c5fd1e856e88..e39b31267ada3d 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -20,6 +20,7 @@
 		"src/draggable/**/*",
 		"src/flex/**/*",
 		"src/form-group/**/*",
+		"src/scroll-lock/**/*",
 		"src/shortcut/**/*",
 		"src/spinner/**/*",
 		"src/tip/**/*",

From 6484a2669d12821f40d11aa234dbb1cee257cc87 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 31 Mar 2021 15:54:51 +0200
Subject: [PATCH 07/53] Fix Empty Block Templates output string (#30145)

* Fix Empty Block Templates output string
---
 lib/full-site-editing/template-loader.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/full-site-editing/template-loader.php b/lib/full-site-editing/template-loader.php
index f90f07c02fff55..c828a27c99a7bd 100644
--- a/lib/full-site-editing/template-loader.php
+++ b/lib/full-site-editing/template-loader.php
@@ -79,8 +79,16 @@ function gutenberg_override_query_template( $template, $type, array $templates =
 	}
 
 	if ( $current_template ) {
-		$_wp_current_template_content = empty( $current_template->content ) ? __( 'Empty template.', 'gutenberg' ) : $current_template->content;
-
+		if ( empty( $current_template->content ) && is_user_logged_in() ) {
+			$_wp_current_template_content =
+			sprintf(
+				/* translators: %s: Template title */
+				__( 'Empty template: %s', 'gutenberg' ),
+				$current_template->title
+			);
+		} elseif ( ! empty( $current_template->content ) ) {
+			$_wp_current_template_content = $current_template->content;
+		}
 		if ( isset( $_GET['_wp-find-template'] ) ) {
 			wp_send_json_success( $current_template );
 		}
@@ -174,7 +182,10 @@ function gutenberg_get_the_template_html() {
 	global $wp_embed;
 
 	if ( ! $_wp_current_template_content ) {
-		return '<h1>' . esc_html__( 'No matching template found', 'gutenberg' ) . '</h1>';
+		if ( is_user_logged_in() ) {
+			return '<h1>' . esc_html__( 'No matching template found', 'gutenberg' ) . '</h1>';
+		}
+		return;
 	}
 
 	$content = $wp_embed->run_shortcode( $_wp_current_template_content );

From 158d03ce1e98a75fecbe1bd009226cc72e73664b Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 31 Mar 2021 17:02:19 +0300
Subject: [PATCH 08/53] Use a WordPress loop for the query block (#30405)

* Use a normal WordPress loop similar to themes

* post-content: Run the_post if not in a loop

* phpcs fix

* Address feedback

* early exit earlier

* Update packages/block-library/src/post-content/index.php

Co-authored-by: Nik Tsekouras <ntsekouras@outlook.com>

Co-authored-by: Nik Tsekouras <ntsekouras@outlook.com>
---
 .../block-library/src/post-content/index.php  |  4 ++++
 .../block-library/src/query-loop/index.php    | 24 +++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/block-library/src/post-content/index.php b/packages/block-library/src/post-content/index.php
index 7ee8b4dd1b7055..251947582c920a 100644
--- a/packages/block-library/src/post-content/index.php
+++ b/packages/block-library/src/post-content/index.php
@@ -18,6 +18,10 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 		return '';
 	}
 
+	if ( ! in_the_loop() ) {
+		the_post();
+	}
+
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => 'entry-content' ) );
 
 	return (
diff --git a/packages/block-library/src/query-loop/index.php b/packages/block-library/src/query-loop/index.php
index 293ad681ff0f06..30bc6ca75de08d 100644
--- a/packages/block-library/src/query-loop/index.php
+++ b/packages/block-library/src/query-loop/index.php
@@ -18,24 +18,25 @@ function render_block_core_query_loop( $attributes, $content, $block ) {
 	$page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
 	$page     = empty( $_GET[ $page_key ] ) ? 1 : filter_var( $_GET[ $page_key ], FILTER_VALIDATE_INT );
 
-	$query = construct_wp_query_args( $block, $page );
+	$query_args = construct_wp_query_args( $block, $page );
 	// Override the custom query with the global query if needed.
 	$use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
 	if ( $use_global_query ) {
 		global $wp_query;
 		if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) {
 			// Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination.
-			unset( $query['offset'] );
-			$query = wp_parse_args( $wp_query->query_vars, $query );
+			unset( $query_args['offset'] );
+			$query_args = wp_parse_args( $wp_query->query_vars, $query_args );
 
-			if ( empty( $query['post_type'] ) && is_singular() ) {
-				$query['post_type'] = get_post_type( get_the_ID() );
+			if ( empty( $query_args['post_type'] ) && is_singular() ) {
+				$query_args['post_type'] = get_post_type( get_the_ID() );
 			}
 		}
 	}
 
-	$posts = get_posts( $query );
-	if ( empty( $posts ) ) {
+	$query = new WP_Query( $query_args );
+
+	if ( ! $query->have_posts() ) {
 		return '';
 	}
 
@@ -49,19 +50,22 @@ function render_block_core_query_loop( $attributes, $content, $block ) {
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
 
 	$content = '';
-	foreach ( $posts as $post ) {
+	while ( $query->have_posts() ) {
+		$query->the_post();
 		$block_content = (
 			new WP_Block(
 				$block->parsed_block,
 				array(
-					'postType' => $post->post_type,
-					'postId'   => $post->ID,
+					'postType' => get_post_type(),
+					'postId'   => get_the_ID(),
 				)
 			)
 		)->render( array( 'dynamic' => false ) );
 		$content      .= "<li>{$block_content}</li>";
 	}
 
+	wp_reset_postdata();
+
 	return sprintf(
 		'<ul %1$s>%2$s</ul>',
 		$wrapper_attributes,

From ef10b4a334487520fe5256a6366062d3231c041c Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 31 Mar 2021 14:59:36 +0000
Subject: [PATCH 09/53] Bump plugin version to 10.3.0

---
 gutenberg.php     | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 readme.txt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 8d15396ee54465..74dabab72d3a69 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
  * Requires at least: 5.6
  * Requires PHP: 5.6
- * Version: 10.3.0-rc.1
+ * Version: 10.3.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 199b089e99bc4a..81b7f2e4bb11da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0-rc.1",
+	"version": "10.3.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 22e027d5313306..cb2e78fcbb1b3a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0-rc.1",
+	"version": "10.3.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
diff --git a/readme.txt b/readme.txt
index 87cbe04b9e5980..f18e4630ba4458 100644
--- a/readme.txt
+++ b/readme.txt
@@ -55,4 +55,4 @@ View <a href="https://developer.wordpress.org/block-editor/principles/versions-i
 
 == Changelog ==
 
-To read the changelog for Gutenberg 10.3.0-rc.1, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.0-rc.1">release page</a>.
+To read the changelog for Gutenberg 10.3.0, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.0">release page</a>.

From 87db183c6bb3db0e9ac0c72cf5abe05260ce6043 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 31 Mar 2021 15:00:18 +0000
Subject: [PATCH 10/53] Bump plugin version to 10.3.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 readme.txt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 74dabab72d3a69..06561f7d0b06b6 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
  * Requires at least: 5.6
  * Requires PHP: 5.6
- * Version: 10.3.0
+ * Version: 10.3.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 81b7f2e4bb11da..4746a384a82cbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0",
+	"version": "10.3.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index cb2e78fcbb1b3a..a65896086d3acc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0",
+	"version": "10.3.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
diff --git a/readme.txt b/readme.txt
index f18e4630ba4458..55143c81c6ddd2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -55,4 +55,4 @@ View <a href="https://developer.wordpress.org/block-editor/principles/versions-i
 
 == Changelog ==
 
-To read the changelog for Gutenberg 10.3.0, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.0">release page</a>.
+To read the changelog for Gutenberg 10.3.1, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.1">release page</a>.

From 58dc8645a3f4ea337560180896cc15aa2fbd18cd Mon Sep 17 00:00:00 2001
From: Joel Dean <jdeanjj1000@gmail.com>
Date: Wed, 31 Mar 2021 10:04:50 -0500
Subject: [PATCH 11/53] [RNMobile] Initial HTML E2E test (#26405)

* added initial-html to test-data.js

* Added a test that loads all the blocks within a post.

* Updated the ci test runners to run gutenberg-editor-blocks

* added a function that scrolls to a specific element and returns it.

* updated the test to utilize the scroll and return functionality

* utilize a shared initialHtml for both test and initial editor content.

* added delay to swipe methods.

* Remove unneeded code after merging master

* Paste instead of typing when setting HTML content

* Paste using keycode on Android

* Select html content view only on android

* Use iOS 14.0 simulator on server

* Print driver data on stop

* Enable remaining paragraph tests on iOS

* Remove dot at the end of jobURL

* Print menuButton

* Print error if environment cannot be initialized

* Revert "Use iOS 14.0 simulator on server"

This reverts commit 85178d15122d09bfb0060af2957ced110e41b41f.

* Revert "Print driver data on stop"

This reverts commit f136234b0d3cef5089162606a46b9191189447d8.

* Revert "Print menuButton"

This reverts commit 9e16a13eee9a52bc56528b31d3118c330a89aeac.

* Update server appium version to 1.18 and iOS to 14.0

* Add teardown to paste test

* On iOS wait for paste notification to disappear

* Double tap instead of long press to paste

* Fix lint error

* On iOS also long press before pasting

* On iOS use click instead of clickBeginningOfElement in paragraph test

* Scroll to bottom by adding a paragraph block to the end

* Use .type on Android instead of pressing paste keycode

* Check last block without scrolling on iOS

* Update package-lock.json

* added endYCoefficient to increase the swipe distance on Android.

* added package-lock.json

* Retry one more time getting the last block after a delay on iOS

* Temporarily delete cancel workflow (and others) to run native jobs multiple times more quickly in consecutive commits

* Run 1

* Run 2

* Run 3

* Run 4

* Run 5

* Run 6

* Run 7

* Run 8

* Revert "Temporarily delete cancel workflow (and others) to run native jobs multiple times more quickly in consecutive commits"

This reverts commit fe5a1b11ed2f337eea40522f1e8620dd595e0aab.

* Temporarily delete cancel workflow

* Run 1

* Run 2

* Run 3

* Run 4

* Run 5

* Run 6

* Run 7

* Run 8

* Temporarily delete non-native workflows

* Bump reactivecircus/android-emulator-runner action to v2.15.0

* Run 1

* Run 2

* Run 3

* Run 4

* Run 5

* Run 6

* Run 7

* Run 8

* Run 9

* Run 10

* Run 11

* Run 12

* Run 13

* Run 14

* Run 15

* Run 16

* Revert "Temporarily delete cancel workflow"

This reverts commit b31695a7bb55efb19b2740ac72cdbc3dd69a1a18.

* Revert "Temporarily delete non-native workflows"

This reverts commit ff5a3c4b8ade129c3057868b2bb47b60522f54fe.

* Rename test file

Co-authored-by: Ceyhun Ozugur <ceyhunozugur@gmail.com>
---
 .github/workflows/rnmobile-android-runner.yml |   4 +-
 .github/workflows/rnmobile-ios-runner.yml     |   2 +-
 .../gutenberg-editor-initial-html.test.js     |  39 ++++++
 .../gutenberg-editor-paragraph.test.js        | 112 ++++++++----------
 .../gutenberg-editor-paste.test.js            |   3 +
 .../__device-tests__/helpers/caps.js          |   6 +-
 .../__device-tests__/helpers/utils.js         |  43 +++++--
 .../__device-tests__/pages/editor-page.js     |  46 ++++++-
 .../react-native-editor/src/initial-html.js   |   4 +
 9 files changed, 180 insertions(+), 79 deletions(-)
 create mode 100644 packages/react-native-editor/__device-tests__/gutenberg-editor-initial-html.test.js

diff --git a/.github/workflows/rnmobile-android-runner.yml b/.github/workflows/rnmobile-android-runner.yml
index 76128bb84a6742..384cfaf5de5a06 100644
--- a/.github/workflows/rnmobile-android-runner.yml
+++ b/.github/workflows/rnmobile-android-runner.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         native-test-name: [
-          gutenberg-editor-gallery
+          gutenberg-editor-initial-html
         ]
 
     steps:
@@ -35,7 +35,7 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
 
-    - uses: reactivecircus/android-emulator-runner@08b092e904025fada32a01b711af1e7ff7b7a4a3 # v2.14.3
+    - uses: reactivecircus/android-emulator-runner@d2799957d660add41c61a5103e2fbb9e2889eb73 # v2.15.0
       with:
         api-level: 28
         profile: pixel_xl
diff --git a/.github/workflows/rnmobile-ios-runner.yml b/.github/workflows/rnmobile-ios-runner.yml
index 33b3a8ab72172e..c05bbb42da10a3 100644
--- a/.github/workflows/rnmobile-ios-runner.yml
+++ b/.github/workflows/rnmobile-ios-runner.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         xcode: [12.2]
         native-test-name: [
-          gutenberg-editor-gallery
+          gutenberg-editor-initial-html
         ]
 
     steps:
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-initial-html.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-initial-html.test.js
new file mode 100644
index 00000000000000..90bcb0f16b0e55
--- /dev/null
+++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-initial-html.test.js
@@ -0,0 +1,39 @@
+/**
+ * Internal dependencies
+ */
+import initialHtml from '../src/initial-html';
+import { isAndroid } from './helpers/utils';
+
+describe( 'Gutenberg Editor Blocks test', () => {
+	it( 'should be able to create a post with all blocks and scroll to the last one', async () => {
+		await editorPage.setHtmlContent( initialHtml );
+
+		const lastBlockAccessibilityLabel =
+			'This block is used in initial HTML e2e tests and should be kept as the last block.';
+		let lastBlockElement;
+		if ( isAndroid() ) {
+			lastBlockElement = await editorPage.androidScrollAndReturnElement(
+				lastBlockAccessibilityLabel
+			);
+		} else {
+			lastBlockElement = await editorPage.getLastElementByXPath(
+				lastBlockAccessibilityLabel
+			);
+			if ( ! lastBlockElement ) {
+				const retryDelay = 5000;
+				// eslint-disable-next-line no-console
+				console.log(
+					`Warning: "lastBlockElement" was not found in the first attempt. Could be that all the blocks were not loaded yet.
+Will retry one more time after ${ retryDelay / 1000 } seconds.`,
+					lastBlockElement
+				);
+				await editorPage.driver.sleep( retryDelay );
+				lastBlockElement = await editorPage.getLastElementByXPath(
+					lastBlockAccessibilityLabel
+				);
+			}
+		}
+
+		expect( lastBlockElement ).toBeTruthy();
+	} );
+} );
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js
index f6ab1e191fc541..85345ec9079dfa 100644
--- a/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js
+++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js
@@ -148,10 +148,8 @@ describe( 'Gutenberg Editor tests for Paragraph Block', () => {
 		}
 	} );
 
-	// Restricting these test to Android because I was not able to update the html on iOS
-	if ( isAndroid() ) {
-		it( 'should be able to merge blocks with unknown html elements', async () => {
-			await editorPage.setHtmlContent( `
+	it( 'should be able to merge blocks with unknown html elements', async () => {
+		await editorPage.setHtmlContent( `
 <!-- wp:paragraph -->
 <p><unknownhtmlelement>abc</unknownhtmlelement>D</p>
 <!-- /wp:paragraph -->
@@ -160,61 +158,53 @@ describe( 'Gutenberg Editor tests for Paragraph Block', () => {
 <p>E</p>
 <!-- /wp:paragraph -->` );
 
-			// // Merge paragraphs
-			const secondParagraphBlockElement = await editorPage.getBlockAtPosition(
-				blockNames.paragraph,
-				2
-			);
-			await clickBeginningOfElement(
-				editorPage.driver,
-				secondParagraphBlockElement
-			);
-			await editorPage.typeTextToParagraphBlock(
-				secondParagraphBlockElement,
-				backspace
-			);
-
-			// verify the editor has not crashed
-			const text = await editorPage.getTextForParagraphBlockAtPosition(
-				1
-			);
-			expect( text.length ).not.toEqual( 0 );
-
-			await editorPage.removeBlockAtPosition( blockNames.paragraph );
-		} );
-
-		// Based on https://github.com/wordpress-mobile/gutenberg-mobile/pull/1507
-		it( 'should handle multiline paragraphs from web', async () => {
-			await editorPage.setHtmlContent( `
-	<!-- wp:paragraph -->
-	<p>multiple lines<br><br></p>
-	<!-- /wp:paragraph -->
-
-	<!-- wp:paragraph -->
-	<p></p>
-	<!-- /wp:paragraph -->` );
-
-			// // Merge paragraphs
-			const secondParagraphBlockElement = await editorPage.getBlockAtPosition(
-				blockNames.paragraph,
-				2
-			);
-			await clickBeginningOfElement(
-				editorPage.driver,
-				secondParagraphBlockElement
-			);
-			await editorPage.typeTextToParagraphBlock(
-				secondParagraphBlockElement,
-				backspace
-			);
-
-			// verify the editor has not crashed
-			const text = await editorPage.getTextForParagraphBlockAtPosition(
-				1
-			);
-			expect( text.length ).not.toEqual( 0 );
-
-			await editorPage.removeBlockAtPosition( blockNames.paragraph );
-		} );
-	}
+		// // Merge paragraphs
+		const secondParagraphBlockElement = await editorPage.getBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+		await clickBeginningOfElement(
+			editorPage.driver,
+			secondParagraphBlockElement
+		);
+		await editorPage.typeTextToParagraphBlock(
+			secondParagraphBlockElement,
+			backspace
+		);
+
+		// verify the editor has not crashed
+		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		expect( text.length ).not.toEqual( 0 );
+
+		await editorPage.removeBlockAtPosition( blockNames.paragraph );
+	} );
+
+	// Based on https://github.com/wordpress-mobile/gutenberg-mobile/pull/1507
+	it( 'should handle multiline paragraphs from web', async () => {
+		await editorPage.setHtmlContent( `
+<!-- wp:paragraph -->
+<p>multiple lines<br><br></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->` );
+
+		// // Merge paragraphs
+		const secondParagraphBlockElement = await editorPage.getBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+		await secondParagraphBlockElement.click();
+		await editorPage.typeTextToParagraphBlock(
+			secondParagraphBlockElement,
+			backspace
+		);
+
+		// verify the editor has not crashed
+		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		expect( text.length ).not.toEqual( 0 );
+
+		await editorPage.removeBlockAtPosition( blockNames.paragraph );
+	} );
 } );
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-paste.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-paste.test.js
index e0799af6f135a7..6498f46ca7c551 100644
--- a/packages/react-native-editor/__device-tests__/gutenberg-editor-paste.test.js
+++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-paste.test.js
@@ -70,6 +70,9 @@ describe( 'Gutenberg Editor paste tests', () => {
 
 		const text = await editorPage.getTextForParagraphBlockAtPosition( 2 );
 		expect( text ).toBe( testData.pastePlainText );
+
+		await editorPage.removeBlockAtPosition( blockNames.paragraph, 2 );
+		await editorPage.removeBlockAtPosition( blockNames.paragraph, 1 );
 	} );
 
 	it( 'copies styled text from one paragraph block and pastes in another', async () => {
diff --git a/packages/react-native-editor/__device-tests__/helpers/caps.js b/packages/react-native-editor/__device-tests__/helpers/caps.js
index 30f23cc2ffa5e6..d614724f1870ae 100644
--- a/packages/react-native-editor/__device-tests__/helpers/caps.js
+++ b/packages/react-native-editor/__device-tests__/helpers/caps.js
@@ -4,7 +4,7 @@ const ios = {
 	os: 'iOS',
 	deviceOrientation: 'portrait',
 	automationName: 'XCUITest',
-	appiumVersion: '1.17.1', // Sauce Labs requires appiumVersion to be specified.
+	appiumVersion: '1.18.3', // Sauce Labs requires appiumVersion to be specified.
 	app: undefined, // will be set later, locally this is relative to root of project
 	processArguments: {
 		args: [ 'uitesting' ],
@@ -20,7 +20,7 @@ exports.iosLocal = {
 
 exports.iosServer = {
 	...ios,
-	platformVersion: '13.4', // Supported Sauce Labs platforms can be found here: https://saucelabs.com/rest/v1/info/platforms/appium
+	platformVersion: '14.0', // Supported Sauce Labs platforms can be found here: https://saucelabs.com/rest/v1/info/platforms/appium
 	deviceName: 'iPhone 11 Simulator',
 };
 
@@ -34,6 +34,6 @@ exports.android = {
 	appPackage: 'com.gutenberg',
 	appActivity: 'com.gutenberg.MainActivity',
 	deviceOrientation: 'portrait',
-	appiumVersion: '1.16.0',
+	appiumVersion: '1.18.1',
 	app: undefined,
 };
diff --git a/packages/react-native-editor/__device-tests__/helpers/utils.js b/packages/react-native-editor/__device-tests__/helpers/utils.js
index eec48ba84a26b4..df49d98b600f63 100644
--- a/packages/react-native-editor/__device-tests__/helpers/utils.js
+++ b/packages/react-native-editor/__device-tests__/helpers/utils.js
@@ -172,7 +172,7 @@ const stopDriver = async ( driver ) => {
 			.createHmac( 'md5', jobID )
 			.update( serverConfigs.sauce.auth )
 			.digest( 'hex' );
-		const jobURL = `https://saucelabs.com/jobs/${ jobID }?auth=${ hash }.`;
+		const jobURL = `https://saucelabs.com/jobs/${ jobID }?auth=${ hash }`;
 		// eslint-disable-next-line no-console
 		console.log( `You can view the video of this test run at ${ jobURL }` );
 	}
@@ -218,15 +218,19 @@ const clearTextBox = async ( driver, element ) => {
 	// We are double tapping on the text field and pressing backspace until all content is removed.
 	do {
 		originalText = await element.text();
-		const action = new wd.TouchAction( driver );
-		action.tap( { el: element, count: 2 } );
-		await action.perform();
+		await doubleTap( driver, element );
 		await element.type( '\b' );
 		text = await element.text();
 		// We compare with the original content and not empty because text always return any hint set on the element.
 	} while ( originalText !== text );
 };
 
+const doubleTap = async ( driver, element ) => {
+	const action = new wd.TouchAction( driver );
+	action.tap( { el: element, count: 2 } );
+	await action.perform();
+};
+
 const typeStringAndroid = async (
 	driver,
 	element,
@@ -351,7 +355,12 @@ const tapPasteAboveElement = async ( driver, element ) => {
 
 // Starts from the middle of the screen or the element(if specified)
 // and swipes upwards
-const swipeUp = async ( driver, element = undefined ) => {
+const swipeUp = async (
+	driver,
+	element = undefined,
+	delay = 3000,
+	endYCoefficient = 0.5
+) => {
 	let size = await driver.getWindowSize();
 	let y = 0;
 	if ( element !== undefined ) {
@@ -363,27 +372,33 @@ const swipeUp = async ( driver, element = undefined ) => {
 	const startX = size.width / 2;
 	const startY = y + size.height / 3;
 	const endX = startX;
-	const endY = startY + startY * -1 * 0.5;
+	const endY = startY + startY * -1 * endYCoefficient;
 
-	await swipeFromTo( driver, { x: startX, y: startY }, { x: endX, y: endY } );
+	await swipeFromTo(
+		driver,
+		{ x: startX, y: startY },
+		{ x: endX, y: endY },
+		delay
+	);
 };
 
 const defaultCoordinates = { x: 0, y: 0 };
 const swipeFromTo = async (
 	driver,
 	from = defaultCoordinates,
-	to = defaultCoordinates
+	to = defaultCoordinates,
+	delay
 ) => {
 	const action = await new wd.TouchAction( driver );
 	action.press( from );
-	action.wait( 3000 );
+	action.wait( delay );
 	action.moveTo( to );
 	action.release();
 	await action.perform();
 };
 
 // Starts from the middle of the screen and swipes downwards
-const swipeDown = async ( driver ) => {
+const swipeDown = async ( driver, delay = 3000 ) => {
 	const size = await driver.getWindowSize();
 	const y = 0;
 
@@ -392,7 +407,12 @@ const swipeDown = async ( driver ) => {
 	const endX = startX;
 	const endY = startY - startY * -1 * 0.5;
 
-	await swipeFromTo( driver, { x: startX, y: startY }, { x: endX, y: endY } );
+	await swipeFromTo(
+		driver,
+		{ x: startX, y: startY },
+		{ x: endX, y: endY },
+		delay
+	);
 };
 
 const toggleHtmlMode = async ( driver, toggleOn ) => {
@@ -451,4 +471,5 @@ module.exports = {
 	stopDriver,
 	toggleHtmlMode,
 	toggleOrientation,
+	doubleTap,
 };
diff --git a/packages/react-native-editor/__device-tests__/pages/editor-page.js b/packages/react-native-editor/__device-tests__/pages/editor-page.js
index 8fd19373bba37b..492d16f62c0287 100644
--- a/packages/react-native-editor/__device-tests__/pages/editor-page.js
+++ b/packages/react-native-editor/__device-tests__/pages/editor-page.js
@@ -11,6 +11,7 @@ const {
 	toggleHtmlMode,
 	swipeFromTo,
 	longPressMiddleOfElement,
+	doubleTap,
 } = require( '../helpers/utils' );
 
 const initializeEditorPage = async () => {
@@ -135,6 +136,27 @@ class EditorPage {
 		return elements[ elements.length - 1 ];
 	}
 
+	// iOS loads the block list more eagerly compared to Android.
+	// This makes this function return elements without scrolling on iOS.
+	// So we are keeping this Android only.
+	async androidScrollAndReturnElement( accessibilityLabel ) {
+		const elements = await this.driver.elementsByXPath(
+			`//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ accessibilityLabel }")]`
+		);
+		if ( elements.length === 0 ) {
+			await swipeUp( this.driver, undefined, 100, 1 );
+			return this.androidScrollAndReturnElement( accessibilityLabel );
+		}
+		return elements[ elements.length - 1 ];
+	}
+
+	async getLastElementByXPath( accessibilityLabel ) {
+		const elements = await this.driver.elementsByXPath(
+			`//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ accessibilityLabel }")]`
+		);
+		return elements[ elements.length - 1 ];
+	}
+
 	async getTextViewForHtmlViewContent() {
 		const accessibilityId = 'html-view-content';
 		let blockLocator = `//*[@${ this.accessibilityIdXPathAttrib }="${ accessibilityId }"]`;
@@ -161,8 +183,30 @@ class EditorPage {
 	async setHtmlContent( html ) {
 		await toggleHtmlMode( this.driver, true );
 
+		const base64String = Buffer.from( html ).toString( 'base64' );
+
+		await this.driver.setClipboard( base64String, 'plaintext' );
+
 		const htmlContentView = await this.getTextViewForHtmlViewContent();
-		await htmlContentView.type( html );
+
+		if ( isAndroid() ) {
+			// Attention! On Android `.type()` replaces the content of htmlContentView instead of appending
+			// contrary to what iOS is doing. On Android tried calling `driver.pressKeycode( 279 ) // KEYCODE_PASTE`
+			// before to paste, but for some reason it didn't work on GitHub Actions but worked only on Sauce Labs
+			await htmlContentView.type( html );
+		} else {
+			await htmlContentView.click();
+			await doubleTap( this.driver, htmlContentView );
+			// Sometimes double tap is not enough for paste menu to appear, so we also long press
+			await longPressMiddleOfElement( this.driver, htmlContentView );
+
+			const pasteButton = this.driver.elementByXPath(
+				'//XCUIElementTypeMenuItem[@name="Paste"]'
+			);
+
+			await pasteButton.click();
+			await this.driver.sleep( 3000 ); // wait for paste notification to disappear
+		}
 
 		await toggleHtmlMode( this.driver, false );
 	}
diff --git a/packages/react-native-editor/src/initial-html.js b/packages/react-native-editor/src/initial-html.js
index 8650bf7d7b54cd..7c1cb67a5cc9bb 100644
--- a/packages/react-native-editor/src/initial-html.js
+++ b/packages/react-native-editor/src/initial-html.js
@@ -248,4 +248,8 @@ else:
 <!-- wp:heading {"align":"left","level":4,"className":"has-primary-background-color has-background","style":{"typography":{"lineHeight":"2.5"}}} -->
 <h4 class="has-text-align-left has-primary-background-color has-background" style="line-height:2.5">Heading with line-height set</h4>
 <!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>This block is used in initial HTML e2e tests and should be kept as the last block.</p>
+<!-- /wp:paragraph -->
 `;

From cf7d5b193cc89d8284d284b1d726ef0325b6567e Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Wed, 31 Mar 2021 16:28:25 +0100
Subject: [PATCH 12/53] Clarify that when the Inserter is open clicking the +
 button in the top bar will close it again (#29759)

* Rotate the inserter icon and switch the label when pressed

* Use a single label rather than toggling. Include reduce-motion mixin.

* Update tests

* formatting

* Update test snapshots

* Update labels

* Add old selectors

* Add comment

Co-authored-by: David Szabo <david.szabo97@gmail.com>
---
 packages/e2e-test-utils/src/inserter.js               |  8 ++++++--
 .../specs/editor/plugins/cpt-locking.test.js          |  8 ++++++--
 .../src/components/header/header-toolbar/index.js     |  2 +-
 .../src/components/header/header-toolbar/style.scss   | 11 +++++++++++
 packages/edit-site/src/components/header/index.js     |  2 +-
 packages/edit-site/src/components/header/style.scss   | 11 +++++++++++
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/e2e-test-utils/src/inserter.js b/packages/e2e-test-utils/src/inserter.js
index 4c907efab7a18b..b5041992f2bbc4 100644
--- a/packages/e2e-test-utils/src/inserter.js
+++ b/packages/e2e-test-utils/src/inserter.js
@@ -40,8 +40,10 @@ export async function closeGlobalBlockInserter() {
 
 async function isGlobalInserterOpen() {
 	return await page.evaluate( () => {
+		// "Add block" selector is required to make sure performance comparison
+		// doesn't fail on older branches where we still had "Add block" as label.
 		return !! document.querySelector(
-			'.edit-post-header [aria-label="Add block"].is-pressed, .edit-site-header [aria-label="Add block"].is-pressed'
+			'.edit-post-header [aria-label="Add block"].is-pressed, .edit-site-header [aria-label="Add block"].is-pressed, .edit-post-header [aria-label="Toggle block inserter"].is-pressed, .edit-site-header [aria-label="Toggle block inserter"].is-pressed'
 		);
 	} );
 }
@@ -49,8 +51,10 @@ async function isGlobalInserterOpen() {
  * Toggles the global inserter.
  */
 export async function toggleGlobalBlockInserter() {
+	// "Add block" selector is required to make sure performance comparison
+	// doesn't fail on older branches where we still had "Add block" as label.
 	await page.click(
-		'.edit-post-header [aria-label="Add block"], .edit-site-header [aria-label="Add block"]'
+		'.edit-post-header [aria-label="Add block"], .edit-site-header [aria-label="Add block"], .edit-post-header [aria-label="Toggle block inserter"], .edit-site-header [aria-label="Toggle block inserter"]'
 	);
 }
 
diff --git a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
index a9b0181d4e47fc..aee6398871a9b1 100644
--- a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
@@ -27,7 +27,7 @@ describe( 'cpt locking', () => {
 		expect(
 			await page.evaluate( () => {
 				const inserter = document.querySelector(
-					'.edit-post-header [aria-label="Add block"]'
+					'.edit-post-header [aria-label="Add block"], .edit-post-header [aria-label="Toggle block inserter"]'
 				);
 				return inserter.getAttribute( 'disabled' );
 			} )
@@ -159,7 +159,11 @@ describe( 'cpt locking', () => {
 
 		it( 'should allow blocks to be inserted', async () => {
 			expect(
-				await page.$( '.edit-post-header [aria-label="Add block"]' )
+				// "Add block" selector is required to make sure performance comparison
+				// doesn't fail on older branches where we still had "Add block" as label.
+				await page.$(
+					'.edit-post-header [aria-label="Add block"], .edit-post-header [aria-label="Toggle block inserter"]'
+				)
 			).not.toBeNull();
 			await insertBlock( 'List' );
 			await page.keyboard.type( 'List content' );
diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
index cc2efea4bf657a..e2d287346bc899 100644
--- a/packages/edit-post/src/components/header/header-toolbar/index.js
+++ b/packages/edit-post/src/components/header/header-toolbar/index.js
@@ -143,7 +143,7 @@ function HeaderToolbar() {
 					/* translators: button label text should, if possible, be under 16
 			characters. */
 					label={ _x(
-						'Add block',
+						'Toggle block inserter',
 						'Generic label for block inserter button'
 					) }
 					showTooltip={ ! showIconLabels }
diff --git a/packages/edit-post/src/components/header/header-toolbar/style.scss b/packages/edit-post/src/components/header/header-toolbar/style.scss
index c71dfebddfc66f..f1be46ff3c2803 100644
--- a/packages/edit-post/src/components/header/header-toolbar/style.scss
+++ b/packages/edit-post/src/components/header/header-toolbar/style.scss
@@ -15,6 +15,17 @@
 
 	.edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle {
 		display: inline-flex;
+
+		svg {
+			transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
+			@include reduce-motion("transition");
+		}
+
+		&.is-pressed {
+			svg {
+				transform: rotate(45deg);
+			}
+		}
 	}
 
 	// Hide table of contents and block navigation on mobile.
diff --git a/packages/edit-site/src/components/header/index.js b/packages/edit-site/src/components/header/index.js
index eff62335460e43..9e6a6fbf31a18d 100644
--- a/packages/edit-site/src/components/header/index.js
+++ b/packages/edit-site/src/components/header/index.js
@@ -106,7 +106,7 @@ export default function Header( { openEntitiesSavedStates } ) {
 						} }
 						icon={ plus }
 						label={ _x(
-							'Add block',
+							'Toggle block inserter',
 							'Generic label for block inserter button'
 						) }
 					/>
diff --git a/packages/edit-site/src/components/header/style.scss b/packages/edit-site/src/components/header/style.scss
index 859c26d8c1e456..1b4d68e1c8f71b 100644
--- a/packages/edit-site/src/components/header/style.scss
+++ b/packages/edit-site/src/components/header/style.scss
@@ -79,6 +79,17 @@ body.is-navigation-sidebar-open {
 		width: $grid-unit-40;
 		height: $grid-unit-40;
 		padding: 0;
+
+		svg {
+			transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
+			@include reduce-motion("transition");
+		}
+
+		&.is-pressed {
+			svg {
+				transform: rotate(45deg);
+			}
+		}
 	}
 }
 

From 836e6db06b0eba2783b02ae09cfebcd2d098a88c Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Wed, 31 Mar 2021 17:36:32 +0200
Subject: [PATCH 13/53] Revert "Bump plugin version to 10.3.1"

This reverts commit 87db183c6bb3db0e9ac0c72cf5abe05260ce6043.
---
 gutenberg.php     | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 readme.txt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 06561f7d0b06b6..74dabab72d3a69 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
  * Requires at least: 5.6
  * Requires PHP: 5.6
- * Version: 10.3.1
+ * Version: 10.3.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 4746a384a82cbe..81b7f2e4bb11da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.1",
+	"version": "10.3.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index a65896086d3acc..cb2e78fcbb1b3a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.1",
+	"version": "10.3.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
diff --git a/readme.txt b/readme.txt
index 55143c81c6ddd2..f18e4630ba4458 100644
--- a/readme.txt
+++ b/readme.txt
@@ -55,4 +55,4 @@ View <a href="https://developer.wordpress.org/block-editor/principles/versions-i
 
 == Changelog ==
 
-To read the changelog for Gutenberg 10.3.1, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.1">release page</a>.
+To read the changelog for Gutenberg 10.3.0, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.0">release page</a>.

From e70720a62afbd01e32b90766783af4c8e54129f9 Mon Sep 17 00:00:00 2001
From: Janw Oostendorp <webmaster@janw.me>
Date: Wed, 31 Mar 2021 18:31:23 +0200
Subject: [PATCH 14/53] Added a practical example of adding a component to the
 sidebar. (#30379)

* Added a practical example of adding a component to the sidebar.

* Apply suggestions from code review

I needed to unresolve the comments so I could commit them. In GitHub, it is possible to accept the suggestions and commit them directly from the Files tab in the PR.

Co-authored-by: Marcus Kazmierczak <marcus@mkaz.com>
---
 .../block-controls-toolbar-and-sidebar.md     | 111 +++++++++++++++---
 .../plugin-sidebar-1-up-and-running.md        |   2 +
 2 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md b/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md
index 957104508fdd2a..eecbd3d0977c15 100644
--- a/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md
+++ b/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md
@@ -44,26 +44,17 @@ registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
 			alignment: 'right',
 		},
 	},
-	edit: ( props ) => {
-		const {
-			attributes: {
-				content,
-				alignment,
-			},
-		} = props;
-
-		const blockProps = useBlockProps();
-
+	edit: ( {attributes, setAttributes} ) => {
 		const onChangeContent = ( newContent ) => {
-			props.setAttributes( { content: newContent } );
+			setAttributes( { content: newContent } );
 		};
 
 		const onChangeAlignment = ( newAlignment ) => {
-			props.setAttributes( { alignment: newAlignment === undefined ? 'none' : newAlignment } );
+			setAttributes( { alignment: newAlignment === undefined ? 'none' : newAlignment } );
 		};
 
 		return (
-			<div {...blockProps}>
+			<div {...useBlockProps()}>
 				{
 					<BlockControls>
 						<AlignmentToolbar
@@ -88,9 +79,9 @@ registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
 		return (
 			<div {...blockProps}>
 				<RichText.Content
-					className={ `gutenberg-examples-align-${ props.attributes.alignment }` }
+					className={ `gutenberg-examples-align-${ attributes.alignment }` }
 					tagName="p"
-					value={ props.attributes.content }
+					value={ attributes.content }
 				/>
 			</div>
 		);
@@ -131,7 +122,6 @@ registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
 		edit: function( props ) {
 			var content = props.attributes.content;
 			var alignment = props.attributes.alignment;
-			var blockProps = useBlockProps();
 
 			function onChangeContent( newContent ) {
 				props.setAttributes( { content: newContent } );
@@ -142,8 +132,8 @@ registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
 			}
 
 			return el( 
-				'div', 
-				blockProps, 
+				'div',
+				useBlockProps(), 
 				el(
 					BlockControls,
 					{ key: 'controls' },
@@ -192,7 +182,7 @@ registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
 
 Note that `BlockControls` is only visible when the block is currently selected and in visual editing mode. `BlockControls` are not shown when editing a block in HTML editing mode.
 
-## Inspector
+## Settings Sidebar
 
 ![Screenshot of the inspector panel focused on the settings for a Paragraph block](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/inspector.png)
 
@@ -203,6 +193,89 @@ If you have settings that affects only selected content inside a block (example:
 The Block Tab is shown in place of the Document Tab when a block is selected.
 
 Similar to rendering a toolbar, if you include an `InspectorControls` element in the return value of your block type's `edit` function, those controls will be shown in the Settings Sidebar region.
+The following example adds 2 color palettes to the sidebar, one for the text color and one for the background color.
+
+```jsx
+import { registerBlockType } from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+import { TextControl } from '@wordpress/components';
+
+import {
+	useBlockProps,
+	ColorPalette,
+	InspectorControls,
+} from '@wordpress/block-editor';
+
+registerBlockType( 'create-block/gutenpride', {
+	apiVersion: 2,
+	attributes: {
+		message: {
+			type: 'string',
+			source: 'text',
+			selector: 'div',
+			default: '', // empty default
+		},
+		bg_color: { type: 'string', default: '#000000' },
+		text_color: { type: 'string', default: '#ffffff' },
+	},
+	edit: ( { attributes, setAttributes } ) => {
+		const onChangeBGColor = ( hexColor ) => {
+			setAttributes( { bg_color: hexColor } );
+		};
+
+		const onChangeTextColor = ( hexColor ) => {
+			setAttributes( { text_color: hexColor } );
+		};
+
+		return (
+			<div { ...useBlockProps() }>
+				<InspectorControls key="settting">
+					<div id="gutenpride-controlls">
+						<fieldset>
+							<legend className="blocks-base-control__label">
+								{ __( 'Background color', 'gutenpride' ) }
+							</legend>
+							<ColorPalette // Element Tag for Gutenberg standard colour selector
+								onChange={ onChangeBGColor } // onChange event callback
+							/>
+						</fieldset>
+						<fieldset>
+							<legend className="blocks-base-control__label">
+								{ __( 'Text color', 'gutenpride' ) }
+							</legend>
+							<ColorPalette // Element Tag for Gutenberg standard colour selector
+								onChange={ onChangeTextColor } // onChange event callback
+							/>
+						</fieldset>
+					</div>
+				</InspectorControls>
+				<TextControl
+					value={ attributes.message }
+					onChange={ ( val ) => setAttributes( { message: val } ) }
+					style={ {
+						backgroundColor: attributes.bg_color,
+						color: attributes.text_color,
+					} }
+				/>
+			</div>
+		);
+	},
+	save: ( { attributes } ) => {
+		return (
+			<div
+				{ ...useBlockProps.save() }
+				style={ {
+					backgroundColor: attributes.bg_color,
+					color: attributes.text_color,
+				} }
+			>
+				{ attributes.message }
+			</div>
+		);
+	},
+} );
+
+```
 
 Block controls rendered in both the toolbar and sidebar will also be used when
 multiple blocks of the same type are selected.
diff --git a/docs/how-to-guides/sidebar-tutorial/plugin-sidebar-1-up-and-running.md b/docs/how-to-guides/sidebar-tutorial/plugin-sidebar-1-up-and-running.md
index 0f7a9410b78596..f908c59e6d194a 100644
--- a/docs/how-to-guides/sidebar-tutorial/plugin-sidebar-1-up-and-running.md
+++ b/docs/how-to-guides/sidebar-tutorial/plugin-sidebar-1-up-and-running.md
@@ -1,5 +1,7 @@
 # Get a Sidebar up and Running
 
+_Note: this tutorial covers a custom sidebar, Adding controls to the sidebar is covered in [Block Toolbar and Settings Sidebar](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md)_
+
 The first step in the journey is to tell the editor that there is a new plugin that will have its own sidebar. You can do so by using the [registerPlugin](/packages/plugins/README.md), [PluginSidebar](/packages/edit-post/README.md#pluginsidebar), and [createElement](/packages/element/README.md) utilities provided by WordPress, to be found in the `@wordpress/plugins`, `@wordpress/edit-post`, and `@wordpress/element` [packages](/docs/reference-guides/packages.md), respectively.
 
 Add the following code to a JavaScript file called `plugin-sidebar.js` and save it within your plugin's directory:

From df8e7307404818446c3ffd0d86ac6584fa15a911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Zi=C3=B3=C5=82kowski?= <grzegorz@gziolo.pl>
Date: Wed, 31 Mar 2021 19:02:09 +0200
Subject: [PATCH 15/53] Gutenberg Plugin: Remove deprecations planned for 10.3
 release (#30417)

* Gutenberg Plugin: Remove deprecations planned for 10.3 release

* Docs: Add changelog entry
---
 packages/interface/CHANGELOG.md                   |  4 ++++
 .../interface/src/components/action-item/index.js | 15 +--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index b7e838b04ad30b..8fe1eb16ff1a96 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+-   Passing a tuple of components with `as` prop to `ActionItem.Slot` component is no longer supported. Please pass a component with `as` prop instead ([#30417](https://github.com/WordPress/gutenberg/pull/30417)).
+
 ## 1.1.0 (2021-03-17)
 
 ### Deprecations
diff --git a/packages/interface/src/components/action-item/index.js b/packages/interface/src/components/action-item/index.js
index 23d3e147eefe3c..b19a573f1016b0 100644
--- a/packages/interface/src/components/action-item/index.js
+++ b/packages/interface/src/components/action-item/index.js
@@ -1,13 +1,12 @@
 /**
  * External dependencies
  */
-import { isArray, isEmpty, noop } from 'lodash';
+import { isEmpty, noop } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { ButtonGroup, Button, Slot, Fill } from '@wordpress/components';
-import deprecated from '@wordpress/deprecated';
 import { Children } from '@wordpress/element';
 
 function ActionItemSlot( {
@@ -17,18 +16,6 @@ function ActionItemSlot( {
 	bubblesVirtually,
 	...props
 } ) {
-	if ( isArray( Component ) ) {
-		deprecated(
-			'Passing a tuple of components with `as` prop to `ActionItem.Slot` component',
-			{
-				since: '10.2',
-				plugin: 'Gutenberg',
-				alternative: 'a component with `as` prop',
-				version: '10.3',
-			}
-		);
-		Component = Component[ 0 ];
-	}
 	return (
 		<Slot
 			name={ name }

From 2837012d7a084e701f2d12a06efe8dea4ba4b35d Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 31 Mar 2021 19:00:18 +0000
Subject: [PATCH 16/53] Update Changelog for 10.3.0

---
 changelog.txt | 393 +++++++++++++++++++++++++-------------------------
 1 file changed, 199 insertions(+), 194 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 603d1a298dee94..50eb6f10d5be23 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,223 +1,228 @@
 == Changelog ==
 
-= 10.3.0-rc.1 =
-
-### Features
-
-- Move theme location settings to navigation editor sidebar. ([29458](https://github.com/WordPress/gutenberg/pull/29458))
+= 10.3.0 =
 
 ### Enhancements
 
-- File block: Make the editor markup match the frontend. ([30148](https://github.com/WordPress/gutenberg/pull/30148))
-- Add 'since' versions to the deprecated features. ([30072](https://github.com/WordPress/gutenberg/pull/30072))
-- Better CSS reset style loader order. ([30034](https://github.com/WordPress/gutenberg/pull/30034))
-- Add 'since' option to deprecated function. ([30017](https://github.com/WordPress/gutenberg/pull/30017))
-- Normalize the block toolbar of the audio, file, media and text, video, site logo and post featured image blocks. ([30012](https://github.com/WordPress/gutenberg/pull/30012))
-- Try: Add post content description. ([29971](https://github.com/WordPress/gutenberg/pull/29971))
-- Media: Use image default size from settings. ([29966](https://github.com/WordPress/gutenberg/pull/29966))
-- Components: Allow multiple words in the autocomplete phrase matcher. ([29939](https://github.com/WordPress/gutenberg/pull/29939))
-- Persistent List View: Add visual support for multiple selected blocks. ([29878](https://github.com/WordPress/gutenberg/pull/29878))
-- Normalize the block toolbar for more blocks: Button, buttons, list, heading, paragraph and quote. ([29863](https://github.com/WordPress/gutenberg/pull/29863))
-- Create block: Require WordPress 5.7 by default and source it from the main plugin file. ([29757](https://github.com/WordPress/gutenberg/pull/29757))
-- List View and Block List: Update hover, focus, highlight, select borders. ([29636](https://github.com/WordPress/gutenberg/pull/29636))
-- Cover Block: Normalize the block toolbar. ([29247](https://github.com/WordPress/gutenberg/pull/29247))
-- Editor Styles: Add a transform for button rules. ([29229](https://github.com/WordPress/gutenberg/pull/29229))
-- Improve block inserter keyboard navigation. ([26938](https://github.com/WordPress/gutenberg/pull/26938))
+-   Add `since` versions to the deprecated features. ([30072](https://github.com/WordPress/gutenberg/pull/30072))
+-   Blocks: Add "theme" category and better present Template Parts in the inserter. ([30020](https://github.com/WordPress/gutenberg/pull/30020))
+-   Block Editor:
+    -   Add drag handle to select mode. ([28815](https://github.com/WordPress/gutenberg/pull/28815))
+    -   Improve block inserter keyboard navigation. ([26938](https://github.com/WordPress/gutenberg/pull/26938))
+    -   Open admin sidebar menu over editor on small screens. ([29955](https://github.com/WordPress/gutenberg/pull/29955))
+-   Block Library:
+    -   Cover: Allow drag and drop media replacement. ([29813](https://github.com/WordPress/gutenberg/pull/29813))
+    -   File: Make the editor markup match the frontend. ([30148](https://github.com/WordPress/gutenberg/pull/30148))
+    -   Social Links: Improve selected state of empty block. ([29756](https://github.com/WordPress/gutenberg/pull/29756))
+    -   Standardize the groups in the block toolbar. ([30012](https://github.com/WordPress/gutenberg/pull/30012), [29247](https://github.com/WordPress/gutenberg/pull/29247), [29863](https://github.com/WordPress/gutenberg/pull/29863))
+    -   Verse block: Add support for the padding to the verse block. ([29820](https://github.com/WordPress/gutenberg/pull/29820))
+-   Components: Allow multiple words in the autocomplete phrase matcher. ([29939](https://github.com/WordPress/gutenberg/pull/29939))
+-   Gutenberg Plugin: Improved cache bust without `filemtime` for assets. ([29775](https://github.com/WordPress/gutenberg/pull/29775))
+-   Icons: Hint the lowercase icon by 0.15px to correct the font weight appearance. ([29754](https://github.com/WordPress/gutenberg/pull/29754))
+-   Media: Use image default size from settings. ([29966](https://github.com/WordPress/gutenberg/pull/29966))
 
 ### New APIs
 
-- Copy to clipboard hook: Use ref callback. ([29643](https://github.com/WordPress/gutenberg/pull/29643))
+-   Compose: Add new `useCopyToClipboard` hook. ([29643](https://github.com/WordPress/gutenberg/pull/29643))
+-   Deprecated: Add `since` option to `deprecated` function. ([30017](https://github.com/WordPress/gutenberg/pull/30017))
 
 ### Bug Fixes
 
-- RichText: Fix inline display warning. ([30193](https://github.com/WordPress/gutenberg/pull/30193))
-- Fix regression with multi select style. ([30128](https://github.com/WordPress/gutenberg/pull/30128))
-- Add check to avoid PHP warnings. ([30127](https://github.com/WordPress/gutenberg/pull/30127))
-- Fix navigation mode focus. ([30126](https://github.com/WordPress/gutenberg/pull/30126))
-- Block Editor: Ensure that uncategorized block types are properly handled. ([30125](https://github.com/WordPress/gutenberg/pull/30125))
-- Blocks: Adding onRemove event to verse block. ([30104](https://github.com/WordPress/gutenberg/pull/30104))
-- Navigation component: Align item text to the left/right. ([30083](https://github.com/WordPress/gutenberg/pull/30083))
-- Restore the default editor font for the non FSE themes. ([30080](https://github.com/WordPress/gutenberg/pull/30080))
-- Fix: Kind attribute missing subtitle value in video text track. ([30040](https://github.com/WordPress/gutenberg/pull/30040))
-- Fix persistence of Preferences in site editor. ([30019](https://github.com/WordPress/gutenberg/pull/30019))
-- Writing flow: Fix tab behaviour. ([30000](https://github.com/WordPress/gutenberg/pull/30000))
-- Fix sibling block inserter displaying at end of block list. ([29920](https://github.com/WordPress/gutenberg/pull/29920))
-- Prevent PanelBody title from being overlapped by arrow. ([29914](https://github.com/WordPress/gutenberg/pull/29914))
-- Block Editor: Fix the issue with block style preview when example missing. ([29894](https://github.com/WordPress/gutenberg/pull/29894))
-- useMergeRefs: Call when dependency changes after ref change. ([29892](https://github.com/WordPress/gutenberg/pull/29892))
-- Fix mover width/size regressions. ([29889](https://github.com/WordPress/gutenberg/pull/29889))
-- Try: Fix gallery item clicking. ([29860](https://github.com/WordPress/gutenberg/pull/29860))
-- Fix broken image link in the documentation main README. ([29857](https://github.com/WordPress/gutenberg/pull/29857))
-- Docs: Fix broken link to developer resources in README.md. (#29795). ([29796](https://github.com/WordPress/gutenberg/pull/29796))
-- Site Editor: Remove header toolbar transition in reduced-motion mode. ([29764](https://github.com/WordPress/gutenberg/pull/29764))
-- Docs: Fix rebase error. ([29753](https://github.com/WordPress/gutenberg/pull/29753))
-- Storybook playground - Fix block editor shortcuts. ([29750](https://github.com/WordPress/gutenberg/pull/29750))
-- Keep post publishing popover open when a date is clicked. ([29738](https://github.com/WordPress/gutenberg/pull/29738))
-- Fix React warning in Text Control. ([29724](https://github.com/WordPress/gutenberg/pull/29724))
-- Try: Fix overzealous aspect ratio scaling for embeds. ([29510](https://github.com/WordPress/gutenberg/pull/29510))
-- Embed: Fix select on focus. ([29431](https://github.com/WordPress/gutenberg/pull/29431))
-- Raw handling: Fix pasting special spaces. ([28077](https://github.com/WordPress/gutenberg/pull/28077))
-- Fix/image block reset sizes on external URL change. ([26879](https://github.com/WordPress/gutenberg/pull/26879))
+-   Block Editor:
+    -   Ensure that uncategorized block types are properly handled. ([30125](https://github.com/WordPress/gutenberg/pull/30125))
+    -   Fix mover width/size regressions. ([29889](https://github.com/WordPress/gutenberg/pull/29889))
+    -   Fix navigation mode focus. ([30126](https://github.com/WordPress/gutenberg/pull/30126))
+    -   Fix regression with multi select style. ([30128](https://github.com/WordPress/gutenberg/pull/30128))
+    -   Fix the issue with block style preview when example missing. ([29894](https://github.com/WordPress/gutenberg/pull/29894))
+    -   Fix sibling block inserter displaying at end of block list. ([29920](https://github.com/WordPress/gutenberg/pull/29920))
+    -   Revert showing empty paragraphs on fronted. ([29809](https://github.com/WordPress/gutenberg/pull/29809))
+    -   Show the active block variation's icon in Select mode. ([30143](https://github.com/WordPress/gutenberg/pull/30143))
+-   Blocks: Adding onRemove event to verse block. ([30104](https://github.com/WordPress/gutenberg/pull/30104))
+-   Block Library:
+    -   Cover: Improve disabled media buttons check for placeholder. ([29858](https://github.com/WordPress/gutenberg/pull/29858))
+    -   Embed:
+        -   Fix overzealous aspect ratio scaling for embeds. ([29510](https://github.com/WordPress/gutenberg/pull/29510))
+        -   Embed: Fix select on focus. ([29431](https://github.com/WordPress/gutenberg/pull/29431))
+    -   Gallery: Fix gallery item clicking. ([29860](https://github.com/WordPress/gutenberg/pull/29860))
+    -   Image:
+        -   Fix block reset sizes on external URL change. ([26879](https://github.com/WordPress/gutenberg/pull/26879))
+        -   Fix undo step with temporary URL. ([30114](https://github.com/WordPress/gutenberg/pull/30114))
+    -   Social Link: More accessible labels. ([29659](https://github.com/WordPress/gutenberg/pull/29659))
+    -   Video: Fix kind attribute missing subtitle value in video text track. ([30040](https://github.com/WordPress/gutenberg/pull/30040))
+-   Components:
+    -   Don't display Guide's page control if there is only one page. ([29629](https://github.com/WordPress/gutenberg/pull/29629))
+    -   Prevent PanelBody title from being overlapped by arrow. ([29914](https://github.com/WordPress/gutenberg/pull/29914))
+-   Compose: Call `useMergeRefs` when dependency changes after ref change. ([29892](https://github.com/WordPress/gutenberg/pull/29892))
+-   Copy:
+    -   Restore dot at the end of a sentence. ([29897](https://github.com/WordPress/gutenberg/pull/29897))
+    -   Update the layout alignment description for better clarity. ([29974](https://github.com/WordPress/gutenberg/pull/29974))
+-   Gutenberg Plugin: Update "requires at least" value to 5.6. ([29646](https://github.com/WordPress/gutenberg/pull/29646))
+-   E2E Tests: Stabilize randomly failing tests in trunk. ([29836](https://github.com/WordPress/gutenberg/pull/29836))
+-   Navigation Component: Align item text to the left/right. ([30083](https://github.com/WordPress/gutenberg/pull/30083))
+-   Post Editor:
+    -   Fix post editor layout regression. ([30093](https://github.com/WordPress/gutenberg/pull/30093))
+    -   Keep post publishing popover open when a date is clicked. ([29738](https://github.com/WordPress/gutenberg/pull/29738), [29893](https://github.com/WordPress/gutenberg/pull/29893))
+-   RichText: Fix inline display warning. ([30193](https://github.com/WordPress/gutenberg/pull/30193))
+-   Themes: Restore the default editor font for the non FSE themes. ([30080](https://github.com/WordPress/gutenberg/pull/30080))
+-   Raw Handling: Fix pasting special spaces. ([28077](https://github.com/WordPress/gutenberg/pull/28077))
+-   Storybook: Fix block editor shortcuts. ([29750](https://github.com/WordPress/gutenberg/pull/29750))
+-   Writing Flow:
+    -   Fix `caretRangeFromPoint`. ([30031](https://github.com/WordPress/gutenberg/pull/30031))
+    -   Fix tab behavior. ([30000](https://github.com/WordPress/gutenberg/pull/30000))
+    -   Remove arrow nav limitations. ([30057](https://github.com/WordPress/gutenberg/pull/30057))
 
 ### Performance
 
-- Button block: Use early return to optimize save.js. ([29781](https://github.com/WordPress/gutenberg/pull/29781))
-- Parsing patterns when idling (performance follow-up for inserting patterns into containers). ([29444](https://github.com/WordPress/gutenberg/pull/29444))
+-   Block Editor:
+    -   Optimise multi-selection select calls. ([30140](https://github.com/WordPress/gutenberg/pull/30140))
+    -   When inserting Block Patterns they get parsed when the browser is idle. ([29444](https://github.com/WordPress/gutenberg/pull/29444))
+-   Block Library: Use early return in the Button block to optimize save.js. ([29781](https://github.com/WordPress/gutenberg/pull/29781))
 
 ### Experiments
 
-- Fix padding issues with nav screen. ([30183](https://github.com/WordPress/gutenberg/pull/30183))
-- Global Styles: Skip null when translating settings. ([30171](https://github.com/WordPress/gutenberg/pull/30171))
-- Navigation Block: Increase importance of submenus staying open. ([30169](https://github.com/WordPress/gutenberg/pull/30169))
-- Polish navigation editor menu settings styles. ([30168](https://github.com/WordPress/gutenberg/pull/30168))
-- Fix minor styling issues with nav editor. ([30129](https://github.com/WordPress/gutenberg/pull/30129))
-- Navigation: Consistently provide fallback variations. ([30117](https://github.com/WordPress/gutenberg/pull/30117))
-- Fix Template Part Alignments behavior. ([30099](https://github.com/WordPress/gutenberg/pull/30099))
-- Site Editor (Experiment): Automatically open the sidebar to the appropriate template sub-menu. ([30098](https://github.com/WordPress/gutenberg/pull/30098))
-- Fix post editor layout regression. ([30093](https://github.com/WordPress/gutenberg/pull/30093))
-- Optimistically continue with empty data when user data for global styles is not a JSON. ([30088](https://github.com/WordPress/gutenberg/pull/30088))
-- Fix navigation screen font. ([30085](https://github.com/WordPress/gutenberg/pull/30085))
-- Use a default sans serif font for the widget screen. ([30084](https://github.com/WordPress/gutenberg/pull/30084))
-- Remove alignments from the root level of the site editor. ([30079](https://github.com/WordPress/gutenberg/pull/30079))
-- Fix query loop margin. ([30078](https://github.com/WordPress/gutenberg/pull/30078))
-- Add layout support to the template part block. ([30077](https://github.com/WordPress/gutenberg/pull/30077))
-- Load block editor assets in the navigation and widget editors. ([30076](https://github.com/WordPress/gutenberg/pull/30076))
-- Fix post comment count block attribute. ([30056](https://github.com/WordPress/gutenberg/pull/30056))
-- Fix paragraph margin specificity inside layout containers. ([30038](https://github.com/WordPress/gutenberg/pull/30038))
-- Block Supports: Allow skipping serialization of border. ([30035](https://github.com/WordPress/gutenberg/pull/30035))
-- Expose Template part block variations to the Inserter. ([30032](https://github.com/WordPress/gutenberg/pull/30032))
-- Fix edge case where the default layout could be undefined. ([30024](https://github.com/WordPress/gutenberg/pull/30024))
-- Add "theme" category and better present template parts in the inserter. ([30020](https://github.com/WordPress/gutenberg/pull/30020))
-- Use the interface package for the navigation screen. ([30013](https://github.com/WordPress/gutenberg/pull/30013))
-- Unset font weight and text decoration inheritance in nav block. ([30011](https://github.com/WordPress/gutenberg/pull/30011))
-- Try: Add line-height to Navigation block. ([30010](https://github.com/WordPress/gutenberg/pull/30010))
-- Fix link items in navigation screen. ([30009](https://github.com/WordPress/gutenberg/pull/30009))
-- GlobalStyles: Remove kebab-case camelCase transformations. ([29986](https://github.com/WordPress/gutenberg/pull/29986))
-- Post Content: Add support for experimental layout. ([29982](https://github.com/WordPress/gutenberg/pull/29982))
-- Navigation Block / Page List: Unify menu item styles. ([29975](https://github.com/WordPress/gutenberg/pull/29975))
-- Fix navigation editor block toolbar not visible on small screens. ([29967](https://github.com/WordPress/gutenberg/pull/29967))
-- Editor Layout: Open sidebar menu over editor on small screens. ([29955](https://github.com/WordPress/gutenberg/pull/29955))
-- [Query block] Remove unused QueryProvider. ([29947](https://github.com/WordPress/gutenberg/pull/29947))
-- Allow themes to use any styles in the theme.json whether or not the block supports it. ([29941](https://github.com/WordPress/gutenberg/pull/29941))
-- Page List & Navigation Screen: Fix flyout bg color in page list. ([29932](https://github.com/WordPress/gutenberg/pull/29932))
-- Fix navigation screen inserter horizontal scrollbar. ([29930](https://github.com/WordPress/gutenberg/pull/29930))
-- Polish nav screen slightly. ([29926](https://github.com/WordPress/gutenberg/pull/29926))
-- Navigation Editor: Improve default label of location select. ([29908](https://github.com/WordPress/gutenberg/pull/29908))
-- Navigation Editor: Show all menus in manage locations. ([29906](https://github.com/WordPress/gutenberg/pull/29906))
-- Block Editor: Add client ID trees selectors. ([29902](https://github.com/WordPress/gutenberg/pull/29902))
-- Lighten the post content block. ([29898](https://github.com/WordPress/gutenberg/pull/29898))
-- Navigation Menu: Show submenus only on select in the editor. ([29869](https://github.com/WordPress/gutenberg/pull/29869))
-- Update post content icon, unuse justify. ([29867](https://github.com/WordPress/gutenberg/pull/29867))
-- Fix template saving issue after switching themes. ([29842](https://github.com/WordPress/gutenberg/pull/29842))
-- Add padding to link placeholder. ([29832](https://github.com/WordPress/gutenberg/pull/29832))
-- Update Post Title markup so that editor and front match. ([29824](https://github.com/WordPress/gutenberg/pull/29824))
-- Verse block: Add support for the padding to the verse block. ([29820](https://github.com/WordPress/gutenberg/pull/29820))
-- List View: Visual and design improvements. ([29769](https://github.com/WordPress/gutenberg/pull/29769))
-- Add loginout block. ([29766](https://github.com/WordPress/gutenberg/pull/29766))
-- Fix navigation editor saving. ([29749](https://github.com/WordPress/gutenberg/pull/29749))
-- Fix navigation block styles in the navigation editor. ([29748](https://github.com/WordPress/gutenberg/pull/29748))
-- Keep submenus open onselect in the editor. ([29713](https://github.com/WordPress/gutenberg/pull/29713))
-- Fix navigation editor link search suggestions. ([29707](https://github.com/WordPress/gutenberg/pull/29707))
-- Iterate on widget REST API endpoints. ([29649](https://github.com/WordPress/gutenberg/pull/29649))
-- Query title block - Archive Title. ([29428](https://github.com/WordPress/gutenberg/pull/29428))
-- Add a layout configuration to the group and theme.json and make alignments declarative. ([29335](https://github.com/WordPress/gutenberg/pull/29335))
-- First step towards hybrid themes: Fallback to PHP templates. ([29026](https://github.com/WordPress/gutenberg/pull/29026))
-- Fix Site title: Different markup in the editor and on the frontend. ([29021](https://github.com/WordPress/gutenberg/pull/29021))
-- Try: Allow vertical inserter in the nav block. ([28833](https://github.com/WordPress/gutenberg/pull/28833))
-- Add preload_paths filter for widgets screen and full site editing. ([28701](https://github.com/WordPress/gutenberg/pull/28701))
-- Site Editor (Experiment): Automatically open the sidebar to the appropriate menu. ([26964](https://github.com/WordPress/gutenberg/pull/26964))
+-   Components:
+    -   Add Heading. ([29592](https://github.com/WordPress/gutenberg/pull/29592))
+    -   Button: Add a default type of button. ([29900](https://github.com/WordPress/gutenberg/pull/29900))
+-   Customizer: Add widgets customize inspector. ([29755](https://github.com/WordPress/gutenberg/pull/29755))
+-   Full-Site Editing:
+    -   Add a layout configuration to the Group block and `theme.json` and make alignments declarative. ([29335](https://github.com/WordPress/gutenberg/pull/29335))
+    -   Add client ID trees selectors in block navigation. ([29902](https://github.com/WordPress/gutenberg/pull/29902))
+    -   Add description field to Post Content block. ([29971](https://github.com/WordPress/gutenberg/pull/29971))
+    -   Add Log In/Out block. ([29766](https://github.com/WordPress/gutenberg/pull/29766))
+    -   Add Query Title block and Archive Title variation. ([29428](https://github.com/WordPress/gutenberg/pull/29428))
+    -   Add Term Description block. ([29613](https://github.com/WordPress/gutenberg/pull/29613))
+    -   Add preload_paths filter for widgets screen and full site editing. ([28701](https://github.com/WordPress/gutenberg/pull/28701))
+    -   Add support for experimental layout in Post Content block. ([29982](https://github.com/WordPress/gutenberg/pull/29982))
+    -   Add layout support to the Template Part block. ([30077](https://github.com/WordPress/gutenberg/pull/30077))
+    -   Add link color option in Site Title block. ([29924](https://github.com/WordPress/gutenberg/pull/29924))
+    -   Always use full screen mode. ([29489](https://github.com/WordPress/gutenberg/pull/29489))
+    -   Automatically open the sidebar to the appropriate menu. ([26964](https://github.com/WordPress/gutenberg/pull/26964), [30098](https://github.com/WordPress/gutenberg/pull/30098))
+    -   Close navigation panel after template selection. ([29956](https://github.com/WordPress/gutenberg/pull/29956))
+    -   Expose Template Part block variations to the Inserter. ([30032](https://github.com/WordPress/gutenberg/pull/30032))
+    -   First step towards hybrid themes – fallback to PHP templates. ([29026](https://github.com/WordPress/gutenberg/pull/29026))
+    -   Fix block toolbar from overlapping navigation panel. ([29918](https://github.com/WordPress/gutenberg/pull/29918))
+    -   Fix different markup in the editor and on the frontend for the Site Title block. ([29021](https://github.com/WordPress/gutenberg/pull/29021))
+    -   Fix edge case where the default layout could be undefined. ([30024](https://github.com/WordPress/gutenberg/pull/30024))
+    -   Fix persistence of Preferences in site editor. ([30019](https://github.com/WordPress/gutenberg/pull/30019))
+    -   Fix Post Comment Count block attribute. ([30056](https://github.com/WordPress/gutenberg/pull/30056))
+    -   Fix Query Loop block margin. ([30078](https://github.com/WordPress/gutenberg/pull/30078))
+    -   Fix Template Part alignments behavior. ([30099](https://github.com/WordPress/gutenberg/pull/30099))
+    -   Fix template saving issue after switching themes. ([29842](https://github.com/WordPress/gutenberg/pull/29842))
+    -   Polish site button focus/hover styles in post and site editor. ([29888](https://github.com/WordPress/gutenberg/pull/29888))
+    -   Prevent navigation panel focus when hidden. ([29600](https://github.com/WordPress/gutenberg/pull/29600))
+    -   Refactor the Post Content block. ([29898](https://github.com/WordPress/gutenberg/pull/29898))
+    -   Remove alignments from the root level of the site editor. ([30079](https://github.com/WordPress/gutenberg/pull/30079))
+    -   Remove header toolbar transition in reduced-motion mode. ([29764](https://github.com/WordPress/gutenberg/pull/29764))
+    -   Remove unused QueryProvider in Query block. ([29947](https://github.com/WordPress/gutenberg/pull/29947))
+    -   Template Part: Identify template parts in error messages. ([28398](https://github.com/WordPress/gutenberg/pull/28398))
+    -   Update Post Content icon, unuse justify. ([29867](https://github.com/WordPress/gutenberg/pull/29867))
+    -   Update Post Title markup so that editor and front match. ([29824](https://github.com/WordPress/gutenberg/pull/29824))
+    -   Update template details popover. ([29439](https://github.com/WordPress/gutenberg/pull/29439))
+-   Global Styles:
+    -   Allow themes to use any styles in the `theme.json` whether or not the block supports it. ([29941](https://github.com/WordPress/gutenberg/pull/29941))
+    -   Better CSS reset style loader order. ([30034](https://github.com/WordPress/gutenberg/pull/30034))
+    -   Block Supports: Allow skipping serialization of border. ([30035](https://github.com/WordPress/gutenberg/pull/30035))
+    -   Optimistically continue with empty data when user data for global styles is not a JSON. ([30088](https://github.com/WordPress/gutenberg/pull/30088))
+    -   Remove kebab-case camelCase transformations. ([29986](https://github.com/WordPress/gutenberg/pull/29986))
+    -   Skip `null` when translating settings. ([30171](https://github.com/WordPress/gutenberg/pull/30171))
+    -   Translate custom templates in `theme.json`. ([29828](https://github.com/WordPress/gutenberg/pull/29828))
+-   Navigation Editor and Block:
+    -   Add line-height to Navigation block. ([30010](https://github.com/WordPress/gutenberg/pull/30010))
+    -   Add padding to Navigation Link placeholder. ([29832](https://github.com/WordPress/gutenberg/pull/29832))
+    -   Allow vertical inserter in the Navigation block. ([28833](https://github.com/WordPress/gutenberg/pull/28833))
+    -   Consistently provide fallback variations for the block. ([30117](https://github.com/WordPress/gutenberg/pull/30117))
+    -   Enable list view. ([29936](https://github.com/WordPress/gutenberg/pull/29936))
+    -   Fix flyout background color in Page List block. ([29932](https://github.com/WordPress/gutenberg/pull/29932))
+    -   Fix link items in navigation screen. ([30009](https://github.com/WordPress/gutenberg/pull/30009))
+    -   Fix minor styling issues with nav editor. ([30129](https://github.com/WordPress/gutenberg/pull/30129))
+    -   Fix Navigation block styles in the navigation editor. ([29748](https://github.com/WordPress/gutenberg/pull/29748))
+    -   Fix navigation editor link search suggestions. ([29707](https://github.com/WordPress/gutenberg/pull/29707))
+    -   Fix navigation editor saving. ([29749](https://github.com/WordPress/gutenberg/pull/29749))
+    -   Fix navigation screen font. ([30085](https://github.com/WordPress/gutenberg/pull/30085))
+    -   Fix navigation screen inserter horizontal scrollbar. ([29930](https://github.com/WordPress/gutenberg/pull/29930))
+    -   Fix navigation editor block toolbar not visible on small screens. ([29967](https://github.com/WordPress/gutenberg/pull/29967))
+    -   Fix padding issues with nav screen. ([30183](https://github.com/WordPress/gutenberg/pull/30183))
+    -   Fix paragraph margin specificity inside layout containers. ([30038](https://github.com/WordPress/gutenberg/pull/30038))
+    -   Fix popover anchor in Navigation Link block. ([30173](https://github.com/WordPress/gutenberg/pull/30173))
+    -   Improve default label of location select. ([29908](https://github.com/WordPress/gutenberg/pull/29908))
+    -   Increase importance of submenus staying open. ([30169](https://github.com/WordPress/gutenberg/pull/30169))
+    -   Keep submenus open on select in the editor. ([29713](https://github.com/WordPress/gutenberg/pull/29713))
+    -   Match editor markup to rendered in Navigation Link block. ([29935](https://github.com/WordPress/gutenberg/pull/29935))
+    -   Move theme location settings to navigation editor sidebar. ([29458](https://github.com/WordPress/gutenberg/pull/29458))
+    -   Navigation Menu: Show submenus only on select in the editor. ([29869](https://github.com/WordPress/gutenberg/pull/29869))
+    -   Polish navigation screen. ([29926](https://github.com/WordPress/gutenberg/pull/29926), [30168](https://github.com/WordPress/gutenberg/pull/30168))
+    -   Simplify focus style in Site Icon block. ([29872](https://github.com/WordPress/gutenberg/pull/29872))
+    -   Show all menus in manage locations. ([29906](https://github.com/WordPress/gutenberg/pull/29906))
+    -   Unset font weight and text decoration inheritance in Navigation block. ([30011](https://github.com/WordPress/gutenberg/pull/30011))
+    -   Use the interface package for the navigation screen. ([30013](https://github.com/WordPress/gutenberg/pull/30013))
+    -   Visual and design improvements for List View. ([29769](https://github.com/WordPress/gutenberg/pull/29769))
+-   Widgets Editor:
+    -   Fix warning when widgets block editor is disabled. ([30318](https://github.com/WordPress/gutenberg/pull/30318))
+    -   Iterate on widgets REST API endpoints. ([29649](https://github.com/WordPress/gutenberg/pull/29649))
+    -   Load block editor assets in the navigation and widget editors. ([30076](https://github.com/WordPress/gutenberg/pull/30076))
+    -   Unify menu item styles for Navigation Block and Page List blocks. ([29975](https://github.com/WordPress/gutenberg/pull/29975))
+    -   Use a default sans serif font for the widget screen. ([30084](https://github.com/WordPress/gutenberg/pull/30084))
 
 ### Documentation
 
-- Docs: Clarify the purpose of the `@wordpress/editor` package. ([30136](https://github.com/WordPress/gutenberg/pull/30136))
-- Docs: Remove superfluous sentence in create block tutorial. ([30062](https://github.com/WordPress/gutenberg/pull/30062))
-- Fix renderAppender documentation. ([29925](https://github.com/WordPress/gutenberg/pull/29925))
-- Update block design principles with a new section on how to group controls. ([29816](https://github.com/WordPress/gutenberg/pull/29816))
-- Docs: Fix typos in interface package. ([29740](https://github.com/WordPress/gutenberg/pull/29740))
-- i18n: Replace dead link in README.md. ([29699](https://github.com/WordPress/gutenberg/pull/29699))
+-   Block Editor: Fix `renderAppender` documentation. ([29925](https://github.com/WordPress/gutenberg/pull/29925))
+-   Handbook:
+    -   Fix broken image link in the documentation main README. ([29857](https://github.com/WordPress/gutenberg/pull/29857))
+    -   Fix broken link to developer resources in README.md. (#29795). ([29796](https://github.com/WordPress/gutenberg/pull/29796))
+    -   Fix link to native-mobile.md in pull request template. ([29923](https://github.com/WordPress/gutenberg/pull/29923))
+    -   Fix rebase error. ([29753](https://github.com/WordPress/gutenberg/pull/29753))
+    -   Remove superfluous sentence in create block tutorial. ([30062](https://github.com/WordPress/gutenberg/pull/30062))
+    -   Update block design principles with a new section on how to group controls. ([29816](https://github.com/WordPress/gutenberg/pull/29816))
+    -   Update broken link to Getting Started for the React Native based Mobile Gutenberg. ([30162](https://github.com/WordPress/gutenberg/pull/30162))
+    -   Update the quick view image on the documentation homepage. ([29808](https://github.com/WordPress/gutenberg/pull/29808))
+-   Editor: Clarify the purpose of the `@wordpress/editor` package. ([30136](https://github.com/WordPress/gutenberg/pull/30136))
+-   I18n: Replace dead link in README.md. ([29699](https://github.com/WordPress/gutenberg/pull/29699))
+-   Interface: Fix typos in interface package. ([29740](https://github.com/WordPress/gutenberg/pull/29740))
 
 ### Code Quality
 
-- Block editor: Avoid isInsideRootBlock (DOM query) in useFocusFirstElement. ([30178](https://github.com/WordPress/gutenberg/pull/30178))
-- Move nav mode exit from writing flow to block props. ([30175](https://github.com/WordPress/gutenberg/pull/30175))
-- Revert "Add check to avoid PHP warnings". ([30174](https://github.com/WordPress/gutenberg/pull/30174))
-- Block editor: focus mode: Fix opacity for inner blocks, move classes. ([30130](https://github.com/WordPress/gutenberg/pull/30130))
-- Block editor: Move is-typing and is-outline-mode classes up the tree. ([30106](https://github.com/WordPress/gutenberg/pull/30106))
-- Remove obsolete editor styles for List block. ([30094](https://github.com/WordPress/gutenberg/pull/30094))
-- Blocks: Ensure theme category is only added when not provided. ([30089](https://github.com/WordPress/gutenberg/pull/30089))
-- Fix PHPCS warnings. ([30022](https://github.com/WordPress/gutenberg/pull/30022))
-- Rename loginOut to logInOut. ([29979](https://github.com/WordPress/gutenberg/pull/29979))
-- Cleanup the blocks.php file. ([29964](https://github.com/WordPress/gutenberg/pull/29964))
-- Rename getBlockContent to getBlockInnerHTML internally. ([29949](https://github.com/WordPress/gutenberg/pull/29949))
-- RichText: Remove dead and deprecated setFocusedElement. ([29877](https://github.com/WordPress/gutenberg/pull/29877))
-- Refactor ServerSideRender to use React hooks. ([28297](https://github.com/WordPress/gutenberg/pull/28297))
+-   API Fetch:
+    -   Type several of the middlewares. ([29719](https://github.com/WordPress/gutenberg/pull/29719), [30150](https://github.com/WordPress/gutenberg/pull/30150), [29901](https://github.com/WordPress/gutenberg/pull/29901))
+    -   Type the rest of the package. ([30161](https://github.com/WordPress/gutenberg/pull/30161))
+-   Block Editor:
+    -   Avoid `isInsideRootBlock` (DOM query) in `useFocusFirstElement`. ([30178](https://github.com/WordPress/gutenberg/pull/30178))
+    -   Focus mode: Fix opacity for inner blocks, move classes. ([30130](https://github.com/WordPress/gutenberg/pull/30130))
+    -   Move class for navigation mode. ([30181](https://github.com/WordPress/gutenberg/pull/30181))
+    -   Move `is-typing` and `is-outline-mode` classes up the tree. ([30106](https://github.com/WordPress/gutenberg/pull/30106))
+    -   Move nav mode exit from writing flow to block props. ([30175](https://github.com/WordPress/gutenberg/pull/30175))
+-   Block Library:
+    -   Refactor ServerSideRender to use React hooks. ([28297](https://github.com/WordPress/gutenberg/pull/28297))
+    -   Remove obsolete editor styles for List block. ([30094](https://github.com/WordPress/gutenberg/pull/30094))
+    -   Rename `loginOut` variable to `logInOut`. ([29979](https://github.com/WordPress/gutenberg/pull/29979))
+-   Blocks:
+    -   Ensure theme category is only added when not provided. ([30089](https://github.com/WordPress/gutenberg/pull/30089))
+    -   Rename getBlockContent to getBlockInnerHTML internally. ([29949](https://github.com/WordPress/gutenberg/pull/29949))
+-   Components: Fix React warning in Text Control. ([29724](https://github.com/WordPress/gutenberg/pull/29724))
+-   Date: Add types. ([29789](https://github.com/WordPress/gutenberg/pull/29789))
+-   DOM:
+    -   Add types to `focusable`. ([29787](https://github.com/WordPress/gutenberg/pull/29787), [30030](https://github.com/WordPress/gutenberg/pull/30030))
+    -   Split into smaller modules to facilitate typing. ([30044](https://github.com/WordPress/gutenberg/pull/30044))
+-   Gutenberg Plugin:
+    -   Cleanup the blocks.php file. ([29964](https://github.com/WordPress/gutenberg/pull/29964))
+    -   Fix PHPCS warnings. ([30022](https://github.com/WordPress/gutenberg/pull/30022))
+-   Packages: Add types directive to api-fetch and date packages. ([30252](https://github.com/WordPress/gutenberg/pull/30252))
+-   RichText: Remove dead and deprecated `setFocusedElement`. ([29877](https://github.com/WordPress/gutenberg/pull/29877))
 
 ### Tools
 
-- Workflows: Use Gutenberg token for version bump, changelog commits. ([30212](https://github.com/WordPress/gutenberg/pull/30212))
-- Remove path ignore configs from CI. ([30090](https://github.com/WordPress/gutenberg/pull/30090))
-- Babel Preset: Update Babel to v7.13.x. ([30018](https://github.com/WordPress/gutenberg/pull/30018))
-- end-to-end Tests: Cover the case when using multiple words in the inserter. ([29978](https://github.com/WordPress/gutenberg/pull/29978))
-- Eslint Plugin: Add TypeScript as peer dependency and make it optional. ([29942](https://github.com/WordPress/gutenberg/pull/29942))
-- Fix link to native-mobile.md in pull request template. ([29923](https://github.com/WordPress/gutenberg/pull/29923))
-- Testing: Allow TypeScript modules for transpiled packages. ([29873](https://github.com/WordPress/gutenberg/pull/29873))
-- Set delay to zero in the reduce-motion mixin and tests. ([29762](https://github.com/WordPress/gutenberg/pull/29762))
-- Fix another end-to-end test function name. ([29745](https://github.com/WordPress/gutenberg/pull/29745))
-- Fix test plugin clash. ([29744](https://github.com/WordPress/gutenberg/pull/29744))
-- Release Workflow: Allow triggering manually. ([28138](https://github.com/WordPress/gutenberg/pull/28138))
-
-### Various
-
-- Revert "Editor Styles: Add a transform for button rules". ([30184](https://github.com/WordPress/gutenberg/pull/30184))
-- Block editor: nav mode: Move class. ([30181](https://github.com/WordPress/gutenberg/pull/30181))
-- Nav link block: Fix popover anchor. ([30173](https://github.com/WordPress/gutenberg/pull/30173))
-- Docs: Update broken link to Getting Started for the React Native based Mobile Gutenberg. ([30162](https://github.com/WordPress/gutenberg/pull/30162))
-- api-fetch: Add types to http-v1 middleware. ([30150](https://github.com/WordPress/gutenberg/pull/30150))
-- Show the active block variation's icon in Select mode. ([30143](https://github.com/WordPress/gutenberg/pull/30143))
-- Block editor: Optimise multi-selection select calls. ([30140](https://github.com/WordPress/gutenberg/pull/30140))
-- Image block: Fix undo step with temporary URL. ([30114](https://github.com/WordPress/gutenberg/pull/30114))
-- Writing flow: Remove arrow nav limitations. ([30057](https://github.com/WordPress/gutenberg/pull/30057))
-- dom: Split into smaller modules to facilitate typing. ([30044](https://github.com/WordPress/gutenberg/pull/30044))
-- Writing flow: Fix caretRangeFromPoint. ([30031](https://github.com/WordPress/gutenberg/pull/30031))
-- dom: Add types to `focusable`. ([30030](https://github.com/WordPress/gutenberg/pull/30030))
-- Update the layout alignment description for better clarity. ([29974](https://github.com/WordPress/gutenberg/pull/29974))
-- Site Editor: Close navigation panel after template selection. ([29956](https://github.com/WordPress/gutenberg/pull/29956))
-- Enable list view. ([29936](https://github.com/WordPress/gutenberg/pull/29936))
-- Navigation Link: Match Editor Markup to Rendered. ([29935](https://github.com/WordPress/gutenberg/pull/29935))
-- Site Title: Add link color option. ([29924](https://github.com/WordPress/gutenberg/pull/29924))
-- Site Editor: Fix block toolbar from overlapping navigation panel. ([29918](https://github.com/WordPress/gutenberg/pull/29918))
-- Improve focal point settings filename clarity. ([29910](https://github.com/WordPress/gutenberg/pull/29910))
-- Packages: Enforce version bump for production packages after WP major. ([29903](https://github.com/WordPress/gutenberg/pull/29903))
-- api-fetch: Add types to media-upload middleware. ([29901](https://github.com/WordPress/gutenberg/pull/29901))
-- Component System: Button - Add a default type of button. ([29900](https://github.com/WordPress/gutenberg/pull/29900))
-- Restore dot at the end of a sentence. ([29897](https://github.com/WordPress/gutenberg/pull/29897))
-- Keep post publishing popover open when a date is clicked, by default. ([29893](https://github.com/WordPress/gutenberg/pull/29893))
-- Polish site button focus/hover styles in post and site editor. ([29888](https://github.com/WordPress/gutenberg/pull/29888))
-- Site icon: Simplify focus style. ([29872](https://github.com/WordPress/gutenberg/pull/29872))
-- Cover: Improve disabled media buttons check for placeholder. ([29858](https://github.com/WordPress/gutenberg/pull/29858))
-- E2E: Stabilize failing tests in trunk. ([29836](https://github.com/WordPress/gutenberg/pull/29836))
-- Themes: Translate custom templates in theme.json. ([29828](https://github.com/WordPress/gutenberg/pull/29828))
-- Cover: Allow drag n drop media replacement. ([29813](https://github.com/WordPress/gutenberg/pull/29813))
-- Revert: Show empty paragraphs on fronted. ([29809](https://github.com/WordPress/gutenberg/pull/29809))
-- Update the quick view image on the documentation homepage. ([29808](https://github.com/WordPress/gutenberg/pull/29808))
-- date: Add types. ([29789](https://github.com/WordPress/gutenberg/pull/29789))
-- dom: Add types to focusable. ([29787](https://github.com/WordPress/gutenberg/pull/29787))
-- Register Assets: Cache bust without filemtime. ([29775](https://github.com/WordPress/gutenberg/pull/29775))
-- Social Links: Improve selected state of empty block. ([29756](https://github.com/WordPress/gutenberg/pull/29756))
-- Add widgets customize inspector. ([29755](https://github.com/WordPress/gutenberg/pull/29755))
-- Hint the lowercase icon by 0.15px to correct the font weight appearance. ([29754](https://github.com/WordPress/gutenberg/pull/29754))
-- api-fetch: Type several of the middlewares. ([29719](https://github.com/WordPress/gutenberg/pull/29719))
-- Try: More accessible labels. ([29659](https://github.com/WordPress/gutenberg/pull/29659))
-- Update "requires at least"  value to 5.6. ([29646](https://github.com/WordPress/gutenberg/pull/29646))
-- Don't display Guide's page control if there is only one page. ([29629](https://github.com/WordPress/gutenberg/pull/29629))
-- Add term-description block. ([29613](https://github.com/WordPress/gutenberg/pull/29613))
-- Site Editor: Prevent navigation panel focus when hidden. ([29600](https://github.com/WordPress/gutenberg/pull/29600))
-- Components: Add Heading. ([29592](https://github.com/WordPress/gutenberg/pull/29592))
-- Site Editor: Always use full screen mode. ([29489](https://github.com/WordPress/gutenberg/pull/29489))
-- Update template details popover. ([29439](https://github.com/WordPress/gutenberg/pull/29439))
-- RN: Button Block set the width to fixed when width is set. ([29360](https://github.com/WordPress/gutenberg/pull/29360))
-- Try/add drag handle to select mode. ([28815](https://github.com/WordPress/gutenberg/pull/28815))
-- Identify template parts in error messages. ([28398](https://github.com/WordPress/gutenberg/pull/28398))
+-   Babel Preset: Update Babel to v7.13.x. ([30018](https://github.com/WordPress/gutenberg/pull/30018))
+-   Create block: Require WordPress 5.7 by default and source it from the main plugin file. ([29757](https://github.com/WordPress/gutenberg/pull/29757))
+-   E2E Tests:
+    -   Cover the case when using multiple words in the inserter. ([29978](https://github.com/WordPress/gutenberg/pull/29978))
+    -   Fix test plugin clash. ([29744](https://github.com/WordPress/gutenberg/pull/29744), [29745](https://github.com/WordPress/gutenberg/pull/29745))
+    -   Set delay to zero in the reduce-motion mixin and tests. ([29762](https://github.com/WordPress/gutenberg/pull/29762))
+-   Eslint Plugin: Add TypeScript as peer dependency and make it optional. ([29942](https://github.com/WordPress/gutenberg/pull/29942))
+-   GitHub Workflows:
+    -   Release: Allow triggering manually. ([28138](https://github.com/WordPress/gutenberg/pull/28138))
+    -   Remove path ignore configs from CI. ([30090](https://github.com/WordPress/gutenberg/pull/30090))
+    -   Use Gutenberg token for version bump, changelog commits. ([30212](https://github.com/WordPress/gutenberg/pull/30212))
+-   Packages: Enforce version bump for production packages after WP major. ([29903](https://github.com/WordPress/gutenberg/pull/29903))
+-   Unit Testing: Allow TypeScript modules for transpiled packages. ([29873](https://github.com/WordPress/gutenberg/pull/29873))
 
 
 = 10.2.1 =

From e7369c09f468158e42851ba2a5b1b58efbd4ca88 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Wed, 31 Mar 2021 21:00:32 +0200
Subject: [PATCH 17/53] Prettify YAML scripts (#30409)

---
 .github/ISSUE_TEMPLATE/config.yml             |  18 +-
 .github/workflows/build-plugin-zip.yml        | 403 +++++++++---------
 .github/workflows/bundle-size.yml             |  22 +-
 .github/workflows/cancel.yml                  |  22 +-
 .github/workflows/create-block.yml            |  64 +--
 .github/workflows/end2end-test.yml            | 115 +++--
 .github/workflows/performance.yml             | 104 +++--
 .github/workflows/pull-request-automation.yml |  34 +-
 .github/workflows/rnmobile-android-runner.yml |  96 ++---
 .github/workflows/rnmobile-ios-runner.yml     | 158 ++++---
 .../stale-issue-add-needs-testing.yml         |  28 +-
 .github/workflows/stale-issue-mark-stale.yml  |  28 +-
 .github/workflows/stale-issue-needs-info.yml  |  28 +-
 .github/workflows/static-checks.yml           | 108 ++---
 .github/workflows/storybook-pages.yml         |  70 +--
 .github/workflows/unit-test.yml               | 263 ++++++------
 .../upload-release-to-plugin-repo.yml         | 294 ++++++-------
 .../project-management-automation/action.yml  |  12 +-
 18 files changed, 929 insertions(+), 938 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index d30612c4f194ff..51bfb0d1bb7c13 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: true
 contact_links:
-  - name: General help request
-    url: https://wordpress.org/support/forum/how-to-and-troubleshooting/
-    about: For general help requests, create a new topic in the Fixing WordPress support forum
-  - name: Technical help request
-    url: https://wordpress.org/support/forum/wp-advanced/
-    about: For more technical help requests, create a new topic in the Developing with WordPress Forum
-  - name: Development help request
-    url: https://wordpress.stackexchange.com/
-    about: For questions about WordPress development, ask a question in the WordPress Development Stack Exchange
+    - name: General help request
+      url: https://wordpress.org/support/forum/how-to-and-troubleshooting/
+      about: For general help requests, create a new topic in the Fixing WordPress support forum
+    - name: Technical help request
+      url: https://wordpress.org/support/forum/wp-advanced/
+      about: For more technical help requests, create a new topic in the Developing with WordPress Forum
+    - name: Development help request
+      url: https://wordpress.stackexchange.com/
+      about: For questions about WordPress development, ask a question in the WordPress Development Stack Exchange
diff --git a/.github/workflows/build-plugin-zip.yml b/.github/workflows/build-plugin-zip.yml
index 9d5eadacb40153..bc2e68bbff513e 100644
--- a/.github/workflows/build-plugin-zip.yml
+++ b/.github/workflows/build-plugin-zip.yml
@@ -1,208 +1,207 @@
 name: Build Gutenberg Plugin Zip
 
 on:
-  pull_request:
-  push:
-    branches: [trunk]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'rc or stable?'
-        required: true
+    pull_request:
+    push:
+        branches: [trunk]
+    workflow_dispatch:
+        inputs:
+            version:
+                description: 'rc or stable?'
+                required: true
 
 jobs:
-  bump-version:
-    name: Bump version
-    runs-on: ubuntu-latest
-    if: |
-      github.event_name == 'workflow_dispatch' &&
-      github.ref == 'refs/heads/trunk' && (
-        github.event.inputs.version == 'rc' ||
-        github.event.inputs.version == 'stable'
-      )
-    outputs:
-      old_version: ${{ steps.get_version.outputs.old_version }}
-      new_version: ${{ steps.get_version.outputs.new_version }}
-      release_branch: ${{ steps.get_version.outputs.release_branch }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-        with:
-          token: ${{ secrets.GUTENBERG_TOKEN }}
-
-      - name: Compute old and new version
-        id: get_version
-        run: |
-          OLD_VERSION=$(jq --raw-output '.version' package.json)
-          echo "::set-output name=old_version::$(echo $OLD_VERSION)"
-          if [[ ${{ github.event.inputs.version }} == 'stable' ]]; then
-            NEW_VERSION=$(npx semver $OLD_VERSION -i patch)
-          else
-            if [[ $OLD_VERSION == *"rc"* ]]; then
-              NEW_VERSION=$(npx semver $OLD_VERSION -i prerelease)
-            else
-              # WordPress version guidelines: If minor is 9, bump major instead.
-              IFS='.' read -r -a OLD_VERSION_ARRAY <<< "$OLD_VERSION"
-              if [[ ${OLD_VERSION_ARRAY[1]} == "9" ]]; then
-                NEW_VERSION="$(npx semver $OLD_VERSION -i major)-rc.1"
-              else
-                NEW_VERSION="$(npx semver $OLD_VERSION -i minor)-rc.1"
-              fi
-            fi
-          fi
-          echo "::set-output name=new_version::$(echo $NEW_VERSION)"
-          IFS='.' read -r -a NEW_VERSION_ARRAY <<< "$NEW_VERSION"
-          RELEASE_BRANCH="release/${NEW_VERSION_ARRAY[0]}.${NEW_VERSION_ARRAY[1]}"
-          echo "::set-output name=release_branch::$(echo $RELEASE_BRANCH)"
-
-      - name: Configure git user name and email
-        run: |
-          git config user.name "Gutenberg Repository Automation"
-          git config user.email gutenberg@wordpress.org
-
-      - name: Create and switch to release branch
+    bump-version:
+        name: Bump version
+        runs-on: ubuntu-latest
         if: |
-          github.event.inputs.version == 'rc' &&
-          ! contains( steps.get_version.outputs.old_version, 'rc' )
-        run: git checkout -b "${{ steps.get_version.outputs.release_branch }}"
-
-      - name: Switch to release branch
-        if: |
-          github.event.inputs.version == 'stable' ||
-          contains( steps.get_version.outputs.old_version, 'rc' )
-        run: |
-          git fetch --depth=1 origin "${{ steps.get_version.outputs.release_branch }}"
-          git checkout "${{ steps.get_version.outputs.release_branch }}"
-
-      - name: Update plugin version
-        env:
-          VERSION: ${{ steps.get_version.outputs.new_version }}
-        run: |
-          cat <<< $(jq --tab --arg version "${VERSION}" '.version = $version' package.json) > package.json
-          cat <<< $(jq --tab --arg version "${VERSION}" '.version = $version' package-lock.json) > package-lock.json
-          sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" gutenberg.php
-          sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" readme.txt
-
-      - name: Commit the version bump
-        run: |
-          git add gutenberg.php package.json package-lock.json readme.txt
-          git commit -m "Bump plugin version to ${{ steps.get_version.outputs.new_version }}"
-          git push --set-upstream origin "${{ steps.get_version.outputs.release_branch }}"
-
-      - name: Cherry-pick to trunk
-        run: |
-          git checkout trunk
-          TRUNK_VERSION=$(jq --raw-output '.version' package.json)
-          if [[ ${{ steps.get_version.outputs.old_version }} == "$TRUNK_VERSION" ]]; then
-            git cherry-pick "${{ steps.get_version.outputs.release_branch }}"
-            git push
-          fi
-
-
-  build:
-    name: Build Release Artifact
-    runs-on: ubuntu-latest
-    needs: bump-version
-    if: always()
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-        with:
-          ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
-
-      - name: Cache node modules
-        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-        with:
-          node-version: 14.x
-
-      - name: Build Gutenberg plugin ZIP file
-        run: ./bin/build-plugin-zip.sh
-        env:
-          NO_CHECKS: 'true'
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-        with:
-          name: gutenberg-plugin
-          path: ./gutenberg.zip
-
-      - name: Build release notes draft
-        if: ${{ needs.bump-version.outputs.new_version }}
-        env:
-          VERSION: ${{ needs.bump-version.outputs.new_version }}
-        run: |
-          IFS='.' read -r -a VERSION_ARRAY <<< "${VERSION}"
-          MILESTONE="Gutenberg ${VERSION_ARRAY[0]}.${VERSION_ARRAY[1]}"
-          npm run changelog -- --milestone="$MILESTONE" --unreleased > release-notes.txt
-          sed -ie '1,6d' release-notes.txt
-          if [[ ${{ needs.bump-version.outputs.new_version }} != *"rc"* ]]; then
-            # Include previous RCs' release notes, if any
-            CHANGELOG_REGEX="=\s[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?\s="
-            RC_REGEX="=\s${VERSION}(-rc\.[0-9]+)?\s="
-            awk "/${RC_REGEX}/ {found=1;print;next} /${CHANGELOG_REGEX}/ {found=0} found" changelog.txt >> release-notes.txt
-          fi
-
-      - name: Upload release notes artifact
-        if: ${{ needs.bump-version.outputs.new_version }}
-        uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-        with:
-          name: release-notes
-          path: ./release-notes.txt
-
-  create-release:
-    name: Create Release Draft and Attach Asset
-    needs: [bump-version, build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set Release Version
-        id: get_release_version
-        env:
-          VERSION: ${{ needs.bump-version.outputs.new_version }}
-        run: echo ::set-output name=version::$(echo $VERSION | cut -d / -f 3 | sed 's/-rc./ RC/' )
-
-      - name: Download Plugin Zip Artifact
-        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
-        with:
-          name: gutenberg-plugin
-
-      - name: Download Release Notes Artifact
-        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
-        with:
-          name: release-notes
-
-      - name: Create Release Draft
-        id: create_release
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: "v${{ needs.bump-version.outputs.new_version }}"
-          release_name: ${{ steps.get_release_version.outputs.version }}
-          commitish: ${{ needs.bump-version.outputs.release_branch || github.ref }}
-          draft: true
-          prerelease: ${{ contains(needs.bump-version.outputs.new_version, 'rc') }}
-          body_path: release-notes.txt
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./gutenberg.zip
-          asset_name: gutenberg.zip
-          asset_content_type: application/zip
+            github.event_name == 'workflow_dispatch' &&
+            github.ref == 'refs/heads/trunk' && (
+              github.event.inputs.version == 'rc' ||
+              github.event.inputs.version == 'stable'
+            )
+        outputs:
+            old_version: ${{ steps.get_version.outputs.old_version }}
+            new_version: ${{ steps.get_version.outputs.new_version }}
+            release_branch: ${{ steps.get_version.outputs.release_branch }}
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  token: ${{ secrets.GUTENBERG_TOKEN }}
+
+            - name: Compute old and new version
+              id: get_version
+              run: |
+                  OLD_VERSION=$(jq --raw-output '.version' package.json)
+                  echo "::set-output name=old_version::$(echo $OLD_VERSION)"
+                  if [[ ${{ github.event.inputs.version }} == 'stable' ]]; then
+                    NEW_VERSION=$(npx semver $OLD_VERSION -i patch)
+                  else
+                    if [[ $OLD_VERSION == *"rc"* ]]; then
+                      NEW_VERSION=$(npx semver $OLD_VERSION -i prerelease)
+                    else
+                      # WordPress version guidelines: If minor is 9, bump major instead.
+                      IFS='.' read -r -a OLD_VERSION_ARRAY <<< "$OLD_VERSION"
+                      if [[ ${OLD_VERSION_ARRAY[1]} == "9" ]]; then
+                        NEW_VERSION="$(npx semver $OLD_VERSION -i major)-rc.1"
+                      else
+                        NEW_VERSION="$(npx semver $OLD_VERSION -i minor)-rc.1"
+                      fi
+                    fi
+                  fi
+                  echo "::set-output name=new_version::$(echo $NEW_VERSION)"
+                  IFS='.' read -r -a NEW_VERSION_ARRAY <<< "$NEW_VERSION"
+                  RELEASE_BRANCH="release/${NEW_VERSION_ARRAY[0]}.${NEW_VERSION_ARRAY[1]}"
+                  echo "::set-output name=release_branch::$(echo $RELEASE_BRANCH)"
+
+            - name: Configure git user name and email
+              run: |
+                  git config user.name "Gutenberg Repository Automation"
+                  git config user.email gutenberg@wordpress.org
+
+            - name: Create and switch to release branch
+              if: |
+                  github.event.inputs.version == 'rc' &&
+                  ! contains( steps.get_version.outputs.old_version, 'rc' )
+              run: git checkout -b "${{ steps.get_version.outputs.release_branch }}"
+
+            - name: Switch to release branch
+              if: |
+                  github.event.inputs.version == 'stable' ||
+                  contains( steps.get_version.outputs.old_version, 'rc' )
+              run: |
+                  git fetch --depth=1 origin "${{ steps.get_version.outputs.release_branch }}"
+                  git checkout "${{ steps.get_version.outputs.release_branch }}"
+
+            - name: Update plugin version
+              env:
+                  VERSION: ${{ steps.get_version.outputs.new_version }}
+              run: |
+                  cat <<< $(jq --tab --arg version "${VERSION}" '.version = $version' package.json) > package.json
+                  cat <<< $(jq --tab --arg version "${VERSION}" '.version = $version' package-lock.json) > package-lock.json
+                  sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" gutenberg.php
+                  sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" readme.txt
+
+            - name: Commit the version bump
+              run: |
+                  git add gutenberg.php package.json package-lock.json readme.txt
+                  git commit -m "Bump plugin version to ${{ steps.get_version.outputs.new_version }}"
+                  git push --set-upstream origin "${{ steps.get_version.outputs.release_branch }}"
+
+            - name: Cherry-pick to trunk
+              run: |
+                  git checkout trunk
+                  TRUNK_VERSION=$(jq --raw-output '.version' package.json)
+                  if [[ ${{ steps.get_version.outputs.old_version }} == "$TRUNK_VERSION" ]]; then
+                    git cherry-pick "${{ steps.get_version.outputs.release_branch }}"
+                    git push
+                  fi
+
+    build:
+        name: Build Release Artifact
+        runs-on: ubuntu-latest
+        needs: bump-version
+        if: always()
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Build Gutenberg plugin ZIP file
+              run: ./bin/build-plugin-zip.sh
+              env:
+                  NO_CHECKS: 'true'
+
+            - name: Upload artifact
+              uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              with:
+                  name: gutenberg-plugin
+                  path: ./gutenberg.zip
+
+            - name: Build release notes draft
+              if: ${{ needs.bump-version.outputs.new_version }}
+              env:
+                  VERSION: ${{ needs.bump-version.outputs.new_version }}
+              run: |
+                  IFS='.' read -r -a VERSION_ARRAY <<< "${VERSION}"
+                  MILESTONE="Gutenberg ${VERSION_ARRAY[0]}.${VERSION_ARRAY[1]}"
+                  npm run changelog -- --milestone="$MILESTONE" --unreleased > release-notes.txt
+                  sed -ie '1,6d' release-notes.txt
+                  if [[ ${{ needs.bump-version.outputs.new_version }} != *"rc"* ]]; then
+                    # Include previous RCs' release notes, if any
+                    CHANGELOG_REGEX="=\s[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?\s="
+                    RC_REGEX="=\s${VERSION}(-rc\.[0-9]+)?\s="
+                    awk "/${RC_REGEX}/ {found=1;print;next} /${CHANGELOG_REGEX}/ {found=0} found" changelog.txt >> release-notes.txt
+                  fi
+
+            - name: Upload release notes artifact
+              if: ${{ needs.bump-version.outputs.new_version }}
+              uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              with:
+                  name: release-notes
+                  path: ./release-notes.txt
+
+    create-release:
+        name: Create Release Draft and Attach Asset
+        needs: [bump-version, build]
+        runs-on: ubuntu-latest
+        steps:
+            - name: Set Release Version
+              id: get_release_version
+              env:
+                  VERSION: ${{ needs.bump-version.outputs.new_version }}
+              run: echo ::set-output name=version::$(echo $VERSION | cut -d / -f 3 | sed 's/-rc./ RC/' )
+
+            - name: Download Plugin Zip Artifact
+              uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
+              with:
+                  name: gutenberg-plugin
+
+            - name: Download Release Notes Artifact
+              uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
+              with:
+                  name: release-notes
+
+            - name: Create Release Draft
+              id: create_release
+              uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  tag_name: 'v${{ needs.bump-version.outputs.new_version }}'
+                  release_name: ${{ steps.get_release_version.outputs.version }}
+                  commitish: ${{ needs.bump-version.outputs.release_branch || github.ref }}
+                  draft: true
+                  prerelease: ${{ contains(needs.bump-version.outputs.new_version, 'rc') }}
+                  body_path: release-notes.txt
+
+            - name: Upload Release Asset
+              id: upload-release-asset
+              uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  upload_url: ${{ steps.create_release.outputs.upload_url }}
+                  asset_path: ./gutenberg.zip
+                  asset_name: gutenberg.zip
+                  asset_content_type: application/zip
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 1b85fa623e23fe..2253ff9941d23e 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -3,16 +3,16 @@ name: Compressed Size
 on: [pull_request]
 
 jobs:
-  build:
-    name: Check
-    runs-on: ubuntu-latest
+    build:
+        name: Check
+        runs-on: ubuntu-latest
 
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-      with:
-        fetch-depth: 1
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  fetch-depth: 1
 
-    - uses: preactjs/compressed-size-action@7d87f60a6b0c7d193b8183ce859ed00b356ea92f # v2.1.0
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        pattern: "{build/**/*.js,build/**/*.css}"
+            - uses: preactjs/compressed-size-action@7d87f60a6b0c7d193b8183ce859ed00b356ea92f # v2.1.0
+              with:
+                  repo-token: '${{ secrets.GITHUB_TOKEN }}'
+                  pattern: '{build/**/*.js,build/**/*.css}'
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
index 6c8cc20fe1135f..919a8a4691db8c 100644
--- a/.github/workflows/cancel.yml
+++ b/.github/workflows/cancel.yml
@@ -1,15 +1,15 @@
 name: Cancel
 on: pull_request
 jobs:
-  cancel:
-    name: 'Cancel Previous Runs'
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    steps:
-      - name: Get all workflow ids and set to env variable
-        run: echo "WORKFLOW_IDS_TO_CANCEL=$(curl https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows -s | jq -r '.workflows | map(.id|tostring) | join(",")')" >> $GITHUB_ENV
+    cancel:
+        name: 'Cancel Previous Runs'
+        runs-on: ubuntu-latest
+        timeout-minutes: 3
+        steps:
+            - name: Get all workflow ids and set to env variable
+              run: echo "WORKFLOW_IDS_TO_CANCEL=$(curl https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows -s | jq -r '.workflows | map(.id|tostring) | join(",")')" >> $GITHUB_ENV
 
-      - uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
-        with:
-          workflow_id: ${{ env.WORKFLOW_IDS_TO_CANCEL }}
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+            - uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
+              with:
+                  workflow_id: ${{ env.WORKFLOW_IDS_TO_CANCEL }}
+                  access_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/create-block.yml b/.github/workflows/create-block.yml
index e27b9a83686769..e2d76e14788da6 100644
--- a/.github/workflows/create-block.yml
+++ b/.github/workflows/create-block.yml
@@ -1,41 +1,41 @@
 name: Create Block
 
 on:
-  pull_request:
-  push:
-    branches: [trunk, wp/trunk]
+    pull_request:
+    push:
+        branches: [trunk, wp/trunk]
 
 jobs:
-  checks:
-    name: Checks
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [12, 14]
+    checks:
+        name: Checks
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                node: [12, 14]
 
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
 
-    - name: Use Node.js ${{ matrix.node }}.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: ${{ matrix.node }}
+            - name: Use Node.js ${{ matrix.node }}.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: ${{ matrix.node }}
 
-    - name: npm install, build, format and lint
-      run: |
-        npm ci
-        npm run test:create-block
+            - name: npm install, build, format and lint
+              run: |
+                  npm ci
+                  npm run test:create-block
diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
index 4d0bbe41c5b27f..6f4576b6cd37c5 100644
--- a/.github/workflows/end2end-test.yml
+++ b/.github/workflows/end2end-test.yml
@@ -1,63 +1,62 @@
 name: End-to-End Tests
 
 on:
-  pull_request:
-  push:
-    branches:
-      - trunk
-      - 'wp/**'
+    pull_request:
+    push:
+        branches:
+            - trunk
+            - 'wp/**'
 
 jobs:
-  admin:
-    name: Admin - ${{ matrix.part }}
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        part: [1, 2, 3, 4]
-
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: 14.x
-
-    - name: Npm install and build
-      run: |
-        npm ci
-        FORCE_REDUCED_MOTION=true npm run build
-
-    - name: Install WordPress
-      run: |
-        chmod -R 767 ./ # TODO: Possibly integrate in wp-env
-        npm run wp-env start
-
-    - name: Running the tests
-      run: |
-        $( npm bin )/wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --listTests > ~/.jest-e2e-tests
-        $( npm bin )/wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --cacheDirectory="$HOME/.jest-cache" --runTestsByPath $( awk 'NR % 4 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests )
-
-    - name: Archive debug artifacts (screenshots, HTML snapshots)
-      uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-      if: always()
-      with:
-        name: failures-artifacts
-        path: artifacts
+    admin:
+        name: Admin - ${{ matrix.part }}
+
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                part: [1, 2, 3, 4]
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Npm install and build
+              run: |
+                  npm ci
+                  FORCE_REDUCED_MOTION=true npm run build
+
+            - name: Install WordPress
+              run: |
+                  chmod -R 767 ./ # TODO: Possibly integrate in wp-env
+                  npm run wp-env start
+
+            - name: Running the tests
+              run: |
+                  $( npm bin )/wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --listTests > ~/.jest-e2e-tests
+                  $( npm bin )/wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --cacheDirectory="$HOME/.jest-cache" --runTestsByPath $( awk 'NR % 4 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests )
+
+            - name: Archive debug artifacts (screenshots, HTML snapshots)
+              uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              if: always()
+              with:
+                  name: failures-artifacts
+                  path: artifacts
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index e3adb12f173846..bf9fb39e4b065a 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -1,58 +1,56 @@
 name: Performances Tests
 
 on:
-  pull_request:
-  release:
-    types: [created]
+    pull_request:
+    release:
+        types: [created]
 
 jobs:
-  performance:
-    name: Run performance tests
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: 14.x
-
-    - name: Npm install
-      run: |
-        npm ci
-
-    - name: Compare performance with trunk
-      if: github.event_name == 'pull_request'
-      run: ./bin/plugin/cli.js perf --ci $GITHUB_SHA trunk --tests-branch $GITHUB_SHA
-
-    - name: Compare performance with current WordPress Core and previous Gutenberg versions
-      if: github.event_name == 'release'
-      env:
-        PLUGIN_VERSION: ${{ github.event.release.name }}
-      run: |
-        IFS='.' read -r -a PLUGIN_VERSION_ARRAY <<< "$PLUGIN_VERSION"
-        CURRENT_RELEASE_BRANCH="release/${PLUGIN_VERSION_ARRAY[0]}.${PLUGIN_VERSION_ARRAY[1]}"
-        PREVIOUS_VERSION_BASE_10=$(expr ${PLUGIN_VERSION_ARRAY[0]} \* 10 + ${PLUGIN_VERSION_ARRAY[1]} - 1)
-        PREVIOUS_RELEASE_BRANCH="release/$(expr $PREVIOUS_VERSION_BASE_10 / 10).$(expr $PREVIOUS_VERSION_BASE_10 % 10)"
-        TESTED_UP_TO_REGEX="Tested up to: \K([0-9]+)\.([0-9]+)\.?([0-9]?)"
-        WP_VERSION=$(grep -oP "$TESTED_UP_TO_REGEX" ./readme.txt)
-        IFS='.' read -r -a WP_VERSION_ARRAY <<< "$WP_VERSION"
-        WP_BRANCH="wp/${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
-        ./bin/plugin/cli.js perf --ci $WP_BRANCH $PREVIOUS_RELEASE_BRANCH $CURRENT_RELEASE_BRANCH
-
-
+    performance:
+        name: Run performance tests
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Npm install
+              run: |
+                  npm ci
+
+            - name: Compare performance with trunk
+              if: github.event_name == 'pull_request'
+              run: ./bin/plugin/cli.js perf --ci $GITHUB_SHA trunk --tests-branch $GITHUB_SHA
+
+            - name: Compare performance with current WordPress Core and previous Gutenberg versions
+              if: github.event_name == 'release'
+              env:
+                  PLUGIN_VERSION: ${{ github.event.release.name }}
+              run: |
+                  IFS='.' read -r -a PLUGIN_VERSION_ARRAY <<< "$PLUGIN_VERSION"
+                  CURRENT_RELEASE_BRANCH="release/${PLUGIN_VERSION_ARRAY[0]}.${PLUGIN_VERSION_ARRAY[1]}"
+                  PREVIOUS_VERSION_BASE_10=$(expr ${PLUGIN_VERSION_ARRAY[0]} \* 10 + ${PLUGIN_VERSION_ARRAY[1]} - 1)
+                  PREVIOUS_RELEASE_BRANCH="release/$(expr $PREVIOUS_VERSION_BASE_10 / 10).$(expr $PREVIOUS_VERSION_BASE_10 % 10)"
+                  TESTED_UP_TO_REGEX="Tested up to: \K([0-9]+)\.([0-9]+)\.?([0-9]?)"
+                  WP_VERSION=$(grep -oP "$TESTED_UP_TO_REGEX" ./readme.txt)
+                  IFS='.' read -r -a WP_VERSION_ARRAY <<< "$WP_VERSION"
+                  WP_BRANCH="wp/${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
+                  ./bin/plugin/cli.js perf --ci $WP_BRANCH $PREVIOUS_RELEASE_BRANCH $CURRENT_RELEASE_BRANCH
diff --git a/.github/workflows/pull-request-automation.yml b/.github/workflows/pull-request-automation.yml
index b3fe89023d2bf3..f97e9c28ec7e90 100644
--- a/.github/workflows/pull-request-automation.yml
+++ b/.github/workflows/pull-request-automation.yml
@@ -1,23 +1,23 @@
 on:
-  pull_request_target:
-    types: [opened]
-  push:
+    pull_request_target:
+        types: [opened]
+    push:
 name: Pull request automation
 
 jobs:
-  pull-request-automation:
-    runs-on: ubuntu-latest
-    steps:
-    # Checkout defaults to using the branch which triggered the event, which
-    # isn't necessarily `trunk` (e.g. in the case of a merge).
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-      with:
-        ref: trunk
+    pull-request-automation:
+        runs-on: ubuntu-latest
+        steps:
+            # Checkout defaults to using the branch which triggered the event, which
+            # isn't necessarily `trunk` (e.g. in the case of a merge).
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  ref: trunk
 
-    # Changing into the action's directory and running `npm install` is much
-    # faster than a full project-wide `npm ci`.
-    - run: cd packages/project-management-automation && npm install
+            # Changing into the action's directory and running `npm install` is much
+            # faster than a full project-wide `npm ci`.
+            - run: cd packages/project-management-automation && npm install
 
-    - uses: ./packages/project-management-automation
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+            - uses: ./packages/project-management-automation
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rnmobile-android-runner.yml b/.github/workflows/rnmobile-android-runner.yml
index 384cfaf5de5a06..74b722c70fcbb4 100644
--- a/.github/workflows/rnmobile-android-runner.yml
+++ b/.github/workflows/rnmobile-android-runner.yml
@@ -1,54 +1,52 @@
 name: React Native E2E Tests (Android)
 
 on:
-  pull_request:
-  push:
-    branches: [trunk]
+    pull_request:
+    push:
+        branches: [trunk]
 
 jobs:
-  test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        native-test-name: [
-          gutenberg-editor-initial-html
-        ]
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Restore npm cache
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-npm-
-
-    - run: npm ci
-
-    - name: Restore Gradle cache
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
-
-    - uses: reactivecircus/android-emulator-runner@d2799957d660add41c61a5103e2fbb9e2889eb73 # v2.15.0
-      with:
-        api-level: 28
-        profile: pixel_xl
-        script: npm run native test:e2e:android:local ${{ matrix.native-test-name }}
-
-    - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-      if: always()
-      with:
-        name: android-screen-recordings
-        path: packages/react-native-editor/android-screen-recordings
-
-    - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-      if: always()
-      with:
-        name: appium-logs
-        path: packages/react-native-editor/appium-out.log
+    test:
+        runs-on: macos-latest
+        strategy:
+            matrix:
+                native-test-name: [gutenberg-editor-initial-html]
+
+        steps:
+            - name: checkout
+              uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Restore npm cache
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              with:
+                  path: ~/.npm
+                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-npm-
+
+            - run: npm ci
+
+            - name: Restore Gradle cache
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+                  restore-keys: ${{ runner.os }}-gradle
+
+            - uses: reactivecircus/android-emulator-runner@d2799957d660add41c61a5103e2fbb9e2889eb73 # v2.15.0
+              with:
+                  api-level: 28
+                  profile: pixel_xl
+                  script: npm run native test:e2e:android:local ${{ matrix.native-test-name }}
+
+            - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              if: always()
+              with:
+                  name: android-screen-recordings
+                  path: packages/react-native-editor/android-screen-recordings
+
+            - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              if: always()
+              with:
+                  name: appium-logs
+                  path: packages/react-native-editor/appium-out.log
diff --git a/.github/workflows/rnmobile-ios-runner.yml b/.github/workflows/rnmobile-ios-runner.yml
index c05bbb42da10a3..1f178df8a6b21b 100644
--- a/.github/workflows/rnmobile-ios-runner.yml
+++ b/.github/workflows/rnmobile-ios-runner.yml
@@ -1,85 +1,83 @@
 name: React Native E2E Tests (iOS)
 
 on:
-  pull_request:
-  push:
-    branches: [trunk]
+    pull_request:
+    push:
+        branches: [trunk]
 
 jobs:
-  test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        xcode: [12.2]
-        native-test-name: [
-          gutenberg-editor-initial-html
-        ]
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Restore npm cache
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-npm-
-
-    - run: npm ci
-
-    - name: Prepare build cache key
-      run: find package-lock.json packages/react-native-editor/ios packages/react-native-aztec/ios packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
-
-    - name: Restore build cache
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      with:
-        path: |
-          packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app
-          packages/react-native-editor/ios/build/WDA
-        key: ${{ runner.os }}-ios-build-${{ matrix.xcode }}-${{ hashFiles('ios-checksums.txt') }}
-
-    - name: Restore pods cache
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      with:
-        path: |
-          packages/react-native-editor/ios/Pods
-          ~/Library/Caches/CocoaPods
-          ~/.cocoapods/repos/trunk
-          packages/react-native-editor/ios/vendor
-        key: ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-${{ hashFiles('package-lock.json') }}
-          ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-
-          ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-
-          ${{ runner.os }}-pods-
-
-    - name: Bundle iOS
-      run: npm run native test:e2e:bundle:ios
-
-    - name: Switch Xcode version to ${{ matrix.xcode }}
-      run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
-
-    - name: Build (if needed)
-      run: test -e packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/GutenbergDemo || npm run native test:e2e:build-app:ios
-
-    - name: Build Web Driver Agent (if needed)
-      run: test -d packages/react-native-editor/ios/build/WDA || npm run native test:e2e:build-wda
-
-    - name: Run iOS Device Tests
-      run: TEST_RN_PLATFORM=ios npm run native device-tests:local  ${{ matrix.native-test-name }}
-
-    - name: Prepare build cache
-      run: rm packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
-
-    - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-      if: always()
-      with:
-        name: ios-screen-recordings
-        path: packages/react-native-editor/ios-screen-recordings
-
-    - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-      if: always()
-      with:
-        name: appium-logs
-        path: packages/react-native-editor/appium-out.log
+    test:
+        runs-on: macos-latest
+        strategy:
+            matrix:
+                xcode: [12.2]
+                native-test-name: [gutenberg-editor-initial-html]
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Restore npm cache
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              with:
+                  path: ~/.npm
+                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-npm-
+
+            - run: npm ci
+
+            - name: Prepare build cache key
+              run: find package-lock.json packages/react-native-editor/ios packages/react-native-aztec/ios packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
+
+            - name: Restore build cache
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              with:
+                  path: |
+                      packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app
+                      packages/react-native-editor/ios/build/WDA
+                  key: ${{ runner.os }}-ios-build-${{ matrix.xcode }}-${{ hashFiles('ios-checksums.txt') }}
+
+            - name: Restore pods cache
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              with:
+                  path: |
+                      packages/react-native-editor/ios/Pods
+                      ~/Library/Caches/CocoaPods
+                      ~/.cocoapods/repos/trunk
+                      packages/react-native-editor/ios/vendor
+                  key: ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-${{ hashFiles('package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-${{ hashFiles('package-lock.json') }}
+                      ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-${{ hashFiles('packages/react-native-editor/ios/Podfile.lock') }}-
+                      ${{ runner.os }}-pods-${{ hashFiles('packages/react-native-editor/ios/Gemfile.lock') }}-
+                      ${{ runner.os }}-pods-
+
+            - name: Bundle iOS
+              run: npm run native test:e2e:bundle:ios
+
+            - name: Switch Xcode version to ${{ matrix.xcode }}
+              run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
+
+            - name: Build (if needed)
+              run: test -e packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/GutenbergDemo || npm run native test:e2e:build-app:ios
+
+            - name: Build Web Driver Agent (if needed)
+              run: test -d packages/react-native-editor/ios/build/WDA || npm run native test:e2e:build-wda
+
+            - name: Run iOS Device Tests
+              run: TEST_RN_PLATFORM=ios npm run native device-tests:local  ${{ matrix.native-test-name }}
+
+            - name: Prepare build cache
+              run: rm packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
+
+            - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              if: always()
+              with:
+                  name: ios-screen-recordings
+                  path: packages/react-native-editor/ios-screen-recordings
+
+            - uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              if: always()
+              with:
+                  name: appium-logs
+                  path: packages/react-native-editor/appium-out.log
diff --git a/.github/workflows/stale-issue-add-needs-testing.yml b/.github/workflows/stale-issue-add-needs-testing.yml
index a963f97287939e..e17bfa7b295670 100644
--- a/.github/workflows/stale-issue-add-needs-testing.yml
+++ b/.github/workflows/stale-issue-add-needs-testing.yml
@@ -1,17 +1,17 @@
-name: "Mark old issues as needs confirmation"
+name: 'Mark old issues as needs confirmation'
 on:
-  schedule:
-  - cron: "45 1 * * *"
+    schedule:
+        - cron: '45 1 * * *'
 
 jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: "Hi,\nThis issue has gone 180 days without any activity. This means it is time for a check-in to make sure it is still relevant. If you are still experiencing this issue with the latest versions, you can help the project by responding to confirm the problem and by providing any updated reproduction steps.\nThanks for helping out."
-        days-before-stale: 180
-        days-before-close: -1
-        remove-stale-when-updated: false
-        stale-issue-label: 'Needs Testing'
+    stale:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  stale-issue-message: "Hi,\nThis issue has gone 180 days without any activity. This means it is time for a check-in to make sure it is still relevant. If you are still experiencing this issue with the latest versions, you can help the project by responding to confirm the problem and by providing any updated reproduction steps.\nThanks for helping out."
+                  days-before-stale: 180
+                  days-before-close: -1
+                  remove-stale-when-updated: false
+                  stale-issue-label: 'Needs Testing'
diff --git a/.github/workflows/stale-issue-mark-stale.yml b/.github/workflows/stale-issue-mark-stale.yml
index 91d29cccedbe8f..983b62c1e07005 100644
--- a/.github/workflows/stale-issue-mark-stale.yml
+++ b/.github/workflows/stale-issue-mark-stale.yml
@@ -1,17 +1,17 @@
-name: "Mark issues stale after needs testing for 30 days"
+name: 'Mark issues stale after needs testing for 30 days'
 on:
-  schedule:
-  - cron: "55 1 * * *"
+    schedule:
+        - cron: '55 1 * * *'
 
 jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 30
-        days-before-close: -1
-        only-labels: 'Needs Testing'
-        skip-stale-issue-message: true
-        stale-issue-label: '[Status] Stale'
+    stale:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  days-before-stale: 30
+                  days-before-close: -1
+                  only-labels: 'Needs Testing'
+                  skip-stale-issue-message: true
+                  stale-issue-label: '[Status] Stale'
diff --git a/.github/workflows/stale-issue-needs-info.yml b/.github/workflows/stale-issue-needs-info.yml
index 7dede45c224ed4..c0f3e4ed6bec62 100644
--- a/.github/workflows/stale-issue-needs-info.yml
+++ b/.github/workflows/stale-issue-needs-info.yml
@@ -1,17 +1,17 @@
-name: "Mark issues stale that require info"
+name: 'Mark issues stale that require info'
 on:
-  schedule:
-  - cron: "30 1 * * *"
+    schedule:
+        - cron: '30 1 * * *'
 
 jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Help us move this issue forward. This issue is being marked stale since it has no activity after 15 days of requesting more information. Please add info requested so we can help move the issue forward. Note: The triage policy is to close stale issues that need more info and no response after 2 weeks.'
-        days-before-stale: 15
-        days-before-close: -1
-        only-labels: '[Status] Needs More Info'
-        stale-issue-label: '[Status] Stale'
+    stale:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  stale-issue-message: 'Help us move this issue forward. This issue is being marked stale since it has no activity after 15 days of requesting more information. Please add info requested so we can help move the issue forward. Note: The triage policy is to close stale issues that need more info and no response after 2 weeks.'
+                  days-before-stale: 15
+                  days-before-close: -1
+                  only-labels: '[Status] Needs More Info'
+                  stale-issue-label: '[Status] Stale'
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index ad10daa5a167fb..4264af972e028d 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -1,59 +1,59 @@
 name: Static Analysis (Linting, License, Type checks...)
 
 on:
-  pull_request:
-  push:
-    branches:
-      - trunk
-      - 'wp/**'
+    pull_request:
+    push:
+        branches:
+            - trunk
+            - 'wp/**'
 
 jobs:
-  check:
-    name: All
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: 14.x
-
-    - name: Npm install and build
-      # A "full" install is executed, since `npm ci` does not always exit
-      # with an error status code if the lock file is inaccurate.
-      #
-      # See: https://github.com/WordPress/gutenberg/issues/16157
-      run: |
-        npm install
-        npm run build
-
-    - name: Lint JavaScript and Styles
-      run: npm run lint
-
-    - name: Lint ES5 built files (IE11)
-      run: npx eslint --parser-options=ecmaVersion:5 --no-eslintrc --no-ignore ./build/**/*.js
-
-    - name: Type checking
-      run: npm run build:package-types
-
-    - name: Build artifacts
-      run: npm run check-local-changes
-
-    - name: License compatibility
-      run: npm run check-licenses
+    check:
+        name: All
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Npm install and build
+              # A "full" install is executed, since `npm ci` does not always exit
+              # with an error status code if the lock file is inaccurate.
+              #
+              # See: https://github.com/WordPress/gutenberg/issues/16157
+              run: |
+                  npm install
+                  npm run build
+
+            - name: Lint JavaScript and Styles
+              run: npm run lint
+
+            - name: Lint ES5 built files (IE11)
+              run: npx eslint --parser-options=ecmaVersion:5 --no-eslintrc --no-ignore ./build/**/*.js
+
+            - name: Type checking
+              run: npm run build:package-types
+
+            - name: Build artifacts
+              run: npm run check-local-changes
+
+            - name: License compatibility
+              run: npm run check-licenses
diff --git a/.github/workflows/storybook-pages.yml b/.github/workflows/storybook-pages.yml
index 5ea64c67899344..d717c1cf58c3a6 100644
--- a/.github/workflows/storybook-pages.yml
+++ b/.github/workflows/storybook-pages.yml
@@ -1,45 +1,45 @@
 name: Storybook GitHub Pages
 
 on:
-  push:
-    branches:
-      - trunk
+    push:
+        branches:
+            - trunk
 
 jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-      with:
-        ref: trunk
+    deploy:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  ref: trunk
 
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
 
-    - name: Setup Node
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: '14.x'
+            - name: Setup Node
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: '14.x'
 
-    - name: Install Dependencies
-      run: npm ci
+            - name: Install Dependencies
+              run: npm ci
 
-    - name: Build Storybook
-      run: npm run storybook:build
+            - name: Build Storybook
+              run: npm run storybook:build
 
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501 # v3.7.3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./storybook/build
+            - name: Deploy
+              uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501 # v3.7.3
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  publish_dir: ./storybook/build
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index a5ccf320fbef50..a14504275a7809 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -3,137 +3,136 @@ name: Unit Tests
 # Since Unit Tests are required to pass for each PR,
 # we cannot disable them for documentation-only changes.
 on:
-  pull_request:
-  push:
-    branches:
-      - trunk
-      - 'wp/**'
+    pull_request:
+    push:
+        branches:
+            - trunk
+            - 'wp/**'
 
 jobs:
-  unit-js:
-    name: JavaScript
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [12, 14]
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js ${{ matrix.node }}.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: ${{ matrix.node }}
-
-    - name: Npm install and build
-      # It's not necessary to run the full build, since Jest can interpret
-      # source files with `babel-jest`. Some packages have their own custom
-      # build tasks, however. These must be run.
-      run: |
-        npm ci
-        npx lerna run build
-
-    - name: Running the tests
-      run: npm run test-unit -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
-
-    - name: Running the date tests
-      run: npm run test-unit:date -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
-
-  unit-php:
-    name: PHP
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: 14.x
-
-    - name: Npm install and build
-      run: |
-        npm ci
-        npm run build
-
-    - name: Install WordPress
-      run: |
-        chmod -R 767 ./ # TODO: Possibly integrate in wp-env
-        npm run wp-env start
-
-    - name: Running lint check
-      run: npm run lint-php
-
-    - name: Running single site unit tests
-      run: npm run test-unit-php
-      if: ${{ success() || failure() }}
-
-    - name: Running multisite unit tests
-      run: npm run test-unit-php-multisite
-      if: ${{ success() || failure() }}
-
-
-  mobile-unit-js:
-    name: Mobile
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-
-    - name: Cache node modules
-      uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-      with:
-        node-version: 14.x
-
-    - name: Npm install and build
-      # It's not necessary to run the full build, since Jest can interpret
-      # source files with `babel-jest`. Some packages have their own custom
-      # build tasks, however. These must be run.
-      run: |
-        npm ci
-        npx lerna run build
-
-    - name: Running the tests
-      run: npm run test-unit:native -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+    unit-js:
+        name: JavaScript
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                node: [12, 14]
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js ${{ matrix.node }}.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: ${{ matrix.node }}
+
+            - name: Npm install and build
+              # It's not necessary to run the full build, since Jest can interpret
+              # source files with `babel-jest`. Some packages have their own custom
+              # build tasks, however. These must be run.
+              run: |
+                  npm ci
+                  npx lerna run build
+
+            - name: Running the tests
+              run: npm run test-unit -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+
+            - name: Running the date tests
+              run: npm run test-unit:date -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+
+    unit-php:
+        name: PHP
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Npm install and build
+              run: |
+                  npm ci
+                  npm run build
+
+            - name: Install WordPress
+              run: |
+                  chmod -R 767 ./ # TODO: Possibly integrate in wp-env
+                  npm run wp-env start
+
+            - name: Running lint check
+              run: npm run lint-php
+
+            - name: Running single site unit tests
+              run: npm run test-unit-php
+              if: ${{ success() || failure() }}
+
+            - name: Running multisite unit tests
+              run: npm run test-unit-php-multisite
+              if: ${{ success() || failure() }}
+
+    mobile-unit-js:
+        name: Mobile
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+            - name: Cache node modules
+              uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+              env:
+                  cache-name: cache-node-modules
+              with:
+                  # npm cache files are stored in `~/.npm` on Linux/macOS
+                  path: ~/.npm
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                  node-version: 14.x
+
+            - name: Npm install and build
+              # It's not necessary to run the full build, since Jest can interpret
+              # source files with `babel-jest`. Some packages have their own custom
+              # build tasks, however. These must be run.
+              run: |
+                  npm ci
+                  npx lerna run build
+
+            - name: Running the tests
+              run: npm run test-unit:native -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
diff --git a/.github/workflows/upload-release-to-plugin-repo.yml b/.github/workflows/upload-release-to-plugin-repo.yml
index 0f77e22b1844eb..e0997cd45ee58a 100644
--- a/.github/workflows/upload-release-to-plugin-repo.yml
+++ b/.github/workflows/upload-release-to-plugin-repo.yml
@@ -1,154 +1,154 @@
 name: Update Changelog and upload Gutenberg plugin to WordPress.org plugin repo
 
 on:
-  release:
-    types: [published]
+    release:
+        types: [published]
 
 jobs:
-  get-release-branch:
-    name: Get release branch name
-    runs-on: ubuntu-latest
-    if: github.event.release.assets[0]
-    outputs:
-      release_branch: ${{ steps.get_release_branch.outputs.release_branch }}
-    steps:
-    - name: Compute release branch name
-      id: get_release_branch
-      env:
-        TAG: ${{ github.event.release.tag_name }}
-      run: |
-        IFS='.' read -r -a VERSION_ARRAY <<< "${TAG#v}"
-        RELEASE_BRANCH="release/${VERSION_ARRAY[0]}.${VERSION_ARRAY[1]}"
-        echo "::set-output name=release_branch::$(echo $RELEASE_BRANCH)"
-
-  update-changelog:
-    name: Update Changelog on ${{ matrix.branch }} branch
-    runs-on: ubuntu-latest
-    if: github.event.release.assets[0]
-    needs: get-release-branch
-    env:
-      TAG: ${{ github.event.release.tag_name }}
-    strategy:
-      matrix:
-       include:
-        - branch: trunk
-          label: trunk
-        - branch: ${{ needs.get-release-branch.outputs.release_branch }}
-          label: release
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-        with:
-          ref: ${{ matrix.branch }}
-          token: ${{ secrets.GUTENBERG_TOKEN }}
-
-      - name: Update the Changelog to include the release notes
-        run: |
-          # First, determine where to insert the new Changelog entry.
-          SERIES="${RELEASE_BRANCH#release/}"
-          SERIES_REGEX="=\s${SERIES}\.[0-9]+\s="
-          CUT_MARKS=$( grep -nP -m 1 "${SERIES_REGEX}" changelog.txt | cut -d: -f1 )
-          if [[ -z "${CUT_MARKS}" ]]; then
-            CHANGELOG_REGEX="=\s[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?\s="
-            RC_REGEX="=\s${TAG#v}(-rc\.[0-9]+)?\s="
-            CUT_MARKS=$( awk "/${RC_REGEX}/ {print NR; next}; /${CHANGELOG_REGEX}/ {print NR; exit}" changelog.txt )
-          fi
-          BEFORE=$( echo "$CUT_MARKS" | head -n 1 )
-          AFTER=$( echo "$CUT_MARKS" | tail -n 1 )
-          # Okay, we have all we need to build the new Changelog.
-          head -n $(( "${BEFORE}" - 1 )) changelog.txt > new_changelog.txt
-          printf '= %s =\n\n' "${TAG#v}" >> new_changelog.txt
-          # Need to use a heredoc in order to preserve special characters.
-          cat <<- "EOF" > release_notes.txt
-          ${{ github.event.release.body }}
-          EOF
-          # Normalize empty lines: Trim them from beginning and end of file...
-          awk 'NF {p=1} p' <<< "$(< release_notes.txt)" >> new_changelog.txt
-          # ...then add two empty lines at the end.
-          printf '\n\n' >> new_changelog.txt
-          tail -n +"${AFTER}" changelog.txt >> new_changelog.txt
-          mv new_changelog.txt changelog.txt
-
-      - name: Configure git user name and email
-        run: |
-          git config user.name "Gutenberg Repository Automation"
-          git config user.email gutenberg@wordpress.org
-
-      - name: Commit the Changelog update
-        run: |
-          git add changelog.txt
-          git commit -m "Update Changelog for ${TAG#v}"
-          git push --set-upstream origin "${{ matrix.branch }}"
-
-      - name: Upload Changelog artifact
-        uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
-        with:
-          name: changelog ${{ matrix.label }}
-          path: ./changelog.txt
-
-  upload:
-    name: Upload Gutenberg Plugin
-    runs-on: ubuntu-latest
-    environment: wp.org plugin
-    needs: update-changelog
-    if: ${{ !github.event.release.prerelease && github.event.release.assets[0] }}
-    env:
-      PLUGIN_REPO_URL: 'https://plugins.svn.wordpress.org/gutenberg'
-      STABLE_VERSION_REGEX: '[0-9]\+\.[0-9]\+\.[0-9]\+\s*'
-      SVN_USERNAME: ${{ secrets.svn_username }}
-      SVN_PASSWORD: ${{ secrets.svn_password }}
-      VERSION: ${{ github.event.release.name }}
-    steps:
-      - name: Check out Gutenberg trunk from WP.org plugin repo
-        run: svn checkout "$PLUGIN_REPO_URL/trunk"
-
-      - name: Get previous stable version
-        id: get_previous_stable_version
+    get-release-branch:
+        name: Get release branch name
+        runs-on: ubuntu-latest
+        if: github.event.release.assets[0]
+        outputs:
+            release_branch: ${{ steps.get_release_branch.outputs.release_branch }}
+        steps:
+            - name: Compute release branch name
+              id: get_release_branch
+              env:
+                  TAG: ${{ github.event.release.tag_name }}
+              run: |
+                  IFS='.' read -r -a VERSION_ARRAY <<< "${TAG#v}"
+                  RELEASE_BRANCH="release/${VERSION_ARRAY[0]}.${VERSION_ARRAY[1]}"
+                  echo "::set-output name=release_branch::$(echo $RELEASE_BRANCH)"
+
+    update-changelog:
+        name: Update Changelog on ${{ matrix.branch }} branch
+        runs-on: ubuntu-latest
+        if: github.event.release.assets[0]
+        needs: get-release-branch
         env:
-          STABLE_TAG_REGEX: 'Stable tag: \K${{ env.STABLE_VERSION_REGEX }}'
-        run: echo ::set-output name=stable_version::$(grep -oP "${STABLE_TAG_REGEX}" ./trunk/readme.txt)
-
-      - name: Delete everything
-        working-directory: ./trunk
-        run: find . -maxdepth 1 -not -name ".svn" -not -name "." -not -name ".." -exec rm -rf {} +
-
-      - name: Download and unzip Gutenberg plugin asset into trunk folder
-        env:
-          PLUGIN_URL: ${{ github.event.release.assets[0].browser_download_url }}
-        run: |
-          curl -L -o gutenberg.zip $PLUGIN_URL
-          unzip gutenberg.zip -d trunk
-          rm gutenberg.zip
-
-      - name: Replace the stable tag placeholder with the existing stable tag on the SVN repository
+            TAG: ${{ github.event.release.tag_name }}
+        strategy:
+            matrix:
+                include:
+                    - branch: trunk
+                      label: trunk
+                    - branch: ${{ needs.get-release-branch.outputs.release_branch }}
+                      label: release
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+              with:
+                  ref: ${{ matrix.branch }}
+                  token: ${{ secrets.GUTENBERG_TOKEN }}
+
+            - name: Update the Changelog to include the release notes
+              run: |
+                  # First, determine where to insert the new Changelog entry.
+                  SERIES="${RELEASE_BRANCH#release/}"
+                  SERIES_REGEX="=\s${SERIES}\.[0-9]+\s="
+                  CUT_MARKS=$( grep -nP -m 1 "${SERIES_REGEX}" changelog.txt | cut -d: -f1 )
+                  if [[ -z "${CUT_MARKS}" ]]; then
+                    CHANGELOG_REGEX="=\s[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?\s="
+                    RC_REGEX="=\s${TAG#v}(-rc\.[0-9]+)?\s="
+                    CUT_MARKS=$( awk "/${RC_REGEX}/ {print NR; next}; /${CHANGELOG_REGEX}/ {print NR; exit}" changelog.txt )
+                  fi
+                  BEFORE=$( echo "$CUT_MARKS" | head -n 1 )
+                  AFTER=$( echo "$CUT_MARKS" | tail -n 1 )
+                  # Okay, we have all we need to build the new Changelog.
+                  head -n $(( "${BEFORE}" - 1 )) changelog.txt > new_changelog.txt
+                  printf '= %s =\n\n' "${TAG#v}" >> new_changelog.txt
+                  # Need to use a heredoc in order to preserve special characters.
+                  cat <<- "EOF" > release_notes.txt
+                  ${{ github.event.release.body }}
+                  EOF
+                  # Normalize empty lines: Trim them from beginning and end of file...
+                  awk 'NF {p=1} p' <<< "$(< release_notes.txt)" >> new_changelog.txt
+                  # ...then add two empty lines at the end.
+                  printf '\n\n' >> new_changelog.txt
+                  tail -n +"${AFTER}" changelog.txt >> new_changelog.txt
+                  mv new_changelog.txt changelog.txt
+
+            - name: Configure git user name and email
+              run: |
+                  git config user.name "Gutenberg Repository Automation"
+                  git config user.email gutenberg@wordpress.org
+
+            - name: Commit the Changelog update
+              run: |
+                  git add changelog.txt
+                  git commit -m "Update Changelog for ${TAG#v}"
+                  git push --set-upstream origin "${{ matrix.branch }}"
+
+            - name: Upload Changelog artifact
+              uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
+              with:
+                  name: changelog ${{ matrix.label }}
+                  path: ./changelog.txt
+
+    upload:
+        name: Upload Gutenberg Plugin
+        runs-on: ubuntu-latest
+        environment: wp.org plugin
+        needs: update-changelog
+        if: ${{ !github.event.release.prerelease && github.event.release.assets[0] }}
         env:
-          STABLE_TAG_PLACEHOLDER: 'Stable tag: V\.V\.V'
-          STABLE_TAG: 'Stable tag: ${{ steps.get_previous_stable_version.outputs.stable_version }}'
-        run: sed -i "s/${STABLE_TAG_PLACEHOLDER}/${STABLE_TAG}/g" ./trunk/readme.txt
-
-      - name: Download Changelog Artifact
-        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
-        with:
-          name: changelog trunk
-          path: trunk
-
-      - name: Commit the content changes
-        working-directory: ./trunk
-        run: |
-          svn st | grep '^?' | awk '{print $2}' | xargs -r svn add
-          svn st | grep '^!' | awk '{print $2}' | xargs -r svn rm
-          svn commit -m "Committing version $VERSION" \
-           --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
-
-      - name: Create the SVN tag
-        working-directory: ./trunk
-        run: |
-          svn copy "$PLUGIN_REPO_URL/trunk" "$PLUGIN_REPO_URL/tags/$VERSION" -m "Tagging version $VERSION" \
-           --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
-
-      - name: Update the plugin's stable version
-        working-directory: ./trunk
-        run: |
-          sed -i "s/Stable tag: ${STABLE_VERSION_REGEX}/Stable tag: ${VERSION}/g" ./readme.txt
-          svn commit -m "Releasing version $VERSION" \
-           --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
+            PLUGIN_REPO_URL: 'https://plugins.svn.wordpress.org/gutenberg'
+            STABLE_VERSION_REGEX: '[0-9]\+\.[0-9]\+\.[0-9]\+\s*'
+            SVN_USERNAME: ${{ secrets.svn_username }}
+            SVN_PASSWORD: ${{ secrets.svn_password }}
+            VERSION: ${{ github.event.release.name }}
+        steps:
+            - name: Check out Gutenberg trunk from WP.org plugin repo
+              run: svn checkout "$PLUGIN_REPO_URL/trunk"
+
+            - name: Get previous stable version
+              id: get_previous_stable_version
+              env:
+                  STABLE_TAG_REGEX: 'Stable tag: \K${{ env.STABLE_VERSION_REGEX }}'
+              run: echo ::set-output name=stable_version::$(grep -oP "${STABLE_TAG_REGEX}" ./trunk/readme.txt)
+
+            - name: Delete everything
+              working-directory: ./trunk
+              run: find . -maxdepth 1 -not -name ".svn" -not -name "." -not -name ".." -exec rm -rf {} +
+
+            - name: Download and unzip Gutenberg plugin asset into trunk folder
+              env:
+                  PLUGIN_URL: ${{ github.event.release.assets[0].browser_download_url }}
+              run: |
+                  curl -L -o gutenberg.zip $PLUGIN_URL
+                  unzip gutenberg.zip -d trunk
+                  rm gutenberg.zip
+
+            - name: Replace the stable tag placeholder with the existing stable tag on the SVN repository
+              env:
+                  STABLE_TAG_PLACEHOLDER: 'Stable tag: V\.V\.V'
+                  STABLE_TAG: 'Stable tag: ${{ steps.get_previous_stable_version.outputs.stable_version }}'
+              run: sed -i "s/${STABLE_TAG_PLACEHOLDER}/${STABLE_TAG}/g" ./trunk/readme.txt
+
+            - name: Download Changelog Artifact
+              uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
+              with:
+                  name: changelog trunk
+                  path: trunk
+
+            - name: Commit the content changes
+              working-directory: ./trunk
+              run: |
+                  svn st | grep '^?' | awk '{print $2}' | xargs -r svn add
+                  svn st | grep '^!' | awk '{print $2}' | xargs -r svn rm
+                  svn commit -m "Committing version $VERSION" \
+                   --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
+
+            - name: Create the SVN tag
+              working-directory: ./trunk
+              run: |
+                  svn copy "$PLUGIN_REPO_URL/trunk" "$PLUGIN_REPO_URL/tags/$VERSION" -m "Tagging version $VERSION" \
+                   --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
+
+            - name: Update the plugin's stable version
+              working-directory: ./trunk
+              run: |
+                  sed -i "s/Stable tag: ${STABLE_VERSION_REGEX}/Stable tag: ${VERSION}/g" ./readme.txt
+                  svn commit -m "Releasing version $VERSION" \
+                   --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
diff --git a/packages/project-management-automation/action.yml b/packages/project-management-automation/action.yml
index c5cd00678edd4d..34490f539875cc 100644
--- a/packages/project-management-automation/action.yml
+++ b/packages/project-management-automation/action.yml
@@ -1,10 +1,10 @@
 name: Gutenberg project management automation
 description: >
-  Various automation to assist with managing the Gutenberg GitHub repository.
+    Various automation to assist with managing the Gutenberg GitHub repository.
 inputs:
-  github_token:
-    description: Secret GitHub API token to use for making API requests.
-    required: true
+    github_token:
+        description: Secret GitHub API token to use for making API requests.
+        required: true
 runs:
-  using: node12
-  main: lib/index.js
+    using: node12
+    main: lib/index.js

From 0ae0aea0902340bd68b82a0c878676ba7bc3a5f8 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Thu, 1 Apr 2021 09:03:42 +1100
Subject: [PATCH 18/53] Widgets Customizer: Add Legacy Widget block (#30321)

* Widgets Customizer: Enable Legacy Widget block

Wires up the Legacy Widget block to the Widgets Customizer.

* Widgets Customizer: Remove __unstable_instance in lieu of raw_instance.

Removes __unstable_instance from the instance object returned by the
Customizer and instead add raw_instance. This property is only added if
the widget has declared that it supports raw instances via the
show_instance_in_rest flag.

* Use themes.php in Legacy Widget iframe

* Use destructuring in widgetToBlock
---
 lib/widgets-customize.php                     | 77 ++++++++-----------
 .../src/legacy-widget/edit/preview.js         |  3 +-
 .../use-sidebar-block-editor.js               | 68 ++++++++--------
 packages/customize-widgets/src/index.js       | 33 +-------
 4 files changed, 76 insertions(+), 105 deletions(-)

diff --git a/lib/widgets-customize.php b/lib/widgets-customize.php
index 20b79c262a8e6d..e0793ff383bf10 100644
--- a/lib/widgets-customize.php
+++ b/lib/widgets-customize.php
@@ -59,59 +59,48 @@ function gutenberg_widgets_customize_register( $manager ) {
 }
 
 /**
- * Our own implementation of WP_Customize_Widgets::sanitize_widget_instance
- * which uses __unstable_instance if it exists.
+ * Swaps the customizer setting's sanitize_callback and sanitize_js_callback
+ * arguments with our own implementation that adds raw_instance to the sanitized
+ * value. This is only done if the widget has declared that it supports raw
+ * instances via the show_instance_in_rest flag. This lets the block editor use
+ * raw_instance to create blocks.
+ *
+ * When merged to Core, these changes should be made to
+ * WP_Customize_Widgets::sanitize_widget_instance and
+ * WP_Customize_Widgets::sanitize_widget_js_instance.
  *
- * @param array $value Widget instance to sanitize.
- * @return array|void Sanitized widget instance.
+ * @param array  $args Array of Customizer setting arguments.
+ * @param string $id   Widget setting ID.
  */
-function gutenberg_widgets_customize_sanitize_widget_instance( $value ) {
-	global $wp_customize;
+function gutenberg_widgets_customize_add_unstable_instance( $args, $id ) {
+	if ( preg_match( '/^widget_(?P<id_base>.+?)(?:\[(?P<widget_number>\d+)\])?$/', $id, $matches ) ) {
+		$id_base = $matches['id_base'];
 
-	if ( isset( $value['__unstable_instance'] ) ) {
-		return $value['__unstable_instance'];
-	}
+		$args['sanitize_callback'] = function( $value ) use ( $id_base ) {
+			global $wp_customize;
 
-	return $wp_customize->widgets->sanitize_widget_instance( $value );
-}
+			if ( isset( $value['raw_instance'] ) ) {
+				$widget_object = gutenberg_get_widget_object( $id_base );
+				if ( ! empty( $widget_object->show_instance_in_rest ) ) {
+					return $value['raw_instance'];
+				}
+			}
 
-/**
- * Our own implementation of WP_Customize_Widgets::sanitize_widget_js_instance
- * which adds __unstable_instance.
- *
- * @param array $value Widget instance to convert to JSON.
- * @return array JSON-converted widget instance.
- */
-function gutenberg_widgets_customize_sanitize_widget_js_instance( $value ) {
-	global $wp_customize;
+			return $wp_customize->widgets->sanitize_widget_instance( $value );
+		};
 
-	$sanitized_value = $wp_customize->widgets->sanitize_widget_js_instance( $value );
+		$args['sanitize_js_callback'] = function( $value ) use ( $id_base ) {
+			global $wp_customize;
 
-	$sanitized_value['__unstable_instance'] = $value;
+			$sanitized_value = $wp_customize->widgets->sanitize_widget_js_instance( $value );
 
-	return $sanitized_value;
-}
+			$widget_object = gutenberg_get_widget_object( $id_base );
+			if ( ! empty( $widget_object->show_instance_in_rest ) ) {
+				$sanitized_value['raw_instance'] = (object) $value;
+			}
 
-/**
- * TEMPORARY HACK! \o/
- *
- * Swaps the customizer setting's sanitize_callback and sanitize_js_callback
- * arguments with our own implementation that adds __unstable_instance to the
- * sanitized value.
- *
- * This lets the block editor use __unstable_instance to create blocks.
- *
- * A proper fix would be to only add the raw instance when the widget is a block
- * widget and to update the Legacy Widget block to work with encoded instance
- * values. See https://github.com/WordPress/gutenberg/issues/28902.
- *
- * @param array  $args Array of Customizer setting arguments.
- * @param string $id   Widget setting ID.
- */
-function gutenberg_widgets_customize_add_unstable_instance( $args, $id ) {
-	if ( 0 === strpos( $id, 'widget_' ) ) {
-		$args['sanitize_callback']    = 'gutenberg_widgets_customize_sanitize_widget_instance';
-		$args['sanitize_js_callback'] = 'gutenberg_widgets_customize_sanitize_widget_js_instance';
+			return $sanitized_value;
+		};
 	}
 
 	return $args;
diff --git a/packages/block-library/src/legacy-widget/edit/preview.js b/packages/block-library/src/legacy-widget/edit/preview.js
index ebdc0a5707e8e4..212905aed71001 100644
--- a/packages/block-library/src/legacy-widget/edit/preview.js
+++ b/packages/block-library/src/legacy-widget/edit/preview.js
@@ -34,7 +34,8 @@ export default function PreviewIframe( { idBase, instance, isVisible } ) {
 			<iframe
 				ref={ ref }
 				className="wp-block-legacy-widget__edit-preview"
-				src={ addQueryArgs( '', {
+				src={ addQueryArgs( 'themes.php', {
+					page: 'gutenberg-widgets',
 					'legacy-widget-preview': {
 						idBase,
 						instance,
diff --git a/packages/customize-widgets/src/components/sidebar-block-editor/use-sidebar-block-editor.js b/packages/customize-widgets/src/components/sidebar-block-editor/use-sidebar-block-editor.js
index 05c516c7947c3b..0f601bb226eb53 100644
--- a/packages/customize-widgets/src/components/sidebar-block-editor/use-sidebar-block-editor.js
+++ b/packages/customize-widgets/src/components/sidebar-block-editor/use-sidebar-block-editor.js
@@ -23,17 +23,21 @@ function blockToWidget( block, existingWidget = null ) {
 	let widget;
 
 	if ( block.name === 'core/legacy-widget' ) {
-		const isReferenceWidget = !! block.attributes.referenceWidgetName;
-		if ( isReferenceWidget ) {
+		if ( block.attributes.id ) {
+			// Widget that does not extend WP_Widget.
 			widget = {
-				id: block.attributes.referenceWidgetName,
-				instance: block.attributes.instance,
+				id: block.attributes.id,
 			};
 		} else {
+			// Widget that extends WP_Widget.
 			widget = {
-				widgetClass: block.attributes.widgetClass,
 				idBase: block.attributes.idBase,
-				instance: block.attributes.instance,
+				instance: {
+					encoded_serialized_instance:
+						block.attributes.instance.encoded,
+					instance_hash_key: block.attributes.instance.hash,
+					raw_instance: block.attributes.instance.raw,
+				},
 			};
 		}
 	} else {
@@ -44,8 +48,7 @@ function blockToWidget( block, existingWidget = null ) {
 			idBase: 'block',
 			widgetClass: 'WP_Widget_Block',
 			instance: {
-				...instance,
-				__unstable_instance: instance,
+				raw_instance: instance,
 			},
 		};
 	}
@@ -56,36 +59,41 @@ function blockToWidget( block, existingWidget = null ) {
 	};
 }
 
-function widgetToBlock( widget ) {
+function widgetToBlock( {
+	id,
+	idBase,
+	number,
+	instance: {
+		encoded_serialized_instance: encoded,
+		instance_hash_key: hash,
+		raw_instance: raw,
+	},
+} ) {
 	let block;
 
-	if ( widget.idBase === 'block' ) {
-		const parsedBlocks = parse(
-			widget.instance.__unstable_instance.content
-		);
+	if ( idBase === 'block' ) {
+		const parsedBlocks = parse( raw.content );
 		block = parsedBlocks.length
 			? parsedBlocks[ 0 ]
 			: createBlock( 'core/paragraph', {} );
+	} else if ( number ) {
+		// Widget that extends WP_Widget.
+		block = createBlock( 'core/legacy-widget', {
+			idBase,
+			instance: {
+				encoded,
+				hash,
+				raw,
+			},
+		} );
 	} else {
-		const attributes = {
-			name: widget.name,
-			form: widget.form,
-			instance: widget.instance,
-			idBase: widget.idBase,
-			number: widget.number,
-		};
-
-		const isReferenceWidget = ! widget.widgetClass;
-		if ( isReferenceWidget ) {
-			attributes.referenceWidgetName = widget.id;
-		} else {
-			attributes.widgetClass = widget.widgetClass;
-		}
-
-		block = createBlock( 'core/legacy-widget', attributes, [] );
+		// Widget that does not extend WP_Widget.
+		block = createBlock( 'core/legacy-widget', {
+			id,
+		} );
 	}
 
-	return addWidgetIdToBlock( block, widget.id );
+	return addWidgetIdToBlock( block, id );
 }
 
 function initState( sidebar ) {
diff --git a/packages/customize-widgets/src/index.js b/packages/customize-widgets/src/index.js
index e64110b154c1f9..b6e68d009464c5 100644
--- a/packages/customize-widgets/src/index.js
+++ b/packages/customize-widgets/src/index.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { registerBlockType } from '@wordpress/blocks';
 import {
 	registerCoreBlocks,
 	__experimentalGetCoreBlocks,
@@ -26,37 +25,11 @@ export function initialize() {
 	registerCoreBlocks( coreBlocks );
 
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
-		__experimentalRegisterExperimentalCoreBlocks();
+		__experimentalRegisterExperimentalCoreBlocks( {
+			enableLegacyWidgetBlock: true,
+		} );
 	}
 
-	// TODO: Register legacy widgets block
-	registerBlockType( 'core/legacy-widget', {
-		title: 'Legacy Widget',
-		attributes: {
-			widgetClass: {
-				type: 'string',
-			},
-			referenceWidgetName: {
-				type: 'string',
-			},
-			name: {
-				type: 'string',
-			},
-			idBase: {
-				type: 'string',
-			},
-			number: {
-				type: 'number',
-			},
-			instance: {
-				type: 'object',
-			},
-		},
-		edit( { attributes } ) {
-			return <div>{ JSON.stringify( attributes ) }</div>;
-		},
-	} );
-
 	wp.customize.sectionConstructor.sidebar = SidebarSection;
 	wp.customize.controlConstructor.sidebar_block_editor = SidebarControl;
 }

From 336748b39cc1e079806c87c2b8f30ed32d0ebb26 Mon Sep 17 00:00:00 2001
From: Mohammed Faragallah <o0frego0o@hotmail.com>
Date: Thu, 1 Apr 2021 03:54:30 +0200
Subject: [PATCH 19/53] docs: update broken links (#30188)

---
 docs/contributors/code/coding-guidelines.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contributors/code/coding-guidelines.md b/docs/contributors/code/coding-guidelines.md
index ada1952f38e02a..c2a53eb5caff47 100644
--- a/docs/contributors/code/coding-guidelines.md
+++ b/docs/contributors/code/coding-guidelines.md
@@ -225,7 +225,7 @@ Gutenberg follows the [WordPress JavaScript Documentation Standards](https://mak
 For additional guidance, consult the following resources:
 
 -   [JSDoc Official Documentation](https://jsdoc.app/index.html)
--   [TypeScript Supported JSDoc](https://www.typescriptlang.org/docs/handbook/type-checking-javascript-files.html#supported-jsdoc)
+-   [TypeScript Supported JSDoc](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html)
 
 ### Custom Types
 
@@ -264,7 +264,7 @@ Note the use of quotes when defining a set of string literals. As in the [JavaSc
 
 ### Importing and Exporting Types
 
-Use the [TypeScript `import` function](https://www.typescriptlang.org/docs/handbook/type-checking-javascript-files.html#import-types) to import type declarations from other files or third-party dependencies.
+Use the [TypeScript `import` function](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html#import-types) to import type declarations from other files or third-party dependencies.
 
 Since an imported type declaration can occupy an excess of the available line length and become verbose when referenced multiple times, you are encouraged to create an alias of the external type using a `@typedef` declaration at the top of the file, immediately following [the `import` groupings](/docs/contributors/code/coding-guidelines.md#imports).
 
@@ -314,9 +314,9 @@ When documenting a generic type such as `Object`, `Function`, `Promise`, etc., a
 
 When an object is used as a dictionary, you can define its type in 2 ways: indexable interface (`{[setting:string]:any}`) or `Record`. When the name of the key for an object provides hints for developers what to do like `setting`, use indexable interface. If not, use `Record`.
 
-The function expression here uses TypeScript's syntax for function types, which can be useful in providing more detailed information about the names and types of the expected parameters. For more information, consult the [TypeScript `@type` tag function recommendations](https://www.typescriptlang.org/docs/handbook/type-checking-javascript-files.html#type).
+The function expression here uses TypeScript's syntax for function types, which can be useful in providing more detailed information about the names and types of the expected parameters. For more information, consult the [TypeScript `@type` tag function recommendations](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html#type).
 
-In more advanced cases, you may define your own custom types as a generic type using the [TypeScript `@template` tag](https://www.typescriptlang.org/docs/handbook/type-checking-javascript-files.html#template).
+In more advanced cases, you may define your own custom types as a generic type using the [TypeScript `@template` tag](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html#template).
 
 Similar to the "Custom Types" advice concerning type unions and with literal values, you can consider to create a custom type `@typedef` to better describe expected key values for object records, or to extract a complex function signature.
 

From 2332b58a476e77eab9f00df8dc35d9ba2fb54198 Mon Sep 17 00:00:00 2001
From: JoshuaDoshua <1930699+JoshuaDoshua@users.noreply.github.com>
Date: Wed, 31 Mar 2021 21:58:23 -0400
Subject: [PATCH 20/53] Documentation: Fix code snippet for disabling the block
 directory (#30365)

The `plugins_loaded` filter doesn't work to successfully remove these actions.
Relevant comment:
https://github.com/WordPress/gutenberg/issues/23961#issuecomment-688957626
---
 docs/reference-guides/filters/editor-filters.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/reference-guides/filters/editor-filters.md b/docs/reference-guides/filters/editor-filters.md
index 6166b356c22f2d..b9701a30b2e24d 100644
--- a/docs/reference-guides/filters/editor-filters.md
+++ b/docs/reference-guides/filters/editor-filters.md
@@ -57,11 +57,6 @@ If set to false the user will not be able to switch between visual and code edit
 The Block Directory enables installing new block plugins from [WordPress.org.](https://wordpress.org/plugins/browse/block/) It can be disabled by removing the actions that enqueue it. In WordPress core, the function is `wp_enqueue_editor_block_directory_assets`, and Gutenberg uses `gutenberg_enqueue_block_editor_assets_block_directory`. To remove the feature, use [`remove_action`,](https://developer.wordpress.org/reference/functions/remove_action/) like this:
 
 ```php
-add_action(
-	'plugins_loaded',
-	function() {
-		remove_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
-		remove_action( 'enqueue_block_editor_assets', 'gutenberg_enqueue_block_editor_assets_block_directory' );
-	}
-);
+remove_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
+remove_action( 'enqueue_block_editor_assets', 'gutenberg_enqueue_block_editor_assets_block_directory' );
 ```

From 787717644b18183904bf34e1b79e94ed66d84420 Mon Sep 17 00:00:00 2001
From: Cory Hughart <cr0ybot@gmail.com>
Date: Wed, 31 Mar 2021 22:18:58 -0400
Subject: [PATCH 21/53] Remove references to __experimental* in the docs
 (#29322)

Remove documented code using `__experimentalGetSettings` as per https://developer.wordpress.org/block-editor/contributors/develop/coding-guidelines/#experimental-and-unstable-apis
---
 packages/components/src/date-time/README.md | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/packages/components/src/date-time/README.md b/packages/components/src/date-time/README.md
index 1a796674d87259..23bc4269170868 100644
--- a/packages/components/src/date-time/README.md
+++ b/packages/components/src/date-time/README.md
@@ -16,28 +16,16 @@ Render a DateTimePicker.
 
 ```jsx
 import { DateTimePicker } from '@wordpress/components';
-import { __experimentalGetSettings } from '@wordpress/date';
 import { withState } from '@wordpress/compose';
 
 const MyDateTimePicker = withState( {
 	date: new Date(),
 } )( ( { date, setState } ) => {
-	const settings = __experimentalGetSettings();
-
-	// To know if the current timezone is a 12 hour time with look for an "a" in the time format.
-	// We also make sure this a is not escaped by a "/".
-	const is12HourTime = /a(?!\\)/i.test(
-		settings.formats.time
-			.toLowerCase() // Test only the lower case a
-			.replace( /\\\\/g, '' ) // Replace "//" with empty strings
-			.split( '' ).reverse().join( '' ) // Reverse the string and test for "a" not followed by a slash
-	);
-
 	return (
 		<DateTimePicker
 			currentDate={ date }
 			onChange={ ( date ) => setState( { date } ) }
-			is12Hour={ is12HourTime }
+			is12Hour={ true }
 		/>
 	);
 } );
@@ -68,6 +56,7 @@ Whether we use a 12-hour clock. With a 12-hour clock, an AM/PM widget is display
 
 - Type: `bool`
 - Required: No
+- Default: false
 
 ### isInvalidDate
 

From e7e165346bde9e0582c6464ce991487927bcaa36 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 1 Apr 2021 08:54:57 +0100
Subject: [PATCH 22/53] Update "close small" icon so that its shape matches the
 "add" icon dimensionally (#30014)

* Update "close small" icon so that its shape matches the "add" icon dimensionally.

* Update test snapshots

* Update e2e test snapshots

Co-authored-by: David Szabo <david.szabo97@gmail.com>
---
 .../editor/plugins/__snapshots__/plugins-api.test.js.snap     | 4 ++--
 .../post-publish-panel/test/__snapshots__/index.js.snap       | 4 ++--
 packages/icons/src/library/close-small.js                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap b/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap
index 6a21f349febadd..0bc642cc5bbac8 100644
--- a/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap
+++ b/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap
@@ -2,6 +2,6 @@
 
 exports[`Using Plugins API Document Setting Custom Panel Should render a custom panel inside Document Setting sidebar 1`] = `"My Custom Panel"`;
 
-exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
+exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
 
-exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
+exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" role=\\"img\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
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 b7df303bf69db5..601a5876e3102e 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
@@ -14,7 +14,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
           xmlns="http://www.w3.org/2000/svg"
         >
           <Path
-            d="M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z"
+            d="M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z"
           />
         </SVG>
       }
@@ -52,7 +52,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
           xmlns="http://www.w3.org/2000/svg"
         >
           <Path
-            d="M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z"
+            d="M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z"
           />
         </SVG>
       }
diff --git a/packages/icons/src/library/close-small.js b/packages/icons/src/library/close-small.js
index 657a8d23c22b89..a90269ea69343f 100644
--- a/packages/icons/src/library/close-small.js
+++ b/packages/icons/src/library/close-small.js
@@ -5,7 +5,7 @@ import { SVG, Path } from '@wordpress/primitives';
 
 const closeSmall = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M13 11.9l3.3-3.4-1.1-1-3.2 3.3-3.2-3.3-1.1 1 3.3 3.4-3.5 3.6 1 1L12 13l3.5 3.5 1-1z" />
+		<Path d="M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z" />
 	</SVG>
 );
 

From 367620edfc423d0b8d221be800f57b498b98636c Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 1 Apr 2021 01:41:09 -0700
Subject: [PATCH 23/53] Docs: Add instructions for finding attributes for use
 in templates. (#30258)

---
 docs/reference-guides/block-api/block-templates.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/reference-guides/block-api/block-templates.md b/docs/reference-guides/block-api/block-templates.md
index d64e80028bc0b2..b5a01daccd1908 100644
--- a/docs/reference-guides/block-api/block-templates.md
+++ b/docs/reference-guides/block-api/block-templates.md
@@ -61,6 +61,15 @@ registerBlockType( 'myplugin/template', {
 
 See the [Meta Block Tutorial](/docs/how-to-guides/metabox/meta-block-5-finishing.md) for a full example of a template in use.
 
+## Block Attributes
+
+To find a comprehensive list of all block attributes that you can define in a template, consult the block's `block.json` file, and look at the `attributes` and `supports` values.
+
+For example, [packages/block-library/src/heading/block.json](https://github.com/WordPress/gutenberg/blob/c62ccd80c7c6abb85740cf8745439029bf0f4d35/packages/block-library/src/heading/block.json#L5-L25) shows that the block has a `level` attribute, and supports the `anchor` parameter.
+
+If you don't have the Gutenberg plugin installed, you can find `block.json` files inside `wp-includes/blocks/heading/block.json`.
+
+
 ## Custom Post types
 
 A custom post type can register its own template during registration:

From f98f2d2915953375a88c7ad113bb2595bb07f59a Mon Sep 17 00:00:00 2001
From: Matias Ventura <mv@matiasventura.com>
Date: Thu, 1 Apr 2021 10:44:40 +0200
Subject: [PATCH 24/53] Update placeholder text across blocks: (#30404)

- Favor more concise wording such as "Add caption".
- Remove trailing ellipsis.

This is meant to work better with the new persistent placeholder
text until the user types in RichText.
---
 packages/block-editor/src/components/caption/index.native.js  | 2 +-
 packages/block-library/src/audio/edit.js                      | 2 +-
 .../src/audio/test/__snapshots__/edit.native.js.snap          | 4 ++--
 packages/block-library/src/embed/embed-preview.js             | 2 +-
 packages/block-library/src/gallery/gallery-image.js           | 4 +---
 packages/block-library/src/gallery/gallery-image.native.js    | 4 +---
 packages/block-library/src/heading/edit.js                    | 2 +-
 packages/block-library/src/image/image.js                     | 2 +-
 packages/block-library/src/list/edit.js                       | 2 +-
 packages/block-library/src/pullquote/edit.js                  | 4 ++--
 packages/block-library/src/quote/edit.js                      | 4 ++--
 packages/block-library/src/table/edit.js                      | 2 +-
 packages/block-library/src/video/edit.js                      | 2 +-
 13 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/block-editor/src/components/caption/index.native.js b/packages/block-editor/src/components/caption/index.native.js
index 89a67cd2112db9..6e26fa8ae7d396 100644
--- a/packages/block-editor/src/components/caption/index.native.js
+++ b/packages/block-editor/src/components/caption/index.native.js
@@ -18,7 +18,7 @@ const Caption = ( {
 	onBlur,
 	onChange,
 	onFocus,
-	placeholder = __( 'Write caption…' ),
+	placeholder = __( 'Add caption' ),
 	placeholderTextColor,
 	shouldDisplay = true,
 	style,
diff --git a/packages/block-library/src/audio/edit.js b/packages/block-library/src/audio/edit.js
index c691b72fcabbde..425c5ef808b731 100644
--- a/packages/block-library/src/audio/edit.js
+++ b/packages/block-library/src/audio/edit.js
@@ -188,7 +188,7 @@ function AudioEdit( {
 					<RichText
 						tagName="figcaption"
 						aria-label={ __( 'Audio caption text' ) }
-						placeholder={ __( 'Write caption…' ) }
+						placeholder={ __( 'Add caption' ) }
 						value={ caption }
 						onChange={ ( value ) =>
 							setAttributes( { caption: value } )
diff --git a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
index b11b526d43565b..34dff2838a0acf 100644
--- a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
@@ -121,7 +121,7 @@ exports[`Audio block renders audio block error state without crashing 1`] = `
           onResponderTerminationRequest={[Function]}
           onSelectionChange={[Function]}
           onStartShouldSetResponder={[Function]}
-          placeholder="Write caption…"
+          placeholder="Add caption"
           placeholderTextColor="gray"
           style={
             Object {
@@ -291,7 +291,7 @@ exports[`Audio block renders audio file without crashing 1`] = `
           onResponderTerminationRequest={[Function]}
           onSelectionChange={[Function]}
           onStartShouldSetResponder={[Function]}
-          placeholder="Write caption…"
+          placeholder="Add caption"
           placeholderTextColor="gray"
           style={
             Object {
diff --git a/packages/block-library/src/embed/embed-preview.js b/packages/block-library/src/embed/embed-preview.js
index 4480f94c9d22e6..9e04efe78a0bfe 100644
--- a/packages/block-library/src/embed/embed-preview.js
+++ b/packages/block-library/src/embed/embed-preview.js
@@ -140,7 +140,7 @@ class EmbedPreview extends Component {
 				{ ( ! RichText.isEmpty( caption ) || isSelected ) && (
 					<RichText
 						tagName="figcaption"
-						placeholder={ __( 'Write caption…' ) }
+						placeholder={ __( 'Add caption' ) }
 						value={ caption }
 						onChange={ onCaptionChange }
 						inlineToolbar
diff --git a/packages/block-library/src/gallery/gallery-image.js b/packages/block-library/src/gallery/gallery-image.js
index e73a7e9cd7d93c..5b07c133ef9625 100644
--- a/packages/block-library/src/gallery/gallery-image.js
+++ b/packages/block-library/src/gallery/gallery-image.js
@@ -281,9 +281,7 @@ class GalleryImage extends Component {
 					<RichText
 						tagName="figcaption"
 						aria-label={ __( 'Image caption text' ) }
-						placeholder={
-							isSelected ? __( 'Write caption…' ) : null
-						}
+						placeholder={ isSelected ? __( 'Add caption' ) : null }
 						value={ caption }
 						isSelected={ this.state.captionSelected }
 						onChange={ ( newCaption ) =>
diff --git a/packages/block-library/src/gallery/gallery-image.native.js b/packages/block-library/src/gallery/gallery-image.native.js
index 4289485b7ac3c3..65c9b22446484f 100644
--- a/packages/block-library/src/gallery/gallery-image.native.js
+++ b/packages/block-library/src/gallery/gallery-image.native.js
@@ -287,9 +287,7 @@ class GalleryImage extends Component {
 									onChange={ this.onCaptionChange }
 									onFocus={ this.onSelectCaption }
 									placeholder={
-										isSelected
-											? __( 'Write caption…' )
-											: null
+										isSelected ? __( 'Add caption' ) : null
 									}
 									placeholderTextColor={
 										captionPlaceholderStyle.color
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index e10ff49aa787cd..0f8d900b62c4cf 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -80,7 +80,7 @@ function HeadingEdit( {
 				onReplace={ onReplace }
 				onRemove={ () => onReplace( [] ) }
 				aria-label={ __( 'Heading text' ) }
-				placeholder={ placeholder || __( 'Write heading…' ) }
+				placeholder={ placeholder || __( 'Heading' ) }
 				textAlign={ textAlign }
 				{ ...blockProps }
 			/>
diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 5acedd5114aeae..fa5f501cabc5a2 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -560,7 +560,7 @@ export default function Image( {
 					ref={ captionRef }
 					tagName="figcaption"
 					aria-label={ __( 'Image caption text' ) }
-					placeholder={ __( 'Write caption…' ) }
+					placeholder={ __( 'Add caption' ) }
 					value={ caption }
 					unstableOnFocus={ onFocusCaption }
 					onChange={ ( value ) =>
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 3e84918f5ec957..8a9c8af53dd65c 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -155,7 +155,7 @@ export default function ListEdit( {
 				}
 				value={ values }
 				aria-label={ __( 'List text' ) }
-				placeholder={ __( 'Write list…' ) }
+				placeholder={ __( 'List' ) }
 				onMerge={ mergeBlocks }
 				onSplit={ ( value ) =>
 					createBlock( name, { ...attributes, values: value } )
diff --git a/packages/block-library/src/pullquote/edit.js b/packages/block-library/src/pullquote/edit.js
index 709f3745108741..58830ff3508549 100644
--- a/packages/block-library/src/pullquote/edit.js
+++ b/packages/block-library/src/pullquote/edit.js
@@ -127,7 +127,7 @@ function PullQuoteEdit( {
 						aria-label={ __( 'Pullquote text' ) }
 						placeholder={
 							// translators: placeholder text used for the quote
-							__( 'Write quote…' )
+							__( 'Add quote' )
 						}
 						textAlign="center"
 					/>
@@ -138,7 +138,7 @@ function PullQuoteEdit( {
 							aria-label={ __( 'Pullquote citation text' ) }
 							placeholder={
 								// translators: placeholder text used for the citation
-								__( 'Write citation…' )
+								__( 'Add citation' )
 							}
 							onChange={ ( nextCitation ) =>
 								setAttributes( {
diff --git a/packages/block-library/src/quote/edit.js b/packages/block-library/src/quote/edit.js
index e4337960ad652e..5c5cf69239bbf6 100644
--- a/packages/block-library/src/quote/edit.js
+++ b/packages/block-library/src/quote/edit.js
@@ -65,7 +65,7 @@ export default function QuoteEdit( {
 					aria-label={ __( 'Quote text' ) }
 					placeholder={
 						// translators: placeholder text used for the quote
-						__( 'Write quote…' )
+						__( 'Add quote' )
 					}
 					onReplace={ onReplace }
 					onSplit={ ( piece ) =>
@@ -94,7 +94,7 @@ export default function QuoteEdit( {
 						aria-label={ __( 'Quote citation text' ) }
 						placeholder={
 							// translators: placeholder text used for the citation
-							__( 'Write citation…' )
+							__( 'Add citation' )
 						}
 						className="wp-block-quote__citation"
 						textAlign={ align }
diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js
index 5876f7f956c250..63355783447164 100644
--- a/packages/block-library/src/table/edit.js
+++ b/packages/block-library/src/table/edit.js
@@ -528,7 +528,7 @@ function TableEdit( {
 				<RichText
 					tagName="figcaption"
 					aria-label={ __( 'Table caption text' ) }
-					placeholder={ __( 'Write caption…' ) }
+					placeholder={ __( 'Add caption' ) }
 					value={ caption }
 					onChange={ ( value ) =>
 						setAttributes( { caption: value } )
diff --git a/packages/block-library/src/video/edit.js b/packages/block-library/src/video/edit.js
index 1db4ce9ad87267..79a255651b73ed 100644
--- a/packages/block-library/src/video/edit.js
+++ b/packages/block-library/src/video/edit.js
@@ -239,7 +239,7 @@ function VideoEdit( {
 					<RichText
 						tagName="figcaption"
 						aria-label={ __( 'Video caption text' ) }
-						placeholder={ __( 'Write caption…' ) }
+						placeholder={ __( 'Add caption' ) }
 						value={ caption }
 						onChange={ ( value ) =>
 							setAttributes( { caption: value } )

From aa05bd47df3247730065b197a170ab84e4c6761f Mon Sep 17 00:00:00 2001
From: Jacopo Tomasone <Copons@users.noreply.github.com>
Date: Thu, 1 Apr 2021 11:52:46 +0100
Subject: [PATCH 25/53] Site Editor: Revert custom templates to their original
 theme-provided files (#28141)

---
 lib/full-site-editing/block-templates.php     |  69 ++++--
 .../class-wp-block-template.php               |  13 +-
 .../class-wp-rest-templates-controller.php    |  74 +++---
 packages/e2e-test-utils/README.md             |  14 ++
 packages/e2e-test-utils/src/index.js          |   1 +
 packages/e2e-tests/experimental-features.js   |  34 ++-
 .../specs/experiments/template-revert.test.js | 220 ++++++++++++++++++
 .../edit-site/src/components/header/index.js  |   8 +-
 .../src/components/template-details/index.js  |  27 ++-
 .../components/template-details/style.scss    |  16 +-
 packages/edit-site/src/store/actions.js       | 143 +++++++++++-
 .../src/utils/is-template-revertable.js       |  14 ++
 phpunit/class-block-templates-test.php        |  16 +-
 ...class-wp-rest-template-controller-test.php | 124 +++++-----
 14 files changed, 641 insertions(+), 132 deletions(-)
 create mode 100644 packages/e2e-tests/specs/experiments/template-revert.test.js
 create mode 100644 packages/edit-site/src/utils/is-template-revertable.js

diff --git a/lib/full-site-editing/block-templates.php b/lib/full-site-editing/block-templates.php
index 265d0bda0f4a7f..d0bcab00c91528 100644
--- a/lib/full-site-editing/block-templates.php
+++ b/lib/full-site-editing/block-templates.php
@@ -184,15 +184,16 @@ function _gutenberg_build_template_result_from_file( $template_file, $template_t
 	$template_content       = file_get_contents( $template_file['path'] );
 	$theme                  = wp_get_theme()->get_stylesheet();
 
-	$template            = new WP_Block_Template();
-	$template->id        = $theme . '//' . $template_file['slug'];
-	$template->theme     = $theme;
-	$template->content   = _inject_theme_attribute_in_content( $template_content );
-	$template->slug      = $template_file['slug'];
-	$template->is_custom = false;
-	$template->type      = $template_type;
-	$template->title     = $template_file['slug'];
-	$template->status    = 'publish';
+	$template                 = new WP_Block_Template();
+	$template->id             = $theme . '//' . $template_file['slug'];
+	$template->theme          = $theme;
+	$template->content        = _inject_theme_attribute_in_content( $template_content );
+	$template->slug           = $template_file['slug'];
+	$template->source         = 'theme';
+	$template->type           = $template_type;
+	$template->title          = $template_file['slug'];
+	$template->status         = 'publish';
+	$template->has_theme_file = true;
 
 	if ( 'wp_template' === $template_type && isset( $default_template_types[ $template_file['slug'] ] ) ) {
 		$template->description = $default_template_types[ $template_file['slug'] ]['description'];
@@ -224,19 +225,22 @@ function _gutenberg_build_template_result_from_post( $post ) {
 		return new WP_Error( 'template_missing_theme', __( 'No theme is defined for this template.', 'gutenberg' ) );
 	}
 
-	$theme = $terms[0]->name;
-
-	$template              = new WP_Block_Template();
-	$template->wp_id       = $post->ID;
-	$template->id          = $theme . '//' . $post->post_name;
-	$template->theme       = $theme;
-	$template->content     = $post->post_content;
-	$template->slug        = $post->post_name;
-	$template->is_custom   = true;
-	$template->type        = $post->post_type;
-	$template->description = $post->post_excerpt;
-	$template->title       = $post->post_title;
-	$template->status      = $post->post_status;
+	$theme          = $terms[0]->name;
+	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
+		null !== _gutenberg_get_template_file( $post->post_type, $post->post_name );
+
+	$template                 = new WP_Block_Template();
+	$template->wp_id          = $post->ID;
+	$template->id             = $theme . '//' . $post->post_name;
+	$template->theme          = $theme;
+	$template->content        = $post->post_content;
+	$template->slug           = $post->post_name;
+	$template->source         = 'custom';
+	$template->type           = $post->post_type;
+	$template->description    = $post->post_excerpt;
+	$template->title          = $post->post_title;
+	$template->status         = $post->post_status;
+	$template->has_theme_file = $has_theme_file;
 
 	if ( 'wp_template_part' === $post->post_type ) {
 		$type_terms = get_the_terms( $post, 'wp_template_part_area' );
@@ -331,7 +335,7 @@ function gutenberg_get_block_templates( $query = array(), $template_type = 'wp_t
 /**
  * Retrieves a single unified template object using its id.
  *
- * @param string $id Template unique identifier (example: theme|slug).
+ * @param string $id Template unique identifier (example: theme_slug//template_slug).
  * @param array  $template_type wp_template or wp_template_part.
  *
  * @return WP_Block_Template|null Template.
@@ -367,6 +371,25 @@ function gutenberg_get_block_template( $id, $template_type = 'wp_template' ) {
 		}
 	}
 
+	return gutenberg_get_block_file_template( $id, $template_type );
+}
+
+/**
+ * Retrieves a single unified template object using its id.
+ * Retrieves the file template.
+ *
+ * @param string $id Template unique identifier (example: theme_slug//template_slug).
+ * @param array  $template_type wp_template or wp_template_part.
+ *
+ * @return WP_Block_Template|null File template.
+ */
+function gutenberg_get_block_file_template( $id, $template_type = 'wp_template' ) {
+	$parts = explode( '//', $id, 2 );
+	if ( count( $parts ) < 2 ) {
+		return null;
+	}
+	list( $theme, $slug ) = $parts;
+
 	if ( wp_get_theme()->get_stylesheet() === $theme ) {
 		$template_file = _gutenberg_get_template_file( $template_type, $slug );
 		if ( null !== $template_file ) {
diff --git a/lib/full-site-editing/class-wp-block-template.php b/lib/full-site-editing/class-wp-block-template.php
index b5e051241bc395..d8c9d5c54a2b95 100644
--- a/lib/full-site-editing/class-wp-block-template.php
+++ b/lib/full-site-editing/class-wp-block-template.php
@@ -61,11 +61,11 @@ class WP_Block_Template {
 	public $description = '';
 
 	/**
-	 * Whether it's a theme file template or a custom one.
+	 * Source of the content. `theme` and `custom` is used for now.
 	 *
-	 * @var boolean
+	 * @var string
 	 */
-	public $is_custom = false;
+	public $source = 'theme';
 
 	/**
 	 * Post Id.
@@ -80,4 +80,11 @@ class WP_Block_Template {
 	 * @var string
 	 */
 	public $status;
+
+	/**
+	 * Whether a template is, or is based upon, an existing template file.
+	 *
+	 * @var boolean
+	 */
+	public $has_theme_file;
 }
diff --git a/lib/full-site-editing/class-wp-rest-templates-controller.php b/lib/full-site-editing/class-wp-rest-templates-controller.php
index a4d818fca256a4..e6b3a90efd3d38 100644
--- a/lib/full-site-editing/class-wp-rest-templates-controller.php
+++ b/lib/full-site-editing/class-wp-rest-templates-controller.php
@@ -168,7 +168,11 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error
 	 */
 	public function get_item( $request ) {
-		$template = gutenberg_get_block_template( $request['id'], $this->post_type );
+		if ( isset( $request['source'] ) && 'theme' === $request['source'] ) {
+			$template = gutenberg_get_block_file_template( $request['id'], $this->post_type );
+		} else {
+			$template = gutenberg_get_block_template( $request['id'], $this->post_type );
+		}
 
 		if ( ! $template ) {
 			return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.', 'gutenberg' ), array( 'status' => 404 ) );
@@ -199,9 +203,14 @@ public function update_item( $request ) {
 			return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.', 'gutenberg' ), array( 'status' => 404 ) );
 		}
 
+		if ( isset( $request['source'] ) && 'theme' === $request['source'] ) {
+			wp_delete_post( $template->wp_id, true );
+			return $this->prepare_item_for_response( gutenberg_get_block_file_template( $request['id'], $this->post_type ), $request );
+		}
+
 		$changes = $this->prepare_item_for_database( $request );
 
-		if ( $template->is_custom ) {
+		if ( 'custom' === $template->source ) {
 			$result = wp_update_post( wp_slash( (array) $changes ), true );
 		} else {
 			$result = wp_insert_post( wp_slash( (array) $changes ), true );
@@ -283,7 +292,7 @@ public function delete_item( $request ) {
 		if ( ! $template ) {
 			return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.', 'gutenberg' ), array( 'status' => 404 ) );
 		}
-		if ( ! $template->is_custom ) {
+		if ( 'custom' !== $template->source ) {
 			return new WP_Error( 'rest_invalid_template', __( 'Templates based on theme files can\'t be removed.', 'gutenberg' ), array( 'status' => 400 ) );
 		}
 
@@ -335,7 +344,7 @@ protected function prepare_item_for_database( $request ) {
 			$changes->tax_input   = array(
 				'wp_theme' => isset( $request['theme'] ) ? $request['content'] : wp_get_theme()->get_stylesheet(),
 			);
-		} elseif ( ! $template->is_custom ) {
+		} elseif ( 'custom' !== $template->source ) {
 			$changes->post_type   = $this->post_type;
 			$changes->post_status = 'publish';
 			$changes->tax_input   = array(
@@ -347,24 +356,24 @@ protected function prepare_item_for_database( $request ) {
 		}
 		if ( isset( $request['content'] ) ) {
 			$changes->post_content = $request['content'];
-		} elseif ( null !== $template && ! $template->is_custom ) {
+		} elseif ( null !== $template && 'custom' !== $template->source ) {
 			$changes->post_content = $template->content;
 		}
 		if ( isset( $request['title'] ) ) {
 			$changes->post_title = $request['title'];
-		} elseif ( null !== $template && ! $template->is_custom ) {
+		} elseif ( null !== $template && 'custom' !== $template->source ) {
 			$changes->post_title = $template->title;
 		}
 		if ( isset( $request['description'] ) ) {
 			$changes->post_excerpt = $request['description'];
-		} elseif ( null !== $template && ! $template->is_custom ) {
+		} elseif ( null !== $template && 'custom' !== $template->source ) {
 			$changes->post_excerpt = $template->description;
 		}
 
 		if ( 'wp_template_part' === $this->post_type ) {
 			if ( isset( $request['area'] ) ) {
 				$changes->tax_input['wp_template_part_area'] = gutenberg_filter_template_part_area( $request['area'] );
-			} elseif ( null !== $template && ! $template->is_custom && $template->area ) {
+			} elseif ( null !== $template && 'custom' !== $template->source && $template->area ) {
 				$changes->tax_input['wp_template_part_area'] = gutenberg_filter_template_part_area( $template->area );
 			} elseif ( ! $template->area ) {
 				$changes->tax_input['wp_template_part_area'] = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
@@ -384,19 +393,20 @@ protected function prepare_item_for_database( $request ) {
 	 */
 	public function prepare_item_for_response( $template, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 		$result = array(
-			'id'          => $template->id,
-			'theme'       => $template->theme,
-			'content'     => array( 'raw' => $template->content ),
-			'slug'        => $template->slug,
-			'is_custom'   => $template->is_custom,
-			'type'        => $template->type,
-			'description' => $template->description,
-			'title'       => array(
+			'id'             => $template->id,
+			'theme'          => $template->theme,
+			'content'        => array( 'raw' => $template->content ),
+			'slug'           => $template->slug,
+			'source'         => $template->source,
+			'type'           => $template->type,
+			'description'    => $template->description,
+			'title'          => array(
 				'raw'      => $template->title,
 				'rendered' => $template->title,
 			),
-			'status'      => $template->status,
-			'wp_id'       => $template->wp_id,
+			'status'         => $template->status,
+			'wp_id'          => $template->wp_id,
+			'has_theme_file' => $template->has_theme_file,
 		);
 
 		if ( 'wp_template_part' === $template->type ) {
@@ -495,13 +505,13 @@ public function get_item_schema() {
 			'title'      => $this->post_type,
 			'type'       => 'object',
 			'properties' => array(
-				'id'          => array(
+				'id'             => array(
 					'description' => __( 'ID of template.', 'gutenberg' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'slug'        => array(
+				'slug'           => array(
 					'description' => __( 'Unique slug identifying the template.', 'gutenberg' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
@@ -509,47 +519,53 @@ public function get_item_schema() {
 					'minLength'   => 1,
 					'pattern'     => '[a-zA-Z_\-]+',
 				),
-				'theme'       => array(
+				'theme'          => array(
 					'description' => __( 'Theme identifier for the template.', 'gutenberg' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'is_custom'   => array(
-					'description' => __( 'Whether the template is customized.', 'gutenberg' ),
-					'type'        => 'bool',
+				'source'         => array(
+					'description' => __( 'Source of template', 'gutenberg' ),
+					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'content'     => array(
+				'content'        => array(
 					'description' => __( 'Content of template.', 'gutenberg' ),
 					'type'        => array( 'object', 'string' ),
 					'default'     => '',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'title'       => array(
+				'title'          => array(
 					'description' => __( 'Title of template.', 'gutenberg' ),
 					'type'        => array( 'object', 'string' ),
 					'default'     => '',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'description' => array(
+				'description'    => array(
 					'description' => __( 'Description of template.', 'gutenberg' ),
 					'type'        => 'string',
 					'default'     => '',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'status'      => array(
+				'status'         => array(
 					'description' => __( 'Status of template.', 'gutenberg' ),
 					'type'        => 'string',
 					'default'     => 'publish',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'wp_id'       => array(
+				'wp_id'          => array(
 					'description' => __( 'Post ID.', 'gutenberg' ),
 					'type'        => 'integer',
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
+				'has_theme_file' => array(
+					'description' => __( 'Theme file exists.', 'gutenberg' ),
+					'type'        => 'bool',
+					'context'     => array( 'embed', 'view', 'edit' ),
+					'readonly'    => true,
+				),
 			),
 		);
 
diff --git a/packages/e2e-test-utils/README.md b/packages/e2e-test-utils/README.md
index 55e162ac6bec3a..d7e3889ec9dd51 100644
--- a/packages/e2e-test-utils/README.md
+++ b/packages/e2e-test-utils/README.md
@@ -713,6 +713,20 @@ _Parameters_
 -   _width_ `number`: Width of the window.
 -   _height_ `number`: Height of the window.
 
+<a name="wpDataSelect" href="#wpDataSelect">#</a> **wpDataSelect**
+
+Queries the WordPress data module.
+
+_Parameters_
+
+-   _store_ `string`: Store to query e.g: core/editor, core/blocks...
+-   _selector_ `string`: Selector to exectute e.g: getBlocks.
+-   _parameters_ `...Object`: Parameters to pass to the selector.
+
+_Returns_
+
+-   `Promise<?Object>`: Result of querying.
+
 
 <!-- END TOKEN(Autogenerated API docs) -->
 
diff --git a/packages/e2e-test-utils/src/index.js b/packages/e2e-test-utils/src/index.js
index 20fd36167a5b7e..f71d2151ecd362 100644
--- a/packages/e2e-test-utils/src/index.js
+++ b/packages/e2e-test-utils/src/index.js
@@ -77,5 +77,6 @@ export { visitAdminPage } from './visit-admin-page';
 export { waitForWindowDimensions } from './wait-for-window-dimensions';
 export { showBlockToolbar } from './show-block-toolbar';
 export { openPreviewPage } from './preview';
+export { wpDataSelect } from './wp-data-select';
 
 export * from './mocks';
diff --git a/packages/e2e-tests/experimental-features.js b/packages/e2e-tests/experimental-features.js
index a8185b5f36a725..115b69d9e45e2e 100644
--- a/packages/e2e-tests/experimental-features.js
+++ b/packages/e2e-tests/experimental-features.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { addQueryArgs } from '@wordpress/url';
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage, wpDataSelect } from '@wordpress/e2e-test-utils';
 
 async function setExperimentalFeaturesState( features, enable ) {
 	const query = addQueryArgs( '', {
@@ -129,4 +129,36 @@ export const siteEditor = {
 
 		await elementToClick.click();
 	},
+
+	async getEditedPostContent() {
+		const postId = await wpDataSelect(
+			'core/edit-site',
+			'getEditedPostId'
+		);
+		const postType = await wpDataSelect(
+			'core/edit-site',
+			'getEditedPostType'
+		);
+		const record = await wpDataSelect(
+			'core',
+			'getEditedEntityRecord',
+			'postType',
+			postType,
+			postId
+		);
+		if ( record ) {
+			if ( typeof record.content === 'function' ) {
+				return record.content( record );
+			} else if ( record.blocks ) {
+				return await page.evaluate(
+					( blocks ) =>
+						window.wp.blocks.__unstableSerializeAndClean( blocks ),
+					record.blocks
+				);
+			} else if ( record.content ) {
+				return record.content;
+			}
+		}
+		return '';
+	},
 };
diff --git a/packages/e2e-tests/specs/experiments/template-revert.test.js b/packages/e2e-tests/specs/experiments/template-revert.test.js
new file mode 100644
index 00000000000000..cd0dcaa7ab3d5d
--- /dev/null
+++ b/packages/e2e-tests/specs/experiments/template-revert.test.js
@@ -0,0 +1,220 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	insertBlock,
+	trashAllPosts,
+	activateTheme,
+	switchUserToAdmin,
+	switchUserToTest,
+	visitAdminPage,
+} from '@wordpress/e2e-test-utils';
+import { addQueryArgs } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { siteEditor } from '../../experimental-features';
+
+const { visit: visitSiteEditor, getEditedPostContent } = siteEditor;
+
+const assertSaveButtonIsDisabled = () =>
+	page.waitForSelector(
+		'.edit-site-save-button__button[aria-disabled="true"]'
+	);
+
+const assertSaveButtonIsEnabled = () =>
+	page.waitForSelector(
+		'.edit-site-save-button__button[aria-disabled="false"]'
+	);
+
+const waitForNotice = () => page.waitForSelector( '.components-snackbar' );
+
+const clickButtonInNotice = async () => {
+	const selector = '.components-snackbar button';
+	await page.waitForSelector( selector );
+	await page.click( selector );
+};
+
+const clickUndoInHeaderToolbar = () =>
+	page.click( '.edit-site-header__toolbar button[aria-label="Undo"]' );
+
+const clickRedoInHeaderToolbar = () =>
+	page.click( '.edit-site-header__toolbar button[aria-label="Redo"]' );
+
+const undoRevertInHeaderToolbar = async () => {
+	await clickUndoInHeaderToolbar();
+	await assertSaveButtonIsEnabled();
+};
+
+const undoRevertInNotice = async () => {
+	await clickButtonInNotice();
+	await assertSaveButtonIsEnabled();
+};
+
+const addDummyText = async () => {
+	await insertBlock( 'Paragraph' );
+	await page.keyboard.type( 'Test' );
+};
+
+const save = async () => {
+	await page.click( '.edit-site-save-button__button' );
+	await page.click( '.editor-entities-saved-states__save-button' );
+	await page.waitForSelector(
+		'.edit-site-save-button__button:not(.is-busy)'
+	);
+};
+
+const revertTemplate = async () => {
+	await page.click( '.edit-site-document-actions__get-info' );
+	await page.click( '.edit-site-template-details__revert button' );
+	await waitForNotice();
+	await assertSaveButtonIsEnabled();
+};
+
+const assertTemplatesAreDeleted = async () => {
+	await switchUserToAdmin();
+	const query = addQueryArgs( '', {
+		post_type: 'wp_template',
+	} ).slice( 1 );
+	await visitAdminPage( 'edit.php', query );
+	const element = await page.waitForSelector( '#the-list .no-items' );
+	expect( element ).toBeTruthy();
+	await switchUserToTest();
+};
+
+describe( 'Template Revert', () => {
+	beforeAll( async () => {
+		await activateTheme( 'tt1-blocks' );
+		await trashAllPosts( 'wp_template' );
+		await trashAllPosts( 'wp_template_part' );
+	} );
+	afterAll( async () => {
+		await trashAllPosts( 'wp_template' );
+		await trashAllPosts( 'wp_template_part' );
+		await activateTheme( 'twentytwentyone' );
+	} );
+	beforeEach( async () => {
+		await trashAllPosts( 'wp_template' );
+		await visitSiteEditor();
+	} );
+
+	it( 'should delete the template after saving the reverted template', async () => {
+		await addDummyText();
+		await save();
+		await revertTemplate();
+		await save();
+
+		await assertTemplatesAreDeleted();
+	} );
+
+	it( 'should show the original content after revert', async () => {
+		const contentBefore = await getEditedPostContent();
+
+		await addDummyText();
+		await save();
+		await revertTemplate();
+		await save();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the original content after revert and page reload', async () => {
+		const contentBefore = await getEditedPostContent();
+
+		await addDummyText();
+		await save();
+		await revertTemplate();
+		await save();
+		await visitSiteEditor();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the edited content after revert and clicking undo in the header toolbar', async () => {
+		await addDummyText();
+		await save();
+		const contentBefore = await getEditedPostContent();
+
+		await revertTemplate();
+		await save();
+		await undoRevertInHeaderToolbar();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the edited content after revert and clicking undo in the notice', async () => {
+		await addDummyText();
+		await save();
+		const contentBefore = await getEditedPostContent();
+
+		await revertTemplate();
+		await save();
+		await undoRevertInNotice();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the original content after revert, clicking undo then redo in the header toolbar', async () => {
+		const contentBefore = await getEditedPostContent();
+
+		await addDummyText();
+		await save();
+		await revertTemplate();
+		await save();
+		await undoRevertInHeaderToolbar();
+		await clickRedoInHeaderToolbar();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the original content after revert, clicking undo in the notice then undo in the header toolbar', async () => {
+		const contentBefore = await getEditedPostContent();
+
+		await addDummyText();
+		await save();
+		await revertTemplate();
+		await save();
+		await undoRevertInNotice();
+		await undoRevertInHeaderToolbar();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the edited content after revert, clicking undo in the header toolbar, save and reload', async () => {
+		await addDummyText();
+		await save();
+		const contentBefore = await getEditedPostContent();
+
+		await revertTemplate();
+		await save();
+		await clickUndoInHeaderToolbar();
+		await save();
+		await assertSaveButtonIsDisabled();
+		await visitSiteEditor();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+
+	it( 'should show the edited content after revert, clicking undo in the notice and reload', async () => {
+		await addDummyText();
+		await save();
+		const contentBefore = await getEditedPostContent();
+
+		await revertTemplate();
+		await save();
+		await undoRevertInNotice();
+		await save();
+		await visitSiteEditor();
+
+		const contentAfter = await getEditedPostContent();
+		expect( contentBefore ).toBe( contentAfter );
+	} );
+} );
diff --git a/packages/edit-site/src/components/header/index.js b/packages/edit-site/src/components/header/index.js
index 9e6a6fbf31a18d..da94aecc5ae5fe 100644
--- a/packages/edit-site/src/components/header/index.js
+++ b/packages/edit-site/src/components/header/index.js
@@ -14,6 +14,8 @@ import { _x, __ } from '@wordpress/i18n';
 import { listView, plus } from '@wordpress/icons';
 import { Button } from '@wordpress/components';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { store as editorStore } from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -46,15 +48,15 @@ export default function Header( { openEntitiesSavedStates } ) {
 			isInserterOpened,
 			isListViewOpened,
 		} = select( editSiteStore );
-		const { getEntityRecord } = select( 'core' );
+		const { getEditedEntityRecord } = select( coreStore );
 		const { __experimentalGetTemplateInfo: getTemplateInfo } = select(
-			'core/editor'
+			editorStore
 		);
 		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
 
 		const postType = getEditedPostType();
 		const postId = getEditedPostId();
-		const record = getEntityRecord( 'postType', postType, postId );
+		const record = getEditedEntityRecord( 'postType', postType, postId );
 		const _entityTitle =
 			'wp_template' === postType
 				? getTemplateInfo( record ).title
diff --git a/packages/edit-site/src/components/template-details/index.js b/packages/edit-site/src/components/template-details/index.js
index a8896c24ace79b..103c4f0e4107b2 100644
--- a/packages/edit-site/src/components/template-details/index.js
+++ b/packages/edit-site/src/components/template-details/index.js
@@ -2,12 +2,17 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Button, __experimentalText as Text } from '@wordpress/components';
+import {
+	Button,
+	MenuItem,
+	__experimentalText as Text,
+} from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
+import isTemplateRevertable from '../../utils/is-template-revertable';
 import { MENU_TEMPLATES } from '../navigation-sidebar/navigation-panel/constants';
 import { store as editSiteStore } from '../../store';
 
@@ -17,7 +22,9 @@ export default function TemplateDetails( { template, onClose } ) {
 			select( 'core/editor' ).__experimentalGetTemplateInfo( template ),
 		[]
 	);
-	const { openNavigationPanelToMenu } = useDispatch( editSiteStore );
+	const { openNavigationPanelToMenu, revertTemplate } = useDispatch(
+		editSiteStore
+	);
 
 	if ( ! template ) {
 		return null;
@@ -28,6 +35,11 @@ export default function TemplateDetails( { template, onClose } ) {
 		openNavigationPanelToMenu( MENU_TEMPLATES );
 	};
 
+	const revert = () => {
+		revertTemplate( template );
+		onClose();
+	};
+
 	return (
 		<>
 			<div className="edit-site-template-details">
@@ -43,6 +55,17 @@ export default function TemplateDetails( { template, onClose } ) {
 				) }
 			</div>
 
+			{ isTemplateRevertable( template ) && (
+				<div className="edit-site-template-details__revert">
+					<MenuItem
+						info={ __( 'Restore template to theme default' ) }
+						onClick={ revert }
+					>
+						{ __( 'Clear customizations' ) }
+					</MenuItem>
+				</div>
+			) }
+
 			<Button
 				className="edit-site-template-details__show-all-button"
 				onClick={ showTemplateInSidebar }
diff --git a/packages/edit-site/src/components/template-details/style.scss b/packages/edit-site/src/components/template-details/style.scss
index e56595039a37a7..b2e0982b0b072c 100644
--- a/packages/edit-site/src/components/template-details/style.scss
+++ b/packages/edit-site/src/components/template-details/style.scss
@@ -10,6 +10,20 @@
 	color: $gray-700;
 }
 
+.edit-site-template-details__revert {
+	border-top: $border-width solid $gray-400;
+
+	.components-menu-item__button {
+		height: auto;
+		padding: $grid-unit-20;
+		text-align: left;
+
+		&:focus:not(:disabled) {
+			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 3px $white;
+		}
+	}
+}
+
 .edit-site-template-details__show-all-button.components-button {
 	display: block;
 	background: $gray-900;
@@ -27,6 +41,6 @@
 	}
 
 	&:focus:not(:disabled) {
-		box-shadow: inset 0 0 0 1.5px var(--wp-admin-theme-color), inset 0 0 0 3px #fff;
+		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 3px $white;
 	}
 }
diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
index cd898184de86fb..4bad708c4f9131 100644
--- a/packages/edit-site/src/store/actions.js
+++ b/packages/edit-site/src/store/actions.js
@@ -1,15 +1,19 @@
 /**
  * WordPress dependencies
  */
-import { parse } from '@wordpress/blocks';
-import { controls } from '@wordpress/data';
+import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+import { controls, dispatch } from '@wordpress/data';
 import { apiFetch } from '@wordpress/data-controls';
-import { getPathAndQueryString } from '@wordpress/url';
+import { addQueryArgs, getPathAndQueryString } from '@wordpress/url';
+import { __ } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { STORE_NAME as editSiteStoreName } from './constants';
+import isTemplateRevertable from '../utils/is-template-revertable';
 
 /**
  * Returns an action object used to toggle a feature flag.
@@ -298,3 +302,136 @@ export function setIsListViewOpened( isOpen ) {
 		isOpen,
 	};
 }
+
+/**
+ * Reverts a template to its original theme-provided file.
+ *
+ * @param {Object} template The template to revert.
+ */
+export function* revertTemplate( template ) {
+	if ( ! isTemplateRevertable( template ) ) {
+		yield controls.dispatch(
+			noticesStore,
+			'createErrorNotice',
+			__( 'This template is not revertable.' ),
+			{ type: 'snackbar' }
+		);
+		return;
+	}
+
+	try {
+		const templateEntity = yield controls.select(
+			coreStore,
+			'getEntity',
+			'postType',
+			template.type
+		);
+		if ( ! templateEntity ) {
+			yield controls.dispatch(
+				noticesStore,
+				'createErrorNotice',
+				__(
+					'The editor has encountered an unexpected error. Please reload.'
+				),
+				{ type: 'snackbar' }
+			);
+			return;
+		}
+
+		const fileTemplatePath = addQueryArgs(
+			`${ templateEntity.baseURL }/${ template.id }`,
+			{ context: 'edit', source: 'theme' }
+		);
+		const fileTemplate = yield apiFetch( { path: fileTemplatePath } );
+		if ( ! fileTemplate ) {
+			yield controls.dispatch(
+				noticesStore,
+				'createErrorNotice',
+				__(
+					'The editor has encountered an unexpected error. Please reload.'
+				),
+				{ type: 'snackbar' }
+			);
+			return;
+		}
+
+		const serializeBlocks = ( { blocks: blocksForSerialization = [] } ) =>
+			__unstableSerializeAndClean( blocksForSerialization );
+		const edited = yield controls.select(
+			coreStore,
+			'getEditedEntityRecord',
+			'postType',
+			'wp_template',
+			template.id
+		);
+		// We are fixing up the undo level here to make sure we can undo
+		// the revert in the header toolbar correctly.
+		yield controls.dispatch(
+			coreStore,
+			'editEntityRecord',
+			'postType',
+			'wp_template',
+			template.id,
+			{
+				content: serializeBlocks, // required to make the `undo` behave correctly
+				blocks: edited.blocks, // required to revert the blocks in the editor
+				source: 'custom', // required to avoid turning the editor into a dirty state
+			},
+			{
+				undoIgnore: true, // required to merge this edit with the last undo level
+			}
+		);
+
+		const blocks = parse( fileTemplate?.content?.raw );
+		yield controls.dispatch(
+			coreStore,
+			'editEntityRecord',
+			'postType',
+			'wp_template',
+			fileTemplate.id,
+			{
+				content: serializeBlocks,
+				blocks,
+				source: 'theme',
+			}
+		);
+
+		const undoRevert = async () => {
+			await dispatch( coreStore ).editEntityRecord(
+				'postType',
+				'wp_template',
+				edited.id,
+				{
+					content: serializeBlocks,
+					blocks: edited.blocks,
+					source: 'custom',
+				}
+			);
+		};
+		yield controls.dispatch(
+			noticesStore,
+			'createSuccessNotice',
+			__( 'Template reverted.' ),
+			{
+				type: 'snackbar',
+				actions: [
+					{
+						label: __( 'Undo' ),
+						onClick: undoRevert,
+					},
+				],
+			}
+		);
+	} catch ( error ) {
+		const errorMessage =
+			error.message && error.code !== 'unknown_error'
+				? error.message
+				: __( 'Template revert failed. Please reload.' );
+		yield controls.dispatch(
+			noticesStore,
+			'createErrorNotice',
+			errorMessage,
+			{ type: 'snackbar' }
+		);
+	}
+}
diff --git a/packages/edit-site/src/utils/is-template-revertable.js b/packages/edit-site/src/utils/is-template-revertable.js
new file mode 100644
index 00000000000000..c2d42f51c97018
--- /dev/null
+++ b/packages/edit-site/src/utils/is-template-revertable.js
@@ -0,0 +1,14 @@
+/**
+ * Check if a template is revertable to its original theme-provided template file.
+ *
+ * @param {Object} template The template entity to check.
+ * @return {boolean} Whether the template is revertable.
+ */
+export default function isTemplateRevertable( template ) {
+	if ( ! template ) {
+		return false;
+	}
+	/* eslint-disable camelcase */
+	return template?.source === 'custom' && template?.has_theme_file;
+	/* eslint-enable camelcase */
+}
diff --git a/phpunit/class-block-templates-test.php b/phpunit/class-block-templates-test.php
index 43b6d0a891b309..76565358d9159f 100644
--- a/phpunit/class-block-templates-test.php
+++ b/phpunit/class-block-templates-test.php
@@ -92,7 +92,7 @@ function test_gutenberg_build_template_result_from_file() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'single', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( false, $template->is_custom );
+		$this->assertEquals( 'theme', $template->source );
 		$this->assertEquals( 'Single', $template->title );
 		$this->assertEquals( 'Template used to display a single blog post.', $template->description );
 		$this->assertEquals( 'wp_template', $template->type );
@@ -110,7 +110,7 @@ function test_gutenberg_build_template_result_from_file() {
 		$this->assertEquals( get_stylesheet(), $template_part->theme );
 		$this->assertEquals( 'header', $template_part->slug );
 		$this->assertEquals( 'publish', $template_part->status );
-		$this->assertEquals( false, $template_part->is_custom );
+		$this->assertEquals( 'theme', $template_part->source );
 		$this->assertEquals( 'header', $template_part->title );
 		$this->assertEquals( '', $template_part->description );
 		$this->assertEquals( 'wp_template_part', $template_part->type );
@@ -128,7 +128,7 @@ function test_gutenberg_build_template_result_from_post() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'my_template', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( true, $template->is_custom );
+		$this->assertEquals( 'custom', $template->source );
 		$this->assertEquals( 'My Template', $template->title );
 		$this->assertEquals( 'Description of my template', $template->description );
 		$this->assertEquals( 'wp_template', $template->type );
@@ -143,7 +143,7 @@ function test_gutenberg_build_template_result_from_post() {
 		$this->assertEquals( get_stylesheet(), $template_part->theme );
 		$this->assertEquals( 'my_template_part', $template_part->slug );
 		$this->assertEquals( 'publish', $template_part->status );
-		$this->assertEquals( true, $template_part->is_custom );
+		$this->assertEquals( 'custom', $template_part->source );
 		$this->assertEquals( 'My Template Part', $template_part->title );
 		$this->assertEquals( 'Description of my template part', $template_part->description );
 		$this->assertEquals( 'wp_template_part', $template_part->type );
@@ -190,7 +190,7 @@ function test_gutenberg_get_block_template_from_file() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'index', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( false, $template->is_custom );
+		$this->assertEquals( 'theme', $template->source );
 		$this->assertEquals( 'wp_template', $template->type );
 
 		// Test template parts.
@@ -200,7 +200,7 @@ function test_gutenberg_get_block_template_from_file() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'header', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( false, $template->is_custom );
+		$this->assertEquals( 'theme', $template->source );
 		$this->assertEquals( 'wp_template_part', $template->type );
 		// TODO - update 'UNCATEGORIZED' to 'HEADER' once tt1-blocks theme.json updated for template part area info.
 		$this->assertEquals( WP_TEMPLATE_PART_AREA_UNCATEGORIZED, $template->area );
@@ -216,7 +216,7 @@ function test_gutenberg_get_block_template_from_post() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'my_template', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( true, $template->is_custom );
+		$this->assertEquals( 'custom', $template->source );
 		$this->assertEquals( 'wp_template', $template->type );
 
 		// Test template parts.
@@ -226,7 +226,7 @@ function test_gutenberg_get_block_template_from_post() {
 		$this->assertEquals( get_stylesheet(), $template->theme );
 		$this->assertEquals( 'my_template_part', $template->slug );
 		$this->assertEquals( 'publish', $template->status );
-		$this->assertEquals( true, $template->is_custom );
+		$this->assertEquals( 'custom', $template->source );
 		$this->assertEquals( 'wp_template_part', $template->type );
 		$this->assertEquals( WP_TEMPLATE_PART_AREA_SIDEBAR, $template->area );
 	}
diff --git a/phpunit/class-wp-rest-template-controller-test.php b/phpunit/class-wp-rest-template-controller-test.php
index 659120d1ada86b..2f2b9f4735a0d9 100644
--- a/phpunit/class-wp-rest-template-controller-test.php
+++ b/phpunit/class-wp-rest-template-controller-test.php
@@ -62,18 +62,19 @@ function find_and_normalize_template_by_id( $templates, $id ) {
 
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//index',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'index',
-				'title'       => array(
+				'id'             => 'tt1-blocks//index',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'index',
+				'title'          => array(
 					'raw'      => 'Index',
 					'rendered' => 'Index',
 				),
-				'description' => 'The default template used when no other template is available. This is a required template in WordPress.',
-				'status'      => 'publish',
-				'is_custom'   => false,
-				'type'        => 'wp_template',
-				'wp_id'       => null,
+				'description'    => 'The default template used when no other template is available. This is a required template in WordPress.',
+				'status'         => 'publish',
+				'source'         => 'theme',
+				'type'           => 'wp_template',
+				'wp_id'          => null,
+				'has_theme_file' => true,
 			),
 			find_and_normalize_template_by_id( $data, 'tt1-blocks//index' )
 		);
@@ -85,20 +86,21 @@ function find_and_normalize_template_by_id( $templates, $id ) {
 
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//header',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'header',
-				'title'       => array(
+				'id'             => 'tt1-blocks//header',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'header',
+				'title'          => array(
 					'raw'      => 'header',
 					'rendered' => 'header',
 				),
-				'description' => '',
-				'status'      => 'publish',
-				'is_custom'   => false,
-				'type'        => 'wp_template_part',
-				'wp_id'       => null,
+				'description'    => '',
+				'status'         => 'publish',
+				'source'         => 'theme',
+				'type'           => 'wp_template_part',
+				'wp_id'          => null,
 				// TODO - update 'UNCATEGORIZED' to 'HEADER' once tt1-blocks theme.json updated for template part area info.
-				'area'        => WP_TEMPLATE_PART_AREA_UNCATEGORIZED,
+				'area'           => WP_TEMPLATE_PART_AREA_UNCATEGORIZED,
+				'has_theme_file' => true,
 			),
 			find_and_normalize_template_by_id( $data, 'tt1-blocks//header' )
 		);
@@ -114,18 +116,19 @@ public function test_get_item() {
 
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//index',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'index',
-				'title'       => array(
+				'id'             => 'tt1-blocks//index',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'index',
+				'title'          => array(
 					'raw'      => 'Index',
 					'rendered' => 'Index',
 				),
-				'description' => 'The default template used when no other template is available. This is a required template in WordPress.',
-				'status'      => 'publish',
-				'is_custom'   => false,
-				'type'        => 'wp_template',
-				'wp_id'       => null,
+				'description'    => 'The default template used when no other template is available. This is a required template in WordPress.',
+				'status'         => 'publish',
+				'source'         => 'theme',
+				'type'           => 'wp_template',
+				'wp_id'          => null,
+				'has_theme_file' => true,
 			),
 			$data
 		);
@@ -138,20 +141,21 @@ public function test_get_item() {
 		unset( $data['_links'] );
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//header',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'header',
-				'title'       => array(
+				'id'             => 'tt1-blocks//header',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'header',
+				'title'          => array(
 					'raw'      => 'header',
 					'rendered' => 'header',
 				),
-				'description' => '',
-				'status'      => 'publish',
-				'is_custom'   => false,
-				'type'        => 'wp_template_part',
-				'wp_id'       => null,
+				'description'    => '',
+				'status'         => 'publish',
+				'source'         => 'theme',
+				'type'           => 'wp_template_part',
+				'wp_id'          => null,
 				// TODO - update 'UNCATEGORIZED' to 'HEADER' once tt1-blocks theme.json updated for template part area info.
-				'area'        => WP_TEMPLATE_PART_AREA_UNCATEGORIZED,
+				'area'           => WP_TEMPLATE_PART_AREA_UNCATEGORIZED,
+				'has_theme_file' => true,
 			),
 			$data
 		);
@@ -175,20 +179,21 @@ public function test_create_item() {
 
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//my_custom_template',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'my_custom_template',
-				'title'       => array(
+				'id'             => 'tt1-blocks//my_custom_template',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'my_custom_template',
+				'title'          => array(
 					'raw'      => 'My Template',
 					'rendered' => 'My Template',
 				),
-				'description' => 'Just a description',
-				'status'      => 'publish',
-				'is_custom'   => true,
-				'type'        => 'wp_template',
-				'content'     => array(
+				'description'    => 'Just a description',
+				'status'         => 'publish',
+				'source'         => 'custom',
+				'type'           => 'wp_template',
+				'content'        => array(
 					'raw' => 'Content',
 				),
+				'has_theme_file' => false,
 			),
 			$data
 		);
@@ -211,21 +216,22 @@ public function test_create_item() {
 
 		$this->assertEquals(
 			array(
-				'id'          => 'tt1-blocks//my_custom_template_part',
-				'theme'       => 'tt1-blocks',
-				'slug'        => 'my_custom_template_part',
-				'title'       => array(
+				'id'             => 'tt1-blocks//my_custom_template_part',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'my_custom_template_part',
+				'title'          => array(
 					'raw'      => 'My Template Part',
 					'rendered' => 'My Template Part',
 				),
-				'description' => 'Just a description of a template part',
-				'status'      => 'publish',
-				'is_custom'   => true,
-				'type'        => 'wp_template_part',
-				'content'     => array(
+				'description'    => 'Just a description of a template part',
+				'status'         => 'publish',
+				'source'         => 'custom',
+				'type'           => 'wp_template_part',
+				'content'        => array(
 					'raw' => 'Content',
 				),
-				'area'        => 'header',
+				'area'           => 'header',
+				'has_theme_file' => false,
 			),
 			$data
 		);
@@ -242,7 +248,7 @@ public function test_update_item() {
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertEquals( 'My new Index Title', $data['title']['raw'] );
-		$this->assertEquals( true, $data['is_custom'] );
+		$this->assertEquals( 'custom', $data['source'] );
 
 		// Test template parts.
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/template-parts/tt1-blocks//header' );
@@ -254,7 +260,7 @@ public function test_update_item() {
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertEquals( WP_TEMPLATE_PART_AREA_UNCATEGORIZED, $data['area'] );
-		$this->assertEquals( true, $data['is_custom'] );
+		$this->assertEquals( 'custom', $data['source'] );
 	}
 
 	public function test_delete_item() {

From 0cbab3a6bcabc001d9b118beeb5320f816ce5fa9 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 1 Apr 2021 18:58:39 +0800
Subject: [PATCH 26/53] Add post format variation to navigation link block
 (#30403)

* Add post format variation to nav link block

* post format is a taxonomy

* Switch to using custom post type icon for format variation

* Override some values for post_format and post_tag

* Update test snapshot for fallback variations

* Add comment

* Use post_format as name and type for variation

* Remove post format fallback variation
---
 .../block-library/src/navigation-link/edit.js |  2 +
 .../src/navigation-link/index.php             | 46 ++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 09b06798b59615..0348ec76cfd31d 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -117,6 +117,8 @@ function getSuggestionsQuery( type, kind ) {
 			return { type: 'term', subtype: 'category' };
 		case 'tag':
 			return { type: 'term', subtype: 'post_tag' };
+		case 'post_format':
+			return { type: 'post-format' };
 		default:
 			if ( kind === 'taxonomy' ) {
 				return { type: 'term', subtype: type };
diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index 5309df8a510270..2720ea870ddcaa 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -233,8 +233,6 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
  * @return array
  */
 function build_variation_for_navigation_link( $entity, $kind ) {
-	$name = 'post_tag' === $entity->name ? 'tag' : $entity->name;
-
 	$title       = '';
 	$description = '';
 
@@ -245,15 +243,45 @@ function build_variation_for_navigation_link( $entity, $kind ) {
 		$description = $entity->labels->item_link_description;
 	}
 
-	return array(
-		'name'        => $name,
+	$variation = array(
+		'name'        => $entity->name,
 		'title'       => $title,
 		'description' => $description,
 		'attributes'  => array(
-			'type' => $name,
+			'type' => $entity->name,
 			'kind' => $kind,
 		),
 	);
+
+	// Tweak some value for the variations.
+	$variation_overrides = array(
+		'post_tag'    => array(
+			'name'       => 'tag',
+			'attributes' => array(
+				'type' => 'tag',
+				'kind' => $kind,
+			),
+		),
+		'post_format' => array(
+			// The item_link and item_link_description for post formats is the
+			// same as for tags, so need to be overridden.
+			'title'       => __( 'Post Format Link' ),
+			'description' => __( 'A link to a post format' ),
+			'attributes'  => array(
+				'type' => 'post_format',
+				'kind' => $kind,
+			),
+		),
+	);
+
+	if ( array_key_exists( $entity->name, $variation_overrides ) ) {
+		$variation = array_merge(
+			$variation,
+			$variation_overrides[ $entity->name ]
+		);
+	}
+
+	return $variation;
 }
 
 /**
@@ -263,9 +291,13 @@ function build_variation_for_navigation_link( $entity, $kind ) {
  * @throws WP_Error An WP_Error exception parsing the block definition.
  */
 function register_block_core_navigation_link() {
-
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
+
+	// Use two separate arrays as a way to order the variations in the UI.
+	// Known variations (like Post Link and Page Link) are added to the
+	// `built_ins` array. Variations for custom post types and taxonomies are
+	// added to the `variations` array and will always appear after `built-ins.
 	$built_ins  = array();
 	$variations = array();
 
@@ -282,7 +314,7 @@ function register_block_core_navigation_link() {
 	if ( $taxonomies ) {
 		foreach ( $taxonomies as $taxonomy ) {
 			$variation = build_variation_for_navigation_link( $taxonomy, 'taxonomy' );
-			if ( 'category' === $variation['name'] || 'tag' === $variation['name'] ) {
+			if ( 'category' === $variation['name'] || 'tag' === $variation['name'] || 'post_format' === $variation['name'] ) {
 				$built_ins[] = $variation;
 			} else {
 				$variations[] = $variation;

From 28893c2b8d0bd3803eb9b9772a5aa4ae4f354bf6 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 1 Apr 2021 15:05:39 +0400
Subject: [PATCH 27/53] Update feature deprecation guide (#30220)

---
 docs/how-to-guides/backward-compatibility/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/how-to-guides/backward-compatibility/README.md b/docs/how-to-guides/backward-compatibility/README.md
index 82ede6ca49e0bb..8035d003e977fd 100644
--- a/docs/how-to-guides/backward-compatibility/README.md
+++ b/docs/how-to-guides/backward-compatibility/README.md
@@ -48,6 +48,17 @@ As the project evolves, flaws of existing APIs are discovered, or updates are re
 
 To encourage third-party developers to adopt the new APIs instead, we can use the [**deprecated**](/packages/deprecated/README.md) helper to show a message explaining the deprecation and propose the alternative whenever the old API is used.
 
+Make it more clear when the feature was deprecated. Use the `since` and `plugin` options of the helper method.
+
+Example:
+```js
+deprecated( 'wp.components.ClipboardButton', {
+	since: '10.3',
+	plugin: 'Gutenberg',
+	alternative: 'wp.compose.useCopyToClipboard',
+} );
+```
+
 ## Dev Notes
 
 Dev notes are [posts published on the make/core site](https://make.wordpress.org/core/tag/dev-notes/) prior to WordPress releases to inform third-party developers about important changes to the developer APIs, these changes can include:

From 7b22e5fd21da8c44219ed91775e741003a932832 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 1 Apr 2021 19:16:36 +0800
Subject: [PATCH 28/53] Navigation Block: Avoid creating a new array/object on
 every render (#30374)

---
 packages/block-library/src/navigation/edit.js | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
index 0f21df8e75ad3d..9edc6046f9deea 100644
--- a/packages/block-library/src/navigation/edit.js
+++ b/packages/block-library/src/navigation/edit.js
@@ -29,6 +29,19 @@ import useBlockNavigator from './use-block-navigator';
 import NavigationPlaceholder from './placeholder';
 import PlaceholderPreview from './placeholder-preview';
 
+const ALLOWED_BLOCKS = [
+	'core/navigation-link',
+	'core/search',
+	'core/social-links',
+	'core/page-list',
+	'core/spacer',
+];
+
+const LAYOUT = {
+	type: 'default',
+	alignments: [],
+};
+
 function Navigation( {
 	selectedBlockHasDescendants,
 	attributes,
@@ -64,13 +77,7 @@ function Navigation( {
 			className: 'wp-block-navigation__container',
 		},
 		{
-			allowedBlocks: [
-				'core/navigation-link',
-				'core/search',
-				'core/social-links',
-				'core/page-list',
-				'core/spacer',
-			],
+			allowedBlocks: ALLOWED_BLOCKS,
 			orientation: attributes.orientation || 'horizontal',
 			renderAppender:
 				( isImmediateParentOfSelectedBlock &&
@@ -84,10 +91,7 @@ function Navigation( {
 			// Block on the experimental menus screen does not
 			// inherit templateLock={ 'all' }.
 			templateLock: false,
-			__experimentalLayout: {
-				type: 'default',
-				alignments: [],
-			},
+			__experimentalLayout: LAYOUT,
 			placeholder: <PlaceholderPreview />,
 		}
 	);

From dc22fab4e039f0617eb39453d08903b05ff86fa4 Mon Sep 17 00:00:00 2001
From: Kerry Liu <gwwar@users.noreply.github.com>
Date: Thu, 1 Apr 2021 08:34:32 -0700
Subject: [PATCH 29/53] Navigation: use same default implementation of
 __experimentalFetchLinkSuggestions in post, site, navigation, widget editor
 (#29993)

---
 package-lock.json                             |   1 +
 packages/core-data/package.json               |   1 +
 .../__experimental-fetch-link-suggestions.js  | 155 +++++++++++++
 packages/core-data/src/fetch/index.js         |   1 +
 .../__experimental-fetch-link-suggestions.js  | 218 ++++++++++++++++++
 packages/core-data/src/index.js               |   1 +
 packages/edit-navigation/src/index.js         |   9 +-
 .../src/utils/fetch-link-suggestions.js       | 101 --------
 packages/edit-site/src/index.js               |  33 +--
 packages/edit-widgets/src/index.js            |   3 +
 .../provider/use-block-editor-settings.js     | 102 +-------
 11 files changed, 394 insertions(+), 231 deletions(-)
 create mode 100644 packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js
 create mode 100644 packages/core-data/src/fetch/index.js
 create mode 100644 packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
 delete mode 100644 packages/edit-navigation/src/utils/fetch-link-suggestions.js

diff --git a/package-lock.json b/package-lock.json
index 81b7f2e4bb11da..f57d6e92cc0fd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12531,6 +12531,7 @@
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/data-controls": "file:packages/data-controls",
 				"@wordpress/element": "file:packages/element",
+				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/url": "file:packages/url",
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index ce47b5d8b80ffe..cf26b01a42e066 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -32,6 +32,7 @@
 		"@wordpress/data": "file:../data",
 		"@wordpress/data-controls": "file:../data-controls",
 		"@wordpress/element": "file:../element",
+		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/url": "file:../url",
diff --git a/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js b/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js
new file mode 100644
index 00000000000000..ef1a80c95c2437
--- /dev/null
+++ b/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js
@@ -0,0 +1,155 @@
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+import { addQueryArgs } from '@wordpress/url';
+import { decodeEntities } from '@wordpress/html-entities';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Filters the search by type
+ *
+ * @typedef { 'post' | 'term' | 'post-format' } WPLinkSearchType
+ */
+
+/**
+ * @typedef WPLinkSearchOptions
+ *
+ * @property {boolean}             [isInitialSuggestions] Displays initial search suggestions, when true.
+ * @property {WPLinkSearchType}    [type]                 Filters by search type.
+ * @property {string}              [subtype]              Slug of the post-type or taxonomy.
+ * @property {number}              [page]                 Which page of results to return.
+ * @property {number}              [perPage]              Search results per page.
+ */
+
+/**
+ * @typedef WPLinkSearchResult
+ *
+ * @property {number} id     Post or term id.
+ * @property {string} url    Link url.
+ * @property {string} title  Title of the link.
+ * @property {string} type   The taxonomy or post type slug or type URL.
+ */
+
+/**
+ * @typedef WPEditorSettings
+ *
+ * @property {boolean} [ disablePostFormats ] Disables post formats, when true.
+ */
+
+/**
+ * Fetches link suggestions from the API.
+ *
+ * @async
+ * @param {string}              search
+ * @param {WPLinkSearchOptions} [searchOptions]
+ * @param {WPEditorSettings}    [settings]
+ *
+ * @example
+ * ```js
+ * import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
+ *
+ * //...
+ *
+ * export function initialize( id, settings ) {
+ *
+ * settings.__experimentalFetchLinkSuggestions = (
+ *     search,
+ *     searchOptions
+ * ) => fetchLinkSuggestions( search, searchOptions, settings );
+ * ```
+ * @return {Promise< WPLinkSearchResult[] >} List of search suggestions
+ */
+const fetchLinkSuggestions = async (
+	search,
+	searchOptions = {},
+	settings = {}
+) => {
+	const {
+		isInitialSuggestions = false,
+		type = undefined,
+		subtype = undefined,
+		page = undefined,
+		perPage = isInitialSuggestions ? 3 : 20,
+	} = searchOptions;
+
+	const { disablePostFormats = false } = settings;
+
+	const queries = [];
+
+	if ( ! type || type === 'post' ) {
+		queries.push(
+			apiFetch( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'post',
+					subtype,
+				} ),
+			} ).catch( () => [] ) // fail by returning no results
+		);
+	}
+
+	if ( ! type || type === 'term' ) {
+		queries.push(
+			apiFetch( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'term',
+					subtype,
+				} ),
+			} ).catch( () => [] )
+		);
+	}
+
+	if ( ! disablePostFormats && ( ! type || type === 'post-format' ) ) {
+		queries.push(
+			apiFetch( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'post-format',
+					subtype,
+				} ),
+			} ).catch( () => [] )
+		);
+	}
+
+	return Promise.all( queries ).then( ( results ) => {
+		return results
+			.reduce(
+				( accumulator, current ) => accumulator.concat( current ), //flatten list
+				[]
+			)
+			.filter(
+				/**
+				 * @param {{ id: number }} result
+				 */
+				( result ) => {
+					return !! result.id;
+				}
+			)
+			.slice( 0, perPage )
+			.map(
+				/**
+				 * @param {{ id: number, url:string, title?:string, subtype?: string, type?: string }} result
+				 */
+				( result ) => {
+					return {
+						id: result.id,
+						url: result.url,
+						title:
+							decodeEntities( result.title || '' ) ||
+							__( '(no title)' ),
+						type: result.subtype || result.type,
+					};
+				}
+			);
+	} );
+};
+
+export default fetchLinkSuggestions;
diff --git a/packages/core-data/src/fetch/index.js b/packages/core-data/src/fetch/index.js
new file mode 100644
index 00000000000000..f01b9008b8196f
--- /dev/null
+++ b/packages/core-data/src/fetch/index.js
@@ -0,0 +1 @@
+export { default as __experimentalFetchLinkSuggestions } from './__experimental-fetch-link-suggestions';
diff --git a/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js b/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
new file mode 100644
index 00000000000000..82a68cc7974396
--- /dev/null
+++ b/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
@@ -0,0 +1,218 @@
+/**
+ * Internal dependencies
+ */
+import fetchLinkSuggestions from '../__experimental-fetch-link-suggestions';
+
+jest.mock( '@wordpress/api-fetch', () =>
+	jest.fn( ( { path } ) => {
+		switch ( path ) {
+			case '/wp/v2/search?search=&per_page=20&type=post':
+			case '/wp/v2/search?search=Contact&per_page=20&type=post&subtype=page':
+				return Promise.resolve( [
+					{
+						id: 37,
+						title: 'Contact Page',
+						url: 'http://wordpress.local/contact-page/',
+						type: 'post',
+						subtype: 'page',
+					},
+				] );
+			case '/wp/v2/search?search=&per_page=20&type=term':
+			case '/wp/v2/search?search=cat&per_page=20&type=term&subtype=category':
+				return Promise.resolve( [
+					{
+						id: 9,
+						title: 'Cats',
+						url: 'http://wordpress.local/category/cats/',
+						type: 'category',
+					},
+					{
+						id: 1,
+						title: 'Uncategorized',
+						url: 'http://wordpress.local/category/uncategorized/',
+						type: 'category',
+					},
+				] );
+			case '/wp/v2/search?search=&per_page=20&type=post-format':
+				return Promise.resolve( [
+					{
+						id: 'gallery',
+						title: 'Gallery',
+						url: 'http://wordpress.local/type/gallery/',
+						type: 'post-format',
+					},
+					{
+						id: 'quote',
+						title: 'Quote',
+						url: 'http://wordpress.local/type/quote/',
+						type: 'post-format',
+					},
+				] );
+			case '/wp/v2/search?search=&per_page=3&type=post&subtype=page':
+				return Promise.resolve( [
+					{
+						id: 11,
+						title: 'Limit Case',
+						url: 'http://wordpress.local/limit-case/',
+						type: 'post',
+						subtype: 'page',
+					},
+				] );
+			case '/wp/v2/search?search=&page=11&per_page=20&type=post&subtype=page':
+				return Promise.resolve( [
+					{
+						id: 22,
+						title: 'Page Case',
+						url: 'http://wordpress.local/page-case/',
+						type: 'post',
+						subtype: 'page',
+					},
+				] );
+			default:
+				return Promise.resolve( [
+					{
+						id: -1,
+						title: 'missing case or failed',
+						url: path,
+						type: 'missing case or failed',
+					},
+				] );
+		}
+	} )
+);
+
+describe( 'fetchLinkSuggestions', () => {
+	it( 'filters suggestions by post-type', () => {
+		return fetchLinkSuggestions( 'Contact', {
+			type: 'post',
+			subtype: 'page',
+		} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 37,
+					title: 'Contact Page',
+					type: 'page',
+					url: 'http://wordpress.local/contact-page/',
+				},
+			] )
+		);
+	} );
+	it( 'filters suggestions by term', () => {
+		return fetchLinkSuggestions( 'cat', {
+			type: 'term',
+			subtype: 'category',
+		} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 9,
+					title: 'Cats',
+					url: 'http://wordpress.local/category/cats/',
+					type: 'category',
+				},
+				{
+					id: 1,
+					title: 'Uncategorized',
+					url: 'http://wordpress.local/category/uncategorized/',
+					type: 'category',
+				},
+			] )
+		);
+	} );
+	it( 'filters suggestions by post-format', () => {
+		return fetchLinkSuggestions( '', {
+			type: 'post-format',
+		} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 'gallery',
+					title: 'Gallery',
+					url: 'http://wordpress.local/type/gallery/',
+					type: 'post-format',
+				},
+				{
+					id: 'quote',
+					title: 'Quote',
+					url: 'http://wordpress.local/type/quote/',
+					type: 'post-format',
+				},
+			] )
+		);
+	} );
+	it( 'filters does not return post-format suggestions when formats are not supported', () => {
+		return fetchLinkSuggestions(
+			'',
+			{
+				type: 'post-format',
+			},
+			{ disablePostFormats: true }
+		).then( ( suggestions ) => expect( suggestions ).toEqual( [] ) );
+	} );
+	it( 'returns suggestions from post, term, and post-format', () => {
+		return fetchLinkSuggestions( '', {} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 37,
+					title: 'Contact Page',
+					url: 'http://wordpress.local/contact-page/',
+					type: 'page',
+				},
+				{
+					id: 9,
+					title: 'Cats',
+					url: 'http://wordpress.local/category/cats/',
+					type: 'category',
+				},
+				{
+					id: 1,
+					title: 'Uncategorized',
+					url: 'http://wordpress.local/category/uncategorized/',
+					type: 'category',
+				},
+				{
+					id: 'gallery',
+					title: 'Gallery',
+					url: 'http://wordpress.local/type/gallery/',
+					type: 'post-format',
+				},
+				{
+					id: 'quote',
+					title: 'Quote',
+					url: 'http://wordpress.local/type/quote/',
+					type: 'post-format',
+				},
+			] )
+		);
+	} );
+	it( 'initial search suggestions limits results', () => {
+		return fetchLinkSuggestions( '', {
+			type: 'post',
+			subtype: 'page',
+			isInitialSuggestions: true,
+		} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 11,
+					title: 'Limit Case',
+					url: 'http://wordpress.local/limit-case/',
+					type: 'page',
+				},
+			] )
+		);
+	} );
+	it( 'allows searching from a page', () => {
+		return fetchLinkSuggestions( '', {
+			type: 'post',
+			subtype: 'page',
+			page: 11,
+		} ).then( ( suggestions ) =>
+			expect( suggestions ).toEqual( [
+				{
+					id: 22,
+					title: 'Page Case',
+					url: 'http://wordpress.local/page-case/',
+					type: 'page',
+				},
+			] )
+		);
+	} );
+} );
diff --git a/packages/core-data/src/index.js b/packages/core-data/src/index.js
index 7d7ab99194c1d2..5f2a2035afbd2e 100644
--- a/packages/core-data/src/index.js
+++ b/packages/core-data/src/index.js
@@ -78,3 +78,4 @@ register( store );
 
 export { default as EntityProvider } from './entity-provider';
 export * from './entity-provider';
+export * from './fetch';
diff --git a/packages/edit-navigation/src/index.js b/packages/edit-navigation/src/index.js
index 8421751159f90f..54ecb2df73c889 100644
--- a/packages/edit-navigation/src/index.js
+++ b/packages/edit-navigation/src/index.js
@@ -6,11 +6,12 @@ import {
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
 import { render } from '@wordpress/element';
+import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
+
 /**
  * Internal dependencies
  */
 import { addFilters } from './filters';
-import fetchLinkSuggestions from './utils/fetch-link-suggestions';
 
 /**
  * Internal dependencies
@@ -26,10 +27,8 @@ export function initialize( id, settings ) {
 		__experimentalRegisterExperimentalCoreBlocks();
 	}
 
-	settings.__experimentalFetchLinkSuggestions = (
-		searchText,
-		searchOptions
-	) => fetchLinkSuggestions( searchText, searchOptions, settings );
+	settings.__experimentalFetchLinkSuggestions = ( search, searchOptions ) =>
+		fetchLinkSuggestions( search, searchOptions, settings );
 
 	render(
 		<Layout blockEditorSettings={ settings } />,
diff --git a/packages/edit-navigation/src/utils/fetch-link-suggestions.js b/packages/edit-navigation/src/utils/fetch-link-suggestions.js
deleted file mode 100644
index 94a4e1587b15d7..00000000000000
--- a/packages/edit-navigation/src/utils/fetch-link-suggestions.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * WordPress dependencies
- */
-import apiFetch from '@wordpress/api-fetch';
-import { addQueryArgs } from '@wordpress/url';
-/**
- * External dependencies
- */
-import { flatten, map } from 'lodash';
-import { decodeEntities } from '@wordpress/html-entities';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Fetches link suggestions from the API. This function is an exact copy of a function found at:
- *
- * packages/editor/src/components/provider/index.js
- *
- * It seems like there is no suitable package to import this from. Ideally it would be either part of core-data.
- * Until we refactor it, just copying the code is the simplest solution.
- *
- * @param {string} search
- * @param {Object} [searchArguments]
- * @param {number} [searchArguments.isInitialSuggestions]
- * @param {number} [searchArguments.type]
- * @param {number} [searchArguments.subtype]
- * @param {Object} [editorSettings]
- * @param {boolean} [editorSettings.disablePostFormats=false]
- * @return {Promise<Object[]>} List of suggestions
- */
-
-export default function fetchLinkSuggestions(
-	search,
-	{ isInitialSuggestions, type, subtype } = {},
-	{ disablePostFormats = false } = {}
-) {
-	const perPage = isInitialSuggestions ? 3 : 20;
-
-	const linkTypes = [ 'post', 'term', 'post-format' ];
-
-	linkTypes.forEach( ( linkType ) => {
-		if ( ! type || type === linkType ) {
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					per_page: perPage,
-					type: 'post',
-					subtype,
-				} ),
-			} ).catch( () => [] ); // fail by returning no results
-		}
-	} );
-	const queries = [];
-
-	if ( ! type || type === 'post' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					per_page: perPage,
-					type: 'post',
-					subtype,
-				} ),
-			} ).catch( () => [] ) // fail by returning no results
-		);
-	}
-
-	if ( ! type || type === 'term' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					per_page: perPage,
-					type: 'term',
-					subtype,
-				} ),
-			} ).catch( () => [] )
-		);
-	}
-
-	if ( ! disablePostFormats && ( ! type || type === 'post-format' ) ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					per_page: perPage,
-					type: 'post-format',
-					subtype,
-				} ),
-			} ).catch( () => [] )
-		);
-	}
-
-	return Promise.all( queries ).then( ( results ) => {
-		return map( flatten( results ).slice( 0, perPage ), ( result ) => ( {
-			id: result.id,
-			url: result.url,
-			title: decodeEntities( result.title ) || __( '(no title)' ),
-			type: result.subtype || result.type,
-		} ) );
-	} );
-}
diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
index 29ad1c6a801d99..fe42ad69af26c6 100644
--- a/packages/edit-site/src/index.js
+++ b/packages/edit-site/src/index.js
@@ -1,14 +1,12 @@
 /**
  * WordPress dependencies
  */
-import apiFetch from '@wordpress/api-fetch';
-import { addQueryArgs } from '@wordpress/url';
-import { __ } from '@wordpress/i18n';
 import {
 	registerCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
 import { render } from '@wordpress/element';
+import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -18,32 +16,6 @@ import './hooks';
 import './store';
 import Editor from './components/editor';
 
-const fetchLinkSuggestions = ( search, { perPage = 20 } = {} ) =>
-	apiFetch( {
-		path: addQueryArgs( '/wp/v2/search', {
-			per_page: perPage,
-			search,
-			type: 'post',
-			subtype: 'post',
-		} ),
-	} )
-		.then( ( posts ) =>
-			Promise.all(
-				posts.map( ( post ) =>
-					apiFetch( { url: post._links.self[ 0 ].href } )
-				)
-			)
-		)
-		.then( ( posts ) =>
-			posts.map( ( post ) => ( {
-				url: post.link,
-				type: post.type,
-				id: post.id,
-				slug: post.slug,
-				title: post.title.rendered || __( '(no title)' ),
-			} ) )
-		);
-
 /**
  * Initializes the site editor screen.
  *
@@ -51,7 +23,8 @@ const fetchLinkSuggestions = ( search, { perPage = 20 } = {} ) =>
  * @param {Object} settings Editor settings.
  */
 export function initialize( id, settings ) {
-	settings.__experimentalFetchLinkSuggestions = fetchLinkSuggestions;
+	settings.__experimentalFetchLinkSuggestions = ( search, searchOptions ) =>
+		fetchLinkSuggestions( search, searchOptions, settings );
 	settings.__experimentalSpotlightEntityBlocks = [ 'core/template-part' ];
 
 	registerCoreBlocks();
diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
index 57ffb98bde4f54..521c997ec791b3 100644
--- a/packages/edit-widgets/src/index.js
+++ b/packages/edit-widgets/src/index.js
@@ -11,6 +11,7 @@ import {
 	__experimentalGetCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
+import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -39,6 +40,8 @@ export function initialize( id, settings ) {
 	}
 	registerLegacyWidgetVariations( settings );
 	registerBlock( widgetArea );
+	settings.__experimentalFetchLinkSuggestions = ( search, searchOptions ) =>
+		fetchLinkSuggestions( search, searchOptions, settings );
 	render(
 		<Layout blockEditorSettings={ settings } />,
 		document.getElementById( id )
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index 6638f091994172..64fb570b5d945c 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -1,18 +1,17 @@
 /**
  * External dependencies
  */
-import { map, pick, defaultTo, flatten, partialRight } from 'lodash';
+import { pick, defaultTo } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { Platform, useMemo } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
-import apiFetch from '@wordpress/api-fetch';
-import { addQueryArgs } from '@wordpress/url';
-import { decodeEntities } from '@wordpress/html-entities';
+import {
+	store as coreStore,
+	__experimentalFetchLinkSuggestions as fetchLinkSuggestions,
+} from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -20,91 +19,6 @@ import { decodeEntities } from '@wordpress/html-entities';
 import { mediaUpload } from '../../utils';
 import { store as editorStore } from '../../store';
 
-/**
- * Fetches link suggestions from the API. This function is an exact copy of a function found at:
- *
- * packages/edit-navigation/src/index.js
- *
- * It seems like there is no suitable package to import this from. Ideally it would be either part of core-data.
- * Until we refactor it, just copying the code is the simplest solution.
- *
- * @param {string} search
- * @param {Object} [searchArguments]
- * @param {number} [searchArguments.isInitialSuggestions]
- * @param {number} [searchArguments.type]
- * @param {number} [searchArguments.subtype]
- * @param {number} [searchArguments.page]
- * @param {Object} [editorSettings]
- * @param {boolean} [editorSettings.disablePostFormats=false]
- * @return {Promise<Object[]>} List of suggestions
- */
-
-const fetchLinkSuggestions = async (
-	search,
-	{ isInitialSuggestions, type, subtype, page, perPage: perPageArg } = {},
-	{ disablePostFormats = false } = {}
-) => {
-	const perPage = perPageArg || isInitialSuggestions ? 3 : 20;
-
-	const queries = [];
-
-	if ( ! type || type === 'post' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'post',
-					subtype,
-				} ),
-			} ).catch( () => [] ) // fail by returning no results
-		);
-	}
-
-	if ( ! type || type === 'term' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'term',
-					subtype,
-				} ),
-			} ).catch( () => [] )
-		);
-	}
-
-	if ( ! disablePostFormats && ( ! type || type === 'post-format' ) ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'post-format',
-					subtype,
-				} ),
-			} ).catch( () => [] )
-		);
-	}
-
-	return Promise.all( queries ).then( ( results ) => {
-		return map(
-			flatten( results )
-				.filter( ( result ) => !! result.id )
-				.slice( 0, perPage ),
-			( result ) => ( {
-				id: result.id,
-				url: result.url,
-				title: decodeEntities( result.title ) || __( '(no title)' ),
-				type: result.subtype || result.type,
-			} )
-		);
-	} );
-};
-
 /**
  * React hook used to compute the block editor settings to use for the post editor.
  *
@@ -191,10 +105,8 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			] ),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			__experimentalReusableBlocks: reusableBlocks,
-			__experimentalFetchLinkSuggestions: partialRight(
-				fetchLinkSuggestions,
-				settings
-			),
+			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>
+				fetchLinkSuggestions( search, searchOptions, settings ),
 			__experimentalCanUserUseUnfilteredHTML: canUseUnfilteredHTML,
 			__experimentalUndo: undo,
 			__experimentalShouldInsertAtTheTop: isTitleSelected,

From 4d4ce410c7983a24c2969cd44640faa7bf4f1a07 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 1 Apr 2021 16:36:38 +0100
Subject: [PATCH 30/53] Fix the link color support for themes without
 theme.json file (#30452)

---
 lib/global-styles.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/global-styles.php b/lib/global-styles.php
index 9a935de29145eb..7a7225f4bf816c 100644
--- a/lib/global-styles.php
+++ b/lib/global-styles.php
@@ -158,7 +158,9 @@ function gutenberg_experimental_global_styles_get_stylesheet( $tree, $type = 'al
  * and enqueues the resulting stylesheet.
  */
 function gutenberg_experimental_global_styles_enqueue_assets() {
-	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if (
+		! get_theme_support( 'experimental-link-color' ) && // link color support needs the presets CSS variables regardless of the presence of theme.json file.
+		! WP_Theme_JSON_Resolver::theme_has_support() ) {
 		return;
 	}
 
@@ -231,7 +233,10 @@ function_exists( 'gutenberg_is_edit_site_page' ) &&
 
 		$settings['__experimentalGlobalStylesUserEntityId'] = $user_cpt_id;
 		$settings['__experimentalGlobalStylesBaseStyles']   = $base_styles;
-	} elseif ( WP_Theme_JSON_Resolver::theme_has_support() ) {
+	} elseif (
+		WP_Theme_JSON_Resolver::theme_has_support() ||
+		get_theme_support( 'experimental-link-color' ) // link color support needs the presets CSS variables regardless of the presence of theme.json file.
+	) {
 		// STEP 3 - ADD STYLES IF THEME HAS SUPPORT
 		//
 		// If we are in a block editor context, but not in edit-site,

From 9db7e9959c97bd8637021614818ee7086e4d4a2d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hello@hellofromtonya.com>
Date: Thu, 1 Apr 2021 10:43:26 -0500
Subject: [PATCH 31/53] Delete sitelogo option when custom logo does not exist
 or was removed. (#30427)

---
 packages/block-library/src/site-logo/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/site-logo/index.php b/packages/block-library/src/site-logo/index.php
index 1d1659d20bc98d..62a046aca9e080 100644
--- a/packages/block-library/src/site-logo/index.php
+++ b/packages/block-library/src/site-logo/index.php
@@ -74,7 +74,11 @@ function override_custom_logo_theme_mod( $custom_logo ) {
  * @return string The custom logo.
  */
 function sync_site_logo_to_theme_mod( $custom_logo ) {
-	if ( $custom_logo ) {
+	// Delete the option when the custom logo does not exist or was removed.
+	// This step ensures the option stays in sync.
+	if ( empty( $custom_logo ) ) {
+		delete_option( 'sitelogo' );
+	} else {
 		update_option( 'sitelogo', $custom_logo );
 	}
 	return $custom_logo;

From a59d42df5cf8cf9cfa6418353f7a4e1c55380614 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell.reigstad@automattic.com>
Date: Thu, 1 Apr 2021 11:49:01 -0400
Subject: [PATCH 32/53] Revert "Try using the column-gap property to improve
 spacing between custom-sized buttons (#29165)" (#30449)

This reverts commit 069aa44883e151d35c785968c44b00edcc5c6f17.
---
 packages/block-library/src/button/style.scss  | 28 -------------------
 packages/block-library/src/buttons/style.scss |  1 -
 2 files changed, 29 deletions(-)

diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index e6eff8f378f56b..ba2a7c98bcf982 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -61,34 +61,6 @@ $blocks-block__margin: 0.5em;
 	}
 }
 
-// If the browser supports column-gap, use that instead of the margins above.
-@supports ( column-gap: #{ $blocks-block__margin } ) {
-	.wp-block-buttons > .wp-block-button {
-		// Added .wp-block specificity needed to override the default button margin.
-		&.wp-block,
-		&.has-custom-width {
-			margin-right: 0;
-		}
-
-		&.wp-block-button__width-25 {
-			width: calc(25% - #{ $blocks-block__margin * 0.75 });
-		}
-
-		&.wp-block-button__width-50 {
-			width: calc(50% - #{ $blocks-block__margin * 0.5 });
-		}
-
-		&.wp-block-button__width-75 {
-			width: calc(75% - #{ $blocks-block__margin * 0.25 });
-		}
-
-		&.wp-block-button__width-100 {
-			width: auto;
-			flex-basis: 100%;
-		}
-	}
-}
-
 // the first selector is required for old buttons markup
 .wp-block-button.is-style-squared,
 .wp-block-button__link.wp-block-button.is-style-squared {
diff --git a/packages/block-library/src/buttons/style.scss b/packages/block-library/src/buttons/style.scss
index 95ffef779791bb..568a44824f53e3 100644
--- a/packages/block-library/src/buttons/style.scss
+++ b/packages/block-library/src/buttons/style.scss
@@ -5,7 +5,6 @@ $blocks-block__margin: 0.5em;
 	display: flex;
 	flex-direction: row;
 	flex-wrap: wrap;
-	column-gap: $blocks-block__margin;
 
 	&.is-vertical {
 		flex-direction: column;

From 2c491ad941060b5076bc43093ae7f81788d5b848 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 1 Apr 2021 19:35:13 +0100
Subject: [PATCH 33/53] Restore the inner div of the group block in the editor
 for classic themes (#30453)

---
 packages/block-library/src/group/edit.js | 36 ++++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/block-library/src/group/edit.js b/packages/block-library/src/group/edit.js
index 9c2355dc7c3a99..bb88f00772a7e0 100644
--- a/packages/block-library/src/group/edit.js
+++ b/packages/block-library/src/group/edit.js
@@ -34,17 +34,22 @@ function GroupEdit( { attributes, setAttributes, clientId } ) {
 			? [ 'wide', 'full' ]
 			: [ 'left', 'center', 'right' ];
 	const blockProps = useBlockProps();
-	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		templateLock,
-		renderAppender: hasInnerBlocks
-			? undefined
-			: InnerBlocks.ButtonBlockAppender,
-		__experimentalLayout: {
-			type: 'default',
-			// Find a way to inject this in the support flag code (hooks).
-			alignments: themeSupportsLayout ? alignments : undefined,
-		},
-	} );
+	const innerBlocksProps = useInnerBlocksProps(
+		themeSupportsLayout
+			? blockProps
+			: { className: 'wp-block-group__inner-container' },
+		{
+			templateLock,
+			renderAppender: hasInnerBlocks
+				? undefined
+				: InnerBlocks.ButtonBlockAppender,
+			__experimentalLayout: {
+				type: 'default',
+				// Find a way to inject this in the support flag code (hooks).
+				alignments: themeSupportsLayout ? alignments : undefined,
+			},
+		}
+	);
 
 	return (
 		<>
@@ -66,7 +71,14 @@ function GroupEdit( { attributes, setAttributes, clientId } ) {
 					}
 				/>
 			</InspectorAdvancedControls>
-			<TagName { ...innerBlocksProps } />
+			{ themeSupportsLayout && <TagName { ...innerBlocksProps } /> }
+			{ /* Ideally this is not needed but it's there for backward compatibility reason
+				to keep this div for themes that might rely on its presence */ }
+			{ ! themeSupportsLayout && (
+				<TagName { ...blockProps }>
+					<div { ...innerBlocksProps } />
+				</TagName>
+			) }
 		</>
 	);
 }

From 7473b539a9f51afb3b4f221cbd0e6b146981c782 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 1 Apr 2021 21:50:01 +0100
Subject: [PATCH 34/53] Fix content loss for group block (#30460)

Co-authored-by: Bernie Reiter <ockham@raz.or.at>
---
 lib/block-supports/layout.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
index bae12fb6912ce8..a5ab0dbf261a59 100644
--- a/lib/block-supports/layout.php
+++ b/lib/block-supports/layout.php
@@ -119,7 +119,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
  * @return string                Filtered block content.
  */
 function gutenberg_restore_group_inner_container( $block_content, $block ) {
-	$group_with_inner_container_regex = '/(^(\s|\S)*<div\b[^>]*wp-block-group(\s|")[^>]*>)(([\s]|\S)*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
+	$group_with_inner_container_regex = '/(^\s*<div\b[^>]*wp-block-group(\s|")[^>]*>)(\s*<div\b[^>]*wp-block-group__inner-container(\s|")[^>]*>)((.|\S|\s)*)/';
 
 	if (
 		'core/group' !== $block['blockName'] ||
@@ -129,15 +129,14 @@ function gutenberg_restore_group_inner_container( $block_content, $block ) {
 		return $block_content;
 	}
 
-	$replace_regex   = '/(^(\s|\S)*<div\b[^>]*wp-block-group[^>]*>)((.|\S|\s)*)(<\/div>(\s|\S)*$)/m';
+	$replace_regex   = '/(^\s*<div\b[^>]*wp-block-group[^>]*>)(.*)(<\/div>\s*$)/ms';
 	$updated_content = preg_replace_callback(
 		$replace_regex,
 		function( $matches ) {
-			return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[3] . '</div>' . $matches[5];
+			return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[2] . '</div>' . $matches[3];
 		},
 		$block_content
 	);
-
 	return $updated_content;
 }
 

From 505a0ed5f4d391e886979db48d3767dfda618363 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Thu, 1 Apr 2021 20:54:38 +0000
Subject: [PATCH 35/53] Bump plugin version to 10.3.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 readme.txt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 74dabab72d3a69..06561f7d0b06b6 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
  * Requires at least: 5.6
  * Requires PHP: 5.6
- * Version: 10.3.0
+ * Version: 10.3.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index f57d6e92cc0fd8..df3e2ebd8825dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0",
+	"version": "10.3.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index cb2e78fcbb1b3a..a65896086d3acc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "10.3.0",
+	"version": "10.3.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
diff --git a/readme.txt b/readme.txt
index f18e4630ba4458..55143c81c6ddd2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -55,4 +55,4 @@ View <a href="https://developer.wordpress.org/block-editor/principles/versions-i
 
 == Changelog ==
 
-To read the changelog for Gutenberg 10.3.0, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.0">release page</a>.
+To read the changelog for Gutenberg 10.3.1, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v10.3.1">release page</a>.

From 83128b2b51a88acd65139b1da8116b307b45d865 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Thu, 1 Apr 2021 21:07:19 +0000
Subject: [PATCH 36/53] Update Changelog for 10.3.1

---
 changelog.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 50eb6f10d5be23..2fb596dc5c402c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,14 @@
 == Changelog ==
 
+= 10.3.1 =
+
+### Bug Fixes
+
+- Restore color preset CSS variables for custom links for themes with the  `experimental-link-color` support flag enabled. ([30452](https://github.com/WordPress/gutenberg/pull/30452))
+- Restore the inner `<div />` of the Group block in the editor for classic themes. ([30453](https://github.com/WordPress/gutenberg/pull/30453))
+- Fix content loss for Group block when used with lots of nesting. ([30460](https://github.com/WordPress/gutenberg/pull/30460))
+
+
 = 10.3.0 =
 
 ### Enhancements

From 68c3978be352c6d3982f73bcf8c80744608c53c8 Mon Sep 17 00:00:00 2001
From: Paul Von Schrottky <paul.von.schrottky@automattic.com>
Date: Thu, 1 Apr 2021 20:36:47 -0400
Subject: [PATCH 37/53] Mobile Release v1.50.0 (#30418)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Release script: Update react-native-editor version to 1.50.0

* Release script: Update with changes from 'npm run core preios'

* Gutenberg Plugin: Remove deprecations planned for 10.3 release (#30417)

* Gutenberg Plugin: Remove deprecations planned for 10.3 release

* Docs: Add changelog entry

* Closed changelog for 1.50.0

Co-authored-by: Greg Ziółkowski <grzegorz@gziolo.pl>
---
 packages/react-native-aztec/package.json      | 2 +-
 packages/react-native-bridge/package.json     | 2 +-
 packages/react-native-editor/CHANGELOG.md     | 2 ++
 packages/react-native-editor/ios/Gemfile.lock | 5 ++++-
 packages/react-native-editor/ios/Podfile.lock | 8 ++++----
 packages/react-native-editor/package.json     | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json
index bbd87100b2f0e6..815e2cac3b63f5 100644
--- a/packages/react-native-aztec/package.json
+++ b/packages/react-native-aztec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-aztec",
-	"version": "1.49.0",
+	"version": "1.50.0",
 	"description": "Aztec view for react-native.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json
index 3bb0db42bd2885..e64ec1780b3f5b 100644
--- a/packages/react-native-bridge/package.json
+++ b/packages/react-native-bridge/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-bridge",
-	"version": "1.49.0",
+	"version": "1.50.0",
 	"description": "Native bridge library used to integrate the block editor into a native App.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index de522914b7c4be..4bbf6f4ae9db1d 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -11,6 +11,8 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 
+## 1.50.0
+
 -   [***] a11y: Screenreader improvements for the UnitControl component [#29741]
 
 ## 1.49.0
diff --git a/packages/react-native-editor/ios/Gemfile.lock b/packages/react-native-editor/ios/Gemfile.lock
index 8537a61386f86b..cd2c385ba653bc 100644
--- a/packages/react-native-editor/ios/Gemfile.lock
+++ b/packages/react-native-editor/ios/Gemfile.lock
@@ -1,3 +1,6 @@
+GEM
+  specs:
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -80,4 +83,4 @@ DEPENDENCIES
   cocoapods (~> 1.8.0)!
 
 BUNDLED WITH
-   2.0.2
+   2.2.10
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index bb43afd0154c5d..949515bc92a06c 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -21,7 +21,7 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Gutenberg (1.49.0):
+  - Gutenberg (1.50.0):
     - React-Core (= 0.61.5)
     - React-CoreModules (= 0.61.5)
     - React-RCTImage (= 0.61.5)
@@ -253,7 +253,7 @@ PODS:
     - React-Core
   - RNSVG (9.13.6-gb):
     - React-Core
-  - RNTAztecView (1.49.0):
+  - RNTAztecView (1.50.0):
     - React-Core
     - WordPress-Aztec-iOS (~> 1.19.4)
   - WordPress-Aztec-iOS (1.19.4)
@@ -402,7 +402,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Gutenberg: a6a27f9f3b421da20f0ea091da6779f3ec036696
+  Gutenberg: 3fb0791ec50a4bfb82d53ee47d57b413229d3a97
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -435,7 +435,7 @@ SPEC CHECKSUMS:
   RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918
   RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b
   RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f
-  RNTAztecView: 9fa0a3430874ae395e3e3efa728919c749d6bf9e
+  RNTAztecView: 7552d3a49d7958b422dc089ae5e1d91b8300f58d
   WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index 08c90f761514ba..1a5fae78c15ffb 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-editor",
-	"version": "1.49.0",
+	"version": "1.50.0",
 	"description": "Mobile WordPress gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From e35fdbdd84c4f8300b515eaef55ff5a2c32a3df5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 2 Apr 2021 08:21:34 +0300
Subject: [PATCH 38/53] Load block-editor scripts & styles in the site-editor
 (#30448)

---
 lib/full-site-editing/full-site-editing.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/full-site-editing/full-site-editing.php b/lib/full-site-editing/full-site-editing.php
index 68e6d42d2f6bf5..28f91a9792265e 100644
--- a/lib/full-site-editing/full-site-editing.php
+++ b/lib/full-site-editing/full-site-editing.php
@@ -121,3 +121,16 @@ function gutenberg_menu_order( $menu_order ) {
 	}
 	return $menu_order;
 }
+
+/**
+ * Tells the script loader to load the scripts and styles of custom block on site editor screen.
+ *
+ * @param bool $is_block_editor_screen Current decision about loading block assets.
+ * @return bool Filtered decision about loading block assets.
+ */
+function gutenberg_site_editor_load_block_editor_scripts_and_styles( $is_block_editor_screen ) {
+	return ( is_callable( 'get_current_screen' ) && 'toplevel_page_gutenberg-edit-site' === get_current_screen()->base )
+		? true
+		: $is_block_editor_screen;
+}
+add_filter( 'should_load_block_editor_scripts_and_styles', 'gutenberg_site_editor_load_block_editor_scripts_and_styles' );

From ed00137bb984482b908dd4dbc93849e08631d3df Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Fri, 2 Apr 2021 17:16:17 +1100
Subject: [PATCH 39/53] Add allowedMimeTypes to site editor settings (#30436)

Co-authored-by: Andrew Serong <andrewserong@users.noreply.github.com>
---
 lib/editor-settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/editor-settings.php b/lib/editor-settings.php
index 3aff40945abf69..59e1b8fb804496 100644
--- a/lib/editor-settings.php
+++ b/lib/editor-settings.php
@@ -49,6 +49,7 @@ function gutenberg_get_common_block_editor_settings() {
 		'imageSizes'                            => $available_image_sizes,
 		'isRTL'                                 => is_rtl(),
 		'maxUploadFileSize'                     => $max_upload_size,
+		'allowedMimeTypes'                      => get_allowed_mime_types(),
 	);
 
 	$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );

From 568dc74145485118e82fc3a2849231b1e828acd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Justin=20S=C3=A8gb=C3=A9dji=20Ahinon?=
 <justiny.ahinon@gmail.com>
Date: Fri, 2 Apr 2021 07:32:37 +0100
Subject: [PATCH 40/53] Fix search block alignment issues (#30444)

---
 packages/block-library/src/search/editor.scss | 8 ++++++++
 packages/block-library/src/search/style.scss  | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/packages/block-library/src/search/editor.scss b/packages/block-library/src/search/editor.scss
index 8f1bc15c57a6eb..4383c20bb0bcb3 100644
--- a/packages/block-library/src/search/editor.scss
+++ b/packages/block-library/src/search/editor.scss
@@ -1,3 +1,11 @@
+.wp-block[data-align="center"] {
+	.wp-block-search {
+		.wp-block-search__inside-wrapper {
+			margin: auto;
+		}
+	}
+}
+
 .wp-block-search {
 	.wp-block-search__input {
 		padding: $grid-unit-10;
diff --git a/packages/block-library/src/search/style.scss b/packages/block-library/src/search/style.scss
index 6f47aa3761dbcb..9959c4545ace41 100644
--- a/packages/block-library/src/search/style.scss
+++ b/packages/block-library/src/search/style.scss
@@ -59,5 +59,9 @@
 			padding: 0.125em 0.5em;
 		}
 	}
+
+	&.aligncenter .wp-block-search__inside-wrapper {
+		margin: auto;
+	}
 }
 

From 53c45185c76b01f9e50b8df7ee3a491d3bb1f248 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Fri, 19 Mar 2021 09:00:48 +0100
Subject: [PATCH 41/53] Update changelog file

---
 packages/eslint-plugin/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 71a7f94b028c24..2931efc71ccca2 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.0.1 (2021-03-19)
+
 ### Bug Fix
 
 - Adds TypeScript as a peer dependency and makes it optional when not installed ([#29942](https://github.com/WordPress/gutenberg/pull/29942)).

From b022302f804e901d1ae5a02729e9dae57815d6b2 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Fri, 19 Mar 2021 09:11:25 +0100
Subject: [PATCH 42/53] chore(release): publish

 - @wordpress/e2e-tests@2.1.1
 - @wordpress/eslint-plugin@9.0.1
 - @wordpress/scripts@14.0.1
---
 packages/e2e-tests/package.json     | 2 +-
 packages/eslint-plugin/package.json | 2 +-
 packages/scripts/package.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index b6a1878c624eea..e7f28f8137126a 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index ebf8aff15da88f..f05aa17fae5b01 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index fb615ccef62d26..c2573c916e54dc 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "14.0.0",
+	"version": "14.0.1",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From c508c1b0955bdba8a8e8e06140163a94da8f49a3 Mon Sep 17 00:00:00 2001
From: Siobhan Bamber <SiobhyB@users.noreply.github.com>
Date: Fri, 2 Apr 2021 09:04:03 +0100
Subject: [PATCH 43/53] [RNMobile] Image Block: Improve Text Entry for Long Alt
 Text (#29670)

* Create new AltTextSettings component

With this commit, a new AltTextSettings component has been introduced to replace the current TextControl that exists for entering an image's Alt text. This new component makes use of BottomSheet.SubSheet, so that users are taken to a new subsheet when entering alt text.

* Update text colour in footer note in styles.css

The current text in the alt text subsheet's footer doesn't meet WordPress' accessibility standards for colour contrast. This commit updates the colour from " $gray-30" to "$gray-text-min" in order to meet those standards.

* Increase min-height of altTextEditor

This commit increases the min-height of "altTextEditor" so that the editor is a larger height on iOS devices by default.

* Update border colours for both light and dark mode

This commit updates the component's border colours to match similar separators/borders throughout the app. "light-gray-400" is used for light mode and "gray-70" for dark mode.

* Update text colour in dark mode

This commit fixes a bug, where text entered in iOS appear black on black (therefore, unreadable) in dark mode.

* Update footer note styling in styles.css

With this commit, I've tweaked the font size and padding around the "altTextSetting" compont's footer note to more closely match up with the initial design.

* Set max height for the editor

This commit fixes a bug I spotted while testing, where it's possible to continue hitting "enter" and increasing the size of the editor without limitless, leading to the footer note being dragged off screen.

* Increase bottom padding of footer note

This commit increase the padding at the bottom of the footer note, in accordance with the design.

* Update colour of placeholder text

This commit updates the colour of the default placeholder text in the "AltTextSettings" component's TextInput. The purpose of defining this is to fix a bug in iOS, where the placeholder text appeared as black on black in dark mode.

* Styling tweaks to footnote and placeholder text

Two small changes to the "Alt Text Settings" components are included in this commit. The first increases the padding of the footnote to match the design and the second aligns the placeholder text to the top, which is necessary for Android devices.

* Update font-size of footnote

Changes the font-size of the footnote from 13px to 12px, based on feedback.

* Set defined height for altTextEditor

This commit sets a defined height of 80px for the altTextEditor component, in response to feedback and to remove complexity around the box expanding when text is entered.

* Update blue colour of link for both light and dark mode

The colour of the link is updated for both light and dark mode with this commit, based on feedback received.

* Update CHANGELOG.md

Update CHANGELOG.md with changes from this commit.

* Convert "AltTextSettings" component into more generic "BottomSheetTextControl" component

This commit, converts the "AltTextSettings" component into more generic "BottomSheetTextControl" component by removing references to "alt" from main component and passing down props.

* Created README.md for BottomSheetTextControl component

This commit introduces a README.md for the new BottomSheetTextControl component.

* Formatting tweaks for README.md

* Formatting tweaks for README.md

Fixes some issues with spacing.

* retrigger checks

* Simplify BottomSheetTextControl

This commit seeks to simplify the BottomSheetTextControl component by splitting out two more, smaller components from it: 1. smallFooterMessageControl 2. smallFooterMessageControlLink

* retrigger checks

* Correct merge conflict

* Update "SmallFooterMessageLinkControl" to "FooterMessageLink"

This commit updates the name of "SmallFooterMessageLinkControl" to "FooterMessageLink" in order to be clearer and more readable.

* Update "SmallFooterMessageLinkControl" to "FooterMessageLink"

This commit updates the name of "SmallFooterMessageLinkControl" to "FooterMessageLink" in order to be clearer and more readable.

* Delete small-footer-message-control-link.native.js

* Remove small-footer-message-control

* Update Footer Message Control

* Add README to FooterMessageLink component

This commit moves FooterMessageLink to a separate folder for the purpose of adding a README

* Revert accidental commit

This reverts an accidental commit, where I'd made changes in "link-settings/index.native.js" as part of general testing. I also remove "textAlign="left"" from a FooterMessageControl component in this file, as this is now the default.
---
 .../block-library/src/image/edit.native.js    |  51 ++++++---
 packages/components/src/index.native.js       |   2 +
 .../bottom-sheet-text-control/README.md       |  91 +++++++++++++++
 .../bottom-sheet-text-control/index.native.js | 104 ++++++++++++++++++
 .../bottom-sheet-text-control/styles.scss     |  22 ++++
 .../footer-message-cell.native.js             |   2 +-
 .../footer-message-link/README.md             |  37 +++++++
 .../footer-message-link.native.js             |  25 +++++
 .../footer-message-link/styles.native.scss    |   7 ++
 .../mobile/bottom-sheet/styles.native.scss    |   2 +-
 .../src/mobile/link-settings/index.native.js  |   5 +-
 packages/react-native-editor/CHANGELOG.md     |   1 +
 12 files changed, 329 insertions(+), 20 deletions(-)
 create mode 100644 packages/components/src/mobile/bottom-sheet-text-control/README.md
 create mode 100644 packages/components/src/mobile/bottom-sheet-text-control/index.native.js
 create mode 100644 packages/components/src/mobile/bottom-sheet-text-control/styles.scss
 create mode 100644 packages/components/src/mobile/bottom-sheet/footer-message-link/README.md
 create mode 100644 packages/components/src/mobile/bottom-sheet/footer-message-link/footer-message-link.native.js
 create mode 100644 packages/components/src/mobile/bottom-sheet/footer-message-link/styles.native.scss

diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 09727d0cceb14d..7c4348270aaa0a 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -19,12 +19,13 @@ import {
 	CycleSelectControl,
 	Icon,
 	PanelBody,
-	TextControl,
 	ToolbarButton,
 	ToolbarGroup,
 	Image,
 	WIDE_ALIGNMENTS,
 	LinkSettingsNavigation,
+	BottomSheetTextControl,
+	FooterMessageLink,
 } from '@wordpress/components';
 import {
 	BlockCaption,
@@ -45,9 +46,9 @@ import { compose, withPreferredColorScheme } from '@wordpress/compose';
 import { withSelect } from '@wordpress/data';
 import {
 	image as placeholderIcon,
-	textColor,
 	replace,
 	expand,
+	textColor,
 } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
 
@@ -82,7 +83,6 @@ export class ImageEdit extends Component {
 			this
 		);
 		this.updateMediaProgress = this.updateMediaProgress.bind( this );
-		this.updateAlt = this.updateAlt.bind( this );
 		this.updateImageURL = this.updateImageURL.bind( this );
 		this.onSetLinkDestination = this.onSetLinkDestination.bind( this );
 		this.onSetNewTab = this.onSetNewTab.bind( this );
@@ -246,10 +246,6 @@ export class ImageEdit extends Component {
 		this.setState( { isUploadInProgress: false } );
 	}
 
-	updateAlt( newAlt ) {
-		this.props.setAttributes( { alt: newAlt } );
-	}
-
 	updateImageURL( url ) {
 		this.props.setAttributes( {
 			url,
@@ -396,6 +392,39 @@ export class ImageEdit extends Component {
 		);
 	}
 
+	getAltTextSettings() {
+		const {
+			attributes: { alt },
+		} = this.props;
+
+		const updateAlt = ( newAlt ) => {
+			this.props.setAttributes( { alt: newAlt } );
+		};
+
+		return (
+			<BottomSheetTextControl
+				initialValue={ alt }
+				onChange={ updateAlt }
+				placeholder={ __( 'Add alt text' ) }
+				label={ __( 'Alt Text' ) }
+				icon={ textColor }
+				footerNote={
+					<>
+						{ __(
+							'Describe the purpose of the image. Leave empty if the image is purely decorative. '
+						) }
+						<FooterMessageLink
+							href={
+								'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+							}
+							value={ __( 'What is alt text?' ) }
+						/>
+					</>
+				}
+			/>
+		);
+	}
+
 	onSizeChangeValue( newValue ) {
 		this.onSetSizeSlug( newValue );
 	}
@@ -448,13 +477,7 @@ export class ImageEdit extends Component {
 							options={ this.sizeOptions }
 						/>
 					) }
-					<TextControl
-						icon={ textColor }
-						label={ __( 'Alt Text' ) }
-						value={ alt || '' }
-						valuePlaceholder={ __( 'None' ) }
-						onChangeValue={ this.updateAlt }
-					/>
+					{ this.getAltTextSettings() }
 				</PanelBody>
 				<PanelBody title={ __( 'Link Settings' ) }>
 					{ this.getLinkSettings( true ) }
diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js
index 486db3742868ec..e4fe68573ceda2 100644
--- a/packages/components/src/index.native.js
+++ b/packages/components/src/index.native.js
@@ -76,6 +76,8 @@ export { default as CycleSelectControl } from './mobile/cycle-select-control';
 export { default as Gradient } from './mobile/gradient';
 export { default as ColorSettings } from './mobile/color-settings';
 export { default as FocalPointSettingsPanel } from './mobile/focal-point-settings-panel';
+export { default as BottomSheetTextControl } from './mobile/bottom-sheet-text-control';
+export { default as FooterMessageLink } from './mobile/bottom-sheet/footer-message-link/footer-message-link';
 export { LinkPicker } from './mobile/link-picker';
 export { default as LinkPickerScreen } from './mobile/link-picker/link-picker-screen';
 export { default as LinkSettings } from './mobile/link-settings';
diff --git a/packages/components/src/mobile/bottom-sheet-text-control/README.md b/packages/components/src/mobile/bottom-sheet-text-control/README.md
new file mode 100644
index 00000000000000..e23680f5ba2beb
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet-text-control/README.md
@@ -0,0 +1,91 @@
+# BottomSheetTextControl
+
+`BottomSheetTextControl` allows users to enter and edit text, similar to [`TextControl`](/packages/components/src/text-control/README.md).
+
+`BottomSheetTextControl`'s main difference from `TextControl` is that it utilizes [`BottomSheetSubSheet`](/packages/components/src/mobile/bottom-sheet/sub-sheet/README.md). A user will tap to open a subsheet where they can enter their text into an editor. This is useful for cases where a larger text area is warranted for user input.
+
+### Usage
+
+```jsx
+// This is a paraphrased example from the image block's edit.native.js file
+import {
+	BottomSheetSelectControl,
+	FooterMessageLink,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+const MyTextControl = () => {
+	const {
+		attributes: { alt },
+	} = this.props;
+
+	const updateAlt = ( newAlt ) => {
+		this.props.setAttributes( { alt: newAlt } );
+	};
+
+	return (
+		<PanelBody>
+			<BottomSheetTextControl
+				initialValue={ alt }
+				onChange={ updateAlt }
+				placeholder={ __( 'Generic placeholder text' ) }
+				label={ __( 'Generic label' ) }
+				icon={ textColor }
+				footerNote={
+					<>
+						{ __( 'A footer note to add to the component! ' ) }
+						<FooterMessageLink
+							href={ 'https://wordpress.org/' }
+							value={ __( 'Visit WordPress.org' ) }
+						/>
+					</>
+				}
+			/>
+		</PanelBody>
+	);
+};
+```
+
+### Props
+
+#### initialValue
+
+The initial value of the input.
+
+-   Type: `String`
+-   Required: Yes
+
+#### onChange
+
+A function that receives the value that's input into the text editor.
+
+-   Type: `Function`
+-   Required: Yes
+
+#### placeholder
+
+The placeholder text that will display in the component's subsheet, when its text editor is empty.
+
+-   Type: `String`
+-   Required: No
+
+#### label
+
+The label for the control. The label will appear in the header area of the subsheet and is necessary for navigation.
+
+-   Type: `String`
+-   Required: Yes
+
+#### icon
+
+The icon to display alongside the control.
+
+-   Type: `String`
+-   Required: No
+
+#### footerNote
+
+An optional note to display in the component's footer area.
+
+-   Type: `String`
+-   Required: No
diff --git a/packages/components/src/mobile/bottom-sheet-text-control/index.native.js b/packages/components/src/mobile/bottom-sheet-text-control/index.native.js
new file mode 100644
index 00000000000000..c3bcb337d9ad52
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet-text-control/index.native.js
@@ -0,0 +1,104 @@
+/**
+ * External dependencies
+ */
+import { TextInput } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+import { Icon, chevronRight } from '@wordpress/icons';
+import { usePreferredColorSchemeStyle } from '@wordpress/compose';
+import {
+	BottomSheet,
+	PanelBody,
+	FooterMessageControl,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.scss';
+
+const BottomSheetTextControl = ( {
+	initialValue,
+	onChange,
+	placeholder,
+	label,
+	icon,
+	footerNote,
+} ) => {
+	const [ showSubSheet, setShowSubSheet ] = useState( false );
+	const navigation = useNavigation();
+
+	const goBack = () => {
+		setShowSubSheet( false );
+		navigation.goBack();
+	};
+
+	const openSubSheet = () => {
+		navigation.navigate( BottomSheet.SubSheet.screenName );
+		setShowSubSheet( true );
+	};
+
+	const [ value, onChangeText ] = useState( initialValue );
+
+	const horizontalBorderStyle = usePreferredColorSchemeStyle(
+		styles.horizontalBorder,
+		styles.horizontalBorderDark
+	);
+
+	const textEditorStyle = usePreferredColorSchemeStyle(
+		styles.textEditor,
+		styles.textEditorDark
+	);
+
+	return (
+		<BottomSheet.SubSheet
+			navigationButton={
+				<BottomSheet.Cell
+					icon={ icon }
+					placeholder={ placeholder }
+					label={ label }
+					onPress={ openSubSheet }
+					value={ initialValue || '' }
+				>
+					<Icon icon={ chevronRight }></Icon>
+				</BottomSheet.Cell>
+			}
+			showSheet={ showSubSheet }
+		>
+			<>
+				<BottomSheet.NavigationHeader
+					screen={ label }
+					leftButtonOnPress={ goBack }
+				/>
+				<PanelBody style={ horizontalBorderStyle }>
+					<TextInput
+						label={ label }
+						onChangeText={ ( text ) => onChangeText( text ) }
+						onChange={ onChange( value ) }
+						value={ value }
+						multiline={ true }
+						placeholder={ placeholder }
+						placeholderTextColor={ '#87a6bc' }
+						style={ textEditorStyle }
+						textAlignVertical={ 'top' }
+					/>
+				</PanelBody>
+			</>
+
+			{ footerNote && (
+				<PanelBody style={ styles.textFooternote }>
+					<FooterMessageControl
+						label={ footerNote }
+						textAlign="left"
+					/>
+				</PanelBody>
+			) }
+		</BottomSheet.SubSheet>
+	);
+};
+
+export default BottomSheetTextControl;
diff --git a/packages/components/src/mobile/bottom-sheet-text-control/styles.scss b/packages/components/src/mobile/bottom-sheet-text-control/styles.scss
new file mode 100644
index 00000000000000..f50712d403a747
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet-text-control/styles.scss
@@ -0,0 +1,22 @@
+.textEditor {
+	padding: 14px 0;
+	height: 80px;
+}
+
+.textEditorDark {
+	color: $white;
+}
+
+.textFooternote {
+	padding: 0 16px 24px;
+}
+
+.horizontalBorder {
+	border-top-width: $border-width;
+	border-bottom-width: $border-width;
+	border-color: $light-gray-400;
+}
+
+.horizontalBorderDark {
+	border-color: $gray-70;
+}
diff --git a/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js b/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
index 2163224074c1d3..343363a2b07fe4 100644
--- a/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
@@ -8,7 +8,7 @@ import { withPreferredColorScheme } from '@wordpress/compose';
 import Cell from './cell';
 import styles from './styles.scss';
 
-function FooterMessageCell( { textAlign = 'center', ...props } ) {
+function FooterMessageCell( { textAlign = 'left', ...props } ) {
 	return (
 		<Cell
 			{ ...props }
diff --git a/packages/components/src/mobile/bottom-sheet/footer-message-link/README.md b/packages/components/src/mobile/bottom-sheet/footer-message-link/README.md
new file mode 100644
index 00000000000000..61df444a200975
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet/footer-message-link/README.md
@@ -0,0 +1,37 @@
+# Footer Message Link
+
+FooterMessageLink allows for adding a link within a FooterMessageControl component.
+
+### Usage
+
+```jsx
+return (
+	<FooterMessageControl
+		value={
+			<>
+				{ __( 'Example footer text. ' ) }
+				<FooterMessageLink
+					href={ 'https://www.wordpress.org/' }
+					value={ __( 'Visit WordPress.org!' ) }
+				/>
+			</>
+		}
+	/>
+);
+```
+
+### Props
+
+#### href
+
+The URL that is being linked to and that will open in a browser tab when selected.
+
+-   Type: `String`
+-   Required: Yes
+
+#### value
+
+The "clickable" text that will be displayed to the user.
+
+-   Type: `String`
+-   Required: Yes
diff --git a/packages/components/src/mobile/bottom-sheet/footer-message-link/footer-message-link.native.js b/packages/components/src/mobile/bottom-sheet/footer-message-link/footer-message-link.native.js
new file mode 100644
index 00000000000000..cdd478a958ef0e
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet/footer-message-link/footer-message-link.native.js
@@ -0,0 +1,25 @@
+/**
+ * External dependencies
+ */
+import { Text, Linking } from 'react-native';
+/**
+ * WordPress dependencies
+ */
+import { withPreferredColorScheme } from '@wordpress/compose';
+/**
+ * Internal dependencies
+ */
+import styles from './styles.scss';
+
+function FooterMessageLink( { href, value } ) {
+	return (
+		<Text
+			style={ styles.footerMessageLink }
+			onPress={ () => Linking.openURL( href ) }
+		>
+			{ value }
+		</Text>
+	);
+}
+
+export default withPreferredColorScheme( FooterMessageLink );
diff --git a/packages/components/src/mobile/bottom-sheet/footer-message-link/styles.native.scss b/packages/components/src/mobile/bottom-sheet/footer-message-link/styles.native.scss
new file mode 100644
index 00000000000000..d612defade6294
--- /dev/null
+++ b/packages/components/src/mobile/bottom-sheet/footer-message-link/styles.native.scss
@@ -0,0 +1,7 @@
+.footerMessageLink {
+	color: $blue-50;
+}
+
+.footerMessageLinkDark {
+	color: $blue-30;
+}
diff --git a/packages/components/src/mobile/bottom-sheet/styles.native.scss b/packages/components/src/mobile/bottom-sheet/styles.native.scss
index 4269ab14ec30f2..e17161621b60b3 100644
--- a/packages/components/src/mobile/bottom-sheet/styles.native.scss
+++ b/packages/components/src/mobile/bottom-sheet/styles.native.scss
@@ -149,7 +149,7 @@
 // Footer Message Cell
 
 .footerMessageCell {
-	font-size: $text-editor-font-size;
+	font-size: 12px;
 	color: $gray;
 	flex: 1;
 }
diff --git a/packages/components/src/mobile/link-settings/index.native.js b/packages/components/src/mobile/link-settings/index.native.js
index 396279418fc730..a8c8fa39e3a0db 100644
--- a/packages/components/src/mobile/link-settings/index.native.js
+++ b/packages/components/src/mobile/link-settings/index.native.js
@@ -293,10 +293,7 @@ function LinkSettings( {
 			</PanelBody>
 			{ options.footer && (
 				<PanelBody style={ styles.linkSettingsPanel }>
-					<FooterMessageControl
-						label={ options.footer.label }
-						textAlign="left"
-					/>
+					<FooterMessageControl label={ options.footer.label } />
 				</PanelBody>
 			) }
 			{ actions && <PanelActions actions={ actions } /> }
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 4bbf6f4ae9db1d..4771d098746a59 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+* [*] Image block: Improve text entry for long alt text. [#29670]
 
 ## 1.50.0
 

From 4b557cb26963ce822a89cee27e4c91c64b20f4b3 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 2 Apr 2021 12:46:31 +0400
Subject: [PATCH 44/53] Add 'object-position' to allowed inline style
 attributes list (#30243)

---
 lib/compat.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/compat.php b/lib/compat.php
index e391b66aa1fedf..a67bdce1de8ccc 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -192,3 +192,18 @@ function gutenberg_override_reusable_block_post_type_labels() {
 	);
 }
 add_filter( 'post_type_labels_wp_block', 'gutenberg_override_reusable_block_post_type_labels', 10, 0 );
+
+/**
+ * Update allowed inline style attributes list.
+ *
+ * Note: This should be removed when the minimum required WP version is >= 5.8.
+ *
+ * @param string[] $attrs Array of allowed CSS attributes.
+ * @return string[] CSS attributes.
+ */
+function gutenberg_safe_style_attrs( $attrs ) {
+	$attrs[] = 'object-position';
+
+	return $attrs;
+}
+add_filter( 'safe_style_css', 'gutenberg_safe_style_attrs' );

From 2557a44f182041394cd9bce173ee8355849418d7 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Fri, 2 Apr 2021 11:57:12 +0100
Subject: [PATCH 45/53] Update list view icon size and spacing (#30455)

---
 .../block-editor/src/components/block-navigation/style.scss  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/block-navigation/style.scss b/packages/block-editor/src/components/block-navigation/style.scss
index 6aaa8d8d600ca3..3d40f63dfeb190 100644
--- a/packages/block-editor/src/components/block-navigation/style.scss
+++ b/packages/block-editor/src/components/block-navigation/style.scss
@@ -60,7 +60,7 @@
 		align-items: center;
 		width: 100%;
 		height: auto;
-		padding: ($grid-unit-15 / 2);
+		padding: ($grid-unit-15 / 2) $grid-unit-15;
 		text-align: left;
 		color: $gray-900;
 		border-radius: 2px;
@@ -121,7 +121,8 @@
 
 	.block-editor-block-icon {
 		align-self: flex-start;
-		margin-right: 6px;
+		margin-right: ( $grid-unit-05 * 2.5 ); // 10px is off the 4px grid, but required for visual alignment between block name and subsequent nested icon
+		width: 20px;
 	}
 
 	.block-editor-block-navigation-block__menu-cell,

From aca801a11162e881fd79f8c975af61e9a4d7daae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <wp@iseulde.com>
Date: Fri, 2 Apr 2021 20:44:58 +0200
Subject: [PATCH 46/53] Writing flow: fix horizontal caret placing for empty
 editable with placeholder (#30463)

* Writing flow: fix horizontal caret placing for empty rich text with placeholder

* Prevent placeholder from catching selection (esp in FF)

* Scroll into view if needed
---
 .../src/query-pagination-next/edit.js         |  1 +
 .../src/query-pagination-previous/edit.js     |  1 +
 .../src/site-title/edit/index.js              |  1 +
 packages/dom/README.md                        |  1 +
 .../src/dom/place-caret-at-horizontal-edge.js | 51 +++++++++++++------
 .../src/component/use-inline-warning.js       |  2 +-
 packages/rich-text/src/to-tree.js             |  2 +
 7 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/packages/block-library/src/query-pagination-next/edit.js b/packages/block-library/src/query-pagination-next/edit.js
index 4e48c0bcecaa6b..e2bb7160e4dcca 100644
--- a/packages/block-library/src/query-pagination-next/edit.js
+++ b/packages/block-library/src/query-pagination-next/edit.js
@@ -12,6 +12,7 @@ export default function QueryPaginationNextEdit( {
 		<PlainText
 			__experimentalVersion={ 2 }
 			tagName="a"
+			style={ { display: 'inline-block' } }
 			aria-label={ __( 'Next page link' ) }
 			placeholder={ __( 'Next Page' ) }
 			value={ label }
diff --git a/packages/block-library/src/query-pagination-previous/edit.js b/packages/block-library/src/query-pagination-previous/edit.js
index 2c0bf33005de81..fed5909d100813 100644
--- a/packages/block-library/src/query-pagination-previous/edit.js
+++ b/packages/block-library/src/query-pagination-previous/edit.js
@@ -12,6 +12,7 @@ export default function QueryPaginationPreviousEdit( {
 		<PlainText
 			__experimentalVersion={ 2 }
 			tagName="a"
+			style={ { display: 'inline-block' } }
 			aria-label={ __( 'Previous page link' ) }
 			placeholder={ __( 'Previous Page' ) }
 			value={ label }
diff --git a/packages/block-library/src/site-title/edit/index.js b/packages/block-library/src/site-title/edit/index.js
index f7a0640bdf74b9..0805d4ed72db3d 100644
--- a/packages/block-library/src/site-title/edit/index.js
+++ b/packages/block-library/src/site-title/edit/index.js
@@ -49,6 +49,7 @@ export default function SiteTitleEdit( { attributes, setAttributes } ) {
 			<TagName { ...blockProps }>
 				<RichText
 					tagName="a"
+					style={ { display: 'inline-block' } }
 					aria-label={ __( 'Site title text' ) }
 					placeholder={ __( 'Write site title…' ) }
 					value={ title }
diff --git a/packages/dom/README.md b/packages/dom/README.md
index fe4dc671d4e6e6..75bfd1e2e2ba20 100644
--- a/packages/dom/README.md
+++ b/packages/dom/README.md
@@ -272,6 +272,7 @@ _Parameters_
 
 -   _container_ `Element`: Focusable element.
 -   _isReverse_ `boolean`: True for end, false for start.
+-   _mayUseScroll_ `boolean`: Whether to allow scrolling.
 
 <a name="placeCaretAtVerticalEdge" href="#placeCaretAtVerticalEdge">#</a> **placeCaretAtVerticalEdge**
 
diff --git a/packages/dom/src/dom/place-caret-at-horizontal-edge.js b/packages/dom/src/dom/place-caret-at-horizontal-edge.js
index 3aa0d8fbe69107..bcc79715915d7f 100644
--- a/packages/dom/src/dom/place-caret-at-horizontal-edge.js
+++ b/packages/dom/src/dom/place-caret-at-horizontal-edge.js
@@ -3,13 +3,23 @@
  */
 import { includes } from 'lodash';
 
+/**
+ * Internal dependencies
+ */
+import hiddenCaretRangeFromPoint from './hidden-caret-range-from-point';
+
 /**
  * Places the caret at start or end of a given element.
  *
- * @param {Element} container Focusable element.
- * @param {boolean} isReverse True for end, false for start.
+ * @param {Element} container    Focusable element.
+ * @param {boolean} isReverse    True for end, false for start.
+ * @param {boolean} mayUseScroll Whether to allow scrolling.
  */
-export default function placeCaretAtHorizontalEdge( container, isReverse ) {
+export default function placeCaretAtHorizontalEdge(
+	container,
+	isReverse,
+	mayUseScroll
+) {
 	if ( ! container ) {
 		return;
 	}
@@ -37,25 +47,34 @@ export default function placeCaretAtHorizontalEdge( container, isReverse ) {
 		return;
 	}
 
-	// Select on extent child of the container, not the container itself. This
-	// avoids the selection always being `endOffset` of 1 when placed at end,
-	// where `startContainer`, `endContainer` would always be container itself.
-	const rangeTarget = container[ isReverse ? 'lastChild' : 'firstChild' ];
+	const { ownerDocument } = container;
+	const containerRect = container.getBoundingClientRect();
+	// When placing at the end (isReverse), find the closest range to the bottom
+	// right corner. When placing at the start, to the top left corner.
+	const x = isReverse ? containerRect.right - 1 : containerRect.left + 1;
+	const y = isReverse ? containerRect.bottom - 1 : containerRect.top + 1;
+	const range = hiddenCaretRangeFromPoint( ownerDocument, x, y, container );
+
+	// If no range range can be created or it is outside the container, the
+	// element may be out of view.
+	if (
+		! range ||
+		! range.startContainer ||
+		! container.contains( range.startContainer )
+	) {
+		if ( ! mayUseScroll ) {
+			return;
+		}
 
-	// If no range target, it implies that the container is empty. Focusing is
-	// sufficient for caret to be placed correctly.
-	if ( ! rangeTarget ) {
+		// Only try to scroll into view once to avoid an infinite loop.
+		mayUseScroll = false;
+		container.scrollIntoView( isReverse );
+		placeCaretAtHorizontalEdge( container, isReverse, mayUseScroll );
 		return;
 	}
 
-	const { ownerDocument } = container;
 	const { defaultView } = ownerDocument;
 	const selection = defaultView.getSelection();
-	const range = ownerDocument.createRange();
-
-	range.selectNodeContents( rangeTarget );
-	range.collapse( ! isReverse );
-
 	selection.removeAllRanges();
 	selection.addRange( range );
 }
diff --git a/packages/rich-text/src/component/use-inline-warning.js b/packages/rich-text/src/component/use-inline-warning.js
index 0056771cc1dc2f..f68bd9dd3d5e5a 100644
--- a/packages/rich-text/src/component/use-inline-warning.js
+++ b/packages/rich-text/src/component/use-inline-warning.js
@@ -15,7 +15,7 @@ export function useInlineWarning( { ref } ) {
 
 			if ( computedStyle.display === 'inline' ) {
 				// eslint-disable-next-line no-console
-				console.warn( message );
+				console.error( message );
 			}
 		}
 	}, [] );
diff --git a/packages/rich-text/src/to-tree.js b/packages/rich-text/src/to-tree.js
index 885f74da2ca303..b41820a8ee8ecb 100644
--- a/packages/rich-text/src/to-tree.js
+++ b/packages/rich-text/src/to-tree.js
@@ -305,6 +305,8 @@ export function toTree( {
 						// selection. The placeholder is also not editable after
 						// all.
 						contenteditable: 'false',
+						style:
+							'pointer-events:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;',
 					},
 				} );
 			}

From 98a51d7efe5bbe06184f01c78d10f3c8f4f4e712 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Mon, 5 Apr 2021 09:39:29 +0300
Subject: [PATCH 47/53] Remove `scope` from Query patterns and introduce
 `blockTypes` (#30471)

* remove scope from query patterns

* clone blocks on insertion

* properly handle query update and make previews show 1 post per page

* fix typos
---
 lib/block-patterns.php                        | 50 ++++++++-------
 .../inserter/hooks/use-patterns-state.js      |  7 +--
 packages/block-editor/src/store/selectors.js  | 43 ++++++++-----
 .../block-editor/src/store/test/selectors.js  | 61 +++++++++++++------
 .../src/query/edit/block-setup/layout-step.js | 14 ++---
 .../src/query/edit/query-block-setup.js       | 59 ++++++++++++++----
 6 files changed, 151 insertions(+), 83 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index d376fb59aea1e9..da42a0b25f8aec 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -5,34 +5,38 @@
  * @package gutenberg
  */
 
+register_block_pattern_category( 'Query', array( 'label' => __( 'Query', 'gutenberg' ) ) );
+
 // Initial Query block patterns.
 register_block_pattern(
 	'query/large-posts',
 	array(
-		'title'   => __( 'Large', 'gutenberg' ),
-		'scope'   => array(
-			'inserter' => false,
-			'block'    => array( 'core/query' ),
-		),
-		'content' => '<!-- wp:post-title {"isLink":true} /-->
+		'title'      => __( 'Large', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:post-title {"isLink":true} /-->
 						<!-- wp:post-featured-image  {"isLink":true,"align":"wide"} /-->
 						<!-- wp:post-excerpt /-->
 						<!-- wp:separator -->
 						<hr class="wp-block-separator"/>
 						<!-- /wp:separator -->
-						<!-- wp:post-date /-->',
+						<!-- wp:post-date /-->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query -->',
 	)
 );
 
 register_block_pattern(
 	'query/medium-posts',
 	array(
-		'title'   => __( 'Medium', 'gutenberg' ),
-		'scope'   => array(
-			'inserter' => false,
-			'block'    => array( 'core/query' ),
-		),
-		'content' => '<!-- wp:columns {"align":"wide"} -->
+		'title'      => __( 'Medium', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:columns {"align":"wide"} -->
 						<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
 						<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
 						<!-- /wp:column -->
@@ -40,25 +44,29 @@
 						<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
 						<!-- wp:post-excerpt /--></div>
 						<!-- /wp:column --></div>
-						<!-- /wp:columns -->',
+						<!-- /wp:columns -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query -->',
 	)
 );
 
 register_block_pattern(
 	'query/small-posts',
 	array(
-		'title'   => __( 'Small', 'gutenberg' ),
-		'scope'   => array(
-			'inserter' => false,
-			'block'    => array( 'core/query' ),
-		),
-		'content' => '<!-- wp:columns {"verticalAlignment":"center"} -->
+		'title'      => __( 'Small', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:columns {"verticalAlignment":"center"} -->
 						<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
 						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>
 						<!-- /wp:column -->
 						<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
 						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>
 						<!-- /wp:column --></div>
-						<!-- /wp:columns -->',
+						<!-- /wp:columns -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query -->',
 	)
 );
diff --git a/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js b/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
index 1b14286c821bf3..5b5090e6d7b2b8 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
@@ -31,13 +31,8 @@ const usePatternsState = ( onInsert, rootClientId ) => {
 			const { __experimentalGetAllowedPatterns, getSettings } = select(
 				blockEditorStore
 			);
-			const inserterPatterns = __experimentalGetAllowedPatterns(
-				rootClientId
-			).filter(
-				( pattern ) => ! pattern.scope || pattern.scope.inserter
-			);
 			return {
-				patterns: inserterPatterns,
+				patterns: __experimentalGetAllowedPatterns( rootClientId ),
 				patternCategories: getSettings()
 					.__experimentalBlockPatternCategories,
 			};
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index d2288f9fc67cf1..3af1ae3ba200b8 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -1838,29 +1838,40 @@ export const __experimentalGetAllowedPatterns = createSelector(
 );
 
 /**
- * Returns the list of patterns based on specific `scope` and
- * a block's name.
- * `inserter` scope should be handled differently, probably in
- * combination with `__experimentalGetAllowedPatterns`.
- * For now `__experimentalGetScopedBlockPatterns` handles properly
- * all other scopes.
- * Since both APIs are experimental we should revisit this.
+ * Returns the list of patterns based on their declared `blockTypes`
+ * and a block's name.
+ * Patterns can use `blockTypes` to integrate in work flows like
+ * suggesting appropriate patterns in a Placeholder state(during insertion)
+ * or blocks transformations.
  *
  * @param {Object} state Editor state.
- * @param {string} scope Block pattern scope.
- * @param {string} blockName Block's name.
+ * @param {string|string[]} blockNames Block's name or array of block names to find matching pattens.
+ * @param {?string} rootClientId Optional target root client ID.
  *
- * @return {Array} The list of matched block patterns based on provided scope and block name.
+ * @return {Array} The list of matched block patterns based on declared `blockTypes` and block name.
  */
-export const __experimentalGetScopedBlockPatterns = createSelector(
-	( state, scope, blockName ) => {
-		if ( ! scope && ! blockName ) return EMPTY_ARRAY;
-		const patterns = state.settings.__experimentalBlockPatterns;
+export const __experimentalGetPatternsByBlockTypes = createSelector(
+	( state, blockNames, rootClientId = null ) => {
+		if ( ! blockNames ) return EMPTY_ARRAY;
+		const patterns = __experimentalGetAllowedPatterns(
+			state,
+			rootClientId
+		);
+		const normalizedBlockNames = Array.isArray( blockNames )
+			? blockNames
+			: [ blockNames ];
 		return patterns.filter( ( pattern ) =>
-			pattern.scope?.[ scope ]?.includes?.( blockName )
+			pattern?.blockTypes?.some?.( ( blockName ) =>
+				normalizedBlockNames.includes( blockName )
+			)
 		);
 	},
-	( state ) => [ state.settings.__experimentalBlockPatterns ]
+	( state, rootClientId ) => [
+		...__experimentalGetAllowedPatterns.getDependants(
+			state,
+			rootClientId
+		),
+	]
 );
 
 /**
diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
index 167c830f510366..6563be65dad33d 100644
--- a/packages/block-editor/src/store/test/selectors.js
+++ b/packages/block-editor/src/store/test/selectors.js
@@ -72,7 +72,7 @@ const {
 	__experimentalGetActiveBlockIdByBlockNames: getActiveBlockIdByBlockNames,
 	__experimentalGetParsedReusableBlock,
 	__experimentalGetAllowedPatterns,
-	__experimentalGetScopedBlockPatterns,
+	__experimentalGetPatternsByBlockTypes,
 	__unstableGetClientIdWithClientIdsTree,
 	__unstableGetClientIdsTree,
 } = selectors;
@@ -3407,52 +3407,77 @@ describe( 'selectors', () => {
 			).toHaveLength( 0 );
 		} );
 	} );
-	describe( '__experimentalGetScopedBlockPatterns', () => {
+	describe( '__experimentalGetPatternsByBlockTypes', () => {
 		const state = {
-			blocks: {},
+			blocks: {
+				byClientId: {
+					block1: { name: 'core/test-block-a' },
+				},
+			},
+			blockListSettings: {
+				block1: {
+					allowedBlocks: [ 'core/test-block-b' ],
+				},
+			},
 			settings: {
 				__experimentalBlockPatterns: [
 					{
 						name: 'pattern-a',
+						blockTypes: [ 'test/block-a' ],
 						title: 'pattern a',
-						scope: { block: [ 'test/block-a' ] },
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
 					},
 					{
 						name: 'pattern-b',
+						blockTypes: [ 'test/block-b' ],
 						title: 'pattern b',
-						scope: { block: [ 'test/block-b' ] },
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						title: 'pattern c',
+						blockTypes: [ 'test/block-a' ],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
 					},
 				],
 			},
 		};
-		it( 'should return empty array if no scope and block name is provided', () => {
-			expect( __experimentalGetScopedBlockPatterns( state ) ).toEqual(
+		it( 'should return empty array if no block name is provided', () => {
+			expect( __experimentalGetPatternsByBlockTypes( state ) ).toEqual(
 				[]
 			);
-			expect(
-				__experimentalGetScopedBlockPatterns( state, 'block' )
-			).toEqual( [] );
 		} );
 		it( 'shoud return empty array if no match is found', () => {
-			const patterns = __experimentalGetScopedBlockPatterns(
+			const patterns = __experimentalGetPatternsByBlockTypes(
 				state,
-				'block',
 				'test/block-not-exists'
 			);
 			expect( patterns ).toEqual( [] );
 		} );
 		it( 'should return proper results when there are matched block patterns', () => {
-			const patterns = __experimentalGetScopedBlockPatterns(
+			const patterns = __experimentalGetPatternsByBlockTypes(
 				state,
-				'block',
 				'test/block-a'
 			);
+			expect( patterns ).toHaveLength( 2 );
+			expect( patterns ).toEqual(
+				expect.arrayContaining( [
+					expect.objectContaining( { title: 'pattern a' } ),
+					expect.objectContaining( { title: 'pattern c' } ),
+				] )
+			);
+		} );
+		it( 'should return proper result with matched patterns and allowed blocks from rootClientId', () => {
+			const patterns = __experimentalGetPatternsByBlockTypes(
+				state,
+				'test/block-a',
+				'block1'
+			);
 			expect( patterns ).toHaveLength( 1 );
 			expect( patterns[ 0 ] ).toEqual(
-				expect.objectContaining( {
-					title: 'pattern a',
-					scope: { block: [ 'test/block-a' ] },
-				} )
+				expect.objectContaining( { title: 'pattern c' } )
 			);
 		} );
 	} );
diff --git a/packages/block-library/src/query/edit/block-setup/layout-step.js b/packages/block-library/src/query/edit/block-setup/layout-step.js
index a2a206dbb0dde8..9df6893856722f 100644
--- a/packages/block-library/src/query/edit/block-setup/layout-step.js
+++ b/packages/block-library/src/query/edit/block-setup/layout-step.js
@@ -2,8 +2,8 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { useState, useMemo } from '@wordpress/element';
-import { parse, store as blocksStore } from '@wordpress/blocks';
+import { useState } from '@wordpress/element';
+import { store as blocksStore } from '@wordpress/blocks';
 import { useInstanceId } from '@wordpress/compose';
 import {
 	BlockPreview,
@@ -36,14 +36,11 @@ const LayoutSetupStep = ( {
 			const { getBlockVariations, getDefaultBlockVariation } = select(
 				blocksStore
 			);
-			const { __experimentalGetScopedBlockPatterns } = select(
+			const { __experimentalGetPatternsByBlockTypes } = select(
 				blockEditorStore
 			);
 			const { name } = blockType;
-			const _patterns = __experimentalGetScopedBlockPatterns(
-				'block',
-				name
-			);
+			const _patterns = __experimentalGetPatternsByBlockTypes( name );
 			const _blockVariations = getBlockVariations( name, 'block' );
 			return {
 				defaultVariation: getDefaultBlockVariation( name, 'block' ),
@@ -126,8 +123,7 @@ const LayoutSetupStep = ( {
 };
 
 function BlockPattern( { pattern, onSelect, composite } ) {
-	const { content, viewportWidth } = pattern;
-	const blocks = useMemo( () => parse( content ), [ content ] );
+	const { viewportWidth, blocks } = pattern;
 	const descriptionId = useInstanceId(
 		BlockPattern,
 		'block-setup-block-layout-list__item-description'
diff --git a/packages/block-library/src/query/edit/query-block-setup.js b/packages/block-library/src/query/edit/query-block-setup.js
index 2a89734275d67d..f7837da313fc37 100644
--- a/packages/block-library/src/query/edit/query-block-setup.js
+++ b/packages/block-library/src/query/edit/query-block-setup.js
@@ -1,10 +1,17 @@
+/**
+ * External dependencies
+ */
+import { cloneDeep } from 'lodash';
 /**
  * WordPress dependencies
  */
 import { useDispatch } from '@wordpress/data';
 import { __, _x } from '@wordpress/i18n';
 import { SelectControl, ToggleControl } from '@wordpress/components';
-import { createBlocksFromInnerBlocksTemplate } from '@wordpress/blocks';
+import {
+	cloneBlock,
+	createBlocksFromInnerBlocksTemplate,
+} from '@wordpress/blocks';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
@@ -20,29 +27,55 @@ const QueryBlockSetup = ( {
 	name: blockName,
 } ) => {
 	const { postType, inherit } = query;
-	const { replaceInnerBlocks } = useDispatch( blockEditorStore );
+	const { replaceBlocks, replaceInnerBlocks } = useDispatch(
+		blockEditorStore
+	);
 	const { postTypesSelectOptions } = usePostTypes();
 	const updateQuery = ( newQuery ) =>
 		setAttributes( { query: { ...query, ...newQuery } } );
-	const onFinish = ( innerBlocks ) => {
-		if ( innerBlocks ) {
-			replaceInnerBlocks(
-				clientId,
-				createBlocksFromInnerBlocksTemplate( innerBlocks ),
-				false
-			);
-		}
-	};
 	const onVariationSelect = ( nextVariation ) => {
 		if ( nextVariation.attributes ) {
 			setAttributes( nextVariation.attributes );
 		}
 		if ( nextVariation.innerBlocks ) {
-			onFinish( nextVariation.innerBlocks );
+			replaceInnerBlocks(
+				clientId,
+				createBlocksFromInnerBlocksTemplate(
+					nextVariation.innerBlocks
+				),
+				false
+			);
 		}
 	};
 	const onBlockPatternSelect = ( blocks ) => {
-		onFinish( [ [ 'core/query-loop', {}, blocks ] ] );
+		const clonedBlocks = blocks.map( ( block ) => {
+			const clone = cloneBlock( block );
+			/**
+			 * TODO: this check will be revised with the ongoing work on block patterns.
+			 * For now we keep the value of posts per page (`query.perPage`) from Query patterns
+			 * so as to preview the pattern as intended, without possible big previews.
+			 * During insertion, we need to override the Query's attributes that can be set in
+			 * the Placeholder and we unset the `perPage` value to be set appropriately by Query block.
+			 */
+			if ( block.name === 'core/query' ) {
+				/**
+				 * We need to `cloneDeep` the Query's attributes, as `cloneBlock` does a swallow
+				 * copy of the block.
+				 */
+				const queryAttributes = cloneDeep( clone.attributes );
+				Object.assign( queryAttributes.query, {
+					inherit: query.inherit,
+					postType: query.postType,
+					perPage: null,
+				} );
+				return {
+					...clone,
+					attributes: queryAttributes,
+				};
+			}
+			return clone;
+		} );
+		replaceBlocks( clientId, clonedBlocks );
 	};
 	const inheritToggleHelp = !! inherit
 		? _x(

From 6cf3521df09da7a974465529e8f5b54ba2e71db6 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Mon, 5 Apr 2021 09:53:41 +0300
Subject: [PATCH 48/53] [Site editor]: Switch to proper settings tab based on
 the selection (#30387)

* switch to block tab on block select

* add e2e tests
---
 .../experiments/settings-sidebar.test.js      | 24 +++++++++
 .../edit-site/src/components/sidebar/index.js | 50 ++++++++++++-------
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/packages/e2e-tests/specs/experiments/settings-sidebar.test.js b/packages/e2e-tests/specs/experiments/settings-sidebar.test.js
index 43c95626525801..9b51ec3d56195f 100644
--- a/packages/e2e-tests/specs/experiments/settings-sidebar.test.js
+++ b/packages/e2e-tests/specs/experiments/settings-sidebar.test.js
@@ -6,6 +6,7 @@ import {
 	activateTheme,
 	getAllBlocks,
 	selectBlockByClientId,
+	insertBlock,
 } from '@wordpress/e2e-test-utils';
 
 /**
@@ -95,4 +96,27 @@ describe( 'Settings sidebar', () => {
 			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
 		} );
 	} );
+
+	describe( 'Tab switch based on selection', () => {
+		it( 'should switch to block tab if we select a block, when Template is selected', async () => {
+			await toggleSidebar();
+			expect( await getActiveTabLabel() ).toEqual(
+				'Template (selected)'
+			);
+			// By inserting the block is also selected.
+			await insertBlock( 'Heading' );
+			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
+		} );
+		it( 'should switch to Template tab when a block was selected and we select the Template', async () => {
+			await insertBlock( 'Heading' );
+			await toggleSidebar();
+			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
+			await page.evaluate( () => {
+				wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
+			} );
+			expect( await getActiveTabLabel() ).toEqual(
+				'Template (selected)'
+			);
+		} );
+	} );
 } );
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 206d41b857b833..d99397b9f62f59 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -4,7 +4,8 @@
 import { createSlotFill, PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { cog, typography } from '@wordpress/icons';
-import { useSelect } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { store as interfaceStore } from '@wordpress/interface';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
@@ -24,23 +25,38 @@ const { Slot: InspectorSlot, Fill: InspectorFill } = createSlotFill(
 export const SidebarInspectorFill = InspectorFill;
 
 export function SidebarComplementaryAreaFills() {
-	const { sidebarName } = useSelect( ( select ) => {
-		let sidebar = select( interfaceStore ).getActiveComplementaryArea(
-			STORE_NAME
-		);
-
-		if ( ! [ SIDEBAR_BLOCK, SIDEBAR_TEMPLATE ].includes( sidebar ) ) {
-			sidebar = SIDEBAR_TEMPLATE;
-			if ( select( blockEditorStore ).getBlockSelectionStart() ) {
-				sidebar = SIDEBAR_BLOCK;
-			}
+	const { sidebar, isEditorSidebarOpened, hasBlockSelection } = useSelect(
+		( select ) => {
+			const _sidebar = select(
+				interfaceStore
+			).getActiveComplementaryArea( STORE_NAME );
+			const _isEditorSidebarOpened = [
+				SIDEBAR_BLOCK,
+				SIDEBAR_TEMPLATE,
+			].includes( _sidebar );
+			return {
+				sidebar: _sidebar,
+				isEditorSidebarOpened: _isEditorSidebarOpened,
+				hasBlockSelection: !! select(
+					blockEditorStore
+				).getBlockSelectionStart(),
+			};
+		},
+		[]
+	);
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
+	useEffect( () => {
+		if ( ! isEditorSidebarOpened ) return;
+		if ( hasBlockSelection ) {
+			enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK );
+		} else {
+			enableComplementaryArea( STORE_NAME, SIDEBAR_TEMPLATE );
 		}
-
-		return {
-			sidebarName: sidebar,
-		};
-	} );
-
+	}, [ hasBlockSelection, isEditorSidebarOpened ] );
+	let sidebarName = sidebar;
+	if ( ! isEditorSidebarOpened ) {
+		sidebarName = hasBlockSelection ? SIDEBAR_BLOCK : SIDEBAR_TEMPLATE;
+	}
 	return (
 		<>
 			<DefaultSidebar

From 7c846930f5b7707a0a3bd43ba1c3483de00e3321 Mon Sep 17 00:00:00 2001
From: Lewis Cowles <lewis+github@cowles.uk>
Date: Mon, 5 Apr 2021 08:07:44 +0100
Subject: [PATCH 49/53] Fix: Rename, changed URL Link (#30483)

---
 docs/explanations/architecture/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/explanations/architecture/README.md b/docs/explanations/architecture/README.md
index 3ae16794dfa4ff..caf7b64c3ffdc2 100644
--- a/docs/explanations/architecture/README.md
+++ b/docs/explanations/architecture/README.md
@@ -10,4 +10,4 @@ Let’s look at the big picture and the architectural and UX principles of the b
 - What are the decision decisions behind the Data Module?
 - [Why is Puppeteer the tool of choice for end-to-end tests?](/docs/explanations/architecture/automated-testing.md)
 - [What's the difference between the different editor packages? What's the purpose of each package?](/docs/explanations/architecture/modularity.md#whats-the-difference-between-the-different-editor-packages-whats-the-purpose-of-each-package)
-- [Template and template parts flows](/docs/explanations/architecture/fse-templates.md)
+- [Template and template parts flows](/docs/explanations/architecture/full-site-editing-templates.md)

From 48e470eca70966c8a9ff89f342c875b7aa9845b0 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Mon, 5 Apr 2021 16:45:27 +0300
Subject: [PATCH 50/53] Add option to make PostDate a link (#30499)

* Add option to make PostDate a link

* update fixture
---
 .../block-library/src/post-date/block.json    |  4 ++
 packages/block-library/src/post-date/edit.js  | 57 +++++++++++--------
 .../block-library/src/post-date/index.php     |  9 ++-
 .../fixtures/blocks/core__post-date.json      |  4 +-
 4 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json
index 94fc7dd67d9f98..58bd054fa4d053 100644
--- a/packages/block-library/src/post-date/block.json
+++ b/packages/block-library/src/post-date/block.json
@@ -8,6 +8,10 @@
 		},
 		"format": {
 			"type": "string"
+		},
+		"isLink": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"usesContext": [
diff --git a/packages/block-library/src/post-date/edit.js b/packages/block-library/src/post-date/edit.js
index 4b75b93a648d31..ee998f01188248 100644
--- a/packages/block-library/src/post-date/edit.js
+++ b/packages/block-library/src/post-date/edit.js
@@ -18,16 +18,17 @@ import {
 import {
 	ToolbarGroup,
 	ToolbarButton,
+	ToggleControl,
 	Popover,
 	DateTimePicker,
 	PanelBody,
 	CustomSelectControl,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { edit } from '@wordpress/icons';
 
 export default function PostDateEdit( { attributes, context, setAttributes } ) {
-	const { textAlign, format } = attributes;
+	const { textAlign, format, isLink } = attributes;
 	const { postId, postType } = context;
 
 	const [ siteFormat ] = useEntityProp( 'root', 'site', 'date_format' );
@@ -62,6 +63,25 @@ export default function PostDateEdit( { attributes, context, setAttributes } ) {
 		} ),
 	} );
 
+	let postDate = date ? (
+		<time dateTime={ dateI18n( 'c', date ) }>
+			{ dateI18n( resolvedFormat, date ) }
+			{ isPickerOpen && (
+				<Popover onClose={ setIsPickerOpen.bind( null, false ) }>
+					<DateTimePicker
+						currentDate={ date }
+						onChange={ setDate }
+						is12Hour={ is12Hour }
+					/>
+				</Popover>
+			) }
+		</time>
+	) : (
+		__( 'No Date' )
+	);
+	if ( isLink && date ) {
+		postDate = <a href="#post-date-pseudo-link">{ postDate }</a>;
+	}
 	return (
 		<>
 			<BlockControls>
@@ -103,28 +123,19 @@ export default function PostDateEdit( { attributes, context, setAttributes } ) {
 						) }
 					/>
 				</PanelBody>
-			</InspectorControls>
-
-			<div { ...blockProps }>
-				{ date && (
-					<time dateTime={ dateI18n( 'c', date ) }>
-						{ dateI18n( resolvedFormat, date ) }
-
-						{ isPickerOpen && (
-							<Popover
-								onClose={ setIsPickerOpen.bind( null, false ) }
-							>
-								<DateTimePicker
-									currentDate={ date }
-									onChange={ setDate }
-									is12Hour={ is12Hour }
-								/>
-							</Popover>
+				<PanelBody title={ __( 'Link settings' ) }>
+					<ToggleControl
+						label={ sprintf(
+							// translators: %s: Name of the post type e.g: "post".
+							__( 'Link to %s' ),
+							postType
 						) }
-					</time>
-				) }
-				{ ! date && __( 'No Date' ) }
-			</div>
+						onChange={ () => setAttributes( { isLink: ! isLink } ) }
+						checked={ isLink }
+					/>
+				</PanelBody>
+			</InspectorControls>
+			<div { ...blockProps }>{ postDate }</div>
 		</>
 	);
 }
diff --git a/packages/block-library/src/post-date/index.php b/packages/block-library/src/post-date/index.php
index 940820b504692f..051fc04f4d9131 100644
--- a/packages/block-library/src/post-date/index.php
+++ b/packages/block-library/src/post-date/index.php
@@ -18,14 +18,19 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 		return '';
 	}
 
+	$post_ID            = $block->context['postId'];
 	$align_class_name   = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+	$formatted_date     = get_the_date( isset( $attributes['format'] ) ? $attributes['format'] : '', $post_ID );
+	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
+		$formatted_date = sprintf( '<a href="%1s">%2s</a>', get_the_permalink( $post_ID ), $formatted_date );
+	}
 
 	return sprintf(
 		'<div %1$s><time datetime="%2$s">%3$s</time></div>',
 		$wrapper_attributes,
-		get_the_date( 'c', $block->context['postId'] ),
-		get_the_date( isset( $attributes['format'] ) ? $attributes['format'] : '', $block->context['postId'] )
+		get_the_date( 'c', $post_ID ),
+		$formatted_date
 	);
 }
 
diff --git a/packages/e2e-tests/fixtures/blocks/core__post-date.json b/packages/e2e-tests/fixtures/blocks/core__post-date.json
index 42e12a85c49629..18ccc227b0399d 100644
--- a/packages/e2e-tests/fixtures/blocks/core__post-date.json
+++ b/packages/e2e-tests/fixtures/blocks/core__post-date.json
@@ -3,7 +3,9 @@
         "clientId": "_clientId_0",
         "name": "core/post-date",
         "isValid": true,
-        "attributes": {},
+        "attributes": {
+            "isLink": false
+        },
         "innerBlocks": [],
         "originalContent": ""
     }

From e12881c79441ca874fb2b2c2adffba8ed0792103 Mon Sep 17 00:00:00 2001
From: Jon Desrosiers <desrosj@users.noreply.github.com>
Date: Mon, 5 Apr 2021 11:35:01 -0400
Subject: [PATCH 51/53] Some GHA workflow improvements when setting up NodeJS
 (#29078)

* Some improvements to NPM caching within GHA workflows.

This ensures the version of Node.JS is set up prior to configuring or restoring the cache of NPM modules.

* This updates the version of `actions/setup-node` used to the latest, 2.x.

* Redo formatting updates.
---
 .github/workflows/build-plugin-zip.yml        | 10 +++----
 .github/workflows/bundle-size.yml             |  5 ++++
 .github/workflows/create-block.yml            | 10 +++----
 .github/workflows/end2end-test.yml            | 10 +++----
 .github/workflows/performance.yml             | 10 +++----
 .github/workflows/pull-request-automation.yml |  5 ++++
 .github/workflows/rnmobile-android-runner.yml |  5 ++++
 .github/workflows/rnmobile-ios-runner.yml     |  5 ++++
 .github/workflows/static-checks.yml           | 10 +++----
 .github/workflows/storybook-pages.yml         | 10 +++----
 .github/workflows/unit-test.yml               | 30 +++++++++----------
 11 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/build-plugin-zip.yml b/.github/workflows/build-plugin-zip.yml
index bc2e68bbff513e..0e753ce816e21d 100644
--- a/.github/workflows/build-plugin-zip.yml
+++ b/.github/workflows/build-plugin-zip.yml
@@ -109,6 +109,11 @@ jobs:
               with:
                   ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -122,11 +127,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Build Gutenberg plugin ZIP file
               run: ./bin/build-plugin-zip.sh
               env:
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 2253ff9941d23e..16a32deba10e3d 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -12,6 +12,11 @@ jobs:
               with:
                   fetch-depth: 1
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - uses: preactjs/compressed-size-action@7d87f60a6b0c7d193b8183ce859ed00b356ea92f # v2.1.0
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.github/workflows/create-block.yml b/.github/workflows/create-block.yml
index e2d76e14788da6..d76c2077c3a819 100644
--- a/.github/workflows/create-block.yml
+++ b/.github/workflows/create-block.yml
@@ -17,6 +17,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js ${{ matrix.node }}.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: ${{ matrix.node }}
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -30,11 +35,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js ${{ matrix.node }}.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: ${{ matrix.node }}
-
             - name: npm install, build, format and lint
               run: |
                   npm ci
diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
index 6f4576b6cd37c5..11a3bdd4385756 100644
--- a/.github/workflows/end2end-test.yml
+++ b/.github/workflows/end2end-test.yml
@@ -21,6 +21,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -34,11 +39,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Npm install and build
               run: |
                   npm ci
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index bf9fb39e4b065a..5dd89194808e17 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -14,6 +14,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -27,11 +32,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Npm install
               run: |
                   npm ci
diff --git a/.github/workflows/pull-request-automation.yml b/.github/workflows/pull-request-automation.yml
index f97e9c28ec7e90..46274e7b414484 100644
--- a/.github/workflows/pull-request-automation.yml
+++ b/.github/workflows/pull-request-automation.yml
@@ -14,6 +14,11 @@ jobs:
               with:
                   ref: trunk
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             # Changing into the action's directory and running `npm install` is much
             # faster than a full project-wide `npm ci`.
             - run: cd packages/project-management-automation && npm install
diff --git a/.github/workflows/rnmobile-android-runner.yml b/.github/workflows/rnmobile-android-runner.yml
index 74b722c70fcbb4..f639570acc38d3 100644
--- a/.github/workflows/rnmobile-android-runner.yml
+++ b/.github/workflows/rnmobile-android-runner.yml
@@ -16,6 +16,11 @@ jobs:
             - name: checkout
               uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Restore npm cache
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               with:
diff --git a/.github/workflows/rnmobile-ios-runner.yml b/.github/workflows/rnmobile-ios-runner.yml
index 1f178df8a6b21b..f9c42242709b81 100644
--- a/.github/workflows/rnmobile-ios-runner.yml
+++ b/.github/workflows/rnmobile-ios-runner.yml
@@ -16,6 +16,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Restore npm cache
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               with:
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index 4264af972e028d..2c3baf15d59573 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -16,6 +16,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -29,11 +34,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Npm install and build
               # A "full" install is executed, since `npm ci` does not always exit
               # with an error status code if the lock file is inaccurate.
diff --git a/.github/workflows/storybook-pages.yml b/.github/workflows/storybook-pages.yml
index d717c1cf58c3a6..fa5cbc86ab2662 100644
--- a/.github/workflows/storybook-pages.yml
+++ b/.github/workflows/storybook-pages.yml
@@ -14,6 +14,11 @@ jobs:
               with:
                   ref: trunk
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -27,11 +32,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Setup Node
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: '14.x'
-
             - name: Install Dependencies
               run: npm ci
 
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index a14504275a7809..9181981db99b0e 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -21,6 +21,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js ${{ matrix.node }}.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: ${{ matrix.node }}
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -34,11 +39,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js ${{ matrix.node }}.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: ${{ matrix.node }}
-
             - name: Npm install and build
               # It's not necessary to run the full build, since Jest can interpret
               # source files with `babel-jest`. Some packages have their own custom
@@ -61,6 +61,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -74,11 +79,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Npm install and build
               run: |
                   npm ci
@@ -108,6 +108,11 @@ jobs:
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
+            - name: Use Node.js 14.x
+              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+              with:
+                node-version: 14.x
+
             - name: Cache node modules
               uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
               env:
@@ -121,11 +126,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
-              with:
-                  node-version: 14.x
-
             - name: Npm install and build
               # It's not necessary to run the full build, since Jest can interpret
               # source files with `babel-jest`. Some packages have their own custom

From cf2da3369112dd277a6b252e7719f2ea726b76fc Mon Sep 17 00:00:00 2001
From: sarayourfriend <sarayourfriend@fastmail.com>
Date: Mon, 5 Apr 2021 15:58:38 -0700
Subject: [PATCH 52/53] docgen: Fix arrow functions and TS index module support
 (#30028)

* docgen: Detect TS index modules

* docgen: Handle arrow function annotations

* Refactor restParam to explicitly only handle one rest param

* Use more descriptive and singular names for target file cases

* Fix constructor missing return type

* Simplify rest param handling
---
 packages/docgen/lib/get-type-annotation.js    |  23 +-
 packages/docgen/lib/index.js                  |  23 +-
 .../arrow-function/example.ts                 |   3 +
 .../arrow-function/get-node.js                | 407 ++++++++++++++++++
 packages/docgen/test/get-type-annotation.js   |  11 +
 5 files changed, 454 insertions(+), 13 deletions(-)
 create mode 100644 packages/docgen/test/fixtures/type-annotations/arrow-function/example.ts
 create mode 100644 packages/docgen/test/fixtures/type-annotations/arrow-function/get-node.js

diff --git a/packages/docgen/lib/get-type-annotation.js b/packages/docgen/lib/get-type-annotation.js
index 1b2289b1a4fc4d..8158424eb7fcb4 100644
--- a/packages/docgen/lib/get-type-annotation.js
+++ b/packages/docgen/lib/get-type-annotation.js
@@ -12,11 +12,12 @@ const { types: babelTypes } = require( '@babel/core' );
 /* eslint-enable jsdoc/valid-types */
 
 /**
- * @param {babelTypes.TSCallSignatureDeclaration | babelTypes.TSFunctionType} typeAnnotation
+ * @param {babelTypes.TSCallSignatureDeclaration | babelTypes.TSFunctionType | babelTypes.TSConstructSignatureDeclaration} typeAnnotation
  * @param {' => ' | ': '} returnIndicator The return indicator to use. Allows using the same function for function annotations and object call properties.
  */
 function getFunctionTypeAnnotation( typeAnnotation, returnIndicator ) {
-	const params = typeAnnotation.parameters
+	const nonRestParams = typeAnnotation.parameters
+		.filter( ( p ) => babelTypes.isIdentifier( p ) )
 		.map(
 			( p ) =>
 				`${ p.name }: ${ getTypeAnnotation(
@@ -24,10 +25,24 @@ function getFunctionTypeAnnotation( typeAnnotation, returnIndicator ) {
 				) }`
 		)
 		.join( ', ' );
+
+	let params = nonRestParams;
+	const restParam = typeAnnotation.parameters.find(
+		babelTypes.isRestElement
+	);
+	if ( restParam ) {
+		const paramName = restParam.argument.name;
+		const paramType = getTypeAnnotation(
+			restParam.typeAnnotation.typeAnnotation
+		);
+		params += `, ...${ paramName }: ${ paramType }`;
+	}
+
 	const returnType = getTypeAnnotation(
 		typeAnnotation.returnType ||
 			typeAnnotation.typeAnnotation.typeAnnotation
 	);
+
 	return `( ${ params } )${ returnIndicator }${ returnType }`;
 }
 
@@ -256,14 +271,14 @@ function getTypeAnnotation( typeAnnotation ) {
 			return '';
 		}
 		case 'TSConstructorType': {
-			return `new ${ getFunctionTypeAnnotation( typeAnnotation ) }`;
+			return `new ${ getFunctionTypeAnnotation( typeAnnotation, ': ' ) }`;
 		}
 		case 'TSExpressionWithTypeArguments': {
 			// Unsure with this is
 			return '';
 		}
 		case 'TSFunctionType': {
-			return getFunctionTypeAnnotation( typeAnnotation );
+			return getFunctionTypeAnnotation( typeAnnotation, ' => ' );
 		}
 		case 'TSImportType': {
 			return getImportTypeAnnotation( typeAnnotation );
diff --git a/packages/docgen/lib/index.js b/packages/docgen/lib/index.js
index 67546189a042e7..49548d3ab5ed8d 100644
--- a/packages/docgen/lib/index.js
+++ b/packages/docgen/lib/index.js
@@ -15,20 +15,25 @@ const isSymbolPrivate = require( './is-symbol-private' );
 /**
  * Helpers functions.
  */
-
+const extensions = [ '.js', '.ts', '.tsx' ];
 const relativeToAbsolute = ( basePath, relativePath ) => {
 	const target = path.join( path.dirname( basePath ), relativePath );
-	if ( path.extname( target ) === '.js' ) {
+	const extension = path.extname( target );
+	if ( extensions.includes( extension ) ) {
 		return target;
 	}
-	let targetFile = target + '.js';
-	if ( fs.existsSync( targetFile ) ) {
-		return targetFile;
-	}
-	targetFile = path.join( target, 'index.js' );
-	if ( fs.existsSync( targetFile ) ) {
-		return targetFile;
+
+	for ( const ext of extensions ) {
+		const targetFileWithExtension = target + ext;
+		if ( fs.existsSync( targetFileWithExtension ) ) {
+			return targetFileWithExtension;
+		}
+		const targetFileAsIndexModule = path.join( target, 'index' + ext );
+		if ( fs.existsSync( targetFileAsIndexModule ) ) {
+			return targetFileAsIndexModule;
+		}
 	}
+
 	process.stderr.write( '\nRelative path does not exists.' );
 	process.stderr.write( '\n' );
 	process.stderr.write( `\nBase: ${ basePath }` );
diff --git a/packages/docgen/test/fixtures/type-annotations/arrow-function/example.ts b/packages/docgen/test/fixtures/type-annotations/arrow-function/example.ts
new file mode 100644
index 00000000000000..d3363c20350c50
--- /dev/null
+++ b/packages/docgen/test/fixtures/type-annotations/arrow-function/example.ts
@@ -0,0 +1,3 @@
+export const fn = (
+	callback: ( foo: string, ...rest: any[] ) => GenericType< T >
+): void => {};
diff --git a/packages/docgen/test/fixtures/type-annotations/arrow-function/get-node.js b/packages/docgen/test/fixtures/type-annotations/arrow-function/get-node.js
new file mode 100644
index 00000000000000..9120a2c43a6367
--- /dev/null
+++ b/packages/docgen/test/fixtures/type-annotations/arrow-function/get-node.js
@@ -0,0 +1,407 @@
+module.exports = () => ( {
+	type: 'ExportNamedDeclaration',
+	start: 0,
+	end: 97,
+	loc: {
+		start: {
+			line: 1,
+			column: 0,
+		},
+		end: {
+			line: 3,
+			column: 14,
+		},
+	},
+	exportKind: 'value',
+	specifiers: [],
+	source: null,
+	declaration: {
+		type: 'VariableDeclaration',
+		start: 7,
+		end: 97,
+		loc: {
+			start: {
+				line: 1,
+				column: 7,
+			},
+			end: {
+				line: 3,
+				column: 14,
+			},
+		},
+		declarations: [
+			{
+				type: 'VariableDeclarator',
+				start: 13,
+				end: 96,
+				loc: {
+					start: {
+						line: 1,
+						column: 13,
+					},
+					end: {
+						line: 3,
+						column: 13,
+					},
+				},
+				id: {
+					type: 'Identifier',
+					start: 13,
+					end: 15,
+					loc: {
+						start: {
+							line: 1,
+							column: 13,
+						},
+						end: {
+							line: 1,
+							column: 15,
+						},
+						identifierName: 'fn',
+					},
+					name: 'fn',
+				},
+				init: {
+					type: 'ArrowFunctionExpression',
+					start: 18,
+					end: 96,
+					loc: {
+						start: {
+							line: 1,
+							column: 18,
+						},
+						end: {
+							line: 3,
+							column: 13,
+						},
+					},
+					returnType: {
+						type: 'TSTypeAnnotation',
+						start: 84,
+						end: 90,
+						loc: {
+							start: {
+								line: 3,
+								column: 1,
+							},
+							end: {
+								line: 3,
+								column: 7,
+							},
+						},
+						typeAnnotation: {
+							type: 'TSVoidKeyword',
+							start: 86,
+							end: 90,
+							loc: {
+								start: {
+									line: 3,
+									column: 3,
+								},
+								end: {
+									line: 3,
+									column: 7,
+								},
+							},
+						},
+					},
+					id: null,
+					generator: false,
+					async: false,
+					params: [
+						{
+							type: 'Identifier',
+							start: 21,
+							end: 82,
+							loc: {
+								start: {
+									line: 2,
+									column: 1,
+								},
+								end: {
+									line: 2,
+									column: 62,
+								},
+								identifierName: 'callback',
+							},
+							name: 'callback',
+							typeAnnotation: {
+								type: 'TSTypeAnnotation',
+								start: 29,
+								end: 82,
+								loc: {
+									start: {
+										line: 2,
+										column: 9,
+									},
+									end: {
+										line: 2,
+										column: 62,
+									},
+								},
+								typeAnnotation: {
+									type: 'TSFunctionType',
+									start: 31,
+									end: 82,
+									loc: {
+										start: {
+											line: 2,
+											column: 11,
+										},
+										end: {
+											line: 2,
+											column: 62,
+										},
+									},
+									parameters: [
+										{
+											type: 'Identifier',
+											start: 33,
+											end: 44,
+											loc: {
+												start: {
+													line: 2,
+													column: 13,
+												},
+												end: {
+													line: 2,
+													column: 24,
+												},
+												identifierName: 'foo',
+											},
+											name: 'foo',
+											typeAnnotation: {
+												type: 'TSTypeAnnotation',
+												start: 36,
+												end: 44,
+												loc: {
+													start: {
+														line: 2,
+														column: 16,
+													},
+													end: {
+														line: 2,
+														column: 24,
+													},
+												},
+												typeAnnotation: {
+													type: 'TSStringKeyword',
+													start: 38,
+													end: 44,
+													loc: {
+														start: {
+															line: 2,
+															column: 18,
+														},
+														end: {
+															line: 2,
+															column: 24,
+														},
+													},
+												},
+											},
+										},
+										{
+											type: 'RestElement',
+											start: 46,
+											end: 60,
+											loc: {
+												start: {
+													line: 2,
+													column: 26,
+												},
+												end: {
+													line: 2,
+													column: 40,
+												},
+											},
+											argument: {
+												type: 'Identifier',
+												start: 49,
+												end: 53,
+												loc: {
+													start: {
+														line: 2,
+														column: 29,
+													},
+													end: {
+														line: 2,
+														column: 33,
+													},
+													identifierName: 'rest',
+												},
+												name: 'rest',
+											},
+											typeAnnotation: {
+												type: 'TSTypeAnnotation',
+												start: 53,
+												end: 60,
+												loc: {
+													start: {
+														line: 2,
+														column: 33,
+													},
+													end: {
+														line: 2,
+														column: 40,
+													},
+												},
+												typeAnnotation: {
+													type: 'TSArrayType',
+													start: 55,
+													end: 60,
+													loc: {
+														start: {
+															line: 2,
+															column: 35,
+														},
+														end: {
+															line: 2,
+															column: 40,
+														},
+													},
+													elementType: {
+														type: 'TSAnyKeyword',
+														start: 55,
+														end: 58,
+														loc: {
+															start: {
+																line: 2,
+																column: 35,
+															},
+															end: {
+																line: 2,
+																column: 38,
+															},
+														},
+													},
+												},
+											},
+										},
+									],
+									typeAnnotation: {
+										type: 'TSTypeAnnotation',
+										start: 63,
+										end: 82,
+										loc: {
+											start: {
+												line: 2,
+												column: 43,
+											},
+											end: {
+												line: 2,
+												column: 62,
+											},
+										},
+										typeAnnotation: {
+											type: 'TSTypeReference',
+											start: 66,
+											end: 82,
+											loc: {
+												start: {
+													line: 2,
+													column: 46,
+												},
+												end: {
+													line: 2,
+													column: 62,
+												},
+											},
+											typeName: {
+												type: 'Identifier',
+												start: 66,
+												end: 77,
+												loc: {
+													start: {
+														line: 2,
+														column: 46,
+													},
+													end: {
+														line: 2,
+														column: 57,
+													},
+													identifierName:
+														'GenericType',
+												},
+												name: 'GenericType',
+											},
+											typeParameters: {
+												type:
+													'TSTypeParameterInstantiation',
+												start: 77,
+												end: 82,
+												loc: {
+													start: {
+														line: 2,
+														column: 57,
+													},
+													end: {
+														line: 2,
+														column: 62,
+													},
+												},
+												params: [
+													{
+														type: 'TSTypeReference',
+														start: 79,
+														end: 80,
+														loc: {
+															start: {
+																line: 2,
+																column: 59,
+															},
+															end: {
+																line: 2,
+																column: 60,
+															},
+														},
+														typeName: {
+															type: 'Identifier',
+															start: 79,
+															end: 80,
+															loc: {
+																start: {
+																	line: 2,
+																	column: 59,
+																},
+																end: {
+																	line: 2,
+																	column: 60,
+																},
+																identifierName:
+																	'T',
+															},
+															name: 'T',
+														},
+													},
+												],
+											},
+										},
+									},
+								},
+							},
+						},
+					],
+					body: {
+						type: 'BlockStatement',
+						start: 94,
+						end: 96,
+						loc: {
+							start: {
+								line: 3,
+								column: 11,
+							},
+							end: {
+								line: 3,
+								column: 13,
+							},
+						},
+						body: [],
+						directives: [],
+					},
+				},
+			},
+		],
+		kind: 'const',
+	},
+} );
diff --git a/packages/docgen/test/get-type-annotation.js b/packages/docgen/test/get-type-annotation.js
index 45e3e5377bdfc1..b9e5ab9d0d9138 100644
--- a/packages/docgen/test/get-type-annotation.js
+++ b/packages/docgen/test/get-type-annotation.js
@@ -11,6 +11,7 @@ const getNamedExportNode = require( './fixtures/type-annotations/named-export/ge
 const getExportedVariableDeclarationNode = require( './fixtures/type-annotations/exported-variable-declaration/get-node' );
 const getImportsParameterizedRestOperatorPredicateIndexerTypeNode = require( './fixtures/type-annotations/imports-parameterized-rest-operator-predicate-indexers/get-node' );
 const getMissingTypesNode = require( './fixtures/type-annotations/missing-types/get-node' );
+const getArrowFunctionNode = require( './fixtures/type-annotations/arrow-function/get-node' );
 
 describe( 'Type annotations', () => {
 	it( 'are taken from JSDoc if any', () => {
@@ -205,4 +206,14 @@ describe( 'Type annotations', () => {
 			);
 		} );
 	} );
+
+	describe( 'arrow function parameters', () => {
+		const node = getArrowFunctionNode();
+
+		it( 'should correctly format the arrow function', () => {
+			expect(
+				getTypeAnnotation( { ...paramTag, name: 'callback' }, node )
+			).toBe( '( foo: string, ...rest: any[] ) => GenericType< T >' );
+		} );
+	} );
 } );

From 22f2be9d6a7511ea05a5ff09543547911faa3d3f Mon Sep 17 00:00:00 2001
From: AmandaRiu <5810477+AmandaRiu@users.noreply.github.com>
Date: Mon, 5 Apr 2021 19:11:09 -0400
Subject: [PATCH 53/53] [RNMobile] Search Block: Unit Tests (#30511)

---
 .../block-library/src/search/edit.native.js   |   8 +-
 .../test/__snapshots__/edit.native.js.snap    | 648 ++++++++++++++++++
 .../src/search/test/edit.native.js            | 159 +++++
 3 files changed, 812 insertions(+), 3 deletions(-)
 create mode 100644 packages/block-library/src/search/test/__snapshots__/edit.native.js.snap
 create mode 100644 packages/block-library/src/search/test/edit.native.js

diff --git a/packages/block-library/src/search/edit.native.js b/packages/block-library/src/search/edit.native.js
index fae4d6bb255ca1..239d8cd3a4a037 100644
--- a/packages/block-library/src/search/edit.native.js
+++ b/packages/block-library/src/search/edit.native.js
@@ -219,7 +219,7 @@ export default function SearchEdit( {
 						onFocus();
 					} }
 					onBlur={ () => setIsPlaceholderSelected( false ) }
-					placeholderTextColor={ placeholderStyle.color }
+					placeholderTextColor={ placeholderStyle?.color }
 				/>
 			</View>
 		);
@@ -271,7 +271,9 @@ export default function SearchEdit( {
 							onBlur={ () => {
 								setIsButtonSelected( false );
 							} }
-							selectionColor={ styles.richTextButtonCursor.color }
+							selectionColor={
+								styles.richTextButtonCursor?.color
+							}
 						/>
 					</View>
 				) }
@@ -318,7 +320,7 @@ export default function SearchEdit( {
 						onBlur={ () => {
 							setIsLabelSelected( false );
 						} }
-						selectionColor={ styles.richTextButtonCursor.color }
+						selectionColor={ styles.richTextButtonCursor?.color }
 					/>
 				</View>
 			) }
diff --git a/packages/block-library/src/search/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/search/test/__snapshots__/edit.native.js.snap
new file mode 100644
index 00000000000000..f181950bc874b7
--- /dev/null
+++ b/packages/block-library/src/search/test/__snapshots__/edit.native.js.snap
@@ -0,0 +1,648 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Search Block renders block with button inside option 1`] = `
+<View
+  accessibilityElementsHidden={true}
+  className="wp-block-search__button-inside wp-block-search__text-button"
+  importantForAccessibility="no-hide-descendants"
+>
+  <View
+    accessibilityHint="Double tap to edit label text"
+    accessibilityLabel="Search block label. Current text is Search"
+    accessibilityRole="none"
+    accessible={true}
+  >
+    <View>
+      <RCTAztecView
+        accessible={true}
+        activeFormats={Array []}
+        blockType={
+          Object {
+            "tag": "p",
+          }
+        }
+        disableEditingMenu={false}
+        focusable={true}
+        fontFamily="serif"
+        isMultiline={false}
+        maxImagesWidth={200}
+        onBackspace={[Function]}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onClick={[Function]}
+        onContentSizeChange={[Function]}
+        onEnter={[Function]}
+        onFocus={[Function]}
+        onHTMLContentWithCursor={[Function]}
+        onKeyDown={[Function]}
+        onPaste={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onSelectionChange={[Function]}
+        onStartShouldSetResponder={[Function]}
+        placeholder="Add label…"
+        placeholderTextColor="gray"
+        style={
+          Object {
+            "backgroundColor": undefined,
+            "maxWidth": undefined,
+            "minHeight": 0,
+          }
+        }
+        text={
+          Object {
+            "eventCount": undefined,
+            "linkTextColor": undefined,
+            "selection": null,
+            "text": "<p >Search</p>",
+          }
+        }
+        triggerKeyCodes={Array []}
+      />
+    </View>
+  </View>
+  <View
+    style={
+      Array [
+        undefined,
+        undefined,
+      ]
+    }
+  >
+    <View
+      accessibilityHint="Double tap to edit placeholder text"
+      accessibilityLabel="Search input field. No custom placeholder set"
+      accessibilityRole="none"
+      accessible={true}
+    >
+      <TextInput
+        allowFontScaling={true}
+        className="wp-block-search__input"
+        ellipsizeMode="tail"
+        fontFamily="serif"
+        isSelected={true}
+        label={null}
+        numberOfLines={1}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onFocus={[Function]}
+        placeholder="Optional placeholder…"
+        rejectResponderTermination={true}
+        scrollEnabled={false}
+        style={
+          Array [
+            undefined,
+            false,
+          ]
+        }
+        underlineColorAndroid="transparent"
+      />
+    </View>
+    <View>
+      <View
+        accessibilityHint="Double tap to edit button text"
+        accessibilityLabel="Search button. Current button text is Search Button"
+        accessibilityRole="none"
+        accessible={true}
+      >
+        <View>
+          <RCTAztecView
+            accessible={true}
+            activeFormats={Array []}
+            blockType={
+              Object {
+                "tag": "p",
+              }
+            }
+            disableEditingMenu={false}
+            focusable={true}
+            fontFamily="serif"
+            isMultiline={false}
+            maxImagesWidth={200}
+            minWidth={75}
+            onBackspace={[Function]}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onClick={[Function]}
+            onContentSizeChange={[Function]}
+            onEnter={[Function]}
+            onFocus={[Function]}
+            onHTMLContentWithCursor={[Function]}
+            onKeyDown={[Function]}
+            onPaste={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onSelectionChange={[Function]}
+            onStartShouldSetResponder={[Function]}
+            placeholder=""
+            placeholderTextColor="gray"
+            style={
+              Object {
+                "backgroundColor": undefined,
+                "maxWidth": undefined,
+                "minHeight": 0,
+              }
+            }
+            text={
+              Object {
+                "eventCount": undefined,
+                "linkTextColor": undefined,
+                "selection": null,
+                "text": "<p >Search Button</p>",
+              }
+            }
+            textAlign="center"
+            triggerKeyCodes={Array []}
+          />
+        </View>
+      </View>
+    </View>
+  </View>
+</View>
+`;
+
+exports[`Search Block renders block with icon button option matches snapshot 1`] = `
+<View
+  accessibilityElementsHidden={true}
+  className="wp-block-search__button-outside wp-block-search__icon-button"
+  importantForAccessibility="no-hide-descendants"
+>
+  <View
+    accessibilityHint="Double tap to edit label text"
+    accessibilityLabel="Search block label. Current text is Search"
+    accessibilityRole="none"
+    accessible={true}
+  >
+    <View>
+      <RCTAztecView
+        accessible={true}
+        activeFormats={Array []}
+        blockType={
+          Object {
+            "tag": "p",
+          }
+        }
+        disableEditingMenu={false}
+        focusable={true}
+        fontFamily="serif"
+        isMultiline={false}
+        maxImagesWidth={200}
+        onBackspace={[Function]}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onClick={[Function]}
+        onContentSizeChange={[Function]}
+        onEnter={[Function]}
+        onFocus={[Function]}
+        onHTMLContentWithCursor={[Function]}
+        onKeyDown={[Function]}
+        onPaste={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onSelectionChange={[Function]}
+        onStartShouldSetResponder={[Function]}
+        placeholder="Add label…"
+        placeholderTextColor="gray"
+        style={
+          Object {
+            "backgroundColor": undefined,
+            "maxWidth": undefined,
+            "minHeight": 0,
+          }
+        }
+        text={
+          Object {
+            "eventCount": undefined,
+            "linkTextColor": undefined,
+            "selection": null,
+            "text": "<p >Search</p>",
+          }
+        }
+        triggerKeyCodes={Array []}
+      />
+    </View>
+  </View>
+  <View
+    style={
+      Array [
+        undefined,
+        false,
+      ]
+    }
+  >
+    <View
+      accessibilityHint="Double tap to edit placeholder text"
+      accessibilityLabel="Search input field. No custom placeholder set"
+      accessibilityRole="none"
+      accessible={true}
+    >
+      <TextInput
+        allowFontScaling={true}
+        className="wp-block-search__input"
+        ellipsizeMode="tail"
+        fontFamily="serif"
+        isSelected={true}
+        label={null}
+        numberOfLines={1}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onFocus={[Function]}
+        placeholder="Optional placeholder…"
+        rejectResponderTermination={true}
+        scrollEnabled={false}
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+        underlineColorAndroid="transparent"
+      />
+    </View>
+    <View>
+      Svg
+    </View>
+  </View>
+</View>
+`;
+
+exports[`Search Block renders block with label hidden matches snapshot 1`] = `
+<View
+  accessibilityElementsHidden={true}
+  className="wp-block-search__button-outside wp-block-search__text-button"
+  importantForAccessibility="no-hide-descendants"
+>
+  <View
+    style={
+      Array [
+        undefined,
+        false,
+      ]
+    }
+  >
+    <View
+      accessibilityHint="Double tap to edit placeholder text"
+      accessibilityLabel="Search input field. No custom placeholder set"
+      accessibilityRole="none"
+      accessible={true}
+    >
+      <TextInput
+        allowFontScaling={true}
+        className="wp-block-search__input"
+        ellipsizeMode="tail"
+        fontFamily="serif"
+        isSelected={true}
+        label={null}
+        numberOfLines={1}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onFocus={[Function]}
+        placeholder="Optional placeholder…"
+        rejectResponderTermination={true}
+        scrollEnabled={false}
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+        underlineColorAndroid="transparent"
+      />
+    </View>
+    <View>
+      <View
+        accessibilityHint="Double tap to edit button text"
+        accessibilityLabel="Search button. Current button text is Search Button"
+        accessibilityRole="none"
+        accessible={true}
+      >
+        <View>
+          <RCTAztecView
+            accessible={true}
+            activeFormats={Array []}
+            blockType={
+              Object {
+                "tag": "p",
+              }
+            }
+            disableEditingMenu={false}
+            focusable={true}
+            fontFamily="serif"
+            isMultiline={false}
+            maxImagesWidth={200}
+            minWidth={75}
+            onBackspace={[Function]}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onClick={[Function]}
+            onContentSizeChange={[Function]}
+            onEnter={[Function]}
+            onFocus={[Function]}
+            onHTMLContentWithCursor={[Function]}
+            onKeyDown={[Function]}
+            onPaste={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onSelectionChange={[Function]}
+            onStartShouldSetResponder={[Function]}
+            placeholder=""
+            placeholderTextColor="gray"
+            style={
+              Object {
+                "backgroundColor": undefined,
+                "maxWidth": undefined,
+                "minHeight": 0,
+              }
+            }
+            text={
+              Object {
+                "eventCount": undefined,
+                "linkTextColor": undefined,
+                "selection": null,
+                "text": "<p >Search Button</p>",
+              }
+            }
+            textAlign="center"
+            triggerKeyCodes={Array []}
+          />
+        </View>
+      </View>
+    </View>
+  </View>
+</View>
+`;
+
+exports[`Search Block renders with default configuration matches snapshot 1`] = `
+<View
+  accessibilityElementsHidden={true}
+  className="wp-block-search__button-outside wp-block-search__text-button"
+  importantForAccessibility="no-hide-descendants"
+>
+  <View
+    accessibilityHint="Double tap to edit label text"
+    accessibilityLabel="Search block label. Current text is Search"
+    accessibilityRole="none"
+    accessible={true}
+  >
+    <View>
+      <RCTAztecView
+        accessible={true}
+        activeFormats={Array []}
+        blockType={
+          Object {
+            "tag": "p",
+          }
+        }
+        disableEditingMenu={false}
+        focusable={true}
+        fontFamily="serif"
+        isMultiline={false}
+        maxImagesWidth={200}
+        onBackspace={[Function]}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onClick={[Function]}
+        onContentSizeChange={[Function]}
+        onEnter={[Function]}
+        onFocus={[Function]}
+        onHTMLContentWithCursor={[Function]}
+        onKeyDown={[Function]}
+        onPaste={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onSelectionChange={[Function]}
+        onStartShouldSetResponder={[Function]}
+        placeholder="Add label…"
+        placeholderTextColor="gray"
+        style={
+          Object {
+            "backgroundColor": undefined,
+            "maxWidth": undefined,
+            "minHeight": 0,
+          }
+        }
+        text={
+          Object {
+            "eventCount": undefined,
+            "linkTextColor": undefined,
+            "selection": null,
+            "text": "<p >Search</p>",
+          }
+        }
+        triggerKeyCodes={Array []}
+      />
+    </View>
+  </View>
+  <View
+    style={
+      Array [
+        undefined,
+        false,
+      ]
+    }
+  >
+    <View
+      accessibilityHint="Double tap to edit placeholder text"
+      accessibilityLabel="Search input field. No custom placeholder set"
+      accessibilityRole="none"
+      accessible={true}
+    >
+      <TextInput
+        allowFontScaling={true}
+        className="wp-block-search__input"
+        ellipsizeMode="tail"
+        fontFamily="serif"
+        isSelected={true}
+        label={null}
+        numberOfLines={1}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onFocus={[Function]}
+        placeholder="Optional placeholder…"
+        rejectResponderTermination={true}
+        scrollEnabled={false}
+        style={
+          Array [
+            undefined,
+            undefined,
+          ]
+        }
+        underlineColorAndroid="transparent"
+      />
+    </View>
+    <View>
+      <View
+        accessibilityHint="Double tap to edit button text"
+        accessibilityLabel="Search button. Current button text is Search Button"
+        accessibilityRole="none"
+        accessible={true}
+      >
+        <View>
+          <RCTAztecView
+            accessible={true}
+            activeFormats={Array []}
+            blockType={
+              Object {
+                "tag": "p",
+              }
+            }
+            disableEditingMenu={false}
+            focusable={true}
+            fontFamily="serif"
+            isMultiline={false}
+            maxImagesWidth={200}
+            minWidth={75}
+            onBackspace={[Function]}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onClick={[Function]}
+            onContentSizeChange={[Function]}
+            onEnter={[Function]}
+            onFocus={[Function]}
+            onHTMLContentWithCursor={[Function]}
+            onKeyDown={[Function]}
+            onPaste={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onSelectionChange={[Function]}
+            onStartShouldSetResponder={[Function]}
+            placeholder=""
+            placeholderTextColor="gray"
+            style={
+              Object {
+                "backgroundColor": undefined,
+                "maxWidth": undefined,
+                "minHeight": 0,
+              }
+            }
+            text={
+              Object {
+                "eventCount": undefined,
+                "linkTextColor": undefined,
+                "selection": null,
+                "text": "<p >Search Button</p>",
+              }
+            }
+            textAlign="center"
+            triggerKeyCodes={Array []}
+          />
+        </View>
+      </View>
+    </View>
+  </View>
+</View>
+`;
+
+exports[`Search Block renders with no-button option matches snapshot 1`] = `
+<View
+  accessibilityElementsHidden={true}
+  className="wp-block-search__no-button"
+  importantForAccessibility="no-hide-descendants"
+>
+  <View
+    accessibilityHint="Double tap to edit label text"
+    accessibilityLabel="Search block label. Current text is Search"
+    accessibilityRole="none"
+    accessible={true}
+  >
+    <View>
+      <RCTAztecView
+        accessible={true}
+        activeFormats={Array []}
+        blockType={
+          Object {
+            "tag": "p",
+          }
+        }
+        disableEditingMenu={false}
+        focusable={true}
+        fontFamily="serif"
+        isMultiline={false}
+        maxImagesWidth={200}
+        onBackspace={[Function]}
+        onBlur={[Function]}
+        onChange={[Function]}
+        onClick={[Function]}
+        onContentSizeChange={[Function]}
+        onEnter={[Function]}
+        onFocus={[Function]}
+        onHTMLContentWithCursor={[Function]}
+        onKeyDown={[Function]}
+        onPaste={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onSelectionChange={[Function]}
+        onStartShouldSetResponder={[Function]}
+        placeholder="Add label…"
+        placeholderTextColor="gray"
+        style={
+          Object {
+            "backgroundColor": undefined,
+            "maxWidth": undefined,
+            "minHeight": 0,
+          }
+        }
+        text={
+          Object {
+            "eventCount": undefined,
+            "linkTextColor": undefined,
+            "selection": null,
+            "text": "<p >Search</p>",
+          }
+        }
+        triggerKeyCodes={Array []}
+      />
+    </View>
+  </View>
+  <View
+    accessibilityHint="Double tap to edit placeholder text"
+    accessibilityLabel="Search input field. No custom placeholder set"
+    accessibilityRole="none"
+    accessible={true}
+  >
+    <TextInput
+      allowFontScaling={true}
+      className="wp-block-search__input"
+      ellipsizeMode="tail"
+      fontFamily="serif"
+      isSelected={true}
+      label={null}
+      numberOfLines={1}
+      onBlur={[Function]}
+      onChange={[Function]}
+      onFocus={[Function]}
+      placeholder="Optional placeholder…"
+      rejectResponderTermination={true}
+      scrollEnabled={false}
+      style={
+        Array [
+          undefined,
+          undefined,
+        ]
+      }
+      underlineColorAndroid="transparent"
+    />
+  </View>
+</View>
+`;
diff --git a/packages/block-library/src/search/test/edit.native.js b/packages/block-library/src/search/test/edit.native.js
new file mode 100644
index 00000000000000..f3622c684ea7c1
--- /dev/null
+++ b/packages/block-library/src/search/test/edit.native.js
@@ -0,0 +1,159 @@
+/**
+ * External dependencies
+ */
+import renderer from 'react-test-renderer';
+
+/**
+ * WordPress dependencies
+ */
+import { Icon } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import SearchEdit from '../edit.native.js';
+
+const defaultAttributes = {
+	label: 'Search',
+	buttonText: 'Search Button',
+	buttonPosition: 'button-outside',
+	showLabel: true,
+};
+
+const getTestComponent = ( attributes = {} ) => {
+	const finalAttrs = { ...defaultAttributes, ...attributes };
+	return renderer.create(
+		<SearchEdit attributes={ finalAttrs } setAttributes={ jest.fn() } />
+	);
+};
+
+const getLabel = ( instance ) => {
+	return instance.findByProps( {
+		className: 'wp-block-search__label',
+	} );
+};
+
+const getButton = ( instance ) => {
+	return instance.findByProps( {
+		className: 'wp-block-search__button',
+	} );
+};
+
+const getSearchInput = ( instance ) => {
+	return instance.findByProps( {
+		className: 'wp-block-search__input',
+	} );
+};
+
+const hasComponent = ( instance, className ) => {
+	const components = instance.findAllByProps( {
+		className,
+	} );
+	return components.length !== 0;
+};
+
+describe( 'Search Block', () => {
+	it( 'renders without crashing', () => {
+		const component = getTestComponent();
+		const rendered = component.toJSON();
+		expect( rendered ).toBeTruthy();
+	} );
+
+	describe( 'renders with default configuration', () => {
+		const component = getTestComponent();
+		const instance = component.root;
+
+		it( 'label is visible and text is properly set', () => {
+			// Verify the label element of the search block exists and
+			// label text is set.
+			const label = getLabel( instance );
+			expect( label ).toBeTruthy();
+			expect( label.props.value ).toBe( 'Search' );
+		} );
+
+		it( 'button is visible and text is properly set', () => {
+			// Verify the button element of the search block exists and
+			// button text is set.
+			const button = getButton( instance );
+			expect( button ).toBeTruthy();
+			expect( button.props.value ).toBe( 'Search Button' );
+		} );
+
+		it( 'search input is visible and placeholder text is properly set', () => {
+			// Verify the search input element of the search block exists
+			// and the placeholder text is set.
+			const searchInput = getSearchInput( instance );
+			expect( searchInput ).toBeTruthy();
+			expect( searchInput.props.placeholder ).toBe(
+				'Optional placeholder…'
+			);
+		} );
+
+		it( 'matches snapshot', () => {
+			const rendered = component.toJSON();
+			expect( rendered ).toMatchSnapshot();
+		} );
+	} );
+
+	describe( 'renders with no-button option', () => {
+		const component = getTestComponent( {
+			buttonPosition: 'no-button',
+		} );
+		const instance = component.root;
+
+		it( 'verify button element has not been rendered', () => {
+			expect(
+				hasComponent( instance, 'wp-block-search__button' )
+			).toEqual( false );
+		} );
+
+		it( 'matches snapshot', () => {
+			const rendered = component.toJSON();
+			expect( rendered ).toMatchSnapshot();
+		} );
+	} );
+
+	describe( 'renders block with icon button option', () => {
+		const component = getTestComponent( {
+			buttonUseIcon: true,
+		} );
+		const instance = component.root;
+
+		it( 'search button uses icon', () => {
+			const button = instance.findByType( Icon );
+			expect( button ).toBeTruthy();
+		} );
+
+		it( 'matches snapshot', () => {
+			const rendered = component.toJSON();
+			expect( rendered ).toMatchSnapshot();
+		} );
+	} );
+
+	it( 'renders block with button inside option', () => {
+		const component = getTestComponent( {
+			buttonPosition: 'button-inside',
+		} );
+
+		const rendered = component.toJSON();
+		expect( rendered ).toMatchSnapshot();
+	} );
+
+	describe( 'renders block with label hidden', () => {
+		const component = getTestComponent( {
+			showLabel: false,
+		} );
+		const instance = component.root;
+
+		it( 'verify label has not been rendered', () => {
+			expect(
+				hasComponent( instance, 'wp-block-search__label' )
+			).toEqual( false );
+		} );
+
+		it( 'matches snapshot', () => {
+			const rendered = component.toJSON();
+			expect( rendered ).toMatchSnapshot();
+		} );
+	} );
+} );