From c631dded2c9cdf87a7723010bc94c797c70f3d60 Mon Sep 17 00:00:00 2001
From: Ella <ella@vandurpe.com>
Date: Mon, 2 Dec 2024 13:48:41 +0100
Subject: [PATCH 1/2] Site Editor: Pages: Preload template lookup

---
 backport-changelog/6.8/7695.md       |  2 ++
 lib/compat/wordpress-6.8/preload.php | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/backport-changelog/6.8/7695.md b/backport-changelog/6.8/7695.md
index f45b2039e30274..d69a59f2d67d12 100644
--- a/backport-changelog/6.8/7695.md
+++ b/backport-changelog/6.8/7695.md
@@ -2,3 +2,5 @@ https://github.com/WordPress/wordpress-develop/pull/7695
 
 * https://github.com/WordPress/gutenberg/pull/66631
 * https://github.com/WordPress/gutenberg/pull/67465
+* https://github.com/WordPress/gutenberg/pull/66579
+* https://github.com/WordPress/gutenberg/pull/66654
diff --git a/lib/compat/wordpress-6.8/preload.php b/lib/compat/wordpress-6.8/preload.php
index 494e3ad32ec02e..04af66e6c184cb 100644
--- a/lib/compat/wordpress-6.8/preload.php
+++ b/lib/compat/wordpress-6.8/preload.php
@@ -10,18 +10,26 @@
  */
 function gutenberg_block_editor_preload_paths_6_8( $paths, $context ) {
 	if ( 'core/edit-site' === $context->name ) {
-		$post_id = null;
+		$post = null;
 		if ( isset( $_GET['postId'] ) && is_numeric( $_GET['postId'] ) ) {
-			$post_id = (int) $_GET['postId'];
+			$post = get_post( (int) $_GET['postId'] );
 		}
 		if ( isset( $_GET['p'] ) && preg_match( '/^\/page\/(\d+)$/', $_GET['p'], $matches ) ) {
-			$post_id = (int) $matches[1];
+			$post = get_post( (int) $matches[1] );
 		}
 
-		if ( $post_id ) {
-			$route_for_post = rest_get_route_for_post( $post_id );
+		if (  $post ) {
+			$route_for_post = rest_get_route_for_post( $post );
 			if ( $route_for_post ) {
 				$paths[] = add_query_arg( 'context', 'edit', $route_for_post );
+				if ( 'page' === $post->post_type ) {
+					$paths[] = add_query_arg(
+						'slug',
+						// @see https://github.com/WordPress/gutenberg/blob/489f6067c623926bce7151a76755bb68d8e22ea7/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js#L139-L140
+						'page-' . $post->post_name,
+						'/wp/v2/templates/lookup'
+					);
+				}
 			}
 		}
 

From ac47fe6d051dd761a1a3c0ef664851fd272756c2 Mon Sep 17 00:00:00 2001
From: Ella <ella@vandurpe.com>
Date: Mon, 2 Dec 2024 16:28:33 +0100
Subject: [PATCH 2/2] lint

---
 lib/compat/wordpress-6.8/preload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compat/wordpress-6.8/preload.php b/lib/compat/wordpress-6.8/preload.php
index 04af66e6c184cb..879e263f5a1892 100644
--- a/lib/compat/wordpress-6.8/preload.php
+++ b/lib/compat/wordpress-6.8/preload.php
@@ -18,7 +18,7 @@ function gutenberg_block_editor_preload_paths_6_8( $paths, $context ) {
 			$post = get_post( (int) $matches[1] );
 		}
 
-		if (  $post ) {
+		if ( $post ) {
 			$route_for_post = rest_get_route_for_post( $post );
 			if ( $route_for_post ) {
 				$paths[] = add_query_arg( 'context', 'edit', $route_for_post );