FSE: Parse the template before <head> gets rendered (#28319)

* Parse the template before head gets rendered * add phpcs-ignore
WordPress · Jan 20, 2021 · 8ff0c0a · 8ff0c0a
1 parent f2d3c09
commit 8ff0c0a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/lib/full-site-editing/template-loader.php b/lib/full-site-editing/template-loader.php
@@ -154,15 +154,14 @@ function gutenberg_render_title_tag() {
 }
 
 /**
- * Renders the markup for the current template.
+ * Returns the markup for the current template.
  */
-function gutenberg_render_the_template() {
+function gutenberg_get_the_template_html() {
 	global $_wp_current_template_content;
 	global $wp_embed;
 
 	if ( ! $_wp_current_template_content ) {
-		echo '<h1>' . esc_html__( 'No matching template found', 'gutenberg' ) . '</h1>';
-		return;
+		return '<h1>' . esc_html__( 'No matching template found', 'gutenberg' ) . '</h1>';
 	}
 
 	$content = $wp_embed->run_shortcode( $_wp_current_template_content );
@@ -178,9 +177,14 @@ function gutenberg_render_the_template() {
 
 	// Wrap block template in .wp-site-blocks to allow for specific descendant styles
 	// (e.g. `.wp-site-blocks > *`).
-	echo '<div class="wp-site-blocks">';
-	echo $content; // phpcs:ignore WordPress.Security.EscapeOutput
-	echo '</div>';
+	return '<div class="wp-site-blocks">' . $content . '</div>';
+}
+
+/**
+ * Renders the markup for the current template.
+ */
+function gutenberg_render_the_template() {
+	echo gutenberg_get_the_template_html(); // phpcs:ignore WordPress.Security.EscapeOutput
 }
 
 /**

diff --git a/lib/template-canvas.php b/lib/template-canvas.php
@@ -5,6 +5,11 @@
  * @package gutenberg
  */
 
+/**
+ * Get the template HTML.
+ * This needs to run before <head> so that blocks can add scripts and styles in wp_head().
+ */
+$template_html = gutenberg_get_the_template_html();
 ?>
 <!DOCTYPE html>
 <html <?php language_attributes(); ?>>
@@ -16,7 +21,7 @@
 <body <?php body_class(); ?>>
 <?php wp_body_open(); ?>
 
-<?php gutenberg_render_the_template(); ?>
+<?php echo $template_html; // phpcs:ignore WordPress.Security.EscapeOutput ?>
 
 <?php wp_footer(); ?>
 </body>