Skip to content

Commit

Permalink
Site Editor: preload settings requests (#66488)
Browse files Browse the repository at this point in the history 
Co-authored-by: ellatrix <ellatrix@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
  • Loading branch information
@ellatrix @Mamaduka
3 people authored Oct 30, 2024
1 parent aa2279b commit 9a40ea0
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 0 deletions.
3 changes: 3 additions & 0 deletions backport-changelog/6.8/7687.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
https://github.com/WordPress/wordpress-develop/pull/7687

* https://github.com/WordPress/gutenberg/pull/66488
34 changes: 34 additions & 0 deletions lib/compat/wordpress-6.8/preload.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

/**
* Preload necessary resources for the editors.
*
* @param array $paths REST API paths to preload.
* @param WP_Block_Editor_Context $context Current block editor context
*
* @return array Filtered preload paths.
*/
function gutenberg_block_editor_preload_paths_6_8( $paths, $context ) {
if ( 'core/edit-site' === $context->name ) {
// Core already preloads both of these for `core/edit-post`.
$paths[] = '/wp/v2/settings';
$paths[] = array( '/wp/v2/settings', 'OPTIONS' );
$paths[] = '/?_fields=' . implode(
',',
// @see packages/core-data/src/entities.js
array(
'description',
'gmt_offset',
'home',
'name',
'site_icon',
'site_icon_url',
'site_logo',
'timezone_string',
'url',
)
);
}
return $paths;
}
add_filter( 'block_editor_rest_api_preload_paths', 'gutenberg_block_editor_preload_paths_6_8', 10, 2 );
3 changes: 3 additions & 0 deletions lib/load.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ function gutenberg_is_experiment_enabled( $name ) {
require __DIR__ . '/compat/wordpress-6.7/compat.php';
require __DIR__ . '/compat/wordpress-6.7/post-formats.php';

// WordPress 6.8 compat.
require __DIR__ . '/compat/wordpress-6.8/preload.php';

// Experimental features.
require __DIR__ . '/experimental/block-editor-settings-mobile.php';
require __DIR__ . '/experimental/blocks.php';
Expand Down
2 changes: 2 additions & 0 deletions packages/core-data/src/entities.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export const rootEntitiesConfig = [
name: '__unstableBase',
baseURL: '/',
baseURLParams: {
// Please also change the preload path when changing this.
// @see lib/compat/wordpress-6.8/preload.php
_fields: [
'description',
'gmt_offset',
Expand Down

1 comment on commit 9a40ea0

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in 9a40ea0.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/11598140260
📝 Reported issues:

Please sign in to comment.