From af2915fae5cd9d0e50719e7e8887794bd2be8dbb Mon Sep 17 00:00:00 2001
From: Sunil Prajapati <61308756+akasunil@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:39:57 +0530
Subject: [PATCH 01/24] Featured Image block: Use resolution tool component
 (#68471)

* Removed custom dropdown and implemented resolution tool component

* Remove constant file and use inline constant

* Extract resolution tool logic to separate component

Co-authored-by: akasunil <sunil25393@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 .../post-featured-image/dimension-controls.js | 45 +------------------
 .../src/post-featured-image/edit.js           | 42 +++++++++++++++--
 2 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/packages/block-library/src/post-featured-image/dimension-controls.js b/packages/block-library/src/post-featured-image/dimension-controls.js
index 9a71a96b2db846..4bc343635f2f93 100644
--- a/packages/block-library/src/post-featured-image/dimension-controls.js
+++ b/packages/block-library/src/post-featured-image/dimension-controls.js
@@ -10,19 +10,7 @@ import {
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
-import {
-	useSettings,
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../lock-unlock';
-
-const { ResolutionTool } = unlock( blockEditorPrivateApis );
+import { useSettings } from '@wordpress/block-editor';
 
 const SCALE_OPTIONS = (
 	<>
@@ -45,7 +33,6 @@ const SCALE_OPTIONS = (
 );
 
 const DEFAULT_SCALE = 'cover';
-const DEFAULT_SIZE = 'full';
 
 const scaleHelp = {
 	cover: __(
@@ -61,9 +48,8 @@ const scaleHelp = {
 
 const DimensionControls = ( {
 	clientId,
-	attributes: { aspectRatio, width, height, scale, sizeSlug },
+	attributes: { aspectRatio, width, height, scale },
 	setAttributes,
-	media,
 } ) => {
 	const [ availableUnits, defaultRatios, themeRatios, showDefaultRatios ] =
 		useSettings(
@@ -75,18 +61,6 @@ const DimensionControls = ( {
 	const units = useCustomUnits( {
 		availableUnits: availableUnits || [ 'px', '%', 'vw', 'em', 'rem' ],
 	} );
-	const imageSizes = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().imageSizes,
-		[]
-	);
-	const imageSizeOptions = imageSizes
-		.filter( ( { slug } ) => {
-			return media?.media_details?.sizes?.[ slug ]?.source_url;
-		} )
-		.map( ( { name, slug } ) => ( {
-			value: slug,
-			label: name,
-		} ) );
 
 	const onDimensionChange = ( dimension, nextValue ) => {
 		const parsedValue = parseFloat( nextValue );
@@ -230,21 +204,6 @@ const DimensionControls = ( {
 					</ToggleGroupControl>
 				</ToolsPanelItem>
 			) }
-			{ !! imageSizeOptions.length && (
-				<ResolutionTool
-					panelId={ clientId }
-					value={ sizeSlug }
-					defaultValue={ DEFAULT_SIZE }
-					options={ imageSizeOptions }
-					onChange={ ( nextSizeSlug ) =>
-						setAttributes( { sizeSlug: nextSizeSlug } )
-					}
-					isShownByDefault={ false }
-					resetAllFilter={ () => ( {
-						sizeSlug: DEFAULT_SIZE,
-					} ) }
-				/>
-			) }
 		</>
 	);
 };
diff --git a/packages/block-library/src/post-featured-image/edit.js b/packages/block-library/src/post-featured-image/edit.js
index 6afe2c29e25045..9fd64b29908e42 100644
--- a/packages/block-library/src/post-featured-image/edit.js
+++ b/packages/block-library/src/post-featured-image/edit.js
@@ -27,6 +27,8 @@ import {
 	__experimentalUseBorderProps as useBorderProps,
 	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 	useBlockEditingMode,
+	privateApis as blockEditorPrivateApis,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { useMemo, useEffect, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
@@ -40,12 +42,37 @@ import DimensionControls from './dimension-controls';
 import OverlayControls from './overlay-controls';
 import Overlay from './overlay';
 import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
+import { unlock } from '../lock-unlock';
 
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
+const { ResolutionTool } = unlock( blockEditorPrivateApis );
+const DEFAULT_MEDIA_SIZE_SLUG = 'full';
+
+function FeaturedImageResolutionTool( { image, value, onChange } ) {
+	const { imageSizes } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		return {
+			imageSizes: getSettings().imageSizes,
+		};
+	}, [] );
+
+	if ( ! imageSizes?.length ) {
+		return null;
+	}
+
+	const imageSizeOptions = imageSizes
+		.filter(
+			( { slug } ) => image?.media_details?.sizes?.[ slug ]?.source_url
+		)
+		.map( ( { name, slug } ) => ( { value: slug, label: name } ) );
 
-function getMediaSourceUrlBySizeSlug( media, slug ) {
 	return (
-		media?.media_details?.sizes?.[ slug ]?.source_url || media?.source_url
+		<ResolutionTool
+			value={ value }
+			defaultValue={ DEFAULT_MEDIA_SIZE_SLUG }
+			options={ imageSizeOptions }
+			onChange={ onChange }
+		/>
 	);
 }
 
@@ -125,7 +152,9 @@ export default function PostFeaturedImageEdit( {
 		[ featuredImage, postTypeSlug, postId ]
 	);
 
-	const mediaUrl = getMediaSourceUrlBySizeSlug( media, sizeSlug );
+	const mediaUrl =
+		media?.media_details?.sizes?.[ sizeSlug ]?.source_url ||
+		media?.source_url;
 
 	const blockProps = useBlockProps( {
 		style: { width, height, aspectRatio },
@@ -291,6 +320,13 @@ export default function PostFeaturedImageEdit( {
 							/>
 						</ToolsPanelItem>
 					) }
+					<FeaturedImageResolutionTool
+						image={ media }
+						value={ sizeSlug }
+						onChange={ ( nextSizeSlug ) =>
+							setAttributes( { sizeSlug: nextSizeSlug } )
+						}
+					/>
 				</ToolsPanel>
 			</InspectorControls>
 		</>

From b0e328f34efabd1097d55aed32772f8d2594d388 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 5 Feb 2025 06:58:33 +0000
Subject: [PATCH 02/24] chore(release): publish

 - @wordpress/block-directory@5.17.1
 - @wordpress/edit-post@8.17.1
 - @wordpress/edit-site@6.17.1
 - @wordpress/editor@14.17.1
---
 package-lock.json                     | 8 ++++----
 packages/block-directory/package.json | 2 +-
 packages/edit-post/package.json       | 2 +-
 packages/edit-site/package.json       | 2 +-
 packages/editor/package.json          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c8ec35e2c3a99..b7cf99a110d796 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49960,7 +49960,7 @@
 		},
 		"packages/block-directory": {
 			"name": "@wordpress/block-directory",
-			"version": "5.17.0",
+			"version": "5.17.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "7.25.7",
@@ -51024,7 +51024,7 @@
 		},
 		"packages/edit-post": {
 			"name": "@wordpress/edit-post",
-			"version": "8.17.0",
+			"version": "8.17.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "7.25.7",
@@ -51071,7 +51071,7 @@
 		},
 		"packages/edit-site": {
 			"name": "@wordpress/edit-site",
-			"version": "6.17.0",
+			"version": "6.17.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "7.25.7",
@@ -51177,7 +51177,7 @@
 		},
 		"packages/editor": {
 			"name": "@wordpress/editor",
-			"version": "14.17.0",
+			"version": "14.17.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "7.25.7",
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index b3af341dba0f37..f7750c2e49f170 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "5.17.0",
+	"version": "5.17.1",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index ab9096f89903a2..0403f1b952eef9 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "8.17.0",
+	"version": "8.17.1",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index e830ee3066c0ce..637032e303e9e8 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.17.0",
+	"version": "6.17.1",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/package.json b/packages/editor/package.json
index bfa645fa88a74b..3b40e5965b6a33 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.17.0",
+	"version": "14.17.1",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 589e763287a8cc9a2750196f81f4cffcc6558121 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Wed, 5 Feb 2025 00:39:55 -0700
Subject: [PATCH 03/24] ComboboxControl: Add an `isLoading` prop to show a
 loading spinner (#68990)

Co-authored-by: adamsilverstein <adamsilverstein@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
---
 packages/components/CHANGELOG.md                    |  2 ++
 packages/components/src/combobox-control/README.md  | 10 +++++++++-
 packages/components/src/combobox-control/index.tsx  |  5 ++++-
 packages/components/src/combobox-control/style.scss |  5 ++++-
 packages/components/src/combobox-control/types.ts   |  7 +++++++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index c487b0a17a288d..a36773a8e16d66 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+-   `ComboboxControl`: Add an `isLoading` prop to show a loading spinner ([#68990](https://github.com/WordPress/gutenberg/pull/68990))
+
 ## 29.3.0 (2025-01-29)
 
 ### Enhancements
diff --git a/packages/components/src/combobox-control/README.md b/packages/components/src/combobox-control/README.md
index 4089cf9c56e9b5..7a11c8b95fe2e9 100644
--- a/packages/components/src/combobox-control/README.md
+++ b/packages/components/src/combobox-control/README.md
@@ -39,6 +39,7 @@ function MyComboboxControl() {
 			label="Font Size"
 			value={ fontSize }
 			onChange={ setFontSize }
+			isLoading={ isLoading }
 			options={ filteredOptions }
 			onFilterValueChange={ ( inputValue ) =>
 				setFilteredOptions(
@@ -112,13 +113,20 @@ If the control is clicked, the dropdown will expand regardless of this prop.
 -   Required: No
 -   Default: `true`
 
-### placeholder
+#### placeholder
 
 If passed, the combobox input will show a placeholder string if no values are present.
 
 -   Type: `string`
 -   Required: No
 
+#### isLoading
+
+Show a spinner (and hide the suggestions dropdown) while data about the matching suggestions (ie the `options` prop) is loading
+
+-   Type: `Boolean`
+-   Required: No
+
 #### __experimentalRenderItem
 
 Custom renderer invoked for each option in the suggestion list. The render prop receives as its argument an object containing, under the `item` key, the single option's data (directly from the array of data passed to the `options` prop).
diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index 28510c8653d02e..9c6bd2a4d75dd2 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -35,6 +35,7 @@ import type { TokenInputProps } from '../form-token-field/types';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
 import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 import { maybeWarnDeprecated36pxSize } from '../utils/deprecated-36px-size';
+import Spinner from '../spinner';
 
 const noop = () => {};
 
@@ -126,6 +127,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 		help,
 		allowReset = true,
 		className,
+		isLoading = false,
 		messages = {
 			selected: __( 'Item selected.' ),
 		},
@@ -362,6 +364,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 								onChange={ onInputChange }
 							/>
 						</FlexBlock>
+						{ isLoading && <Spinner /> }
 						{ allowReset && (
 							<Button
 								size="small"
@@ -375,7 +378,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 							/>
 						) }
 					</InputWrapperFlex>
-					{ isExpanded && (
+					{ isExpanded && ! isLoading && (
 						<SuggestionsList
 							instanceId={ instanceId }
 							// The empty string for `value` here is not actually used, but is
diff --git a/packages/components/src/combobox-control/style.scss b/packages/components/src/combobox-control/style.scss
index c8fd8a168c0fb7..558475f6bd522e 100644
--- a/packages/components/src/combobox-control/style.scss
+++ b/packages/components/src/combobox-control/style.scss
@@ -36,5 +36,8 @@ input.components-combobox-control__input[type="text"] {
 	&:focus-within {
 		@include input-style__focus();
 	}
-}
 
+	.components-spinner {
+		margin: 0;
+	}
+}
diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index 470b38c35e2c8a..3398e9ee9a760e 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -86,4 +86,11 @@ export type ComboboxControlProps = Pick<
 	 * If passed, the combobox input will show a placeholder string if no values are present.
 	 */
 	placeholder?: string;
+	/**
+	 * Show a spinner (and hide the suggestions dropdown) while data
+	 * about the matching suggestions (ie the `options` prop) is loading
+	 *
+	 * @default false
+	 */
+	isLoading?: boolean;
 };

From 4aa8c1364156c281ca4bed56f005551681c29bb6 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 5 Feb 2025 08:52:18 +0100
Subject: [PATCH 04/24] Add missing list role to the list of blocks in the
 global Styles. (#69027)

Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: shail-mehta <shailu25@git.wordpress.org>
---
 .../edit-site/src/components/global-styles/screen-block-list.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/edit-site/src/components/global-styles/screen-block-list.js b/packages/edit-site/src/components/global-styles/screen-block-list.js
index 441c4168f814aa..8f2ac2ff9c1cb1 100644
--- a/packages/edit-site/src/components/global-styles/screen-block-list.js
+++ b/packages/edit-site/src/components/global-styles/screen-block-list.js
@@ -137,6 +137,8 @@ function BlockList( { filterValue } ) {
 		<div
 			ref={ blockTypesListRef }
 			className="edit-site-block-types-item-list"
+			// By default, BlockMenuItem has a role=listitem so this div must have a list role.
+			role="list"
 		>
 			{ filteredBlockTypes.map( ( block ) => (
 				<BlockMenuItem

From 3e4c376907ed196125ea63c79369e2419a6f85da Mon Sep 17 00:00:00 2001
From: Sainath Poojary <53347682+SainathPoojary@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:30:38 +0530
Subject: [PATCH 05/24] Inserter: Remove unused no-results-icon styles (#69018)

Co-authored-by: SainathPoojary <sainathpoojary@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
---
 packages/block-editor/src/components/inserter/style.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index fe0893b0619a72..20aa1c288103d4 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -168,10 +168,6 @@ $block-inserter-tabs-height: 44px;
 	text-align: center;
 }
 
-.block-editor-inserter__no-results-icon {
-	fill: $gray-600;
-}
-
 .block-editor-inserter__child-blocks {
 	padding: 0 $grid-unit-20;
 }

From fa5a02e53a2297cf6be36947bba36053b82d17dd Mon Sep 17 00:00:00 2001
From: Himanshu Pathak <himanshu.pathak@rtcamp.com>
Date: Wed, 5 Feb 2025 14:42:53 +0530
Subject: [PATCH 06/24] E2E: Add regression test for spacer block in themes
 without spacing units (#68913)

Co-authored-by: himanshupathak95 <abcd95@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: fullofcaffeine <fullofcaffeine@git.wordpress.org>
---
 test/e2e/specs/editor/blocks/spacer.spec.js | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/test/e2e/specs/editor/blocks/spacer.spec.js b/test/e2e/specs/editor/blocks/spacer.spec.js
index da262c9b4e26d9..620d1a3c967b88 100644
--- a/test/e2e/specs/editor/blocks/spacer.spec.js
+++ b/test/e2e/specs/editor/blocks/spacer.spec.js
@@ -48,4 +48,29 @@ test.describe( 'Spacer', () => {
 			)
 		).toBeFocused();
 	} );
+
+	test( 'should work in theme without spacing units support', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.waitForFunction( () => window?.wp?.data );
+
+		// Mock the theme.json data to simulate a theme without spacing units
+		await page.evaluate( () => {
+			const settings = window.wp.data
+				.select( 'core/block-editor' )
+				.getSettings();
+			window.__originalSettings = settings;
+			window.wp.data.dispatch( 'core/block-editor' ).updateSettings( {
+				...settings,
+				spacing: { units: false },
+			} );
+		} );
+
+		await editor.insertBlock( { name: 'core/spacer' } );
+
+		await expect(
+			editor.canvas.locator( '.block-editor-warning' )
+		).toBeHidden();
+	} );
 } );

From 0ee04b15292a6cbd04ada1ff3a1175d89f57f208 Mon Sep 17 00:00:00 2001
From: Rishit Gupta <rishitgupta2013@gmail.com>
Date: Wed, 5 Feb 2025 18:13:37 +0530
Subject: [PATCH 07/24] Fix: Missing 'No blocks found.' message for block
 search in editor  (#69036)

Co-authored-by: Rishit30G <rishit30g@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 .../global-styles/screen-block-list.js        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/screen-block-list.js b/packages/edit-site/src/components/global-styles/screen-block-list.js
index 8f2ac2ff9c1cb1..5ec0089a47bbbf 100644
--- a/packages/edit-site/src/components/global-styles/screen-block-list.js
+++ b/packages/edit-site/src/components/global-styles/screen-block-list.js
@@ -7,6 +7,7 @@ import {
 	FlexItem,
 	SearchControl,
 	__experimentalHStack as HStack,
+	__experimentalText as Text,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import {
@@ -140,12 +141,18 @@ function BlockList( { filterValue } ) {
 			// By default, BlockMenuItem has a role=listitem so this div must have a list role.
 			role="list"
 		>
-			{ filteredBlockTypes.map( ( block ) => (
-				<BlockMenuItem
-					block={ block }
-					key={ 'menu-itemblock-' + block.name }
-				/>
-			) ) }
+			{ filteredBlockTypes.length === 0 ? (
+				<Text align="center" as="p">
+					{ __( 'No blocks found.' ) }
+				</Text>
+			) : (
+				filteredBlockTypes.map( ( block ) => (
+					<BlockMenuItem
+						block={ block }
+						key={ 'menu-itemblock-' + block.name }
+					/>
+				) )
+			) }
 		</div>
 	);
 }

From 3612e98b5d74288d5186e5f9bed6da1c29895456 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 5 Feb 2025 12:57:05 +0000
Subject: [PATCH 08/24] Bump plugin version to 20.2.0

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

diff --git a/gutenberg.php b/gutenberg.php
index 06152fa72876e1..de187b8d13af90 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.6
  * Requires PHP: 7.2
- * Version: 20.2.0-rc.1
+ * Version: 20.2.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index b7cf99a110d796..350fea74ea1b09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "20.2.0-rc.1",
+	"version": "20.2.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "20.2.0-rc.1",
+			"version": "20.2.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"workspaces": [
diff --git a/package.json b/package.json
index b5fd51d6edd49b..3d0194fb941bb7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "20.2.0-rc.1",
+	"version": "20.2.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From e992acf22bffa59ddf014a7e9153ef6889781b00 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 5 Feb 2025 13:06:50 +0000
Subject: [PATCH 09/24] Update Changelog for 20.2.0

---
 changelog.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index e0ff271a5b28d8..2c54f92fae8726 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,6 @@
 == Changelog ==
 
-= 20.2.0-rc.1 =
-
+= 20.2.0 =
 
 ## Changelog
 
@@ -143,6 +142,8 @@ The following contributors merged PRs in this release:
 @afercia @benazeer-ben @fabiankaegy @himanshupathak95 @im3dabasia @Infinite-Null @justlevine @karthick-murugan @Mamaduka @Mayank-Tripathi32 @SainathPoojary @shail-mehta @shimotmk @Soean @spacedmonkey @stokesman @Sukhendu2002 @t-hamano @yogeshbhutkar
 
 
+
+
 = 20.1.0 =
 
 ## Changelog

From e41b9f68c3be62c9a452335a7bc1a5378eee613c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 10:33:31 -0500
Subject: [PATCH 10/24] Bump undici from 5.28.4 to 5.28.5 (#68816)

Bumps [undici](https://github.com/nodejs/undici) from 5.28.4 to 5.28.5.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.28.4...v5.28.5)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 350fea74ea1b09..38b92c08b9a792 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45328,9 +45328,9 @@
 			}
 		},
 		"node_modules/undici": {
-			"version": "5.28.4",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
-			"integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+			"version": "5.28.5",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-5.28.5.tgz",
+			"integrity": "sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==",
 			"license": "MIT",
 			"dependencies": {
 				"@fastify/busboy": "^2.0.0"

From 30dc8897ecad796f9eb96127943e1866d847d08b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 10:58:12 -0500
Subject: [PATCH 11/24] Bump http-proxy-middleware from 2.0.6 to 2.0.7 in
 /platform-docs (#68900)

Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md)
- [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.6...v2.0.7)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
---
 platform-docs/package-lock.json | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/platform-docs/package-lock.json b/platform-docs/package-lock.json
index ce0969c3928a48..9e26bbe030cd87 100644
--- a/platform-docs/package-lock.json
+++ b/platform-docs/package-lock.json
@@ -8031,9 +8031,10 @@
 			}
 		},
 		"node_modules/http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+			"integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/http-proxy": "^1.17.8",
 				"http-proxy": "^1.18.1",
@@ -13460,12 +13461,6 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/search-insights": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.13.0.tgz",
-			"integrity": "sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==",
-			"peer": true
-		},
 		"node_modules/section-matter": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
@@ -14563,19 +14558,6 @@
 				"is-typedarray": "^1.0.0"
 			}
 		},
-		"node_modules/typescript": {
-			"version": "5.4.2",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
-			"integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
-			"peer": true,
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",

From 1405851c007839734b638b6353a87a8760d31664 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 5 Feb 2025 17:02:17 +0100
Subject: [PATCH 12/24] Remove block icon from InstalledBlocksPrePublishPanel.
 (#69046)

* Remove block icon from InstalledBlocksPrePublishPanel.

* Add inline comment.

Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 packages/block-directory/src/plugins/index.js                  | 3 +++
 .../src/plugins/installed-blocks-pre-publish-panel/index.js    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-directory/src/plugins/index.js b/packages/block-directory/src/plugins/index.js
index 283ff0ea4d2715..50418a9944d311 100644
--- a/packages/block-directory/src/plugins/index.js
+++ b/packages/block-directory/src/plugins/index.js
@@ -13,6 +13,9 @@ import InstalledBlocksPrePublishPanel from './installed-blocks-pre-publish-panel
 import getInstallMissing from './get-install-missing';
 
 registerPlugin( 'block-directory', {
+	// The icon is explicitly set to undefined to prevent PluginPrePublishPanel
+	// from rendering the fallback icon pluginIcon.
+	icon: undefined,
 	render() {
 		return (
 			<>
diff --git a/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js b/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
index 17630c9904e8bd..233f3261c79fc5 100644
--- a/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
+++ b/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
@@ -3,7 +3,6 @@
  */
 import { _n, sprintf } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
-import { blockDefault } from '@wordpress/icons';
 import { PluginPrePublishPanel } from '@wordpress/editor';
 
 /**
@@ -24,7 +23,6 @@ export default function InstalledBlocksPrePublishPanel() {
 
 	return (
 		<PluginPrePublishPanel
-			icon={ blockDefault }
 			title={ sprintf(
 				// translators: %d: number of blocks (number).
 				_n(

From d9d138a094757ab34edc776aa2af56255ede26fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:09:57 +0000
Subject: [PATCH 13/24] Bump cross-spawn from 7.0.3 to 7.0.6 in /platform-docs
 (#68811)

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: desrosj <desrosj@git.wordpress.org>
---
 platform-docs/package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform-docs/package-lock.json b/platform-docs/package-lock.json
index 9e26bbe030cd87..d94103323fe792 100644
--- a/platform-docs/package-lock.json
+++ b/platform-docs/package-lock.json
@@ -5120,9 +5120,10 @@
 			}
 		},
 		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+			"license": "MIT",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",

From 3f0a805c568f92622faf4b71b24eeb5f39b5bca8 Mon Sep 17 00:00:00 2001
From: Hiroshi Urabe <mail@torounit.com>
Date: Thu, 6 Feb 2025 03:27:58 +0900
Subject: [PATCH 14/24] Refactor font variant components to use useId for
 checkbox IDs (#69050)

Co-authored-by: torounit <toro_unit@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: chiilog <mel_cha@git.wordpress.org>
---
 .../font-library-modal/collection-font-variant.js | 14 +++-----------
 .../font-library-modal/library-font-variant.js    | 15 +++------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
index 0719cb873f8f78..105c8e9ff81d95 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
@@ -1,20 +1,14 @@
 /**
  * WordPress dependencies
  */
-import {
-	CheckboxControl,
-	Flex,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { useId } from '@wordpress/element';
+import { CheckboxControl, Flex } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { getFontFaceVariantName } from './utils';
 import FontDemo from './font-demo';
-import { unlock } from '../../../lock-unlock';
-
-const { kebabCase } = unlock( componentsPrivateApis );
 
 function CollectionFontVariant( {
 	face,
@@ -31,9 +25,7 @@ function CollectionFontVariant( {
 	};
 
 	const displayName = font.name + ' ' + getFontFaceVariantName( face );
-	const checkboxId = kebabCase(
-		`${ font.slug }-${ getFontFaceVariantName( face ) }`
-	);
+	const checkboxId = useId();
 
 	return (
 		<div className="font-library-modal__font-card">
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
index 2f84bd1f2c749c..24a1d54871f6bc 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
@@ -1,12 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { useContext } from '@wordpress/element';
-import {
-	CheckboxControl,
-	Flex,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { useContext, useId } from '@wordpress/element';
+import { CheckboxControl, Flex } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -14,9 +10,6 @@ import {
 import { getFontFaceVariantName } from './utils';
 import { FontLibraryContext } from './context';
 import FontDemo from './font-demo';
-import { unlock } from '../../../lock-unlock';
-
-const { kebabCase } = unlock( componentsPrivateApis );
 
 function LibraryFontVariant( { face, font } ) {
 	const { isFontActivated, toggleActivateFont } =
@@ -41,9 +34,7 @@ function LibraryFontVariant( { face, font } ) {
 	};
 
 	const displayName = font.name + ' ' + getFontFaceVariantName( face );
-	const checkboxId = kebabCase(
-		`${ font.slug }-${ getFontFaceVariantName( face ) }`
-	);
+	const checkboxId = useId();
 
 	return (
 		<div className="font-library-modal__font-card">

From 8b64cb1f005d61f2347c4970ecce7adac78eddd5 Mon Sep 17 00:00:00 2001
From: Joe McGill <801097+joemcgill@users.noreply.github.com>
Date: Wed, 5 Feb 2025 23:56:26 -0600
Subject: [PATCH 15/24] Fix installing svn during deploys (#69047)

This fixes a permissions error by installing svn into the worker as sudo.

Co-authored-by: joemcgill <joemcgill@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 .github/workflows/upload-release-to-plugin-repo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/upload-release-to-plugin-repo.yml b/.github/workflows/upload-release-to-plugin-repo.yml
index 8f823a543b826e..7d2c780599cddf 100644
--- a/.github/workflows/upload-release-to-plugin-repo.yml
+++ b/.github/workflows/upload-release-to-plugin-repo.yml
@@ -169,7 +169,7 @@ jobs:
         steps:
             - name: Install Subversion
               run: |
-                  apt-get update -y && apt-get install -y subversion
+                  sudo apt-get update -y && sudo apt-get install -y subversion
 
             - name: Check out Gutenberg trunk from WP.org plugin repo
               run: |
@@ -228,7 +228,7 @@ jobs:
         steps:
             - name: Install Subversion
               run: |
-                  apt-get update -y && apt-get install -y subversion
+                  sudo apt-get update -y && sudo apt-get install -y subversion
 
             - name: Download and unzip Gutenberg plugin asset into tags folder
               env:

From d01a09eccaf5f87c40daff07536dee04bbc54da7 Mon Sep 17 00:00:00 2001
From: Juzar Bharmal <53657281+Juzar10@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:33:08 +0530
Subject: [PATCH 16/24] Fix: Prevent Errors in Header Processing and Encode
 URLs Properly (#67780)

Unlinked contributors: mafiayemakhfi.

Co-authored-by: Juzar10 <juzar@git.wordpress.org>
Co-authored-by: ellatrix <ellatrix@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: SainathPoojary <sainathpoojary@git.wordpress.org>
Co-authored-by: himanshupathak95 <abcd95@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
---
 .../api-fetch/src/middlewares/preloading.js   | 43 ++++++++++++----
 .../src/middlewares/test/preloading.js        | 51 +++++++++++++++++++
 2 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/packages/api-fetch/src/middlewares/preloading.js b/packages/api-fetch/src/middlewares/preloading.js
index ac293738513bd3..3eaab48dc8392c 100644
--- a/packages/api-fetch/src/middlewares/preloading.js
+++ b/packages/api-fetch/src/middlewares/preloading.js
@@ -68,15 +68,40 @@ function createPreloadingMiddleware( preloadedData ) {
  * @return {Promise<any>} Promise with the response.
  */
 function prepareResponse( responseData, parse ) {
-	return Promise.resolve(
-		parse
-			? responseData.body
-			: new window.Response( JSON.stringify( responseData.body ), {
-					status: 200,
-					statusText: 'OK',
-					headers: responseData.headers,
-			  } )
-	);
+	if ( parse ) {
+		return Promise.resolve( responseData.body );
+	}
+
+	try {
+		return Promise.resolve(
+			new window.Response( JSON.stringify( responseData.body ), {
+				status: 200,
+				statusText: 'OK',
+				headers: responseData.headers,
+			} )
+		);
+	} catch {
+		// See: https://github.com/WordPress/gutenberg/issues/67358#issuecomment-2621163926.
+		Object.entries( responseData.headers ).forEach( ( [ key, value ] ) => {
+			if ( key.toLowerCase() === 'link' ) {
+				responseData.headers[ key ] = value.replace(
+					/<([^>]+)>/,
+					( /** @type {any} */ _, /** @type {string} */ url ) =>
+						`<${ encodeURI( url ) }>`
+				);
+			}
+		} );
+
+		return Promise.resolve(
+			parse
+				? responseData.body
+				: new window.Response( JSON.stringify( responseData.body ), {
+						status: 200,
+						statusText: 'OK',
+						headers: responseData.headers,
+				  } )
+		);
+	}
 }
 
 export default createPreloadingMiddleware;
diff --git a/packages/api-fetch/src/middlewares/test/preloading.js b/packages/api-fetch/src/middlewares/test/preloading.js
index 696d8a37648651..a3ffedbdef46d5 100644
--- a/packages/api-fetch/src/middlewares/test/preloading.js
+++ b/packages/api-fetch/src/middlewares/test/preloading.js
@@ -265,6 +265,57 @@ describe( 'Preloading Middleware', () => {
 		expect( secondMiddleware ).toHaveBeenCalledTimes( 1 );
 	} );
 
+	it( 'should not throw an error when non-ASCII headers are present', async () => {
+		const noResponseMock = 'undefined' === typeof window.Response;
+		if ( noResponseMock ) {
+			window.Response = class {
+				constructor( body, options ) {
+					this.body = JSON.parse( body );
+					this.headers = options.headers;
+
+					// Check for non-ASCII characters in headers
+					for ( const [ key, value ] of Object.entries(
+						this.headers || {}
+					) ) {
+						if ( /[^\x00-\x7F]/.test( value ) ) {
+							throw new Error(
+								`Invalid non-ASCII character found in header: ${ key }`
+							);
+						}
+					}
+				}
+			};
+		}
+
+		const data = {
+			body: 'Hello',
+			headers: {
+				Link: '<http://example.com/ویدیو/example>; rel="alternate"; type=text/html',
+			},
+		};
+
+		const preloadedData = {
+			'wp/v2/example': data,
+		};
+
+		const preloadingMiddleware =
+			createPreloadingMiddleware( preloadedData );
+
+		const requestOptions = {
+			method: 'GET',
+			path: 'wp/v2/example',
+			parse: false,
+		};
+
+		await expect(
+			preloadingMiddleware( requestOptions, () => {} )
+		).resolves.not.toThrow();
+
+		if ( noResponseMock ) {
+			delete window.Response;
+		}
+	} );
+
 	describe.each( [ [ 'GET' ], [ 'OPTIONS' ] ] )( '%s', ( method ) => {
 		describe.each( [
 			[ 'all empty', {} ],

From 269ebe62359fb64bac3d5abcc95dd9bb11609aba Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 6 Feb 2025 10:29:29 +0400
Subject: [PATCH 17/24] Relocate changelog file for WP#6910 to 6.9 backports
 (#69068)

Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 backport-changelog/{6.8 => 6.9}/6910.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backport-changelog/{6.8 => 6.9}/6910.md (100%)

diff --git a/backport-changelog/6.8/6910.md b/backport-changelog/6.9/6910.md
similarity index 100%
rename from backport-changelog/6.8/6910.md
rename to backport-changelog/6.9/6910.md

From 484ace368102a773548a035691673f1a617b252f Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 6 Feb 2025 01:32:16 -0500
Subject: [PATCH 18/24] wp-env: Add lifecycleScripts to the schema (#68724)

* Add lifecycleScripts to the README

* Add lifecycleScripts to the schema/README for @wordpress/env

* Adjust from code review feedback

Co-authored-by: srtfisher <sean212@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
---
 packages/env/README.md   | 27 ++++++++++++++-------------
 schemas/json/wp-env.json | 21 ++++++++++++++++++++-
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/packages/env/README.md b/packages/env/README.md
index 16bba5cba20c07..fe3e5dea3bf2b2 100644
--- a/packages/env/README.md
+++ b/packages/env/README.md
@@ -479,19 +479,20 @@ You can customize the WordPress installation, plugins and themes that the develo
 
 `.wp-env.json` supports fields for options applicable to both the tests and development instances.
 
-| Field              | Type           | Default                                | Description                                                                                                                      |
-|--------------------|----------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|
-| `"core"`           | `string\|null` | `null`                                 | The WordPress installation to use. If `null` is specified, `wp-env` will use the latest production release of WordPress.         |
-| `"phpVersion"`     | `string\|null` | `null`                                 | The PHP version to use. If `null` is specified, `wp-env` will use the default version used with production release of WordPress. |
-| `"plugins"`        | `string[]`     | `[]`                                   | A list of plugins to install and activate in the environment.                                                                    |
-| `"themes"`         | `string[]`     | `[]`                                   | A list of themes to install in the environment.                                                                                  |
-| `"port"`           | `integer`      | `8888` (`8889` for the tests instance) | The primary port number to use for the installation. You'll access the instance through the port: 'http://localhost:8888'.       |
-| `"testsPort"`      | `integer`      | `8889`                                 | The port number for the test site. You'll access the instance through the port: 'http://localhost:8889'.                         |
-| `"config"`         | `Object`       | See below.                             | Mapping of wp-config.php constants to their desired values.                                                                      |
-| `"mappings"`       | `Object`       | `"{}"`                                 | Mapping of WordPress directories to local directories to be mounted in the WordPress instance.                                   |
-| `"mysqlPort"`      | `integer`      | `null` (randomly assigned)             | The MySQL port number to expose. The setting is only available in the `env.development` and `env.tests` objects.                 |
-| `"phpmyadminPort"` | `integer`      | `null`                                 | The port number for phpMyAdmin. If provided, you'll access phpMyAdmin through: http://localhost:<port>                           |
-| `"multisite"`      | `boolean`      | `false`                                | Whether to set up a multisite installation.                                                                                      |
+| Field                | Type           | Default                                | Description                                                                                                                      |
+|----------------------|----------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|
+| `"core"`             | `string\|null` | `null`                                 | The WordPress installation to use. If `null` is specified, `wp-env` will use the latest production release of WordPress.         |
+| `"phpVersion"`       | `string\|null` | `null`                                 | The PHP version to use. If `null` is specified, `wp-env` will use the default version used with production release of WordPress. |
+| `"plugins"`          | `string[]`     | `[]`                                   | A list of plugins to install and activate in the environment.                                                                    |
+| `"themes"`           | `string[]`     | `[]`                                   | A list of themes to install in the environment.                                                                                  |
+| `"port"`             | `integer`      | `8888` (`8889` for the tests instance) | The primary port number to use for the installation. You'll access the instance through the port: 'http://localhost:8888'.       |
+| `"testsPort"`        | `integer`      | `8889`                                 | The port number for the test site. You'll access the instance through the port: 'http://localhost:8889'.                         |
+| `"config"`           | `Object`       | See below.                             | Mapping of wp-config.php constants to their desired values.                                                                      |
+| `"mappings"`         | `Object`       | `"{}"`                                 | Mapping of WordPress directories to local directories to be mounted in the WordPress instance.                                   |
+| `"mysqlPort"`        | `integer`      | `null` (randomly assigned)             | The MySQL port number to expose. The setting is only available in the `env.development` and `env.tests` objects.                 |
+| `"phpmyadminPort"`   | `integer`      | `null`                                 | The port number for phpMyAdmin. If provided, you'll access phpMyAdmin through: http://localhost:<port>                           |
+| `"multisite"`        | `boolean`      | `false`                                | Whether to set up a multisite installation.                                                                                      |
+| `"lifecycleScripts"` | `Object`       | `"{}"`                                 | Mapping of commands that should be executed at certain points in the lifecycle.                                                   |
 
 _Note: the port number environment variables (`WP_ENV_PORT` and `WP_ENV_TESTS_PORT`) take precedent over the .wp-env.json values._
 
diff --git a/schemas/json/wp-env.json b/schemas/json/wp-env.json
index 5761fb3d877116..2a98cb3d0d2635 100644
--- a/schemas/json/wp-env.json
+++ b/schemas/json/wp-env.json
@@ -119,6 +119,25 @@
 					"description": "The port number for the test site. You'll access the instance through the port: http://localhost:8889",
 					"type": "integer",
 					"default": 8889
+				},
+				"lifecycleScripts": {
+					"description": "Mapping of commands that should be executed at certain points in the lifecycle.",
+					"type": "object",
+					"default": {},
+					"properties": {
+						"afterStart": {
+							"description": "Runs after wp-env start has finished setting up the environment.",
+							"type": "string"
+						},
+						"afterClean": {
+							"description": "Runs after wp-env clean has finished cleaning the environment.",
+							"type": "string"
+						},
+						"afterDestroy": {
+							"description": "Runs after wp-env destroy has destroyed the environment.",
+							"type": "string"
+						}
+					}
 				}
 			}
 		},
@@ -130,7 +149,7 @@
 						"$ref": "#/definitions/wpEnvPropertyNames"
 					},
 					{
-						"enum": [ "$schema", "env", "testsPort" ]
+						"enum": [ "$schema", "env", "testsPort", "lifecycleScripts" ]
 					}
 				]
 			}

From 145eecace72b4da118c654daf5e8e54b91fc8170 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Thu, 6 Feb 2025 09:50:44 +0000
Subject: [PATCH 19/24] Update Changelog for 20.0.1

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

diff --git a/changelog.txt b/changelog.txt
index 2c54f92fae8726..e791d102a6b773 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,14 @@
 == Changelog ==
 
+= 20.0.1 =
+
+## Changelog
+
+### Bug Fixes
+
+- iAPI Router: add missing changelog entry for [#68923](https://github.com/WordPress/gutenberg/pull/68945)
+
+
 = 20.2.0 =
 
 ## Changelog

From d3b89431fd9c34cf88923685d2d59ab3ac61d0c9 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Thu, 6 Feb 2025 14:05:08 +0100
Subject: [PATCH 20/24] Fix the background, arrowUpLeft, keyboardReturn and
 square icons. (#69076)

* Fix the background, arrowUpLeft and square icons.

* Fix keyboardReturn icon.

Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
---
 packages/icons/src/library/arrow-up-left.js   | 2 +-
 packages/icons/src/library/background.js      | 2 +-
 packages/icons/src/library/keyboard-return.js | 2 +-
 packages/icons/src/library/square.js          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/icons/src/library/arrow-up-left.js b/packages/icons/src/library/arrow-up-left.js
index 1b3686f6ec1e62..7d46e8bbef6377 100644
--- a/packages/icons/src/library/arrow-up-left.js
+++ b/packages/icons/src/library/arrow-up-left.js
@@ -4,7 +4,7 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const arrowUpLeft = (
-	<SVG width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path d="M14 6H6v8h1.5V8.5L17 18l1-1-9.5-9.5H14V6Z" />
 	</SVG>
 );
diff --git a/packages/icons/src/library/background.js b/packages/icons/src/library/background.js
index 173b609354380d..388d685b07b8a3 100644
--- a/packages/icons/src/library/background.js
+++ b/packages/icons/src/library/background.js
@@ -4,7 +4,7 @@
 import { Path, SVG } from '@wordpress/primitives';
 
 const background = (
-	<SVG width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path
 			fillRule="evenodd"
 			clipRule="evenodd"
diff --git a/packages/icons/src/library/keyboard-return.js b/packages/icons/src/library/keyboard-return.js
index d4a85e1f1a4982..aa66d5a24866de 100644
--- a/packages/icons/src/library/keyboard-return.js
+++ b/packages/icons/src/library/keyboard-return.js
@@ -4,7 +4,7 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const keyboardReturn = (
-	<SVG xmlns="http://www.w3.org/2000/svg">
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path d="m6.734 16.106 2.176-2.38-1.093-1.028-3.846 4.158 3.846 4.158 1.093-1.028-2.176-2.38h2.811c1.125 0 2.25.03 3.374 0 1.428-.001 3.362-.25 4.963-1.277 1.66-1.065 2.868-2.906 2.868-5.859 0-2.479-1.327-4.896-3.65-5.93-1.82-.813-3.044-.8-4.806-.788l-.567.002v1.5c.184 0 .368 0 .553-.002 1.82-.007 2.704-.014 4.21.657 1.854.827 2.76 2.657 2.76 4.561 0 2.472-.973 3.824-2.178 4.596-1.258.807-2.864 1.04-4.163 1.04h-.02c-1.115.03-2.229 0-3.344 0H6.734Z" />
 	</SVG>
 );
diff --git a/packages/icons/src/library/square.js b/packages/icons/src/library/square.js
index 843a8d2d5261dd..40b678f2f04755 100644
--- a/packages/icons/src/library/square.js
+++ b/packages/icons/src/library/square.js
@@ -4,7 +4,7 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const square = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path
 			fill="none"
 			d="M5.75 12.75V18.25H11.25M12.75 5.75H18.25V11.25"

From 9b90569a95620ddab6e5e99a51f323810a00a833 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:40:38 +0900
Subject: [PATCH 21/24] Social Links: Fix appender size in non-iframe editor
 (#68215)

Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: up1512001 <up1512001@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 packages/block-library/src/social-links/editor.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/social-links/editor.scss b/packages/block-library/src/social-links/editor.scss
index 54a4154659eb2d..6b1286c94757d8 100644
--- a/packages/block-library/src/social-links/editor.scss
+++ b/packages/block-library/src/social-links/editor.scss
@@ -100,6 +100,10 @@
 .wp-block-social-links .block-list-appender {
 	position: static; // display inline.
 
+	.block-editor-inserter {
+		font-size: inherit;
+	}
+
 	.block-editor-button-block-appender {
 		height: 1.5em;
 		width: 1.5em;

From 96b12e5c8571b77e24e4a352094bafebddc35ec8 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 6 Feb 2025 18:12:51 +0400
Subject: [PATCH 22/24] Quick Inserter: Restore pattern search and insertion
 (#69028)

Unlinked contributors: xpurichan.

Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: yogeshbhutkar <yogeshbhutkar@git.wordpress.org>
Co-authored-by: fabiankaegy <fabiankaegy@git.wordpress.org>
---
 .../block-editor/src/components/inserter/quick-inserter.js   | 5 ++++-
 .../block-editor/src/components/inserter/search-results.js   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/quick-inserter.js b/packages/block-editor/src/components/inserter/quick-inserter.js
index 498030a0019dcc..baedf91b87a906 100644
--- a/packages/block-editor/src/components/inserter/quick-inserter.js
+++ b/packages/block-editor/src/components/inserter/quick-inserter.js
@@ -21,6 +21,7 @@ import { store as blockEditorStore } from '../../store';
 
 const SEARCH_THRESHOLD = 6;
 const SHOWN_BLOCK_TYPES = 6;
+const SHOWN_BLOCK_PATTERNS = 2;
 
 export default function QuickInserter( {
 	onSelect,
@@ -106,7 +107,9 @@ export default function QuickInserter( {
 					rootClientId={ rootClientId }
 					clientId={ clientId }
 					isAppender={ isAppender }
-					maxBlockPatterns={ 0 }
+					maxBlockPatterns={
+						!! filterValue ? SHOWN_BLOCK_PATTERNS : 0
+					}
 					maxBlockTypes={ SHOWN_BLOCK_TYPES }
 					isDraggable={ false }
 					selectBlockOnInsert={ selectBlockOnInsert }
diff --git a/packages/block-editor/src/components/inserter/search-results.js b/packages/block-editor/src/components/inserter/search-results.js
index 5a5725a3bb08cd..c020e86f99a638 100644
--- a/packages/block-editor/src/components/inserter/search-results.js
+++ b/packages/block-editor/src/components/inserter/search-results.js
@@ -84,7 +84,9 @@ function InserterSearchResults( {
 	] = useBlockTypesState( destinationRootClientId, onInsertBlocks, isQuick );
 	const [ patterns, , onClickPattern ] = usePatternsState(
 		onInsertBlocks,
-		destinationRootClientId
+		destinationRootClientId,
+		undefined,
+		isQuick
 	);
 
 	const filteredBlockPatterns = useMemo( () => {

From e850c6894da68b70eb689d38f834d93b4c1460c3 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 6 Feb 2025 08:13:11 -0700
Subject: [PATCH 23/24] Editor: Add loading state to the 'PostAuthorCombobox'
 component (#68991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add loading indicator to author selector

* Only show "No items found" when isLoading is false

* Remove unitended change

* Update packages/components/src/combobox-control/types.ts

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

* Revert "Only show "No items found" when isLoading is false"

This reverts commit 76488c1841a4932a3350c927ea739c4da4b5bbfd.

* Only show the suggestion list when the component isn’t loading data

* Document `isLoading` prop in readme

* Add is loading to Combobox storybook

* Match readme description to type.js description

* Revert combobox changes

---------

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>
---
 packages/editor/src/components/post-author/combobox.js | 4 +++-
 packages/editor/src/components/post-author/hook.js     | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/editor/src/components/post-author/combobox.js b/packages/editor/src/components/post-author/combobox.js
index 867eca7947976a..9cc6e01f5b82ce 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -17,7 +17,8 @@ export default function PostAuthorCombobox() {
 	const [ fieldValue, setFieldValue ] = useState();
 
 	const { editPost } = useDispatch( editorStore );
-	const { authorId, authorOptions } = useAuthorsQuery( fieldValue );
+	const { authorId, authorOptions, isLoading } =
+		useAuthorsQuery( fieldValue );
 
 	/**
 	 * Handle author selection.
@@ -51,6 +52,7 @@ export default function PostAuthorCombobox() {
 			onChange={ handleSelect }
 			allowReset={ false }
 			hideLabelFromVision
+			isLoading={ isLoading }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/post-author/hook.js b/packages/editor/src/components/post-author/hook.js
index f251eba79e1806..28c4c126547b82 100644
--- a/packages/editor/src/components/post-author/hook.js
+++ b/packages/editor/src/components/post-author/hook.js
@@ -14,9 +14,9 @@ import { store as editorStore } from '../../store';
 import { AUTHORS_QUERY, BASE_QUERY } from './constants';
 
 export function useAuthorsQuery( search ) {
-	const { authorId, authors, postAuthor } = useSelect(
+	const { authorId, authors, postAuthor, isLoading } = useSelect(
 		( select ) => {
-			const { getUser, getUsers } = select( coreStore );
+			const { getUser, getUsers, isResolving } = select( coreStore );
 			const { getEditedPostAttribute } = select( editorStore );
 			const _authorId = getEditedPostAttribute( 'author' );
 			const query = { ...AUTHORS_QUERY };
@@ -30,6 +30,7 @@ export function useAuthorsQuery( search ) {
 				authorId: _authorId,
 				authors: getUsers( query ),
 				postAuthor: getUser( _authorId, BASE_QUERY ),
+				isLoading: isResolving( 'getUsers', [ query ] ),
 			};
 		},
 		[ search ]
@@ -68,5 +69,5 @@ export function useAuthorsQuery( search ) {
 		return [ ...currentAuthor, ...fetchedAuthors ];
 	}, [ authors, postAuthor ] );
 
-	return { authorId, authorOptions, postAuthor };
+	return { authorId, authorOptions, postAuthor, isLoading };
 }

From c9ee64ad2e5e05ecbc40eb95faa3a0775ae674b1 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 7 Feb 2025 13:11:19 +0400
Subject: [PATCH 24/24] Exclude Iterator helpers from polyfills (#69070)

* Exclude Iterator helpers from polyfills
* Use assertEqualSets
* Ignore bundled packages

Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: swissspidy <swissspidy@git.wordpress.org>
---
 .../polyfill-exclusions.js                    |  5 ++
 phpunit/script-dependencies-test.php          | 48 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 phpunit/script-dependencies-test.php

diff --git a/packages/babel-preset-default/polyfill-exclusions.js b/packages/babel-preset-default/polyfill-exclusions.js
index ca8c045d124146..9d0d18737540cb 100644
--- a/packages/babel-preset-default/polyfill-exclusions.js
+++ b/packages/babel-preset-default/polyfill-exclusions.js
@@ -28,4 +28,9 @@ module.exports = [
 	//
 	// @see https://github.com/WordPress/gutenberg/pull/67230
 	/^es(next)?\.set\./,
+	// Remove Iterator feature polyfills.
+	// For the same reasoning as for Set exlusion above, we're excluding all iterator helper polyfills.
+	//
+	// @see https://github.com/WordPress/wordpress-develop/pull/8224#issuecomment-2636390007.
+	/^es(next)?\.iterator\./,
 ];
diff --git a/phpunit/script-dependencies-test.php b/phpunit/script-dependencies-test.php
new file mode 100644
index 00000000000000..66f5c0a7e3dc57
--- /dev/null
+++ b/phpunit/script-dependencies-test.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @group script-dependencies
+ */
+class Test_Script_Dependencies extends WP_UnitTestCase {
+	public $bundled_scripts = array( 'wp-upload-media' );
+
+	/**
+	 * Tests for accidental `wp-polyfill` script dependents.
+	 */
+	public function test_polyfill_dependents() {
+		$scripts            = wp_scripts();
+		$registered_scripts = $scripts->registered;
+		$dependents         = array();
+
+		// Iterate over all registered scripts, finding dependents of the `wp-polyfill` script.
+		// Based on private `WP_Scripts::get_dependents` method.
+		foreach ( $registered_scripts as $registered_handle => $args ) {
+			// Ignore bundled packages, they don't load separate polyfills.
+			if ( in_array( $registered_handle, $this->bundled_scripts, true ) ) {
+				continue;
+			}
+
+			if ( in_array( 'wp-polyfill', $args->deps, true ) ) {
+				$dependents[] = $registered_handle;
+			}
+		}
+
+		// This list should get smaller over time as we remove `wp-polyfill` dependencies.
+		// If the list update is intentional, please add a comment explaining why.
+		$expected = array(
+			'react',
+			'wp-blob',
+			'wp-block-editor',
+			'wp-block-library',
+			'wp-blocks',
+			'wp-edit-site',
+			'wp-core-data',
+			'wp-editor',
+			'wp-router',
+			'wp-url',
+			'wp-widgets',
+		);
+
+		$this->assertEqualSets( $expected, $dependents );
+	}
+}