From 646579000de27efdef6c142e977f28b899c81f09 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 9 Aug 2019 14:12:17 +1000
Subject: [PATCH 01/52] Basic gallery caption.

---
 package-lock.json                             |   4 +-
 packages/block-library/src/gallery/block.json |   7 +-
 packages/block-library/src/gallery/edit.js    | 105 +++++++++++-------
 packages/block-library/src/gallery/save.js    |  17 ++-
 packages/block-library/src/gallery/style.scss |   2 +-
 packages/blocks/src/api/validation.js         |   1 -
 6 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index db4ab1e5b5f252..9d4cd468015bc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7737,7 +7737,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": false,
+									"resolved": "",
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -12590,7 +12590,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": false,
+							"resolved": "",
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index 6fa43d279a80e4..e677e7eb365628 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -6,7 +6,7 @@
 			"type": "array",
 			"default": [ ],
 			"source": "query",
-			"selector": "ul.wp-block-gallery .blocks-gallery-item",
+			"selector": ".wp-block-gallery .blocks-gallery-item",
 			"query": {
 				"url": {
 					"source": "attribute",
@@ -48,6 +48,11 @@
 		"columns": {
 			"type": "number"
 		},
+		"galleryCaption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption"
+		},
 		"imageCrop": {
 			"type": "boolean",
 			"default": true
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 129fc2343224a6..8a6c05c095c70b 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -19,6 +19,7 @@ import {
 	BlockIcon,
 	MediaPlaceholder,
 	InspectorControls,
+	RichText,
 } from '@wordpress/block-editor';
 import { Component } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
@@ -56,8 +57,10 @@ class GalleryEdit extends Component {
 		this.onUploadError = this.onUploadError.bind( this );
 		this.setImageAttributes = this.setImageAttributes.bind( this );
 		this.setAttributes = this.setAttributes.bind( this );
+		this.onFocusGalleryCaption = this.onFocusGalleryCaption.bind( this );
 
 		this.state = {
+			galleryCaptionFocused: false,
 			selectedImage: null,
 			attachmentCaptions: null,
 		};
@@ -74,7 +77,6 @@ class GalleryEdit extends Component {
 				ids: map( attributes.images, 'id' ),
 			};
 		}
-
 		this.props.setAttributes( attributes );
 	}
 
@@ -191,6 +193,14 @@ class GalleryEdit extends Component {
 		return checked ? __( 'Thumbnails are cropped to align.' ) : __( 'Thumbnails are not cropped.' );
 	}
 
+	onFocusGalleryCaption() {
+		if ( ! this.state.galleryCaptionFocused ) {
+			this.setState( {
+				galleryCaptionFocused: true,
+			} );
+		}
+	}
+
 	setImageAttributes( index, attributes ) {
 		const { attributes: { images } } = this.props;
 		const { setAttributes } = this;
@@ -231,12 +241,16 @@ class GalleryEdit extends Component {
 				captionSelected: false,
 			} );
 		}
+		if ( ! this.props.isSelected && prevProps.isSelected && this.state.galleryCaptionFocused ) {
+			this.setState( {
+				galleryCaptionFocused: false,
+			} );
+		}
 	}
 
 	render() {
-		const { attributes, isSelected, className, noticeUI } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, imageCrop, linkTo } = attributes;
-
+		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
+		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
@@ -291,42 +305,55 @@ class GalleryEdit extends Component {
 					</PanelBody>
 				</InspectorControls>
 				{ noticeUI }
-				<ul
-					className={ classnames(
-						className,
-						{
-							[ `align${ align }` ]: align,
-							[ `columns-${ columns }` ]: columns,
-							'is-cropped': imageCrop,
-						}
-					) }
-				>
-					{ images.map( ( img, index ) => {
+				<figure className={ className } >
+					<ul
+						className={ classnames(
+							'blocks-gallery-grid',
+							{
+								[ `align${ align }` ]: align,
+								[ `columns-${ columns }` ]: columns,
+								'is-cropped': imageCrop,
+							}
+						) }
+					>
+						{ images.map( ( img, index ) => {
 						/* translators: %1$d is the order number of the image, %2$d is the total number of images. */
-						const ariaLabel = sprintf( __( 'image %1$d of %2$d in gallery' ), ( index + 1 ), images.length );
-
-						return (
-							<li className="blocks-gallery-item" key={ img.id || img.url }>
-								<GalleryImage
-									url={ img.url }
-									alt={ img.alt }
-									id={ img.id }
-									isFirstItem={ index === 0 }
-									isLastItem={ ( index + 1 ) === images.length }
-									isSelected={ isSelected && this.state.selectedImage === index }
-									onMoveBackward={ this.onMoveBackward( index ) }
-									onMoveForward={ this.onMoveForward( index ) }
-									onRemove={ this.onRemoveImage( index ) }
-									onSelect={ this.onSelectImage( index ) }
-									setAttributes={ ( attrs ) => this.setImageAttributes( index, attrs ) }
-									caption={ img.caption }
-									aria-label={ ariaLabel }
-								/>
-							</li>
-						);
-					} ) }
-				</ul>
-				{ mediaPlaceholder }
+							const ariaLabel = sprintf( __( 'image %1$d of %2$d in gallery' ), ( index + 1 ), images.length );
+
+							return (
+								<li className="blocks-gallery-item" key={ img.id || img.url }>
+									<GalleryImage
+										url={ img.url }
+										alt={ img.alt }
+										id={ img.id }
+										isFirstItem={ index === 0 }
+										isLastItem={ ( index + 1 ) === images.length }
+										isSelected={ isSelected && this.state.selectedImage === index }
+										onMoveBackward={ this.onMoveBackward( index ) }
+										onMoveForward={ this.onMoveForward( index ) }
+										onRemove={ this.onRemoveImage( index ) }
+										onSelect={ this.onSelectImage( index ) }
+										setAttributes={ ( attrs ) => this.setImageAttributes( index, attrs ) }
+										caption={ img.caption }
+										aria-label={ ariaLabel }
+									/>
+								</li>
+							);
+						} ) }
+					</ul>
+					{ mediaPlaceholder }
+					{ ( ! RichText.isEmpty( galleryCaption ) || isSelected ) && (
+						<RichText
+							tagName="figcaption"
+							placeholder={ __( 'Write gallery caption…' ) }
+							value={ galleryCaption }
+							unstableOnFocus={ this.onFocusGalleryCaption }
+							onChange={ ( value ) => setAttributes( { galleryCaption: value } ) }
+							isSelected={ this.state.galleryCaptionFocused }
+							inlineToolbar
+						/>
+					) }
+				</figure>
 			</>
 		);
 	}
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 638523c6554464..2c49141ea80e59 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,9 +9,10 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
-	return (
-		<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+
+	const baseGallery = (
+		<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
 			{ images.map( ( image ) => {
 				let href;
 
@@ -48,4 +49,14 @@ export default function save( { attributes } ) {
 			} ) }
 		</ul>
 	);
+
+	if ( galleryCaption ) {
+		return (
+			<figure>
+				{ baseGallery }
+				{ <RichText.Content tagName="figcaption" value={ galleryCaption } /> }
+			</figure>
+		);
+	}
+	return baseGallery;
 }
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index df60d6fd1fc9b6..06c7dcfd12c826 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -1,4 +1,4 @@
-.wp-block-gallery {
+.blocks-gallery-grid {
 	display: flex;
 	flex-wrap: wrap;
 	list-style-type: none;
diff --git a/packages/blocks/src/api/validation.js b/packages/blocks/src/api/validation.js
index 444830c47c5ac7..d1fe839851c889 100644
--- a/packages/blocks/src/api/validation.js
+++ b/packages/blocks/src/api/validation.js
@@ -636,7 +636,6 @@ export function isValidBlockContent( blockTypeOrName, attributes, originalBlockC
 		log.error( 'Block validation failed because an error occurred while generating block content:\n\n%s', error.toString() );
 		return false;
 	}
-
 	const isValid = isEquivalentHTML( originalBlockContent, generatedBlockContent );
 	if ( ! isValid ) {
 		log.error(

From 9fc66997e815588f77b83b6e29161e2ad23e573d Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 9 Aug 2019 16:47:41 +1000
Subject: [PATCH 02/52] add block deprecation

---
 .../block-library/src/gallery/deprecated.js   | 99 +++++++++++++++++++
 packages/block-library/src/gallery/style.scss |  8 ++
 2 files changed, 107 insertions(+)

diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 2b77e33e0b36e4..74af7e3f50b6e7 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,6 +15,105 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
+	{
+		attributes: {
+			images: {
+				type: 'array',
+				default: [],
+				source: 'query',
+				selector: 'ul.wp-block-gallery .blocks-gallery-item',
+				query: {
+					url: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'src',
+					},
+					fullUrl: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-full-url',
+					},
+					alt: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'alt',
+						default: '',
+					},
+					id: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-id',
+					},
+					link: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-link',
+					},
+					caption: {
+						type: 'array',
+						source: 'children',
+						selector: 'figcaption',
+					},
+				},
+			},
+			ids: {
+				type: 'array',
+				default: [],
+			},
+			columns: {
+				type: 'number',
+			},
+			imageCrop: {
+				type: 'boolean',
+				default: true,
+			},
+			linkTo: {
+				type: 'string',
+				default: 'none',
+			},
+		},
+		save( { attributes } ) {
+			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
+			return (
+				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+					{ images.map( ( image ) => {
+						let href;
+
+						switch ( linkTo ) {
+							case 'media':
+								href = image.fullUrl || image.url;
+								break;
+							case 'attachment':
+								href = image.link;
+								break;
+						}
+
+						const img = (
+							<img
+								src={ image.url }
+								alt={ image.alt }
+								data-id={ image.id }
+								data-full-url={ image.fullUrl }
+								data-link={ image.link }
+								className={ image.id ? `wp-image-${ image.id }` : null }
+							/>
+						);
+
+						return (
+							<li key={ image.id || image.url } className="blocks-gallery-item">
+								<figure>
+									{ href ? <a href={ href }>{ img }</a> : img }
+									{ image.caption && image.caption.length > 0 && (
+										<RichText.Content tagName="figcaption" value={ image.caption } />
+									) }
+								</figure>
+							</li>
+						);
+					} ) }
+				</ul>
+			);
+		},
+	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index 06c7dcfd12c826..dc2e99ac57366f 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -3,6 +3,7 @@
 	flex-wrap: wrap;
 	list-style-type: none;
 	padding: 0;
+	margin-bottom: 0;
 
 	.blocks-gallery-image,
 	.blocks-gallery-item {
@@ -147,4 +148,11 @@
 			justify-content: center;
 		}
 	}
+
+	+ figcaption {
+		margin-top: -$grid-size;
+		font-size: $editor-font-size;
+		font-family: $default-font;
+		color: $dark-gray-500;
+	}
 }

From f635ed940c40f4c4949df3949b152ed15b98bb6b Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:24:13 +1000
Subject: [PATCH 03/52] Regenerate test fixtures and fix failures

---
 packages/block-library/src/gallery/style.scss |  1 +
 .../blocks/core__gallery-with-caption.html    | 17 +++++++++++
 .../blocks/core__gallery-with-caption.json    | 30 +++++++++++++++++++
 .../core__gallery-with-caption.parsed.json    | 25 ++++++++++++++++
 ...core__gallery-with-caption.serialized.html |  3 ++
 .../fixtures/blocks/core__gallery.html        |  2 +-
 .../fixtures/blocks/core__gallery.json        |  3 +-
 .../fixtures/blocks/core__gallery.parsed.json |  4 +--
 .../blocks/core__gallery.serialized.html      |  2 +-
 .../blocks/core__gallery__columns.html        |  2 +-
 .../blocks/core__gallery__columns.json        |  3 +-
 .../blocks/core__gallery__columns.parsed.json |  4 +--
 .../core__gallery__columns.serialized.html    |  2 +-
 ...ore__gallery__deprecated-1.serialized.html |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  4 +--
 ...ore__gallery__deprecated-2.serialized.html |  4 +--
 .../blocks/core__gallery__deprecated-3.html   | 14 +++++++++
 .../blocks/core__gallery__deprecated-3.json   | 29 ++++++++++++++++++
 .../core__gallery__deprecated-3.parsed.json   | 25 ++++++++++++++++
 ...ore__gallery__deprecated-3.serialized.html |  3 ++
 .../blocks-raw-handling.spec.js.snap          |  2 +-
 test/integration/fixtures/wordpress-out.html  |  2 +-
 22 files changed, 166 insertions(+), 17 deletions(-)
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index dc2e99ac57366f..9727baa5c9812d 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -1,3 +1,4 @@
+.wp-block-gallery,
 .blocks-gallery-grid {
 	display: flex;
 	flex-wrap: wrap;
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
new file mode 100644
index 00000000000000..55346fad9662ed
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
@@ -0,0 +1,17 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<figure class="wp-block-gallery">
+	<ul class="blocks-gallery-grid columns-2 is-cropped">
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+			</figure>
+		</li>
+	</ul>
+	<figcaption>Gallery caption.</figcaption>
+</figure>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
new file mode 100644
index 00000000000000..72617e1d629527
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -0,0 +1,30 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": ""
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": ""
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "galleryCaption": "Gallery caption.",
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
new file mode 100644
index 00000000000000..9c41df754c14a5
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>\n",
+        "innerContent": [
+            "\n<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
new file mode 100644
index 00000000000000..e5c131fd06c1c2
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<figure class="wp-block-gallery"><ul class="blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul><figcaption>Gallery caption.</figcaption></figure>
+<!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.html b/packages/e2e-tests/fixtures/blocks/core__gallery.html
index b91a575be9ca53..4533b7bd7af9f6 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped">
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index 4825848d9e6c43..b2b2059aa6eb83 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,10 +20,11 @@
                 null,
                 null
             ],
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
index 99c1ac20ed9562..907def5df53548 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
@@ -8,9 +8,9 @@
             ]
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
index 813f97c645287e..24ebb0d1cd4d93 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
index e97f7b9f87f3cb..243784c359066b 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery columns-1 is-cropped">
+<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index f149e3faf630a4..77815722299e45 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,10 +21,11 @@
                 null
             ],
             "columns": 1,
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
index 14a5b12897804f..1d5be9ec070fb1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
@@ -9,9 +9,9 @@
             "columns": 1
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
index cb2b112acad9e3..c578089e68cc6a 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
index eb7bc9482b7f29..9a8d9596ca1d07 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"columns":2,"align":"none"} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 3c0eacb2de59fb..ae7369c05d01ba 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -9,13 +9,13 @@
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
                     "id": "1",
-                    "caption": ""
+                    "caption": []
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
                     "id": "2",
-                    "caption": ""
+                    "caption": []
                 }
             ],
             "ids": [],
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
index 8951d81b0c4e80..8a5a4355e9a523 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:gallery {"columns":2} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
+<!-- wp:gallery {"ids":[],"columns":2} -->
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
new file mode 100644
index 00000000000000..b91a575be9ca53
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
new file mode 100644
index 00000000000000..1ab0e9709401c8
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -0,0 +1,29 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": []
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": []
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
new file mode 100644
index 00000000000000..99c1ac20ed9562
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerContent": [
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
new file mode 100644
index 00000000000000..24ebb0d1cd4d93
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<!-- /wp:gallery -->
diff --git a/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap b/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
index d7bdedf537779b..0e9a51b2eebb18 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
@@ -30,7 +30,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:heading -->
 
 <!-- wp:gallery {\\"ids\\":[1],\\"columns\\":3,\\"linkTo\\":\\"attachment\\"} -->
-<ul class=\\"wp-block-gallery columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
 <!-- /wp:gallery -->
 
 <!-- wp:html -->
diff --git a/test/integration/fixtures/wordpress-out.html b/test/integration/fixtures/wordpress-out.html
index e179380c983daa..941440d9ab122e 100644
--- a/test/integration/fixtures/wordpress-out.html
+++ b/test/integration/fixtures/wordpress-out.html
@@ -19,5 +19,5 @@ <h3>Shortcode</h3>
 <!-- /wp:heading -->
 
 <!-- wp:gallery {"ids":[1],"columns":3,"linkTo":"attachment"} -->
-<ul class="wp-block-gallery columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
 <!-- /wp:gallery -->

From 3f90fa4494243f9d7391cf53668ce5d9b2ba259e Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:56:59 +1000
Subject: [PATCH 04/52] e2e snapshot update

---
 .../__snapshots__/block-transforms.test.js.snap    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index 3288fac0c027a6..a411c092f8ef4a 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -92,7 +92,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -128,7 +128,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -156,7 +156,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[],\\"align\\":\\"center\\"} -->
-<ul class=\\"wp-block-gallery aligncenter columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery aligncenter blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -184,7 +184,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -212,7 +212,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -240,7 +240,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -268,7 +268,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 

From 9751b3917a5e59b697560022dee20b60513473b2 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:57:13 +1000
Subject: [PATCH 05/52] Fix editor styles

---
 packages/block-library/src/gallery/editor.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index 9452f917298f69..fa6bcee764e845 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -1,4 +1,6 @@
-ul.wp-block-gallery {
+.wp-block-gallery {
+	display: block;
+
 	// Override the default list style type _only in the editor_
 	// to avoid :not() selector specificity issues.
 	// See https://github.com/WordPress/gutenberg/pull/10358

From bbaf7a3fcb819af29fe73031136573471a56f344 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 16:08:27 +1000
Subject: [PATCH 06/52] Fix block transforms e2e

---
 packages/e2e-tests/fixtures/block-transforms.js        |  7 +++++++
 .../specs/__snapshots__/block-transforms.test.js.snap  | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/packages/e2e-tests/fixtures/block-transforms.js b/packages/e2e-tests/fixtures/block-transforms.js
index 3dd876b460a998..3d5875e7c5b40c 100644
--- a/packages/e2e-tests/fixtures/block-transforms.js
+++ b/packages/e2e-tests/fixtures/block-transforms.js
@@ -157,6 +157,13 @@ export const EXPECTED_TRANSFORMS = {
 			'Image',
 		],
 	},
+	'core__gallery-with-caption': {
+		originalBlock: 'Gallery',
+		availableTransforms: [
+			'Group',
+			'Image',
+		],
+	},
 	core__gallery__columns: {
 		originalBlock: 'Gallery',
 		availableTransforms: [
diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index a411c092f8ef4a..74366e7e2dfe8b 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -52,6 +52,16 @@ exports[`Block transforms correctly transform block Gallery in fixture core__gal
 <!-- /wp:image -->"
 `;
 
+exports[`Block transforms correctly transform block Gallery in fixture core__gallery-with-caption into the Image block 1`] = `
+"<!-- wp:image -->
+<figure class=\\"wp-block-image\\"><img src=\\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\\" alt=\\"title\\"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image -->
+<figure class=\\"wp-block-image\\"><img src=\\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\\" alt=\\"title\\"/></figure>
+<!-- /wp:image -->"
+`;
+
 exports[`Block transforms correctly transform block Heading in fixture core__heading__h2 into the Paragraph block 1`] = `
 "<!-- wp:paragraph -->
 <p>A picture is worth a thousand words, or so the saying goes</p>

From 4a79b861cab971cdd9f1ecc5d0f58d897a4fcd3f Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 18:26:12 +1000
Subject: [PATCH 07/52] Workaround for failing tests

---
 packages/block-library/src/gallery/save.js        | 15 ++++++++++-----
 .../e2e-tests/fixtures/blocks/core__gallery.html  |  2 +-
 .../e2e-tests/fixtures/blocks/core__gallery.json  |  2 +-
 .../fixtures/blocks/core__gallery.parsed.json     |  4 ++--
 .../fixtures/blocks/core__gallery.serialized.html |  2 +-
 .../fixtures/blocks/core__gallery__columns.html   |  2 +-
 .../fixtures/blocks/core__gallery__columns.json   |  2 +-
 .../blocks/core__gallery__columns.parsed.json     |  4 ++--
 .../blocks/core__gallery__columns.serialized.html |  2 +-
 .../core__gallery__deprecated-1.serialized.html   |  2 +-
 .../blocks/core__gallery__deprecated-2.json       |  5 +++--
 .../core__gallery__deprecated-2.serialized.html   |  4 ++--
 .../blocks/core__gallery__deprecated-3.json       |  5 +++--
 .../core__gallery__deprecated-3.serialized.html   |  2 +-
 .../__snapshots__/block-transforms.test.js.snap   | 14 +++++++-------
 .../blocks-raw-handling.spec.js.snap              |  2 +-
 test/integration/fixtures/wordpress-out.html      |  2 +-
 17 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 2c49141ea80e59..86364c7625fc6b 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -10,9 +10,8 @@ import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
 	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
-
 	const baseGallery = (
-		<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+		<>
 			{ images.map( ( image ) => {
 				let href;
 
@@ -47,16 +46,22 @@ export default function save( { attributes } ) {
 					</li>
 				);
 			} ) }
-		</ul>
+		</>
 	);
 
 	if ( galleryCaption ) {
 		return (
 			<figure>
-				{ baseGallery }
+				<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` }>
+					{ baseGallery }
+				</ul>
 				{ <RichText.Content tagName="figcaption" value={ galleryCaption } /> }
 			</figure>
 		);
 	}
-	return baseGallery;
+	return (
+		<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` }>
+			{ baseGallery }
+		</ul>
+	);
 }
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.html b/packages/e2e-tests/fixtures/blocks/core__gallery.html
index 4533b7bd7af9f6..b91a575be9ca53 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped">
+<ul class="wp-block-gallery columns-2 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index b2b2059aa6eb83..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -25,6 +25,6 @@
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
index 907def5df53548..99c1ac20ed9562 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
@@ -8,9 +8,9 @@
             ]
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
index 24ebb0d1cd4d93..813f97c645287e 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
index 243784c359066b..e97f7b9f87f3cb 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped">
+<ul class="wp-block-gallery columns-1 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 77815722299e45..83a8363d2f0cb5 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -26,6 +26,6 @@
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
index 1d5be9ec070fb1..14a5b12897804f 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
@@ -9,9 +9,9 @@
             "columns": 1
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
index c578089e68cc6a..cb2b112acad9e3 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
index 9a8d9596ca1d07..eb7bc9482b7f29 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"columns":2,"align":"none"} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index ae7369c05d01ba..9ab909dbb44e8c 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -9,17 +9,18 @@
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
                     "id": "1",
-                    "caption": []
+                    "caption": ""
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
                     "id": "2",
-                    "caption": []
+                    "caption": ""
                 }
             ],
             "ids": [],
             "columns": 2,
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
index 8a5a4355e9a523..8951d81b0c4e80 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:gallery {"ids":[],"columns":2} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
+<!-- wp:gallery {"columns":2} -->
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
index 1ab0e9709401c8..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -8,18 +8,19 @@
                 {
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
-                    "caption": []
+                    "caption": ""
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
-                    "caption": []
+                    "caption": ""
                 }
             ],
             "ids": [
                 null,
                 null
             ],
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
index 24ebb0d1cd4d93..813f97c645287e 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index 74366e7e2dfe8b..959ae009325aea 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -102,7 +102,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -138,7 +138,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -166,7 +166,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[],\\"align\\":\\"center\\"} -->
-<ul class=\\"wp-block-gallery aligncenter blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery aligncenter columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -194,7 +194,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -222,7 +222,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -250,7 +250,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -278,7 +278,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
diff --git a/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap b/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
index 0e9a51b2eebb18..d7bdedf537779b 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
@@ -30,7 +30,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:heading -->
 
 <!-- wp:gallery {\\"ids\\":[1],\\"columns\\":3,\\"linkTo\\":\\"attachment\\"} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
+<ul class=\\"wp-block-gallery columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
 <!-- /wp:gallery -->
 
 <!-- wp:html -->
diff --git a/test/integration/fixtures/wordpress-out.html b/test/integration/fixtures/wordpress-out.html
index 941440d9ab122e..e179380c983daa 100644
--- a/test/integration/fixtures/wordpress-out.html
+++ b/test/integration/fixtures/wordpress-out.html
@@ -19,5 +19,5 @@ <h3>Shortcode</h3>
 <!-- /wp:heading -->
 
 <!-- wp:gallery {"ids":[1],"columns":3,"linkTo":"attachment"} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
+<ul class="wp-block-gallery columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
 <!-- /wp:gallery -->

From f4f8ba975a15f40fab3cfefded1ff4becc46e3cc Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 10:51:40 +1000
Subject: [PATCH 08/52] Undo package-lock changes

---
 package-lock.json | 311 ++++++++--------------------------------------
 1 file changed, 54 insertions(+), 257 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d4cd468015bc9..2413d9d0c96d27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "6.3.0-rc.1",
+	"version": "6.2.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -4626,26 +4626,19 @@
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
-				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
-				"inherits": "^2.0.3",
 				"lodash": "^4.17.10",
-				"memize": "^1.0.5",
-				"react-autosize-textarea": "^3.0.2",
 				"react-spring": "^8.0.19",
 				"redux-multi": "^0.1.12",
 				"refx": "^3.0.0",
 				"rememo": "^3.0.0",
-				"tinycolor2": "^1.4.1",
-				"traverse": "^0.6.6"
+				"tinycolor2": "^1.4.1"
 			}
 		},
 		"@wordpress/block-library": {
 			"version": "file:packages/block-library",
 			"requires": {
 				"@babel/runtime": "^7.4.4",
-				"@wordpress/a11y": "file:packages/a11y",
-				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-editor": "file:packages/block-editor",
@@ -4654,23 +4647,18 @@
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/editor": "file:packages/editor",
 				"@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/keycodes": "file:packages/keycodes",
-				"@wordpress/rich-text": "file:packages/rich-text",
 				"@wordpress/server-side-render": "file:packages/server-side-render",
-				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"fast-average-color": "4.3.0",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
-				"moment": "^2.22.1",
-				"tinycolor2": "^1.4.1",
 				"url": "^0.11.0"
 			}
 		},
@@ -4683,8 +4671,7 @@
 		"@wordpress/block-serialization-spec-parser": {
 			"version": "file:packages/block-serialization-spec-parser",
 			"requires": {
-				"pegjs": "^0.10.0",
-				"phpegjs": "^1.0.0-beta7"
+				"pegjs": "^0.10.0"
 			}
 		},
 		"@wordpress/blocks": {
@@ -4694,7 +4681,7 @@
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
-				"@wordpress/compose": "file:packages/compose",
+				"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
@@ -4730,14 +4717,17 @@
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
+				"@wordpress/url": "file:packages/url",
 				"classnames": "^2.2.5",
 				"clipboard": "^2.0.1",
+				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"moment": "^2.22.1",
 				"mousetrap": "^1.6.2",
-				"re-resizable": "^6.0.0",
+				"re-resizable": "^5.0.1",
+				"react-click-outside": "^3.0.0",
 				"react-dates": "^17.1.1",
 				"react-spring": "^8.0.20",
 				"rememo": "^3.0.0",
@@ -4825,9 +4815,6 @@
 			"version": "file:packages/docgen",
 			"dev": true,
 			"requires": {
-				"doctrine": "^2.1.0",
-				"espree": "^4.0.0",
-				"lodash": "^4.17.14",
 				"mdast-util-inject": "1.1.0",
 				"optionator": "0.8.2",
 				"remark": "10.0.1",
@@ -4868,8 +4855,7 @@
 				"@wordpress/jest-puppeteer-axe": "file:packages/jest-puppeteer-axe",
 				"@wordpress/scripts": "file:packages/scripts",
 				"expect-puppeteer": "^4.3.0",
-				"lodash": "^4.17.14",
-				"uuid": "^3.3.2"
+				"lodash": "^4.17.14"
 			}
 		},
 		"@wordpress/edit-post": {
@@ -4890,17 +4876,13 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
-				"@wordpress/media-utils": "file:packages/media-utils",
-				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
 				"@wordpress/plugins": "file:packages/plugins",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.14",
-				"memize": "^1.0.5",
-				"refx": "^3.0.0",
-				"rememo": "^3.0.0"
+				"refx": "^3.0.0"
 			}
 		},
 		"@wordpress/edit-widgets": {
@@ -4908,19 +4890,10 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
-				"@wordpress/block-library": "file:packages/block-library",
-				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
-				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/data": "file:packages/data",
-				"@wordpress/data-controls": "file:packages/data-controls",
 				"@wordpress/element": "file:packages/element",
-				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/media-utils": "file:packages/media-utils",
-				"@wordpress/notices": "file:packages/notices",
-				"lodash": "^4.17.14",
-				"rememo": "^3.0.0"
+				"@wordpress/notices": "file:packages/notices"
 			}
 		},
 		"@wordpress/editor": {
@@ -4928,7 +4901,7 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/api-fetch": "file:packages/api-fetch",
-				"@wordpress/autop": "file:packages/autop",
+				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
@@ -4942,23 +4915,22 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/media-utils": "file:packages/media-utils",
 				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
-				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/server-side-render": "file:packages/server-side-render",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
+				"inherits": "^2.0.3",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"react-autosize-textarea": "^3.0.2",
 				"redux-optimist": "^1.0.0",
 				"refx": "^3.0.0",
-				"rememo": "^3.0.0"
+				"rememo": "^3.0.0",
+				"traverse": "^0.6.6"
 			}
 		},
 		"@wordpress/element": {
@@ -4996,14 +4968,13 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/components": "file:packages/components",
-				"@wordpress/dom": "file:packages/dom",
+				"@wordpress/editor": "file:packages/editor",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/url": "file:packages/url",
-				"lodash": "^4.17.14"
+				"@wordpress/url": "file:packages/url"
 			}
 		},
 		"@wordpress/hooks": {
@@ -5157,7 +5128,6 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"is-promise": "^2.1.0",
-				"lodash": "^4.17.14",
 				"rungen": "^0.3.2"
 			}
 		},
@@ -5167,6 +5137,7 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
+				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/escape-html": "file:packages/escape-html",
@@ -5218,7 +5189,6 @@
 				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/url": "file:packages/url",
@@ -5253,6 +5223,7 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
+				"@wordpress/element": "file:packages/element",
 				"lodash": "^4.17.14"
 			}
 		},
@@ -7737,7 +7708,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": "",
+									"resolved": false,
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -8566,12 +8537,6 @@
 			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
 			"dev": true
 		},
-		"contains-path": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-			"dev": true
-		},
 		"content-disposition": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -10872,190 +10837,6 @@
 				}
 			}
 		},
-		"eslint-import-resolver-node": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-			"integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.9",
-				"resolve": "^1.5.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-module-utils": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
-			"integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.8",
-				"pkg-dir": "^2.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-plugin-eslint-comments": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz",
-			"integrity": "sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5",
-				"ignore": "^5.0.5"
-			},
-			"dependencies": {
-				"ignore": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz",
-					"integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-import": {
-			"version": "2.18.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
-			"integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.0.3",
-				"contains-path": "^0.1.0",
-				"debug": "^2.6.9",
-				"doctrine": "1.5.0",
-				"eslint-import-resolver-node": "^0.3.2",
-				"eslint-module-utils": "^2.4.0",
-				"has": "^1.0.3",
-				"minimatch": "^3.0.4",
-				"object.values": "^1.1.0",
-				"read-pkg-up": "^2.0.0",
-				"resolve": "^1.11.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-					"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-					"dev": true,
-					"requires": {
-						"object-keys": "^1.0.12"
-					}
-				},
-				"doctrine": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-					"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2",
-						"isarray": "^1.0.0"
-					}
-				},
-				"load-json-file": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-					"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"object.values": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
-					"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
-					"dev": true,
-					"requires": {
-						"define-properties": "^1.1.3",
-						"es-abstract": "^1.12.0",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3"
-					}
-				},
-				"path-parse": {
-					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-					"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-					"dev": true
-				},
-				"path-type": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-					"dev": true,
-					"requires": {
-						"pify": "^2.0.0"
-					}
-				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"resolve": {
-					"version": "1.12.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-					"integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-					"dev": true
-				}
-			}
-		},
 		"eslint-plugin-jest": {
 			"version": "22.14.1",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.14.1.tgz",
@@ -11458,9 +11239,9 @@
 			}
 		},
 		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
 			"dev": true
 		},
 		"extend-shallow": {
@@ -12590,7 +12371,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -20319,7 +20100,8 @@
 		"phpegjs": {
 			"version": "1.0.0-beta7",
 			"resolved": "https://registry.npmjs.org/phpegjs/-/phpegjs-1.0.0-beta7.tgz",
-			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ="
+			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ=",
+			"dev": true
 		},
 		"physical-cpu-count": {
 			"version": "2.0.0",
@@ -21265,9 +21047,9 @@
 			},
 			"dependencies": {
 				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+					"version": "4.17.11",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
 					"dev": true
 				}
 			}
@@ -21754,9 +21536,9 @@
 			}
 		},
 		"re-resizable": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.0.0.tgz",
-			"integrity": "sha512-RTrnhbGgYyZ4hTc6db4JeMnRfmloEPWtuYaXZEa2PRaEC4mreWNFnZtMVsHil3z3iX+WchD+da8BLlTJBcstMA==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-5.0.1.tgz",
+			"integrity": "sha512-Iy8v5li7bhNBDxCN1DbA4l6G2Hk8NCZtcExoI1D+5pfvKyQcH8LH2P5h3DGoEfHhs0uyyRC1Qx8bHBomfrmxgA==",
 			"requires": {
 				"fast-memoize": "^2.5.1"
 			}
@@ -21791,6 +21573,21 @@
 				"prop-types": "^15.5.6"
 			}
 		},
+		"react-click-outside": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/react-click-outside/-/react-click-outside-3.0.1.tgz",
+			"integrity": "sha512-d0KWFvBt+esoZUF15rL2UBB7jkeAqLU8L/Ny35oLK6fW6mIbOv/ChD+ExF4sR9PD26kVx+9hNfD0FTIqRZEyRQ==",
+			"requires": {
+				"hoist-non-react-statics": "^2.1.1"
+			},
+			"dependencies": {
+				"hoist-non-react-statics": {
+					"version": "2.5.5",
+					"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+					"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+				}
+			}
+		},
 		"react-dates": {
 			"version": "17.2.0",
 			"resolved": "https://registry.npmjs.org/react-dates/-/react-dates-17.2.0.tgz",
@@ -23313,9 +23110,9 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"safer-eval": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.5.tgz",
-			"integrity": "sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==",
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.2.tgz",
+			"integrity": "sha512-mAkc9NX+ULPw4qX+lkFVuIhXQbjFaX97fWFj6atFXMG11lUX4rXfQY6Q0VFf1wfJfqCHYO7cxtC7cA8fIkWsLQ==",
 			"dev": true,
 			"requires": {
 				"clones": "^1.2.0"
@@ -25109,9 +24906,9 @@
 					"dev": true
 				},
 				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+					"version": "4.17.11",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
 					"dev": true
 				},
 				"slice-ansi": {

From 321d469afee344a74ce6174446c7a3ce7a7633e5 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 10:57:20 +1000
Subject: [PATCH 09/52] Revert "Undo package-lock changes"

This reverts commit f4f8ba975a15f40fab3cfefded1ff4becc46e3cc.
---
 package-lock.json | 311 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 257 insertions(+), 54 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2413d9d0c96d27..9d4cd468015bc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "6.2.0",
+	"version": "6.3.0-rc.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -4626,19 +4626,26 @@
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
+				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
+				"inherits": "^2.0.3",
 				"lodash": "^4.17.10",
+				"memize": "^1.0.5",
+				"react-autosize-textarea": "^3.0.2",
 				"react-spring": "^8.0.19",
 				"redux-multi": "^0.1.12",
 				"refx": "^3.0.0",
 				"rememo": "^3.0.0",
-				"tinycolor2": "^1.4.1"
+				"tinycolor2": "^1.4.1",
+				"traverse": "^0.6.6"
 			}
 		},
 		"@wordpress/block-library": {
 			"version": "file:packages/block-library",
 			"requires": {
 				"@babel/runtime": "^7.4.4",
+				"@wordpress/a11y": "file:packages/a11y",
+				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-editor": "file:packages/block-editor",
@@ -4647,18 +4654,23 @@
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
+				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/editor": "file:packages/editor",
 				"@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/keycodes": "file:packages/keycodes",
+				"@wordpress/rich-text": "file:packages/rich-text",
 				"@wordpress/server-side-render": "file:packages/server-side-render",
+				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"fast-average-color": "4.3.0",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
+				"moment": "^2.22.1",
+				"tinycolor2": "^1.4.1",
 				"url": "^0.11.0"
 			}
 		},
@@ -4671,7 +4683,8 @@
 		"@wordpress/block-serialization-spec-parser": {
 			"version": "file:packages/block-serialization-spec-parser",
 			"requires": {
-				"pegjs": "^0.10.0"
+				"pegjs": "^0.10.0",
+				"phpegjs": "^1.0.0-beta7"
 			}
 		},
 		"@wordpress/blocks": {
@@ -4681,7 +4694,7 @@
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
-				"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
+				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
@@ -4717,17 +4730,14 @@
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/url": "file:packages/url",
 				"classnames": "^2.2.5",
 				"clipboard": "^2.0.1",
-				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"moment": "^2.22.1",
 				"mousetrap": "^1.6.2",
-				"re-resizable": "^5.0.1",
-				"react-click-outside": "^3.0.0",
+				"re-resizable": "^6.0.0",
 				"react-dates": "^17.1.1",
 				"react-spring": "^8.0.20",
 				"rememo": "^3.0.0",
@@ -4815,6 +4825,9 @@
 			"version": "file:packages/docgen",
 			"dev": true,
 			"requires": {
+				"doctrine": "^2.1.0",
+				"espree": "^4.0.0",
+				"lodash": "^4.17.14",
 				"mdast-util-inject": "1.1.0",
 				"optionator": "0.8.2",
 				"remark": "10.0.1",
@@ -4855,7 +4868,8 @@
 				"@wordpress/jest-puppeteer-axe": "file:packages/jest-puppeteer-axe",
 				"@wordpress/scripts": "file:packages/scripts",
 				"expect-puppeteer": "^4.3.0",
-				"lodash": "^4.17.14"
+				"lodash": "^4.17.14",
+				"uuid": "^3.3.2"
 			}
 		},
 		"@wordpress/edit-post": {
@@ -4876,13 +4890,17 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
+				"@wordpress/media-utils": "file:packages/media-utils",
+				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
 				"@wordpress/plugins": "file:packages/plugins",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.14",
-				"refx": "^3.0.0"
+				"memize": "^1.0.5",
+				"refx": "^3.0.0",
+				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/edit-widgets": {
@@ -4890,10 +4908,19 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
+				"@wordpress/block-library": "file:packages/block-library",
+				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
+				"@wordpress/compose": "file:packages/compose",
+				"@wordpress/data": "file:packages/data",
+				"@wordpress/data-controls": "file:packages/data-controls",
 				"@wordpress/element": "file:packages/element",
+				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/notices": "file:packages/notices"
+				"@wordpress/media-utils": "file:packages/media-utils",
+				"@wordpress/notices": "file:packages/notices",
+				"lodash": "^4.17.14",
+				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/editor": {
@@ -4901,7 +4928,7 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/api-fetch": "file:packages/api-fetch",
-				"@wordpress/blob": "file:packages/blob",
+				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
@@ -4915,22 +4942,23 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
+				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/media-utils": "file:packages/media-utils",
 				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
+				"@wordpress/rich-text": "file:packages/rich-text",
+				"@wordpress/server-side-render": "file:packages/server-side-render",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
-				"inherits": "^2.0.3",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"react-autosize-textarea": "^3.0.2",
 				"redux-optimist": "^1.0.0",
 				"refx": "^3.0.0",
-				"rememo": "^3.0.0",
-				"traverse": "^0.6.6"
+				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/element": {
@@ -4968,13 +4996,14 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/components": "file:packages/components",
-				"@wordpress/editor": "file:packages/editor",
+				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/url": "file:packages/url"
+				"@wordpress/url": "file:packages/url",
+				"lodash": "^4.17.14"
 			}
 		},
 		"@wordpress/hooks": {
@@ -5128,6 +5157,7 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"is-promise": "^2.1.0",
+				"lodash": "^4.17.14",
 				"rungen": "^0.3.2"
 			}
 		},
@@ -5137,7 +5167,6 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/escape-html": "file:packages/escape-html",
@@ -5189,6 +5218,7 @@
 				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/data": "file:packages/data",
+				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/url": "file:packages/url",
@@ -5223,7 +5253,6 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/element": "file:packages/element",
 				"lodash": "^4.17.14"
 			}
 		},
@@ -7708,7 +7737,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": false,
+									"resolved": "",
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -8537,6 +8566,12 @@
 			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
 			"dev": true
 		},
+		"contains-path": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+			"dev": true
+		},
 		"content-disposition": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -10837,6 +10872,190 @@
 				}
 			}
 		},
+		"eslint-import-resolver-node": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+			"integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^2.6.9",
+				"resolve": "^1.5.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
+		"eslint-module-utils": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+			"integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+			"dev": true,
+			"requires": {
+				"debug": "^2.6.8",
+				"pkg-dir": "^2.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
+		"eslint-plugin-eslint-comments": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz",
+			"integrity": "sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^1.0.5",
+				"ignore": "^5.0.5"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz",
+					"integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-import": {
+			"version": "2.18.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+			"integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
+			"dev": true,
+			"requires": {
+				"array-includes": "^3.0.3",
+				"contains-path": "^0.1.0",
+				"debug": "^2.6.9",
+				"doctrine": "1.5.0",
+				"eslint-import-resolver-node": "^0.3.2",
+				"eslint-module-utils": "^2.4.0",
+				"has": "^1.0.3",
+				"minimatch": "^3.0.4",
+				"object.values": "^1.1.0",
+				"read-pkg-up": "^2.0.0",
+				"resolve": "^1.11.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"define-properties": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+					"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+					"dev": true,
+					"requires": {
+						"object-keys": "^1.0.12"
+					}
+				},
+				"doctrine": {
+					"version": "1.5.0",
+					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+					"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+					"dev": true,
+					"requires": {
+						"esutils": "^2.0.2",
+						"isarray": "^1.0.0"
+					}
+				},
+				"load-json-file": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+					"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"parse-json": "^2.2.0",
+						"pify": "^2.0.0",
+						"strip-bom": "^3.0.0"
+					}
+				},
+				"object.values": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+					"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+					"dev": true,
+					"requires": {
+						"define-properties": "^1.1.3",
+						"es-abstract": "^1.12.0",
+						"function-bind": "^1.1.1",
+						"has": "^1.0.3"
+					}
+				},
+				"path-parse": {
+					"version": "1.0.6",
+					"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+					"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+					"dev": true
+				},
+				"path-type": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+					"dev": true,
+					"requires": {
+						"pify": "^2.0.0"
+					}
+				},
+				"read-pkg": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+					"dev": true,
+					"requires": {
+						"load-json-file": "^2.0.0",
+						"normalize-package-data": "^2.3.2",
+						"path-type": "^2.0.0"
+					}
+				},
+				"read-pkg-up": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+					"dev": true,
+					"requires": {
+						"find-up": "^2.0.0",
+						"read-pkg": "^2.0.0"
+					}
+				},
+				"resolve": {
+					"version": "1.12.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+					"integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				},
+				"strip-bom": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+					"dev": true
+				}
+			}
+		},
 		"eslint-plugin-jest": {
 			"version": "22.14.1",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.14.1.tgz",
@@ -11239,9 +11458,9 @@
 			}
 		},
 		"extend": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
 			"dev": true
 		},
 		"extend-shallow": {
@@ -12371,7 +12590,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": false,
+							"resolved": "",
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -20100,8 +20319,7 @@
 		"phpegjs": {
 			"version": "1.0.0-beta7",
 			"resolved": "https://registry.npmjs.org/phpegjs/-/phpegjs-1.0.0-beta7.tgz",
-			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ=",
-			"dev": true
+			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ="
 		},
 		"physical-cpu-count": {
 			"version": "2.0.0",
@@ -21047,9 +21265,9 @@
 			},
 			"dependencies": {
 				"lodash": {
-					"version": "4.17.11",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+					"version": "4.17.15",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 					"dev": true
 				}
 			}
@@ -21536,9 +21754,9 @@
 			}
 		},
 		"re-resizable": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-5.0.1.tgz",
-			"integrity": "sha512-Iy8v5li7bhNBDxCN1DbA4l6G2Hk8NCZtcExoI1D+5pfvKyQcH8LH2P5h3DGoEfHhs0uyyRC1Qx8bHBomfrmxgA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.0.0.tgz",
+			"integrity": "sha512-RTrnhbGgYyZ4hTc6db4JeMnRfmloEPWtuYaXZEa2PRaEC4mreWNFnZtMVsHil3z3iX+WchD+da8BLlTJBcstMA==",
 			"requires": {
 				"fast-memoize": "^2.5.1"
 			}
@@ -21573,21 +21791,6 @@
 				"prop-types": "^15.5.6"
 			}
 		},
-		"react-click-outside": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/react-click-outside/-/react-click-outside-3.0.1.tgz",
-			"integrity": "sha512-d0KWFvBt+esoZUF15rL2UBB7jkeAqLU8L/Ny35oLK6fW6mIbOv/ChD+ExF4sR9PD26kVx+9hNfD0FTIqRZEyRQ==",
-			"requires": {
-				"hoist-non-react-statics": "^2.1.1"
-			},
-			"dependencies": {
-				"hoist-non-react-statics": {
-					"version": "2.5.5",
-					"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-					"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-				}
-			}
-		},
 		"react-dates": {
 			"version": "17.2.0",
 			"resolved": "https://registry.npmjs.org/react-dates/-/react-dates-17.2.0.tgz",
@@ -23110,9 +23313,9 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"safer-eval": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.2.tgz",
-			"integrity": "sha512-mAkc9NX+ULPw4qX+lkFVuIhXQbjFaX97fWFj6atFXMG11lUX4rXfQY6Q0VFf1wfJfqCHYO7cxtC7cA8fIkWsLQ==",
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.5.tgz",
+			"integrity": "sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==",
 			"dev": true,
 			"requires": {
 				"clones": "^1.2.0"
@@ -24906,9 +25109,9 @@
 					"dev": true
 				},
 				"lodash": {
-					"version": "4.17.11",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+					"version": "4.17.15",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 					"dev": true
 				},
 				"slice-ansi": {

From 18b194a4cb4fa6957a6cdc7ecdf69c5ef7373278 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 13 Aug 2019 12:16:18 +0800
Subject: [PATCH 10/52] Update github action exit codes (#17002)

* Update github action exit codes

* Remove Filter Opened from github actions
---
 .../actions/assign-fixed-issues/entrypoint.sh | 19 +++++++++++++-----
 .../first-time-contributor/entrypoint.sh      | 20 +++++++++++++------
 .github/actions/milestone-it/entrypoint.sh    |  8 ++++----
 ...-prs-opened-by-first-time-contributors.yml |  6 +-----
 ...-fixed-issues-when-pull-request-opened.yml |  4 ----
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/.github/actions/assign-fixed-issues/entrypoint.sh b/.github/actions/assign-fixed-issues/entrypoint.sh
index c8c15d53d88f71..83680fcc308779 100755
--- a/.github/actions/assign-fixed-issues/entrypoint.sh
+++ b/.github/actions/assign-fixed-issues/entrypoint.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 set -e
 
-# 1. Find the issues that this PR 'fixes'.
+# 1. Proceed only when acting on an opened pull request.
+
+action=$(jq -r '.action' $GITHUB_EVENT_PATH)
+
+if [ "$action" != 'closed' ]; then
+	echo "Action '$action' not a close action. Aborting."
+	exit 0;
+fi
+
+# 2. Find the issues that this PR 'fixes'.
 
 issues=$(
 	jq -r '.pull_request.body' $GITHUB_EVENT_PATH | perl -nle 'print $1 while /
@@ -15,18 +24,18 @@ issues=$(
 
 if [ -z "$issues" ]; then
 	echo "Pull request does not 'fix' any issues. Aborting."
-	exit 78
+	exit 0
 fi
 
-# 2. Grab the author of the PR.
+# 3. Grab the author of the PR.
 
 author=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH)
 
-# 3. Loop through each 'fixed' issue.
+# 4. Loop through each 'fixed' issue.
 
 for issue in $issues; do
 
-	# 3a. Add the author as an asignee to the issue. This fails if the author is
+	# 4a. Add the author as an asignee to the issue. This fails if the author is
 	#     already assigned, which is expected and ignored.
 
 	curl \
diff --git a/.github/actions/first-time-contributor/entrypoint.sh b/.github/actions/first-time-contributor/entrypoint.sh
index c775c4f6150981..9360574ebe5097 100755
--- a/.github/actions/first-time-contributor/entrypoint.sh
+++ b/.github/actions/first-time-contributor/entrypoint.sh
@@ -1,16 +1,24 @@
 #!/bin/bash
 set -e
 
-# 1. Get the author and pr number for the pull request.
+# 1. Proceed only when acting on an opened pull request.
+action=$(jq -r '.action' $GITHUB_EVENT_PATH)
+
+if [ "$action" != 'opened' ]; then
+	echo "Action '$action' not a close action. Aborting."
+	exit 0;
+fi
+
+# 2. Get the author and pr number for the pull request.
 author=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH)
 pr_number=$(jq -r '.number' $GITHUB_EVENT_PATH)
 
 if [ "$pr_number" = "null" ] || [ "$author" = "null" ]; then
 	echo "Could not find PR number or author. $pr_number / $author"
-	exit 78
+	exit 0
 fi
 
-# 2. Fetch the author's commit count for the repo to determine if they're a first-time contributor.
+# 3. Fetch the author's commit count for the repo to determine if they're a first-time contributor.
 commit_count=$(
 	curl \
 		--silent \
@@ -19,13 +27,13 @@ commit_count=$(
 		| jq -r '.total_count'
 )
 
-# 3. If the response has a commit count of zero, exit early, the author is not a first time contributor.
+# 4. If the response has a commit count of zero, exit early, the author is not a first time contributor.
 if [ "$commit_count" != "0" ]; then
 	echo "Pull request #$pr_number was not created by a first-time contributor ($author)."
-	exit 78
+	exit 0
 fi
 
-# 4. Assign the 'First Time Contributor' label.
+# 5. Assign the 'First Time Contributor' label.
 curl \
 	--silent \
 	-X POST \
diff --git a/.github/actions/milestone-it/entrypoint.sh b/.github/actions/milestone-it/entrypoint.sh
index 3c65671104e266..8c91df0cb05ff6 100755
--- a/.github/actions/milestone-it/entrypoint.sh
+++ b/.github/actions/milestone-it/entrypoint.sh
@@ -7,21 +7,21 @@ action=$(jq -r '.action' $GITHUB_EVENT_PATH)
 
 if [ "$action" != 'closed' ]; then
 	echo "Action '$action' not a close action. Aborting."
-	exit 78;
+	exit 0;
 fi
 
 merged=$(jq -r '.pull_request.merged' $GITHUB_EVENT_PATH)
 
 if [ "$merged" != 'true' ]; then
 	echo "Pull request closed without merge. Aborting."
-	exit 78;
+	exit 0;
 fi
 
 base=$(jq -r '.pull_request.base.ref' $GITHUB_EVENT_PATH)
 
 if [ "$base" != 'master' ]; then
 	echo 'Milestones apply only to master merge. Aborting.'
-	exit 78;
+	exit 0;
 fi
 
 # 2. Determine if milestone already exists (don't replace one which has already
@@ -39,7 +39,7 @@ current_milestone=$(
 
 if [ "$current_milestone" != 'null' ]; then
 	echo 'Milestone already applied. Aborting.'
-	exit 78;
+	exit 0;
 fi
 
 # 3. Read current version.
diff --git a/.github/workflows/pull_request-add-the-first-time-contributor-label-to-prs-opened-by-first-time-contributors.yml b/.github/workflows/pull_request-add-the-first-time-contributor-label-to-prs-opened-by-first-time-contributors.yml
index d5b8fbbe2e07bd..5c5bf75d0716e6 100644
--- a/.github/workflows/pull_request-add-the-first-time-contributor-label-to-prs-opened-by-first-time-contributors.yml
+++ b/.github/workflows/pull_request-add-the-first-time-contributor-label-to-prs-opened-by-first-time-contributors.yml
@@ -1,15 +1,11 @@
 on: pull_request
-name: Add the First-time Contributor label to PRs opened by first-time contributors
+name: Add the First-time Contributor label
 jobs:
   filterOpened:
     name: Filter opened
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Filter opened
-      uses: actions/bin/filter@0dbb077f64d0ec1068a644d25c71b1db66148a24
-      with:
-        args: action opened
     - name: First Time Contributor
       uses: ./.github/actions/first-time-contributor
       env:
diff --git a/.github/workflows/pull_request-assign-fixed-issues-when-pull-request-opened.yml b/.github/workflows/pull_request-assign-fixed-issues-when-pull-request-opened.yml
index 2b4f0ac9ec4e71..bc39c694424252 100644
--- a/.github/workflows/pull_request-assign-fixed-issues-when-pull-request-opened.yml
+++ b/.github/workflows/pull_request-assign-fixed-issues-when-pull-request-opened.yml
@@ -6,10 +6,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Filter opened
-      uses: actions/bin/filter@0dbb077f64d0ec1068a644d25c71b1db66148a24
-      with:
-        args: action opened
     - name: Assign Fixed Issues
       uses: ./.github/actions/assign-fixed-issues
       env:

From f6acb42e5cfe10b1fd75468578826399ece2a498 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 14:44:50 +1000
Subject: [PATCH 11/52] Fix messed up styles.

---
 packages/block-library/src/gallery/editor.scss | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index fa6bcee764e845..955293c8f8e65f 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -1,6 +1,4 @@
 .wp-block-gallery {
-	display: block;
-
 	// Override the default list style type _only in the editor_
 	// to avoid :not() selector specificity issues.
 	// See https://github.com/WordPress/gutenberg/pull/10358
@@ -12,6 +10,16 @@
 	.is-selected & {
 		margin-bottom: 0;
 	}
+
+	// Targets gallery caption.
+	> .block-editor-rich-text {
+		text-align: center;
+	}
+}
+
+figure.wp-block-gallery {
+	display: block;
+	margin-left: 0;
 }
 
 .blocks-gallery-item {

From 9aa06d3cd92b2a994e8c805d39cce137f572e420 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 15:47:49 +1000
Subject: [PATCH 12/52] Try to fix package-lock issue _again_

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d4cd468015bc9..db4ab1e5b5f252 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7737,7 +7737,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": "",
+									"resolved": false,
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -12590,7 +12590,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true

From eebf33b6e7192b7326dea34df2a2fd27c798b4e5 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 13 Aug 2019 12:14:02 +0100
Subject: [PATCH 13/52] chore: Update: Use mixins in button instead of media
 queries (#17012)

---
 packages/block-library/src/button/editor.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/button/editor.scss b/packages/block-library/src/button/editor.scss
index da2116d2fc492d..3250c9d7dcfe00 100644
--- a/packages/block-library/src/button/editor.scss
+++ b/packages/block-library/src/button/editor.scss
@@ -51,7 +51,7 @@
 		max-width: 290px;
 	}
 
-	@media (min-width: #{ ($break-medium) }) {
+	@include break-medium() {
 		max-width: 260px;
 
 		&-input__suggestions {
@@ -59,7 +59,7 @@
 		}
 
 	}
-	@media (min-width: #{ ($break-large) }) {
+	@include break-large() {
 		max-width: 290px;
 
 		&-input__suggestions {

From bbe692b7e6e60cc17b4460a9ae145891c3978278 Mon Sep 17 00:00:00 2001
From: Matt Chowning <matt.chowning@automattic.com>
Date: Wed, 7 Aug 2019 13:07:33 -0400
Subject: [PATCH 14/52] [RNMobile] Reset toolbar scroll on content change

---
 .../src/components/header/header-toolbar/index.native.js  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/edit-post/src/components/header/header-toolbar/index.native.js b/packages/edit-post/src/components/header/header-toolbar/index.native.js
index 487dcea882dab1..7c33856a629180 100644
--- a/packages/edit-post/src/components/header/header-toolbar/index.native.js
+++ b/packages/edit-post/src/components/header/header-toolbar/index.native.js
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { useRef } from 'react';
 import { ScrollView, View } from 'react-native';
 
 /**
@@ -31,9 +32,16 @@ function HeaderToolbar( {
 	showKeyboardHideButton,
 	clearSelectedBlock,
 } ) {
+	const scrollViewRef = useRef( null );
+	const scrollToStart = () => {
+		scrollViewRef.current.scrollTo( { x: 0 } );
+	};
+
 	return (
 		<View style={ styles.container }>
 			<ScrollView
+				ref={ scrollViewRef }
+				onContentSizeChange={ scrollToStart }
 				horizontal={ true }
 				showsHorizontalScrollIndicator={ false }
 				keyboardShouldPersistTaps="always"

From 4cfbd6446543c18459fb44c0cb4a78d7994a2719 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 13 Aug 2019 18:35:45 +0100
Subject: [PATCH 15/52] Add editor-styles-wrapper class to the widgets screen
 block list (#17023)

---
 .../src/components/widget-area/index.js          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/edit-widgets/src/components/widget-area/index.js b/packages/edit-widgets/src/components/widget-area/index.js
index 517ae9d3212ff0..7a1b897cb8d517 100644
--- a/packages/edit-widgets/src/components/widget-area/index.js
+++ b/packages/edit-widgets/src/components/widget-area/index.js
@@ -86,13 +86,15 @@ function WidgetArea( {
 					<Sidebar.Inspector>
 						<BlockInspector showNoBlockSelectedMessage={ false } />
 					</Sidebar.Inspector>
-					<WritingFlow>
-						<ObserveTyping>
-							<BlockList
-								className="edit-widgets-main-block-list"
-							/>
-						</ObserveTyping>
-					</WritingFlow>
+					<div className="editor-styles-wrapper">
+						<WritingFlow>
+							<ObserveTyping>
+								<BlockList
+									className="edit-widgets-main-block-list"
+								/>
+							</ObserveTyping>
+						</WritingFlow>
+					</div>
 				</BlockEditorProvider>
 			</PanelBody>
 		</Panel>

From 387d85ab1ac03ccce908a8f836bbaa6e0ad61c92 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 13 Aug 2019 21:42:48 +0100
Subject: [PATCH 16/52] Add: Button Block appender to the widgets screen.
 (#16971)

---
 packages/edit-widgets/src/components/widget-area/index.js  | 2 ++
 .../edit-widgets/src/components/widget-area/style.scss     | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/packages/edit-widgets/src/components/widget-area/index.js b/packages/edit-widgets/src/components/widget-area/index.js
index 7a1b897cb8d517..a224ea87f2f833 100644
--- a/packages/edit-widgets/src/components/widget-area/index.js
+++ b/packages/edit-widgets/src/components/widget-area/index.js
@@ -18,6 +18,7 @@ import {
 	WritingFlow,
 	ObserveTyping,
 	BlockEditorKeyboardShortcuts,
+	ButtonBlockerAppender,
 } from '@wordpress/block-editor';
 import { withDispatch, withSelect } from '@wordpress/data';
 
@@ -91,6 +92,7 @@ function WidgetArea( {
 							<ObserveTyping>
 								<BlockList
 									className="edit-widgets-main-block-list"
+									renderAppender={ ButtonBlockerAppender }
 								/>
 							</ObserveTyping>
 						</WritingFlow>
diff --git a/packages/edit-widgets/src/components/widget-area/style.scss b/packages/edit-widgets/src/components/widget-area/style.scss
index 60f2ce9f1b7e7b..392d1ae8ff2128 100644
--- a/packages/edit-widgets/src/components/widget-area/style.scss
+++ b/packages/edit-widgets/src/components/widget-area/style.scss
@@ -17,3 +17,10 @@
 .edit-widgets-main-block-list {
 	padding-top: $block-toolbar-height + 2 * $grid-size;
 }
+
+.edit-widgets-main-block-list > .block-list-appender {
+	padding-top: $panel-padding;
+	// Add a margin equivalent to block side UI so the appender is aligned with the blocks.
+	margin-left: $block-side-ui-width;
+	margin-right: $block-side-ui-width;
+}

From a94e9075f47f067ff431951d1b1022075f2e4fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=28Greg=29=20Zi=C3=B3=C5=82kowski?=
 <grzegorz@gziolo.pl>
Date: Wed, 14 Aug 2019 02:34:15 +0200
Subject: [PATCH 17/52] Scripts: Add section about updating package after new
 releases (#17026)

* Scripts: Add section about updating package after new releases
It also contains some editorial changes to make things clearer

* Use one version of apostrophe
---
 packages/scripts/README.md | 46 +++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/packages/scripts/README.md b/packages/scripts/README.md
index 671ad6cbd2d780..fdbb75f9876cfd 100644
--- a/packages/scripts/README.md
+++ b/packages/scripts/README.md
@@ -1,14 +1,16 @@
 # Scripts
 
-Collection of reusable scripts for WordPress development. For convenience, every tool provided in this package comes with a recommended configuration.
+This is a collection of reusable scripts tailored for WordPress development. For convenience, every tool provided in this package comes with an integrated recommended configuration.
 
-Command-line interfaces help to turn working with an app into a pleasant experience, but it is still not enough to keep it easy to maintain in the long run. Developers are left on their own to keep all configurations and dependent tools up to date. This problem multiplies when they own more than one project which shares the same setup. Fortunately, there is a pattern that can simplify maintainers life – reusable scripts. This idea boils down to moving all the necessary configurations and scripts to one single tool dependency. In most cases, it should be possible to accomplish all tasks using the default settings, but some customization is allowed, too. With all that in place updating all projects should become a very straightforward task.
+When working seamlessly, sophisticated command-line interfaces help to turn work with a project into a more pleasant experience. However, it’s a misleading assumption that developers can easily pick the proper tools in the first place and then ensure that they play along with each other, including all their extensions. Besides, it’s still not enough because developers are left on their own to keep all configurations and dependent tools up to date. This problem multiplies when they support more than one project which shares the same setup.
+
+Fortunately, there is a pattern that can simplify maintainers life – reusable scripts. The idea boils down to moving all the necessary configurations and scripts to one single tool dependency. In most cases, it should be possible to accomplish all tasks using the default settings, but some customization is allowed, too. With all that in place, updating all projects should become a very straightforward task.
 
 _This package is inspired by [react-scripts](https://www.npmjs.com/package/react-scripts) and [kcd-scripts](https://www.npmjs.com/package/kcd-scripts)._
 
 ## Installation
 
-Install the module
+You only need to install one npm module:
 
 ```bash
 npm install @wordpress/scripts --save-dev
@@ -16,7 +18,7 @@ npm install @wordpress/scripts --save-dev
 
 ## Setup
 
-This is a CLI and exposes a binary called `wp-scripts` so you can call it directly. However this module is designed to be configured using the `scripts` section in the `package.json` file of your project.
+This package offers a command-line interface and exposes a binary called `wp-scripts` so you can call it directly with `npx` – an npm package runner. However, this module is designed to be configured using the `scripts` section in the `package.json` file of your project. This comprehensive example demonstrates the most of the capabilities included.
 
 _Example:_
 
@@ -38,11 +40,19 @@ _Example:_
 
 It might also be a good idea to get familiar with the [JavaScript Build Setup tutorial](/docs/designers-developers/developers/tutorials/javascript/js-build-setup.md) for setting up a development environment to use ESNext syntax. It gives a very in-depth explanation of how to use the [build](#build) and [start](#start) scripts.
 
+## Updating to New Release
+
+To update an existing project to a new version of `@wordpress/scripts`, open the [changelog](/packages/scripts/CHANGELOG.md), find the version you’re currently on (check `package.json` in the top-level directory of your project), and apply the migration instructions for the newer versions.
+
+In most cases bumping the `@wordpress/scripts` version in `package.json` and running `npm install` in the root folder of your project should be enough, but it’s good to check the [changelog](/packages/scripts/CHANGELOG.md) for potential breaking changes.
+
+We commit to keeping the breaking changes minimal so you can upgrade `@wordpress/scripts` as seamless as possible.
+
 ## Available Scripts
 
 ### `build`
 
-Transforms your code according the configuration provided so it's ready for production and optimized for the best performance. The entry point for your project's code should be located in `src/index.js`. The output generated will be written to `build/index.js`. This script exits after producing a single build. For incremental builds, better suited for development, see the [start](#start) script.
+Transforms your code according the configuration provided so it’s ready for production and optimized for the best performance. The entry point for your project’s code should be located in `src/index.js`. The output generated will be written to `build/index.js`. This script exits after producing a single build. For incremental builds, better suited for development, see the [start](#start) script.
 
 _Example:_
 
@@ -62,7 +72,7 @@ This is how you execute the script with presented setup:
 
 #### Advanced information
 
-This script uses [webpack](https://webpack.js.org/) behind the scenes. It'll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it'll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
+This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
 
 ### `check-engines`
 
@@ -88,7 +98,7 @@ It uses [check-node-version](https://www.npmjs.com/package/check-node-version) b
 
 ### `check-licenses`
 
-Validates that all dependencies of a project are compatible with the project's own license.
+Validates that all dependencies of a project are compatible with the project’s own license.
 
 _Example:_
 
@@ -105,7 +115,7 @@ _Flags_:
 - `--prod` (or `--production`): When present, validates only `dependencies` and not `devDependencies`
 - `--dev` (or `--development`): When present, validates only `devDependencies` and not `dependencies`
 - `--gpl2`: Validates against [GPLv2 license compatibility](https://www.gnu.org/licenses/license-list.en.html)
-- `--ignore=a,b,c`: A comma-separated set of package names to ignore for validation. This is intended to be used primarily in cases where a dependency's `license` field is malformed. It's assumed that any `ignored` package argument would be manually vetted for compatibility by the project owner.
+- `--ignore=a,b,c`: A comma-separated set of package names to ignore for validation. This is intended to be used primarily in cases where a dependency’s `license` field is malformed. It’s assumed that any `ignored` package argument would be manually vetted for compatibility by the project owner.
 
 ### `lint-js`
 
@@ -124,8 +134,8 @@ _Example:_
 
 This is how you execute the script with presented setup:
 
-* `npm run lint:js` - lints JavaScript files in the entire project's directories.
-* `npm run lint:js:src` - lints JavaScript files in the project's `src` subfolder's directories.
+* `npm run lint:js` - lints JavaScript files in the entire project’s directories.
+* `npm run lint:js:src` - lints JavaScript files in the project’s `src` subfolder’s directories.
 
 When you run commands similar to the `npm run lint:js:src` example above, you can provide a file, a directory, or `glob` syntax or any combination of them. See [more examples](https://eslint.org/docs/user-guide/command-line-interface).
 
@@ -152,8 +162,8 @@ _Example:_
 
 This is how you execute those scripts using the presented setup:
 
-* `npm run lint:pkg-json` - lints `package.json` file in the entire project's directories.
-* `npm run lint:pkg-json:src` - lints `package.json` file in the project's `src` subfolder's directories.
+* `npm run lint:pkg-json` - lints `package.json` file in the entire project’s directories.
+* `npm run lint:pkg-json:src` - lints `package.json` file in the project’s `src` subfolder’s directories.
 
 When you run commands similar to the `npm run lint:pkg-json:src` example above, you can provide one or multiple directories to scan as well. See [more examples](https://github.com/tclindner/npm-package-json-lint/blob/HEAD/README.md#examples).
 
@@ -180,8 +190,8 @@ _Example:_
 
 This is how you execute the script with presented setup:
 
-* `npm run lint:style` - lints CSS and SCSS files in the entire project's directories.
-* `npm run lint:css:src` - lints only CSS files in the project's `src` subfolder's directories.
+* `npm run lint:style` - lints CSS and SCSS files in the entire project’s directories.
+* `npm run lint:css:src` - lints only CSS files in the project’s `src` subfolder’s directories.
 
 When you run commands similar to the `npm run lint:css:src` example above, be sure to include the quotation marks around file globs. This ensures that you can use the powers of [globby](https://github.com/sindresorhus/globby) (like the `**` globstar) regardless of your shell. See [more examples](https://github.com/stylelint/stylelint/blob/HEAD/docs/user-guide/cli.md#examples).
 
@@ -193,7 +203,7 @@ It uses [stylelint](https://github.com/stylelint/stylelint) with the [stylelint-
 
 ### `start`
 
-Transforms your code according the configuration provided so it's ready for development. The script will automatically rebuild if you make changes to the code, and you will see the build errors in the console. The entry point for your project's code should be located in `src/index.js`. The output generated will be written to `build/index.js`. For single builds, better suited for production, see the [build](#build) script.
+Transforms your code according the configuration provided so it’s ready for development. The script will automatically rebuild if you make changes to the code, and you will see the build errors in the console. The entry point for your project’s code should be located in `src/index.js`. The output generated will be written to `build/index.js`. For single builds, better suited for production, see the [build](#build) script.
 
 _Example:_
 
@@ -213,7 +223,7 @@ This is how you execute the script with presented setup:
 
 #### Advanced information
 
-This script uses [webpack](https://webpack.js.org/) behind the scenes. It'll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it'll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
+This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
 
 ### `test-e2e`
 
@@ -281,7 +291,7 @@ It uses [Jest](https://jestjs.io/) behind the scenes and you are able to use all
 
 ## Advanced Usage
 
-In general, this package should be used with the set of recommended config files. While it is possible to override every single config file provided, if you have to do it, it means that your use case is more complex than anticipated. If that happens, it would be better to avoid using the whole abstraction layer and set up your project with full control over tooling used.
+In general, this package should be used with the set of recommended config files. While it’s possible to override every single config file provided, if you have to do it, it means that your use case is far more complicated than anticipated. If that happens, it would be better to avoid using the whole abstraction layer and set up your project with full control over tooling used.
 
 ### Webpack config
 
@@ -328,5 +338,5 @@ module.exports = {
   }
 };
 ```
-If you follow this approach, please, be aware that future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package's CHANGELOG](https://github.com/WordPress/gutenberg/blob/master/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
+If you follow this approach, please, be aware that future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package’s CHANGELOG](https://github.com/WordPress/gutenberg/blob/master/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
 <br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>

From 949c088bdb7f03728618f069b8103e999e5d8f98 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Wed, 14 Aug 2019 18:16:50 +1000
Subject: [PATCH 18/52] Addressed design feedback.

---
 packages/block-library/src/gallery/editor.scss | 11 +++--------
 packages/block-library/src/gallery/style.scss  | 11 ++++-------
 packages/block-library/src/gallery/theme.scss  |  4 ++++
 packages/block-library/src/theme.scss          |  1 +
 4 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 packages/block-library/src/gallery/theme.scss

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index 955293c8f8e65f..8595836c9ebe2f 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -10,16 +10,11 @@
 	.is-selected & {
 		margin-bottom: 0;
 	}
-
-	// Targets gallery caption.
-	> .block-editor-rich-text {
-		text-align: center;
-	}
 }
 
-figure.wp-block-gallery {
-	display: block;
-	margin-left: 0;
+// need to override default editor ul styles
+.blocks-gallery-grid.blocks-gallery-grid {
+	margin-bottom: 0;
 }
 
 .blocks-gallery-item {
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index 9727baa5c9812d..dcef0c46593720 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -149,11 +149,8 @@
 			justify-content: center;
 		}
 	}
-
-	+ figcaption {
-		margin-top: -$grid-size;
-		font-size: $editor-font-size;
-		font-family: $default-font;
-		color: $dark-gray-500;
-	}
+}
+figure.wp-block-gallery {
+	display: block;
+	margin: 0;
 }
diff --git a/packages/block-library/src/gallery/theme.scss b/packages/block-library/src/gallery/theme.scss
new file mode 100644
index 00000000000000..289194d5f4cecf
--- /dev/null
+++ b/packages/block-library/src/gallery/theme.scss
@@ -0,0 +1,4 @@
+.blocks-gallery-grid + figcaption,
+.wp-block-gallery > .block-editor-rich-text {
+	@include caption-style-theme();
+}
diff --git a/packages/block-library/src/theme.scss b/packages/block-library/src/theme.scss
index 691a7c53e9b4b1..57eaa3a710d07c 100644
--- a/packages/block-library/src/theme.scss
+++ b/packages/block-library/src/theme.scss
@@ -1,6 +1,7 @@
 @import "./audio/theme.scss";
 @import "./code/theme.scss";
 @import "./embed/theme.scss";
+@import "./gallery/theme.scss";
 @import "./image/theme.scss";
 @import "./preformatted/theme.scss";
 @import "./pullquote/theme.scss";

From 940184cb6a88dddfe0d22580255797470209c227 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Wed, 14 Aug 2019 09:24:00 +0100
Subject: [PATCH 19/52] Fix: Duplicate button appears even if the block is not
 allowed (#17007)

---
 .../src/components/block-actions/index.js             | 11 ++++++++---
 .../src/components/block-settings-menu/index.js       |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-actions/index.js b/packages/block-editor/src/components/block-actions/index.js
index 3e12269b074e33..82f12e6e256048 100644
--- a/packages/block-editor/src/components/block-actions/index.js
+++ b/packages/block-editor/src/components/block-actions/index.js
@@ -46,10 +46,15 @@ export default compose( [
 		const { getDefaultBlockName } = select( 'core/blocks' );
 
 		const blocks = getBlocksByClientId( props.clientIds );
+		const rootClientId = getBlockRootClientId( props.clientIds[ 0 ] );
 		const canDuplicate = every( blocks, ( block ) => {
-			return !! block && hasBlockSupport( block.name, 'multiple', true );
+			return (
+				!! block &&
+				hasBlockSupport( block.name, 'multiple', true ) &&
+				canInsertBlockType( block.name, rootClientId )
+			);
 		} );
-		const rootClientId = getBlockRootClientId( props.clientIds[ 0 ] );
+
 		const canInsertDefaultBlock = canInsertBlockType(
 			getDefaultBlockName(),
 			rootClientId
@@ -83,7 +88,7 @@ export default compose( [
 
 		return {
 			onDuplicate() {
-				if ( isLocked || ! canDuplicate ) {
+				if ( ! canDuplicate ) {
 					return;
 				}
 
diff --git a/packages/block-editor/src/components/block-settings-menu/index.js b/packages/block-editor/src/components/block-settings-menu/index.js
index a0133182548025..5a7890c9002b42 100644
--- a/packages/block-editor/src/components/block-settings-menu/index.js
+++ b/packages/block-editor/src/components/block-settings-menu/index.js
@@ -69,7 +69,7 @@ export function BlockSettingsMenu( { clientIds } ) {
 											clientId={ firstBlockClientId }
 										/>
 									) }
-									{ ! isLocked && canDuplicate && (
+									{ canDuplicate && (
 										<MenuItem
 											className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 											onClick={ flow( onClose, onDuplicate ) }

From 9a0876c608eb3eaaeab51189ee1d34f665cf336d Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Wed, 14 Aug 2019 18:44:17 +1000
Subject: [PATCH 20/52] Change caption name and remove deprecation.

---
 packages/block-library/src/gallery/block.json |  2 +-
 .../block-library/src/gallery/deprecated.js   | 99 -------------------
 packages/block-library/src/gallery/edit.js    |  2 +-
 packages/block-library/src/gallery/save.js    |  2 +-
 .../blocks/core__gallery-with-caption.json    |  2 +-
 .../fixtures/blocks/core__gallery.json        |  2 +-
 .../blocks/core__gallery__columns.json        |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  2 +-
 .../blocks/core__gallery__deprecated-3.html   | 14 ---
 .../blocks/core__gallery__deprecated-3.json   | 30 ------
 .../core__gallery__deprecated-3.parsed.json   | 25 -----
 ...ore__gallery__deprecated-3.serialized.html |  3 -
 12 files changed, 7 insertions(+), 178 deletions(-)
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index e677e7eb365628..da3612b7d2fb0a 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"galleryCaption": {
+		"caption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 74af7e3f50b6e7..2b77e33e0b36e4 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,105 +15,6 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
-	{
-		attributes: {
-			images: {
-				type: 'array',
-				default: [],
-				source: 'query',
-				selector: 'ul.wp-block-gallery .blocks-gallery-item',
-				query: {
-					url: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'src',
-					},
-					fullUrl: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-full-url',
-					},
-					alt: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'alt',
-						default: '',
-					},
-					id: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-id',
-					},
-					link: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-link',
-					},
-					caption: {
-						type: 'array',
-						source: 'children',
-						selector: 'figcaption',
-					},
-				},
-			},
-			ids: {
-				type: 'array',
-				default: [],
-			},
-			columns: {
-				type: 'number',
-			},
-			imageCrop: {
-				type: 'boolean',
-				default: true,
-			},
-			linkTo: {
-				type: 'string',
-				default: 'none',
-			},
-		},
-		save( { attributes } ) {
-			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
-			return (
-				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
-					{ images.map( ( image ) => {
-						let href;
-
-						switch ( linkTo ) {
-							case 'media':
-								href = image.fullUrl || image.url;
-								break;
-							case 'attachment':
-								href = image.link;
-								break;
-						}
-
-						const img = (
-							<img
-								src={ image.url }
-								alt={ image.alt }
-								data-id={ image.id }
-								data-full-url={ image.fullUrl }
-								data-link={ image.link }
-								className={ image.id ? `wp-image-${ image.id }` : null }
-							/>
-						);
-
-						return (
-							<li key={ image.id || image.url } className="blocks-gallery-item">
-								<figure>
-									{ href ? <a href={ href }>{ img }</a> : img }
-									{ image.caption && image.caption.length > 0 && (
-										<RichText.Content tagName="figcaption" value={ image.caption } />
-									) }
-								</figure>
-							</li>
-						);
-					} ) }
-				</ul>
-			);
-		},
-	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 8a6c05c095c70b..2a90bd45e7d2a2 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 86364c7625fc6b..ac8c346f328716 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 72617e1d629527..234396e37da3f1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "Gallery caption.",
+            "caption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 83a8363d2f0cb5..06c7288273a836 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 9ab909dbb44e8c..4a7fa792469800 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
deleted file mode 100644
index b91a575be9ca53..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped">
-	<li class="blocks-gallery-item">
-		<figure>
-			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
-		</figure>
-	</li>
-	<li class="blocks-gallery-item">
-		<figure>
-			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
-		</figure>
-	</li>
-</ul>
-<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
deleted file mode 100644
index fb2db61c343094..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "clientId": "_clientId_0",
-        "name": "core/gallery",
-        "isValid": true,
-        "attributes": {
-            "images": [
-                {
-                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
-                    "alt": "title",
-                    "caption": ""
-                },
-                {
-                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
-                    "alt": "title",
-                    "caption": ""
-                }
-            ],
-            "ids": [
-                null,
-                null
-            ],
-            "galleryCaption": "",
-            "imageCrop": true,
-            "linkTo": "none"
-        },
-        "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
-    }
-]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
deleted file mode 100644
index 99c1ac20ed9562..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-    {
-        "blockName": "core/gallery",
-        "attrs": {
-            "ids": [
-                null,
-                null
-            ]
-        },
-        "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
-        "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
-        ]
-    },
-    {
-        "blockName": null,
-        "attrs": {},
-        "innerBlocks": [],
-        "innerHTML": "\n",
-        "innerContent": [
-            "\n"
-        ]
-    }
-]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
deleted file mode 100644
index 813f97c645287e..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
-<!-- /wp:gallery -->

From 9c4ee6f7d291675a9be913dde2be750e6d4fa694 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 14 Aug 2019 10:41:41 +0100
Subject: [PATCH 21/52] Fix the double scrollbar appearing in full screen mode
 (#17031)

---
 packages/edit-post/src/components/layout/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/edit-post/src/components/layout/style.scss b/packages/edit-post/src/components/layout/style.scss
index 66307b74c0101c..f275e9f14d0962 100644
--- a/packages/edit-post/src/components/layout/style.scss
+++ b/packages/edit-post/src/components/layout/style.scss
@@ -5,6 +5,7 @@
 
 .edit-post-layout {
 	position: relative;
+	box-sizing: border-box;
 
 	// Beyond the mobile breakpoint, the editor bar is fixed, so make room for it eabove the layout content.
 	@include break-small {

From be7db4f6c98857bae01180b07db0e8a2ec18f6d1 Mon Sep 17 00:00:00 2001
From: Enrique Piqueras <epiqueras@users.noreply.github.com>
Date: Wed, 14 Aug 2019 02:42:23 -0700
Subject: [PATCH 22/52] Core Data: Return updated record in `saveEntityRecord`.
 (#17030)

---
 packages/core-data/src/actions.js      |  9 ++++++---
 packages/core-data/src/test/actions.js | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
index 43861be226ca5d..80d9fa1915b19a 100644
--- a/packages/core-data/src/actions.js
+++ b/packages/core-data/src/actions.js
@@ -231,6 +231,7 @@ export function* saveEntityRecord(
 	const recordId = record[ entityIdKey ];
 
 	yield { type: 'SAVE_ENTITY_RECORD_START', kind, name, recordId, isAutosave };
+	let updatedRecord;
 	let error;
 	try {
 		const path = `${ entity.baseURL }${ recordId ? '/' + recordId : '' }`;
@@ -260,14 +261,14 @@ export function* saveEntityRecord(
 				}
 				return acc;
 			}, {} );
-			const autosave = yield apiFetch( {
+			updatedRecord = yield apiFetch( {
 				path: `${ path }/autosaves`,
 				method: 'POST',
 				data,
 			} );
-			yield receiveAutosaves( persistedRecord.id, autosave );
+			yield receiveAutosaves( persistedRecord.id, updatedRecord );
 		} else {
-			const updatedRecord = yield apiFetch( {
+			updatedRecord = yield apiFetch( {
 				path,
 				method: recordId ? 'PUT' : 'POST',
 				data: record,
@@ -285,6 +286,8 @@ export function* saveEntityRecord(
 		error,
 		isAutosave,
 	};
+
+	return updatedRecord;
 }
 
 /**
diff --git a/packages/core-data/src/test/actions.js b/packages/core-data/src/test/actions.js
index 16ac5776be1976..7e62338545520d 100644
--- a/packages/core-data/src/test/actions.js
+++ b/packages/core-data/src/test/actions.js
@@ -21,9 +21,19 @@ describe( 'saveEntityRecord', () => {
 			data: post,
 		} );
 		// Provide response and trigger action
-		const { value: received } = fulfillment.next( { ...post, id: 10 } );
-		expect( received ).toEqual( receiveEntityRecords( 'postType', 'post', { ...post, id: 10 }, undefined, true ) );
+		const updatedRecord = { ...post, id: 10 };
+		const { value: received } = fulfillment.next( updatedRecord );
+		expect( received ).toEqual(
+			receiveEntityRecords(
+				'postType',
+				'post',
+				updatedRecord,
+				undefined,
+				true
+			)
+		);
 		expect( fulfillment.next().value.type ).toBe( 'SAVE_ENTITY_RECORD_FINISH' );
+		expect( fulfillment.next().value ).toBe( updatedRecord );
 	} );
 
 	it( 'triggers a PUT request for an existing record', async () => {

From 8d62c26e4c5ec554a7a41c78650ff7480a069749 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 14 Aug 2019 12:57:57 +0100
Subject: [PATCH 23/52] Fix performance tests with the introduction of the
 navigation mode (#17034)

---
 packages/e2e-tests/specs/performance.test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/e2e-tests/specs/performance.test.js b/packages/e2e-tests/specs/performance.test.js
index c63ffb11560879..174bf2c6ab1301 100644
--- a/packages/e2e-tests/specs/performance.test.js
+++ b/packages/e2e-tests/specs/performance.test.js
@@ -11,6 +11,7 @@ import {
 	createNewPost,
 	saveDraft,
 	insertBlock,
+	disableNavigationMode,
 } from '@wordpress/e2e-test-utils';
 
 function readFile( filePath ) {
@@ -53,6 +54,7 @@ describe( 'Performance', () => {
 		while ( i-- ) {
 			startTime = new Date();
 			await page.reload( { waitUntil: [ 'domcontentloaded', 'load' ] } );
+			await disableNavigationMode();
 		}
 
 		await insertBlock( 'Paragraph' );

From b99ae5600bd8855270f9b652864d68e97e0c0e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <wp@iseulde.com>
Date: Wed, 14 Aug 2019 14:51:44 +0200
Subject: [PATCH 24/52] RichText: ignore selection changes during composition
 (#16960)

---
 packages/rich-text/src/component/index.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
index 1689efc01056d2..a6af287ec5a5d3 100644
--- a/packages/rich-text/src/component/index.js
+++ b/packages/rich-text/src/component/index.js
@@ -391,9 +391,11 @@ class RichText extends Component {
 	}
 
 	/**
-	 * Handles the `selectionchange` event: sync the selection to local state.
+	 * Syncs the selection to local state. A callback for the `selectionchange`
+	 * native events, `keyup`, `mouseup` and `touchend` synthetic events, and
+	 * animation frames after the `focus` event.
 	 *
-	 * @param {Event} event `selectionchange` event.
+	 * @param {Event|SyntheticEvent|DOMHighResTimeStamp} event
 	 */
 	onSelectionChange( event ) {
 		if (
@@ -403,6 +405,15 @@ class RichText extends Component {
 			return;
 		}
 
+		// In case of a keyboard event, ignore selection changes during
+		// composition.
+		if (
+			event.nativeEvent &&
+			event.nativeEvent.isComposing
+		) {
+			return;
+		}
+
 		const { start, end } = this.createRecord();
 		const value = this.getRecord();
 

From 989c224ce81008d3448932cfb03aa0a71922e6be Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 14 Aug 2019 13:59:02 +0100
Subject: [PATCH 25/52] Bump plugin version to 6.3.0

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

diff --git a/gutenberg.php b/gutenberg.php
index 136d5230c59687..e9062de0f73069 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -3,7 +3,7 @@
  * Plugin Name: Gutenberg
  * Plugin URI: https://github.com/WordPress/gutenberg
  * Description: Printing since 1440. This is the development plugin for the new block editor in core.
- * Version: 6.3.0-rc.1
+ * Version: 6.3.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index db4ab1e5b5f252..96b0a0d3d31555 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "6.3.0-rc.1",
+	"version": "6.3.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 46ebf924d604a2..aa4805e6597d89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "6.3.0-rc.1",
+	"version": "6.3.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 24caaa3d324bf71fc498abcf559863454433a0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <wp@iseulde.com>
Date: Wed, 14 Aug 2019 21:22:41 +0200
Subject: [PATCH 26/52] =?UTF-8?q?RichText=20=F0=9F=A7=B9=20(clean=20up,=20?=
 =?UTF-8?q?move=20Autocomplete,=20remove=20DOM=20dependency)=20(#16905)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* RichText 🧹

* Clean up

* Clean up

* Simplify

* Move Autocomplete

* children => Editable wrapper component

* Bind Editable wrapper to class

* Minimise diff
---
 package-lock.json                             |   1 -
 .../src/components/rich-text/index.js         |  95 ++--
 packages/rich-text/package.json               |   1 -
 packages/rich-text/src/component/index.js     | 425 +++++++++---------
 4 files changed, 265 insertions(+), 257 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96b0a0d3d31555..2febb418532ae1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5167,7 +5167,6 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/escape-html": "file:packages/escape-html",
 				"@wordpress/hooks": "file:packages/hooks",
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index 1cf2c6225afaa0..344aa0d96edc1b 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -9,7 +9,7 @@ import { omit } from 'lodash';
  */
 import { RawHTML, Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
-import { pasteHandler, children, getBlockTransforms, findTransform } from '@wordpress/blocks';
+import { pasteHandler, children as childrenSource, getBlockTransforms, findTransform } from '@wordpress/blocks';
 import { withInstanceId, compose } from '@wordpress/compose';
 import {
 	RichText,
@@ -42,6 +42,21 @@ import { RemoveBrowserShortcuts } from './remove-browser-shortcuts';
 const wrapperClasses = 'editor-rich-text block-editor-rich-text';
 const classes = 'editor-rich-text__editable block-editor-rich-text__editable';
 
+/**
+ * Get the multiline tag based on the multiline prop.
+ *
+ * @param {?(string|boolean)} multiline The multiline prop.
+ *
+ * @return {?string} The multiline tag.
+ */
+function getMultilineTag( multiline ) {
+	if ( multiline !== true && multiline !== 'p' && multiline !== 'li' ) {
+		return;
+	}
+
+	return multiline === true ? 'p' : multiline;
+}
+
 class RichTextWrapper extends Component {
 	constructor() {
 		super( ...arguments );
@@ -102,7 +117,13 @@ class RichTextWrapper extends Component {
 	}
 
 	onPaste( { value, onChange, html, plainText, image } ) {
-		const { onReplace, onSplit, tagName, canUserUseUnfilteredHTML } = this.props;
+		const {
+			onReplace,
+			onSplit,
+			tagName,
+			canUserUseUnfilteredHTML,
+			multiline,
+		} = this.props;
 
 		if ( image && ! html ) {
 			const file = image.getAsFile ? image.getAsFile() : image;
@@ -149,7 +170,7 @@ class RichTextWrapper extends Component {
 
 			// If the content should be multiline, we should process text
 			// separated by a line break as separate lines.
-			if ( this.multilineTag ) {
+			if ( multiline ) {
 				valueToInsert = replace( valueToInsert, /\n+/g, LINE_SEPARATOR );
 			}
 
@@ -187,6 +208,7 @@ class RichTextWrapper extends Component {
 		const blocks = [];
 		const [ before, after ] = split( record );
 		const hasPastedBlocks = pastedBlocks.length > 0;
+		const multilineTag = getMultilineTag( multiline );
 
 		// Create a block with the content before the caret if there's no pasted
 		// blocks, or if there are pasted blocks and the value is not empty.
@@ -195,7 +217,7 @@ class RichTextWrapper extends Component {
 		if ( ! hasPastedBlocks || ! isEmpty( before ) ) {
 			blocks.push( onSplit( toHTMLString( {
 				value: before,
-				multilineTag: multiline,
+				multilineTag,
 			} ) ) );
 		}
 
@@ -212,7 +234,7 @@ class RichTextWrapper extends Component {
 		if ( hasPastedBlocks || ! onSplitMiddle || ! isEmpty( after ) ) {
 			blocks.push( onSplit( toHTMLString( {
 				value: after,
-				multilineTag: multiline,
+				multilineTag,
 			} ) ) );
 		}
 
@@ -313,6 +335,7 @@ class RichTextWrapper extends Component {
 			// From experimental filter. To do: pick props instead.
 			...experimentalProps
 		} = this.props;
+		const multilineTag = getMultilineTag( multiline );
 
 		const adjustedAllowedFormats = this.getAllowedFormats();
 		const hasFormats = ! adjustedAllowedFormats || adjustedAllowedFormats.length > 0;
@@ -321,13 +344,13 @@ class RichTextWrapper extends Component {
 
 		// Handle deprecated format.
 		if ( Array.isArray( originalValue ) ) {
-			adjustedValue = children.toHTML( originalValue );
-			adjustedOnChange = ( newValue ) => originalOnChange( children.fromDOM(
+			adjustedValue = childrenSource.toHTML( originalValue );
+			adjustedOnChange = ( newValue ) => originalOnChange( childrenSource.fromDOM(
 				__unstableCreateElement( document, newValue ).childNodes
 			) );
 		}
 
-		return (
+		const content = (
 			<RichText
 				{ ...experimentalProps }
 				value={ adjustedValue }
@@ -336,7 +359,6 @@ class RichTextWrapper extends Component {
 				selectionEnd={ selectionEnd }
 				onSelectionChange={ onSelectionChange }
 				tagName={ tagName }
-				wrapperClassName={ classnames( wrapperClasses, wrapperClassName ) }
 				className={ classnames( classes, className, { 'is-selected': originalIsSelected } ) }
 				placeholder={ placeholder }
 				allowedFormats={ adjustedAllowedFormats }
@@ -346,18 +368,15 @@ class RichTextWrapper extends Component {
 				onPaste={ this.onPaste }
 				__unstableIsSelected={ originalIsSelected }
 				__unstableInputRule={ this.inputRule }
-				__unstableAutocomplete={ Autocomplete }
-				__unstableAutocompleters={ autocompleters }
-				__unstableOnReplace={ onReplace }
-				__unstableMultiline={ multiline }
+				__unstableMultilineTag={ multilineTag }
 				__unstableIsCaretWithinFormattedText={ isCaretWithinFormattedText }
 				__unstableOnEnterFormattedText={ onEnterFormattedText }
 				__unstableOnExitFormattedText={ onExitFormattedText }
 				__unstableOnCreateUndoLevel={ onCreateUndoLevel }
 			>
-				{ ( { isSelected, value, onChange } ) =>
+				{ ( { isSelected, value, onChange, Editable } ) =>
 					<>
-						{ isSelected && multiline === 'li' && (
+						{ isSelected && multilineTag === 'li' && (
 							<ListEdit
 								onTagNameChange={ onTagNameChange }
 								tagName={ tagName }
@@ -378,10 +397,30 @@ class RichTextWrapper extends Component {
 							</IsolatedEventContainer>
 						) }
 						{ isSelected && <RemoveBrowserShortcuts /> }
+						<Autocomplete
+							onReplace={ onReplace }
+							completers={ autocompleters }
+							record={ value }
+							onChange={ onChange }
+						>
+							{ ( { listBoxId, activeId } ) =>
+								<Editable
+									aria-autocomplete={ listBoxId ? 'list' : undefined }
+									aria-owns={ listBoxId }
+									aria-activedescendant={ activeId }
+								/>
+							}
+						</Autocomplete>
 					</>
 				}
 			</RichText>
 		);
+
+		return (
+			<div className={ classnames( wrapperClasses, wrapperClassName ) }>
+				{ content }
+			</div>
+		);
 	}
 }
 
@@ -444,23 +483,18 @@ const RichTextContainer = compose( [
 ] )( RichTextWrapper );
 
 RichTextContainer.Content = ( { value, tagName: Tag, multiline, ...props } ) => {
-	let html = value;
-	let MultilineTag;
-
-	if ( multiline === true || multiline === 'p' || multiline === 'li' ) {
-		MultilineTag = multiline === true ? 'p' : multiline;
-	}
-
 	// Handle deprecated `children` and `node` sources.
 	if ( Array.isArray( value ) ) {
-		html = children.toHTML( value );
+		value = childrenSource.toHTML( value );
 	}
 
-	if ( ! html && MultilineTag ) {
-		html = `<${ MultilineTag }></${ MultilineTag }>`;
+	const MultilineTag = getMultilineTag( multiline );
+
+	if ( ! value && MultilineTag ) {
+		value = `<${ MultilineTag }></${ MultilineTag }>`;
 	}
 
-	const content = <RawHTML>{ html }</RawHTML>;
+	const content = <RawHTML>{ value }</RawHTML>;
 
 	if ( Tag ) {
 		return <Tag { ...omit( props, [ 'format' ] ) }>{ content }</Tag>;
@@ -469,13 +503,8 @@ RichTextContainer.Content = ( { value, tagName: Tag, multiline, ...props } ) =>
 	return content;
 };
 
-RichTextContainer.isEmpty = ( value = '' ) => {
-	// Handle deprecated `children` and `node` sources.
-	if ( Array.isArray( value ) ) {
-		return ! value || value.length === 0;
-	}
-
-	return value.length === 0;
+RichTextContainer.isEmpty = ( value ) => {
+	return ! value || value.length === 0;
 };
 
 RichTextContainer.Content.defaultProps = {
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index e0d763ba266d8c..c0fea5f7ccb901 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -24,7 +24,6 @@
 		"@babel/runtime": "^7.4.4",
 		"@wordpress/compose": "file:../compose",
 		"@wordpress/data": "file:../data",
-		"@wordpress/dom": "file:../dom",
 		"@wordpress/element": "file:../element",
 		"@wordpress/escape-html": "file:../escape-html",
 		"@wordpress/hooks": "file:../hooks",
diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
index a6af287ec5a5d3..f75aceb79cc598 100644
--- a/packages/rich-text/src/component/index.js
+++ b/packages/rich-text/src/component/index.js
@@ -12,7 +12,6 @@ import {
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { isHorizontalEdge } from '@wordpress/dom';
 import { BACKSPACE, DELETE, ENTER, LEFT, RIGHT, SPACE } from '@wordpress/keycodes';
 import { withSelect } from '@wordpress/data';
 import { withSafeTimeout, compose } from '@wordpress/compose';
@@ -24,7 +23,6 @@ import isShallowEqual from '@wordpress/is-shallow-equal';
 import FormatEdit from './format-edit';
 import Editable from './editable';
 import { pickAriaProps } from './aria';
-import { isEmpty } from '../is-empty';
 import { create } from '../create';
 import { apply, toDom } from '../to-dom';
 import { toHTMLString } from '../to-html-string';
@@ -85,42 +83,40 @@ function createPrepareEditableTree( props, prefix ) {
 class RichText extends Component {
 	constructor( {
 		value,
-		__unstableMultiline: multiline,
 		selectionStart,
 		selectionEnd,
 	} ) {
 		super( ...arguments );
 
-		if ( multiline === true || multiline === 'p' || multiline === 'li' ) {
-			this.multilineTag = multiline === true ? 'p' : multiline;
-		}
-
-		if ( this.multilineTag === 'li' ) {
-			this.multilineWrapperTags = [ 'ul', 'ol' ];
-		}
-
 		this.onFocus = this.onFocus.bind( this );
 		this.onBlur = this.onBlur.bind( this );
 		this.onChange = this.onChange.bind( this );
-		this.onDeleteKeyDown = this.onDeleteKeyDown.bind( this );
-		this.onKeyDown = this.onKeyDown.bind( this );
+		this.handleDelete = this.handleDelete.bind( this );
+		this.handleEnter = this.handleEnter.bind( this );
+		this.handleSpace = this.handleSpace.bind( this );
+		this.handleHorizontalNavigation = this.handleHorizontalNavigation.bind( this );
 		this.onPaste = this.onPaste.bind( this );
 		this.onCreateUndoLevel = this.onCreateUndoLevel.bind( this );
 		this.onInput = this.onInput.bind( this );
 		this.onCompositionEnd = this.onCompositionEnd.bind( this );
 		this.onSelectionChange = this.onSelectionChange.bind( this );
-		this.getRecord = this.getRecord.bind( this );
 		this.createRecord = this.createRecord.bind( this );
 		this.applyRecord = this.applyRecord.bind( this );
 		this.valueToFormat = this.valueToFormat.bind( this );
 		this.setRef = this.setRef.bind( this );
 		this.valueToEditableHTML = this.valueToEditableHTML.bind( this );
-		this.handleHorizontalNavigation = this.handleHorizontalNavigation.bind( this );
 		this.onPointerDown = this.onPointerDown.bind( this );
 		this.formatToValue = this.formatToValue.bind( this );
+		this.Editable = this.Editable.bind( this );
 
-		this.state = {};
+		this.onKeyDown = ( event ) => {
+			this.handleDelete( event );
+			this.handleEnter( event );
+			this.handleSpace( event );
+			this.handleHorizontalNavigation( event );
+		};
 
+		this.state = {};
 		this.lastHistoryValue = value;
 
 		// Internal values are updated synchronously, unlike props and state.
@@ -152,34 +148,28 @@ class RichText extends Component {
 		}
 	}
 
-	/**
-	 * Get the current record (value and selection) from props and state.
-	 *
-	 * @return {Object} The current record (value and selection).
-	 */
-	getRecord() {
-		return this.record;
-	}
-
 	createRecord() {
+		const { __unstableMultilineTag: multilineTag } = this.props;
 		const selection = getSelection();
 		const range = selection.rangeCount > 0 ? selection.getRangeAt( 0 ) : null;
 
 		return create( {
 			element: this.editableRef,
 			range,
-			multilineTag: this.multilineTag,
-			multilineWrapperTags: this.multilineWrapperTags,
+			multilineTag,
+			multilineWrapperTags: multilineTag === 'li' ? [ 'ul', 'ol' ] : undefined,
 			__unstableIsEditableTree: true,
 		} );
 	}
 
 	applyRecord( record, { domOnly } = {} ) {
+		const { __unstableMultilineTag: multilineTag } = this.props;
+
 		apply( {
 			value: record,
 			current: this.editableRef,
-			multilineTag: this.multilineTag,
-			multilineWrapperTags: this.multilineWrapperTags,
+			multilineTag,
+			multilineWrapperTags: multilineTag === 'li' ? [ 'ul', 'ol' ] : undefined,
 			prepareEditableTree: createPrepareEditableTree( this.props, 'format_prepare_functions' ),
 			__unstableDomOnly: domOnly,
 			placeholder: this.props.placeholder,
@@ -229,7 +219,7 @@ class RichText extends Component {
 		window.console.log( 'Received HTML:\n\n', html );
 		window.console.log( 'Received plain text:\n\n', plainText );
 
-		const record = this.getRecord();
+		const record = this.record;
 		const transformed = formatTypes.reduce( ( accumlator, { __unstablePasteRule } ) => {
 			// Only allow one transform.
 			if ( __unstablePasteRule && accumlator === record ) {
@@ -340,7 +330,7 @@ class RichText extends Component {
 				inputType.indexOf( 'format' ) === 0 ||
 				INSERTION_INPUT_TYPES_TO_IGNORE.has( inputType )
 			) {
-				this.applyRecord( this.getRecord() );
+				this.applyRecord( this.record );
 				return;
 			}
 		}
@@ -415,43 +405,45 @@ class RichText extends Component {
 		}
 
 		const { start, end } = this.createRecord();
-		const value = this.getRecord();
-
-		if ( start !== value.start || end !== value.end ) {
-			const {
-				__unstableIsCaretWithinFormattedText: isCaretWithinFormattedText,
-				__unstableOnEnterFormattedText: onEnterFormattedText,
-				__unstableOnExitFormattedText: onExitFormattedText,
-			} = this.props;
-			const newValue = {
-				...value,
-				start,
-				end,
-				// Allow `getActiveFormats` to get new `activeFormats`.
-				activeFormats: undefined,
-			};
+		const value = this.record;
 
-			const activeFormats = getActiveFormats( newValue );
+		if ( start === value.start && end === value.end ) {
+			return;
+		}
 
-			// Update the value with the new active formats.
-			newValue.activeFormats = activeFormats;
+		const {
+			__unstableIsCaretWithinFormattedText: isCaretWithinFormattedText,
+			__unstableOnEnterFormattedText: onEnterFormattedText,
+			__unstableOnExitFormattedText: onExitFormattedText,
+		} = this.props;
+		const newValue = {
+			...value,
+			start,
+			end,
+			// Allow `getActiveFormats` to get new `activeFormats`.
+			activeFormats: undefined,
+		};
 
-			if ( ! isCaretWithinFormattedText && activeFormats.length ) {
-				onEnterFormattedText();
-			} else if ( isCaretWithinFormattedText && ! activeFormats.length ) {
-				onExitFormattedText();
-			}
+		const activeFormats = getActiveFormats( newValue );
 
-			// It is important that the internal value is updated first,
-			// otherwise the value will be wrong on render!
-			this.record = newValue;
-			this.applyRecord( newValue, { domOnly: true } );
-			this.props.onSelectionChange( start, end );
-			this.setState( { activeFormats } );
+		// Update the value with the new active formats.
+		newValue.activeFormats = activeFormats;
 
-			if ( activeFormats.length > 0 ) {
-				this.recalculateBoundaryStyle();
-			}
+		if ( ! isCaretWithinFormattedText && activeFormats.length ) {
+			onEnterFormattedText();
+		} else if ( isCaretWithinFormattedText && ! activeFormats.length ) {
+			onExitFormattedText();
+		}
+
+		// It is important that the internal value is updated first,
+		// otherwise the value will be wrong on render!
+		this.record = newValue;
+		this.applyRecord( newValue, { domOnly: true } );
+		this.props.onSelectionChange( start, end );
+		this.setState( { activeFormats } );
+
+		if ( activeFormats.length > 0 ) {
+			this.recalculateBoundaryStyle();
 		}
 	}
 
@@ -516,112 +508,109 @@ class RichText extends Component {
 	}
 
 	/**
-	 * Handles a delete keyDown event to handle merge or removal for collapsed
-	 * selection where caret is at directional edge: forward for a delete key,
-	 * reverse for a backspace key.
-	 *
-	 * @see https://en.wikipedia.org/wiki/Caret_navigation
+	 * Handles delete on keydown:
+	 * - outdent list items,
+	 * - delete content if everything is selected,
+	 * - trigger the onDelete prop when selection is uncollapsed and at an edge.
 	 *
-	 * @param {KeyboardEvent} event Keydown event.
+	 * @param {SyntheticEvent} event A synthetic keyboard event.
 	 */
-	onDeleteKeyDown( event ) {
-		const { onDelete } = this.props;
+	handleDelete( event ) {
+		const { keyCode } = event;
 
-		if ( ! onDelete ) {
+		if ( keyCode !== DELETE && keyCode !== BACKSPACE ) {
 			return;
 		}
 
-		const { keyCode } = event;
+		const { onDelete, __unstableMultilineTag: multilineTag } = this.props;
+		const { activeFormats = [] } = this.state;
+		const value = this.createRecord();
+		const { start, end, text } = value;
 		const isReverse = keyCode === BACKSPACE;
-		const record = this.createRecord();
 
-		// Only process delete if the key press occurs at uncollapsed edge.
-		if ( ! isCollapsed( record ) ) {
-			return;
+		if ( multilineTag ) {
+			const newValue = removeLineSeparator( value, isReverse );
+			if ( newValue ) {
+				this.onChange( newValue );
+				event.preventDefault();
+			}
 		}
 
-		// It is important to consider emptiness because an empty container
-		// will include a padding BR node _after_ the caret, so in a forward
-		// deletion the isHorizontalEdge function will incorrectly interpret the
-		// presence of the BR node as not being at the edge.
-		const isEdge = ( isEmpty( record ) || isHorizontalEdge( this.editableRef, isReverse ) );
+		// Always handle full content deletion ourselves.
+		if ( start === 0 && end !== 0 && end === text.length ) {
+			this.onChange( remove( value ) );
+			event.preventDefault();
+			return;
+		}
 
-		if ( ! isEdge ) {
+		// Only process delete if the key press occurs at an uncollapsed edge.
+		if (
+			! onDelete ||
+			! isCollapsed( value ) ||
+			activeFormats.length ||
+			( isReverse && start !== 0 ) ||
+			( ! isReverse && end !== text.length )
+		) {
 			return;
 		}
 
+		onDelete( { isReverse, value } );
 		event.preventDefault();
-
-		if ( onDelete ) {
-			onDelete( { isReverse, value: record } );
-		}
 	}
 
 	/**
-	 * Handles a keydown event.
+	 * Triggers the `onEnter` prop on keydown.
 	 *
 	 * @param {SyntheticEvent} event A synthetic keyboard event.
 	 */
-	onKeyDown( event ) {
-		const { keyCode, shiftKey, altKey, metaKey, ctrlKey } = event;
+	handleEnter( event ) {
+		if ( event.keyCode !== ENTER ) {
+			return;
+		}
+
+		event.preventDefault();
+
 		const { onEnter } = this.props;
 
-		if (
-			// Only override left and right keys without modifiers pressed.
-			! shiftKey && ! altKey && ! metaKey && ! ctrlKey &&
-			( keyCode === LEFT || keyCode === RIGHT )
-		) {
-			this.handleHorizontalNavigation( event );
+		if ( ! onEnter ) {
+			return;
 		}
 
-		// Use the space key in list items (at the start of an item) to indent
-		// the list item.
-		if ( keyCode === SPACE && this.multilineTag === 'li' ) {
-			const value = this.createRecord();
+		onEnter( {
+			value: this.removeEditorOnlyFormats( this.createRecord() ),
+			onChange: this.onChange,
+			shiftKey: event.shiftKey,
+		} );
+	}
 
-			if ( isCollapsed( value ) ) {
-				const { text, start } = value;
-				const characterBefore = text[ start - 1 ];
+	/**
+	 * Indents list items on space keydown.
+	 *
+	 * @param {SyntheticEvent} event A synthetic keyboard event.
+	 */
+	handleSpace( event ) {
+		const { tagName, __unstableMultilineTag: multilineTag } = this.props;
 
-				// The caret must be at the start of a line.
-				if ( ! characterBefore || characterBefore === LINE_SEPARATOR ) {
-					this.onChange( indentListItems( value, { type: this.props.tagName } ) );
-					event.preventDefault();
-				}
-			}
+		if ( event.keyCode !== SPACE || multilineTag !== 'li' ) {
+			return;
 		}
 
-		if ( keyCode === DELETE || keyCode === BACKSPACE ) {
-			const value = this.createRecord();
-			const { start, end } = value;
-
-			// Always handle full content deletion ourselves.
-			if ( start === 0 && end !== 0 && end === value.text.length ) {
-				this.onChange( remove( value ) );
-				event.preventDefault();
-				return;
-			}
+		const value = this.createRecord();
 
-			if ( this.multilineTag ) {
-				const newValue = removeLineSeparator( value, keyCode === BACKSPACE );
-				if ( newValue ) {
-					this.onChange( newValue );
-					event.preventDefault();
-				}
-			}
+		if ( ! isCollapsed( value ) ) {
+			return;
+		}
 
-			this.onDeleteKeyDown( event );
-		} else if ( keyCode === ENTER ) {
-			event.preventDefault();
+		const { text, start } = value;
+		const characterBefore = text[ start - 1 ];
 
-			if ( onEnter ) {
-				onEnter( {
-					value: this.removeEditorOnlyFormats( this.createRecord() ),
-					onChange: this.onChange,
-					shiftKey: event.shiftKey,
-				} );
-			}
+		// The caret must be at the start of a line.
+		if ( characterBefore && characterBefore !== LINE_SEPARATOR ) {
+			return;
 		}
+
+		this.onChange( indentListItems( value, { type: tagName } ) );
+		event.preventDefault();
 	}
 
 	/**
@@ -632,7 +621,17 @@ class RichText extends Component {
 	 * @param  {SyntheticEvent} event A synthetic keyboard event.
 	 */
 	handleHorizontalNavigation( event ) {
-		const value = this.getRecord();
+		const { keyCode, shiftKey, altKey, metaKey, ctrlKey } = event;
+
+		if (
+			// Only override left and right keys without modifiers pressed.
+			shiftKey || altKey || metaKey || ctrlKey ||
+			( keyCode !== LEFT && keyCode !== RIGHT )
+		) {
+			return;
+		}
+
+		const value = this.record;
 		const { text, formats, start, end, activeFormats = [] } = value;
 		const collapsed = isCollapsed( value );
 		// To do: ideally, we should look at visual position instead.
@@ -706,7 +705,7 @@ class RichText extends Component {
 			return;
 		}
 
-		const newPos = value.start + ( isReverse ? -1 : 1 );
+		const newPos = start + ( isReverse ? -1 : 1 );
 		const newActiveFormats = isReverse ? formatsBefore : formatsAfter;
 		const newValue = {
 			...value,
@@ -820,26 +819,30 @@ class RichText extends Component {
 	 * @return {Object} An internal rich-text value.
 	 */
 	formatToValue( value ) {
-		if ( this.props.format === 'string' ) {
-			const prepare = createPrepareEditableTree( this.props, 'format_value_functions' );
-
-			value = create( {
-				html: value,
-				multilineTag: this.multilineTag,
-				multilineWrapperTags: this.multilineWrapperTags,
-			} );
-			value.formats = prepare( value );
+		const { format, __unstableMultilineTag: multilineTag } = this.props;
 
+		if ( format !== 'string' ) {
 			return value;
 		}
 
+		const prepare = createPrepareEditableTree( this.props, 'format_value_functions' );
+
+		value = create( {
+			html: value,
+			multilineTag,
+			multilineWrapperTags: multilineTag === 'li' ? [ 'ul', 'ol' ] : undefined,
+		} );
+		value.formats = prepare( value );
+
 		return value;
 	}
 
 	valueToEditableHTML( value ) {
+		const { __unstableMultilineTag: multilineTag } = this.props;
+
 		return toDom( {
 			value,
-			multilineTag: this.multilineTag,
+			multilineTag,
 			prepareEditableTree: createPrepareEditableTree( this.props, 'format_prepare_functions' ),
 			placeholder: this.props.placeholder,
 		} ).body.innerHTML;
@@ -872,106 +875,84 @@ class RichText extends Component {
 	 * @return {*} The external data format, data type depends on props.
 	 */
 	valueToFormat( value ) {
+		const { format, __unstableMultilineTag: multilineTag } = this.props;
+
 		value = this.removeEditorOnlyFormats( value );
 
-		if ( this.props.format === 'string' ) {
-			return toHTMLString( {
-				value,
-				multilineTag: this.multilineTag,
-			} );
+		if ( format !== 'string' ) {
+			return;
 		}
 
-		return value;
+		return toHTMLString( { value, multilineTag } );
 	}
 
-	render() {
+	Editable( props ) {
 		const {
 			tagName: Tagname = 'div',
 			style,
-			wrapperClassName,
 			className,
 			placeholder,
-			__unstableIsSelected: isSelected,
-			children,
-			// To do: move autocompletion logic to rich-text.
-			__unstableAutocompleters: autocompleters,
-			__unstableAutocomplete: Autocomplete = ( { children: ch } ) => ch( {} ),
-			__unstableOnReplace: onReplace,
-			allowedFormats,
-			withoutInteractiveFormatting,
 		} = this.props;
-
 		// Generating a key that includes `tagName` ensures that if the tag
 		// changes, we replace the relevant element. This is needed because we
 		// prevent Editable component updates.
 		const key = Tagname;
-		const ariaProps = pickAriaProps( this.props );
-		const record = this.getRecord();
 
-		const autoCompleteContent = ( { listBoxId, activeId } ) => (
+		return (
+			<Editable
+				{ ...props }
+				tagName={ Tagname }
+				style={ style }
+				record={ this.record }
+				valueToEditableHTML={ this.valueToEditableHTML }
+				aria-label={ placeholder }
+				{ ...pickAriaProps( this.props ) }
+				className={ classnames( 'rich-text', className ) }
+				key={ key }
+				onPaste={ this.onPaste }
+				onInput={ this.onInput }
+				onCompositionEnd={ this.onCompositionEnd }
+				onKeyDown={ this.onKeyDown }
+				onFocus={ this.onFocus }
+				onBlur={ this.onBlur }
+				onMouseDown={ this.onPointerDown }
+				onTouchStart={ this.onPointerDown }
+				setRef={ this.setRef }
+				// Selection updates must be done at these events as they
+				// happen before the `selectionchange` event. In some cases,
+				// the `selectionchange` event may not even fire, for
+				// example when the window receives focus again on click.
+				onKeyUp={ this.onSelectionChange }
+				onMouseUp={ this.onSelectionChange }
+				onTouchEnd={ this.onSelectionChange }
+			/>
+		);
+	}
+
+	render() {
+		const {
+			__unstableIsSelected: isSelected,
+			children,
+			allowedFormats,
+			withoutInteractiveFormatting,
+		} = this.props;
+
+		return (
 			<>
-				<Editable
-					tagName={ Tagname }
-					style={ style }
-					record={ record }
-					valueToEditableHTML={ this.valueToEditableHTML }
-					aria-label={ placeholder }
-					aria-autocomplete={ listBoxId ? 'list' : undefined }
-					aria-owns={ listBoxId }
-					aria-activedescendant={ activeId }
-					{ ...ariaProps }
-					className={ classnames( 'rich-text', className ) }
-					key={ key }
-					onPaste={ this.onPaste }
-					onInput={ this.onInput }
-					onCompositionEnd={ this.onCompositionEnd }
-					onKeyDown={ this.onKeyDown }
-					onFocus={ this.onFocus }
-					onBlur={ this.onBlur }
-					onMouseDown={ this.onPointerDown }
-					onTouchStart={ this.onPointerDown }
-					setRef={ this.setRef }
-					// Selection updates must be done at these events as they
-					// happen before the `selectionchange` event. In some cases,
-					// the `selectionchange` event may not even fire, for
-					// example when the window receives focus again on click.
-					onKeyUp={ this.onSelectionChange }
-					onMouseUp={ this.onSelectionChange }
-					onTouchEnd={ this.onSelectionChange }
-				/>
 				{ isSelected && <FormatEdit
 					allowedFormats={ allowedFormats }
 					withoutInteractiveFormatting={ withoutInteractiveFormatting }
-					value={ record }
+					value={ this.record }
 					onChange={ this.onChange }
 				/> }
-			</>
-		);
-
-		const content = (
-			<Autocomplete
-				onReplace={ onReplace }
-				completers={ autocompleters }
-				record={ record }
-				onChange={ this.onChange }
-			>
-				{ autoCompleteContent }
-			</Autocomplete>
-		);
-
-		if ( ! children ) {
-			return content;
-		}
-
-		return (
-			<div className={ wrapperClassName }>
-				{ children( {
+				{ children && children( {
 					isSelected,
-					value: record,
+					value: this.record,
 					onChange: this.onChange,
+					Editable: this.Editable,
 				} ) }
-				{ content }
-			</div>
+				{ ! children && <this.Editable /> }
+			</>
 		);
 	}
 }

From 28919d1b73206aa9d67998815c2b166ecadf7d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ella=20van=C2=A0Durpe?= <wp@iseulde.com>
Date: Wed, 14 Aug 2019 22:16:20 +0200
Subject: [PATCH 27/52] RichText (block context): move list controls to list
 block (#16962)

* Move list controls

* Don't restrict to isSelected
---
 .../src/components/rich-text/index.js         |  12 +-
 .../src/components/rich-text/list-edit.js     | 104 ------------------
 packages/block-library/src/list/edit.js       | 103 ++++++++++++++++-
 3 files changed, 100 insertions(+), 119 deletions(-)
 delete mode 100644 packages/block-editor/src/components/rich-text/list-edit.js

diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index 344aa0d96edc1b..e765ba77291dca 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -36,7 +36,6 @@ import Autocomplete from '../autocomplete';
 import BlockFormatControls from '../block-format-controls';
 import FormatToolbar from './format-toolbar';
 import { withBlockEditContext } from '../block-edit/context';
-import { ListEdit } from './list-edit';
 import { RemoveBrowserShortcuts } from './remove-browser-shortcuts';
 
 const wrapperClasses = 'editor-rich-text block-editor-rich-text';
@@ -296,6 +295,7 @@ class RichTextWrapper extends Component {
 
 	render() {
 		const {
+			children,
 			tagName,
 			value: originalValue,
 			onChange: originalOnChange,
@@ -303,7 +303,6 @@ class RichTextWrapper extends Component {
 			selectionEnd,
 			onSelectionChange,
 			multiline,
-			onTagNameChange,
 			inlineToolbar,
 			wrapperClassName,
 			className,
@@ -376,14 +375,7 @@ class RichTextWrapper extends Component {
 			>
 				{ ( { isSelected, value, onChange, Editable } ) =>
 					<>
-						{ isSelected && multilineTag === 'li' && (
-							<ListEdit
-								onTagNameChange={ onTagNameChange }
-								tagName={ tagName }
-								value={ value }
-								onChange={ onChange }
-							/>
-						) }
+						{ children && children( { value, onChange } ) }
 						{ isSelected && ! inlineToolbar && hasFormats && (
 							<BlockFormatControls>
 								<FormatToolbar />
diff --git a/packages/block-editor/src/components/rich-text/list-edit.js b/packages/block-editor/src/components/rich-text/list-edit.js
deleted file mode 100644
index 762f24b8a10025..00000000000000
--- a/packages/block-editor/src/components/rich-text/list-edit.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * WordPress dependencies
- */
-
-import { Toolbar } from '@wordpress/components';
-import { __, _x } from '@wordpress/i18n';
-import {
-	__unstableIndentListItems as indentListItems,
-	__unstableOutdentListItems as outdentListItems,
-	__unstableChangeListType as changeListType,
-	__unstableIsListRootSelected as isListRootSelected,
-	__unstableIsActiveListType as isActiveListType,
-} from '@wordpress/rich-text';
-
-/**
- * Internal dependencies
- */
-
-import { RichTextShortcut } from './shortcut';
-import BlockFormatControls from '../block-format-controls';
-
-export const ListEdit = ( {
-	onTagNameChange,
-	tagName,
-	value,
-	onChange,
-} ) => (
-	<>
-		<RichTextShortcut
-			type="primary"
-			character="["
-			onUse={ () => {
-				onChange( outdentListItems( value ) );
-			} }
-		/>
-		<RichTextShortcut
-			type="primary"
-			character="]"
-			onUse={ () => {
-				onChange( indentListItems( value, { type: tagName } ) );
-			} }
-		/>
-		<RichTextShortcut
-			type="primary"
-			character="m"
-			onUse={ () => {
-				onChange( indentListItems( value, { type: tagName } ) );
-			} }
-		/>
-		<RichTextShortcut
-			type="primaryShift"
-			character="m"
-			onUse={ () => {
-				onChange( outdentListItems( value ) );
-			} }
-		/>
-		<BlockFormatControls>
-			<Toolbar
-				controls={ [
-					onTagNameChange && {
-						icon: 'editor-ul',
-						title: __( 'Convert to unordered list' ),
-						isActive: isActiveListType( value, 'ul', tagName ),
-						onClick() {
-							onChange( changeListType( value, { type: 'ul' } ) );
-
-							if ( isListRootSelected( value ) ) {
-								onTagNameChange( 'ul' );
-							}
-						},
-					},
-					onTagNameChange && {
-						icon: 'editor-ol',
-						title: __( 'Convert to ordered list' ),
-						isActive: isActiveListType( value, 'ol', tagName ),
-						onClick() {
-							onChange( changeListType( value, { type: 'ol' } ) );
-
-							if ( isListRootSelected( value ) ) {
-								onTagNameChange( 'ol' );
-							}
-						},
-					},
-					{
-						icon: 'editor-outdent',
-						title: __( 'Outdent list item' ),
-						shortcut: _x( 'Backspace', 'keyboard key' ),
-						onClick: () => {
-							onChange( outdentListItems( value ) );
-						},
-					},
-					{
-						icon: 'editor-indent',
-						title: __( 'Indent list item' ),
-						shortcut: _x( 'Space', 'keyboard key' ),
-						onClick: () => {
-							onChange( indentListItems( value, { type: tagName } ) );
-						},
-					},
-				].filter( Boolean ) }
-			/>
-		</BlockFormatControls>
-	</>
-);
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 585aecd6aa7ab8..5c7e04a667af43 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -1,9 +1,17 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { createBlock } from '@wordpress/blocks';
-import { RichText } from '@wordpress/block-editor';
+import { RichText, BlockControls, RichTextShortcut } from '@wordpress/block-editor';
+import { Toolbar } from '@wordpress/components';
+import {
+	__unstableIndentListItems as indentListItems,
+	__unstableOutdentListItems as outdentListItems,
+	__unstableChangeListType as changeListType,
+	__unstableIsListRootSelected as isListRootSelected,
+	__unstableIsActiveListType as isActiveListType,
+} from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -18,12 +26,96 @@ export default function ListEdit( {
 	className,
 } ) {
 	const { ordered, values } = attributes;
+	const tagName = ordered ? 'ol' : 'ul';
+
+	const controls = ( { value, onChange } ) => {
+		if ( value.start === undefined ) {
+			return;
+		}
+
+		return <>
+			<RichTextShortcut
+				type="primary"
+				character="["
+				onUse={ () => {
+					onChange( outdentListItems( value ) );
+				} }
+			/>
+			<RichTextShortcut
+				type="primary"
+				character="]"
+				onUse={ () => {
+					onChange( indentListItems( value, { type: tagName } ) );
+				} }
+			/>
+			<RichTextShortcut
+				type="primary"
+				character="m"
+				onUse={ () => {
+					onChange( indentListItems( value, { type: tagName } ) );
+				} }
+			/>
+			<RichTextShortcut
+				type="primaryShift"
+				character="m"
+				onUse={ () => {
+					onChange( outdentListItems( value ) );
+				} }
+			/>
+			<BlockControls>
+				<Toolbar
+					controls={ [
+						{
+							icon: 'editor-ul',
+							title: __( 'Convert to unordered list' ),
+							isActive: isActiveListType( value, 'ul', tagName ),
+							onClick() {
+								onChange( changeListType( value, { type: 'ul' } ) );
+
+								if ( isListRootSelected( value ) ) {
+									setAttributes( { ordered: false } );
+								}
+							},
+						},
+						{
+							icon: 'editor-ol',
+							title: __( 'Convert to ordered list' ),
+							isActive: isActiveListType( value, 'ol', tagName ),
+							onClick() {
+								onChange( changeListType( value, { type: 'ol' } ) );
+
+								if ( isListRootSelected( value ) ) {
+									setAttributes( { ordered: true } );
+								}
+							},
+						},
+						{
+							icon: 'editor-outdent',
+							title: __( 'Outdent list item' ),
+							shortcut: _x( 'Backspace', 'keyboard key' ),
+							onClick() {
+								onChange( outdentListItems( value ) );
+							},
+						},
+						{
+							icon: 'editor-indent',
+							title: __( 'Indent list item' ),
+							shortcut: _x( 'Space', 'keyboard key' ),
+							onClick() {
+								onChange( indentListItems( value, { type: tagName } ) );
+							},
+						},
+					] }
+				/>
+			</BlockControls>
+		</>;
+	};
 
 	return (
 		<RichText
 			identifier="values"
 			multiline="li"
-			tagName={ ordered ? 'ol' : 'ul' }
+			tagName={ tagName }
 			onChange={ ( nextValues ) => setAttributes( { values: nextValues } ) }
 			value={ values }
 			wrapperClassName="block-library-list"
@@ -34,7 +126,8 @@ export default function ListEdit( {
 			__unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
 			onReplace={ onReplace }
 			onRemove={ () => onReplace( [] ) }
-			onTagNameChange={ ( tag ) => setAttributes( { ordered: tag === 'ol' } ) }
-		/>
+		>
+			{ controls }
+		</RichText>
 	);
 }

From e07fb3cdbe6d803ebd5ccc2f624f99f1a928e56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <nosolosw@users.noreply.github.com>
Date: Thu, 15 Aug 2019 10:50:21 +0200
Subject: [PATCH 28/52] Update notifications (#17046)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e2d185b76a068d..97359c3011bd3a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -46,7 +46,7 @@
 /packages/library-export-default-webpack-plugin @gziolo @ntwb @nerrad @ajitbohra
 /packages/npm-package-json-lint-config          @gziolo @ntwb @nerrad @ajitbohra
 /packages/postcss-themes                        @youknowriad @ntwb @nerrad @ajitbohra
-/packages/scripts                               @youknowriad @gziolo @ntwb @nerrad @ajitbohra @nosolosw
+/packages/scripts                               @youknowriad @gziolo @ntwb @nerrad @ajitbohra
 
 # UI Components
 /packages/components                            @youknowriad @gziolo @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @chrisvanpatten

From 43250cebf0fee36138ca03c7b0dec63b0470118b Mon Sep 17 00:00:00 2001
From: Jackie6 <541172791@qq.com>
Date: Thu, 15 Aug 2019 04:42:16 -0700
Subject: [PATCH 29/52] List block: add start and reversed attributes (#15113)

* Squash for easier merge:
f6ad4f07e6a1c8d99e55aa7acb01cf8ef1dfddd7 (HEAD -> update/list-block, Jackie6/update/list-block) Add id to BaseControl
212cab106044c4d7300d9441e48241b911db0bcb Fix unit test and e2e test
421a198bf58431c91b4c09d6ee45ba932762cb15 Refine the type definition of start and reversed
4172707059558ba9fc47d9557457e0b8e441f050 Fix typo
21ed1dbeb7881a9a5a6eea85fb3293e9d6ba0d5a Update CSS styles
925f1ab1ed073b31358a129c62abd56021e14c38 Update list type style and remove description
ef0aca95cb88203ceff78b81473e37ad8fc22714 Allow the start to be NaN
495166d3fc14591ceb88597915a19e976b2ebbeb Change to check strict equality
216ca51cfacfc174ca00d9669b88b53eaa6d0356 Fix the accidental change of travis yml
8e31259624ece930c385bf9cb7a28046505c7aff Change local state to attributes
09199ff9516aab099e47ed6e61fd4e2fadfdb95b Add list type, start, reversed settings

* Revert adding  attribute for now, let's extract to a separate PR

* Use proper TextControl

* Adjust toggle control to unset attribute

* Clearer label
---
 .../src/components/rich-text/index.js         |  5 ++
 packages/block-library/src/list/block.json    |  6 +++
 packages/block-library/src/list/edit.js       | 53 +++++++++++++++++--
 packages/block-library/src/list/save.js       | 10 +++-
 packages/rich-text/src/component/editable.js  |  8 +++
 5 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index e765ba77291dca..51af2159ec92f5 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -331,6 +331,9 @@ class RichTextWrapper extends Component {
 			identifier,
 			// eslint-disable-next-line no-unused-vars
 			instanceId,
+			// To do: find a better way to implicitly inherit props.
+			start,
+			reversed,
 			// From experimental filter. To do: pick props instead.
 			...experimentalProps
 		} = this.props;
@@ -400,6 +403,8 @@ class RichTextWrapper extends Component {
 									aria-autocomplete={ listBoxId ? 'list' : undefined }
 									aria-owns={ listBoxId }
 									aria-activedescendant={ activeId }
+									start={ start }
+									reversed={ reversed }
 								/>
 							}
 						</Autocomplete>
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index 26cdf8c19d6780..654bd3e281ccf5 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -12,6 +12,12 @@
 			"selector": "ol,ul",
 			"multiline": "li",
 			"default": ""
+		},
+		"start": {
+			"type": "number"
+		},
+		"reversed": {
+			"type": "boolean"
 		}
 	}
 }
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 5c7e04a667af43..efc38c50a63e22 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -3,8 +3,18 @@
  */
 import { __, _x } from '@wordpress/i18n';
 import { createBlock } from '@wordpress/blocks';
-import { RichText, BlockControls, RichTextShortcut } from '@wordpress/block-editor';
-import { Toolbar } from '@wordpress/components';
+import {
+	RichText,
+	BlockControls,
+	RichTextShortcut,
+	InspectorControls,
+} from '@wordpress/block-editor';
+import {
+	Toolbar,
+	TextControl,
+	PanelBody,
+	ToggleControl,
+} from '@wordpress/components';
 import {
 	__unstableIndentListItems as indentListItems,
 	__unstableOutdentListItems as outdentListItems,
@@ -25,7 +35,7 @@ export default function ListEdit( {
 	onReplace,
 	className,
 } ) {
-	const { ordered, values } = attributes;
+	const { ordered, values, reversed, start } = attributes;
 	const tagName = ordered ? 'ol' : 'ul';
 
 	const controls = ( { value, onChange } ) => {
@@ -111,7 +121,7 @@ export default function ListEdit( {
 		</>;
 	};
 
-	return (
+	return <>
 		<RichText
 			identifier="values"
 			multiline="li"
@@ -126,8 +136,41 @@ export default function ListEdit( {
 			__unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
 			onReplace={ onReplace }
 			onRemove={ () => onReplace( [] ) }
+			start={ start }
+			reversed={ reversed }
 		>
 			{ controls }
 		</RichText>
-	);
+		{ ordered &&
+			<InspectorControls>
+				<PanelBody title={ __( 'Ordered List Settings' ) }>
+					<TextControl
+						label={ __( 'Start Value' ) }
+						type="number"
+						onChange={ ( value ) => {
+							const int = parseInt( value, 10 );
+
+							setAttributes( {
+								// It should be possible to unset the value,
+								// e.g. with an empty string.
+								start: isNaN( int ) ? undefined : int,
+							} );
+						} }
+						value={ Number.isInteger( start ) ? start.toString( 10 ) : '' }
+						step="1"
+					/>
+					<ToggleControl
+						label={ __( 'Reverse List Numbering' ) }
+						checked={ reversed || false }
+						onChange={ ( value ) => {
+							setAttributes( {
+								// Unset the attribute if not reversed.
+								reversed: value || undefined,
+							} );
+						} }
+					/>
+				</PanelBody>
+			</InspectorControls>
+		}
+	</>;
 }
diff --git a/packages/block-library/src/list/save.js b/packages/block-library/src/list/save.js
index 9b0ff55b44cd5d..18458c2c1ce5a5 100644
--- a/packages/block-library/src/list/save.js
+++ b/packages/block-library/src/list/save.js
@@ -4,10 +4,16 @@
 import { RichText } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
-	const { ordered, values } = attributes;
+	const { ordered, values, reversed, start } = attributes;
 	const tagName = ordered ? 'ol' : 'ul';
 
 	return (
-		<RichText.Content tagName={ tagName } value={ values } multiline="li" />
+		<RichText.Content
+			tagName={ tagName }
+			value={ values }
+			reversed={ reversed }
+			start={ start }
+			multiline="li"
+		/>
 	);
 }
diff --git a/packages/rich-text/src/component/editable.js b/packages/rich-text/src/component/editable.js
index c5407fc308582c..c4c7cb453acd84 100644
--- a/packages/rich-text/src/component/editable.js
+++ b/packages/rich-text/src/component/editable.js
@@ -116,6 +116,14 @@ export default class Editable extends Component {
 			this.editorNode.className = nextProps.className;
 		}
 
+		if ( this.props.start !== nextProps.start ) {
+			this.editorNode.setAttribute( 'start', nextProps.start );
+		}
+
+		if ( this.props.reversed !== nextProps.reversed ) {
+			this.editorNode.reversed = nextProps.reversed;
+		}
+
 		const { removedKeys, updatedKeys } = diffAriaProps( this.props, nextProps );
 		removedKeys.forEach( ( key ) =>
 			this.editorNode.removeAttribute( key ) );

From d83c23932f4ca9530ccb2c86057b3d0f52bc351c Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 15 Aug 2019 16:06:26 +0100
Subject: [PATCH 30/52] Adds default funcs as props (#17036)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously the component assumed that the onChange and onInput props would always be present. However, there are times where this may not be the case such as when the BlockPreview component uses the provider to render the previews. In such cases `onChange` is called but is undefined which causes an error to be thrown.

To avoid this we provide lodash noop as defaults for both “change” props.
---
 packages/block-editor/src/components/provider/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/provider/index.js b/packages/block-editor/src/components/provider/index.js
index 33eff22a08892b..488dd6244d8c65 100644
--- a/packages/block-editor/src/components/provider/index.js
+++ b/packages/block-editor/src/components/provider/index.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import { noop } from 'lodash';
+
 /**
  * WordPress dependencies
  */
@@ -87,8 +92,8 @@ class BlockEditorProvider extends Component {
 
 		this.unsubscribe = registry.subscribe( () => {
 			const {
-				onChange,
-				onInput,
+				onChange = noop,
+				onInput = noop,
 			} = this.props;
 
 			const newBlocks = getBlocks();

From 0ca1b7e1e16ba5b61d82a38756d6c88dfe9056f7 Mon Sep 17 00:00:00 2001
From: Benjamin Intal <bfintal@gmail.com>
Date: Fri, 16 Aug 2019 06:55:30 +0800
Subject: [PATCH 31/52] Added ESNext examples to format API tutorial (page 1)
 (#16804)

* Added ESNext examples

* Added missing end tag
---
 .../tutorials/format-api/1-register-format.md     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/designers-developers/developers/tutorials/format-api/1-register-format.md b/docs/designers-developers/developers/tutorials/format-api/1-register-format.md
index 6a18806f6a48a4..7a0f01e5fe0e9d 100644
--- a/docs/designers-developers/developers/tutorials/format-api/1-register-format.md
+++ b/docs/designers-developers/developers/tutorials/format-api/1-register-format.md
@@ -27,6 +27,8 @@ add_action( 'enqueue_block_editor_assets', 'my_custom_format_enqueue_assets_edit
 
 Then add a new file named `my-custom-format.js` with the following contents:
 
+{% codetabs %}
+{% ES5 %}
 ```js
 ( function( wp ) {
 	wp.richText.registerFormatType(
@@ -38,6 +40,19 @@ Then add a new file named `my-custom-format.js` with the following contents:
 	);
 } )( window.wp );
 ```
+{% ESNext %}
+```js
+const { registerFormatType } = wp.richText;
+
+registerFormatType(
+	'my-custom-format/sample-output', {
+		title: 'Sample output',
+		tagName: 'samp',
+		className: null,
+	}
+);
+```
+{% end %}
 
 Make that plugin available in your WordPress setup and activate it. Then, load a new page/post.
 

From 0f3c147e1198947933e2905095ab7f2a94baabe7 Mon Sep 17 00:00:00 2001
From: Benjamin Intal <bfintal@gmail.com>
Date: Fri, 16 Aug 2019 06:55:51 +0800
Subject: [PATCH 32/52] Added ESNext examples to format API tutorial (page 2)
 (#16803)

* Added ESNext examples

* Added missing end tags
---
 .../tutorials/format-api/2-toolbar-button.md  | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/docs/designers-developers/developers/tutorials/format-api/2-toolbar-button.md b/docs/designers-developers/developers/tutorials/format-api/2-toolbar-button.md
index 52b07b6002581c..d6517b93ccc10d 100644
--- a/docs/designers-developers/developers/tutorials/format-api/2-toolbar-button.md
+++ b/docs/designers-developers/developers/tutorials/format-api/2-toolbar-button.md
@@ -4,6 +4,8 @@ Now that the format is available, the next step is to surface it to the UI. You
 
 Paste this code in `my-custom-format.js`:
 
+{% codetabs %}
+{% ES5 %}
 ```js
 ( function( wp ) {
 	var MyCustomButton = function( props ) {
@@ -27,6 +29,31 @@ Paste this code in `my-custom-format.js`:
 	);
 } )( window.wp );
 ```
+{% ESNext %}
+```js
+const { registerFormatType } = wp.richText;
+const { RichTextToolbarButton } = wp.blockEditor;
+
+const MyCustomButton = props => {
+	return <RichTextToolbarButton
+		icon='editor-code'
+		title='Sample output'
+		onClick={ () => {
+			console.log( 'toggle format' );
+		} }
+	/>
+};
+
+registerFormatType(
+	'my-custom-format/sample-output', {
+		title: 'Sample output',
+		tagName: 'samp',
+		className: null,
+		edit: MyCustomButton,
+	}
+);
+```
+{% end %}
 
 **Important**: note that this code is using two new utilities (`wp.element.createElement`, and `wp.editor.RichTextToolbarButton`) so don't forget adding the corresponding `wp-element` and `wp-editor` packages to the dependencies array in the PHP file along with the existing `wp-rich-text`.
 
@@ -42,6 +69,8 @@ By default, the button is rendered on every rich text toolbar (image captions, b
 It is possible to render the button only on blocks of a certain type by using `wp.data.withSelect` together with `wp.compose.ifCondition`.
 The following sample code renders the previously shown button only on Paragraph blocks:
 
+{% codetabs %}
+{% ES5 %}
 ```js
 ( function( wp ) {
 	var withSelect = wp.data.withSelect;
@@ -82,6 +111,47 @@ The following sample code renders the previously shown button only on Paragraph
 	);
 } )( window.wp );
 ```
+{% ESNext %}
+```js
+const { compose, ifCondition } = wp.compose;
+const { registerFormatType } = wp.richText;
+const { RichTextToolbarButton } = wp.blockEditor;
+const { withSelect } = wp.data;
+
+const MyCustomButton = props => {
+	return <RichTextToolbarButton
+		icon='editor-code'
+		title='Sample output'
+		onClick={ () => {
+			console.log( 'toggle format' );
+		} }
+	/>
+};
+
+const ConditionalButton = compose(
+	withSelect( function( select ) {
+		return {
+			selectedBlock: select( 'core/editor' ).getSelectedBlock()
+		}
+	} ),
+	ifCondition( function( props ) {
+		return (
+			props.selectedBlock &&
+			props.selectedBlock.name === 'core/paragraph'
+		);
+	} )
+)( MyCustomButton );
+
+registerFormatType(
+	'my-custom-format/sample-output', {
+		title: 'Sample output',
+		tagName: 'samp',
+		className: null,
+		edit: ConditionalButton,
+	}
+);
+```
+{% end %}
 
 Don't forget adding `wp-compose` and `wp-data` to the dependencies array in the PHP script.
 

From 2a7c8a676c6e70009d8c2c4c988fa94e467bb939 Mon Sep 17 00:00:00 2001
From: Benjamin Intal <bfintal@gmail.com>
Date: Fri, 16 Aug 2019 06:56:04 +0800
Subject: [PATCH 33/52] Added ESNext examples to format API tutorial (page 3)
 (#16802)

* Added ESNext examples

* Added missing end tag

* Use wp.blockEditor instead of wp.editor
---
 .../tutorials/format-api/3-apply-format.md    | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/docs/designers-developers/developers/tutorials/format-api/3-apply-format.md b/docs/designers-developers/developers/tutorials/format-api/3-apply-format.md
index 278f74143882ce..8b822b3a75845a 100644
--- a/docs/designers-developers/developers/tutorials/format-api/3-apply-format.md
+++ b/docs/designers-developers/developers/tutorials/format-api/3-apply-format.md
@@ -6,11 +6,13 @@ The [rich-text package](/packages/rich-text/README.md) offers a few utilities to
 
 Update `my-custom-format.js` with this new code:
 
+{% codetabs %}
+{% ES5 %}
 ```js
 ( function( wp ) {
 	var MyCustomButton = function( props ) {
 		return wp.element.createElement(
-			wp.editor.RichTextToolbarButton, {
+			wp.blockEditor.RichTextToolbarButton, {
 				icon: 'editor-code',
 				title: 'Sample output',
 				onClick: function() {
@@ -33,6 +35,35 @@ Update `my-custom-format.js` with this new code:
 	);
 } )( window.wp );
 ```
+{% ESNext %}
+```js
+const { registerFormatType, toggleFormat } = wp.richText
+const { RichTextToolbarButton } = wp.blockEditor;
+
+const MyCustomButton = props => {
+	return <RichTextToolbarButton
+		icon='editor-code'
+		title='Sample output'
+		onClick={ () => {
+			props.onChange( toggleFormat(
+				props.value,
+				{ type: 'my-custom-format/sample-output' }
+			) );
+		} }
+		isActive={ props.isActive }
+	/>
+};
+
+registerFormatType(
+	'my-custom-format/sample-output', {
+		title: 'Sample output',
+		tagName: 'samp',
+		className: null,
+		edit: MyCustomButton,
+	}
+);
+```
+{% end %}
 
 Now, let's check that is working as intended: reload the post/page, make a text selection, click the button, and then change to HTML view to confirm that the tag was effectively applied.
 

From 0f3058e295cdfc8a874cfb5e78e1f8fae53a1278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=28Greg=29=20Zi=C3=B3=C5=82kowski?=
 <grzegorz@gziolo.pl>
Date: Fri, 16 Aug 2019 10:54:59 +0200
Subject: [PATCH 34/52] Scripts: Improve the way test files are discovered
 (#17033)

* Scripts: Improve the way test files are discovered

* Fix file matching patterns and file extensions for integration tests
---
 packages/jest-preset-default/CHANGELOG.md             | 10 ++++++++++
 packages/jest-preset-default/README.md                |  2 +-
 packages/jest-preset-default/jest-preset.json         |  6 +++---
 packages/scripts/CHANGELOG.md                         |  4 ++++
 packages/scripts/README.md                            | 11 +++++++++++
 packages/scripts/config/jest-e2e.config.js            |  5 ++---
 ....spec.js.snap => blocks-raw-handling.test.js.snap} |  0
 ...w-handling.spec.js => blocks-raw-handling.test.js} |  0
 .../{full-content.spec.js => full-content.test.js}    |  0
 ...{is-valid-block.spec.js => is-valid-block.test.js} |  0
 ...ling.spec.js => non-matched-tags-handling.test.js} |  0
 ...-converter.spec.js => shortcode-converter.test.js} |  0
 12 files changed, 31 insertions(+), 7 deletions(-)
 rename test/integration/__snapshots__/{blocks-raw-handling.spec.js.snap => blocks-raw-handling.test.js.snap} (100%)
 rename test/integration/{blocks-raw-handling.spec.js => blocks-raw-handling.test.js} (100%)
 rename test/integration/full-content/{full-content.spec.js => full-content.test.js} (100%)
 rename test/integration/{is-valid-block.spec.js => is-valid-block.test.js} (100%)
 rename test/integration/{non-matched-tags-handling.spec.js => non-matched-tags-handling.test.js} (100%)
 rename test/integration/{shortcode-converter.spec.js => shortcode-converter.test.js} (100%)

diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index 0fd0e34112251b..3b0b30a79c8265 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Master
+
+### Breaking Changes
+
+- Files with `.spec.js` suffix are no longer matched as test files by default.
+
+### New Features
+
+- Align `testMatch` config option with Jest and allow test files with `.ts` suffix.
+
 ## 4.0.0 (2019-03-06)
 
 ### Breaking Changes
diff --git a/packages/jest-preset-default/README.md b/packages/jest-preset-default/README.md
index 52e7df8c715fde..ab5251a1098681 100644
--- a/packages/jest-preset-default/README.md
+++ b/packages/jest-preset-default/README.md
@@ -29,7 +29,7 @@ npm install @wordpress/jest-preset-default --save-dev
 * `setupFiles` - runs code before each test which sets up global variables required in the testing environment.
 * `setupFilesAfterEnv` - runs code which adds improved support for `Console` object and `React` components to the testing framework before each test.
 * `snapshotSerializers` - makes it possible to use snapshot tests on `Enzyme` wrappers.
-* `testMatch`- includes `/test/` subfolder in the glob patterns Jest uses to detect test files. It detects only test files containing `.js` extension.
+* `testMatch`- includes `/test/` subfolder in addition to the glob patterns Jest uses to detect test files. It detects only test files containing `.js` (or `.ts`) suffix. It doesn't match files with `.spec.js` suffix.
 * `timers` - use of [fake timers](https://jestjs.io/docs/en/timer-mocks.html) for functions such as `setTimeout` is enabled.
 * `transform` - keeps the default [babel-jest](https://github.com/facebook/jest/tree/master/packages/babel-jest) transformer.
 * `verbose` - each individual test won't be reported during the run.
diff --git a/packages/jest-preset-default/jest-preset.json b/packages/jest-preset-default/jest-preset.json
index be09fe7d6bb573..eb670e561b8497 100644
--- a/packages/jest-preset-default/jest-preset.json
+++ b/packages/jest-preset-default/jest-preset.json
@@ -15,9 +15,9 @@
 		"<rootDir>/node_modules/enzyme-to-json/serializer.js"
 	],
 	"testMatch": [
-		"**/__tests__/**/*.js",
-		"**/?(*.)(spec|test).js",
-		"**/test/*.js"
+		"**/__tests__/**/*.[jt]s",
+		"**/test/*.[jt]s",
+		"**/?(*.)test.[jt]s"
 	],
 	"timers": "fake",
 	"transform": {
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index 7ccc3d4d75efa7..69166d2f0b3f33 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Master
 
+### Breaking Changes
+
+- Test files matching has changed to fix the overlap between two types of tests implemented with `test-e2e` and `test-unit`. Refer to the documentation of the corresponding scripts to learn about new file discovery rules.
+
 ### New Features
 
 - The bundled `puppeteer` dependency has been updated from requiring `1.6.1` to requiring `^1.19.0` ([#16875](https://github.com/WordPress/gutenberg/pull/16875)). It uses Chromium v77 instead of Chromium v69.
diff --git a/packages/scripts/README.md b/packages/scripts/README.md
index fdbb75f9876cfd..50b95ff07c5e3e 100644
--- a/packages/scripts/README.md
+++ b/packages/scripts/README.md
@@ -252,6 +252,11 @@ This is how you execute those scripts using the presented setup:
 * `npm run test-e2e FILE_NAME -- --puppeteer-interactive ` - runs one test file interactively.
 * `npm run test-e2e:watch -- --puppeteer-interactive` - runs all tests interactively and watch for changes.
 
+Jest will look for test files with any of the following popular naming conventions:
+
+- Files with `.js` (or `.ts`) suffix at any level of depth in `spec` folders.
+- Files with `.spec.js` (or `.spec.ts`) suffix.
+
 This script automatically detects the best config to start Puppeteer but sometimes you may need to specify custom options:
  - You can add a `jest-puppeteer.config.js` at the root of the project or define a custom path using `JEST_PUPPETEER_CONFIG` environment variable. Check [jest-puppeteer](https://github.com/smooth-code/jest-puppeteer#jest-puppeteerconfigjs) for more details.
 
@@ -285,6 +290,12 @@ This is how you execute those scripts using the presented setup:
 * `npm run test:unit:help` - prints all available options to configure unit tests runner.
 * `npm run test:unit:watch` - runs all unit tests in the watch mode.
 
+Jest will look for test files with any of the following popular naming conventions:
+
+- Files with `.js` (or `.ts`) suffix located at any level of depth in `__tests__` folders.
+- Files with `.js` (or `.ts`) suffix directly located in `test` folders.
+- Files with `.test.js` (or `.test.ts`) suffix.
+
 #### Advanced information
 
 It uses [Jest](https://jestjs.io/) behind the scenes and you are able to use all of its [CLI options](https://jestjs.io/docs/en/cli.html). You can also run `./node_modules/.bin/wp-scripts test:unit --help` or `npm run test:unit:help` (as mentioned above) to view all of the available options. By default, it uses the set of recommended options defined in [@wordpress/jest-preset-default](https://www.npmjs.com/package/@wordpress/jest-preset-default) npm package. You can override them with your own options as described in [Jest documentation](https://jestjs.io/docs/en/configuration). Learn more in the [Advanced Usage](#advanced-usage) section.
diff --git a/packages/scripts/config/jest-e2e.config.js b/packages/scripts/config/jest-e2e.config.js
index d27b8d1b8cd2b0..45140772dc4c1c 100644
--- a/packages/scripts/config/jest-e2e.config.js
+++ b/packages/scripts/config/jest-e2e.config.js
@@ -11,9 +11,8 @@ const { hasBabelConfig } = require( '../utils' );
 const jestE2EConfig = {
 	preset: 'jest-puppeteer',
 	testMatch: [
-		'**/__tests__/**/*.js',
-		'**/?(*.)(spec|test).js',
-		'**/test/*.js',
+		'**/specs/**/*.[jt]s',
+		'**/?(*.)spec.[jt]s',
 	],
 };
 
diff --git a/test/integration/__snapshots__/blocks-raw-handling.spec.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
similarity index 100%
rename from test/integration/__snapshots__/blocks-raw-handling.spec.js.snap
rename to test/integration/__snapshots__/blocks-raw-handling.test.js.snap
diff --git a/test/integration/blocks-raw-handling.spec.js b/test/integration/blocks-raw-handling.test.js
similarity index 100%
rename from test/integration/blocks-raw-handling.spec.js
rename to test/integration/blocks-raw-handling.test.js
diff --git a/test/integration/full-content/full-content.spec.js b/test/integration/full-content/full-content.test.js
similarity index 100%
rename from test/integration/full-content/full-content.spec.js
rename to test/integration/full-content/full-content.test.js
diff --git a/test/integration/is-valid-block.spec.js b/test/integration/is-valid-block.test.js
similarity index 100%
rename from test/integration/is-valid-block.spec.js
rename to test/integration/is-valid-block.test.js
diff --git a/test/integration/non-matched-tags-handling.spec.js b/test/integration/non-matched-tags-handling.test.js
similarity index 100%
rename from test/integration/non-matched-tags-handling.spec.js
rename to test/integration/non-matched-tags-handling.test.js
diff --git a/test/integration/shortcode-converter.spec.js b/test/integration/shortcode-converter.test.js
similarity index 100%
rename from test/integration/shortcode-converter.spec.js
rename to test/integration/shortcode-converter.test.js

From fbf19384325ede65c10b83560ad109a31178c421 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Fri, 16 Aug 2019 15:12:58 +0100
Subject: [PATCH 35/52] Fix: Button block does not centers on the editor
 (#17063)

---
 packages/block-library/src/button/edit.js     | 4 ----
 packages/block-library/src/button/editor.scss | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index e70cc00b278540..b258486b989203 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -33,10 +33,6 @@ import {
 const { getComputedStyle } = window;
 
 const applyFallbackStyles = withFallbackStyles( ( node, ownProps ) => {
-	if ( node ) {
-		node.classList.add( 'wp-block-button-wrapper' );
-	}
-
 	const { textColor, backgroundColor } = ownProps;
 	const backgroundColorValue = backgroundColor && backgroundColor.color;
 	const textColorValue = textColor && textColor.color;
diff --git a/packages/block-library/src/button/editor.scss b/packages/block-library/src/button/editor.scss
index 3250c9d7dcfe00..5ccd04dd5b6254 100644
--- a/packages/block-library/src/button/editor.scss
+++ b/packages/block-library/src/button/editor.scss
@@ -1,6 +1,10 @@
 .block-editor-block-list__block[data-type="core/button"] {
 	&[data-align="center"] {
 		text-align: center;
+		div[data-block] {
+			margin-left: auto;
+			margin-right: auto;
+		}
 	}
 
 	&[data-align="right"] {
@@ -76,6 +80,7 @@
 	}
 }
 
-.wp-block-button-wrapper {
+// Display "table" is used because the button container should only wrap the content and not takes the full width.
+div[data-type="core/button"] div[data-block] {
 	display: table;
 }

From 15f5ff44609df48a47dee1d3e750470cdda50a5e Mon Sep 17 00:00:00 2001
From: Matt Chowning <matt.chowning@automattic.com>
Date: Fri, 16 Aug 2019 13:09:57 -0400
Subject: [PATCH 36/52] [RNMobile] Extract caption component (#16825)

* Extract caption component

* Use caption component for video

* Move Caption to block-editor for mobile tests

This move avoids a dependency issue that was causing the mobile tests to
fail due to the Caption component's import of RichText from the
block-editor package.

* Pass onBlur to Caption component

* Connect Caption component to store
---
 .../src/components/caption/index.native.js    | 65 +++++++++++++++++++
 .../src/components/index.native.js            |  1 +
 .../block-library/src/image/edit.native.js    | 49 ++++----------
 .../block-library/src/video/edit.native.js    | 57 +++++++++-------
 .../block-library/src/video/style.native.scss |  8 ---
 5 files changed, 114 insertions(+), 66 deletions(-)
 create mode 100644 packages/block-editor/src/components/caption/index.native.js

diff --git a/packages/block-editor/src/components/caption/index.native.js b/packages/block-editor/src/components/caption/index.native.js
new file mode 100644
index 00000000000000..68e965524c8b87
--- /dev/null
+++ b/packages/block-editor/src/components/caption/index.native.js
@@ -0,0 +1,65 @@
+/**
+ * External dependencies
+ */
+import { View } from 'react-native';
+
+/**
+ * WordPress dependencies
+ */
+import { RichText } from '@wordpress/block-editor';
+import { compose } from '@wordpress/compose';
+import { withDispatch, withSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+
+const Caption = ( { accessible, accessibilityLabel, onBlur, onChange, onFocus, isSelected, shouldDisplay, text } ) => (
+	<View style={ {	padding: 12, flex: 1, display: shouldDisplay ? 'flex' : 'none' } }
+		accessible={ accessible }
+		accessibilityLabel={ accessibilityLabel }
+		accessibilityRole={ 'button' }
+	>
+		<RichText
+			rootTagsToEliminate={ [ 'p' ] }
+			placeholder={ __( 'Write caption…' ) }
+			value={ text }
+			onChange={ onChange }
+			unstableOnFocus={ onFocus }
+			onBlur={ onBlur } // always assign onBlur as props
+			isSelected={ isSelected }
+			__unstableMobileNoFocusOnMount
+			fontSize={ 14 }
+			underlineColorAndroid="transparent"
+			textAlign={ 'center' }
+			tagName={ '' }
+		/>
+	</View>
+);
+
+export default compose( [
+	withSelect( ( select, { accessibilityLabelCreator, clientId } ) => {
+		const {
+			getBlockAttributes,
+			getSelectedBlockClientId,
+		} = select( 'core/block-editor' );
+		const { caption } = getBlockAttributes( clientId );
+		const accessibilityLabel = accessibilityLabelCreator ? accessibilityLabelCreator( caption ) : undefined;
+		const isBlockSelected = getSelectedBlockClientId() === clientId;
+
+		// We'll render the caption so that the soft keyboard is not forced to close on Android
+		// but still hide it by setting its display style to none. See wordpress-mobile/gutenberg-mobile#1221
+		const shouldDisplay = ! RichText.isEmpty( caption ) > 0 || isBlockSelected;
+
+		return {
+			accessibilityLabel,
+			shouldDisplay,
+			text: caption,
+		};
+	} ),
+	withDispatch( ( dispatch, { clientId } ) => {
+		const { updateBlockAttributes } = dispatch( 'core/block-editor' );
+		return {
+			onChange: ( caption ) => {
+				updateBlockAttributes( clientId, { caption } );
+			},
+		};
+	} ),
+] )( Caption );
diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
index dee7b5fbdeddae..5f13de7d91b4ce 100644
--- a/packages/block-editor/src/components/index.native.js
+++ b/packages/block-editor/src/components/index.native.js
@@ -17,6 +17,7 @@ export { default as MediaPlaceholder } from './media-placeholder';
 export { default as MediaUpload, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO } from './media-upload';
 export { default as URLInput } from './url-input';
 export { default as BlockInvalidWarning } from './block-list/block-invalid-warning';
+export { default as Caption } from './caption';
 
 // Content Related Components
 export { default as BlockList } from './block-list';
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 3928691b777aa0..3eb19a6bfa991b 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -21,10 +21,10 @@ import {
 	ToolbarButton,
 } from '@wordpress/components';
 import {
+	Caption,
 	MediaPlaceholder,
 	MediaUpload,
 	MEDIA_TYPE_IMAGE,
-	RichText,
 	BlockControls,
 	InspectorControls,
 } from '@wordpress/block-editor';
@@ -115,7 +115,6 @@ class ImageEdit extends React.Component {
 			requestImageFailedRetryDialog( attributes.id );
 		}
 
-		this._caption.blur();
 		this.setState( {
 			isCaptionSelected: false,
 		} );
@@ -201,8 +200,8 @@ class ImageEdit extends React.Component {
 	}
 
 	render() {
-		const { attributes, isSelected, setAttributes } = this.props;
-		const { url, caption, height, width, alt, href, id } = attributes;
+		const { attributes, isSelected } = this.props;
+		const { url, height, width, alt, href, id } = attributes;
 
 		const onImageSettingsButtonPressed = () => {
 			this.setState( { showSettings: true } );
@@ -270,12 +269,6 @@ class ImageEdit extends React.Component {
 			);
 		}
 
-		// We still want to render the caption so that the soft keyboard is not forced to close on Android
-		const shouldCaptionDisplay = () => {
-			const isCaptionEmpty = RichText.isEmpty( caption ) > 0;
-			return ! isCaptionEmpty || isSelected;
-		};
-
 		const imageContainerHeight = Dimensions.get( 'window' ).width / IMAGE_ASPECT_RATIO;
 		const getImageComponent = ( openMediaOptions, getMediaOptions ) => (
 			<TouchableWithoutFeedback
@@ -344,38 +337,22 @@ class ImageEdit extends React.Component {
 							);
 						} }
 					/>
-					<View style={ { padding: 12, flex: 1, display: shouldCaptionDisplay() ? 'flex' : 'none' } }
+					<Caption
+						clientId={ this.props.clientId }
+						isSelected={ this.state.isCaptionSelected }
 						accessible={ true }
-						accessibilityLabel={
+						accessibilityLabelCreator={ ( caption ) =>
 							isEmpty( caption ) ?
 							/* translators: accessibility text. Empty image caption. */
-								__( 'Image caption. Empty' ) :
+								( 'Image caption. Empty' ) :
 								sprintf(
-									/* translators: accessibility text. %s: image caption. */
+								/* translators: accessibility text. %s: image caption. */
 									__( 'Image caption. %s' ),
-									caption
-								)
+									caption )
 						}
-						accessibilityRole={ 'button' }
-					>
-						<RichText
-							setRef={ ( ref ) => {
-								this._caption = ref;
-							} }
-							rootTagsToEliminate={ [ 'p' ] }
-							placeholder={ __( 'Write caption…' ) }
-							value={ caption }
-							onChange={ ( newCaption ) => setAttributes( { caption: newCaption } ) }
-							unstableOnFocus={ this.onFocusCaption }
-							onBlur={ this.props.onBlur } // always assign onBlur as props
-							isSelected={ this.state.isCaptionSelected }
-							__unstableMobileNoFocusOnMount
-							fontSize={ 14 }
-							underlineColorAndroid="transparent"
-							textAlign={ 'center' }
-							tagName={ '' }
-						/>
-					</View>
+						onFocus={ this.onFocusCaption }
+						onBlur={ this.props.onBlur } // always assign onBlur as props
+					/>
 				</View>
 			</TouchableWithoutFeedback>
 		);
diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js
index 4d7ce426d55c05..3b0a9d186d3084 100644
--- a/packages/block-library/src/video/edit.native.js
+++ b/packages/block-library/src/video/edit.native.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import React from 'react';
-import { View, TextInput, TouchableWithoutFeedback, Text } from 'react-native';
+import { View, TouchableWithoutFeedback, Text } from 'react-native';
 /**
  * Internal dependencies
  */
@@ -22,10 +22,10 @@ import {
 	ToolbarButton,
 } from '@wordpress/components';
 import {
+	Caption,
 	MediaPlaceholder,
 	MediaUpload,
 	MEDIA_TYPE_VIDEO,
-	RichText,
 	BlockControls,
 	InspectorControls,
 } from '@wordpress/block-editor';
@@ -48,6 +48,7 @@ class VideoEdit extends React.Component {
 		super( props );
 
 		this.state = {
+			isCaptionSelected: false,
 			showSettings: false,
 			videoContainerHeight: 0,
 		};
@@ -59,6 +60,7 @@ class VideoEdit extends React.Component {
 		this.updateMediaProgress = this.updateMediaProgress.bind( this );
 		this.onVideoPressed = this.onVideoPressed.bind( this );
 		this.onVideoContanerLayout = this.onVideoContanerLayout.bind( this );
+		this.onFocusCaption = this.onFocusCaption.bind( this );
 	}
 
 	componentDidMount() {
@@ -75,6 +77,14 @@ class VideoEdit extends React.Component {
 		}
 	}
 
+	static getDerivedStateFromProps( props, state ) {
+		// Avoid a UI flicker in the toolbar by insuring that isCaptionSelected
+		// is updated immediately any time the isSelected prop becomes false
+		return {
+			isCaptionSelected: props.isSelected && state.isCaptionSelected,
+		};
+	}
+
 	onVideoPressed() {
 		const { attributes } = this.props;
 
@@ -83,6 +93,16 @@ class VideoEdit extends React.Component {
 		} else if ( attributes.id && ! isURL( attributes.src ) ) {
 			requestImageFailedRetryDialog( attributes.id );
 		}
+
+		this.setState( {
+			isCaptionSelected: false,
+		} );
+	}
+
+	onFocusCaption() {
+		if ( ! this.state.isCaptionSelected ) {
+			this.setState( { isCaptionSelected: true } );
+		}
 	}
 
 	updateMediaProgress( payload ) {
@@ -135,8 +155,8 @@ class VideoEdit extends React.Component {
 	}
 
 	render() {
-		const { attributes, isSelected, setAttributes } = this.props;
-		const { caption, id, src } = attributes;
+		const { attributes, isSelected } = this.props;
+		const { id, src } = attributes;
 		const { videoContainerHeight } = this.state;
 
 		const toolbarEditButton = (
@@ -173,9 +193,10 @@ class VideoEdit extends React.Component {
 		return (
 			<TouchableWithoutFeedback onPress={ this.onVideoPressed } disabled={ ! isSelected }>
 				<View style={ { flex: 1 } }>
-					<BlockControls>
-						{ toolbarEditButton }
-					</BlockControls>
+					{ ! this.state.isCaptionSelected &&
+						<BlockControls>
+							{ toolbarEditButton }
+						</BlockControls> }
 					<InspectorControls>
 						{ false && <ToolbarButton //Not rendering settings button until it has an action
 							label={ __( 'Video Settings' ) }
@@ -212,7 +233,7 @@ class VideoEdit extends React.Component {
 									{ showVideo &&
 										<View style={ style.videoContainer }>
 											<Video
-												isSelected={ isSelected }
+												isSelected={ isSelected && ! this.state.isCaptionSelected }
 												style={ videoStyle }
 												source={ { uri: src } }
 												paused={ true }
@@ -229,20 +250,12 @@ class VideoEdit extends React.Component {
 							);
 						} }
 					/>
-					{ ( ! RichText.isEmpty( caption ) > 0 || isSelected ) && (
-						<View style={ { paddingTop: 8, paddingBottom: 0, flex: 1 } }>
-							<TextInput
-								style={ { textAlign: 'center' } }
-								fontFamily={ this.props.fontFamily || ( style[ 'caption-text' ].fontFamily ) }
-								underlineColorAndroid="transparent"
-								value={ caption }
-								placeholder={ __( 'Write caption…' ) }
-								placeholderTextColor={ style.captionPlaceholder.color }
-								onChangeText={ ( newCaption ) => setAttributes( { caption: newCaption } ) }
-								onFocus={ this.props.onFocus }
-							/>
-						</View>
-					) }
+					<Caption
+						clientId={ this.props.clientId }
+						isSelected={ this.state.isCaptionSelected }
+						onFocus={ this.onFocusCaption }
+						onBlur={ this.props.onBlur } // always assign onBlur as props
+					/>
 				</View>
 			</TouchableWithoutFeedback>
 		);
diff --git a/packages/block-library/src/video/style.native.scss b/packages/block-library/src/video/style.native.scss
index a7b77efce2c4bc..dd4d70ae0a4752 100644
--- a/packages/block-library/src/video/style.native.scss
+++ b/packages/block-library/src/video/style.native.scss
@@ -53,14 +53,6 @@
 	border-style: solid;
 }
 
-.caption-text {
-	font-family: $default-regular-font;
-}
-
-.captionPlaceholder {
-	color: $gray;
-}
-
 .icon {
 	fill: $gray-dark;
 	width: 100%;

From d80b024c7b8a759905cde40f7e7841f7732747c2 Mon Sep 17 00:00:00 2001
From: Michael Joseph Panaga <donmhico@gmail.com>
Date: Sat, 17 Aug 2019 18:01:52 +0800
Subject: [PATCH 37/52] Update: Latest Posts Block: Use (no title) instead of
 (Untitled) for untitled posts (#17074)

---
 packages/block-library/src/latest-posts/edit.js   | 2 +-
 packages/block-library/src/latest-posts/index.php | 2 +-
 packages/block-library/src/rss/index.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/latest-posts/edit.js b/packages/block-library/src/latest-posts/edit.js
index 0b6714c6fff087..aa2111a98a101d 100644
--- a/packages/block-library/src/latest-posts/edit.js
+++ b/packages/block-library/src/latest-posts/edit.js
@@ -206,7 +206,7 @@ class LatestPostsEdit extends Component {
 											{ titleTrimmed }
 										</RawHTML>
 									) :
-										__( '(Untitled)' )
+										__( '(no title)' )
 									}
 								</a>
 								{ displayPostDate && post.date_gmt &&
diff --git a/packages/block-library/src/latest-posts/index.php b/packages/block-library/src/latest-posts/index.php
index 81278794f31749..21f4f335842ddf 100644
--- a/packages/block-library/src/latest-posts/index.php
+++ b/packages/block-library/src/latest-posts/index.php
@@ -34,7 +34,7 @@ function render_block_core_latest_posts( $attributes ) {
 	foreach ( $recent_posts as $post ) {
 		$title = get_the_title( $post );
 		if ( ! $title ) {
-			$title = __( '(Untitled)' );
+			$title = __( '(no title)' );
 		}
 		$list_items_markup .= sprintf(
 			'<li><a href="%1$s">%2$s</a>',
diff --git a/packages/block-library/src/rss/index.php b/packages/block-library/src/rss/index.php
index 53879d5bb2716b..0300585de24f02 100644
--- a/packages/block-library/src/rss/index.php
+++ b/packages/block-library/src/rss/index.php
@@ -32,7 +32,7 @@ function render_block_core_rss( $attributes ) {
 	foreach ( $rss_items as $item ) {
 		$title = esc_html( trim( strip_tags( $item->get_title() ) ) );
 		if ( empty( $title ) ) {
-			$title = __( '(Untitled)' );
+			$title = __( '(no title)' );
 		}
 		$link = $item->get_link();
 		$link = esc_url( $link );

From 82fcf2b8c025ffed8fd116d089663ee7cf777f3a Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 19 Aug 2019 16:46:59 +1000
Subject: [PATCH 38/52] Revert "Change caption name and remove deprecation."

This reverts commit 9a0876c608eb3eaaeab51189ee1d34f665cf336d.
---
 packages/block-library/src/gallery/block.json |  2 +-
 .../block-library/src/gallery/deprecated.js   | 99 +++++++++++++++++++
 packages/block-library/src/gallery/edit.js    |  2 +-
 packages/block-library/src/gallery/save.js    |  2 +-
 .../blocks/core__gallery-with-caption.json    |  2 +-
 .../fixtures/blocks/core__gallery.json        |  2 +-
 .../blocks/core__gallery__columns.json        |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  2 +-
 .../blocks/core__gallery__deprecated-3.html   | 14 +++
 .../blocks/core__gallery__deprecated-3.json   | 30 ++++++
 .../core__gallery__deprecated-3.parsed.json   | 25 +++++
 ...ore__gallery__deprecated-3.serialized.html |  3 +
 12 files changed, 178 insertions(+), 7 deletions(-)
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index da3612b7d2fb0a..e677e7eb365628 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"caption": {
+		"galleryCaption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 2b77e33e0b36e4..74af7e3f50b6e7 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,6 +15,105 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
+	{
+		attributes: {
+			images: {
+				type: 'array',
+				default: [],
+				source: 'query',
+				selector: 'ul.wp-block-gallery .blocks-gallery-item',
+				query: {
+					url: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'src',
+					},
+					fullUrl: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-full-url',
+					},
+					alt: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'alt',
+						default: '',
+					},
+					id: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-id',
+					},
+					link: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-link',
+					},
+					caption: {
+						type: 'array',
+						source: 'children',
+						selector: 'figcaption',
+					},
+				},
+			},
+			ids: {
+				type: 'array',
+				default: [],
+			},
+			columns: {
+				type: 'number',
+			},
+			imageCrop: {
+				type: 'boolean',
+				default: true,
+			},
+			linkTo: {
+				type: 'string',
+				default: 'none',
+			},
+		},
+		save( { attributes } ) {
+			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
+			return (
+				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+					{ images.map( ( image ) => {
+						let href;
+
+						switch ( linkTo ) {
+							case 'media':
+								href = image.fullUrl || image.url;
+								break;
+							case 'attachment':
+								href = image.link;
+								break;
+						}
+
+						const img = (
+							<img
+								src={ image.url }
+								alt={ image.alt }
+								data-id={ image.id }
+								data-full-url={ image.fullUrl }
+								data-link={ image.link }
+								className={ image.id ? `wp-image-${ image.id }` : null }
+							/>
+						);
+
+						return (
+							<li key={ image.id || image.url } className="blocks-gallery-item">
+								<figure>
+									{ href ? <a href={ href }>{ img }</a> : img }
+									{ image.caption && image.caption.length > 0 && (
+										<RichText.Content tagName="figcaption" value={ image.caption } />
+									) }
+								</figure>
+							</li>
+						);
+					} ) }
+				</ul>
+			);
+		},
+	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 2a90bd45e7d2a2..8a6c05c095c70b 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index ac8c346f328716..86364c7625fc6b 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 234396e37da3f1..72617e1d629527 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "caption": "Gallery caption.",
+            "galleryCaption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index edc367a12ba722..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 06c7288273a836..83a8363d2f0cb5 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 4a7fa792469800..9ab909dbb44e8c 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
new file mode 100644
index 00000000000000..b91a575be9ca53
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
new file mode 100644
index 00000000000000..fb2db61c343094
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -0,0 +1,30 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": ""
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": ""
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "galleryCaption": "",
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
new file mode 100644
index 00000000000000..99c1ac20ed9562
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerContent": [
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
new file mode 100644
index 00000000000000..813f97c645287e
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<!-- /wp:gallery -->

From 7b06d770daa106b7f4ba45c5b41fb8477ad078aa Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 19 Aug 2019 16:53:53 +1000
Subject: [PATCH 39/52] Re-add gallery caption name change.

---
 packages/block-library/src/gallery/block.json                   | 2 +-
 packages/block-library/src/gallery/edit.js                      | 2 +-
 packages/block-library/src/gallery/save.js                      | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery-with-caption.json   | 2 +-
 packages/e2e-tests/fixtures/blocks/core__gallery.json           | 2 +-
 packages/e2e-tests/fixtures/blocks/core__gallery__columns.json  | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json  | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index e677e7eb365628..da3612b7d2fb0a 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"galleryCaption": {
+		"caption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 8a6c05c095c70b..2a90bd45e7d2a2 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 86364c7625fc6b..ac8c346f328716 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 72617e1d629527..234396e37da3f1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "Gallery caption.",
+            "caption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 83a8363d2f0cb5..06c7288273a836 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 9ab909dbb44e8c..4a7fa792469800 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },

From b5bea97519a71acb36955f5c6bee47ee7728541d Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 9 Aug 2019 14:12:17 +1000
Subject: [PATCH 40/52] Basic gallery caption.

---
 package-lock.json                             |   4 +-
 packages/block-library/src/gallery/block.json |   7 +-
 packages/block-library/src/gallery/edit.js    | 105 +++++++++++-------
 packages/block-library/src/gallery/save.js    |  17 ++-
 packages/block-library/src/gallery/style.scss |   2 +-
 packages/blocks/src/api/validation.js         |   1 -
 6 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2febb418532ae1..48da0033095df0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7736,7 +7736,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": false,
+									"resolved": "",
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -12589,7 +12589,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": false,
+							"resolved": "",
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index 6fa43d279a80e4..e677e7eb365628 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -6,7 +6,7 @@
 			"type": "array",
 			"default": [ ],
 			"source": "query",
-			"selector": "ul.wp-block-gallery .blocks-gallery-item",
+			"selector": ".wp-block-gallery .blocks-gallery-item",
 			"query": {
 				"url": {
 					"source": "attribute",
@@ -48,6 +48,11 @@
 		"columns": {
 			"type": "number"
 		},
+		"galleryCaption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption"
+		},
 		"imageCrop": {
 			"type": "boolean",
 			"default": true
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 129fc2343224a6..8a6c05c095c70b 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -19,6 +19,7 @@ import {
 	BlockIcon,
 	MediaPlaceholder,
 	InspectorControls,
+	RichText,
 } from '@wordpress/block-editor';
 import { Component } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
@@ -56,8 +57,10 @@ class GalleryEdit extends Component {
 		this.onUploadError = this.onUploadError.bind( this );
 		this.setImageAttributes = this.setImageAttributes.bind( this );
 		this.setAttributes = this.setAttributes.bind( this );
+		this.onFocusGalleryCaption = this.onFocusGalleryCaption.bind( this );
 
 		this.state = {
+			galleryCaptionFocused: false,
 			selectedImage: null,
 			attachmentCaptions: null,
 		};
@@ -74,7 +77,6 @@ class GalleryEdit extends Component {
 				ids: map( attributes.images, 'id' ),
 			};
 		}
-
 		this.props.setAttributes( attributes );
 	}
 
@@ -191,6 +193,14 @@ class GalleryEdit extends Component {
 		return checked ? __( 'Thumbnails are cropped to align.' ) : __( 'Thumbnails are not cropped.' );
 	}
 
+	onFocusGalleryCaption() {
+		if ( ! this.state.galleryCaptionFocused ) {
+			this.setState( {
+				galleryCaptionFocused: true,
+			} );
+		}
+	}
+
 	setImageAttributes( index, attributes ) {
 		const { attributes: { images } } = this.props;
 		const { setAttributes } = this;
@@ -231,12 +241,16 @@ class GalleryEdit extends Component {
 				captionSelected: false,
 			} );
 		}
+		if ( ! this.props.isSelected && prevProps.isSelected && this.state.galleryCaptionFocused ) {
+			this.setState( {
+				galleryCaptionFocused: false,
+			} );
+		}
 	}
 
 	render() {
-		const { attributes, isSelected, className, noticeUI } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, imageCrop, linkTo } = attributes;
-
+		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
+		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
@@ -291,42 +305,55 @@ class GalleryEdit extends Component {
 					</PanelBody>
 				</InspectorControls>
 				{ noticeUI }
-				<ul
-					className={ classnames(
-						className,
-						{
-							[ `align${ align }` ]: align,
-							[ `columns-${ columns }` ]: columns,
-							'is-cropped': imageCrop,
-						}
-					) }
-				>
-					{ images.map( ( img, index ) => {
+				<figure className={ className } >
+					<ul
+						className={ classnames(
+							'blocks-gallery-grid',
+							{
+								[ `align${ align }` ]: align,
+								[ `columns-${ columns }` ]: columns,
+								'is-cropped': imageCrop,
+							}
+						) }
+					>
+						{ images.map( ( img, index ) => {
 						/* translators: %1$d is the order number of the image, %2$d is the total number of images. */
-						const ariaLabel = sprintf( __( 'image %1$d of %2$d in gallery' ), ( index + 1 ), images.length );
-
-						return (
-							<li className="blocks-gallery-item" key={ img.id || img.url }>
-								<GalleryImage
-									url={ img.url }
-									alt={ img.alt }
-									id={ img.id }
-									isFirstItem={ index === 0 }
-									isLastItem={ ( index + 1 ) === images.length }
-									isSelected={ isSelected && this.state.selectedImage === index }
-									onMoveBackward={ this.onMoveBackward( index ) }
-									onMoveForward={ this.onMoveForward( index ) }
-									onRemove={ this.onRemoveImage( index ) }
-									onSelect={ this.onSelectImage( index ) }
-									setAttributes={ ( attrs ) => this.setImageAttributes( index, attrs ) }
-									caption={ img.caption }
-									aria-label={ ariaLabel }
-								/>
-							</li>
-						);
-					} ) }
-				</ul>
-				{ mediaPlaceholder }
+							const ariaLabel = sprintf( __( 'image %1$d of %2$d in gallery' ), ( index + 1 ), images.length );
+
+							return (
+								<li className="blocks-gallery-item" key={ img.id || img.url }>
+									<GalleryImage
+										url={ img.url }
+										alt={ img.alt }
+										id={ img.id }
+										isFirstItem={ index === 0 }
+										isLastItem={ ( index + 1 ) === images.length }
+										isSelected={ isSelected && this.state.selectedImage === index }
+										onMoveBackward={ this.onMoveBackward( index ) }
+										onMoveForward={ this.onMoveForward( index ) }
+										onRemove={ this.onRemoveImage( index ) }
+										onSelect={ this.onSelectImage( index ) }
+										setAttributes={ ( attrs ) => this.setImageAttributes( index, attrs ) }
+										caption={ img.caption }
+										aria-label={ ariaLabel }
+									/>
+								</li>
+							);
+						} ) }
+					</ul>
+					{ mediaPlaceholder }
+					{ ( ! RichText.isEmpty( galleryCaption ) || isSelected ) && (
+						<RichText
+							tagName="figcaption"
+							placeholder={ __( 'Write gallery caption…' ) }
+							value={ galleryCaption }
+							unstableOnFocus={ this.onFocusGalleryCaption }
+							onChange={ ( value ) => setAttributes( { galleryCaption: value } ) }
+							isSelected={ this.state.galleryCaptionFocused }
+							inlineToolbar
+						/>
+					) }
+				</figure>
 			</>
 		);
 	}
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 638523c6554464..2c49141ea80e59 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,9 +9,10 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
-	return (
-		<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+
+	const baseGallery = (
+		<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
 			{ images.map( ( image ) => {
 				let href;
 
@@ -48,4 +49,14 @@ export default function save( { attributes } ) {
 			} ) }
 		</ul>
 	);
+
+	if ( galleryCaption ) {
+		return (
+			<figure>
+				{ baseGallery }
+				{ <RichText.Content tagName="figcaption" value={ galleryCaption } /> }
+			</figure>
+		);
+	}
+	return baseGallery;
 }
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index df60d6fd1fc9b6..06c7dcfd12c826 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -1,4 +1,4 @@
-.wp-block-gallery {
+.blocks-gallery-grid {
 	display: flex;
 	flex-wrap: wrap;
 	list-style-type: none;
diff --git a/packages/blocks/src/api/validation.js b/packages/blocks/src/api/validation.js
index 444830c47c5ac7..d1fe839851c889 100644
--- a/packages/blocks/src/api/validation.js
+++ b/packages/blocks/src/api/validation.js
@@ -636,7 +636,6 @@ export function isValidBlockContent( blockTypeOrName, attributes, originalBlockC
 		log.error( 'Block validation failed because an error occurred while generating block content:\n\n%s', error.toString() );
 		return false;
 	}
-
 	const isValid = isEquivalentHTML( originalBlockContent, generatedBlockContent );
 	if ( ! isValid ) {
 		log.error(

From 647adf0d30f6623d066f7ef89f1cccb780d84d4c Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 9 Aug 2019 16:47:41 +1000
Subject: [PATCH 41/52] add block deprecation

---
 .../block-library/src/gallery/deprecated.js   | 99 +++++++++++++++++++
 packages/block-library/src/gallery/style.scss |  8 ++
 2 files changed, 107 insertions(+)

diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 2b77e33e0b36e4..74af7e3f50b6e7 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,6 +15,105 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
+	{
+		attributes: {
+			images: {
+				type: 'array',
+				default: [],
+				source: 'query',
+				selector: 'ul.wp-block-gallery .blocks-gallery-item',
+				query: {
+					url: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'src',
+					},
+					fullUrl: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-full-url',
+					},
+					alt: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'alt',
+						default: '',
+					},
+					id: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-id',
+					},
+					link: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-link',
+					},
+					caption: {
+						type: 'array',
+						source: 'children',
+						selector: 'figcaption',
+					},
+				},
+			},
+			ids: {
+				type: 'array',
+				default: [],
+			},
+			columns: {
+				type: 'number',
+			},
+			imageCrop: {
+				type: 'boolean',
+				default: true,
+			},
+			linkTo: {
+				type: 'string',
+				default: 'none',
+			},
+		},
+		save( { attributes } ) {
+			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
+			return (
+				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+					{ images.map( ( image ) => {
+						let href;
+
+						switch ( linkTo ) {
+							case 'media':
+								href = image.fullUrl || image.url;
+								break;
+							case 'attachment':
+								href = image.link;
+								break;
+						}
+
+						const img = (
+							<img
+								src={ image.url }
+								alt={ image.alt }
+								data-id={ image.id }
+								data-full-url={ image.fullUrl }
+								data-link={ image.link }
+								className={ image.id ? `wp-image-${ image.id }` : null }
+							/>
+						);
+
+						return (
+							<li key={ image.id || image.url } className="blocks-gallery-item">
+								<figure>
+									{ href ? <a href={ href }>{ img }</a> : img }
+									{ image.caption && image.caption.length > 0 && (
+										<RichText.Content tagName="figcaption" value={ image.caption } />
+									) }
+								</figure>
+							</li>
+						);
+					} ) }
+				</ul>
+			);
+		},
+	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index 06c7dcfd12c826..dc2e99ac57366f 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -3,6 +3,7 @@
 	flex-wrap: wrap;
 	list-style-type: none;
 	padding: 0;
+	margin-bottom: 0;
 
 	.blocks-gallery-image,
 	.blocks-gallery-item {
@@ -147,4 +148,11 @@
 			justify-content: center;
 		}
 	}
+
+	+ figcaption {
+		margin-top: -$grid-size;
+		font-size: $editor-font-size;
+		font-family: $default-font;
+		color: $dark-gray-500;
+	}
 }

From 752c9938df30b825b012b3da2cb6d1156d9b60e2 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:24:13 +1000
Subject: [PATCH 42/52] Regenerate test fixtures and fix failures

---
 packages/block-library/src/gallery/style.scss |  1 +
 .../blocks/core__gallery-with-caption.html    | 17 +++++++++++
 .../blocks/core__gallery-with-caption.json    | 30 +++++++++++++++++++
 .../core__gallery-with-caption.parsed.json    | 25 ++++++++++++++++
 ...core__gallery-with-caption.serialized.html |  3 ++
 .../fixtures/blocks/core__gallery.html        |  2 +-
 .../fixtures/blocks/core__gallery.json        |  3 +-
 .../fixtures/blocks/core__gallery.parsed.json |  4 +--
 .../blocks/core__gallery.serialized.html      |  2 +-
 .../blocks/core__gallery__columns.html        |  2 +-
 .../blocks/core__gallery__columns.json        |  3 +-
 .../blocks/core__gallery__columns.parsed.json |  4 +--
 .../core__gallery__columns.serialized.html    |  2 +-
 ...ore__gallery__deprecated-1.serialized.html |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  4 +--
 ...ore__gallery__deprecated-2.serialized.html |  4 +--
 .../blocks/core__gallery__deprecated-3.html   | 14 +++++++++
 .../blocks/core__gallery__deprecated-3.json   | 29 ++++++++++++++++++
 .../core__gallery__deprecated-3.parsed.json   | 25 ++++++++++++++++
 ...ore__gallery__deprecated-3.serialized.html |  3 ++
 .../blocks-raw-handling.test.js.snap          |  2 +-
 test/integration/fixtures/wordpress-out.html  |  2 +-
 22 files changed, 166 insertions(+), 17 deletions(-)
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index dc2e99ac57366f..9727baa5c9812d 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -1,3 +1,4 @@
+.wp-block-gallery,
 .blocks-gallery-grid {
 	display: flex;
 	flex-wrap: wrap;
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
new file mode 100644
index 00000000000000..55346fad9662ed
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.html
@@ -0,0 +1,17 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<figure class="wp-block-gallery">
+	<ul class="blocks-gallery-grid columns-2 is-cropped">
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+			</figure>
+		</li>
+	</ul>
+	<figcaption>Gallery caption.</figcaption>
+</figure>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
new file mode 100644
index 00000000000000..72617e1d629527
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -0,0 +1,30 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": ""
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": ""
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "galleryCaption": "Gallery caption.",
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
new file mode 100644
index 00000000000000..9c41df754c14a5
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>\n",
+        "innerContent": [
+            "\n<figure class=\"wp-block-gallery\">\n\t<ul class=\"blocks-gallery-grid columns-2 is-cropped\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n\t<figcaption>Gallery caption.</figcaption>\n</figure>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
new file mode 100644
index 00000000000000..e5c131fd06c1c2
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<figure class="wp-block-gallery"><ul class="blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul><figcaption>Gallery caption.</figcaption></figure>
+<!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.html b/packages/e2e-tests/fixtures/blocks/core__gallery.html
index b91a575be9ca53..4533b7bd7af9f6 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped">
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index 4825848d9e6c43..b2b2059aa6eb83 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,10 +20,11 @@
                 null,
                 null
             ],
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
index 99c1ac20ed9562..907def5df53548 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
@@ -8,9 +8,9 @@
             ]
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
index 813f97c645287e..24ebb0d1cd4d93 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
index e97f7b9f87f3cb..243784c359066b 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery columns-1 is-cropped">
+<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index f149e3faf630a4..77815722299e45 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,10 +21,11 @@
                 null
             ],
             "columns": 1,
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
index 14a5b12897804f..1d5be9ec070fb1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
@@ -9,9 +9,9 @@
             "columns": 1
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
index cb2b112acad9e3..c578089e68cc6a 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
index eb7bc9482b7f29..9a8d9596ca1d07 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"columns":2,"align":"none"} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 3c0eacb2de59fb..ae7369c05d01ba 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -9,13 +9,13 @@
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
                     "id": "1",
-                    "caption": ""
+                    "caption": []
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
                     "id": "2",
-                    "caption": ""
+                    "caption": []
                 }
             ],
             "ids": [],
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
index 8951d81b0c4e80..8a5a4355e9a523 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:gallery {"columns":2} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
+<!-- wp:gallery {"ids":[],"columns":2} -->
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
new file mode 100644
index 00000000000000..b91a575be9ca53
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
new file mode 100644
index 00000000000000..1ab0e9709401c8
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -0,0 +1,29 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": []
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": []
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
new file mode 100644
index 00000000000000..99c1ac20ed9562
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerContent": [
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
new file mode 100644
index 00000000000000..24ebb0d1cd4d93
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<!-- /wp:gallery -->
diff --git a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
index d7bdedf537779b..0e9a51b2eebb18 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
@@ -30,7 +30,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:heading -->
 
 <!-- wp:gallery {\\"ids\\":[1],\\"columns\\":3,\\"linkTo\\":\\"attachment\\"} -->
-<ul class=\\"wp-block-gallery columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
 <!-- /wp:gallery -->
 
 <!-- wp:html -->
diff --git a/test/integration/fixtures/wordpress-out.html b/test/integration/fixtures/wordpress-out.html
index e179380c983daa..941440d9ab122e 100644
--- a/test/integration/fixtures/wordpress-out.html
+++ b/test/integration/fixtures/wordpress-out.html
@@ -19,5 +19,5 @@ <h3>Shortcode</h3>
 <!-- /wp:heading -->
 
 <!-- wp:gallery {"ids":[1],"columns":3,"linkTo":"attachment"} -->
-<ul class="wp-block-gallery columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
+<ul class="wp-block-gallery blocks-gallery-grid columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
 <!-- /wp:gallery -->

From 40ada1d3f2d715bd0a4f8f4aae88fcf314d5116e Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:56:59 +1000
Subject: [PATCH 43/52] e2e snapshot update

---
 .../__snapshots__/block-transforms.test.js.snap    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index 3288fac0c027a6..a411c092f8ef4a 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -92,7 +92,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -128,7 +128,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -156,7 +156,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[],\\"align\\":\\"center\\"} -->
-<ul class=\\"wp-block-gallery aligncenter columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery aligncenter blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -184,7 +184,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -212,7 +212,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -240,7 +240,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -268,7 +268,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 

From 09a571dcd67b605ab9001841e457731178f13599 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 14:57:13 +1000
Subject: [PATCH 44/52] Fix editor styles

---
 packages/block-library/src/gallery/editor.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index 9452f917298f69..fa6bcee764e845 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -1,4 +1,6 @@
-ul.wp-block-gallery {
+.wp-block-gallery {
+	display: block;
+
 	// Override the default list style type _only in the editor_
 	// to avoid :not() selector specificity issues.
 	// See https://github.com/WordPress/gutenberg/pull/10358

From 1fe3d2e93644129a74d580dadb8d70241dca46a3 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 16:08:27 +1000
Subject: [PATCH 45/52] Fix block transforms e2e

---
 packages/e2e-tests/fixtures/block-transforms.js        |  7 +++++++
 .../specs/__snapshots__/block-transforms.test.js.snap  | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/packages/e2e-tests/fixtures/block-transforms.js b/packages/e2e-tests/fixtures/block-transforms.js
index 3dd876b460a998..3d5875e7c5b40c 100644
--- a/packages/e2e-tests/fixtures/block-transforms.js
+++ b/packages/e2e-tests/fixtures/block-transforms.js
@@ -157,6 +157,13 @@ export const EXPECTED_TRANSFORMS = {
 			'Image',
 		],
 	},
+	'core__gallery-with-caption': {
+		originalBlock: 'Gallery',
+		availableTransforms: [
+			'Group',
+			'Image',
+		],
+	},
 	core__gallery__columns: {
 		originalBlock: 'Gallery',
 		availableTransforms: [
diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index a411c092f8ef4a..74366e7e2dfe8b 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -52,6 +52,16 @@ exports[`Block transforms correctly transform block Gallery in fixture core__gal
 <!-- /wp:image -->"
 `;
 
+exports[`Block transforms correctly transform block Gallery in fixture core__gallery-with-caption into the Image block 1`] = `
+"<!-- wp:image -->
+<figure class=\\"wp-block-image\\"><img src=\\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\\" alt=\\"title\\"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image -->
+<figure class=\\"wp-block-image\\"><img src=\\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\\" alt=\\"title\\"/></figure>
+<!-- /wp:image -->"
+`;
+
 exports[`Block transforms correctly transform block Heading in fixture core__heading__h2 into the Paragraph block 1`] = `
 "<!-- wp:paragraph -->
 <p>A picture is worth a thousand words, or so the saying goes</p>

From 2572f36d3b4b4f3b956b26d9fdb68bf0294ecd24 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 12 Aug 2019 18:26:12 +1000
Subject: [PATCH 46/52] Workaround for failing tests

---
 packages/block-library/src/gallery/save.js        | 15 ++++++++++-----
 .../e2e-tests/fixtures/blocks/core__gallery.html  |  2 +-
 .../e2e-tests/fixtures/blocks/core__gallery.json  |  2 +-
 .../fixtures/blocks/core__gallery.parsed.json     |  4 ++--
 .../fixtures/blocks/core__gallery.serialized.html |  2 +-
 .../fixtures/blocks/core__gallery__columns.html   |  2 +-
 .../fixtures/blocks/core__gallery__columns.json   |  2 +-
 .../blocks/core__gallery__columns.parsed.json     |  4 ++--
 .../blocks/core__gallery__columns.serialized.html |  2 +-
 .../core__gallery__deprecated-1.serialized.html   |  2 +-
 .../blocks/core__gallery__deprecated-2.json       |  5 +++--
 .../core__gallery__deprecated-2.serialized.html   |  4 ++--
 .../blocks/core__gallery__deprecated-3.json       |  5 +++--
 .../core__gallery__deprecated-3.serialized.html   |  2 +-
 .../__snapshots__/block-transforms.test.js.snap   | 14 +++++++-------
 .../blocks-raw-handling.test.js.snap              |  2 +-
 test/integration/fixtures/wordpress-out.html      |  2 +-
 17 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 2c49141ea80e59..86364c7625fc6b 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -10,9 +10,8 @@ import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
 	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
-
 	const baseGallery = (
-		<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+		<>
 			{ images.map( ( image ) => {
 				let href;
 
@@ -47,16 +46,22 @@ export default function save( { attributes } ) {
 					</li>
 				);
 			} ) }
-		</ul>
+		</>
 	);
 
 	if ( galleryCaption ) {
 		return (
 			<figure>
-				{ baseGallery }
+				<ul className={ `blocks-gallery-grid columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` }>
+					{ baseGallery }
+				</ul>
 				{ <RichText.Content tagName="figcaption" value={ galleryCaption } /> }
 			</figure>
 		);
 	}
-	return baseGallery;
+	return (
+		<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` }>
+			{ baseGallery }
+		</ul>
+	);
 }
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.html b/packages/e2e-tests/fixtures/blocks/core__gallery.html
index 4533b7bd7af9f6..b91a575be9ca53 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped">
+<ul class="wp-block-gallery columns-2 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index b2b2059aa6eb83..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -25,6 +25,6 @@
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
index 907def5df53548..99c1ac20ed9562 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.parsed.json
@@ -8,9 +8,9 @@
             ]
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
index 24ebb0d1cd4d93..813f97c645287e 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
index 243784c359066b..e97f7b9f87f3cb 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.html
@@ -1,5 +1,5 @@
 <!-- wp:core/gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped">
+<ul class="wp-block-gallery columns-1 is-cropped">
 	<li class="blocks-gallery-item">
 		<figure>
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 77815722299e45..83a8363d2f0cb5 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -26,6 +26,6 @@
             "linkTo": "none"
         },
         "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+        "originalContent": "<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
index 1d5be9ec070fb1..14a5b12897804f 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.parsed.json
@@ -9,9 +9,9 @@
             "columns": 1
         },
         "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
         "innerContent": [
-            "\n<ul class=\"wp-block-gallery blocks-gallery-grid columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+            "\n<ul class=\"wp-block-gallery columns-1 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
         ]
     },
     {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
index c578089e68cc6a..cb2b112acad9e3 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null],"columns":1} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-1 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
index 9a8d9596ca1d07..eb7bc9482b7f29 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"columns":2,"align":"none"} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index ae7369c05d01ba..9ab909dbb44e8c 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -9,17 +9,18 @@
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
                     "id": "1",
-                    "caption": []
+                    "caption": ""
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
                     "id": "2",
-                    "caption": []
+                    "caption": ""
                 }
             ],
             "ids": [],
             "columns": 2,
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
index 8a5a4355e9a523..8951d81b0c4e80 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:gallery {"ids":[],"columns":2} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
+<!-- wp:gallery {"columns":2} -->
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" data-id="1" class="wp-image-1"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" data-id="2" class="wp-image-2"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
index 1ab0e9709401c8..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -8,18 +8,19 @@
                 {
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
                     "alt": "title",
-                    "caption": []
+                    "caption": ""
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
                     "alt": "title",
-                    "caption": []
+                    "caption": ""
                 }
             ],
             "ids": [
                 null,
                 null
             ],
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
index 24ebb0d1cd4d93..813f97c645287e 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
 <!-- /wp:gallery -->
diff --git a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
index 74366e7e2dfe8b..959ae009325aea 100644
--- a/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
@@ -102,7 +102,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -138,7 +138,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__attachment-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -166,7 +166,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__center-caption into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[],\\"align\\":\\"center\\"} -->
-<ul class=\\"wp-block-gallery aligncenter blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery aligncenter columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -194,7 +194,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -222,7 +222,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-class into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -250,7 +250,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__custom-link-rel into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
@@ -278,7 +278,7 @@ exports[`Block transforms correctly transform block Image in fixture core__image
 
 exports[`Block transforms correctly transform block Image in fixture core__image__media-link into the Gallery block 1`] = `
 "<!-- wp:gallery {\\"ids\\":[]} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-0 is-cropped\\"></ul>
+<ul class=\\"wp-block-gallery columns-0 is-cropped\\"></ul>
 <!-- /wp:gallery -->"
 `;
 
diff --git a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
index 0e9a51b2eebb18..d7bdedf537779b 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
@@ -30,7 +30,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:heading -->
 
 <!-- wp:gallery {\\"ids\\":[1],\\"columns\\":3,\\"linkTo\\":\\"attachment\\"} -->
-<ul class=\\"wp-block-gallery blocks-gallery-grid columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
+<ul class=\\"wp-block-gallery columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
 <!-- /wp:gallery -->
 
 <!-- wp:html -->
diff --git a/test/integration/fixtures/wordpress-out.html b/test/integration/fixtures/wordpress-out.html
index 941440d9ab122e..e179380c983daa 100644
--- a/test/integration/fixtures/wordpress-out.html
+++ b/test/integration/fixtures/wordpress-out.html
@@ -19,5 +19,5 @@ <h3>Shortcode</h3>
 <!-- /wp:heading -->
 
 <!-- wp:gallery {"ids":[1],"columns":3,"linkTo":"attachment"} -->
-<ul class="wp-block-gallery blocks-gallery-grid columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
+<ul class="wp-block-gallery columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img data-id="1" class="wp-image-1"/></figure></li></ul>
 <!-- /wp:gallery -->

From b978a020caf86939b37e91a177fd9cde53173acc Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 10:51:40 +1000
Subject: [PATCH 47/52] Undo package-lock changes

---
 package-lock.json | 317 +++++++++-------------------------------------
 1 file changed, 61 insertions(+), 256 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48da0033095df0..6e04ccb2cb0cf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,10 @@
 {
 	"name": "gutenberg",
+<<<<<<< HEAD
 	"version": "6.3.0",
+=======
+	"version": "6.2.0",
+>>>>>>> Undo package-lock changes
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -4626,26 +4630,19 @@
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
-				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
-				"inherits": "^2.0.3",
 				"lodash": "^4.17.10",
-				"memize": "^1.0.5",
-				"react-autosize-textarea": "^3.0.2",
 				"react-spring": "^8.0.19",
 				"redux-multi": "^0.1.12",
 				"refx": "^3.0.0",
 				"rememo": "^3.0.0",
-				"tinycolor2": "^1.4.1",
-				"traverse": "^0.6.6"
+				"tinycolor2": "^1.4.1"
 			}
 		},
 		"@wordpress/block-library": {
 			"version": "file:packages/block-library",
 			"requires": {
 				"@babel/runtime": "^7.4.4",
-				"@wordpress/a11y": "file:packages/a11y",
-				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-editor": "file:packages/block-editor",
@@ -4654,23 +4651,18 @@
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/editor": "file:packages/editor",
 				"@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/keycodes": "file:packages/keycodes",
-				"@wordpress/rich-text": "file:packages/rich-text",
 				"@wordpress/server-side-render": "file:packages/server-side-render",
-				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"fast-average-color": "4.3.0",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
-				"moment": "^2.22.1",
-				"tinycolor2": "^1.4.1",
 				"url": "^0.11.0"
 			}
 		},
@@ -4683,8 +4675,7 @@
 		"@wordpress/block-serialization-spec-parser": {
 			"version": "file:packages/block-serialization-spec-parser",
 			"requires": {
-				"pegjs": "^0.10.0",
-				"phpegjs": "^1.0.0-beta7"
+				"pegjs": "^0.10.0"
 			}
 		},
 		"@wordpress/blocks": {
@@ -4694,7 +4685,7 @@
 				"@wordpress/autop": "file:packages/autop",
 				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
-				"@wordpress/compose": "file:packages/compose",
+				"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/dom": "file:packages/dom",
 				"@wordpress/element": "file:packages/element",
@@ -4730,14 +4721,17 @@
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
+				"@wordpress/url": "file:packages/url",
 				"classnames": "^2.2.5",
 				"clipboard": "^2.0.1",
+				"diff": "^3.5.0",
 				"dom-scroll-into-view": "^1.2.1",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"moment": "^2.22.1",
 				"mousetrap": "^1.6.2",
-				"re-resizable": "^6.0.0",
+				"re-resizable": "^5.0.1",
+				"react-click-outside": "^3.0.0",
 				"react-dates": "^17.1.1",
 				"react-spring": "^8.0.20",
 				"rememo": "^3.0.0",
@@ -4825,9 +4819,6 @@
 			"version": "file:packages/docgen",
 			"dev": true,
 			"requires": {
-				"doctrine": "^2.1.0",
-				"espree": "^4.0.0",
-				"lodash": "^4.17.14",
 				"mdast-util-inject": "1.1.0",
 				"optionator": "0.8.2",
 				"remark": "10.0.1",
@@ -4868,8 +4859,7 @@
 				"@wordpress/jest-puppeteer-axe": "file:packages/jest-puppeteer-axe",
 				"@wordpress/scripts": "file:packages/scripts",
 				"expect-puppeteer": "^4.3.0",
-				"lodash": "^4.17.14",
-				"uuid": "^3.3.2"
+				"lodash": "^4.17.14"
 			}
 		},
 		"@wordpress/edit-post": {
@@ -4890,17 +4880,13 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
-				"@wordpress/media-utils": "file:packages/media-utils",
-				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
 				"@wordpress/plugins": "file:packages/plugins",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.14",
-				"memize": "^1.0.5",
-				"refx": "^3.0.0",
-				"rememo": "^3.0.0"
+				"refx": "^3.0.0"
 			}
 		},
 		"@wordpress/edit-widgets": {
@@ -4908,19 +4894,10 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
-				"@wordpress/block-library": "file:packages/block-library",
-				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
-				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/data": "file:packages/data",
-				"@wordpress/data-controls": "file:packages/data-controls",
 				"@wordpress/element": "file:packages/element",
-				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/media-utils": "file:packages/media-utils",
-				"@wordpress/notices": "file:packages/notices",
-				"lodash": "^4.17.14",
-				"rememo": "^3.0.0"
+				"@wordpress/notices": "file:packages/notices"
 			}
 		},
 		"@wordpress/editor": {
@@ -4928,7 +4905,7 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/api-fetch": "file:packages/api-fetch",
-				"@wordpress/autop": "file:packages/autop",
+				"@wordpress/blob": "file:packages/blob",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
@@ -4942,23 +4919,22 @@
 				"@wordpress/hooks": "file:packages/hooks",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/media-utils": "file:packages/media-utils",
 				"@wordpress/notices": "file:packages/notices",
 				"@wordpress/nux": "file:packages/nux",
-				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/server-side-render": "file:packages/server-side-render",
 				"@wordpress/url": "file:packages/url",
 				"@wordpress/viewport": "file:packages/viewport",
 				"@wordpress/wordcount": "file:packages/wordcount",
 				"classnames": "^2.2.5",
+				"inherits": "^2.0.3",
 				"lodash": "^4.17.14",
 				"memize": "^1.0.5",
 				"react-autosize-textarea": "^3.0.2",
 				"redux-optimist": "^1.0.0",
 				"refx": "^3.0.0",
-				"rememo": "^3.0.0"
+				"rememo": "^3.0.0",
+				"traverse": "^0.6.6"
 			}
 		},
 		"@wordpress/element": {
@@ -4996,14 +4972,13 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/block-editor": "file:packages/block-editor",
 				"@wordpress/components": "file:packages/components",
-				"@wordpress/dom": "file:packages/dom",
+				"@wordpress/editor": "file:packages/editor",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/keycodes": "file:packages/keycodes",
 				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/url": "file:packages/url",
-				"lodash": "^4.17.14"
+				"@wordpress/url": "file:packages/url"
 			}
 		},
 		"@wordpress/hooks": {
@@ -5157,7 +5132,6 @@
 			"requires": {
 				"@babel/runtime": "^7.4.4",
 				"is-promise": "^2.1.0",
-				"lodash": "^4.17.14",
 				"rungen": "^0.3.2"
 			}
 		},
@@ -5167,6 +5141,11 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
+<<<<<<< HEAD
+=======
+				"@wordpress/deprecated": "file:packages/deprecated",
+				"@wordpress/dom": "file:packages/dom",
+>>>>>>> Undo package-lock changes
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/escape-html": "file:packages/escape-html",
 				"@wordpress/hooks": "file:packages/hooks",
@@ -5217,7 +5196,6 @@
 				"@wordpress/api-fetch": "file:packages/api-fetch",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/data": "file:packages/data",
-				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/url": "file:packages/url",
@@ -5252,6 +5230,7 @@
 				"@babel/runtime": "^7.4.4",
 				"@wordpress/compose": "file:packages/compose",
 				"@wordpress/data": "file:packages/data",
+				"@wordpress/element": "file:packages/element",
 				"lodash": "^4.17.14"
 			}
 		},
@@ -7736,7 +7715,7 @@
 							"dependencies": {
 								"minimist": {
 									"version": "1.2.0",
-									"resolved": "",
+									"resolved": false,
 									"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 									"dev": true,
 									"optional": true
@@ -8565,12 +8544,6 @@
 			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
 			"dev": true
 		},
-		"contains-path": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-			"dev": true
-		},
 		"content-disposition": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -10871,190 +10844,6 @@
 				}
 			}
 		},
-		"eslint-import-resolver-node": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-			"integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.9",
-				"resolve": "^1.5.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-module-utils": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
-			"integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.8",
-				"pkg-dir": "^2.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-plugin-eslint-comments": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz",
-			"integrity": "sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5",
-				"ignore": "^5.0.5"
-			},
-			"dependencies": {
-				"ignore": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz",
-					"integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-import": {
-			"version": "2.18.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
-			"integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.0.3",
-				"contains-path": "^0.1.0",
-				"debug": "^2.6.9",
-				"doctrine": "1.5.0",
-				"eslint-import-resolver-node": "^0.3.2",
-				"eslint-module-utils": "^2.4.0",
-				"has": "^1.0.3",
-				"minimatch": "^3.0.4",
-				"object.values": "^1.1.0",
-				"read-pkg-up": "^2.0.0",
-				"resolve": "^1.11.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-					"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-					"dev": true,
-					"requires": {
-						"object-keys": "^1.0.12"
-					}
-				},
-				"doctrine": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-					"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2",
-						"isarray": "^1.0.0"
-					}
-				},
-				"load-json-file": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-					"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"object.values": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
-					"integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
-					"dev": true,
-					"requires": {
-						"define-properties": "^1.1.3",
-						"es-abstract": "^1.12.0",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3"
-					}
-				},
-				"path-parse": {
-					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-					"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-					"dev": true
-				},
-				"path-type": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-					"dev": true,
-					"requires": {
-						"pify": "^2.0.0"
-					}
-				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"resolve": {
-					"version": "1.12.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-					"integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-					"dev": true
-				}
-			}
-		},
 		"eslint-plugin-jest": {
 			"version": "22.14.1",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.14.1.tgz",
@@ -11457,9 +11246,9 @@
 			}
 		},
 		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
 			"dev": true
 		},
 		"extend-shallow": {
@@ -12589,7 +12378,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -20318,7 +20107,8 @@
 		"phpegjs": {
 			"version": "1.0.0-beta7",
 			"resolved": "https://registry.npmjs.org/phpegjs/-/phpegjs-1.0.0-beta7.tgz",
-			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ="
+			"integrity": "sha1-uLbthQGYB//Q7+ID4AKj5e2LTZQ=",
+			"dev": true
 		},
 		"physical-cpu-count": {
 			"version": "2.0.0",
@@ -21264,9 +21054,9 @@
 			},
 			"dependencies": {
 				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+					"version": "4.17.11",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
 					"dev": true
 				}
 			}
@@ -21753,9 +21543,9 @@
 			}
 		},
 		"re-resizable": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.0.0.tgz",
-			"integrity": "sha512-RTrnhbGgYyZ4hTc6db4JeMnRfmloEPWtuYaXZEa2PRaEC4mreWNFnZtMVsHil3z3iX+WchD+da8BLlTJBcstMA==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-5.0.1.tgz",
+			"integrity": "sha512-Iy8v5li7bhNBDxCN1DbA4l6G2Hk8NCZtcExoI1D+5pfvKyQcH8LH2P5h3DGoEfHhs0uyyRC1Qx8bHBomfrmxgA==",
 			"requires": {
 				"fast-memoize": "^2.5.1"
 			}
@@ -21790,6 +21580,21 @@
 				"prop-types": "^15.5.6"
 			}
 		},
+		"react-click-outside": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/react-click-outside/-/react-click-outside-3.0.1.tgz",
+			"integrity": "sha512-d0KWFvBt+esoZUF15rL2UBB7jkeAqLU8L/Ny35oLK6fW6mIbOv/ChD+ExF4sR9PD26kVx+9hNfD0FTIqRZEyRQ==",
+			"requires": {
+				"hoist-non-react-statics": "^2.1.1"
+			},
+			"dependencies": {
+				"hoist-non-react-statics": {
+					"version": "2.5.5",
+					"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+					"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+				}
+			}
+		},
 		"react-dates": {
 			"version": "17.2.0",
 			"resolved": "https://registry.npmjs.org/react-dates/-/react-dates-17.2.0.tgz",
@@ -23312,9 +23117,9 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"safer-eval": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.5.tgz",
-			"integrity": "sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==",
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.2.tgz",
+			"integrity": "sha512-mAkc9NX+ULPw4qX+lkFVuIhXQbjFaX97fWFj6atFXMG11lUX4rXfQY6Q0VFf1wfJfqCHYO7cxtC7cA8fIkWsLQ==",
 			"dev": true,
 			"requires": {
 				"clones": "^1.2.0"
@@ -25108,9 +24913,9 @@
 					"dev": true
 				},
 				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+					"version": "4.17.11",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+					"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
 					"dev": true
 				},
 				"slice-ansi": {

From 220968e8caab8c44fbc0614b1df90082af9a64f5 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 13 Aug 2019 14:44:50 +1000
Subject: [PATCH 48/52] Fix messed up styles.

---
 packages/block-library/src/gallery/editor.scss | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index fa6bcee764e845..955293c8f8e65f 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -1,6 +1,4 @@
 .wp-block-gallery {
-	display: block;
-
 	// Override the default list style type _only in the editor_
 	// to avoid :not() selector specificity issues.
 	// See https://github.com/WordPress/gutenberg/pull/10358
@@ -12,6 +10,16 @@
 	.is-selected & {
 		margin-bottom: 0;
 	}
+
+	// Targets gallery caption.
+	> .block-editor-rich-text {
+		text-align: center;
+	}
+}
+
+figure.wp-block-gallery {
+	display: block;
+	margin-left: 0;
 }
 
 .blocks-gallery-item {

From 02171edf21d631fdefcb38325da081f6e5ab5f65 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Wed, 14 Aug 2019 18:16:50 +1000
Subject: [PATCH 49/52] Addressed design feedback.

---
 packages/block-library/src/gallery/editor.scss | 11 +++--------
 packages/block-library/src/gallery/style.scss  | 11 ++++-------
 packages/block-library/src/gallery/theme.scss  |  4 ++++
 packages/block-library/src/theme.scss          |  1 +
 4 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 packages/block-library/src/gallery/theme.scss

diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index 955293c8f8e65f..8595836c9ebe2f 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -10,16 +10,11 @@
 	.is-selected & {
 		margin-bottom: 0;
 	}
-
-	// Targets gallery caption.
-	> .block-editor-rich-text {
-		text-align: center;
-	}
 }
 
-figure.wp-block-gallery {
-	display: block;
-	margin-left: 0;
+// need to override default editor ul styles
+.blocks-gallery-grid.blocks-gallery-grid {
+	margin-bottom: 0;
 }
 
 .blocks-gallery-item {
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index 9727baa5c9812d..dcef0c46593720 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -149,11 +149,8 @@
 			justify-content: center;
 		}
 	}
-
-	+ figcaption {
-		margin-top: -$grid-size;
-		font-size: $editor-font-size;
-		font-family: $default-font;
-		color: $dark-gray-500;
-	}
+}
+figure.wp-block-gallery {
+	display: block;
+	margin: 0;
 }
diff --git a/packages/block-library/src/gallery/theme.scss b/packages/block-library/src/gallery/theme.scss
new file mode 100644
index 00000000000000..289194d5f4cecf
--- /dev/null
+++ b/packages/block-library/src/gallery/theme.scss
@@ -0,0 +1,4 @@
+.blocks-gallery-grid + figcaption,
+.wp-block-gallery > .block-editor-rich-text {
+	@include caption-style-theme();
+}
diff --git a/packages/block-library/src/theme.scss b/packages/block-library/src/theme.scss
index 691a7c53e9b4b1..57eaa3a710d07c 100644
--- a/packages/block-library/src/theme.scss
+++ b/packages/block-library/src/theme.scss
@@ -1,6 +1,7 @@
 @import "./audio/theme.scss";
 @import "./code/theme.scss";
 @import "./embed/theme.scss";
+@import "./gallery/theme.scss";
 @import "./image/theme.scss";
 @import "./preformatted/theme.scss";
 @import "./pullquote/theme.scss";

From 1302a85c9c9ec6a6e03ece8f854b8cf379cdde5e Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Wed, 14 Aug 2019 18:44:17 +1000
Subject: [PATCH 50/52] Change caption name and remove deprecation.

---
 packages/block-library/src/gallery/block.json |  2 +-
 .../block-library/src/gallery/deprecated.js   | 99 -------------------
 packages/block-library/src/gallery/edit.js    |  2 +-
 packages/block-library/src/gallery/save.js    |  2 +-
 .../blocks/core__gallery-with-caption.json    |  2 +-
 .../fixtures/blocks/core__gallery.json        |  2 +-
 .../blocks/core__gallery__columns.json        |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  2 +-
 .../blocks/core__gallery__deprecated-3.html   | 14 ---
 .../blocks/core__gallery__deprecated-3.json   | 30 ------
 .../core__gallery__deprecated-3.parsed.json   | 25 -----
 ...ore__gallery__deprecated-3.serialized.html |  3 -
 12 files changed, 7 insertions(+), 178 deletions(-)
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 delete mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index e677e7eb365628..da3612b7d2fb0a 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"galleryCaption": {
+		"caption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 74af7e3f50b6e7..2b77e33e0b36e4 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,105 +15,6 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
-	{
-		attributes: {
-			images: {
-				type: 'array',
-				default: [],
-				source: 'query',
-				selector: 'ul.wp-block-gallery .blocks-gallery-item',
-				query: {
-					url: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'src',
-					},
-					fullUrl: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-full-url',
-					},
-					alt: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'alt',
-						default: '',
-					},
-					id: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-id',
-					},
-					link: {
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-link',
-					},
-					caption: {
-						type: 'array',
-						source: 'children',
-						selector: 'figcaption',
-					},
-				},
-			},
-			ids: {
-				type: 'array',
-				default: [],
-			},
-			columns: {
-				type: 'number',
-			},
-			imageCrop: {
-				type: 'boolean',
-				default: true,
-			},
-			linkTo: {
-				type: 'string',
-				default: 'none',
-			},
-		},
-		save( { attributes } ) {
-			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
-			return (
-				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
-					{ images.map( ( image ) => {
-						let href;
-
-						switch ( linkTo ) {
-							case 'media':
-								href = image.fullUrl || image.url;
-								break;
-							case 'attachment':
-								href = image.link;
-								break;
-						}
-
-						const img = (
-							<img
-								src={ image.url }
-								alt={ image.alt }
-								data-id={ image.id }
-								data-full-url={ image.fullUrl }
-								data-link={ image.link }
-								className={ image.id ? `wp-image-${ image.id }` : null }
-							/>
-						);
-
-						return (
-							<li key={ image.id || image.url } className="blocks-gallery-item">
-								<figure>
-									{ href ? <a href={ href }>{ img }</a> : img }
-									{ image.caption && image.caption.length > 0 && (
-										<RichText.Content tagName="figcaption" value={ image.caption } />
-									) }
-								</figure>
-							</li>
-						);
-					} ) }
-				</ul>
-			);
-		},
-	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 8a6c05c095c70b..2a90bd45e7d2a2 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 86364c7625fc6b..ac8c346f328716 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 72617e1d629527..234396e37da3f1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "Gallery caption.",
+            "caption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 83a8363d2f0cb5..06c7288273a836 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 9ab909dbb44e8c..4a7fa792469800 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
deleted file mode 100644
index b91a575be9ca53..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- wp:core/gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped">
-	<li class="blocks-gallery-item">
-		<figure>
-			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
-		</figure>
-	</li>
-	<li class="blocks-gallery-item">
-		<figure>
-			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
-		</figure>
-	</li>
-</ul>
-<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
deleted file mode 100644
index fb2db61c343094..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "clientId": "_clientId_0",
-        "name": "core/gallery",
-        "isValid": true,
-        "attributes": {
-            "images": [
-                {
-                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
-                    "alt": "title",
-                    "caption": ""
-                },
-                {
-                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
-                    "alt": "title",
-                    "caption": ""
-                }
-            ],
-            "ids": [
-                null,
-                null
-            ],
-            "galleryCaption": "",
-            "imageCrop": true,
-            "linkTo": "none"
-        },
-        "innerBlocks": [],
-        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
-    }
-]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
deleted file mode 100644
index 99c1ac20ed9562..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-    {
-        "blockName": "core/gallery",
-        "attrs": {
-            "ids": [
-                null,
-                null
-            ]
-        },
-        "innerBlocks": [],
-        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
-        "innerContent": [
-            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
-        ]
-    },
-    {
-        "blockName": null,
-        "attrs": {},
-        "innerBlocks": [],
-        "innerHTML": "\n",
-        "innerContent": [
-            "\n"
-        ]
-    }
-]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
deleted file mode 100644
index 813f97c645287e..00000000000000
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:gallery {"ids":[null,null]} -->
-<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
-<!-- /wp:gallery -->

From 136171287ce8bd0df05c594cd7568e733bdd6605 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 19 Aug 2019 16:46:59 +1000
Subject: [PATCH 51/52] Revert "Change caption name and remove deprecation."

This reverts commit 9a0876c608eb3eaaeab51189ee1d34f665cf336d.
---
 packages/block-library/src/gallery/block.json |  2 +-
 .../block-library/src/gallery/deprecated.js   | 99 +++++++++++++++++++
 packages/block-library/src/gallery/edit.js    |  2 +-
 packages/block-library/src/gallery/save.js    |  2 +-
 .../blocks/core__gallery-with-caption.json    |  2 +-
 .../fixtures/blocks/core__gallery.json        |  2 +-
 .../blocks/core__gallery__columns.json        |  2 +-
 .../blocks/core__gallery__deprecated-2.json   |  2 +-
 .../blocks/core__gallery__deprecated-3.html   | 14 +++
 .../blocks/core__gallery__deprecated-3.json   | 30 ++++++
 .../core__gallery__deprecated-3.parsed.json   | 25 +++++
 ...ore__gallery__deprecated-3.serialized.html |  3 +
 12 files changed, 178 insertions(+), 7 deletions(-)
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index da3612b7d2fb0a..e677e7eb365628 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"caption": {
+		"galleryCaption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 2b77e33e0b36e4..74af7e3f50b6e7 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -15,6 +15,105 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 const deprecated = [
+	{
+		attributes: {
+			images: {
+				type: 'array',
+				default: [],
+				source: 'query',
+				selector: 'ul.wp-block-gallery .blocks-gallery-item',
+				query: {
+					url: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'src',
+					},
+					fullUrl: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-full-url',
+					},
+					alt: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'alt',
+						default: '',
+					},
+					id: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-id',
+					},
+					link: {
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-link',
+					},
+					caption: {
+						type: 'array',
+						source: 'children',
+						selector: 'figcaption',
+					},
+				},
+			},
+			ids: {
+				type: 'array',
+				default: [],
+			},
+			columns: {
+				type: 'number',
+			},
+			imageCrop: {
+				type: 'boolean',
+				default: true,
+			},
+			linkTo: {
+				type: 'string',
+				default: 'none',
+			},
+		},
+		save( { attributes } ) {
+			const { images, columns = defaultColumnsNumber( attributes ), imageCrop, linkTo } = attributes;
+			return (
+				<ul className={ `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }` } >
+					{ images.map( ( image ) => {
+						let href;
+
+						switch ( linkTo ) {
+							case 'media':
+								href = image.fullUrl || image.url;
+								break;
+							case 'attachment':
+								href = image.link;
+								break;
+						}
+
+						const img = (
+							<img
+								src={ image.url }
+								alt={ image.alt }
+								data-id={ image.id }
+								data-full-url={ image.fullUrl }
+								data-link={ image.link }
+								className={ image.id ? `wp-image-${ image.id }` : null }
+							/>
+						);
+
+						return (
+							<li key={ image.id || image.url } className="blocks-gallery-item">
+								<figure>
+									{ href ? <a href={ href }>{ img }</a> : img }
+									{ image.caption && image.caption.length > 0 && (
+										<RichText.Content tagName="figcaption" value={ image.caption } />
+									) }
+								</figure>
+							</li>
+						);
+					} ) }
+				</ul>
+			);
+		},
+	},
 	{
 		attributes: {
 			images: {
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 2a90bd45e7d2a2..8a6c05c095c70b 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index ac8c346f328716..86364c7625fc6b 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 234396e37da3f1..72617e1d629527 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "caption": "Gallery caption.",
+            "galleryCaption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index edc367a12ba722..fb2db61c343094 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 06c7288273a836..83a8363d2f0cb5 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 4a7fa792469800..9ab909dbb44e8c 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "caption": "",
+            "galleryCaption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
new file mode 100644
index 00000000000000..b91a575be9ca53
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
new file mode 100644
index 00000000000000..fb2db61c343094
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -0,0 +1,30 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "title",
+                    "caption": ""
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "title",
+                    "caption": ""
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "galleryCaption": "",
+            "imageCrop": true,
+            "linkTo": "none"
+        },
+        "innerBlocks": [],
+        "originalContent": "<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
new file mode 100644
index 00000000000000..99c1ac20ed9562
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+        "innerContent": [
+            "\n<ul class=\"wp-block-gallery columns-2 is-cropped\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
new file mode 100644
index 00000000000000..813f97c645287e
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null]} -->
+<ul class="wp-block-gallery columns-2 is-cropped"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure></li></ul>
+<!-- /wp:gallery -->

From c401419a4b3d7c3e491acc24f8508912e4867ce0 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Mon, 19 Aug 2019 16:53:53 +1000
Subject: [PATCH 52/52] Re-add gallery caption name change.

---
 packages/block-library/src/gallery/block.json                   | 2 +-
 packages/block-library/src/gallery/edit.js                      | 2 +-
 packages/block-library/src/gallery/save.js                      | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery-with-caption.json   | 2 +-
 packages/e2e-tests/fixtures/blocks/core__gallery.json           | 2 +-
 packages/e2e-tests/fixtures/blocks/core__gallery__columns.json  | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json  | 2 +-
 .../e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index e677e7eb365628..da3612b7d2fb0a 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -48,7 +48,7 @@
 		"columns": {
 			"type": "number"
 		},
-		"galleryCaption": {
+		"caption": {
 			"type": "string",
 			"source": "html",
 			"selector": "figcaption"
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 8a6c05c095c70b..2a90bd45e7d2a2 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -250,7 +250,7 @@ class GalleryEdit extends Component {
 
 	render() {
 		const { attributes, isSelected, className, noticeUI, setAttributes } = this.props;
-		const { images, columns = defaultColumnsNumber( attributes ), align, galleryCaption, imageCrop, linkTo } = attributes;
+		const { images, columns = defaultColumnsNumber( attributes ), align, caption: galleryCaption, imageCrop, linkTo } = attributes;
 		const hasImages = !! images.length;
 
 		const mediaPlaceholder = (
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 86364c7625fc6b..ac8c346f328716 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -9,7 +9,7 @@ import { RichText } from '@wordpress/block-editor';
 import { defaultColumnsNumber } from './shared';
 
 export default function save( { attributes } ) {
-	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, galleryCaption, linkTo } = attributes;
+	const { images, columns = defaultColumnsNumber( attributes ), imageCrop, caption: galleryCaption, linkTo } = attributes;
 	const baseGallery = (
 		<>
 			{ images.map( ( image ) => {
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
index 72617e1d629527..234396e37da3f1 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery-with-caption.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "Gallery caption.",
+            "caption": "Gallery caption.",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery.json b/packages/e2e-tests/fixtures/blocks/core__gallery.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
index 83a8363d2f0cb5..06c7288273a836 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__columns.json
@@ -21,7 +21,7 @@
                 null
             ],
             "columns": 1,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
index 9ab909dbb44e8c..4a7fa792469800 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-2.json
@@ -20,7 +20,7 @@
             ],
             "ids": [],
             "columns": 2,
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
index fb2db61c343094..edc367a12ba722 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__deprecated-3.json
@@ -20,7 +20,7 @@
                 null,
                 null
             ],
-            "galleryCaption": "",
+            "caption": "",
             "imageCrop": true,
             "linkTo": "none"
         },