<!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>[54308] trunk/tools/webpack/blocks.js: Tools: Simplify syncing core blocks from Gutenberg plugin to Core</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/54308">54308</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/54308","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-26 11:40:44 +0000 (Mon, 26 Sep 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'>Tools: Simplify syncing core blocks from Gutenberg plugin to Core
Follow-up <a href="https://core.trac.wordpress.org/changeset/53688">[53688]</a>.
Removes the hardcoded list of blocks that should be synced from the Gutenberg plugin. webpack reads all information from the `@wordpress/block-library` by scanning `block.json` files.
Props zieladam, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/56179">#56179</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktoolswebpackblocksjs">trunk/tools/webpack/blocks.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktoolswebpackblocksjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/blocks.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/blocks.js 2022-09-26 11:20:43 UTC (rev 54307)
+++ trunk/tools/webpack/blocks.js 2022-09-26 11:40:44 UTC (rev 54308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,105 +13,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Internal dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const { normalizeJoin, stylesTransform, baseConfig, baseDir } = require( './shared' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const {
+ isDynamic,
+ toDirectoryName,
+ getStableBlocksMetadata,
+} = require( '../release/sync-stable-blocks' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
</span><span class="cx" style="display: block; padding: 0 10px"> const mode = env.environment;
</span><span class="cx" style="display: block; padding: 0 10px"> const suffix = mode === 'production' ? '.min' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- buildTarget = buildTarget + '/wp-includes';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ buildTarget = buildTarget + '/wp-includes';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const dynamicBlockFolders = [
- 'archives',
- 'avatar',
- 'block',
- 'calendar',
- 'categories',
- 'comment-author-name',
- 'comment-content',
- 'comment-date',
- 'comment-edit-link',
- 'comment-reply-link',
- 'comment-template',
- 'comments',
- 'comments-pagination',
- 'comments-pagination-next',
- 'comments-pagination-numbers',
- 'comments-pagination-previous',
- 'comments-title',
- 'cover',
- 'file',
- 'gallery',
- 'home-link',
- 'image',
- 'latest-comments',
- 'latest-posts',
- 'loginout',
- 'navigation',
- 'navigation-link',
- 'navigation-submenu',
- 'page-list',
- 'pattern',
- 'post-author',
- 'post-author-biography',
- 'post-comments-form',
- 'post-content',
- 'post-date',
- 'post-excerpt',
- 'post-featured-image',
- 'post-navigation-link',
- 'post-template',
- 'post-terms',
- 'post-title',
- 'query',
- 'query-no-results',
- 'query-pagination',
- 'query-pagination-next',
- 'query-pagination-numbers',
- 'query-pagination-previous',
- 'query-title',
- 'read-more',
- 'rss',
- 'search',
- 'shortcode',
- 'site-logo',
- 'site-tagline',
- 'site-title',
- 'social-link',
- 'tag-cloud',
- 'template-part',
- 'term-description',
- ];
- const blockFolders = [
- 'audio',
- 'button',
- 'buttons',
- 'code',
- 'column',
- 'columns',
- 'embed',
- 'freeform',
- 'group',
- 'heading',
- 'html',
- 'list',
- 'list-item',
- 'media-text',
- 'missing',
- 'more',
- 'nextpage',
- 'paragraph',
- 'preformatted',
- 'pullquote',
- 'quote',
- 'separator',
- 'social-links',
- 'spacer',
- 'table',
- 'text-columns',
- 'verse',
- 'video',
- ...dynamicBlockFolders,
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const blocks = getStableBlocksMetadata();
+ const dynamicBlockFolders = blocks.filter( isDynamic ).map( toDirectoryName );
+ const blockFolders = blocks.map( toDirectoryName );
</ins><span class="cx" style="display: block; padding: 0 10px"> const blockPHPFiles = {
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgets/src/blocks/legacy-widget/index.php': 'wp-includes/blocks/legacy-widget.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgets/src/blocks/widget-group/index.php': 'wp-includes/blocks/widget-group.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ...dynamicBlockFolders.reduce( ( files, blockName ) => {
</span><span class="cx" style="display: block; padding: 0 10px"> files[ `block-library/src/${ blockName }/index.php` ] = `wp-includes/blocks/${ blockName }.php`;
</span><span class="cx" style="display: block; padding: 0 10px"> return files;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } , {} ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, {} ),
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> const blockMetadataFiles = {
</span><span class="cx" style="display: block; padding: 0 10px"> 'widgets/src/blocks/legacy-widget/block.json': 'wp-includes/blocks/legacy-widget/block.json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ...blockFolders.reduce( ( files, blockName ) => {
</span><span class="cx" style="display: block; padding: 0 10px"> files[ `block-library/src/${ blockName }/block.json` ] = `wp-includes/blocks/${ blockName }/block.json`;
</span><span class="cx" style="display: block; padding: 0 10px"> return files;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } , {} ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, {} ),
</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"> const blockPHPCopies = Object.keys( blockPHPFiles ).map( ( filename ) => ( {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
</span><span class="cx" style="display: block; padding: 0 10px"> 'process.env.IS_GUTENBERG_PLUGIN': false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'process.env.FORCE_REDUCED_MOTION': JSON.stringify(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- process.env.FORCE_REDUCED_MOTION
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ process.env.FORCE_REDUCED_MOTION,
</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"> new DependencyExtractionPlugin( {
</span></span></pre>
</div>
</div>
</body>
</html>