<!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>[53688] trunk: Tools: Automate backporting core blocks from Gutenberg 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/53688">53688</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/53688","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-07-08 12:32:37 +0000 (Fri, 08 Jul 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: Automate backporting core blocks from Gutenberg to Core
Syncing stable blocks from the Gutenberg repository to wordpress-develop was a manual process, but it got automated with the script that runs together with syncing WordPress packages changed in the Gutenberg package.
Props zieladam.
Fixes <a href="https://core.trac.wordpress.org/ticket/56179">#56179</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
<li><a href="#trunksrcwpincludesblocksindexphp">trunk/src/wp-includes/blocks/index.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksrequiredynamicblocksphp">trunk/src/wp-includes/blocks/require-dynamic-blocks.php</a></li>
<li><a href="#trunksrcwpincludesblocksrequirestaticblocksphp">trunk/src/wp-includes/blocks/require-static-blocks.php</a></li>
<li><a href="#trunktestsphpunitincludesunregisterblockshooksphp">trunk/tests/phpunit/includes/unregister-blocks-hooks.php</a></li>
<li><a href="#trunktoolsreleasesyncstableblocksjs">trunk/tools/release/sync-stable-blocks.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2022-07-08 00:11:15 UTC (rev 53687)
+++ trunk/Gruntfile.js 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1246,9 +1246,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Update any non-@wordpress deps to the same version as required in the @wordpress packages (e.g. react 16 -> 17).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.task.run( 'wp-packages:refresh-deps' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Build the files stored in the src/ directory.
- grunt.task.run( 'build' );
</del><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"> grunt.renameTask( 'watch', '_watch' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1698,6 +1695,12 @@
</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">+ grunt.registerTask( 'wp-packages:sync-stable-blocks', 'Refresh the PHP files referring to stable @wordpress/block-library blocks.', function() {
+ grunt.log.writeln( `Syncing stable blocks from @wordpress/block-library to src/` );
+ const { main } = require( './tools/release/sync-stable-blocks' );
+ main();
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Patch task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.renameTask('patch_wordpress', 'patch');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package.json 2022-07-08 00:11:15 UTC (rev 53687)
+++ trunk/package.json 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,6 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit",
</span><span class="cx" style="display: block; padding: 0 10px"> "test:e2e": "node ./tests/e2e/run-tests.js",
</span><span class="cx" style="display: block; padding: 0 10px"> "test:visual": "node ./tests/visual-regression/run-tests.js",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "sync-gutenberg-packages": "grunt sync-gutenberg-packages --dev"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "sync-gutenberg-packages": "grunt sync-gutenberg-packages",
+ "postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"
</ins><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="trunksrcwpincludesblocksindexphp"></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/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/index.php 2022-07-08 00:11:15 UTC (rev 53687)
+++ trunk/src/wp-includes/blocks/index.php 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,68 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</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">+define( 'BLOCKS_PATH', ABSPATH . WPINC . '/blocks/' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Include files required for core blocks registration.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require ABSPATH . WPINC . '/blocks/archives.php';
-require ABSPATH . WPINC . '/blocks/avatar.php';
-require ABSPATH . WPINC . '/blocks/block.php';
-require ABSPATH . WPINC . '/blocks/calendar.php';
-require ABSPATH . WPINC . '/blocks/categories.php';
-require ABSPATH . WPINC . '/blocks/comment-author-name.php';
-require ABSPATH . WPINC . '/blocks/comment-content.php';
-require ABSPATH . WPINC . '/blocks/comment-date.php';
-require ABSPATH . WPINC . '/blocks/comment-edit-link.php';
-require ABSPATH . WPINC . '/blocks/comment-reply-link.php';
-require ABSPATH . WPINC . '/blocks/comment-template.php';
-require ABSPATH . WPINC . '/blocks/comments-pagination.php';
-require ABSPATH . WPINC . '/blocks/comments-pagination-next.php';
-require ABSPATH . WPINC . '/blocks/comments-pagination-numbers.php';
-require ABSPATH . WPINC . '/blocks/comments-pagination-previous.php';
-require ABSPATH . WPINC . '/blocks/comments-title.php';
-require ABSPATH . WPINC . '/blocks/cover.php';
-require ABSPATH . WPINC . '/blocks/file.php';
-require ABSPATH . WPINC . '/blocks/gallery.php';
-require ABSPATH . WPINC . '/blocks/home-link.php';
-require ABSPATH . WPINC . '/blocks/image.php';
-require ABSPATH . WPINC . '/blocks/latest-comments.php';
-require ABSPATH . WPINC . '/blocks/latest-posts.php';
-require ABSPATH . WPINC . '/blocks/legacy-widget.php';
-require ABSPATH . WPINC . '/blocks/loginout.php';
-require ABSPATH . WPINC . '/blocks/navigation.php';
-require ABSPATH . WPINC . '/blocks/navigation-link.php';
-require ABSPATH . WPINC . '/blocks/navigation-submenu.php';
-require ABSPATH . WPINC . '/blocks/page-list.php';
-require ABSPATH . WPINC . '/blocks/pattern.php';
-require ABSPATH . WPINC . '/blocks/post-author.php';
-require ABSPATH . WPINC . '/blocks/post-author-biography.php';
-require ABSPATH . WPINC . '/blocks/post-comments.php';
-require ABSPATH . WPINC . '/blocks/post-comments-form.php';
-require ABSPATH . WPINC . '/blocks/post-content.php';
-require ABSPATH . WPINC . '/blocks/post-date.php';
-require ABSPATH . WPINC . '/blocks/post-excerpt.php';
-require ABSPATH . WPINC . '/blocks/post-featured-image.php';
-require ABSPATH . WPINC . '/blocks/post-navigation-link.php';
-require ABSPATH . WPINC . '/blocks/post-template.php';
-require ABSPATH . WPINC . '/blocks/post-terms.php';
-require ABSPATH . WPINC . '/blocks/post-title.php';
-require ABSPATH . WPINC . '/blocks/query.php';
-require ABSPATH . WPINC . '/blocks/query-no-results.php';
-require ABSPATH . WPINC . '/blocks/query-pagination.php';
-require ABSPATH . WPINC . '/blocks/query-pagination-next.php';
-require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php';
-require ABSPATH . WPINC . '/blocks/query-pagination-previous.php';
-require ABSPATH . WPINC . '/blocks/query-title.php';
-require ABSPATH . WPINC . '/blocks/read-more.php';
-require ABSPATH . WPINC . '/blocks/rss.php';
-require ABSPATH . WPINC . '/blocks/search.php';
-require ABSPATH . WPINC . '/blocks/shortcode.php';
-require ABSPATH . WPINC . '/blocks/site-logo.php';
-require ABSPATH . WPINC . '/blocks/site-tagline.php';
-require ABSPATH . WPINC . '/blocks/site-title.php';
-require ABSPATH . WPINC . '/blocks/social-link.php';
-require ABSPATH . WPINC . '/blocks/tag-cloud.php';
-require ABSPATH . WPINC . '/blocks/template-part.php';
-require ABSPATH . WPINC . '/blocks/term-description.php';
-require ABSPATH . WPINC . '/blocks/widget-group.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require BLOCKS_PATH . 'legacy-widget.php';
+require BLOCKS_PATH . 'widget-group.php';
+require BLOCKS_PATH . 'require-dynamic-blocks.php';
</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"> * Registers core block types using metadata files.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,40 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_core_block_types_from_metadata() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_folders = array(
- 'audio',
- 'button',
- 'buttons',
- 'code',
- 'column',
- 'columns',
- 'comments-query-loop',
- 'embed',
- 'freeform',
- 'group',
- 'heading',
- 'html',
- 'list',
- 'media-text',
- 'missing',
- 'more',
- 'nextpage',
- 'paragraph',
- 'preformatted',
- 'pullquote',
- 'quote',
- 'separator',
- 'social-links',
- 'spacer',
- 'table',
- 'text-columns',
- 'verse',
- 'video',
- );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_folders = require BLOCKS_PATH . 'require-static-blocks.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $block_folders as $block_folder ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ABSPATH . WPINC . '/blocks/' . $block_folder
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ BLOCKS_PATH . $block_folder
</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="trunksrcwpincludesblocksrequiredynamicblocksphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/blocks/require-dynamic-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/require-dynamic-blocks.php (rev 0)
+++ trunk/src/wp-includes/blocks/require-dynamic-blocks.php 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,63 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!
+// Requires files for dynamic blocks necessary for core blocks registration.
+require ABSPATH . WPINC . '/blocks/archives.php';
+require ABSPATH . WPINC . '/blocks/avatar.php';
+require ABSPATH . WPINC . '/blocks/block.php';
+require ABSPATH . WPINC . '/blocks/calendar.php';
+require ABSPATH . WPINC . '/blocks/categories.php';
+require ABSPATH . WPINC . '/blocks/comment-author-name.php';
+require ABSPATH . WPINC . '/blocks/comment-content.php';
+require ABSPATH . WPINC . '/blocks/comment-date.php';
+require ABSPATH . WPINC . '/blocks/comment-edit-link.php';
+require ABSPATH . WPINC . '/blocks/comment-reply-link.php';
+require ABSPATH . WPINC . '/blocks/comment-template.php';
+require ABSPATH . WPINC . '/blocks/comments-pagination-next.php';
+require ABSPATH . WPINC . '/blocks/comments-pagination-numbers.php';
+require ABSPATH . WPINC . '/blocks/comments-pagination-previous.php';
+require ABSPATH . WPINC . '/blocks/comments-pagination.php';
+require ABSPATH . WPINC . '/blocks/comments-title.php';
+require ABSPATH . WPINC . '/blocks/cover.php';
+require ABSPATH . WPINC . '/blocks/file.php';
+require ABSPATH . WPINC . '/blocks/gallery.php';
+require ABSPATH . WPINC . '/blocks/home-link.php';
+require ABSPATH . WPINC . '/blocks/image.php';
+require ABSPATH . WPINC . '/blocks/latest-comments.php';
+require ABSPATH . WPINC . '/blocks/latest-posts.php';
+require ABSPATH . WPINC . '/blocks/loginout.php';
+require ABSPATH . WPINC . '/blocks/navigation-link.php';
+require ABSPATH . WPINC . '/blocks/navigation-submenu.php';
+require ABSPATH . WPINC . '/blocks/navigation.php';
+require ABSPATH . WPINC . '/blocks/page-list.php';
+require ABSPATH . WPINC . '/blocks/pattern.php';
+require ABSPATH . WPINC . '/blocks/post-author.php';
+require ABSPATH . WPINC . '/blocks/post-author-biography.php';
+require ABSPATH . WPINC . '/blocks/post-comments.php';
+require ABSPATH . WPINC . '/blocks/post-comments-form.php';
+require ABSPATH . WPINC . '/blocks/post-content.php';
+require ABSPATH . WPINC . '/blocks/post-date.php';
+require ABSPATH . WPINC . '/blocks/post-excerpt.php';
+require ABSPATH . WPINC . '/blocks/post-featured-image.php';
+require ABSPATH . WPINC . '/blocks/post-navigation-link.php';
+require ABSPATH . WPINC . '/blocks/post-template.php';
+require ABSPATH . WPINC . '/blocks/post-terms.php';
+require ABSPATH . WPINC . '/blocks/post-title.php';
+require ABSPATH . WPINC . '/blocks/query-no-results.php';
+require ABSPATH . WPINC . '/blocks/query-pagination-next.php';
+require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php';
+require ABSPATH . WPINC . '/blocks/query-pagination-previous.php';
+require ABSPATH . WPINC . '/blocks/query-pagination.php';
+require ABSPATH . WPINC . '/blocks/query-title.php';
+require ABSPATH . WPINC . '/blocks/query.php';
+require ABSPATH . WPINC . '/blocks/read-more.php';
+require ABSPATH . WPINC . '/blocks/rss.php';
+require ABSPATH . WPINC . '/blocks/search.php';
+require ABSPATH . WPINC . '/blocks/shortcode.php';
+require ABSPATH . WPINC . '/blocks/site-logo.php';
+require ABSPATH . WPINC . '/blocks/site-tagline.php';
+require ABSPATH . WPINC . '/blocks/site-title.php';
+require ABSPATH . WPINC . '/blocks/social-link.php';
+require ABSPATH . WPINC . '/blocks/tag-cloud.php';
+require ABSPATH . WPINC . '/blocks/template-part.php';
+require ABSPATH . WPINC . '/blocks/term-description.php';
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/require-dynamic-blocks.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="trunksrcwpincludesblocksrequirestaticblocksphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/blocks/require-static-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/require-static-blocks.php (rev 0)
+++ trunk/src/wp-includes/blocks/require-static-blocks.php 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,34 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!
+// Returns folder names for static blocks necessary for core blocks registration.
+return array(
+ 'audio',
+ 'button',
+ 'buttons',
+ 'code',
+ 'column',
+ 'columns',
+ 'comments-query-loop',
+ 'embed',
+ 'freeform',
+ 'group',
+ 'heading',
+ 'html',
+ 'list',
+ 'media-text',
+ 'missing',
+ 'more',
+ 'nextpage',
+ 'paragraph',
+ 'preformatted',
+ 'pullquote',
+ 'quote',
+ 'separator',
+ 'social-links',
+ 'spacer',
+ 'table',
+ 'text-columns',
+ 'verse',
+ 'video',
+);
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/require-static-blocks.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="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php 2022-07-08 00:11:15 UTC (rev 53687)
+++ trunk/tests/phpunit/includes/functions.php 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,66 +332,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _unhook_block_registration() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'init', 'register_block_core_archives' );
- remove_action( 'init', 'register_block_core_avatar' );
- remove_action( 'init', 'register_block_core_block' );
- remove_action( 'init', 'register_block_core_calendar' );
- remove_action( 'init', 'register_block_core_categories' );
- remove_action( 'init', 'register_block_core_comment_author_name' );
- remove_action( 'init', 'register_block_core_comment_content' );
- remove_action( 'init', 'register_block_core_comment_date' );
- remove_action( 'init', 'register_block_core_comment_edit_link' );
- remove_action( 'init', 'register_block_core_comment_reply_link' );
- remove_action( 'init', 'register_block_core_comment_template' );
- remove_action( 'init', 'register_block_core_comments_pagination' );
- remove_action( 'init', 'register_block_core_comments_pagination_next' );
- remove_action( 'init', 'register_block_core_comments_pagination_numbers' );
- remove_action( 'init', 'register_block_core_comments_pagination_previous' );
- remove_action( 'init', 'register_block_core_comments_title' );
- remove_action( 'init', 'register_block_core_cover' );
- remove_action( 'init', 'register_block_core_file' );
- remove_action( 'init', 'register_block_core_gallery' );
- remove_action( 'init', 'register_block_core_home_link' );
- remove_action( 'init', 'register_block_core_image' );
- remove_action( 'init', 'register_block_core_latest_comments' );
- remove_action( 'init', 'register_block_core_latest_posts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require __DIR__ . '/unregister-blocks-hooks.php';
+ remove_action( 'init', 'register_core_block_types_from_metadata' );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'init', 'register_block_core_legacy_widget' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'init', 'register_block_core_loginout' );
- remove_action( 'init', 'register_block_core_navigation' );
- remove_action( 'init', 'register_block_core_navigation_link' );
- remove_action( 'init', 'register_block_core_navigation_submenu' );
- remove_action( 'init', 'register_block_core_page_list' );
- remove_action( 'init', 'register_block_core_pattern' );
- remove_action( 'init', 'register_block_core_post_author' );
- remove_action( 'init', 'register_block_core_post_author_biography' );
- remove_action( 'init', 'register_block_core_post_comments' );
- remove_action( 'init', 'register_block_core_post_comments_form' );
- remove_action( 'init', 'register_block_core_post_content' );
- remove_action( 'init', 'register_block_core_post_date' );
- remove_action( 'init', 'register_block_core_post_excerpt' );
- remove_action( 'init', 'register_block_core_post_featured_image' );
- remove_action( 'init', 'register_block_core_post_navigation_link' );
- remove_action( 'init', 'register_block_core_post_template' );
- remove_action( 'init', 'register_block_core_post_terms' );
- remove_action( 'init', 'register_block_core_post_title' );
- remove_action( 'init', 'register_block_core_query' );
- remove_action( 'init', 'register_block_core_query_no_results' );
- remove_action( 'init', 'register_block_core_query_pagination' );
- remove_action( 'init', 'register_block_core_query_pagination_next' );
- remove_action( 'init', 'register_block_core_query_pagination_numbers' );
- remove_action( 'init', 'register_block_core_query_pagination_previous' );
- remove_action( 'init', 'register_block_core_query_title' );
- remove_action( 'init', 'register_block_core_read_more' );
- remove_action( 'init', 'register_block_core_rss' );
- remove_action( 'init', 'register_block_core_search' );
- remove_action( 'init', 'register_block_core_shortcode' );
- remove_action( 'init', 'register_block_core_site_logo' );
- remove_action( 'init', 'register_block_core_site_tagline' );
- remove_action( 'init', 'register_block_core_site_title' );
- remove_action( 'init', 'register_block_core_social_link' );
- remove_action( 'init', 'register_block_core_tag_cloud' );
- remove_action( 'init', 'register_block_core_template_part' );
- remove_action( 'init', 'register_block_core_term_description' );
</del><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'init', 'register_block_core_widget_group' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'init', 'register_core_block_types_from_metadata' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitincludesunregisterblockshooksphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/includes/unregister-blocks-hooks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/unregister-blocks-hooks.php (rev 0)
+++ trunk/tests/phpunit/includes/unregister-blocks-hooks.php 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,62 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!
+remove_action( 'init', 'register_block_core_archives' );
+remove_action( 'init', 'register_block_core_avatar' );
+remove_action( 'init', 'register_block_core_block' );
+remove_action( 'init', 'register_block_core_calendar' );
+remove_action( 'init', 'register_block_core_categories' );
+remove_action( 'init', 'register_block_core_comment_author_name' );
+remove_action( 'init', 'register_block_core_comment_content' );
+remove_action( 'init', 'register_block_core_comment_date' );
+remove_action( 'init', 'register_block_core_comment_edit_link' );
+remove_action( 'init', 'register_block_core_comment_reply_link' );
+remove_action( 'init', 'register_block_core_comment_template' );
+remove_action( 'init', 'register_block_core_comments_pagination' );
+remove_action( 'init', 'register_block_core_comments_pagination_next' );
+remove_action( 'init', 'register_block_core_comments_pagination_numbers' );
+remove_action( 'init', 'register_block_core_comments_pagination_previous' );
+remove_action( 'init', 'register_block_core_comments_title' );
+remove_action( 'init', 'register_block_core_cover' );
+remove_action( 'init', 'register_block_core_file' );
+remove_action( 'init', 'register_block_core_gallery' );
+remove_action( 'init', 'register_block_core_home_link' );
+remove_action( 'init', 'register_block_core_image' );
+remove_action( 'init', 'register_block_core_latest_comments' );
+remove_action( 'init', 'register_block_core_latest_posts' );
+remove_action( 'init', 'register_block_core_loginout' );
+remove_action( 'init', 'register_block_core_navigation' );
+remove_action( 'init', 'register_block_core_navigation_link' );
+remove_action( 'init', 'register_block_core_navigation_submenu' );
+remove_action( 'init', 'register_block_core_page_list' );
+remove_action( 'init', 'register_block_core_pattern' );
+remove_action( 'init', 'register_block_core_post_author' );
+remove_action( 'init', 'register_block_core_post_author_biography' );
+remove_action( 'init', 'register_block_core_post_comments' );
+remove_action( 'init', 'register_block_core_post_comments_form' );
+remove_action( 'init', 'register_block_core_post_content' );
+remove_action( 'init', 'register_block_core_post_date' );
+remove_action( 'init', 'register_block_core_post_excerpt' );
+remove_action( 'init', 'register_block_core_post_featured_image' );
+remove_action( 'init', 'register_block_core_post_navigation_link' );
+remove_action( 'init', 'register_block_core_post_template' );
+remove_action( 'init', 'register_block_core_post_terms' );
+remove_action( 'init', 'register_block_core_post_title' );
+remove_action( 'init', 'register_block_core_query' );
+remove_action( 'init', 'register_block_core_query_no_results' );
+remove_action( 'init', 'register_block_core_query_pagination' );
+remove_action( 'init', 'register_block_core_query_pagination_next' );
+remove_action( 'init', 'register_block_core_query_pagination_numbers' );
+remove_action( 'init', 'register_block_core_query_pagination_previous' );
+remove_action( 'init', 'register_block_core_query_title' );
+remove_action( 'init', 'register_block_core_read_more' );
+remove_action( 'init', 'register_block_core_rss' );
+remove_action( 'init', 'register_block_core_search' );
+remove_action( 'init', 'register_block_core_shortcode' );
+remove_action( 'init', 'register_block_core_site_logo' );
+remove_action( 'init', 'register_block_core_site_tagline' );
+remove_action( 'init', 'register_block_core_site_title' );
+remove_action( 'init', 'register_block_core_social_link' );
+remove_action( 'init', 'register_block_core_tag_cloud' );
+remove_action( 'init', 'register_block_core_template_part' );
+remove_action( 'init', 'register_block_core_term_description' );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/includes/unregister-blocks-hooks.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="trunktoolsreleasesyncstableblocksjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tools/release/sync-stable-blocks.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/release/sync-stable-blocks.js (rev 0)
+++ trunk/tools/release/sync-stable-blocks.js 2022-07-08 12:32:37 UTC (rev 53688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,144 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* eslint-disable no-console */
+/**
+ * External dependencies
+ */
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+/**
+ * Constants
+ */
+const BLOCK_LIBRARY_SRC = 'node_modules/@wordpress/block-library/src/';
+
+const REPOSITORY_ROOT = path.dirname( path.dirname( __dirname ) );
+
+/**
+ * The main function of this task.
+ *
+ * Refreshes the PHP files referring to stable @wordpress/block-library blocks.
+ */
+function main() {
+ const blocks = getStableBlocksMetadata();
+ const toolWarningMessage = '// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!';
+
+ // wp-includes/blocks/require-blocks.php
+ console.log( 'Refreshing wp-includes/blocks/require-static-blocks.php...' );
+ const staticBlockFolderNames = blocks
+ .filter( ( metadata ) => ! isDynamic( metadata ) )
+ .map( toDirectoryName )
+ .sort()
+ // To the block folder name statement:
+ .map( dirname => ` '${ dirname }',` )
+ .join( "\n" );
+
+ fs.writeFileSync(
+ `${ REPOSITORY_ROOT }/src/wp-includes/blocks/require-static-blocks.php`,
+ `<?php
+
+${ toolWarningMessage }
+// Returns folder names for static blocks necessary for core blocks registration.
+return array(
+${ staticBlockFolderNames }
+);
+`,
+ );
+
+ // wp-includes/blocks/require-blocks.php
+ console.log( 'Refreshing wp-includes/blocks/require-dynamic-blocks.php...' );
+ const dynamicBlockFileRequires = blocks
+ .filter( isDynamic )
+ .map( toDirectoryName )
+ .sort()
+ // To PHP require statement:
+ .map( dirname => `require ABSPATH . WPINC . '/blocks/${ dirname }.php';` )
+ .join( "\n" );
+
+ fs.writeFileSync(
+ `${ REPOSITORY_ROOT }/src/wp-includes/blocks/require-dynamic-blocks.php`,
+ `<?php
+
+${ toolWarningMessage }
+// Requires files for dynamic blocks necessary for core blocks registration.
+${ dynamicBlockFileRequires }
+`,
+ );
+
+ // tests/phpunit/includes/unregister-blocks-hooks.php
+ console.log( 'Refreshing tests/phpunit/includes/unregister-blocks-hooks.php...' );
+ const unregisterHooks = blocks.filter( isDynamic )
+ .map( function toHookName( metadata ) {
+ const php = fs.readFileSync( path.join( metadata.path, '..', 'index.php' ) ).toString();
+ let hookName = php.substring( php.indexOf( "add_action( 'init', 'register_block_core_" ) );
+ return hookName.split( "'" )[ 3 ];
+ } )
+ .sort()
+ .map( function toUnregisterCall( hookName ) {
+ return `remove_action( 'init', '${ hookName }' );`;
+ } )
+ .join( "\n" );
+
+ fs.writeFileSync(
+ `${ REPOSITORY_ROOT }/tests/phpunit/includes/unregister-blocks-hooks.php`,
+ `<?php
+
+${ toolWarningMessage }
+${ unregisterHooks }
+`,
+ );
+ console.log( 'Done!' );
+}
+
+/**
+ * Returns a list of unserialized block.json metadata of the
+ * stable blocks shipped with the currently installed version
+ * of the @wordpress/block-library package/
+ *
+ * @return {Array} List of stable blocks metadata.
+ */
+function getStableBlocksMetadata() {
+ return (
+ fs.readdirSync( BLOCK_LIBRARY_SRC )
+ .map( dirMaybe => path.join( BLOCK_LIBRARY_SRC, dirMaybe, 'block.json' ) )
+ .filter( fs.existsSync )
+ .map( blockJsonPath => ( {
+ ...JSON.parse( fs.readFileSync( blockJsonPath ) ),
+ path: blockJsonPath,
+ } ) )
+ .filter( metadata => (
+ !( '__experimental' in metadata ) || metadata.__experimental === false
+ ) )
+ );
+}
+
+/**
+ * Returns true if the specified metadata refers to a dynamic block.
+ *
+ * @param {Object} metadata Block metadata in question.
+ * @return {boolean} Is it a dynamic block?
+ */
+function isDynamic( metadata ) {
+ return (
+ fs.existsSync( path.join( metadata.path, '..', 'index.php' ) )
+ );
+}
+
+/**
+ * Returns a name of the directory where a given block resides.
+ *
+ * @param {Object} metadata Block metadata in question.
+ * @return {string} Parent directory name.
+ */
+function toDirectoryName( metadata ) {
+ return (
+ path.basename( path.dirname( metadata.path ) )
+ );
+}
+
+module.exports = {
+ main,
+ isDynamic,
+ toDirectoryName,
+ getStableBlocksMetadata,
+};
+
+/* eslint-enable no-console */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tools/release/sync-stable-blocks.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></div>
</body>
</html>