<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56683] trunk: Editor: Introduce get_block_asset_url Utility Function.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56683">56683</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56683","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>spacedmonkey</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-25 17:47:27 +0000 (Mon, 25 Sep 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Introduce get_block_asset_url Utility Function.
This commit introduces a valuable utility function, get_block_asset_url, designed to simplify the retrieval of block asset URLs, such as those for CSS and JavaScript files. This utility eliminates redundancy in both register_block_script_handle and register_block_style_handle. Additionally, `get_block_asset_url` incorporates an early exit mechanism to optimize performance.
This update includes comprehensive unit tests, covering various scenarios, including asset registration from core (wp-includes), themes, child themes, plugins, and mu-plugins.
Props spacedmonkey, joemcgill, flixos90, gziolo.
Fixes <a href="https://core.trac.wordpress.org/ticket/58525">#58525</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/</li>
<li>trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/</li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockblockjson">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/block.json</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockeditorstylertlcss">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style-rtl.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockeditorstylecss">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockindexassetphp">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.asset.php</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockindexjs">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.js</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockstylertlcss">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style-rtl.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockstylecss">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockviewassetphp">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.asset.php</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockviewjs">trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.js</a></li>
<li><a href="#trunktestsphpunittestsblocksgetBlockAssetUrlphp">trunk/tests/phpunit/tests/blocks/getBlockAssetUrl.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2023-09-25 17:04:41 UTC (rev 56682)
+++ trunk/src/wp-includes/blocks.php 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,6 +74,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the URL to a block asset.
+ *
+ * @since 6.4.0
+ *
+ * @param string $path A normalized path to a block asset.
+ * @return string|false The URL to the block asset or false on failure.
+ */
+function get_block_asset_url( $path ) {
+ if ( empty( $path ) ) {
+ return false;
+ }
+
+ // Path needs to be normalized to work in Windows env.
+ static $wpinc_path_norm = '';
+ if ( ! $wpinc_path_norm ) {
+ $wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
+ }
+
+ if ( str_starts_with( $path, $wpinc_path_norm ) ) {
+ return includes_url( str_replace( $wpinc_path_norm, '', $path ) );
+ }
+
+ static $template_paths_norm = array();
+
+ $template = get_template();
+ if ( ! isset( $template_paths_norm[ $template ] ) ) {
+ $template_paths_norm[ $template ] = wp_normalize_path( get_template_directory() );
+ }
+
+ if ( str_starts_with( $path, trailingslashit( $template_paths_norm[ $template ] ) ) ) {
+ return get_theme_file_uri( str_replace( $template_paths_norm[ $template ], '', $path ) );
+ }
+
+ if ( is_child_theme() ) {
+ $stylesheet = get_stylesheet();
+ if ( ! isset( $template_paths_norm[ $stylesheet ] ) ) {
+ $template_paths_norm[ $stylesheet ] = wp_normalize_path( get_stylesheet_directory() );
+ }
+
+ if ( str_starts_with( $path, trailingslashit( $template_paths_norm[ $stylesheet ] ) ) ) {
+ return get_theme_file_uri( str_replace( $template_paths_norm[ $stylesheet ], '', $path ) );
+ }
+ }
+
+ return plugins_url( basename( $path ), $path );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Finds a script handle for the selected block metadata field. It detects
</span><span class="cx" style="display: block; padding: 0 10px"> * when a path to file was provided and finds a corresponding asset file
</span><span class="cx" style="display: block; padding: 0 10px"> * with details necessary to register the script under automatically
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +155,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $script_handle;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $script_asset_raw_path = dirname( $metadata['file'] ) . '/' . substr_replace( $script_path, '.asset.php', - strlen( '.js' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = dirname( $metadata['file'] );
+ $script_asset_raw_path = $path . '/' . substr_replace( $script_path, '.asset.php', - strlen( '.js' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $script_handle = generate_block_asset_handle( $metadata['name'], $field_name, $index );
</span><span class="cx" style="display: block; padding: 0 10px"> $script_asset_path = wp_normalize_path(
</span><span class="cx" style="display: block; padding: 0 10px"> realpath( $script_asset_raw_path )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,45 +177,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Path needs to be normalized to work in Windows env.
- static $wpinc_path_norm = '';
- if ( ! $wpinc_path_norm ) {
- $wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $script_path_norm = wp_normalize_path( realpath( $path . '/' . $script_path ) );
+ $script_uri = get_block_asset_url( $script_path_norm );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
- static $template_path_norm = '';
- static $stylesheet_path_norm = '';
- if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
- $template_path_norm = wp_normalize_path( get_template_directory() );
- $stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
- }
-
- $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
-
- $is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
-
- /*
- * Determine if the block script was registered in a theme, by checking if the script path starts with either
- * the parent (template) or child (stylesheet) directory path.
- */
- $is_parent_theme_block = str_starts_with( $script_path_norm, trailingslashit( $template_path_norm ) );
- $is_child_theme_block = str_starts_with( $script_path_norm, trailingslashit( $stylesheet_path_norm ) );
- $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
-
- $script_uri = '';
- if ( $is_core_block ) {
- $script_uri = includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) );
- } elseif ( $is_theme_block ) {
- // Get the script path deterministically based on whether or not it was registered in a parent or child theme.
- $script_uri = $is_parent_theme_block
- ? get_theme_file_uri( str_replace( $template_path_norm, '', $script_path_norm ) )
- : get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $script_path_norm ) );
- } else {
- // Fallback to plugins_url().
- $script_uri = plugins_url( $script_path, $metadata['file'] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $script_args = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'viewScript' === $field_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $script_args['strategy'] = 'defer';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,38 +268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $style_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $style_path ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_style_file = '' !== $style_path_norm;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_uri = get_block_asset_url( $style_path_norm );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $has_style_file ) {
- $style_uri = plugins_url( $style_path, $metadata['file'] );
-
- // Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
- static $template_path_norm = '';
- static $stylesheet_path_norm = '';
- if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
- $template_path_norm = wp_normalize_path( get_template_directory() );
- $stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
- }
-
- // Determine if the block style was registered in a theme, by checking if the script path starts with either
- // the parent (template) or child (stylesheet) directory path.
- $is_parent_theme_block = str_starts_with( $style_path_norm, trailingslashit( $template_path_norm ) );
- $is_child_theme_block = str_starts_with( $style_path_norm, trailingslashit( $stylesheet_path_norm ) );
- $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
-
- if ( $is_core_block ) {
- // All possible $style_path variants for core blocks are hard-coded above.
- $style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . '/' . $style_path );
- } elseif ( $is_theme_block ) {
- // Get the script path deterministically based on whether or not it was registered in a parent or child theme.
- $style_uri = $is_parent_theme_block
- ? get_theme_file_uri( str_replace( $template_path_norm, '', $style_path_norm ) )
- : get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $style_path_norm ) );
- }
- } else {
- $style_uri = false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $version = ! $is_core_block && isset( $metadata['version'] ) ? $metadata['version'] : false;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_register_style(
</span><span class="cx" style="display: block; padding: 0 10px"> $style_handle_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $has_style_file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $style_uri ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_style_add_data( $style_handle_name, 'path', $style_path_norm );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_core_block ) {
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockblockjson"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/block.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/block.json (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/block.json 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,8 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+ "apiVersion": 2,
+ "title": "Example Theme Block",
+ "name": "block-theme/example-block",
+ "description": "Custom block registered from within a theme",
+ "editorScript": "file:./index.js",
+ "style": "file:./style.css"
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/block.json
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockeditorstylertlcss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style-rtl.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style-rtl.css 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test CSS file - RTL version */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style-rtl.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockeditorstylecss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style.css 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test CSS file */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/editor-style.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockindexassetphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.asset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.asset.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.asset.php 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,6 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+return array(
+ 'dependencies' => array( 'wp-element', 'wp-blocks' ),
+ 'version' => 'test',
+);
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.asset.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockindexjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.js (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.js 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test JavaScript file. */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/index.js
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockstylertlcss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style-rtl.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style-rtl.css 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test CSS file - RTL version */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style-rtl.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockstylecss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style.css 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test CSS file */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/style.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockviewassetphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.asset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.asset.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.asset.php 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,6 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+return array(
+ 'dependencies' => array( 'wp-element', 'wp-blocks' ),
+ 'version' => 'test',
+);
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.asset.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocksexampleblockviewjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.js (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.js 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Test JavaScript file. */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/blocks/example-block/view.js
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunittestsblocksgetBlockAssetUrlphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/blocks/getBlockAssetUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/getBlockAssetUrl.php (rev 0)
+++ trunk/tests/phpunit/tests/blocks/getBlockAssetUrl.php 2023-09-25 17:47:27 UTC (rev 56683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,116 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Tests for block asset urls.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ *
+ * @since 6.4.0
+ *
+ * @group blocks
+ * @covers ::get_block_asset_url
+ */
+class Tests_Get_Block_Asset_Url extends WP_UnitTestCase {
+ /**
+ * Original theme directory.
+ *
+ * @var string[]
+ */
+ private $orig_theme_dir;
+
+ public function set_up() {
+ global $wp_theme_directories;
+
+ parent::set_up();
+
+ // Sets up the `wp-content/themes/` directory to ensure consistency when running tests.
+ $this->orig_theme_dir = $wp_theme_directories;
+ $wp_theme_directories = array( WP_CONTENT_DIR . '/themes', realpath( DIR_TESTDATA . '/themedir1' ) );
+
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+ }
+
+ public function tear_down() {
+ global $wp_theme_directories;
+
+ $wp_theme_directories = $this->orig_theme_dir;
+
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+
+ parent::tear_down();
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_core_block() {
+ $path = ABSPATH . WPINC . '/blocks/file/view.min.js';
+ $url = get_block_asset_url( $path );
+
+ $this->assertStringNotContainsString( ABSPATH . WPINC, 'The return block asset url should not contain include path.' );
+ $this->assertSame( includes_url( '/blocks/file/view.min.js' ), $url, 'The return block asset url should match includes url.' );
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_parent_theme() {
+ switch_theme( 'block-theme' );
+
+ $path = wp_normalize_path( realpath( DIR_TESTDATA . '/themedir1/block-theme/blocks/example-block/view.js' ) );
+ $url = get_block_asset_url( $path );
+
+ $this->assertSame( get_template_directory_uri() . '/blocks/example-block/view.js', $url );
+
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_child_theme() {
+ switch_theme( 'block-theme-child' );
+
+ $path = wp_normalize_path( realpath( DIR_TESTDATA . '/themedir1/block-theme-child/blocks/example-block/view.js' ) );
+ $url = get_block_asset_url( $path );
+
+ $this->assertSame( get_stylesheet_directory_uri() . '/blocks/example-block/view.js', $url );
+
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_plugin() {
+ $path = WP_PLUGIN_DIR . '/test-plugin/blocks/example-block/view.js';
+ $url = get_block_asset_url( $path );
+
+ $this->assertStringNotContainsString( WP_PLUGIN_DIR, $url, 'The return block asset url should not contain plugin path.' );
+ $this->assertSame( plugins_url( 'view.js', $path ), $url, 'The return block asset url should match plugin url.' );
+ $this->assertStringStartsWith( WP_PLUGIN_URL, $url, 'The return block asset url should contain the url that support with the mu plugin url.' );
+
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_muplugin() {
+ $path = WPMU_PLUGIN_DIR . '/test-plugin/example-block/view.js';
+ $url = get_block_asset_url( $path );
+
+ $this->assertStringNotContainsString( WPMU_PLUGIN_DIR, $url, 'The return block asset url should not contain plugin path.' );
+ $this->assertSame( plugins_url( 'view.js', $path ), $url, 'The return block asset url should match plugin url.' );
+ $this->assertStringStartsWith( WPMU_PLUGIN_URL, $url, 'The return block asset url should contain the url that support with the mu plugin url.' );
+ }
+
+ /**
+ * @ticket 58525
+ */
+ public function test_empty() {
+ $url = get_block_asset_url( '' );
+
+ $this->assertFalse( $url );
+ }
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/blocks/getBlockAssetUrl.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>