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

Editor: Make asset file optional for block scripts 

It is no longer a hard requirement that a *.asset.php file is present to register a script for block. 

Fixes #57234.
Props joefusco, gziolo, spacedmonkey, colorful-tones. 


Built from https://develop.svn.wordpress.org/trunk@57559


git-svn-id: http://core.svn.wordpress.org/trunk@57060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
gziolo 2024-02-08 08:18:10 +00:00
parent 58b0d3f71f
commit 3791772c2d
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/blocks.php
View File

@ -124,12 +124,13 @@ function get_block_asset_url( $path ) {
/** /**
* Finds a script handle for the selected block metadata field. It detects * Finds a script handle for the selected block metadata field. It detects
* when a path to file was provided and finds a corresponding asset file * when a path to file was provided and optionally finds a corresponding asset
* with details necessary to register the script under automatically * file with details necessary to register the script under automatically
* generated handle name. It returns unprocessed script handle otherwise. * generated handle name. It returns unprocessed script handle otherwise.
* *
* @since 5.5.0 * @since 5.5.0
* @since 6.1.0 Added `$index` parameter. * @since 6.1.0 Added `$index` parameter.
* @since 6.5.0 The asset file is optional.
* *
* @param array $metadata Block metadata. * @param array $metadata Block metadata.
* @param string $field_name Field name to pick from metadata. * @param string $field_name Field name to pick from metadata.
@ -163,21 +164,6 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
realpath( $script_asset_raw_path ) realpath( $script_asset_raw_path )
); );
if ( empty( $script_asset_path ) ) {
_doing_it_wrong(
__FUNCTION__,
sprintf(
/* translators: 1: Asset file location, 2: Field name, 3: Block name. */
__( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.' ),
$script_asset_raw_path,
$field_name,
$metadata['name']
),
'5.5.0'
);
return false;
}
$script_path_norm = wp_normalize_path( realpath( $path . '/' . $script_path ) ); $script_path_norm = wp_normalize_path( realpath( $path . '/' . $script_path ) );
$script_uri = get_block_asset_url( $script_path_norm ); $script_uri = get_block_asset_url( $script_path_norm );
@ -186,7 +172,8 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
$script_args['strategy'] = 'defer'; $script_args['strategy'] = 'defer';
} }
$script_asset = require $script_asset_path; // Asset file for blocks is optional. See https://core.trac.wordpress.org/ticket/60460.
$script_asset = ! empty( $script_asset_path ) ? require $script_asset_path : array();
$script_dependencies = isset( $script_asset['dependencies'] ) ? $script_asset['dependencies'] : array(); $script_dependencies = isset( $script_asset['dependencies'] ) ? $script_asset['dependencies'] : array();
$result = wp_register_script( $result = wp_register_script(
$script_handle, $script_handle,

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.5-alpha-57558'; $wp_version = '6.5-alpha-57559';
/** /**
* 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.