Add/caption for gallery block

.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

.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 \

.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 \

.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.

.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:

.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:

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.
 

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.
 

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.
 

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
  *