Optimize preload paths for post and site editors (#39256)

* Optimize preload paths for post editor * Optimize preload paths for site editor * Fetch the / endpoint with a _fields param * Move optimization filter to lib/compat
WordPress · Mar 10, 2022 · 5201e26 · 5201e26
1 parent abd4a49
commit 5201e26
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 3 deletions.
diff --git a/lib/compat/wordpress-6.0/edit-form-blocks.php b/lib/compat/wordpress-6.0/edit-form-blocks.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Patches preload paths for post editor.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Optimizes the preload paths registered in Core (`edit-form-blocks.php`).
+ *
+ * @param array $preload_paths Preload paths to be filtered.
+ * @return array
+ */
+function optimize_preload_paths( $preload_paths ) {
+	// remove preload of the `/` route.
+	$root_index = array_search( '/', $preload_paths, true );
+	if ( false !== $root_index ) {
+		array_splice( $preload_paths, $root_index, 1 );
+	}
+
+	// change `/types` context from `edit` to `view` (requested in `loadPostTypeEntities`).
+	$types_index = array_search( '/wp/v2/types?context=edit', $preload_paths, true );
+	if ( false !== $types_index ) {
+		$preload_paths[ $types_index ] = '/wp/v2/types?context=view';
+	}
+
+	// start preloading `/taxonomies` in `view` context (requested in `loadTaxonomyEntities`).
+	$tax_index = array_search( '/wp/v2/taxonomies?per_page=-1&context=edit', $preload_paths, true );
+	if ( false === $tax_index ) {
+		array_push( $preload_paths, '/wp/v2/taxonomies?context=view' );
+	} else {
+		$preload_paths[ $tax_index ] = '/wp/v2/taxonomies?context=view';
+	}
+
+	// start preloading `/settings`.
+	$settings_index = array_search( '/wp/v2/settings', $preload_paths, true );
+	if ( false === $settings_index ) {
+		array_push( $preload_paths, '/wp/v2/settings' );
+	}
+
+	// modify the preload of `/users/me` to match the real request.
+	foreach ( $preload_paths as $user_index => $user_path ) {
+		if ( 0 === strpos( $user_path, '/wp/v2/users/me' ) ) {
+			$preload_paths[ $user_index ] = '/wp/v2/users/me';
+			break;
+		}
+	}
+
+	return $preload_paths;
+}
+
+add_filter( 'block_editor_rest_api_preload_paths', 'optimize_preload_paths' );
diff --git a/lib/full-site-editing/edit-site-page.php b/lib/full-site-editing/edit-site-page.php
@@ -143,11 +143,10 @@ static function( $classes ) {
 			'preload_paths'    => array_merge(
 				array(
 					array( '/wp/v2/media', 'OPTIONS' ),
-					'/',
-					'/wp/v2/types?context=edit',
+					'/wp/v2/types?context=view',
 					'/wp/v2/types/wp_template?context=edit',
 					'/wp/v2/types/wp_template-part?context=edit',
-					'/wp/v2/taxonomies?context=edit',
+					'/wp/v2/taxonomies?context=view',
 					'/wp/v2/pages?context=edit',
 					'/wp/v2/categories?context=edit',
 					'/wp/v2/posts?context=edit',

diff --git a/lib/load.php b/lib/load.php
@@ -106,6 +106,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.0/class-wp-webfonts-provider.php';
 require __DIR__ . '/compat/wordpress-6.0/class-wp-webfonts-provider-local.php';
 require __DIR__ . '/compat/wordpress-6.0/webfonts.php';
+require __DIR__ . '/compat/wordpress-6.0/edit-form-blocks.php';
 require __DIR__ . '/compat/experimental/blocks.php';
 
 require __DIR__ . '/blocks.php';

diff --git a/packages/core-data/src/entities.js b/packages/core-data/src/entities.js
@@ -24,6 +24,19 @@ export const defaultEntities = [
 		name: '__unstableBase',
 		kind: 'root',
 		baseURL: '/',
+		baseURLParams: {
+			_fields: [
+				'description',
+				'gmt_offset',
+				'home',
+				'name',
+				'site_icon',
+				'site_icon_url',
+				'site_logo',
+				'timezone_string',
+				'url',
+			].join( ',' ),
+		},
 	},
 	{
 		label: __( 'Site' ),