<!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>[52232] 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/52232">52232</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/52232","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-11-23 05:38:45 +0000 (Tue, 23 Nov 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:

- FSE: Add welcome guide
- Update theme styles for the code block
- Add feature flag to toggle the new site editor sidebar
- Add templates list page for site editor
- Cover Block: Fix default background dim
- E2E: Add more Cover block tests
- Cover Block: Fix regressions
- Post Comments Form: ensure typography styles are applied to child elements
- Navigation: Fix space-between
- Fix background colours in nested submenus.
- Fix duplicate custom classnames in navigation submenu block
- Fix colour rendering in Navigation overlay
- Fix: Add ability to opt out of Core color palette V2
- Change @package to WordPress in block-library
- Make the core color palette opt-in for themes with not theme.json
- Remove textdomain from calendar block
- Page List block: fix space before href attribute
- Try: Let Featured Image block inherit dimensions, look like a placeholder
- [Global Styles]: Add block icon next to blocks list
- Page List: Use core entities instead of direct apiFetch
- Site Editor: Stabilize export endpoint
- Fix mobile horizontal scrollbar.
- Multi-entity save: Only set site entity to pending if really saving
- Add page list to navigation direct insert conditions
- Implement "Add New" for templates list in Site Editor
- Post Featured Image: Remove withNotices HOC
- Fix page list missing button styles when set to open on click.
- Make appender fixed position to avoid jumps in the UI
- Color UI component: reorder palettes and update names (core by defaults, user by custom)
- Remove the Styles link in Site Editor
- GlobalStyles sidebar: do not show default palette if theme opts-out
- Only render the site editor canvas when the global styles are ready.
- Global Styles: rename core origin key to default for presets
- Clarify i18n context for PostTemplateActions's "New" label
- Revert erroneous native editor package version bumps
- Try: Hide the columns inserter in pattern previews.
- Fix site editor region navigation
- Update navigation sidebar responsiveness
- Add _wp_array_set and _wp_to_kebab_case to 5.8 compat
- Make user able to change all color palette origins
- Site Editor: Update hrefs to not specifically refer to themes.php?page=gutenberg-edit-site
- Site Editor: Validate the postType query argument
- Navigation: Scale submenu icon.
- Move the theme editor under tools for FSE themes
- Deprecate navigation areas

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="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</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="#trunksrcwpincludesblockscalendarphp">trunk/src/wp-includes/blocks/calendar.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationareaphp">trunk/src/wp-includes/blocks/navigation-area.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationlinkphp">trunk/src/wp-includes/blocks/navigation-link.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationsubmenuphp">trunk/src/wp-includes/blocks/navigation-submenu.php</a></li>
<li><a href="#trunksrcwpincludesblocksnavigationphp">trunk/src/wp-includes/blocks/navigation.php</a></li>
<li><a href="#trunksrcwpincludesblockspagelistphp">trunk/src/wp-includes/blocks/page-list.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesglobalstylesandsettingsphp">trunk/src/wp-includes/global-styles-and-settings.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonphp">trunk/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonResolverphp">trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/package-lock.json     2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2685,9 +2685,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><span class="cx" style="display: block; padding: 0 10px">                "@types/eslint": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "7.29.0",
-                       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-                       "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "8.2.0",
+                       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz",
+                       "integrity": "sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==",
</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">                                "@types/estree": "*",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2894,9 +2894,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">                "@types/webpack": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.41.31",
-                       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
-                       "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.41.32",
+                       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
+                       "integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
</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">                                "@types/node": "*",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3515,9 +3515,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/base-styles": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "4.0.3",
-                       "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.0.3.tgz",
-                       "integrity": "sha512-dL6xsQUeCNY7oqNDbbO9k65bOXq4zKwFfdJQITXUIuH3PBVoZaonsndeV8BsRs7I5YXiJCqT1ts6gjibJr914g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.0.4",
+                       "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.0.4.tgz",
+                       "integrity": "sha512-qXiIhWLdTHWxBWawcqigJUUMeb2jkn9ElUEUC/Cn3DK2i62jiUWXOLp6tFIaf5eQMNXsYqtp5r7n2F/OllngQA==",
</ins><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/blob": {
</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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.9.tgz",
-                       "integrity": "sha512-ckosX2RJa6x+fvqaQ06pBVexaQLNDISi6BxOjm2SRPRlrVs0mPLQUc1agXOMci0i75FQ7F7SMDemXlO9v1I5kg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.11.tgz",
+                       "integrity": "sha512-zSFsm+yUcrgZSWQVXWPd8jp+K1Lf/S5JITUp1cKReae9hhHgvmEpQydmWNGgjIadeALpcka5j0JIe2AJAqGeBA==",
</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.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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.9",
-                               "@wordpress/editor": "^12.0.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/edit-post": "^5.0.11",
+                               "@wordpress/editor": "^12.0.8",
</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.3",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.3.tgz",
-                       "integrity": "sha512-7/FeCK0KFUnWGmUEDoZqdGCOeIaIpD4qyI88WZQnwgaQ3Nsu02L6/kRGD5HXUatFjqGUcz4OGy2dOxrmBNH/6A==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "8.0.5",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.5.tgz",
+                       "integrity": "sha512-s5kmYFizQlf2K2JXaI5Iw3Zo8mYa6sCw0BMDt9Z+67NNyAvsbf9jPA6Uw80yRsCVcjz+cYcgHv3+Tcz9a6VrUw==",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
-                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.7.tgz",
-                       "integrity": "sha512-WpCnFi1j47MB6RFr1M4nlfPnwsYmsh+qwaXH1wfrckT1DM+/G2uRKJKwFAm/gm+OnqjsYOcRYOftaLmgRTAwCg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "6.0.9",
+                       "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.9.tgz",
+                       "integrity": "sha512-5etkM+WKn7jUlZsSiuA6jVBFlBvxn5szu5Shr6GbLnuUwh2pEhj/BY/aqXcyjNXcoUT2WmURcCPBjclgm2CvBA==",
</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.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.7",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.11",
</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.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/server-side-render": "^3.0.9",
</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.0.3",
-                       "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.0.3.tgz",
-                       "integrity": "sha512-A8Y1rIpqBXEpc53IZ0TztEkdAaboMyaLY6PxYXniiI1KUSUrybQIBqcPe6uuCZIBCQNNh2uG3uvHisnuC1HWFQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "19.0.5",
+                       "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.0.5.tgz",
+                       "integrity": "sha512-xtXTpPvmByVPjIWWo/v8ZzVsEtx9dq6bsdOOkDTnFFUXTcgxJb12RmgbsDR+E/L+z9IwuGxLwt08EGrWWvKF6w==",
</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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.9.tgz",
-                       "integrity": "sha512-/BoE7Wr6UOiIUpjngrLeI13JCk8SGdRYhpM17S88YlaaDkhxV4OnEFwizhIjGKbX+M4ftTJjna9BS59oGOTwIQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "2.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.11.tgz",
+                       "integrity": "sha512-3HSHChnMtT7JCXaITzDgM0zwbDopL3CNofhCJf/lQR//msiLiFK2MzjZrgJdQXTzVcPN7fXgIsf5cFJeHsuADg==",
</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.3",
-                               "@wordpress/block-library": "^6.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
+                               "@wordpress/block-library": "^6.0.9",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.7",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/widgets": "^2.0.11",
</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">@@ -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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.9.tgz",
-                       "integrity": "sha512-qvL4/kuFg9/M7occ3dH4RlZB6PvtZoip4Pr9nzDM/T+OS+xw4btUSzfaOhhaWXYiAYo3vOg8ViB/y1JkMrnuFQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.11.tgz",
+                       "integrity": "sha512-UVFve7ETYdJjDm2TgAJKOxiRmoTYNu75fkbvTluxnKbvWKDXzY0QCpw47JY4g+JmYBRda6ZGV51eY5P5G5BZ6Q==",
</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.3",
-                               "@wordpress/block-library": "^6.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
+                               "@wordpress/block-library": "^6.0.9",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/editor": "^12.0.8",
</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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.7",
</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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.9.tgz",
-                       "integrity": "sha512-UhSy7HG22e4TKGz7mb10LFxUSqhVCXW41blDejUaBsAaFAP+85QIvMwpzhP5wlo+6PIqFZAb8YD8ha/eXj/GsQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.11.tgz",
+                       "integrity": "sha512-jwCXMVDg6ucNOur1lpQBDlXNuUv6RzpOK/I2rfhw9Cqv0DyFfWSL6NIxMZFuqfyhCeqnUaz/GT/CVgghx5Ssvw==",
</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.3",
-                               "@wordpress/block-library": "^6.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
+                               "@wordpress/block-library": "^6.0.9",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/editor": "^12.0.8",
</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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.7",
</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">@@ -4020,17 +4020,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.4",
-                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.4.tgz",
-                       "integrity": "sha512-NGLflTSGaAY3BGL4YmnEY/dK8asKvsKpG+tx/6CHMqfxIsei/xnTmnZtdc8Fxof4ciiWuNYueCcbmAhyoTiyuA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.1.6",
+                       "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.6.tgz",
+                       "integrity": "sha512-NuVehrAajzThQLh313FiyhjfIFpCwolyPjndj+urUp+iCKpLTMKTKSrZpC6tQsfycrmpPrnL/RiWsNeAV1zGMg==",
</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.3",
-                               "@wordpress/block-library": "^6.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
+                               "@wordpress/block-library": "^6.0.9",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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">@@ -4039,16 +4039,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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/interface": "^4.1.7",
</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.9",
-                               "@wordpress/server-side-render": "^3.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.11",
+                               "@wordpress/server-side-render": "^3.0.9",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/widgets": "^2.0.11",
</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">@@ -4056,9 +4056,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.6",
-                       "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.6.tgz",
-                       "integrity": "sha512-OP1naxqn0T1/7gIMNIzNj+JIsSWIJta5TcZzdueMimJ3mhSPe1ggQGvEkxd4Xg5mZ1kAboQ1TpzyIqA4Ck1v3w==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "12.0.8",
+                       "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.8.tgz",
+                       "integrity": "sha512-vEEHEH2Pkg/FzfgZqTZI6RhTcGrRwwgdnSrrJJMXQjKg3ieLpSuKZ2LaZEhfqY2ICTuZ/49A9pxOm6FzkQW8Xg==",
</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">@@ -4065,9 +4065,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.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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">@@ -4084,9 +4084,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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/reusable-blocks": "^3.0.11",
</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.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/server-side-render": "^3.0.9",
</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">@@ -4173,14 +4173,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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.9.tgz",
-                       "integrity": "sha512-yzEOzUZ2J/13ENV83x4P+hBFQXNO8QHgYJlaGsnTWYVJTVQtG16ggIcv2JfZ5myHIhl32DRMOvM2SdtnmU8eyw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.11.tgz",
+                       "integrity": "sha512-RhEQtTDUjXJMNkSCL8v+l2/N8T8kizfSoaD84bbJbSU1sahUF7Cdxtlp06z374iTZDzIqZxtEftWRljJs/AqVA==",
</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.3",
-                               "@wordpress/components": "^19.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
+                               "@wordpress/components": "^19.0.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">@@ -4235,13 +4235,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.5",
-                       "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.5.tgz",
-                       "integrity": "sha512-IH/v8sFVT6luFCtnAZ0U82SsXzGJ1qs1m+1UUlSyYpk+jVxy1RQSbFXvdy6NxlO4bOsZYm+ltZN82BuC32Co9A==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "4.1.7",
+                       "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.7.tgz",
+                       "integrity": "sha512-mXsTvVKfDctZ1Kkhto2NLCs8xi3cHFD7QU8OIuofgO8rKlQ4ro7+QTuu1N/SfGRnmTQTX0d1gUMzi4JwWp3nsA==",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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">@@ -4339,13 +4339,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.7",
-                       "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.7.tgz",
-                       "integrity": "sha512-UAv+kXfIuOWO42nSqotQ2sq4pfTa4YDar5NOXMUxsGjYXgOH5CHTeDUGDxhWtHVqNLdubPbmExuVs086D2RCoQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.9",
+                       "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.9.tgz",
+                       "integrity": "sha512-elYJLYWWeMomiUlFmm/GHJrLvjOXGstUGNHVo6NkmnKi3crYc2QNKn+vHnFaXNLi7n1eG0QIUo4guInkyv224g==",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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">@@ -4383,12 +4383,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.7",
-                       "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.7.tgz",
-                       "integrity": "sha512-bVFqkS0+FtceCMj1jTl9PlYHsX61keHlFB7NcfGJmMlUE1d8WhPT5qnH/+/KIMV5mnS0PINT7ZNozaRWYHtUEg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.0.9",
+                       "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.9.tgz",
+                       "integrity": "sha512-HGQVQm/8YAyNCIDQRzwAQSikT4tkJ/Gf/4NU2LbQf45gk0vuPLlbXmlF/cA/AQdA8l8hKfE51SfETRRPIE63IA==",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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">@@ -4414,12 +4414,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">                "@wordpress/postcss-plugins-preset": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.2.4",
-                       "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.4.tgz",
-                       "integrity": "sha512-YFoV+rtBgoWYnW82iQCL5BwYzDPEE0aVNs33IkKV5X+eu7w730q+nyN7th+N4DOYdgApCgi9At2LLMAqTDtwwQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.2.5",
+                       "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.5.tgz",
+                       "integrity": "sha512-R+UKnjSJivvVEZ8rhGrXxsj/BlVeNO2FRXq3IxEOPv5ZRfAS0g8k8EO3xsCIV1RfnozvAApkKEYRClDYXIt+vA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "dev": true,
</span><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/base-styles": "^4.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/base-styles": "^4.0.4",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "autoprefixer": "^10.2.5"
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><span class="cx" style="display: block; padding: 0 10px">                        "dependencies": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4438,9 +4438,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">                                "browserslist": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "4.18.0",
-                                       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz",
-                                       "integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "4.18.1",
+                                       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
+                                       "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
</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">                                                "caniuse-lite": "^1.0.30001280",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4451,15 +4451,15 @@
</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">                                "caniuse-lite": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.0.30001280",
-                                       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz",
-                                       "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.0.30001282",
+                                       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz",
+                                       "integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==",
</ins><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">                                "electron-to-chromium": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.3.896",
-                                       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz",
-                                       "integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.3.904",
+                                       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
+                                       "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
</ins><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">                                "node-releases": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4513,13 +4513,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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.9.tgz",
-                       "integrity": "sha512-ARd5mZwtcomk0T5uSI8PXT1/tvrgFAYHgqAUqLLspKU0iBAy8s2n6kkosBxhD8laZiiz5gylw2B3uKM3TJRBGQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.11.tgz",
+                       "integrity": "sha512-5EQ+qrRDscEmILir+atYyZMgPOoHwZEYlxesRj1pEBO/dQX2tpZKt1W8SfkWSukRQYyqUby8z9sZ04ga+/Khlg==",
</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.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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">@@ -4553,9 +4553,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/scripts": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "19.2.1",
-                       "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.1.tgz",
-                       "integrity": "sha512-BIdCeCwPGQDlkfOR4THcxdiGMK7l27qbv1/n8OkqUcdDi9GICm3TnWeqzRgpw45j6GK0OCEvSjSjQi65kV1/Dw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "19.2.2",
+                       "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.2.tgz",
+                       "integrity": "sha512-cH1NVhBKScNHIHXc3Af7FBOdsZBrA72IJVcZwUx79/BJVEhPVG3B9Kn4xkXP9RtYCkWETQ+s/KodzolL9RuHmQ==",
</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">                                "@svgr/webpack": "^5.5.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4565,7 +4565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/eslint-plugin": "^9.3.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/jest-preset-default": "^7.1.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/npm-package-json-lint-config": "^4.1.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "@wordpress/postcss-plugins-preset": "^3.2.4",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/postcss-plugins-preset": "^3.2.5",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "@wordpress/prettier-config": "^1.1.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                "@wordpress/stylelint-config": "^19.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                "babel-jest": "^26.6.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4747,15 +4747,15 @@
</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">                                "acorn": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "8.5.0",
-                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-                                       "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "8.6.0",
+                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+                                       "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
</ins><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">                                "browserslist": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "4.18.0",
-                                       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz",
-                                       "integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "4.18.1",
+                                       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
+                                       "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
</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">                                                "caniuse-lite": "^1.0.30001280",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4766,9 +4766,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">                                "caniuse-lite": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.0.30001280",
-                                       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz",
-                                       "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.0.30001282",
+                                       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz",
+                                       "integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==",
</ins><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">                                "commander": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4777,12 +4777,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
</span><span class="cx" style="display: block; padding: 0 10px">                                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "css-color-names": {
-                                       "version": "1.0.1",
-                                       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
-                                       "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
-                                       "dev": true
-                               },
</del><span class="cx" style="display: block; padding: 0 10px">                                 "css-declaration-sorter": {
</span><span class="cx" style="display: block; padding: 0 10px">                                        "version": "6.1.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                        "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4822,12 +4816,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">                                "cssnano": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.10",
-                                       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.10.tgz",
-                                       "integrity": "sha512-YfNhVJJ04imffOpbPbXP2zjIoByf0m8E2c/s/HnvSvjXgzXMfgopVjAEGvxYOjkOpWuRQDg/OZFjO7WW94Ri8w==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.11",
+                                       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.11.tgz",
+                                       "integrity": "sha512-5SHM31NAAe29jvy0MJqK40zZ/8dGlnlzcfHKw00bWMVFp8LWqtuyPSFwbaoIoxvt71KWJOfg8HMRGrBR3PExCg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                                         "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px">                                        "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "cssnano-preset-default": "^5.1.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "cssnano-preset-default": "^5.1.7",
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 "is-resolvable": "^1.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "lilconfig": "^2.0.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "yaml": "^1.10.2"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4834,9 +4828,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">                                "cssnano-preset-default": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.1.6",
-                                       "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.6.tgz",
-                                       "integrity": "sha512-X2nDeNGBXc0486oHjT2vSj+TdeyVsxRvJUxaOH50hOM6vSDLkKd0+59YXpSZRInJ4sNtBOykS4KsPfhdrU/35w==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.1.7",
+                                       "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.7.tgz",
+                                       "integrity": "sha512-bWDjtTY+BOqrqBtsSQIbN0RLGD2Yr2CnecpP0ydHNafh9ZUEre8c8VYTaH9FEbyOt0eIfEUAYYk5zj92ioO8LA==",
</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">                                                "css-declaration-sorter": "^6.0.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4848,11 +4842,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-discard-duplicates": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-discard-empty": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-discard-overridden": "^5.0.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-merge-longhand": "^5.0.3",
-                                               "postcss-merge-rules": "^5.0.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-merge-longhand": "^5.0.4",
+                                               "postcss-merge-rules": "^5.0.3",
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 "postcss-minify-font-values": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-minify-gradients": "^5.0.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-minify-params": "^5.0.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-minify-params": "^5.0.2",
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 "postcss-minify-selectors": "^5.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-normalize-charset": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-normalize-display-values": "^5.0.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4861,13 +4855,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-normalize-string": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-normalize-timing-functions": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-normalize-unicode": "^5.0.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-normalize-url": "^5.0.2",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-normalize-url": "^5.0.3",
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 "postcss-normalize-whitespace": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-ordered-values": "^5.0.2",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-reduce-initial": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-reduce-transforms": "^5.0.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "postcss-svgo": "^5.0.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-unique-selectors": "^5.0.1"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-unique-selectors": "^5.0.2"
</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">                                "dom-serializer": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4899,9 +4893,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">                                "electron-to-chromium": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "1.3.896",
-                                       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz",
-                                       "integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "1.3.904",
+                                       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
+                                       "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
</ins><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">                                "enhanced-resolve": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5058,27 +5052,25 @@
</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">                                "postcss-merge-longhand": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.3",
-                                       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz",
-                                       "integrity": "sha512-kmB+1TjMTj/bPw6MCDUiqSA5e/x4fvLffiAdthra3a0m2/IjTrWsTmD3FdSskzUjEwkj5ZHBDEbv5dOcqD7CMQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.4",
+                                       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz",
+                                       "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==",
</ins><span class="cx" style="display: block; padding: 0 10px">                                         "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px">                                        "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "css-color-names": "^1.0.1",
</del><span class="cx" style="display: block; padding: 0 10px">                                                 "postcss-value-parser": "^4.1.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "stylehacks": "^5.0.1"
</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">                                "postcss-merge-rules": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.2",
-                                       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
-                                       "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.3",
+                                       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz",
+                                       "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==",
</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">                                                "browserslist": "^4.16.6",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "caniuse-api": "^3.0.0",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "cssnano-utils": "^2.0.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-selector-parser": "^6.0.5",
-                                               "vendors": "^1.0.3"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-selector-parser": "^6.0.5"
</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">                                                "postcss-selector-parser": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5114,16 +5106,15 @@
</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">                                "postcss-minify-params": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.1",
-                                       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
-                                       "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.2",
+                                       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz",
+                                       "integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==",
</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">                                                "alphanum-sort": "^1.0.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "browserslist": "^4.16.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "browserslist": "^4.16.6",
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 "cssnano-utils": "^2.0.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-value-parser": "^4.1.0",
-                                               "uniqs": "^2.0.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-value-parser": "^4.1.0"
</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">                                "postcss-minify-selectors": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5213,9 +5204,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">                                "postcss-normalize-url": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.2",
-                                       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
-                                       "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.3",
+                                       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz",
+                                       "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==",
</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">                                                "is-absolute-url": "^3.0.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5273,14 +5264,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">                                "postcss-unique-selectors": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.0.1",
-                                       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
-                                       "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.0.2",
+                                       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz",
+                                       "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==",
</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">                                                "alphanum-sort": "^1.0.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "postcss-selector-parser": "^6.0.5",
-                                               "uniqs": "^2.0.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "postcss-selector-parser": "^6.0.5"
</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">                                                "postcss-selector-parser": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5345,9 +5335,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">                                "source-map-support": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "0.5.20",
-                                       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
-                                       "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "0.5.21",
+                                       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+                                       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
</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">                                                "buffer-from": "^1.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5395,9 +5385,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">                                "terser": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.9.0",
-                                       "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-                                       "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.10.0",
+                                       "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
+                                       "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
</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">                                                "commander": "^2.20.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5443,9 +5433,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">                                "webpack": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "5.64.0",
-                                       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz",
-                                       "integrity": "sha512-UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "5.64.2",
+                                       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.2.tgz",
+                                       "integrity": "sha512-4KGc0+Ozi0aS3EaLNRvEppfZUer+CaORKqL6OBjDLZOPf9YfN8leagFzwe6/PoBdHFxc/utKArl8LMC0Ivtmdg==",
</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">                                                "@types/eslint-scope": "^3.7.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5471,7 +5461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                "tapable": "^2.1.1",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "terser-webpack-plugin": "^5.1.3",
</span><span class="cx" style="display: block; padding: 0 10px">                                                "watchpack": "^2.2.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "webpack-sources": "^3.2.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "webpack-sources": "^3.2.2"
</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">                                "webpack-livereload-plugin": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5487,22 +5477,22 @@
</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">                                "webpack-sources": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "3.2.1",
-                                       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
-                                       "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "3.2.2",
+                                       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
+                                       "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
</ins><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">                        }
</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.7",
-                       "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.7.tgz",
-                       "integrity": "sha512-rEvcKVrhgXKVwzt6A1goneIpkhcIrBqeYtRYMDkv+6SSWMMzkXRCqEGnPwPJ+/P1KEc1mLWdvJiIG70CrUIlVA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.0.9",
+                       "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.9.tgz",
+                       "integrity": "sha512-9Pv6909FWDuW8OGZUR/pY3D7+YBIT+O/PI9JcNuNtbUK7YuEc+PF7KNTQ0dTuxRvOYy3kQNw/a4pWefq1HDNzA==",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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">@@ -5568,15 +5558,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.9",
-                       "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.9.tgz",
-                       "integrity": "sha512-008hF4jJkeVdncIGvkxd40Wb3A89Eu1TVC7J2K15pb1NWtJH0rYUB+9vrD7fglWk0xo8iaMMClMv04vAPybw8g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "2.0.11",
+                       "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.11.tgz",
+                       "integrity": "sha512-XIY/W7WnEXbWSeycFtxaShHYxtJOlTgX9L4DCo/hh2IHkG3HHsZ8qIx0lMtsMq2BKZ2mbL3GCp/cjgBNQygUhg==",
</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.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/block-editor": "^8.0.5",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "@wordpress/components": "^19.0.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.7",
</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">@@ -5726,6 +5716,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
</span><span class="cx" style="display: block; padding: 0 10px">                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                "ajv-formats": {
+                       "version": "2.1.1",
+                       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+                       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+                       "dev": true,
+                       "requires": {
+                               "ajv": "^8.0.0"
+                       },
+                       "dependencies": {
+                               "ajv": {
+                                       "version": "8.8.2",
+                                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+                                       "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+                                       "dev": true,
+                                       "requires": {
+                                               "fast-deep-equal": "^3.1.1",
+                                               "json-schema-traverse": "^1.0.0",
+                                               "require-from-string": "^2.0.2",
+                                               "uri-js": "^4.2.2"
+                                       }
+                               },
+                               "json-schema-traverse": {
+                                       "version": "1.0.0",
+                                       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                                       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                                       "dev": true
+                               }
+                       }
+               },
</ins><span class="cx" style="display: block; padding: 0 10px">                 "ajv-keywords": {
</span><span class="cx" style="display: block; padding: 0 10px">                        "version": "3.5.2",
</span><span class="cx" style="display: block; padding: 0 10px">                        "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11187,9 +11206,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">                "eslint-plugin-react": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "7.27.0",
-                       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz",
-                       "integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "7.27.1",
+                       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz",
+                       "integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==",
</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">                                "array-includes": "^3.1.4",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12295,9 +12314,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">                "find-process": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "1.4.5",
-                       "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.5.tgz",
-                       "integrity": "sha512-v11rJYYISUWn+s8qZzgGnBvlzRKf3bOtlGFM8H0kw56lGQtOmLuLCzuclA5kehA2j7S5sioOWdI4woT3jDavAw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "1.4.7",
+                       "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
+                       "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
</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">                                "chalk": "^4.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15296,9 +15315,9 @@
</span><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">                                "@babel/parser": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "7.16.3",
-                                       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz",
-                                       "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "7.16.4",
+                                       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
+                                       "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
</ins><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">                                "semver": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16768,9 +16787,9 @@
</span><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">                                "acorn": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "8.5.0",
-                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-                                       "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "8.6.0",
+                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+                                       "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
</ins><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">                                "agent-base": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17474,9 +17493,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">                "lines-and-columns": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "1.1.6",
-                       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-                       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "1.2.4",
+                       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+                       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px">                "linkify-it": {
</span><span class="cx" style="display: block; padding: 0 10px">                        "version": "2.2.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18342,12 +18361,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">                "mini-css-extract-plugin": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "2.4.4",
-                       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz",
-                       "integrity": "sha512-UJ+aNuFQaQaECu7AamlWOBLj2cJ6XSGU4zNiqXeZ7lZLe5VD0DoSPWFbWArXueo+6FZVbgHzpX9lUIaBIDLuYg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "2.4.5",
+                       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
+                       "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px">                        "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                "schema-utils": "^3.1.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         "schema-utils": "^4.0.0"
</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">                                "@types/json-schema": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18356,15 +18375,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
</span><span class="cx" style="display: block; padding: 0 10px">                                        "dev": true
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                "ajv": {
+                                       "version": "8.8.2",
+                                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+                                       "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+                                       "dev": true,
+                                       "requires": {
+                                               "fast-deep-equal": "^3.1.1",
+                                               "json-schema-traverse": "^1.0.0",
+                                               "require-from-string": "^2.0.2",
+                                               "uri-js": "^4.2.2"
+                                       }
+                               },
+                               "ajv-keywords": {
+                                       "version": "5.1.0",
+                                       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+                                       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+                                       "dev": true,
+                                       "requires": {
+                                               "fast-deep-equal": "^3.1.3"
+                                       }
+                               },
+                               "json-schema-traverse": {
+                                       "version": "1.0.0",
+                                       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                                       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                                       "dev": true
+                               },
</ins><span class="cx" style="display: block; padding: 0 10px">                                 "schema-utils": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "3.1.1",
-                                       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-                                       "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "4.0.0",
+                                       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+                                       "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
</ins><span class="cx" style="display: block; padding: 0 10px">                                         "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px">                                        "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                "@types/json-schema": "^7.0.8",
-                                               "ajv": "^6.12.5",
-                                               "ajv-keywords": "^3.5.2"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         "@types/json-schema": "^7.0.9",
+                                               "ajv": "^8.8.0",
+                                               "ajv-formats": "^2.1.1",
+                                               "ajv-keywords": "^5.0.0"
</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">@@ -21569,9 +21616,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">                "react-colorful": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "5.5.0",
-                       "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.0.tgz",
-                       "integrity": "sha512-BuzrlrM0ylg7coPkXOrRqlf2BgHLw5L44sybbr9Lg4xy7w9e5N7fGYbojOO0s8J0nvrM3PERN2rVFkvSa24lnQ=="
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "5.5.1",
+                       "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz",
+                       "integrity": "sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg=="
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px">                "react-dates": {
</span><span class="cx" style="display: block; padding: 0 10px">                        "version": "17.2.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21938,9 +21985,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">                "reakit": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "1.3.10",
-                       "resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.10.tgz",
-                       "integrity": "sha512-HxHtnegMDwidGU4Ik/fKTZ3coihf4nKeycs0QSIFWcau77qL5wL6xnqZrAxcjjDDPOIANct3LxTiAlf+qGLOlw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "1.3.11",
+                       "resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz",
+                       "integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==",
</ins><span class="cx" style="display: block; padding: 0 10px">                         "requires": {
</span><span class="cx" style="display: block; padding: 0 10px">                                "@popperjs/core": "^2.5.4",
</span><span class="cx" style="display: block; padding: 0 10px">                                "body-scroll-lock": "^3.1.5",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24929,9 +24976,9 @@
</span><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">                                "ajv": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "8.8.0",
-                                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.0.tgz",
-                                       "integrity": "sha512-L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "8.8.2",
+                                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+                                       "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
</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">                                                "fast-deep-equal": "^3.1.1",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25363,9 +25410,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">                "tsconfig-paths": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        "version": "3.11.0",
-                       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
-                       "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 "version": "3.12.0",
+                       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
+                       "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
</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">                                "@types/json5": "^0.0.29",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26338,9 +26385,9 @@
</span><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">                                "acorn": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        "version": "8.5.0",
-                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-                                       "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 "version": "8.6.0",
+                                       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+                                       "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
</ins><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">                                "acorn-walk": {
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/package.json  2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/e2e-test-utils": "5.4.8",
</span><span class="cx" style="display: block; padding: 0 10px">                "@wordpress/library-export-default-webpack-plugin": "2.2.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/scripts": "19.2.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/scripts": "19.2.2",
</ins><span class="cx" style="display: block; padding: 0 10px">                 "autoprefixer": "^9.8.8",
</span><span class="cx" style="display: block; padding: 0 10px">                "chalk": "4.1.2",
</span><span class="cx" style="display: block; padding: 0 10px">                "check-node-version": "4.1.0",
</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.9",
-               "@wordpress/block-editor": "8.0.3",
-               "@wordpress/block-library": "6.0.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/block-directory": "3.0.11",
+               "@wordpress/block-editor": "8.0.5",
+               "@wordpress/block-library": "6.0.9",
</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.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/components": "19.0.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.7",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                "@wordpress/customize-widgets": "2.0.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/customize-widgets": "2.0.11",
</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.9",
-               "@wordpress/edit-site": "3.0.9",
-               "@wordpress/edit-widgets": "3.1.4",
-               "@wordpress/editor": "12.0.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/edit-post": "5.0.11",
+               "@wordpress/edit-site": "3.0.11",
+               "@wordpress/edit-widgets": "3.1.6",
+               "@wordpress/editor": "12.0.8",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/format-library": "3.0.11",
</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.5",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/interface": "4.1.7",
</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.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/list-reusable-blocks": "3.0.9",
</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.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/nux": "5.0.9",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/reusable-blocks": "3.0.11",
</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.7",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/server-side-render": "3.0.9",
</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.9",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         "@wordpress/widgets": "2.0.11",
</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="trunksrcwpadminmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php       2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-admin/menu.php 2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,12 +212,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'edit_theme_options',
</span><span class="cx" style="display: block; padding: 0 10px">                'site-editor.php',
</span><span class="cx" style="display: block; padding: 0 10px">        );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-       $submenu['themes.php'][7] = array(
-               __( 'Styles' ),
-               'edit_theme_options',
-               'site-editor.php?styles=open',
-       );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide Customize link on block themes unless a plugin or theme is using
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // customize_register to add a setting.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_is_block_template_theme() || has_action( 'customize_register' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">        $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $position      = wp_is_block_template_theme() ? 8 : 6;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $position      = wp_is_block_template_theme() ? 7 : 6;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,17 +243,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'Theme Editor' to the bottom of the Appearance menu.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook.
</ins><span class="cx" style="display: block; padding: 0 10px">         add_action( 'admin_menu', '_add_themes_utility_last', 101 );
</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">- * Adds the 'Theme Editor' link to the bottom of the Appearance menu.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds the 'Theme Editor' link to the bottom of the Appearance or Tools menu.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @access private
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 'Theme Editor' link has moved to the Tools menu when a block theme is active.
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function _add_themes_utility_last() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook.
-       add_submenu_page( 'themes.php', __( 'Theme Editor' ), __( 'Theme Editor' ), 'edit_themes', 'theme-editor.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_submenu_page(
+               wp_is_block_template_theme() ? 'tools.php' : 'themes.php',
+               __( 'Theme Editor' ),
+               __( 'Theme Editor' ),
+               'edit_themes',
+               'theme-editor.php'
+       );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $count = '';
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-admin/site-editor.php  2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,61 +40,90 @@
</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"> $block_editor_context = new WP_Block_Editor_Context();
</span><del style="background-color: #fdd; 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/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',
-       '/wp/v2/template-parts?context=edit',
-       '/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',
-       '/wp/v2/block-navigation-areas?context=edit',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$custom_settings      = array(
+       'siteUrl'                              => site_url(),
+       'postsPerPage'                         => get_option( 'posts_per_page' ),
+       'styles'                               => get_block_editor_theme_styles(),
+       'defaultTemplateTypes'                 => get_default_block_template_types(),
+       'defaultTemplatePartAreas'             => get_allowed_block_template_part_areas(),
+       '__experimentalBlockPatterns'          => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
+       '__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$editor_settings      = get_block_editor_settings( $custom_settings, $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">-$areas        = get_option( 'wp_navigation_areas', array() );
-$active_areas = array_intersect_key( $areas, get_navigation_areas() );
-foreach ( $active_areas as $post_id ) {
-       if ( $post_id ) {
-               $preload_paths[] = add_query_arg( 'context', 'edit', rest_get_route_for_post( $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) {
+
+       $post_type = get_post_type_object( $_GET['postType'] );
+
+       if ( ! $post_type ) {
+               wp_die( __( 'Invalid post type.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><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">+ $preload_paths = array(
+               '/',
+               '/wp/v2/types/' . $post_type->name . '?context=edit',
+               '/wp/v2/types?context=edit',
+               '/wp/v2/' . $post_type->rest_base . '?context=edit',
+       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$editor_settings = get_block_editor_settings(
-       array(
-               'siteUrl'                              => site_url(),
-               'postsPerPage'                         => get_option( 'posts_per_page' ),
-               'styles'                               => get_block_editor_theme_styles(),
-               'defaultTemplateTypes'                 => get_default_block_template_types(),
-               'defaultTemplatePartAreas'             => get_allowed_block_template_part_areas(),
-               '__experimentalBlockPatterns'          => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
-               '__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
-       ),
-       $block_editor_context
-);
</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">-wp_add_inline_script(
-       'wp-edit-site',
-       sprintf(
-               'wp.domReady( function() {
-                       wp.editSite.initialize( "site-editor", %s );
-               } );',
-               wp_json_encode( $editor_settings )
-       )
-);
</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.initializeList( "site-editor", "%s", %s );
+                       } );',
+                       $post_type->name,
+                       wp_json_encode( $editor_settings )
+               )
+       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
+
+       $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/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',
+               '/wp/v2/template-parts?context=edit',
+               '/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',
+               '/wp/v2/block-navigation-areas?context=edit',
+       );
+
+       $areas        = get_option( 'wp_navigation_areas', array() );
+       $active_areas = array_intersect_key( $areas, get_navigation_areas() );
+       foreach ( $active_areas as $post_id ) {
+               if ( $post_id ) {
+                       $preload_paths[] = add_query_arg( 'context', 'edit', rest_get_route_for_post( $post_id ) );
+               }
+       }
+
+       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 )
+               )
+       );
+
+}
+
</ins><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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/assets/script-loader-packages.php     2021-11-23 05:38:45 UTC (rev 52232)
</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' => '897c9b926bab0dd5cd5cfe6c316b2214'), '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' => '5b14f70121857cbb4815ae59cd71fd09'), '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' => 'd05bffc75156aea50eaf3d26327778fc'), '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' => '3ee92c4459cc98f8e6ebcdb8ce35e578'), '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' => 'ade1a7fc05c9963d2a591e01d3f11ced'), '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' => '06220b34b86b6ebd6c16e075536984e1'), '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-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport'), 'version' => '0b8897e99de0f3fbe8ab16081c7ac264'), 'edit-widgets.js' => array('dependencies' => ar
 ray('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' => '337b328aa8ba082bb7da34092676754f'), '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' => '77db262c7661b2d0ac8ab108e00e9475'), 'element.js' => array('d
 ependencies' => 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' => array('dependencies' => array('wp-pol
 yfill'), '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('dependencies' => array('lodash', 'wp-com
 ponents', '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('dependencies' => array('lodash', 'wp-compos
 e', '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' => '3ffa376560961ee3a73393f18e786d55'), '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' => '6b537dd5ff318e1d3ac6e32944977862'), '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' => '3de5cbb0aefe275d8abf23f738c797fa'), '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' => '3ee92c4459cc98f8e6ebcdb8ce35e578'), '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-url', 'wp-viewport'), 'version' => '9564025f796935e5ed95304230462642'), 'edit-widgets.js' => array('de
 pendencies' => 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' => '22329f7ff9d35759e1a4ed63f50fd1f1'), 'elemen
 t.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' => 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('dependencies' => arr
 ay('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-ur
 l'), '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('dependencies' => 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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/block-editor.php      2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $colors_by_origin['user'] : (
</span><span class="cx" style="display: block; padding: 0 10px">                                isset( $colors_by_origin['theme'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px">                                        $colors_by_origin['theme'] :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $colors_by_origin['core']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $colors_by_origin['default']
</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">        if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $gradients_by_origin['user'] : (
</span><span class="cx" style="display: block; padding: 0 10px">                                isset( $gradients_by_origin['theme'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px">                                        $gradients_by_origin['theme'] :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $gradients_by_origin['core']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $gradients_by_origin['default']
</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">        if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $font_sizes_by_origin['user'] : (
</span><span class="cx" style="display: block; padding: 0 10px">                                isset( $font_sizes_by_origin['theme'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px">                                        $font_sizes_by_origin['theme'] :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $font_sizes_by_origin['core']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $font_sizes_by_origin['default']
</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">        if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesblockscalendarphp"></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/calendar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/calendar.php 2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/calendar.php   2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        // when there are no published posts on the site.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! block_core_calendar_has_published_posts() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return '<div>' . __( 'The calendar block is hidden because there are no published posts.', 'gutenberg' ) . '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return '<div>' . __( 'The calendar block is hidden because there are no published posts.' ) . '</div>';
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">                return '';
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationareaphp"></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-area.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation-area.php  2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/navigation-area.php    2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Server-side rendering of the `core/navigation-area` block.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package gutenberg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.9.0 See https://github.com/WordPress/gutenberg/issues/36524
+ * @package WordPress
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationlinkphp"></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-link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation-link.php  2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/navigation-link.php    2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Server-side rendering of the `core/navigation-link` block.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package gutenberg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package WordPress
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/navigation-submenu.php 2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Server-side rendering of the `core/navigation-submenu` block.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package gutenberg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package WordPress
</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">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'inline_styles' => '',
</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">-        $is_sub_menu = isset( $attributes['isTopLevelLink'] ) ? ( ! $attributes['isTopLevelLink'] ) : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_sub_menu = isset( $attributes['isTopLevelItem'] ) ? ( ! $attributes['isTopLevelItem'] ) : false;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Text color.
</span><span class="cx" style="display: block; padding: 0 10px">        $named_text_color  = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,12 +150,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $has_submenu = count( $block->inner_blocks ) > 0;
</span><span class="cx" style="display: block; padding: 0 10px">        $is_active   = ! empty( $attributes['id'] ) && ( get_the_ID() === $attributes['id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $class_name = ! empty( $attributes['className'] ) ? implode( ' ', (array) $attributes['className'] ) : false;
-
-       if ( false !== $class_name ) {
-               $css_classes .= ' ' . $class_name;
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         $show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'];
</span><span class="cx" style="display: block; padding: 0 10px">        $open_on_click           = isset( $block->context['openSubmenusOnClick'] ) && $block->context['openSubmenusOnClick'];
</span><span class="cx" style="display: block; padding: 0 10px">        $open_on_hover_and_click = isset( $block->context['openSubmenusOnClick'] ) && ! $block->context['openSubmenusOnClick'] &&
</span></span></pre></div>
<a id="trunksrcwpincludesblocksnavigationphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/navigation.php       2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/navigation.php 2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Server-side rendering of the `core/navigation` block.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package gutenberg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package WordPress
</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">@@ -14,8 +14,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function block_core_navigation_build_css_colors( $attributes ) {
</span><span class="cx" style="display: block; padding: 0 10px">        $colors = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'css_classes'   => array(),
-               'inline_styles' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'css_classes'           => array(),
+               'inline_styles'         => '',
+               'overlay_css_classes'   => array(),
+               'overlay_inline_styles' => '',
</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">        // Text color.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +56,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['inline_styles'] .= sprintf( 'background-color: %s;', $attributes['customBackgroundColor'] );
</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">+        // Overlay text color.
+       $has_named_overlay_text_color  = array_key_exists( 'overlayTextColor', $attributes );
+       $has_custom_overlay_text_color = array_key_exists( 'customOverlayTextColor', $attributes );
+
+       // If has overlay text color.
+       if ( $has_custom_overlay_text_color || $has_named_overlay_text_color ) {
+               // Add has-text-color class.
+               $colors['overlay_css_classes'][] = 'has-text-color';
+       }
+
+       if ( $has_named_overlay_text_color ) {
+               // Add the overlay color class.
+               $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', $attributes['overlayTextColor'] );
+       } elseif ( $has_custom_overlay_text_color ) {
+               // Add the custom overlay color inline style.
+               $colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $attributes['customOverlayTextColor'] );
+       }
+
+       // Overlay background color.
+       $has_named_overlay_background_color  = array_key_exists( 'overlayBackgroundColor', $attributes );
+       $has_custom_overlay_background_color = array_key_exists( 'customOverlayBackgroundColor', $attributes );
+
+       // If has overlay background color.
+       if ( $has_custom_overlay_background_color || $has_named_overlay_background_color ) {
+               // Add has-background class.
+               $colors['overlay_css_classes'][] = 'has-background';
+       }
+
+       if ( $has_named_overlay_background_color ) {
+               // Add the overlay background-color class.
+               $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', $attributes['overlayBackgroundColor'] );
+       } elseif ( $has_custom_overlay_background_color ) {
+               // Add the custom overlay background-color inline style.
+               $colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $attributes['customOverlayBackgroundColor'] );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         return $colors;
</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">@@ -247,6 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $responsive_container_classes = array(
</span><span class="cx" style="display: block; padding: 0 10px">                'wp-block-navigation__responsive-container',
</span><span class="cx" style="display: block; padding: 0 10px">                $is_hidden_by_default ? 'hidden-by-default' : '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                implode( ' ', $colors['overlay_css_classes'] ),
</ins><span class="cx" style="display: block; padding: 0 10px">         );
</span><span class="cx" style="display: block; padding: 0 10px">        $open_button_classes          = array(
</span><span class="cx" style="display: block; padding: 0 10px">                'wp-block-navigation__responsive-container-open',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $responsive_container_markup = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                '<button aria-expanded="false" aria-haspopup="true" aria-label="%3$s" class="%6$s" data-micromodal-trigger="modal-%1$s"><svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg></button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <div class="%5$s" id="modal-%1$s">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="%5$s" style="%7$s" id="modal-%1$s">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="wp-block-navigation__responsive-close" tabindex="-1" data-micromodal-close>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="wp-block-navigation__responsive-dialog" role="dialog" aria-modal="true" aria-labelledby="modal-%1$s-title" >
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <button aria-label="%4$s" data-micromodal-close class="wp-block-navigation__responsive-container-close"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +309,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                __( 'Open menu' ), // Open button label.
</span><span class="cx" style="display: block; padding: 0 10px">                __( 'Close menu' ), // Close button label.
</span><span class="cx" style="display: block; padding: 0 10px">                implode( ' ', $responsive_container_classes ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                implode( ' ', $open_button_classes )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         implode( ' ', $open_button_classes ),
+               $colors['overlay_inline_styles']
</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">        return sprintf(
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/blocks/page-list.php  2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $has_named_text_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                // Add the color class.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $colors['css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['textColor'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $colors['css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['textColor'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         } elseif ( $has_picked_text_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['inline_styles'] .= sprintf( 'color: %s;', $context['customTextColor'] );
</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $has_custom_text_color ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $has_named_background_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                // Add the background-color class.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $colors['css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['backgroundColor'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $colors['css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['backgroundColor'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         } elseif ( $has_picked_background_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['customBackgroundColor'] );
</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $has_custom_background_color ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Give overlay colors priority, fall back to Navigation block colors, then global styles.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $has_named_overlay_text_color ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['overlayTextColor'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $colors['overlay_css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['overlayTextColor'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         } elseif ( $has_picked_overlay_text_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $context['customOverlayTextColor'] );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,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">        if ( $has_named_overlay_background_color ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['overlayBackgroundColor'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['overlayBackgroundColor'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         } elseif ( $has_picked_overlay_background_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $context['customOverlayBackgroundColor'] );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ) . '<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">                        '</button>';
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><del style="background-color: #fdd; text-decoration:none; 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 . '>' . wp_kses(
</del><ins style="background-color: #dfd; text-decoration:none; 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 . '>' . wp_kses(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $page['title'],
</span><span class="cx" style="display: block; padding: 0 10px">                                wp_kses_allowed_html( 'post' )
</span><span class="cx" style="display: block; padding: 0 10px">                        ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonresolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-resolver.php    2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php      2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $config     = self::read_json_file( __DIR__ . '/theme.json' );
</span><span class="cx" style="display: block; padding: 0 10px">                $config     = self::translate( $config );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                self::$core = new WP_Theme_JSON( $config, 'core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         self::$core = new WP_Theme_JSON( $config, 'default' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return self::$core;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">                * So we take theme supports, transform it to theme.json shape
</span><span class="cx" style="display: block; padding: 0 10px">                * and merge the self::$theme upon that.
</span><span class="cx" style="display: block; padding: 0 10px">                */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $theme_support_data  = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+               if ( ! self::theme_has_support() ) {
+                       if ( ! isset( $theme_support_data['settings']['color'] ) ) {
+                               $theme_support_data['settings']['color'] = array();
+                       }
+
+                       $default_palette = false;
+                       if ( current_theme_supports( 'default-color-palette' ) ) {
+                               $default_palette = true;
+                       }
+                       if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
+                               // If the theme does not have any palette, we still want to show the core one.
+                               $default_palette = true;
+                       }
+                       $theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
+
+                       $default_gradients = false;
+                       if ( current_theme_supports( 'default-gradient-presets' ) ) {
+                               $default_gradients = true;
+                       }
+                       if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
+                               // If the theme does not have any gradients, we still want to show the core ones.
+                               $default_gradients = true;
+                       }
+                       $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">                 $with_theme_supports = new WP_Theme_JSON( $theme_support_data );
</span><span class="cx" style="display: block; padding: 0 10px">                $with_theme_supports->merge( self::$theme );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +318,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">         * There are three sources of data (origins) for a site:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * core, theme, and user. The user's has higher priority
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * default, theme, and user. The user's has higher priority
</ins><span class="cx" style="display: block; padding: 0 10px">          * than the theme's, and the theme's higher than core's.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * Unlike the getters {@link get_core_data},
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/class-wp-theme-json.php       2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @var string[]
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        const VALID_ORIGINS = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'core',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'default',
</ins><span class="cx" style="display: block; padding: 0 10px">                 'theme',
</span><span class="cx" style="display: block; padding: 0 10px">                'user',
</span><span class="cx" style="display: block; padding: 0 10px">        );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,15 +220,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'width'  => null,
</span><span class="cx" style="display: block; padding: 0 10px">                ),
</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">-                        'background'     => null,
-                       'custom'         => null,
-                       'customDuotone'  => null,
-                       'customGradient' => null,
-                       'duotone'        => null,
-                       'gradients'      => null,
-                       'link'           => null,
-                       'palette'        => null,
-                       'text'           => null,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'background'       => null,
+                       'custom'           => null,
+                       'customDuotone'    => null,
+                       'customGradient'   => null,
+                       'defaultGradients' => null,
+                       'defaultPalette'   => null,
+                       'duotone'          => null,
+                       'gradients'        => null,
+                       'link'             => null,
+                       'palette'          => null,
+                       'text'             => null,
</ins><span class="cx" style="display: block; padding: 0 10px">                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                'custom'     => null,
</span><span class="cx" style="display: block; padding: 0 10px">                'layout'     => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $theme_json A structure that follows the theme.json schema.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $origin    Optional. What source of data this object represents.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         *                          One of 'core', 'theme', or 'user'. Default 'theme'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  *                          One of 'default', 'theme', or 'user'. Default 'theme'.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct( $theme_json = array(), $origin = 'theme' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +345,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $path   = array_merge( $node['path'], $preset_metadata['path'] );
</span><span class="cx" style="display: block; padding: 0 10px">                                $preset = _wp_array_get( $this->theme_json, $path, null );
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( null !== $preset ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( 'user' !== $origin || isset( $preset[0] ) ) {
+                                               _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
+                                       }
</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">@@ -1472,46 +1476,48 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private static function remove_insecure_settings( $input ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $output = array();
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( self::PRESETS_METADATA as $preset_metadata ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $presets = _wp_array_get( $input, $preset_metadata['path'], null );
-                       if ( null === $presets ) {
-                               continue;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 foreach ( self::VALID_ORIGINS as $origin ) {
+                               $path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) );
+                               $presets          = _wp_array_get( $input, $path_with_origin, null );
+                               if ( null === $presets ) {
+                                       continue;
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $escaped_preset = array();
-                       foreach ( $presets as $preset ) {
-                               if (
-                                       esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
-                                       sanitize_html_class( $preset['slug'] ) === $preset['slug']
-                               ) {
-                                       $value = null;
-                                       if ( isset( $preset_metadata['value_key'] ) ) {
-                                               $value = $preset[ $preset_metadata['value_key'] ];
-                                       } elseif (
-                                               isset( $preset_metadata['value_func'] ) &&
-                                               is_callable( $preset_metadata['value_func'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $escaped_preset = array();
+                               foreach ( $presets as $preset ) {
+                                       if (
+                                               esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
+                                               sanitize_html_class( $preset['slug'] ) === $preset['slug']
</ins><span class="cx" style="display: block; padding: 0 10px">                                         ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $value = call_user_func( $preset_metadata['value_func'], $preset );
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $value = null;
+                                               if ( isset( $preset_metadata['value_key'] ) ) {
+                                                       $value = $preset[ $preset_metadata['value_key'] ];
+                                               } elseif (
+                                                       isset( $preset_metadata['value_func'] ) &&
+                                                       is_callable( $preset_metadata['value_func'] )
+                                               ) {
+                                                       $value = call_user_func( $preset_metadata['value_func'], $preset );
+                                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $preset_is_valid = true;
-                                       foreach ( $preset_metadata['properties'] as $property ) {
-                                               if ( ! self::is_safe_css_declaration( $property, $value ) ) {
-                                                       $preset_is_valid = false;
-                                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $preset_is_valid = true;
+                                               foreach ( $preset_metadata['properties'] as $property ) {
+                                                       if ( ! self::is_safe_css_declaration( $property, $value ) ) {
+                                                               $preset_is_valid = false;
+                                                               break;
+                                                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( $preset_is_valid ) {
-                                               $escaped_preset[] = $preset;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( $preset_is_valid ) {
+                                                       $escaped_preset[] = $preset;
+                                               }
</ins><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">-                        }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! empty( $escaped_preset ) ) {
-                               _wp_array_set( $output, $preset_metadata['path'], $escaped_preset );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( ! empty( $escaped_preset ) ) {
+                                       _wp_array_set( $output, $path_with_origin, $escaped_preset );
+                               }
</ins><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">-
</del><span class="cx" style="display: block; padding: 0 10px">                 return $output;
</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="trunksrcwpincludesglobalstylesandsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/global-styles-and-settings.php      2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/global-styles-and-settings.php        2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,14 +105,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $types = array( 'variables', 'styles', 'presets' );
</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">-        $origins = array( 'core', 'theme', 'user' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $origins = array( 'default', 'theme', 'user' );
</ins><span class="cx" style="display: block; padding: 0 10px">         if ( ! $supports_theme_json && ! $supports_link_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                // In this case we only enqueue the core presets (CSS Custom Properties + the classes).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $origins = array( 'core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $origins = array( 'default' );
</ins><span class="cx" style="display: block; padding: 0 10px">         } elseif ( ! $supports_theme_json && $supports_link_color ) {
</span><span class="cx" style="display: block; padding: 0 10px">                // For the legacy link color feature to work, the CSS Custom Properties
</span><span class="cx" style="display: block; padding: 0 10px">                // should be in scope (either the core or the theme ones).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $origins = array( 'core', 'theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $origins = array( 'default', 'theme' );
</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">        $tree       = WP_Theme_JSON_Resolver::get_merged_data();
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/src/wp-includes/post.php      2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,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_template_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_rest'          => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        'rewrite'               => false,
</span><span class="cx" style="display: block; padding: 0 10px">                        'rest_base'             => 'templates',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +416,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_template_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_rest'          => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        'rewrite'               => false,
</span><span class="cx" style="display: block; padding: 0 10px">                        'rest_base'             => 'template-parts',
</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-11-22 08:40:26 UTC (rev 52231)
+++ trunk/tests/phpunit/tests/theme/wpThemeJson.php     2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 53397
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_settings_presets_are_keyed_by_origin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $core_origin = new WP_Theme_JSON(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $default_origin = new WP_Theme_JSON(
</ins><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,9 +103,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">                        ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'core'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'default'
</ins><span class="cx" style="display: block; padding: 0 10px">                 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $no_origin   = new WP_Theme_JSON(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $no_origin      = new WP_Theme_JSON(
</ins><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,15 +134,15 @@
</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">-                $actual_core      = $core_origin->get_raw_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $actual_default   = $default_origin->get_raw_data();
</ins><span class="cx" style="display: block; padding: 0 10px">                 $actual_no_origin = $no_origin->get_raw_data();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected_core      = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected_default   = array(
</ins><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><span class="cx" style="display: block; padding: 0 10px">                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'core' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'default' => array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'slug'  => 'white',
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'color' => 'white',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'core/group' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                'core' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         'default' => array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                                'slug'  => 'white',
</span><span class="cx" style="display: block; padding: 0 10px">                                                                                'color' => 'white',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualSetsWithIndex( $expected_core, $actual_core );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEqualSetsWithIndex( $expected_default, $actual_default );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'core'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'default'
</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">                $this->assertEquals(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1298,21 +1298,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'color'   => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'custom'  => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                                'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'  => 'Red',
-                                                               'slug'  => 'red',
-                                                               'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'user' => array(
+                                                               array(
+                                                                       'name'  => 'Red',
+                                                                       'slug'  => 'red',
+                                                                       'color' => '#ff0000',
+                                                               ),
+                                                               array(
+                                                                       'name'  => 'Green',
+                                                                       'slug'  => 'green',
+                                                                       'color' => '#00ff00',
+                                                               ),
+                                                               array(
+                                                                       'name'  => 'Blue',
+                                                                       'slug'  => 'blue',
+                                                                       'color' => '#0000ff',
+                                                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'  => 'Green',
-                                                               'slug'  => 'green',
-                                                               'color' => '#00ff00',
-                                                       ),
-                                                       array(
-                                                               'name'  => 'Blue',
-                                                               'slug'  => 'blue',
-                                                               'color' => '#0000ff',
-                                                       ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'spacing' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1323,21 +1325,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'color'   => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'custom'  => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        array(
-                                                                               'name'  => 'Yellow',
-                                                                               'slug'  => 'yellow',
-                                                                               'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 'user' => array(
+                                                                               array(
+                                                                                       'name'  => 'Yellow',
+                                                                                       'slug'  => 'yellow',
+                                                                                       'color' => '#ff0000',
+                                                                               ),
+                                                                               array(
+                                                                                       'name'  => 'Pink',
+                                                                                       'slug'  => 'pink',
+                                                                                       'color' => '#00ff00',
+                                                                               ),
+                                                                               array(
+                                                                                       'name'  => 'Orange',
+                                                                                       'slug'  => 'orange',
+                                                                                       'color' => '#0000ff',
+                                                                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        array(
-                                                                               'name'  => 'Pink',
-                                                                               'slug'  => 'pink',
-                                                                               'color' => '#00ff00',
-                                                                       ),
-                                                                       array(
-                                                                               'name'  => 'Orange',
-                                                                               'slug'  => 'orange',
-                                                                               'color' => '#0000ff',
-                                                                       ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'spacing' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1354,21 +1358,23 @@
</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><span class="cx" style="display: block; padding: 0 10px">                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                array(
-                                                       'name'  => 'Red',
-                                                       'slug'  => 'red',
-                                                       'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'user' => array(
+                                                       array(
+                                                               'name'  => 'Red',
+                                                               'slug'  => 'red',
+                                                               'color' => '#ff0000',
+                                                       ),
+                                                       array(
+                                                               'name'  => 'Green',
+                                                               'slug'  => 'green',
+                                                               'color' => '#00ff00',
+                                                       ),
+                                                       array(
+                                                               'name'  => 'Blue',
+                                                               'slug'  => 'blue',
+                                                               'color' => '#0000ff',
+                                                       ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                array(
-                                                       'name'  => 'Green',
-                                                       'slug'  => 'green',
-                                                       'color' => '#00ff00',
-                                               ),
-                                               array(
-                                                       'name'  => 'Blue',
-                                                       'slug'  => 'blue',
-                                                       'color' => '#0000ff',
-                                               ),
</del><span class="cx" style="display: block; padding: 0 10px">                                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                                'blocks' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1375,21 +1381,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'core/group' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                array(
-                                                                       'name'  => 'Yellow',
-                                                                       'slug'  => 'yellow',
-                                                                       'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         'user' => array(
+                                                                       array(
+                                                                               'name'  => 'Yellow',
+                                                                               'slug'  => 'yellow',
+                                                                               'color' => '#ff0000',
+                                                                       ),
+                                                                       array(
+                                                                               'name'  => 'Pink',
+                                                                               'slug'  => 'pink',
+                                                                               'color' => '#00ff00',
+                                                                       ),
+                                                                       array(
+                                                                               'name'  => 'Orange',
+                                                                               'slug'  => 'orange',
+                                                                               'color' => '#0000ff',
+                                                                       ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                array(
-                                                                       'name'  => 'Pink',
-                                                                       'slug'  => 'pink',
-                                                                       'color' => '#00ff00',
-                                                               ),
-                                                               array(
-                                                                       'name'  => 'Orange',
-                                                                       'slug'  => 'orange',
-                                                                       'color' => '#0000ff',
-                                                               ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1409,50 +1417,54 @@
</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><span class="cx" style="display: block; padding: 0 10px">                                                'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'  => 'Red/><b>ok</ok>',
-                                                               'slug'  => 'red',
-                                                               'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'user' => array(
+                                                               array(
+                                                                       'name'  => 'Red/><b>ok</ok>',
+                                                                       'slug'  => 'red',
+                                                                       'color' => '#ff0000',
+                                                               ),
+                                                               array(
+                                                                       'name'  => 'Green',
+                                                                       'slug'  => 'a" attr',
+                                                                       'color' => '#00ff00',
+                                                               ),
+                                                               array(
+                                                                       'name'  => 'Blue',
+                                                                       'slug'  => 'blue',
+                                                                       'color' => 'var(--color, var(--unsafe-fallback))',
+                                                               ),
+                                                               array(
+                                                                       'name'  => 'Pink',
+                                                                       'slug'  => 'pink',
+                                                                       'color' => '#FFC0CB',
+                                                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'  => 'Green',
-                                                               'slug'  => 'a" attr',
-                                                               'color' => '#00ff00',
-                                                       ),
-                                                       array(
-                                                               'name'  => 'Blue',
-                                                               'slug'  => 'blue',
-                                                               'color' => 'var(--color, var(--unsafe-fallback))',
-                                                       ),
-                                                       array(
-                                                               'name'  => 'Pink',
-                                                               'slug'  => 'pink',
-                                                               'color' => '#FFC0CB',
-                                                       ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'typography' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'fontFamilies' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'       => 'Helvetica Arial/><b>test</b>',
-                                                               'slug'       => 'helvetica-arial',
-                                                               'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 'user' => array(
+                                                               array(
+                                                                       'name'       => 'Helvetica Arial/><b>test</b>',
+                                                                       'slug'       => 'helvetica-arial',
+                                                                       'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
+                                                               ),
+                                                               array(
+                                                                       'name'       => 'Geneva',
+                                                                       'slug'       => 'geneva#asa',
+                                                                       'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
+                                                               ),
+                                                               array(
+                                                                       'name'       => 'Cambria',
+                                                                       'slug'       => 'cambria',
+                                                                       'fontFamily' => 'Cambria, Georgia, serif',
+                                                               ),
+                                                               array(
+                                                                       'name'       => 'Helvetica Arial',
+                                                                       'slug'       => 'helvetica-arial',
+                                                                       'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
+                                                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        array(
-                                                               'name'       => 'Geneva',
-                                                               'slug'       => 'geneva#asa',
-                                                               'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
-                                                       ),
-                                                       array(
-                                                               'name'       => 'Cambria',
-                                                               'slug'       => 'cambria',
-                                                               'fontFamily' => 'Cambria, Georgia, serif',
-                                                       ),
-                                                       array(
-                                                               'name'       => 'Helvetica Arial',
-                                                               'slug'       => 'helvetica-arial',
-                                                               'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
-                                                       ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'blocks'     => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1459,26 +1471,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                'core/group' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        array(
-                                                                               'name'  => 'Red/><b>ok</ok>',
-                                                                               'slug'  => 'red',
-                                                                               'color' => '#ff0000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 'user' => array(
+                                                                               array(
+                                                                                       'name'  => 'Red/><b>ok</ok>',
+                                                                                       'slug'  => 'red',
+                                                                                       'color' => '#ff0000',
+                                                                               ),
+                                                                               array(
+                                                                                       'name'  => 'Green',
+                                                                                       'slug'  => 'a" attr',
+                                                                                       'color' => '#00ff00',
+                                                                               ),
+                                                                               array(
+                                                                                       'name'  => 'Blue',
+                                                                                       'slug'  => 'blue',
+                                                                                       'color' => 'var(--color, var(--unsafe--fallback))',
+                                                                               ),
+                                                                               array(
+                                                                                       'name'  => 'Pink',
+                                                                                       'slug'  => 'pink',
+                                                                                       'color' => '#FFC0CB',
+                                                                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        array(
-                                                                               'name'  => 'Green',
-                                                                               'slug'  => 'a" attr',
-                                                                               'color' => '#00ff00',
-                                                                       ),
-                                                                       array(
-                                                                               'name'  => 'Blue',
-                                                                               'slug'  => 'blue',
-                                                                               'color' => 'var(--color, var(--unsafe--fallback))',
-                                                                       ),
-                                                                       array(
-                                                                               'name'  => 'Pink',
-                                                                               'slug'  => 'pink',
-                                                                               'color' => '#FFC0CB',
-                                                                       ),
</del><span class="cx" style="display: block; padding: 0 10px">                                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,19 +1506,23 @@
</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><span class="cx" style="display: block; padding: 0 10px">                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                array(
-                                                       'name'  => 'Pink',
-                                                       'slug'  => 'pink',
-                                                       'color' => '#FFC0CB',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'user' => array(
+                                                       array(
+                                                               'name'  => 'Pink',
+                                                               'slug'  => 'pink',
+                                                               'color' => '#FFC0CB',
+                                                       ),
</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="cx" style="display: block; padding: 0 10px">                                'typography' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'fontFamilies' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                array(
-                                                       'name'       => 'Cambria',
-                                                       'slug'       => 'cambria',
-                                                       'fontFamily' => 'Cambria, Georgia, serif',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'user' => array(
+                                                       array(
+                                                               'name'       => 'Cambria',
+                                                               'slug'       => 'cambria',
+                                                               'fontFamily' => 'Cambria, Georgia, serif',
+                                                       ),
</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">@@ -1512,10 +1530,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'core/group' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'palette' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                array(
-                                                                       'name'  => 'Pink',
-                                                                       'slug'  => 'pink',
-                                                                       'color' => '#FFC0CB',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         'user' => array(
+                                                                       array(
+                                                                               'name'  => 'Pink',
+                                                                               'slug'  => 'pink',
+                                                                               'color' => '#FFC0CB',
+                                                                       ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                ),
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonResolverphp"></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/wpThemeJsonResolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php   2021-11-22 08:40:26 UTC (rev 52231)
+++ trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php     2021-11-23 05:38:45 UTC (rev 52232)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,8 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_switching_themes_recalculates_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // By default, the theme for unit tests is "default",
-               // which doesn't have theme.json support.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The "default" theme doesn't have theme.json support.
+               switch_theme( 'default' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $default = WP_Theme_JSON_Resolver::theme_has_support();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Switch to a theme that does have support.
</span></span></pre>
</div>
</div>

</body>
</html>