From 625c7e7bf789aa418b720e53d8d044aa3662e4d8 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Tue, 5 Mar 2019 15:48:07 +0100
Subject: [PATCH] Add a way to override core block registration based on
 metadata

---
 lib/blocks.php                                | 62 +++++++++++++++++++
 lib/load.php                                  | 36 +----------
 .../block-library/src/archives/block.json     |  7 ++-
 packages/block-library/src/archives/index.php | 16 +----
 packages/block-library/src/block/block.json   |  5 +-
 packages/block-library/src/block/index.php    | 16 +----
 .../block-library/src/calendar/block.json     |  5 +-
 packages/block-library/src/calendar/index.php | 16 +----
 .../block-library/src/categories/block.json   |  7 ++-
 .../block-library/src/categories/index.php    | 20 +-----
 packages/block-library/src/index.js           | 32 +++++-----
 .../src/latest-comments/block.json            |  7 ++-
 .../src/latest-comments/index.php             | 20 +-----
 .../block-library/src/latest-posts/block.json |  7 ++-
 .../block-library/src/latest-posts/index.php  | 16 +----
 packages/block-library/src/rss/block.json     |  9 ++-
 packages/block-library/src/rss/index.php      | 17 +----
 packages/block-library/src/search/index.php   |  4 +-
 .../block-library/src/shortcode/index.php     |  4 +-
 .../block-library/src/tag-cloud/block.json    |  9 ++-
 .../block-library/src/tag-cloud/index.php     | 17 +----
 21 files changed, 125 insertions(+), 207 deletions(-)
 create mode 100644 lib/blocks.php

diff --git a/lib/blocks.php b/lib/blocks.php
new file mode 100644
index 00000000000000..3049b03c19232f
--- /dev/null
+++ b/lib/blocks.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Overrides all core blocks.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Registers block type from metadata file.
+ *
+ * @param string $file   Path to the translation file to load.
+ */
+function gutenberg_register_block_type_from_metadata( $file ) {
+	$metadata = json_decode( file_get_contents( $file ), true );
+	if ( empty( $metadata['name'] ) || empty( $metadata['title'] ) || empty( $metadata['category'] ) ) {
+		$message = __( 'Required block types must be provided.' );
+		_doing_it_wrong( __FUNCTION__, $message, '5.2.0' );
+		return;
+	}
+	$block_name = $metadata['name'];
+	$settings = array(
+		'title' => $metadata['title'],
+		'category' => $metadata['category'],
+	);
+	foreach( array( 'description', 'keywords', 'attributes', 'supports' ) as $field_name ) {
+		if ( ! empty( $metadata[ $field_name ] ) ) {
+			$settings[ $field_name ] = $metadata[ $field_name ];
+		}
+	}
+	if ( ! empty( $metadata['renderCallback'] ) ) {
+		$render_callback_file = dirname( $file ) . '/' . $metadata['renderCallback'];
+		if ( file_exists( $render_callback_file ) ) {
+			require $render_callback_file;
+			$settings['render_callback'] = 'gutenberg_render_block_' . str_replace( array( '/', '-' ), '_', $block_name );
+		}
+	}
+	$registry = WP_Block_Type_Registry::get_instance();
+	if ( $registry->is_registered( $block_name ) ) {
+		$registry->unregister( $block_name );
+	}
+	register_block_type( $block_name, $settings );
+}
+
+function gutenberg_override_core_blocks() {
+	$block_types = array(
+		'archives',
+		'block',
+		'calendar',
+		'categories',
+		'latest-comments',
+		'latest-posts',
+		'rss',
+		'tag-cloud'
+	);
+
+	$file_format = dirname( dirname( __FILE__ ) ) . '/packages/block-library/src/%s/block.json';
+	foreach ( $block_types as $name ) {
+		gutenberg_register_block_type_from_metadata( sprintf( $file_format, $name ) );
+	}
+}
+
+add_action( 'init', 'gutenberg_override_core_blocks' );
diff --git a/lib/load.php b/lib/load.php
index 999523ed52ff68..be3c4d429f96bd 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -20,38 +20,4 @@
 require dirname( __FILE__ ) . '/register.php';
 require dirname( __FILE__ ) . '/demo.php';
 require dirname( __FILE__ ) . '/widgets-page.php';
-
-// Register server-side code for individual blocks.
-if ( ! function_exists( 'render_block_core_archives' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/archives/index.php';
-}
-if ( ! function_exists( 'render_block_core_block' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/block/index.php';
-}
-if ( ! function_exists( 'render_block_core_categories' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/categories/index.php';
-}
-// Currently merged in core as `gutenberg_render_block_core_latest_comments`,
-// expected to change soon.
-if ( ! function_exists( 'render_block_core_calendar' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/calendar/index.php';
-}
-if ( ! function_exists( 'render_block_core_latest_comments' )
-	&& ! function_exists( 'gutenberg_render_block_core_latest_comments' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/latest-comments/index.php';
-}
-if ( ! function_exists( 'render_block_core_latest_posts' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/latest-posts/index.php';
-}
-if ( ! function_exists( 'render_block_core_rss' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/rss/index.php';
-}
-if ( ! function_exists( 'render_block_core_shortcode' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/shortcode/index.php';
-}
-if ( ! function_exists( 'render_block_core_tag_cloud' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/tag-cloud/index.php';
-}
-if ( ! function_exists( 'render_block_core_search' ) ) {
-	require dirname( __FILE__ ) . '/../packages/block-library/src/search/index.php';
-}
+require dirname( __FILE__ ) . '/blocks.php';
diff --git a/packages/block-library/src/archives/block.json b/packages/block-library/src/archives/block.json
index a75a6f4b9e568a..b0715ec051c146 100644
--- a/packages/block-library/src/archives/block.json
+++ b/packages/block-library/src/archives/block.json
@@ -3,7 +3,7 @@
 	"title": "Archives",
 	"category": "widgets",
 	"icon": {
-		"src": "./icon.js"
+		"src": "icon.js"
 	},
 	"description": "Display a monthly archive of your posts.",
 	"attributes": {
@@ -22,10 +22,11 @@
 			"default": false
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true,
 		"alignWide": false,
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/archives/index.php b/packages/block-library/src/archives/index.php
index 017cb4ec21d1d9..59689ebe079864 100644
--- a/packages/block-library/src/archives/index.php
+++ b/packages/block-library/src/archives/index.php
@@ -14,7 +14,7 @@
  *
  * @return string Returns the post content with archives added.
  */
-function render_block_core_archives( $attributes ) {
+function gutenberg_render_block_core_archives( $attributes ) {
 	$show_post_count = ! empty( $attributes['showPostCounts'] );
 
 	$class = 'wp-block-archives';
@@ -115,17 +115,3 @@ function render_block_core_archives( $attributes ) {
 
 	return $block_content;
 }
-
-/**
- * Registers `core/archives` block.
- */
-function register_block_core_archives() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_archives',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_archives' );
diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json
index bd9c10edce16da..c1cf093e535cba 100644
--- a/packages/block-library/src/block/block.json
+++ b/packages/block-library/src/block/block.json
@@ -8,10 +8,11 @@
 			"type": "number"
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"customClassName": false,
 		"html": false,
 		"inserter": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/block/index.php b/packages/block-library/src/block/index.php
index 72dcfe0fc34fd9..6fdf5cec9a1fa2 100644
--- a/packages/block-library/src/block/index.php
+++ b/packages/block-library/src/block/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Rendered HTML of the referenced block.
  */
-function render_block_core_block( $attributes ) {
+function gutenberg_render_block_core_block( $attributes ) {
 	if ( empty( $attributes['ref'] ) ) {
 		return '';
 	}
@@ -28,17 +28,3 @@ function render_block_core_block( $attributes ) {
 
 	return do_blocks( $reusable_block->post_content );
 }
-
-/**
- * Registers `core/block` block.
- */
-function register_block_core_block() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_block',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_block' );
diff --git a/packages/block-library/src/calendar/block.json b/packages/block-library/src/calendar/block.json
index f7ffcf528d1743..fee67cd22f2049 100644
--- a/packages/block-library/src/calendar/block.json
+++ b/packages/block-library/src/calendar/block.json
@@ -21,8 +21,9 @@
 			"type": "integer"
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/calendar/index.php b/packages/block-library/src/calendar/index.php
index ab7b75f380f15b..3f770742ae6448 100644
--- a/packages/block-library/src/calendar/index.php
+++ b/packages/block-library/src/calendar/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Returns the block content.
  */
-function render_block_core_calendar( $attributes ) {
+function gutenberg_render_block_core_calendar( $attributes ) {
 	global $monthnum, $year;
 
 	$previous_monthnum = $monthnum;
@@ -45,17 +45,3 @@ function render_block_core_calendar( $attributes ) {
 	// phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
 	$year = $previous_year;
 }
-
-/**
- * Registers the `core/calendar` block on server.
- */
-function register_block_core_calendar() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_calendar',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_calendar' );
diff --git a/packages/block-library/src/categories/block.json b/packages/block-library/src/categories/block.json
index 26a5eb57ba13e1..f47f0d6a730ac2 100644
--- a/packages/block-library/src/categories/block.json
+++ b/packages/block-library/src/categories/block.json
@@ -3,7 +3,7 @@
 	"title": "Categories",
 	"category": "widgets",
 	"icon": {
-		"src": "./icon.js"
+		"src": "icon.js"
 	},
 	"description": "Display a list of all categories.",
 	"attributes": {
@@ -26,10 +26,11 @@
 			"default": false
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true,
 		"alignWide": false,
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
index 2936ae2d1e0aa5..359d96e20aef7d 100644
--- a/packages/block-library/src/categories/index.php
+++ b/packages/block-library/src/categories/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Returns the categories list/dropdown markup.
  */
-function render_block_core_categories( $attributes ) {
+function gutenberg_render_block_core_categories( $attributes ) {
 	static $block_id = 0;
 	$block_id++;
 
@@ -33,7 +33,7 @@ function render_block_core_categories( $attributes ) {
 		$type                     = 'dropdown';
 
 		if ( ! is_admin() ) {
-			$wrapper_markup .= build_dropdown_script_block_core_categories( $id );
+			$wrapper_markup .= gutenberg_build_dropdown_script_block_core_categories( $id );
 		}
 	} else {
 		$wrapper_markup = '<ul class="%1$s">%2$s</ul>';
@@ -67,7 +67,7 @@ function render_block_core_categories( $attributes ) {
  *
  * @return string Returns the dropdown onChange redirection script.
  */
-function build_dropdown_script_block_core_categories( $dropdown_id ) {
+function gutenberg_build_dropdown_script_block_core_categories( $dropdown_id ) {
 	ob_start();
 	?>
 	<script type='text/javascript'>
@@ -86,17 +86,3 @@ function onCatChange() {
 	<?php
 	return ob_get_clean();
 }
-
-/**
- * Registers the `core/categories` block on server.
- */
-function register_block_core_categories() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_categories',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_categories' );
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index eb6cd561d887a5..1c0b9047bd8d6c 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -19,11 +19,11 @@ import * as image from './image';
 import * as heading from './heading';
 import * as quote from './quote';
 import * as gallery from './gallery';
-import * as archives from './archives';
+// import * as archives from './archives';
 import * as audio from './audio';
 import * as button from './button';
-import * as calendar from './calendar';
-import * as categories from './categories';
+// import * as calendar from './calendar';
+// import * as categories from './categories';
 import * as code from './code';
 import * as columns from './columns';
 import * as column from './columns/column';
@@ -32,16 +32,16 @@ import * as embed from './embed';
 import * as file from './file';
 import * as html from './html';
 import * as mediaText from './media-text';
-import * as latestComments from './latest-comments';
-import * as latestPosts from './latest-posts';
+// import * as latestComments from './latest-comments';
+// import * as latestPosts from './latest-posts';
 import * as list from './list';
 import * as missing from './missing';
 import * as more from './more';
 import * as nextpage from './nextpage';
 import * as preformatted from './preformatted';
 import * as pullquote from './pullquote';
-import * as reusableBlock from './block';
-import * as rss from './rss';
+// import * as reusableBlock from './block';
+// import * as rss from './rss';
 import * as search from './search';
 import * as separator from './separator';
 import * as shortcode from './shortcode';
@@ -52,7 +52,7 @@ import * as template from './template';
 import * as textColumns from './text-columns';
 import * as verse from './verse';
 import * as video from './video';
-import * as tagCloud from './tag-cloud';
+// import * as tagCloud from './tag-cloud';
 
 import * as classic from './classic';
 
@@ -69,11 +69,11 @@ export const registerCoreBlocks = () => {
 
 		// Register all remaining core blocks.
 		shortcode,
-		archives,
+		// archives,
 		audio,
 		button,
-		calendar,
-		categories,
+		// calendar,
+		// categories,
 		code,
 		columns,
 		column,
@@ -85,21 +85,21 @@ export const registerCoreBlocks = () => {
 		window.wp && window.wp.oldEditor ? classic : null, // Only add the classic block in WP Context
 		html,
 		mediaText,
-		latestComments,
-		latestPosts,
+		// latestComments,
+		// latestPosts,
 		missing,
 		more,
 		nextpage,
 		preformatted,
 		pullquote,
-		rss,
+		// rss,
 		search,
 		separator,
-		reusableBlock,
+		// reusableBlock,
 		spacer,
 		subhead,
 		table,
-		tagCloud,
+		// tagCloud,
 		template,
 		textColumns,
 		verse,
diff --git a/packages/block-library/src/latest-comments/block.json b/packages/block-library/src/latest-comments/block.json
index c98e2f5dcacba9..75036bb979683b 100644
--- a/packages/block-library/src/latest-comments/block.json
+++ b/packages/block-library/src/latest-comments/block.json
@@ -3,7 +3,7 @@
 	"title": "Latest Comments",
 	"category": "widgets",
 	"icon": {
-		"src": "./icon.js"
+		"src": "icon.js"
 	},
 	"description": "Display a list of your most recent comments.",
 	"keywords": [ "recent comments" ],
@@ -33,9 +33,10 @@
 			"default": true
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true,
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/latest-comments/index.php b/packages/block-library/src/latest-comments/index.php
index 14be28fcae5bae..e5a513c168e176 100644
--- a/packages/block-library/src/latest-comments/index.php
+++ b/packages/block-library/src/latest-comments/index.php
@@ -25,7 +25,7 @@
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set; "(no title)" if no title is set.
  */
-function wp_latest_comments_draft_or_post_title( $post = 0 ) {
+function gutenberg_latest_comments_draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
 	if ( empty( $title ) ) {
 		$title = __( '(no title)' );
@@ -40,7 +40,7 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) {
  *
  * @return string Returns the post content with latest comments added.
  */
-function render_block_core_latest_comments( $attributes = array() ) {
+function gutenberg_render_block_core_latest_comments( $attributes = array() ) {
 	// This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php.
 	$comments = get_comments(
 		apply_filters(
@@ -92,7 +92,7 @@ function render_block_core_latest_comments( $attributes = array() ) {
 
 			// `_draft_or_post_title` calls `esc_html()` so we don't need to wrap that call in
 			// `esc_html`.
-			$post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . wp_latest_comments_draft_or_post_title( $comment->comment_post_ID ) . '</a>';
+			$post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . gutenberg_latest_comments_draft_or_post_title( $comment->comment_post_ID ) . '</a>';
 
 			$list_items_markup .= sprintf(
 				/* translators: 1: author name (inside <a> or <span> tag, based on if they have a URL), 2: post title related to this comment */
@@ -149,17 +149,3 @@ function render_block_core_latest_comments( $attributes = array() ) {
 
 	return $block_content;
 }
-
-/**
- * Registers the `core/latest-comments` block on server.
- */
-function register_block_core_latest_comments() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_latest_comments',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_latest_comments' );
diff --git a/packages/block-library/src/latest-posts/block.json b/packages/block-library/src/latest-posts/block.json
index 64994aa324884a..ddc864946b4195 100644
--- a/packages/block-library/src/latest-posts/block.json
+++ b/packages/block-library/src/latest-posts/block.json
@@ -3,7 +3,7 @@
 	"title": "Latest Posts",
 	"category": "widgets",
 	"icon": {
-		"src": "./icon.js"
+		"src": "icon.js"
 	},
 	"description": "Display a list of your most recent posts.",
 	"keywords": [ "recent posts" ],
@@ -42,9 +42,10 @@
 			"default": "date"
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true,
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/latest-posts/index.php b/packages/block-library/src/latest-posts/index.php
index 53274732a37334..ff3ea37544f7d9 100644
--- a/packages/block-library/src/latest-posts/index.php
+++ b/packages/block-library/src/latest-posts/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Returns the post content with latest posts added.
  */
-function render_block_core_latest_posts( $attributes ) {
+function gutenberg_render_block_core_latest_posts( $attributes ) {
 	$args = array(
 		'posts_per_page'   => $attributes['postsToShow'],
 		'post_status'      => 'publish',
@@ -80,17 +80,3 @@ function render_block_core_latest_posts( $attributes ) {
 
 	return $block_content;
 }
-
-/**
- * Registers the `core/latest-posts` block on server.
- */
-function register_block_core_latest_posts() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-			'render_callback' => 'render_block_core_latest_posts',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_latest_posts' );
diff --git a/packages/block-library/src/rss/block.json b/packages/block-library/src/rss/block.json
index 047282f4d3edbf..7d8799170e373e 100644
--- a/packages/block-library/src/rss/block.json
+++ b/packages/block-library/src/rss/block.json
@@ -2,9 +2,7 @@
 	"name": "core/rss",
 	"title": "RSS",
 	"category": "widgets",
-	"icon": {
-		"slug": "rss"
-	},
+	"icon": "rss",
 	"description": "Display entries from any RSS or Atom feed.",
 	"keywords": [ "atom", "feed" ],
 	"attributes": {
@@ -44,8 +42,9 @@
 			"default": 55
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/rss/index.php b/packages/block-library/src/rss/index.php
index 7449d48193f084..08cbfbca807876 100644
--- a/packages/block-library/src/rss/index.php
+++ b/packages/block-library/src/rss/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Returns the block content with received rss items.
  */
-function render_block_core_rss( $attributes ) {
+function gutenberg_render_block_core_rss( $attributes ) {
 	$rss = fetch_feed( $attributes['feedURL'] );
 
 	if ( is_wp_error( $rss ) ) {
@@ -88,18 +88,3 @@ function render_block_core_rss( $attributes ) {
 
 	return $list_items_markup;
 }
-
-/**
- * Registers the `core/rss` block on server.
- */
-function register_block_core_rss() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-
-			'render_callback' => 'render_block_core_rss',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_rss' );
diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php
index 4b51ba74657937..ac7da463e92f2e 100644
--- a/packages/block-library/src/search/index.php
+++ b/packages/block-library/src/search/index.php
@@ -56,8 +56,8 @@ function render_block_core_search( $attributes ) {
  * Registers the `core/search` block on the server.
  */
 function register_block_core_search() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
+	register_block_type(
+		'core/search',
 		array(
 			'attributes'      => array(
 				'label'       => array(
diff --git a/packages/block-library/src/shortcode/index.php b/packages/block-library/src/shortcode/index.php
index 15c90d4083e5de..1c0761250d2cfd 100644
--- a/packages/block-library/src/shortcode/index.php
+++ b/packages/block-library/src/shortcode/index.php
@@ -21,8 +21,8 @@ function render_block_core_shortcode( $attributes, $content ) {
  * Registers the `core/shortcode` block on server.
  */
 function register_block_core_shortcode() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
+	register_block_type(
+		'core/shortcode',
 		array(
 			'render_callback' => 'render_block_core_shortcode',
 		)
diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json
index eabfa300fe3cc0..1c29252d0672ac 100644
--- a/packages/block-library/src/tag-cloud/block.json
+++ b/packages/block-library/src/tag-cloud/block.json
@@ -2,9 +2,7 @@
 	"name": "core/tag-cloud",
 	"title": "Tag Cloud",
 	"category": "widgets",
-	"icon": {
-		"slug": "tag"
-	},
+	"icon": "tag",
 	"description": "A cloud of your most used tags.",
 	"attributes": {
 		"align": {
@@ -22,9 +20,10 @@
 			"default": false
 		}
 	},
-	"edit": "./edit.js",
+	"edit": "edit.js",
 	"supports": {
 		"align": true,
 		"html": false
-	}
+	},
+	"renderCallback": "index.php"
 }
diff --git a/packages/block-library/src/tag-cloud/index.php b/packages/block-library/src/tag-cloud/index.php
index 120231bf6cd0fa..ab390fc77e14b8 100644
--- a/packages/block-library/src/tag-cloud/index.php
+++ b/packages/block-library/src/tag-cloud/index.php
@@ -12,7 +12,7 @@
  *
  * @return string Returns the tag cloud for selected taxonomy.
  */
-function render_block_core_tag_cloud( $attributes ) {
+function gutenberg_render_block_core_tag_cloud( $attributes ) {
 	$class = isset( $attributes['align'] ) ?
 		"wp-block-tag-cloud align{$attributes['align']}" :
 		'wp-block-tag-cloud';
@@ -39,18 +39,3 @@ function render_block_core_tag_cloud( $attributes ) {
 		$tag_cloud
 	);
 }
-
-/**
- * Registers the `core/tag-cloud` block on server.
- */
-function register_block_core_tag_cloud() {
-	register_block_type_from_metadata(
-		dirname( __FILE__ ),
-		array(
-
-			'render_callback' => 'render_block_core_tag_cloud',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_tag_cloud' );