diff --git a/lib/compat/wordpress-6.0/edit-form-blocks.php b/lib/compat/wordpress-6.0/edit-form-blocks.php new file mode 100644 index 0000000000000..691ba12b4b979 --- /dev/null +++ b/lib/compat/wordpress-6.0/edit-form-blocks.php @@ -0,0 +1,52 @@ + $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 index 3287659385dc9..afc80b8ab09d0 100644 --- 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 index 26cd50608dbdc..f15db9de33c05 100644 --- 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 index 0d9a9c1b10be1..eb4ab89b64910 100644 --- 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' ),