WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: Prevent front-end assets of a block from being enqueued in the block editor. 

Since WordPress 5.9 you can set a view script for a block which is supposed to be only loaded on the front end. Unfortunately it's currently also loaded in the editor which can cause unexpected behaviour and also performance issues depending on the size of the scripts.
This is caused by the preloading of REST API routes via `block_editor_rest_api_preload()` which doesn't happen in an encapsulated process and so does pollute any global state like the one for scripts and styles.
Similar to the global `$post`, core now backups the globals `$wp_scripts` and `$wp_styles` and restores the backup after the preloading.

Props gziolo, ocean90.
Fixes #55151.
Built from https://develop.svn.wordpress.org/trunk@52733


git-svn-id: http://core.svn.wordpress.org/trunk@52322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2022-02-15 17:30:02 +00:00
parent fc26a05498
commit 79971103c5
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/block-editor.php
View File

@ -426,6 +426,8 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
* @since 5.8.0 * @since 5.8.0
* *
* @global WP_Post $post Global post object. * @global WP_Post $post Global post object.
* @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
* @global WP_Styles $wp_styles The WP_Styles object for printing styles.
* *
* @param string[] $preload_paths List of paths to preload. * @param string[] $preload_paths List of paths to preload.
* @param WP_Block_Editor_Context $block_editor_context The current block editor context. * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
@ -433,7 +435,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
* @return void * @return void
*/ */
function block_editor_rest_api_preload( array $preload_paths, $block_editor_context ) { function block_editor_rest_api_preload( array $preload_paths, $block_editor_context ) {
global $post; global $post, $wp_scripts, $wp_styles;
/** /**
* Filters the array of REST API paths that will be used to preloaded common data for the block editor. * Filters the array of REST API paths that will be used to preloaded common data for the block editor.
@ -467,11 +469,15 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
} }
/* /*
* Ensure the global $post remains the same after API data is preloaded. * Ensure the global $post, $wp_scripts, and $wp_styles remain the same after
* API data is preloaded.
* Because API preloading can call the_content and other filters, plugins * Because API preloading can call the_content and other filters, plugins
* can unexpectedly modify $post. * can unexpectedly modify the global $post or enqueue assets which are not
* intended for the block editor.
*/ */
$backup_global_post = ! empty( $post ) ? clone $post : $post; $backup_global_post = ! empty( $post ) ? clone $post : $post;
$backup_wp_scripts = ! empty( $wp_scripts ) ? clone $wp_scripts : $wp_scripts;
$backup_wp_styles = ! empty( $wp_styles ) ? clone $wp_styles : $wp_styles;
foreach ( $preload_paths as &$path ) { foreach ( $preload_paths as &$path ) {
if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) { if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) {
@ -492,8 +498,10 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
array() array()
); );
// Restore the global $post as it was before API preloading. // Restore the global $post, $wp_scripts, and $wp_styles as they were before API preloading.
$post = $backup_global_post; $post = $backup_global_post;
$wp_scripts = $backup_wp_scripts;
$wp_styles = $backup_wp_styles;
wp_add_inline_script( wp_add_inline_script(
'wp-api-fetch', 'wp-api-fetch',

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-alpha-52732'; $wp_version = '6.0-alpha-52733';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.