<!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>[52364] trunk: Update @wordpress packages</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/52364">52364</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/52364","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>noisysocks</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-14 01:55:28 +0000 (Tue, 14 Dec 2021)</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'>Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

- Image block: Set image display to grid when no alignment sent to properly align caption on resize
- Update and align template descriptions
- Site Editor - prevent loading state from showing the admin menu.
- Add client side routing for Site Editor
- Navigation: Add clearance for appender in submenus.
- Fix CSS Custom Properties for presets in the site editor
- Add/navigation blocks post processing after migration from menu items
- Allow selector ordering to ensure theme.json root selector margin takes precedence 
- Do not remove theme presets if defaults are hidden
- Format library: fix unsetting highlight color
- FSE: Fix template resolution to give precedence to child theme PHP templates over parent theme block templates with equal specificity
- ColorPalette: Improving accessibility and visibility
- Update: Make the color popover on the gradient picker appear as expected
- Site Editor: Display a notice if export fails
- Fix docs and function naming for gallery block registration in PHP
- Switch to addEventListener for load event in the navigation block view script
- Fix mistake in _remove_theme_attribute_in_block_template_content
- Better synchronisation between Gutenberg and Core code
- Move the block page templates hook into compat/5.9 folder
- Moves to the template loader hooks and functions into lib/compat folder
- Refactor the gutenberg_is_fse_theme function to use wp_is_block_theme
- Site Editor: Update support doc URL in Welcome Guide
- Global Styles: Add Welcome Guide toggle
- Hide remove control point when removing would break gradient control
- Don't request the deprecated navigation areas endpoint outside of the Gutenberg plugin
- Image: Fix resizer controls being hidden in Safari when switching between alignments
- Remove Navigation Menus from WP Admin sidebar
- Site Editor: Hide the block appender in the Template Part editor
- Site Editor: Use server definition for the Template Areas
- Synchronize wp_is_block_theme and block-templates block support with Core
- E2E: Retry login again after a bad nonce request to prevent intermittent test failures 
- Fix theme requirement validation with WP 5.8
- Fix WP 5.9 check for conditionally running code
- Fix post comment form input width
- Border Style Control: Update styling for consistency with border width control
- Fix form-submit styles by adding button classes to the submit-button in post-comments block
- Site Editor: Fix edit template part link in header dropdown
- Move duotone palette to the bottom of global styles gradients
- Fix how appearanceTools works
- Move WP 5.9 wp-admin menus compatibility code to lib/compat folder
- Revert "Site Editor: Set the <title> on the list page to be same as the CPT name"
- Site Editor: Document Actions: add SR text to heading 1
- Do not register global styles CPT in WordPress 5.9
- Global Styles: Move the 'Edit colors' button to a standard menu item
- Fix styles for previews and patterns
- Site Editor: Fix failing E2E test
- Templates: Search for old template names in the parent theme too
- Remove 4 instances of 'gutenberg' text domain from WordPress core
- Fix content loss when ungrouping template parts or reusable blocks
- Simplify the RESET_BLOCK action to fix template part focus mode content loss
- [Global Styles]: Make Blocks section more distinguishable
- Only use block markup for comment form button when using a block theme
- Navigation: Fix vertical alignment of page list in modal.
- Fix: ToggleGroupControl active state
- Remove gutenberg_ prefix from @wordpress/block-library

Props ocean90, oandregal, hellofromtonya, youknowriad.
See <a href="https://core.trac.wordpress.org/ticket/54487">#54487</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkpackagelockjson">trunk/package-lock.json</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
<li><a href="#trunksrcwpadminsiteeditorphp">trunk/src/wp-admin/site-editor.php</a></li>
<li><a href="#trunksrcwpincludesassetsscriptloaderpackagesphp">trunk/src/wp-includes/assets/script-loader-packages.php</a></li>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunksrcwpincludesblocksindexphp">trunk/src/wp-includes/blocks/index.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationviewassetphp">trunk/src/wp-includes/blocks/navigation/view.asset.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationviewminassetphp">trunk/src/wp-includes/blocks/navigation/view.min.asset.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationsubmenuphp">trunk/src/wp-includes/blocks/navigation-submenu.php</a></li>
<li><a href="#trunksrcwpincludesblockspagelistphp">trunk/src/wp-includes/blocks/page-list.php</a></li>
<li><a href="#trunksrcwpincludesblockspostcommentsblockjson">trunk/src/wp-includes/blocks/post-comments/block.json</a></li>
<li><a href="#trunksrcwpincludesblockspostcommentsphp">trunk/src/wp-includes/blocks/post-comments.php</a></li>
<li><a href="#trunksrcwpincludesblockstemplatepartphp">trunk/src/wp-includes/blocks/template-part.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonphp">trunk/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
<li><a href="#trunktoolswebpackblocksjs">trunk/tools/webpack/blocks.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksgalleryphp">trunk/src/wp-includes/blocks/gallery.php</a></li>
<li><a href="#trunksrcwpincludesblocksimagephp">trunk/src/wp-includes/blocks/image.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkpackagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package-lock.json   2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/package-lock.json     2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1384,9 +1384,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@emotion/babel-plugin": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "11.3.0",
-                       "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz",
-                       "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "11.7.1",
+                       "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.1.tgz",
+                       "integrity": "sha512-K3/6Y+J/sIAjplf3uIteWLhPuOyuMNnE+iyYnTF/m294vc6IL90kTHp7y8ldZYbpKlP17rpOWDKM9DvTcrOmNQ==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/helper-module-imports": "^7.12.13",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/plugin-syntax-jsx": "^7.12.13",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1399,7 +1399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "escape-string-regexp": "^4.0.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "find-root": "^1.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "source-map": "^0.5.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "stylis": "^4.0.3"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "stylis": "4.0.13"
</ins><span class="cx" style="display: block; padding: 0 10px">                         },
</span><span class="cx" style="display: block; padding: 0 10px">                        "dependencies": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "escape-string-regexp": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1410,24 +1410,24 @@
</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">                "@emotion/cache": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "11.6.0",
-                       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.6.0.tgz",
-                       "integrity": "sha512-ElbsWY1KMwEowkv42vGo0UPuLgtPYfIs9BxxVrmvsaJVvktknsHYYlx5NQ5g6zLDcOTyamlDc7FkRg2TAcQDKQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "11.7.1",
+                       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz",
+                       "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/memoize": "^0.7.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/sheet": "^1.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/utils": "^1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/weak-memoize": "^0.2.5",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "stylis": "^4.0.10"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "stylis": "4.0.13"
</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">                "@emotion/css": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "11.5.0",
-                       "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.5.0.tgz",
-                       "integrity": "sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "11.7.1",
+                       "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz",
+                       "integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@emotion/babel-plugin": "^11.0.0",
-                               "@emotion/cache": "^11.5.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@emotion/babel-plugin": "^11.7.1",
+                               "@emotion/cache": "^11.7.1",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@emotion/serialize": "^1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/sheet": "^1.0.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/utils": "^1.0.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1452,12 +1452,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@emotion/react": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "11.7.0",
-                       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.0.tgz",
-                       "integrity": "sha512-WL93hf9+/2s3cA1JVJlz8+Uy6p6QWukqQFOm2OZO5ki51hfucHMOmbSjiyC3t2Y4RI8XUmBoepoc/24ny/VBbA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "11.7.1",
+                       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz",
+                       "integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.13.10",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@emotion/cache": "^11.6.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@emotion/cache": "^11.7.1",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@emotion/serialize": "^1.0.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/sheet": "^1.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/utils": "^1.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3529,21 +3529,21 @@
</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">                "@wordpress/block-directory": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.14.tgz",
-                       "integrity": "sha512-c9fSb3JHosUJb8HdatmvZg8iI9AtYfVwyaARt/5LT0xVtsOlNP6+WeaJa2ikpkdxpIt+sUG28YAgOWuCnLkALA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.17.tgz",
+                       "integrity": "sha512-OpD5qBIO8Nac1BJG2GGb3o5I7hfGpTAEG2LI3cIAq4JgTZI0hJwLTak+ENvb8K3EBgCH4QYXqS6ZaZQaG2VQzw==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/edit-post": "^5.0.14",
-                               "@wordpress/editor": "^12.0.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/edit-post": "^5.0.17",
+                               "@wordpress/editor": "^12.0.14",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/element": "^4.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/html-entities": "^3.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3556,9 +3556,9 @@
</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">                "@wordpress/block-editor": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "8.0.8",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.8.tgz",
-                       "integrity": "sha512-3KFD0gQZ6gvP98b3mvDYtZS/APaxWfw02L8/ur23i79HpKfNYheT+3HMrUf/MUxmsJX++BgWWU86r5kqH0Ug0A==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "8.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.11.tgz",
+                       "integrity": "sha512-U70TL7m/TQNGw6gKMe+gzAh3bzziCW5JcFrF8hv42c4uZk1BL8P4WGHpP5WNvr5Ae529VpN+rSaDmqE7pY4IyQ==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@react-spring/web": "^9.2.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3567,7 +3567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/blob": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/block-serialization-default-parser": "^4.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/deprecated": "^3.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3603,9 +3603,9 @@
</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">                "@wordpress/block-library": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "6.0.12",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.12.tgz",
-                       "integrity": "sha512-Mdlspqpezzq0WSmBd2jTlUXb2/Y4CC+AFyOzY5X47ErWbwZPZnwZtqOmeAjrVwfdQpkqAyMJWjMdj7C71qoRTQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "6.0.15",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.15.tgz",
+                       "integrity": "sha512-jE2k9YPOE/AfDJHM0cCInQYY8/OA3xwnbCZb0aazTCfm2UlJYzSc8BluPydX8Pyv4915cLAZ614RueViou6P0g==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3612,9 +3612,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/autop": "^3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/blob": "^3.2.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3627,14 +3627,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/html-entities": "^3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/icons": "^6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/interface": "^4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/is-shallow-equal": "^4.2.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/notices": "^3.2.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/primitives": "^3.0.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/reusable-blocks": "^3.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/rich-text": "^5.0.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/server-side-render": "^3.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/server-side-render": "^3.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/url": "^3.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/viewport": "^4.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "classnames": "^2.3.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3689,9 +3689,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/components": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "19.1.2",
-                       "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.2.tgz",
-                       "integrity": "sha512-Qdj8l+/3wwkwxP1/pG3369/2xhKz07lpDXlNyAOMEctA8o8YhVLKvHhAiOKMNL/TQkPz9hWai9MEK/5aPsXffg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "19.1.5",
+                       "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.5.tgz",
+                       "integrity": "sha512-dZLrGhhjYWhxbDc72kSjgsWUkTksXa5XhCF4hAXXA9zCVMTUksOWFTIozsgQhUDQpHuq1JKWnDvzVo/Gzo24zQ==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@emotion/cache": "^11.4.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3785,16 +3785,16 @@
</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">                "@wordpress/customize-widgets": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "2.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.14.tgz",
-                       "integrity": "sha512-QGHulwm/osqTMnVIcGjCz+hHTNNb1VSucr1zp/pr294H9StOIENer20dr7WSFiUavTRtXdcAWxpbiJkcaeEwYw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "2.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.17.tgz",
+                       "integrity": "sha512-d0piCMwzS6ShBk72RLn6npVGY0XoNcdk1B8Z8h7X2bOQPNZ5UDQw6jMQurQIIbxnsMR9VeluTP5qBVrhc3kqNQ==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
-                               "@wordpress/block-library": "^6.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
+                               "@wordpress/block-library": "^6.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3803,12 +3803,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/icons": "^6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/interface": "^4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/is-shallow-equal": "^4.2.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keyboard-shortcuts": "^3.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/media-utils": "^3.0.5",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/widgets": "^2.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/widgets": "^2.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "classnames": "^2.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "lodash": "^4.17.21"
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3909,9 +3909,9 @@
</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">                "@wordpress/e2e-test-utils": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "5.4.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.9.tgz",
-                       "integrity": "sha512-L0ReQGU8N9soIUoomVEILR7/PX0BrlBMltH9yjFuNxUweqZxoKd5vhNEDQfN2BZM24Zrnm9P/XQmdNwr9r/vPw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.4.10",
+                       "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.10.tgz",
+                       "integrity": "sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px">                        "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3937,27 +3937,27 @@
</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">                "@wordpress/edit-post": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "5.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.14.tgz",
-                       "integrity": "sha512-5groMRI4CT6I6TcZeG2T5GC5j4Uj1dNlk69DF4q+eLJf6bs3EO3A2gIfzr2fuMTsfOO9pyrk+Y3yjEG8fDg3AA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.17.tgz",
+                       "integrity": "sha512-nqRMXTWlutu8OQnqLpp052PqZoBvTjv59hT28QvFagOngGb5/iirqaauCe7iLEZDyIQW95k7K3goxGPhdqzDTA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
-                               "@wordpress/block-library": "^6.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
+                               "@wordpress/block-library": "^6.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data-controls": "^2.2.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/editor": "^12.0.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/editor": "^12.0.14",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/element": "^4.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/icons": "^6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/interface": "^4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/keyboard-shortcuts": "^3.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/media-utils": "^3.0.5",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3982,28 +3982,28 @@
</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">                "@wordpress/edit-site": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.14.tgz",
-                       "integrity": "sha512-mG3D1rad/HK87HqxvnZE7wiQl9ZC2fqrxiUwfQgyOU9F+2T3s6DCKMquJhDrs0TPCmZMj+y4H/cHN46Yw8hhbw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.17.tgz",
+                       "integrity": "sha512-CC3JB4L7Dg33kxSkxpBqsqksn30GiFH5x1dcLMt9BYTAGDGwlmShCQJhZI6ifSD9/F+CA1JviG4fB9UATmgMow==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
-                               "@wordpress/block-library": "^6.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
+                               "@wordpress/block-library": "^6.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data-controls": "^2.2.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/editor": "^12.0.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/editor": "^12.0.14",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/element": "^4.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/html-entities": "^3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/icons": "^6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/interface": "^4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/keyboard-shortcuts": "^3.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/media-utils": "^3.0.5",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4010,12 +4010,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/notices": "^3.2.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/plugins": "^4.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/primitives": "^3.0.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/reusable-blocks": "^3.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/url": "^3.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/viewport": "^4.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "classnames": "^2.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "downloadjs": "^1.4.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "file-saver": "^2.0.2",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                "history": "^5.1.0",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "jszip": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "lodash": "^4.17.21",
</span><span class="cx" style="display: block; padding: 0 10px">                                "rememo": "^3.0.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4022,17 +4023,17 @@
</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">                "@wordpress/edit-widgets": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.1.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.9.tgz",
-                       "integrity": "sha512-ivcnkftK+0N6lZjtcIbj2onsfvmt7/oo6e5Uh+ZcYXQGoX9t+02zFik23gOgqPqbb7XkbkQGf1sHWs5eaFFo5g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.1.12",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.12.tgz",
+                       "integrity": "sha512-u/610TaZbZgE6ArZPBqRvkzCbEJFgtlCrzCEnBIHE93oeytmzUyNo/+vyzj3NvJG40WQIrjWJbmBfuU1Ze+m3w==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
-                               "@wordpress/block-library": "^6.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
+                               "@wordpress/block-library": "^6.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4041,16 +4042,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/hooks": "^3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/icons": "^6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/interface": "^4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/keyboard-shortcuts": "^3.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/media-utils": "^3.0.5",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/notices": "^3.2.7",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/plugins": "^4.0.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/reusable-blocks": "^3.0.14",
-                               "@wordpress/server-side-render": "^3.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.17",
+                               "@wordpress/server-side-render": "^3.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/url": "^3.3.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/widgets": "^2.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/widgets": "^2.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "classnames": "^2.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "lodash": "^4.17.21",
</span><span class="cx" style="display: block; padding: 0 10px">                                "rememo": "^3.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4058,9 +4059,9 @@
</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">                "@wordpress/editor": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "12.0.11",
-                       "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.11.tgz",
-                       "integrity": "sha512-qZ2WJ7JiycKtkPuSUoRApOVECZC5XuseRhfDl3dUwlaRl0jND83B/kj3NoHfZPNB09621j+bwBT39qH78e953g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "12.0.14",
+                       "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.14.tgz",
+                       "integrity": "sha512-CO4I5g4Qve5HOeXcHaQT1sOjZ/VJ5C4K49IIzrgl/P5IEkkw5kwIq94Ori8CtPQZQllzSBWJGpO3QoKhQoVSsg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4067,9 +4068,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/autop": "^3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/blob": "^3.2.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4086,9 +4087,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/keycodes": "^3.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/media-utils": "^3.0.5",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/notices": "^3.2.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/reusable-blocks": "^3.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/rich-text": "^5.0.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/server-side-render": "^3.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/server-side-render": "^3.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/url": "^3.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/wordcount": "^3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "classnames": "^2.3.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4175,14 +4176,14 @@
</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">                "@wordpress/format-library": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.14.tgz",
-                       "integrity": "sha512-iemQKg711CrFmpJvPh1isceiorAGPkKXouPt+UF7Ic8G6YggyUf8hnyGuPIWZM7wTlbh5PD2XeL90+pChJVfRQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.17.tgz",
+                       "integrity": "sha512-QAA0FwJJGW4tj1D/52f28aKtd95yV0md6gVLgoBIgGW+LZV52VYMPMycfxpP/dDBMOzc+8GDQhcutvbpe8weaA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
-                               "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
+                               "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/dom": "^3.2.7",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4237,13 +4238,13 @@
</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">                "@wordpress/interface": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.1.10",
-                       "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.10.tgz",
-                       "integrity": "sha512-3nUDqo69m0EBPpXW83Zv4MjTDRmmeoo2cYWNi2tUEi117Ls7Nuw+zXMdHCdYk1QcqVfVOmRg77tZlPDapDZBqQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.1.13",
+                       "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.13.tgz",
+                       "integrity": "sha512-XWTJtSlqTOTDU19Pq+TMRlYOXRSn2rHRyonp0Il8zSIj6UlMO1FvEXhgGbZcwLfS4bGAqTq7ji5YMxfbTD4QiA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/a11y": "^3.2.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/deprecated": "^3.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4341,13 +4342,13 @@
</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">                "@wordpress/list-reusable-blocks": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.12",
-                       "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.12.tgz",
-                       "integrity": "sha512-slGIu0ABCws87Ch8urInCpg/YI/B7Ap2U8AJ5FSM5cQ6ex+JCbMexABOwiuIHL065hEaw/wI/LNrgP75MRjT8A==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.15",
+                       "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.15.tgz",
+                       "integrity": "sha512-QQ3wH3SAbzQgFbvEzU6gpX1Dc/PzQTwqChVLsXzB7J7538Ulcd+mOvyK9pLn8LCvIeZDBCW5Opp7EPmbWwtN8A==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/element": "^4.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/i18n": "^4.2.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4385,12 +4386,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/nux": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "5.0.12",
-                       "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.12.tgz",
-                       "integrity": "sha512-qMWUHyACqTMI6vGXQA20nUGlagaQ/GOGuk1al6acMrHMbk3b5LCgrA6nYPuHDXfgheZ5dZ85p8r2onos1bUkig==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.0.15",
+                       "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.15.tgz",
+                       "integrity": "sha512-dfpR300xRtj2SgNe2gYp/4KS2ETdixdoIx2B+aap6GdyKW01fF9dmRF8+/bmt3rJs6b3cGE8BaqnS2TEwPH5OA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/deprecated": "^3.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4515,13 +4516,13 @@
</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">                "@wordpress/reusable-blocks": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.14.tgz",
-                       "integrity": "sha512-jR4byu0is1n4FX53wVxuTR60bTU3wYv+yS+nvUPqgo7Ngh/8m3HP6PeKFP35/w3L3zYXM309s9tox7mUsycadg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.17.tgz",
+                       "integrity": "sha512-V12Kr7jzkEbaatSfPdS9u7HSf7KeFe6zO218a51eMqmStHzb9HljO0FKSFLCINq1hjqDiwceeC+S9gfOgIgslg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5487,14 +5488,14 @@
</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">                "@wordpress/server-side-render": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.0.12",
-                       "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.12.tgz",
-                       "integrity": "sha512-ctiH9X/8Yn/Cp7Yvpcq7ee/kG6FDVhgLbCtNLFN+4estKfcKXfdMuzEsV0Lhi3z8SF9pRewwvas0cdIo+maK7g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.15",
+                       "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.15.tgz",
+                       "integrity": "sha512-mrcemEw1eG0i8MGy912rHhi1/FqzneCKv6D/E8QmRX7m2WUz/M5g7XNksRIor44eNLg6dTjQkAM4AzuwAq9C9Q==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/deprecated": "^3.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5560,15 +5561,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "integrity": "sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA=="
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/widgets": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "2.0.14",
-                       "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.14.tgz",
-                       "integrity": "sha512-fMAWwEcK79esTIttuQkCFTHhPsrWbCQmletT8IjpUmT34RXbwGreBXnief8n9H4BC8eTe1JAE/kI3AhtdYfrRg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "2.0.17",
+                       "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.17.tgz",
+                       "integrity": "sha512-jKUIgcu6dlOSk09HEC9p+vnn5J5vc9K0y1NuWumNopqC3/iy9+EwKgpTWkfvytl+pWnDA9Ha+IBa6a99sgcHfw==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@babel/runtime": "^7.16.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/api-fetch": "^5.2.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/block-editor": "^8.0.8",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.11",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/blocks": "^11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/components": "^19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/compose": "^5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/core-data": "^4.0.8",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/data": "^6.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6249,9 +6250,9 @@
</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">                                "object-inspect": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.11.0",
-                                       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-                                       "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.11.1",
+                                       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+                                       "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
</ins><span class="cx" style="display: block; padding: 0 10px">                                 },
</span><span class="cx" style="display: block; padding: 0 10px">                                "string.prototype.trimend": {
</span><span class="cx" style="display: block; padding: 0 10px">                                        "version": "1.0.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13987,6 +13988,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz",
</span><span class="cx" style="display: block; padding: 0 10px">                        "integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                "history": {
+                       "version": "5.1.0",
+                       "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz",
+                       "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==",
+                       "requires": {
+                               "@babel/runtime": "^7.7.6"
+                       }
+               },
</ins><span class="cx" style="display: block; padding: 0 10px">                 "hmac-drbg": {
</span><span class="cx" style="display: block; padding: 0 10px">                        "version": "1.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                        "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21824,9 +21833,9 @@
</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">                                "object-inspect": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.11.0",
-                                       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-                                       "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.11.1",
+                                       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+                                       "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
</ins><span class="cx" style="display: block; padding: 0 10px">                                 },
</span><span class="cx" style="display: block; padding: 0 10px">                                "object.values": {
</span><span class="cx" style="display: block; padding: 0 10px">                                        "version": "1.1.5",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24864,9 +24873,9 @@
</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">                "stylis": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.0.10",
-                       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
-                       "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.0.13",
+                       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
+                       "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px">                "sugarss": {
</span><span class="cx" style="display: block; padding: 0 10px">                        "version": "2.0.0",
</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        2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/package.json  2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/babel-preset-default": "6.4.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/custom-templated-path-webpack-plugin": "2.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/e2e-test-utils": "5.4.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/e2e-test-utils": "5.4.10",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/library-export-default-webpack-plugin": "2.2.0",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/scripts": "19.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "autoprefixer": "^9.8.8",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,15 +82,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/api-fetch": "5.2.6",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/autop": "3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/blob": "3.2.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/block-directory": "3.0.14",
-               "@wordpress/block-editor": "8.0.8",
-               "@wordpress/block-library": "6.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/block-directory": "3.0.17",
+               "@wordpress/block-editor": "8.0.11",
+               "@wordpress/block-library": "6.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/block-serialization-default-parser": "4.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/blocks": "11.1.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/components": "19.1.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/components": "19.1.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/compose": "5.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/core-data": "4.0.8",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/customize-widgets": "2.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/customize-widgets": "2.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/data": "6.1.4",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/data-controls": "2.2.7",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/date": "4.2.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,38 +97,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/deprecated": "3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dom": "3.2.7",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dom-ready": "3.2.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/edit-post": "5.0.14",
-               "@wordpress/edit-site": "3.0.14",
-               "@wordpress/edit-widgets": "3.1.9",
-               "@wordpress/editor": "12.0.11",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/edit-post": "5.0.17",
+               "@wordpress/edit-site": "3.0.17",
+               "@wordpress/edit-widgets": "3.1.12",
+               "@wordpress/editor": "12.0.14",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/element": "4.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/escape-html": "2.2.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/format-library": "3.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/format-library": "3.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/hooks": "3.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/html-entities": "3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/i18n": "4.2.4",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/icons": "6.1.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/interface": "4.1.10",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/interface": "4.1.13",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/is-shallow-equal": "4.2.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/keyboard-shortcuts": "3.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/keycodes": "3.2.4",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/list-reusable-blocks": "3.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/list-reusable-blocks": "3.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/media-utils": "3.0.5",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/notices": "3.2.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/nux": "5.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/nux": "5.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/plugins": "4.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/primitives": "3.0.4",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/priority-queue": "2.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/redux-routine": "4.2.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/reusable-blocks": "3.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/reusable-blocks": "3.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/rich-text": "5.0.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/server-side-render": "3.0.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/server-side-render": "3.0.15",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/shortcode": "3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/token-list": "2.2.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/url": "3.3.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/viewport": "4.0.6",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/warning": "2.2.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/widgets": "2.0.14",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/widgets": "2.0.17",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "@wordpress/wordcount": "3.2.3",
</span><span class="cx" style="display: block; padding: 0 10px">                "backbone": "1.4.0",
</span><span class="cx" style="display: block; padding: 0 10px">                "clipboard": "2.0.8",
</span></span></pre></div>
<a id="trunksrcwpadminsiteeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/site-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/site-editor.php        2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-admin/site-editor.php  2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
</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">+// Used in the HTML title tag.
+$title       = __( 'Editor (beta)' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'themes.php';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Flag that we're loading the block editor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,75 +58,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_settings      = get_block_editor_settings( $custom_settings, $block_editor_context );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         $post_type = get_post_type_object( $_GET['postType'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         if ( ! $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px">                wp_die( __( 'Invalid post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Used in the HTML title tag.
-       $title = $post_type->labels->name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
+$active_theme            = wp_get_theme()->get_stylesheet();
+$preload_paths           = array(
+       array( '/wp/v2/media', 'OPTIONS' ),
+       '/',
+       '/wp/v2/types?context=edit',
+       '/wp/v2/types/wp_template?context=edit',
+       '/wp/v2/types/wp_template-part?context=edit',
+       '/wp/v2/taxonomies?context=edit',
+       '/wp/v2/pages?context=edit',
+       '/wp/v2/categories?context=edit',
+       '/wp/v2/posts?context=edit',
+       '/wp/v2/tags?context=edit',
+       '/wp/v2/templates?context=edit&per_page=-1',
+       '/wp/v2/template-parts?context=edit&per_page=-1',
+       '/wp/v2/settings',
+       '/wp/v2/themes?context=edit&status=active',
+       '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
+       '/wp/v2/global-styles/' . $active_global_styles_id,
+       '/wp/v2/global-styles/themes/' . $active_theme,
+);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $preload_paths = array(
-               '/',
-               '/wp/v2/types/' . $post_type->name . '?context=edit',
-               '/wp/v2/types?context=edit',
-               add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( $post_type->name ) ),
-       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+block_editor_rest_api_preload( $preload_paths, $block_editor_context );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        block_editor_rest_api_preload( $preload_paths, $block_editor_context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_add_inline_script(
+       'wp-edit-site',
+       sprintf(
+               'wp.domReady( function() {
+                       wp.editSite.initializeEditor( "site-editor", %s );
+               } );',
+               wp_json_encode( $editor_settings )
+       )
+);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        wp_add_inline_script(
-               'wp-edit-site',
-               sprintf(
-                       'wp.domReady( function() {
-                               wp.editSite.initializeList( "site-editor", "%s", %s );
-                       } );',
-                       $post_type->name,
-                       wp_json_encode( $editor_settings )
-               )
-       );
-
-} else {
-
-       // Used in the HTML title tag.
-       $title = __( 'Editor (beta)' );
-
-       $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
-       $active_theme            = wp_get_theme()->get_stylesheet();
-       $preload_paths           = array(
-               array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ),
-               '/',
-               '/wp/v2/types?context=edit',
-               '/wp/v2/taxonomies?context=edit',
-               add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'page' ) ),
-               add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'post' ) ),
-               add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'category' ) ),
-               add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'post_tag' ) ),
-               add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template' ) ),
-               add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template_part' ) ),
-               '/wp/v2/settings',
-               '/wp/v2/themes?context=edit&status=active',
-               '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
-               '/wp/v2/global-styles/' . $active_global_styles_id,
-               '/wp/v2/themes/' . $active_theme . '/global-styles',
-       );
-
-       block_editor_rest_api_preload( $preload_paths, $block_editor_context );
-
-       wp_add_inline_script(
-               'wp-edit-site',
-               sprintf(
-                       'wp.domReady( function() {
-                               wp.editSite.initializeEditor( "site-editor", %s );
-                       } );',
-                       wp_json_encode( $editor_settings )
-               )
-       );
-
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Preload server-registered block schemas.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script(
</span><span class="cx" style="display: block; padding: 0 10px">        'wp-blocks',
</span></span></pre></div>
<a id="trunksrcwpincludesassetsscriptloaderpackagesphp"></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/assets/script-loader-packages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/assets/script-loader-packages.php   2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/assets/script-loader-packages.php     2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php return array('a11y.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'fa03f246887237d01c383e85ff6f107c'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'acd6ed75d460d0d3781e1ef6c12cf2aa'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '59f6dbf5a1d9a141515c25411bc4f01e'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e65166da67ee5d5ff66d36ab14532b3b'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-cor
 e-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'a8ff26eaaddf949aee8669d14277aec3'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '1f942819c3ee4c8817290d91009999f9'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp
 -element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '9c50f4a2655f7982925830bfa279e623'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => 'a32036d432544d670dbd252aafb343aa'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', '
 wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '222096a6b8f6db7f3d31e2a7095c7624'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '9dac23239e3ee771f867989188a2e766'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-vie
 wport', 'wp-widgets'), 'version' => 'a4ae79ff9d722a302a31b7af5478e6b7'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'f9c70b06478edf537328ed5ca3555658'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'a6b5897d9fe0799f7c5167a4a9fb3fc2'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'be8358e0f87d66f2bec405069f113602'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '64e8de35a014ff611a39da7042d361dd'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7d156934b7b48d00965baf08e162ab91'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7ad174e925c73007ee5b173582
 42e7d9'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '78dd73ace08da4436266d54e551f1801'), 'edit-site.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => '28cef4f1147fe985ff7d5074907fc201'), 'edit-widge
 ts.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '22329f7ff9d35759e1a4e
 d63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '314e138f1050b863fc65347b91b547d5'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' =&gt
 ; array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '78a4020b31c5ae28f7e97405b83d5027'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '57a448b50bb24e264205e448e0b19ea2'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '411699046747b4d90f82c5b2547ff43c'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab2c70450229febbbb0a87e88074db07'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b9e78ffafe025c455d9ccf2c1a78d1de'), 'nux.js' => array('d
 ependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', '
 wp-primitives', 'wp-url'), 'version' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('depe
 ndencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '67406a236d2370eedc90db2dfdcb46bd'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '5ebe2df53cf3c74ebffc7e2d3e76184c'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3dd8fa0fcd8381649603b755437d9be1'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007'));
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php return array('a11y.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'fa03f246887237d01c383e85ff6f107c'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'acd6ed75d460d0d3781e1ef6c12cf2aa'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '59f6dbf5a1d9a141515c25411bc4f01e'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e65166da67ee5d5ff66d36ab14532b3b'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-cor
 e-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'a8ff26eaaddf949aee8669d14277aec3'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '5447a59462b2c774beaa2c2676852624'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp
 -element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '063fd27a71a60c93f2b842fc805b252e'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => 'a32036d432544d670dbd252aafb343aa'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', '
 wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => 'bbedf234d8932e76baccbf974505e69c'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '9dac23239e3ee771f867989188a2e766'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-vie
 wport', 'wp-widgets'), 'version' => 'a4ae79ff9d722a302a31b7af5478e6b7'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'f9c70b06478edf537328ed5ca3555658'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'a6b5897d9fe0799f7c5167a4a9fb3fc2'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'be8358e0f87d66f2bec405069f113602'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '64e8de35a014ff611a39da7042d361dd'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7d156934b7b48d00965baf08e162ab91'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7ad174e925c73007ee5b173582
 42e7d9'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '78dd73ace08da4436266d54e551f1801'), 'edit-site.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => 'b3c59f02b8cc936c81d89d46c2d09e1c'), 'edit-widge
 ts.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '22329f7ff9d35759e1a4e
 d63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '638b31b2e32bdc443afa62d9aa251d8a'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' =&gt
 ; array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '78a4020b31c5ae28f7e97405b83d5027'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '57a448b50bb24e264205e448e0b19ea2'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '411699046747b4d90f82c5b2547ff43c'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab2c70450229febbbb0a87e88074db07'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b9e78ffafe025c455d9ccf2c1a78d1de'), 'nux.js' => array('d
 ependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', '
 wp-primitives', 'wp-url'), 'version' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('depe
 ndencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '67406a236d2370eedc90db2dfdcb46bd'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '5ebe2df53cf3c74ebffc7e2d3e76184c'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3dd8fa0fcd8381649603b755437d9be1'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007'));
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesblockeditorphp"></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/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-editor.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/block-editor.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'css'                     => 'variables',
</span><span class="cx" style="display: block; padding: 0 10px">                        '__unstableType'          => 'presets',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        '__experimentalNoWrapper' => true,
</del><span class="cx" style="display: block; padding: 0 10px">                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'css'            => 'presets',
</span></span></pre></div>
<a id="trunksrcwpincludesblocktemplateutilsphp"></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/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template-utils.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/block-template-utils.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $root_dir   = get_theme_root( $theme_name );
</span><span class="cx" style="display: block; padding: 0 10px">        $theme_dir  = "$root_dir/$theme_name";
</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 ( is_readable( $theme_dir . '/block-templates/index.html' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( file_exists( $theme_dir . '/block-templates' ) || file_exists( $theme_dir . '/block-template-parts' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_template'      => 'block-templates',
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_template_part' => 'block-template-parts',
</span></span></pre></div>
<a id="trunksrcwpincludesblocksgalleryphp"></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/gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/gallery.php                          (rev 0)
+++ trunk/src/wp-includes/blocks/gallery.php    2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,51 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Server-side rendering of the `core/gallery` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Handles backwards compatibility for Gallery Blocks,
+ * whose images feature a `data-id` attribute.
+ *
+ * Now that the Gallery Block contains inner Image Blocks,
+ * we add a custom `data-id` attribute before rendering the gallery
+ * so that the Image Block can pick it up in its render_callback.
+ *
+ * @param array $parsed_block The block being rendered.
+ * @return array The migrated block object.
+ */
+function block_core_gallery_data_id_backcompatibility( $parsed_block ) {
+       if ( 'core/gallery' === $parsed_block['blockName'] ) {
+               foreach ( $parsed_block['innerBlocks'] as $key => $inner_block ) {
+                       if ( 'core/image' === $inner_block['blockName'] ) {
+                               if ( ! isset( $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] ) && isset( $inner_block['attrs']['id'] ) ) {
+                                       $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] = esc_attr( $inner_block['attrs']['id'] );
+                               }
+                       }
+               }
+       }
+
+       return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' );
+
+/**
+ * Registers the `core/gallery` block on server.
+ * This render callback needs to be here
+ * so that the gallery styles are loaded in block-based themes.
+ */
+function register_block_core_gallery() {
+       register_block_type_from_metadata(
+               __DIR__ . '/gallery',
+               array(
+                       'render_callback' => function ( $attributes, $content ) {
+                               return $content;
+                       },
+               )
+       );
+}
+
+add_action( 'init', 'register_block_core_gallery', 20 );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/gallery.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="trunksrcwpincludesblocksimagephp"></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/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/image.php                            (rev 0)
+++ trunk/src/wp-includes/blocks/image.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,42 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Server-side rendering of the `core/image` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/image` block on the server,
+ * adding a data-id attribute to the element if core/gallery has added on pre-render.
+ *
+ * @param  array $attributes The block attributes.
+ * @param  array $content    The block content.
+ * @return string Returns the block content with the data-id attribute added.
+ */
+function render_block_core_image( $attributes, $content ) {
+       if ( isset( $attributes['data-id'] ) ) {
+               // Add the data-id="$id" attribute to the img element
+               // to provide backwards compatibility for the Gallery Block,
+               // which now wraps Image Blocks within innerBlocks.
+               // The data-id attribute is added in a core/gallery `render_block_data` hook.
+               $data_id_attribute = 'data-id="' . esc_attr( $attributes['data-id'] ) . '"';
+               if ( ! strpos( $content, $data_id_attribute ) ) {
+                       $content = str_replace( '<img', '<img ' . $data_id_attribute . ' ', $content );
+               }
+       }
+       return $content;
+}
+
+
+/**
+ * Registers the `core/image` block on server.
+ */
+function register_block_core_image() {
+       register_block_type_from_metadata(
+               __DIR__ . '/image',
+               array(
+                       'render_callback' => 'render_block_core_image',
+               )
+       );
+}
+add_action( 'init', 'register_block_core_image' );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/image.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="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    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/index.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/calendar.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/categories.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/file.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require ABSPATH . WPINC . '/blocks/gallery.php';
+require ABSPATH . WPINC . '/blocks/image.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/latest-comments.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/latest-posts.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/blocks/legacy-widget.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,11 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'cover',
</span><span class="cx" style="display: block; padding: 0 10px">                'embed',
</span><span class="cx" style="display: block; padding: 0 10px">                'freeform',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'gallery',
</del><span class="cx" style="display: block; padding: 0 10px">                 'group',
</span><span class="cx" style="display: block; padding: 0 10px">                'heading',
</span><span class="cx" style="display: block; padding: 0 10px">                'html',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'image',
</del><span class="cx" style="display: block; padding: 0 10px">                 'list',
</span><span class="cx" style="display: block; padding: 0 10px">                'media-text',
</span><span class="cx" style="display: block; padding: 0 10px">                'missing',
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationviewassetphp"></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/navigation/view.asset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation/view.asset.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/navigation/view.asset.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php return array('dependencies' => array(), 'version' => '133b84f32422a9ad94c4533f85fa4e87');
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php return array('dependencies' => array(), 'version' => '34d9f07c7910e83c264c6c4406619c5e');
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationviewminassetphp"></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/navigation/view.min.asset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation/view.min.asset.php        2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/navigation/view.min.asset.php  2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php return array('dependencies' => array(), 'version' => 'f3cbbfbf9b9c434c39d6f77037d5267c');
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php return array('dependencies' => array(), 'version' => 'd5ab04a497b4f1465f1f0060b6b71ae3');
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationsubmenuphp"></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/navigation-submenu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation-submenu.php       2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/navigation-submenu.php 2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,6 +188,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">+        $aria_label = sprintf(
+               /* translators: Accessibility text. %s: Parent page title. */
+               __( '%s submenu' ),
+               $label
+       );
+
</ins><span class="cx" style="display: block; padding: 0 10px">         $html = '<li ' . $wrapper_attributes . '>';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // If Submenus open on hover, we render an anchor tag with attributes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,11 +232,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $show_submenu_indicators ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // The submenu icon is rendered in a button here
</span><span class="cx" style="display: block; padding: 0 10px">                        // so that there's a clickable elment to open the submenu.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                // If menus open on click, we render the parent as a button.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Wrap title with span to isolate it from submenu icon.
</span><span class="cx" style="display: block; padding: 0 10px">                $html .= '<span class="wp-block-navigation-item__label">';
</span></span></pre></div>
<a id="trunksrcwpincludesblockspagelistphp"></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/page-list.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/page-list.php        2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/page-list.php  2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,12 +173,17 @@
</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">-                $title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $title      = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
+               $aria_label = sprintf(
+                       /* translators: Accessibility text. %s: Parent page title. */
+                       __( '%s submenu' ),
+                       $title
+               );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $markup .= '<li class="wp-block-pages-list__item' . $css_class . '"' . $style_attribute . '>';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $markup .= '<button aria-label="' . $aria_label . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
</ins><span class="cx" style="display: block; padding: 0 10px">                         '</button>';
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $page['children'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $markup .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $markup .= '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
</span><span class="cx" style="display: block; padding: 0 10px">                                $markup .= '</button>';
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span></span></pre></div>
<a id="trunksrcwpincludesblockspostcommentsblockjson"></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/post-comments/block.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/post-comments/block.json     2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/post-comments/block.json       2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,5 +30,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "link": true
</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">-        "style": "wp-block-post-comments"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "style": [
+               "wp-block-post-comments",
+               "wp-block-buttons",
+               "wp-block-button"
+       ]
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesblockspostcommentsphp"></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/post-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/post-comments.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/post-comments.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,3 +66,20 @@
</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"> add_action( 'init', 'register_block_core_post_comments' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Use the button block classes for the form-submit button.
+ *
+ * @param array $fields The default comment form arguments.
+ *
+ * @return array Returns the modified fields.
+ */
+function post_comments_block_form_defaults( $fields ) {
+       if ( wp_is_block_theme() ) {
+               $fields['submit_button'] = '<input name="%1$s" type="submit" id="%2$s" class="%3$s wp-block-button__link" value="%4$s" />';
+               $fields['submit_field']  = '<p class="form-submit wp-block-button">%1$s %2$s</p>';
+       }
+
+       return $fields;
+}
+add_filter( 'comment_form_defaults', 'post_comments_block_form_defaults' );
</ins></span></pre></div>
<a id="trunksrcwpincludesblockstemplatepartphp"></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/template-part.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/template-part.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/blocks/template-part.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +64,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        // Else, if the template part was provided by the active theme,
</span><span class="cx" style="display: block; padding: 0 10px">                        // render the corresponding file content.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $theme_folders           = get_block_theme_folders();
-                       $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $parent_theme_folders        = get_block_theme_folders( get_template() );
+                       $child_theme_folders         = get_block_theme_folders( get_stylesheet() );
+                       $child_theme_part_file_path  = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+                       $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+                       $template_part_file_path     = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path;
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $content = file_get_contents( $template_part_file_path );
</span><span class="cx" style="display: block; padding: 0 10px">                                $content = is_string( $content ) && '' !== $content
</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     2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/class-wp-theme-json.php       2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        const PRESETS_METADATA = array(
</span><span class="cx" style="display: block; padding: 0 10px">                array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'path'       => array( 'color', 'palette' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'override'   => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'override'   => array( 'color', 'defaultPalette' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         'value_key'  => 'color',
</span><span class="cx" style="display: block; padding: 0 10px">                        'css_vars'   => '--wp--preset--color--$slug',
</span><span class="cx" style="display: block; padding: 0 10px">                        'classes'    => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ),
</span><span class="cx" style="display: block; padding: 0 10px">                array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'path'       => array( 'color', 'gradients' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'override'   => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'override'   => array( 'color', 'defaultGradients' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         'value_key'  => 'gradient',
</span><span class="cx" style="display: block; padding: 0 10px">                        'css_vars'   => '--wp--preset--gradient--$slug',
</span><span class="cx" style="display: block; padding: 0 10px">                        'classes'    => array( '.has-$slug-gradient-background' => 'background' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,13 +397,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private static function maybe_opt_in_into_settings( $theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $new_theme_json = $theme_json;
</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 ( isset( $new_theme_json['settings']['appearanceTools'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if (
+                       isset( $new_theme_json['settings']['appearanceTools'] ) &&
+                       true === $new_theme_json['settings']['appearanceTools']
+               ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         self::do_opt_in_into_settings( $new_theme_json['settings'] );
</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">                if ( isset( $new_theme_json['settings']['blocks'] ) && is_array( $new_theme_json['settings']['blocks'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $new_theme_json['settings']['blocks'] as &$block ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( isset( $block['appearanceTools'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( isset( $block['appearanceTools'] ) && ( true === $block['appearanceTools'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         self::do_opt_in_into_settings( $block );
</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">@@ -433,7 +436,9 @@
</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">                foreach ( $to_opt_in as $path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( null === _wp_array_get( $context, $path, null ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Use "unset prop" as a marker instead of "null" because
+                       // "null" can be a valid value for some props (e.g. blockGap).
+                       if ( 'unset prop' === _wp_array_get( $context, $path, 'unset prop' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 _wp_array_set( $context, $path, true );
</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">@@ -1502,9 +1507,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * we remove it from the theme presets.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="cx" style="display: block; padding: 0 10px">                $nodes        = self::get_setting_nodes( $incoming_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $slugs_global = self::get_slugs_not_to_override( $this->theme_json );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $slugs_global = self::get_default_slugs( $this->theme_json, array( 'settings' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $nodes as $node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $slugs_node = self::get_slugs_not_to_override( $this->theme_json, $node['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $slugs_node = self::get_default_slugs( $this->theme_json, $node['path'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $slugs      = array_merge_recursive( $slugs_global, $slugs_node );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Replace the spacing.units.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1516,6 +1521,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Replace the presets.
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( self::PRESETS_METADATA as $preset ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $override_preset = self::should_override_preset( $this->theme_json, $node['path'], $preset['override'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 foreach ( self::VALID_ORIGINS as $origin ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        $path    = array_merge( $node['path'], $preset['path'], array( $origin ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                        $content = _wp_array_get( $incoming_data, $path, null );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1525,13 +1532,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        if (
</span><span class="cx" style="display: block; padding: 0 10px">                                                ( 'theme' !== $origin ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ( 'theme' === $origin && $preset['override'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ( 'theme' === $origin && $override_preset )
</ins><span class="cx" style="display: block; padding: 0 10px">                                         ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                _wp_array_set( $this->theme_json, $path, $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        }
-
-                                       if ( 'theme' === $origin && ! $preset['override'] ) {
-                                               $content = self::filter_slugs( $content, $preset['path'], $slugs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 } else {
+                                               $slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() );
+                                               $content          = self::filter_slugs( $content, $slugs_for_preset );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 _wp_array_set( $this->theme_json, $path, $content );
</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">@@ -1540,13 +1546,55 @@
</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">-         * Returns the slugs for all the presets that cannot be overriden
-        * in the given path. It returns an associative array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Returns whether a presets should be overriden or not.
+        *
+        * @since 5.9.0
+        *
+        * @param array      $theme_json The theme.json like structure to inspect.
+        * @param array      $path Path to inspect.
+        * @param bool|array $override Data to compute whether to override the preset.
+        * @return boolean
+        */
+       private static function should_override_preset( $theme_json, $path, $override ) {
+               if ( is_bool( $override ) ) {
+                       return $override;
+               }
+
+               /*
+                * The relationship between whether to override the defaults
+                * and whether the defaults are enabled is inverse:
+                *
+                * - If defaults are enabled  => theme presets should not be overriden
+                * - If defaults are disabled => theme presets should be overriden
+                *
+                * For example, a theme sets defaultPalette to false,
+                * making the default palette hidden from the user.
+                * In that case, we want all the theme presets to be present,
+                * so they should override the defaults.
+                */
+               if ( is_array( $override ) ) {
+                       $value = _wp_array_get( $theme_json, array_merge( $path, $override ) );
+                       if ( isset( $value ) ) {
+                               return ! $value;
+                       }
+
+                       // Search the top-level key if none was found for this node.
+                       $value = _wp_array_get( $theme_json, array_merge( array( 'settings' ), $override ) );
+                       if ( isset( $value ) ) {
+                               return ! $value;
+                       }
+
+                       return true;
+               }
+       }
+
+       /**
+        * Returns the default slugs for all the presets in an associative array
</ins><span class="cx" style="display: block; padding: 0 10px">          * whose keys are the preset paths and the leafs is the list of slugs.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * For example:
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  *  array(
</ins><span class="cx" style="display: block; padding: 0 10px">          *   'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px">         *     'palette'   => array( 'slug-1', 'slug-2' ),
</span><span class="cx" style="display: block; padding: 0 10px">         *     'gradients' => array( 'slug-3', 'slug-4' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1555,26 +1603,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array $data      A theme.json like structure to inspect.
-        * @param array $node_path The path to inspect. Default `array( 'settings' )`.
-        * @return array An associative array containing the slugs for the given path.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array $data      A theme.json like structure.
+        * @param array $node_path The path to inspect. It's 'settings' by default.
+        * @return array
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private static function get_slugs_not_to_override( $data, $node_path = array( 'settings' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function get_default_slugs( $data, $node_path ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $slugs = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( self::PRESETS_METADATA as $metadata ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $metadata['override'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $path   = array_merge( $node_path, $metadata['path'], array( 'default' ) );
+                       $preset = _wp_array_get( $data, $path, null );
+                       if ( ! isset( $preset ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 continue;
</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">                        $slugs_for_preset = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $path             = array_merge( $node_path, $metadata['path'], array( 'default' ) );
-                       $preset           = _wp_array_get( $data, $path, null );
-                       if ( ! isset( $preset ) ) {
-                               continue;
-                       }
-
</del><span class="cx" style="display: block; padding: 0 10px">                         $slugs_for_preset = array_map(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                function( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         static function( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         return isset( $value['slug'] ) ? $value['slug'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                $preset
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1591,19 +1636,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $node  The node with the presets to validate.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param array $path  The path to the preset type to inspect.
</del><span class="cx" style="display: block; padding: 0 10px">          * @param array $slugs The slugs that should not be overriden.
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array The new node.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private static function filter_slugs( $node, $path, $slugs ) {
-               $slugs_for_preset = _wp_array_get( $slugs, $path, array() );
-               if ( empty( $slugs_for_preset ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function filter_slugs( $node, $slugs ) {
+               if ( empty( $slugs ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $node;
</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">                $new_node = array();
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $node as $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs_for_preset, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $new_node[] = $value;
</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="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/default-filters.php   2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,6 +563,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php    2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/post.php      2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        '_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
</span><span class="cx" style="display: block; padding: 0 10px">                        'has_archive'           => false,
</span><span class="cx" style="display: block; padding: 0 10px">                        'show_ui'               => wp_is_block_theme(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'show_in_menu'          => 'themes.php',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'show_in_menu'          => false,
</ins><span class="cx" style="display: block; padding: 0 10px">                         'show_in_admin_bar'     => false,
</span><span class="cx" style="display: block; padding: 0 10px">                        'show_in_rest'          => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        'rewrite'               => false,
</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   2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/src/wp-includes/script-loader.php     2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2863,3 +2863,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        echo "<script>window.__editorAssets = $editor_assets</script>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Function that enqueues the CSS Custom Properties coming from theme.json.
+ *
+ * @since 5.9.0
+ */
+function wp_enqueue_global_styles_css_custom_properties() {
+       wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
+       wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
+       wp_enqueue_style( 'global-styles-css-custom-properties' );
+}
</ins></span></pre></div>
<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        2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/tests/phpunit/includes/functions.php  2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,6 +307,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        remove_action( 'init', 'register_block_core_calendar' );
</span><span class="cx" style="display: block; padding: 0 10px">        remove_action( 'init', 'register_block_core_categories' );
</span><span class="cx" style="display: block; padding: 0 10px">        remove_action( 'init', 'register_block_core_file' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        remove_action( 'init', 'register_block_core_gallery', 20 );
+       remove_action( 'init', 'register_block_core_image' );
</ins><span class="cx" style="display: block; padding: 0 10px">         remove_action( 'init', 'register_block_core_latest_comments' );
</span><span class="cx" style="display: block; padding: 0 10px">        remove_action( 'init', 'register_block_core_latest_posts' );
</span><span class="cx" style="display: block; padding: 0 10px">        remove_action( 'init', 'register_block_core_legacy_widget' );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/wpThemeJson.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJson.php   2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/tests/phpunit/tests/theme/wpThemeJson.php     2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,12 +200,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
</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">-        function test_get_settings_using_opt_in_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_get_settings_appearance_true_opts_in() {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $theme_json = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="cx" style="display: block; padding: 0 10px">                                'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'appearanceTools' => true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'spacing'         => array(
+                                               'blockGap' => false, // This should override appearanceTools.
+                                       ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                         'blocks'          => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'core/paragraph' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'typography' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +220,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'typography'      => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'lineHeight' => false, // This should override appearanceTools.
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                        'spacing'         => array(
+                                                               'blockGap' => null,
+                                                       ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'link' => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'spacing'    => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'blockGap' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'blockGap' => false,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'margin'   => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                'padding'  => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                'link' => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'spacing'    => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'blockGap' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'blockGap' => false,
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 'margin'   => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                                'padding'  => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,6 +279,54 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $expected, $actual );
</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">+        function test_get_settings_appearance_false_does_not_opt_in() {
+               $theme_json = new WP_Theme_JSON(
+                       array(
+                               'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                               'settings' => array(
+                                       'appearanceTools' => false,
+                                       'border'          => array(
+                                               'width' => true,
+                                       ),
+                                       'blocks'          => array(
+                                               'core/paragraph' => array(
+                                                       'typography' => array(
+                                                               'lineHeight' => false,
+                                                       ),
+                                               ),
+                                               'core/group'     => array(
+                                                       'typography' => array(
+                                                               'lineHeight' => false,
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       )
+               );
+
+               $actual   = $theme_json->get_settings();
+               $expected = array(
+                       'appearanceTools' => false,
+                       'border'          => array(
+                               'width' => true,
+                       ),
+                       'blocks'          => array(
+                               'core/paragraph' => array(
+                                       'typography' => array(
+                                               'lineHeight' => false,
+                                       ),
+                               ),
+                               'core/group'     => array(
+                                       'typography' => array(
+                                               'lineHeight' => false,
+                                       ),
+                               ),
+                       ),
+               );
+
+               $this->assertEqualSetsWithIndex( $expected, $actual );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 54336
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1133,13 +1187,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $expected, $actual );
</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">-        public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_default_presets() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_removed() {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $defaults = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="cx" style="display: block; padding: 0 10px">                                'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'color'  => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'palette' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'defaultPalette' => true,
+                                               'palette'        => array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'slug'  => 'red',
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'color' => 'red',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1218,7 +1273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'version'  => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="cx" style="display: block; padding: 0 10px">                        'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'color'  => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'palette' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'palette'        => array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'slug'  => 'red',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1239,6 +1294,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'defaultPalette' => true,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                'blocks' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'core/paragraph' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1271,6 +1327,162 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $expected, $actual );
</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">+        public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_not_removed_if_defaults_are_disabled() {
+               $defaults = new WP_Theme_JSON(
+                       array(
+                               'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                               'settings' => array(
+                                       'color'  => array(
+                                               'defaultPalette' => true, // Emulate the defaults from core theme.json.
+                                               'palette'        => array(
+                                                       array(
+                                                               'slug'  => 'red',
+                                                               'color' => 'red',
+                                                               'name'  => 'Red',
+                                                       ),
+                                                       array(
+                                                               'slug'  => 'green',
+                                                               'color' => 'green',
+                                                               'name'  => 'Green',
+                                                       ),
+                                               ),
+                                       ),
+                                       'blocks' => array(
+                                               'core/paragraph' => array(
+                                                       'color' => array(
+                                                               'palette' => array(
+                                                                       array(
+                                                                               'slug'  => 'blue',
+                                                                               'color' => 'blue',
+                                                                               'name'  => 'Blue',
+                                                                       ),
+                                                               ),
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       ),
+                       'default'
+               );
+               $theme    = new WP_Theme_JSON(
+                       array(
+                               'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                               'settings' => array(
+                                       'color'  => array(
+                                               'defaultPalette' => false,
+                                               'palette'        => array(
+                                                       array(
+                                                               'slug'  => 'pink',
+                                                               'color' => 'pink',
+                                                               'name'  => 'Pink',
+                                                       ),
+                                                       array(
+                                                               'slug'  => 'green',
+                                                               'color' => 'green',
+                                                               'name'  => 'Greenish',
+                                                       ),
+                                               ),
+                                       ),
+                                       'blocks' => array(
+                                               'core/paragraph' => array(
+                                                       'color' => array(
+                                                               'palette' => array(
+                                                                       array(
+                                                                               'slug'  => 'blue',
+                                                                               'color' => 'blue',
+                                                                               'name'  => 'Bluish',
+                                                                       ),
+                                                                       array(
+                                                                               'slug'  => 'yellow',
+                                                                               'color' => 'yellow',
+                                                                               'name'  => 'Yellow',
+                                                                       ),
+                                                                       array(
+                                                                               'slug'  => 'green',
+                                                                               'color' => 'green',
+                                                                               'name'  => 'Block Green',
+                                                                       ),
+                                                               ),
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       )
+               );
+
+               $expected = array(
+                       'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                       'settings' => array(
+                               'color'  => array(
+                                       'defaultPalette' => false,
+                                       'palette'        => array(
+                                               'default' => array(
+                                                       array(
+                                                               'slug'  => 'red',
+                                                               'color' => 'red',
+                                                               'name'  => 'Red',
+                                                       ),
+                                                       array(
+                                                               'slug'  => 'green',
+                                                               'color' => 'green',
+                                                               'name'  => 'Green',
+                                                       ),
+                                               ),
+                                               'theme'   => array(
+                                                       array(
+                                                               'slug'  => 'pink',
+                                                               'color' => 'pink',
+                                                               'name'  => 'Pink',
+                                                       ),
+                                                       array(
+                                                               'slug'  => 'green',
+                                                               'color' => 'green',
+                                                               'name'  => 'Greenish',
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                               'blocks' => array(
+                                       'core/paragraph' => array(
+                                               'color' => array(
+                                                       'palette' => array(
+                                                               'default' => array(
+                                                                       array(
+                                                                               'slug'  => 'blue',
+                                                                               'color' => 'blue',
+                                                                               'name'  => 'Blue',
+                                                                       ),
+                                                               ),
+                                                               'theme'   => array(
+                                                                       array(
+                                                                               'slug'  => 'blue',
+                                                                               'color' => 'blue',
+                                                                               'name'  => 'Bluish',
+                                                                       ),
+                                                                       array(
+                                                                               'slug'  => 'yellow',
+                                                                               'color' => 'yellow',
+                                                                               'name'  => 'Yellow',
+                                                                       ),
+                                                                       array(
+                                                                               'slug'  => 'green',
+                                                                               'color' => 'green',
+                                                                               'name'  => 'Block Green',
+                                                                       ),
+                                                               ),
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       ),
+               );
+
+               $defaults->merge( $theme );
+               $actual = $defaults->get_raw_data();
+
+               $this->assertEqualSetsWithIndex( $expected, $actual );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 54336
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span></span></pre></div>
<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     2021-12-13 15:19:01 UTC (rev 52363)
+++ trunk/tools/webpack/blocks.js       2021-12-14 01:55:28 UTC (rev 52364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'calendar',
</span><span class="cx" style="display: block; padding: 0 10px">                'categories',
</span><span class="cx" style="display: block; padding: 0 10px">                'file',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                'gallery',
+               'image',
</ins><span class="cx" style="display: block; padding: 0 10px">                 'latest-comments',
</span><span class="cx" style="display: block; padding: 0 10px">                'latest-posts',
</span><span class="cx" style="display: block; padding: 0 10px">                'loginout',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,11 +75,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'cover',
</span><span class="cx" style="display: block; padding: 0 10px">                'embed',
</span><span class="cx" style="display: block; padding: 0 10px">                'freeform',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'gallery',
</del><span class="cx" style="display: block; padding: 0 10px">                 'group',
</span><span class="cx" style="display: block; padding: 0 10px">                'heading',
</span><span class="cx" style="display: block; padding: 0 10px">                'html',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'image',
</del><span class="cx" style="display: block; padding: 0 10px">                 'list',
</span><span class="cx" style="display: block; padding: 0 10px">                'media-text',
</span><span class="cx" style="display: block; padding: 0 10px">                'missing',
</span></span></pre>
</div>
</div>

</body>
</html>