<!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>[54408] trunk/src/wp-includes: Editor: Add missing `blocks` origin to `theme.json`.</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/54408">54408</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/54408","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-07 09:38:15 +0000 (Fri, 07 Oct 2022)</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: Add missing `blocks` origin to `theme.json`.
This changeset updates the blocks origin name from core to blocks and adds it to the list of valid origins for `theme.json`.
(See the original fix in [https://github.com//pull/3319 Gutenberg's PR 44363]).
Why?
- This new origin was missing from the list.
- The `core` name is not reflective of what it does, as this data origin is related to block styles, whether they come with WordPress or third-party blocks.
- The existing filter for this piece of data is called `theme_json_blocks`, to reflect it filters "block" data.
- Though `core` origin was used in the past for `default`, this commit reverts it. Why? It was confusing. The goal is to use names that communicate what part of the pipeline are processing (`default > blocks > theme > custom`).
How?
- Renames the string, from `core` to `blocks`.
- Adds `blocks` to the list of valid origins.
- Verifies that the `$theme_json->get_stylesheet()` call uses the proper `$origins` at all times.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/54162">[54162]</a>, <a href="https://core.trac.wordpress.org/changeset/54251">[54251]</a>.
Props oandregal, czapla, jorgefilipecosta, scruffian, bernhard-reiter hellofromTonya.
See <a href="https://core.trac.wordpress.org/ticket/56467">#56467</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesglobalstylesandsettingsphp">trunk/src/wp-includes/global-styles-and-settings.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpthemejsonresolverphp"></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/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-resolver.php 2022-10-07 02:49:24 UTC (rev 54407)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php 2022-10-07 09:38:15 UTC (rev 54408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,12 +295,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme_JSON_Data Class to access and update the underlying data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_json = apply_filters( 'theme_json_blocks', new WP_Theme_JSON_Data( $config, 'core' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_json = apply_filters( 'theme_json_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $config = $theme_json->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Core here means it's the lower level part of the styles chain.
- // It can be a core or a third-party block.
- return new WP_Theme_JSON( $config, 'core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Theme_JSON( $config, 'blocks' );
</ins><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></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></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/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2022-10-07 02:49:24 UTC (rev 54407)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2022-10-07 09:38:15 UTC (rev 54408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +50,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The sources of data this object can represent.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.1.0 Added 'blocks'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var string[]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const VALID_ORIGINS = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blocks',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'custom',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesglobalstylesandsettingsphp"></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/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/global-styles-and-settings.php 2022-10-07 02:49:24 UTC (rev 54407)
+++ trunk/src/wp-includes/global-styles-and-settings.php 2022-10-07 09:38:15 UTC (rev 54408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,8 +113,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If variables are part of the stylesheet,
- * we add them for all origins (default, theme, user).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If variables are part of the stylesheet, then add them.
</ins><span class="cx" style="display: block; padding: 0 10px"> * This is so themes without a theme.json still work as before 5.9:
</span><span class="cx" style="display: block; padding: 0 10px"> * they can override the default presets.
</span><span class="cx" style="display: block; padding: 0 10px"> * See https://core.trac.wordpress.org/ticket/54782
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +120,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $styles_variables = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'variables', $types, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles_variables = $tree->get_stylesheet( array( 'variables' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Only use the default, theme, and custom origins. Why?
+ * Because styles for `blocks` origin are added at a later phase
+ * (i.e. in the render cycle). Here, only the ones in use are rendered.
+ * @see wp_add_global_styles_for_blocks
+ */
+ $origins = array( 'default', 'theme', 'custom' );
+ $styles_variables = $tree->get_stylesheet( array( 'variables' ), $origins );
</ins><span class="cx" style="display: block; padding: 0 10px"> $types = array_diff( $types, array( 'variables' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,6 +139,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $styles_rest = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $types ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Only use the default, theme, and custom origins. Why?
+ * Because styles for `blocks` origin are added at a later phase
+ * (i.e. in the render cycle). Here, only the ones in use are rendered.
+ * @see wp_add_global_styles_for_blocks
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $origins = array( 'default', 'theme', 'custom' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $supports_theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $origins = array( 'default' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,6 +216,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $block_nodes as $metadata ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_css = $tree->get_styles_for_block( $metadata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_should_load_separate_core_block_assets() ) {
+ wp_add_inline_style( 'global-styles', $block_css );
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $metadata['name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_name = str_replace( 'core/', '', $metadata['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2022-10-07 02:49:24 UTC (rev 54407)
+++ trunk/src/wp-includes/script-loader.php 2022-10-07 09:38:15 UTC (rev 54408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2409,14 +2409,11 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If we are loading CSS for each block separately, then we can load the theme.json CSS conditionally.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If loading the CSS for each block separately, then load the theme.json CSS conditionally.
</ins><span class="cx" style="display: block; padding: 0 10px"> * This removes the CSS from the global-styles stylesheet and adds it to the inline CSS for each block.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This filter must be registered before calling wp_get_global_stylesheet();
</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 ( $separate_assets ) {
- add_filter( 'theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
- // Add each block as an inline css.
- wp_add_global_styles_for_blocks();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = wp_get_global_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2427,6 +2424,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_style( 'global-styles', false, array(), true, true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_style( 'global-styles', $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'global-styles' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add each block as an inline css.
+ wp_add_global_styles_for_blocks();
</ins><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></span></pre>
</div>
</div>
</body>
</html>