From 0bfc1a42b8dbb8b0d9e4ed0ff3def1d4d9d40372 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Mon, 6 Jul 2020 11:07:15 +0200
Subject: [PATCH 1/3] Release: WordPress 5.5 beta 1 finishing touches

---
 lib/block-directory.php |  1 +
 lib/client-assets.php   |  5 ++++-
 lib/compat.php          | 16 ++--------------
 lib/rest-api.php        |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/block-directory.php b/lib/block-directory.php
index 3f80d053dd84cb..cb1ec4bd9d1a2c 100644
--- a/lib/block-directory.php
+++ b/lib/block-directory.php
@@ -29,6 +29,7 @@ function gutenberg_enqueue_block_editor_assets_block_directory() {
 	 * This filter can be removed when plugin support requires WordPress 5.5.0+.
 	 *
 	 * @see https://core.trac.wordpress.org/ticket/48654
+	 * @see https://core.trac.wordpress.org/changeset/48295
 	 *
 	 * @param string $tag     The `<script>` tag for the enqueued script.
 	 * @param string $handle  The script's registered handle.
diff --git a/lib/client-assets.php b/lib/client-assets.php
index e56bec615f6495..92d2d8c604819b 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -720,8 +720,9 @@ function gutenberg_extend_settings_link_color( $settings ) {
 
 /*
  * Register default patterns if not registered in Core already.
+ *
+ * @TODO: Add link to Core ticket.
  */
-
 if ( class_exists( 'WP_Block_Patterns_Registry' ) && ! WP_Block_Patterns_Registry::get_instance()->is_registered( 'text-two-columns' ) ) {
 	register_block_pattern( 'core/text-two-columns', gutenberg_load_block_pattern( 'text-two-columns' ) );
 	register_block_pattern( 'core/two-buttons', gutenberg_load_block_pattern( 'two-buttons' ) );
@@ -737,6 +738,8 @@ function gutenberg_extend_settings_link_color( $settings ) {
 
 /*
  * Register default pattern categories if not registered in Core already.
+ *
+ * @TODO: Add link to Core ticket.
  */
 if ( class_exists( 'WP_Block_Pattern_Categories_Registry' ) ) {
 	register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category', 'gutenberg' ) ) );
diff --git a/lib/compat.php b/lib/compat.php
index 1ff0bb2b2114ea..87ecee9f45a838 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -340,6 +340,7 @@ function gutenberg_add_dom_rect_polyfill( $scripts ) {
  * This can be removed when plugin support requires WordPress 5.5.0+.
  *
  * @see https://core.trac.wordpress.org/ticket/50278
+ * @see https://core.trac.wordpress.org/changeset/48177
  *
  * @param array[] $default_categories Array of block categories.
  *
@@ -401,6 +402,7 @@ function gutenberg_replace_default_block_categories( $default_categories ) {
  * This can be removed when plugin support requires WordPress 5.5.0+.
  *
  * @see https://core.trac.wordpress.org/ticket/49927
+ * @see https://core.trac.wordpress.org/changeset/48243
  *
  * @param string|null $pre_render   The pre-rendered content. Defaults to null.
  * @param array       $parsed_block The parsed block being rendered.
@@ -459,20 +461,6 @@ function gutenberg_render_block_with_assigned_block_context( $pre_render, $parse
 }
 add_filter( 'pre_render_block', 'gutenberg_render_block_with_assigned_block_context', 9, 2 );
 
-/**
- * Avoid enqueueing block assets of all registered blocks for all posts, instead
- * deferring to block render mechanics to enqueue scripts, thereby ensuring only
- * blocks of the content have their assets enqueued.
- *
- * This can be removed once minimum support for the plugin is outside the range
- * of the version associated with closure of the following ticket.
- *
- * @see https://core.trac.wordpress.org/ticket/50328
- *
- * @see WP_Block::render
- */
-remove_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
-
 /**
  * Shim that hooks into `wp_update_nav_menu_item` and makes it so that nav menu
  * items support a 'content' field. This field contains HTML and is used by nav
diff --git a/lib/rest-api.php b/lib/rest-api.php
index 72101776e80ef6..fecf69d4645088 100644
--- a/lib/rest-api.php
+++ b/lib/rest-api.php
@@ -57,7 +57,7 @@ function gutenberg_filter_oembed_result( $response, $handler, $request ) {
  *
  * @todo Remove once Gutenberg's minimum required WordPress version is v5.5.
  * @see https://core.trac.wordpress.org/ticket/49906
- * @see https://github.com/WordPress/wordpress-develop/pull/222
+ * @see https://core.trac.wordpress.org/changeset/47921
  *
  * @param WP_REST_Response $response The response object.
  * @param WP_Theme         $theme    Theme object used to create response.

From 0a0892dd5c067fe7d9cdd172d2dca50c906a733b Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 6 Jul 2020 10:12:42 +0100
Subject: [PATCH 2/3] Add patterns ticket

---
 lib/client-assets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/client-assets.php b/lib/client-assets.php
index 92d2d8c604819b..e6dfcda9bed604 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -721,7 +721,7 @@ function gutenberg_extend_settings_link_color( $settings ) {
 /*
  * Register default patterns if not registered in Core already.
  *
- * @TODO: Add link to Core ticket.
+ * @see https://core.trac.wordpress.org/ticket/50550
  */
 if ( class_exists( 'WP_Block_Patterns_Registry' ) && ! WP_Block_Patterns_Registry::get_instance()->is_registered( 'text-two-columns' ) ) {
 	register_block_pattern( 'core/text-two-columns', gutenberg_load_block_pattern( 'text-two-columns' ) );
@@ -739,7 +739,7 @@ function gutenberg_extend_settings_link_color( $settings ) {
 /*
  * Register default pattern categories if not registered in Core already.
  *
- * @TODO: Add link to Core ticket.
+ * @see https://core.trac.wordpress.org/ticket/50550
  */
 if ( class_exists( 'WP_Block_Pattern_Categories_Registry' ) ) {
 	register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category', 'gutenberg' ) ) );

From 932960baf448b18b580e0a8c5d0eb19037e7053b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Zi=C3=B3=C5=82kowski?= <grzegorz@gziolo.pl>
Date: Mon, 6 Jul 2020 11:14:30 +0200
Subject: [PATCH 3/3] Update client-assets.php

---
 lib/client-assets.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/client-assets.php b/lib/client-assets.php
index e6dfcda9bed604..501842e919c3a8 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -721,6 +721,8 @@ function gutenberg_extend_settings_link_color( $settings ) {
 /*
  * Register default patterns if not registered in Core already.
  *
+ * This can be removed when plugin support requires WordPress 5.5.0+.
+ *
  * @see https://core.trac.wordpress.org/ticket/50550
  */
 if ( class_exists( 'WP_Block_Patterns_Registry' ) && ! WP_Block_Patterns_Registry::get_instance()->is_registered( 'text-two-columns' ) ) {
@@ -739,6 +741,8 @@ function gutenberg_extend_settings_link_color( $settings ) {
 /*
  * Register default pattern categories if not registered in Core already.
  *
+ * This can be removed when plugin support requires WordPress 5.5.0+.
+ *
  * @see https://core.trac.wordpress.org/ticket/50550
  */
 if ( class_exists( 'WP_Block_Pattern_Categories_Registry' ) ) {