Changeset 52275

Timestamp:

11/30/2021 12:22:30 AM (3 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Update Pattern block category and add documentation
• Fix non existent menu handling in nav block
• Make Reusable blocks available in the Site Editor
• Add caching to WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_custom_post_type()
• theme.json: add appearanceTools flag to opt-in into appearance UI controls
• Update the block theme folders to templates and parts
• Remove reference to gutenberg_, swap with wp_
• Use table layout in templates list screen
• Update featured image placeholder graphic.
• [Inserter]: Adjust order of theme blocks and reorder inserter items
• Implement suitable fallback for Nav block on front end of site when no menu selected
• Toggle Group Control: add tooltip
• Use first non-empty Nav post as primary fallback for Nav block
• Change .nvmrc and documentation for Node.js version (LTS to 14.18.1)
• Update: Migrate global styles user database data on the rest endpoint
• Update global styles public API
• Update: Rename user preset origin to custom
• Try always generating navigation post title
• Show all templates and template parts on the site editor list screens
• Highlight "Site" in the navigation panel
• Fix template part slug generation when creating through the block placeholder
• [Block Library - Post Title]: Fix render error when setting Page to homepage
• Add 'Clear customizations' button to template list page
• Gallery v1: Allow clicks within replace media placeholder state
• Site Editor: Set the <title> on the list page to be same as the CPT name
• Gallery: Fix stuck image size options loader
• Cover: Fix undo trap
• Add success and error snackbars to the templates list page
• Fix: theme colors cannot override defaults
• Fix: Color palette is not being stored
• Add elements support to the typography panel in global styles
• Make links plural in global styles
• Add: Gradient palette editor
• Update some small style regressions in the template list
• Add: Transparency support on global styles colors
• Fix: apply by slug on all origins
• Render empty Nav block if no fallback block can be utilised
• Allow filtering of Nav block fallback
• Fix Nav block fallback DB query to match on full block grammar start tag
• Remove unstable max pages attribute from Nav block
• DateTimePicker: set PM hours correctly
• Update delete template button
• Site Editor: Template list add rename action
• Fix Nav block editing wrong entity on creation of new Menu
• [REST] Restore the missing double slash in the ID received by /templates
• Add icons to navigation sidebar items
• Update function names for the public global styles API functions
• Templates Controller: Add missing 'is_custom' prop
• Rename gutenberg_ to wp_ for some functions that land in WordPress 5.9
• [Block Library - Template Part]:Remove support for conversion to Reusable block
• Global Styles: Call "palettes" and not "color palettes" on panel label
• Add button text when no colors found
• Update: Global Styes: Count all color palette origins on the palette counter
• Rename navigationMenuId to ref
• Offset the parent iframe when computing Popover position
• Fix: Failing PHPUnit test
• Show theme, plugin or author in Added By column with appropriate icon or avatar
• Add origin and author to template rest api

See #54487.
Props talldanwp, mamaduka, oandregal.

Location:

trunk

Files:

• package-lock.json (modified) (33 diffs)
• package.json (modified) (3 diffs)
• src/wp-admin/site-editor.php (modified) (3 diffs)
• src/wp-includes/assets/script-loader-packages.php (modified) (1 diff)
• src/wp-includes/block-editor.php (modified) (3 diffs)
• src/wp-includes/block-template-utils.php (modified) (3 diffs)
• src/wp-includes/blocks/calendar.php (modified) (2 diffs)
• src/wp-includes/blocks/navigation.php (modified) (11 diffs)
• src/wp-includes/blocks/navigation/block.json (modified) (1 diff)
• src/wp-includes/blocks/navigation/view.asset.php (modified) (1 diff)
• src/wp-includes/blocks/navigation/view.min.asset.php (modified) (1 diff)
• src/wp-includes/blocks/page-list.php (modified) (1 diff)
• src/wp-includes/blocks/pattern/block.json (modified) (1 diff)
• src/wp-includes/blocks/post-terms/block.json (modified) (1 diff)
• src/wp-includes/blocks/query-title/block.json (modified) (1 diff)
• src/wp-includes/blocks/site-logo/block.json (modified) (1 diff)
• src/wp-includes/blocks/site-logo/editor-rtl.css (modified) (2 diffs)
• src/wp-includes/blocks/site-logo/editor-rtl.min.css (modified) (1 diff)
• src/wp-includes/blocks/site-logo/editor.css (modified) (2 diffs)
• src/wp-includes/blocks/site-logo/editor.min.css (modified) (1 diff)
• src/wp-includes/blocks/site-tagline/block.json (modified) (1 diff)
• src/wp-includes/blocks/site-title/block.json (modified) (1 diff)
• src/wp-includes/blocks/template-part.php (modified) (1 diff)
• src/wp-includes/blocks/template-part/block.json (modified) (1 diff)
• src/wp-includes/class-wp-block-template.php (modified) (2 diffs)
• src/wp-includes/class-wp-theme-json-resolver.php (modified) (9 diffs)
• src/wp-includes/class-wp-theme-json.php (modified) (18 diffs)
• src/wp-includes/global-styles-and-settings.php (modified) (3 diffs)
• src/wp-includes/post.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php (modified) (10 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php (modified) (1 diff)
• src/wp-includes/theme.json (modified) (6 diffs)
• tests/phpunit/tests/rest-api/wpRestTemplatesController.php (modified) (14 diffs)
• tests/phpunit/tests/theme/wpThemeJson.php (modified) (12 diffs)
• tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (3 diffs)
• tests/qunit/fixtures/wp-api-generated.js (modified) (6 diffs)

trunk/package-lock.json

@@ -1453 +1453 @@
         },
         "@emotion/react": {
-            "version": "11.6.0",
-            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.6.0.tgz",
-            "integrity": "sha512-23MnRZFBN9+D1lHXC5pD6z4X9yhPxxtHr6f+iTGz6Fv6Rda0GdefPrsHL7otsEf+//7uqCdT5QtHeRxHCERzuw==",
+            "version": "11.7.0",
+            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.0.tgz",
+            "integrity": "sha512-WL93hf9+/2s3cA1JVJlz8+Uy6p6QWukqQFOm2OZO5ki51hfucHMOmbSjiyC3t2Y4RI8XUmBoepoc/24ny/VBbA==",
             "requires": {
                 "@babel/runtime": "^7.13.10",
@@ -2259 +2259 @@
         },
         "@popperjs/core": {
-            "version": "2.10.2",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
-            "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ=="
+            "version": "2.11.0",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz",
+            "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ=="
         },
         "@react-spring/animated": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.3.0.tgz",
-            "integrity": "sha512-QvuyW77eDvLhdJyO6FFldlWlvnuKK2cpOx4+Zr962RyT/0IO1tbNDRO6G1vM8va6mbv6tmfYmRGKmKYePN3kVg==",
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.3.1.tgz",
+            "integrity": "sha512-23YaERZ++BwZ8F8PxPFqrpOwp/JZun1Pj6aHZtPAU42j5LycBRasT9XMw7Eyr7zNFhT+rl3R3wFfd4WX6Ax+UA==",
             "requires": {
                 "@react-spring/shared": "~9.3.0",
@@ -2273 +2273 @@
         },
         "@react-spring/core": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.3.0.tgz",
-            "integrity": "sha512-SZQOIX7wkIagmucAi7zxqGGIb9A60o9n5922UrWo8Kl3FdG7FgrNwqr0kOI43/pMFeL70/PXwFhBatB03N5ctw==",
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.3.1.tgz",
+            "integrity": "sha512-8rmfmEHLHGtF1CUiXRn64YJqsXNxv2cGX8oNnBnsuoE33c48Zc34t2VIMB4R9q5zwIUCvDBGfiEenA8ZAPxqOQ==",
             "requires": {
                 "@react-spring/animated": "~9.3.0",
@@ -2283 +2283 @@
         },
         "@react-spring/rafz": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.3.0.tgz",
-            "integrity": "sha512-FD04d2TNb3xOZ6+04qwDmC3d0H4X6gvhsxU71/nSm4PPYRqFzZEolcVPmrHlbGzco3bvXKI+Kp2pIrpXLPUJFA=="
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.3.1.tgz",
+            "integrity": "sha512-fEBMCarGVl+/2kdO+g6Zig4F+3ymwmcGN8S71gb1c7Cbbxb87kviPz8EhshfIHoiLeJPGlqwcuGbxNmZbBamvA=="
         },
         "@react-spring/shared": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.3.0.tgz",
-            "integrity": "sha512-7ZFY2Blu/wxbLGcYvQavyLUVi9bK/is1bsn11qZ9AaZb4iucRyIf2jgjBfKZFCq4qgi7S/7QmDQG7sucUyLELg==",
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.3.1.tgz",
+            "integrity": "sha512-jhPpxzURGo6Nty90ex1lkxmZae7w/VAbnGmb/nXcYoZwSoNR+W2aAd00iXsh2ZGz6MgoJOsc495JeG3uC7Am8A==",
             "requires": {
                 "@react-spring/rafz": "~9.3.0",
@@ -2297 +2297 @@
         },
         "@react-spring/types": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.3.0.tgz",
-            "integrity": "sha512-q4cDr2RSPblXMD3Rxvk6qcC7nmhhfV2izEBP06hb8ZCXznA6qJirG3RMpi29kBtEQiw1lWR59hAXKhauaPtbOA=="
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.3.1.tgz",
+            "integrity": "sha512-W/YMJMX35XgGGzX0gKORBTwnvQ+1loDOFN3XlZkW5fgpEY+7VkRUpPyqPWXQr3n6lHrsLmHIGdpznqZi54ACTQ=="
         },
         "@react-spring/web": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.3.0.tgz",
-            "integrity": "sha512-OTAGKRdyz6fLRR1tABFyw9KMpytyATIndQrj0O6RG47GfjiInpf4+WZKxo763vpS7z1OlnkI81WLUm/sqOqAnA==",
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.3.1.tgz",
+            "integrity": "sha512-sisZIgFGva/Z+xKWPSfXpukF0AP3kR9ALTxlHL87fVotMUCJX5vtH/YlVcywToEFwTHKt3MpI5Wy2M+vgVEeaw==",
             "requires": {
                 "@react-spring/animated": "~9.3.0",
@@ -3530 +3530 @@
         },
         "@wordpress/block-directory": {
-            "version": "3.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.11.tgz",
-            "integrity": "sha512-zSFsm+yUcrgZSWQVXWPd8jp+K1Lf/S5JITUp1cKReae9hhHgvmEpQydmWNGgjIadeALpcka5j0JIe2AJAqGeBA==",
+            "version": "3.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.12.tgz",
+            "integrity": "sha512-nZqGheHJ1lapCacPgz+pnk2Rb7i6EmJHLSsAh06Om9lXo3ARph1bhnHlS7KME0zADtam7uHteKYE8oSn0jTLcg==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/block-editor": "^8.0.5",
+                "@wordpress/block-editor": "^8.0.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
-                "@wordpress/edit-post": "^5.0.11",
-                "@wordpress/editor": "^12.0.8",
+                "@wordpress/edit-post": "^5.0.12",
+                "@wordpress/editor": "^12.0.9",
                 "@wordpress/element": "^4.0.4",
                 "@wordpress/hooks": "^3.2.2",
@@ -3557 +3557 @@
         },
         "@wordpress/block-editor": {
-            "version": "8.0.5",
-            "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.5.tgz",
-            "integrity": "sha512-s5kmYFizQlf2K2JXaI5Iw3Zo8mYa6sCw0BMDt9Z+67NNyAvsbf9jPA6Uw80yRsCVcjz+cYcgHv3+Tcz9a6VrUw==",
+            "version": "8.0.6",
+            "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.6.tgz",
+            "integrity": "sha512-t5AL0nQuakopOoH2RgVflGvBwik+IvqRd2UOQsjVNeCIZLpbI4up9QYHtBidoqu4Zye6aGsL5LMDt7bWmWhn9A==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
@@ -3568 +3568 @@
                 "@wordpress/block-serialization-default-parser": "^4.2.3",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/data": "^6.1.4",
@@ -3604 +3604 @@
         },
         "@wordpress/block-library": {
-            "version": "6.0.9",
-            "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.9.tgz",
-            "integrity": "sha512-5etkM+WKn7jUlZsSiuA6jVBFlBvxn5szu5Shr6GbLnuUwh2pEhj/BY/aqXcyjNXcoUT2WmURcCPBjclgm2CvBA==",
+            "version": "6.0.10",
+            "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.10.tgz",
+            "integrity": "sha512-4FVKwUU+ed9oOpk8v8iHq2ZZvmW3AN/dzZ9AAv8ywqoU8IEvw0WjSI87WABT9414w63wE275X7M5Q2eja44ahg==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
@@ -3613 +3613 @@
                 "@wordpress/autop": "^3.2.3",
                 "@wordpress/blob": "^3.2.2",
-                "@wordpress/block-editor": "^8.0.5",
+                "@wordpress/block-editor": "^8.0.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/date": "^4.2.3",
@@ -3628 +3628 @@
                 "@wordpress/i18n": "^4.2.4",
                 "@wordpress/icons": "^6.1.1",
-                "@wordpress/interface": "^4.1.7",
+                "@wordpress/interface": "^4.1.8",
                 "@wordpress/is-shallow-equal": "^4.2.1",
                 "@wordpress/keycodes": "^3.2.4",
                 "@wordpress/notices": "^3.2.7",
                 "@wordpress/primitives": "^3.0.4",
-                "@wordpress/reusable-blocks": "^3.0.11",
+                "@wordpress/reusable-blocks": "^3.0.12",
                 "@wordpress/rich-text": "^5.0.6",
-                "@wordpress/server-side-render": "^3.0.9",
+                "@wordpress/server-side-render": "^3.0.10",
                 "@wordpress/url": "^3.3.1",
                 "@wordpress/viewport": "^4.0.6",
@@ -3690 +3690 @@
         },
         "@wordpress/components": {
-            "version": "19.0.5",
-            "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.0.5.tgz",
-            "integrity": "sha512-xtXTpPvmByVPjIWWo/v8ZzVsEtx9dq6bsdOOkDTnFFUXTcgxJb12RmgbsDR+E/L+z9IwuGxLwt08EGrWWvKF6w==",
+            "version": "19.1.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.0.tgz",
+            "integrity": "sha512-34hYwy3vtsWHdFFvE6cPlV6KxKMa4uaY2dvZlJ++QMVA24geGRfwtM1ZvGgs9fVjo0koC332sN2LGS7wx6aXew==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
@@ -3756 +3756 @@
         },
         "@wordpress/core-data": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-4.0.7.tgz",
-            "integrity": "sha512-N9za/cxd3KiZsHZj5kcD4zYcPgv7PdCQQx0GB5rBzceYzgON/WG3Y/QhoFHFwEw5OOpBIcSKehV975VByRD+qA==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-4.0.8.tgz",
+            "integrity": "sha512-nv7lXFU+7kdPhoD/Cz5oi6Xu1ODPRDwoMYYpIPB2nEfLi6foleDxhUuib9unwAtvUKNtQnrClDesys7l6pXMwQ==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
@@ -3786 +3786 @@
         },
         "@wordpress/customize-widgets": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.11.tgz",
-            "integrity": "sha512-3HSHChnMtT7JCXaITzDgM0zwbDopL3CNofhCJf/lQR//msiLiFK2MzjZrgJdQXTzVcPN7fXgIsf5cFJeHsuADg==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.12.tgz",
+            "integrity": "sha512-83/LFQo7UJ8X2B+yiByRJKWHJV4jpfHsT7RZDg5Vd06bR/UXbM7d8TCCYDvUgn0HuadGM+XcFxxhfYUTm68yHA==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
-                "@wordpress/block-editor": "^8.0.5",
-                "@wordpress/block-library": "^6.0.9",
+                "@wordpress/block-editor": "^8.0.6",
+                "@wordpress/block-library": "^6.0.10",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/dom": "^3.2.7",
@@ -3804 +3804 @@
                 "@wordpress/i18n": "^4.2.4",
                 "@wordpress/icons": "^6.1.1",
-                "@wordpress/interface": "^4.1.7",
+                "@wordpress/interface": "^4.1.8",
                 "@wordpress/is-shallow-equal": "^4.2.1",
                 "@wordpress/keyboard-shortcuts": "^3.0.6",
                 "@wordpress/keycodes": "^3.2.4",
                 "@wordpress/media-utils": "^3.0.5",
-                "@wordpress/widgets": "^2.0.11",
+                "@wordpress/widgets": "^2.0.12",
                 "classnames": "^2.3.1",
                 "lodash": "^4.17.21"
@@ -3938 +3938 @@
         },
         "@wordpress/edit-post": {
-            "version": "5.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.11.tgz",
-            "integrity": "sha512-UVFve7ETYdJjDm2TgAJKOxiRmoTYNu75fkbvTluxnKbvWKDXzY0QCpw47JY4g+JmYBRda6ZGV51eY5P5G5BZ6Q==",
+            "version": "5.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.12.tgz",
+            "integrity": "sha512-A2nt6LXdVcVqUay08P1W0J2t9vUmoxOkZPH4qKhBhUlMfmHKtyqMBiNQFui9drPMWVUb5HB3zsUmlAWsv429Vw==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/block-editor": "^8.0.5",
-                "@wordpress/block-library": "^6.0.9",
+                "@wordpress/block-editor": "^8.0.6",
+                "@wordpress/block-library": "^6.0.10",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/data-controls": "^2.2.7",
-                "@wordpress/editor": "^12.0.8",
+                "@wordpress/editor": "^12.0.9",
                 "@wordpress/element": "^4.0.4",
                 "@wordpress/hooks": "^3.2.2",
                 "@wordpress/i18n": "^4.2.4",
                 "@wordpress/icons": "^6.1.1",
-                "@wordpress/interface": "^4.1.7",
+                "@wordpress/interface": "^4.1.8",
                 "@wordpress/keyboard-shortcuts": "^3.0.6",
                 "@wordpress/keycodes": "^3.2.4",
@@ -3983 +3983 @@
         },
         "@wordpress/edit-site": {
-            "version": "3.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.11.tgz",
-            "integrity": "sha512-jwCXMVDg6ucNOur1lpQBDlXNuUv6RzpOK/I2rfhw9Cqv0DyFfWSL6NIxMZFuqfyhCeqnUaz/GT/CVgghx5Ssvw==",
+            "version": "3.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.12.tgz",
+            "integrity": "sha512-Uxn7mLNCdvND/4ZuMKiNSBSD09hDAdjYsCZDAnZ3HE0lc1DrCQFI8lF911JSYWY2fmiTbAhqGBKHOci7XK4b3A==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/block-editor": "^8.0.5",
-                "@wordpress/block-library": "^6.0.9",
+                "@wordpress/block-editor": "^8.0.6",
+                "@wordpress/block-library": "^6.0.10",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/data-controls": "^2.2.7",
-                "@wordpress/editor": "^12.0.8",
+                "@wordpress/editor": "^12.0.9",
                 "@wordpress/element": "^4.0.4",
                 "@wordpress/hooks": "^3.2.2",
@@ -4004 +4004 @@
                 "@wordpress/i18n": "^4.2.4",
                 "@wordpress/icons": "^6.1.1",
-                "@wordpress/interface": "^4.1.7",
+                "@wordpress/interface": "^4.1.8",
                 "@wordpress/keyboard-shortcuts": "^3.0.6",
                 "@wordpress/keycodes": "^3.2.4",
@@ -4011 +4011 @@
                 "@wordpress/plugins": "^4.0.6",
                 "@wordpress/primitives": "^3.0.4",
+                "@wordpress/reusable-blocks": "^3.0.12",
                 "@wordpress/url": "^3.3.1",
+                "@wordpress/viewport": "^4.0.6",
                 "classnames": "^2.3.1",
                 "downloadjs": "^1.4.7",
@@ -4021 +4023 @@
         },
         "@wordpress/edit-widgets": {
-            "version": "3.1.6",
-            "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.6.tgz",
-            "integrity": "sha512-NuVehrAajzThQLh313FiyhjfIFpCwolyPjndj+urUp+iCKpLTMKTKSrZpC6tQsfycrmpPrnL/RiWsNeAV1zGMg==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.7.tgz",
+            "integrity": "sha512-FwbaqGqGazNSfZth5HG6Kl6l5yCiyL/+h4dSGQrplMxvNlQDC8Sx2x/ti/iH9f82+FOmIbAGvJtZaeRNOI7WZw==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/block-editor": "^8.0.5",
-                "@wordpress/block-library": "^6.0.9",
+                "@wordpress/block-editor": "^8.0.6",
+                "@wordpress/block-library": "^6.0.10",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/dom": "^3.2.7",
@@ -4040 +4042 @@
                 "@wordpress/i18n": "^4.2.4",
                 "@wordpress/icons": "^6.1.1",
-                "@wordpress/interface": "^4.1.7",
+                "@wordpress/interface": "^4.1.8",
                 "@wordpress/keyboard-shortcuts": "^3.0.6",
                 "@wordpress/keycodes": "^3.2.4",
@@ -4046 +4048 @@
                 "@wordpress/notices": "^3.2.7",
                 "@wordpress/plugins": "^4.0.6",
-                "@wordpress/reusable-blocks": "^3.0.11",
-                "@wordpress/server-side-render": "^3.0.9",
+                "@wordpress/reusable-blocks": "^3.0.12",
+                "@wordpress/server-side-render": "^3.0.10",
                 "@wordpress/url": "^3.3.1",
-                "@wordpress/widgets": "^2.0.11",
+                "@wordpress/widgets": "^2.0.12",
                 "classnames": "^2.3.1",
                 "lodash": "^4.17.21",
@@ -4057 +4059 @@
         },
         "@wordpress/editor": {
-            "version": "12.0.8",
-            "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.8.tgz",
-            "integrity": "sha512-vEEHEH2Pkg/FzfgZqTZI6RhTcGrRwwgdnSrrJJMXQjKg3ieLpSuKZ2LaZEhfqY2ICTuZ/49A9pxOm6FzkQW8Xg==",
+            "version": "12.0.9",
+            "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.9.tgz",
+            "integrity": "sha512-yzwkrrCJlgW3VR5xNqsSoLQztYgqqe20goJfRXF+43ZQBTNr0kUbHb3+xF4J/cd3WxqWYYPb2WeHcR65qrnYqw==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
@@ -4066 +4068 @@
                 "@wordpress/autop": "^3.2.3",
                 "@wordpress/blob": "^3.2.2",
-                "@wordpress/block-editor": "^8.0.5",
+                "@wordpress/block-editor": "^8.0.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/data-controls": "^2.2.7",
@@ -4085 +4087 @@
                 "@wordpress/media-utils": "^3.0.5",
                 "@wordpress/notices": "^3.2.7",
-                "@wordpress/reusable-blocks": "^3.0.11",
+                "@wordpress/reusable-blocks": "^3.0.12",
                 "@wordpress/rich-text": "^5.0.6",
-                "@wordpress/server-side-render": "^3.0.9",
+                "@wordpress/server-side-render": "^3.0.10",
                 "@wordpress/url": "^3.3.1",
                 "@wordpress/wordcount": "^3.2.3",
@@ -4174 +4176 @@
         },
         "@wordpress/format-library": {
-            "version": "3.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.11.tgz",
-            "integrity": "sha512-RhEQtTDUjXJMNkSCL8v+l2/N8T8kizfSoaD84bbJbSU1sahUF7Cdxtlp06z374iTZDzIqZxtEftWRljJs/AqVA==",
+            "version": "3.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.12.tgz",
+            "integrity": "sha512-gQzGsv63HwQrDNIQvxEC/xwR730Mv+VkSXvCfHip8dBL1cva4CHzrsnYbXGJuaQEEX7yOSv+IPLcrA8rTy2fzw==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
-                "@wordpress/block-editor": "^8.0.5",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/block-editor": "^8.0.6",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/data": "^6.1.4",
@@ -4236 +4238 @@
         },
         "@wordpress/interface": {
-            "version": "4.1.7",
-            "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.7.tgz",
-            "integrity": "sha512-mXsTvVKfDctZ1Kkhto2NLCs8xi3cHFD7QU8OIuofgO8rKlQ4ro7+QTuu1N/SfGRnmTQTX0d1gUMzi4JwWp3nsA==",
+            "version": "4.1.8",
+            "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.8.tgz",
+            "integrity": "sha512-bvvNJ0uuBozCSpRJx/MSQgC8ReH5dUL8pFJc4ky923xFwMjmOybkQbzf/A4uCiKeGkp0H9mL0VvenDkxBzmw4w==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/a11y": "^3.2.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/data": "^6.1.4",
@@ -4340 +4342 @@
         },
         "@wordpress/list-reusable-blocks": {
-            "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==",
+            "version": "3.0.10",
+            "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.10.tgz",
+            "integrity": "sha512-B8+5GWPRhRDryB44aTidVhe6zCUwSoWMiCzEJ6E9J84bh2P5EfTzQBtzyVBNZYxyn58ZViCW2cnt/yQFh85OrA==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/element": "^4.0.4",
@@ -4384 +4386 @@
         },
         "@wordpress/nux": {
-            "version": "5.0.9",
-            "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.9.tgz",
-            "integrity": "sha512-HGQVQm/8YAyNCIDQRzwAQSikT4tkJ/Gf/4NU2LbQf45gk0vuPLlbXmlF/cA/AQdA8l8hKfE51SfETRRPIE63IA==",
+            "version": "5.0.10",
+            "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.10.tgz",
+            "integrity": "sha512-W9WyfondJ9IGo9W0QShbP2RQbiCctK0Vx916SIBW/xMTux+nB04MaKkfQsuKFWMsMQGsUZHcv6j/uRVCrRpAyQ==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/data": "^6.1.4",
@@ -4514 +4516 @@
         },
         "@wordpress/reusable-blocks": {
-            "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==",
-            "requires": {
-                "@wordpress/block-editor": "^8.0.5",
+            "version": "3.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.12.tgz",
+            "integrity": "sha512-Q38sB3Lo3qHM6JHQoHuEeP9UIsTLBL36dbiaBGyXkMexLG5djr4RIjbzn024nUSk8no+TSqylwxiH/tpW5H8sw==",
+            "requires": {
+                "@wordpress/block-editor": "^8.0.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/element": "^4.0.4",
@@ -5486 +5488 @@
         },
         "@wordpress/server-side-render": {
-            "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==",
+            "version": "3.0.10",
+            "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.10.tgz",
+            "integrity": "sha512-6Ifor/lSJEPpqsdHdNt4NhO/ufR0FyjKN4uIhyZW69BdK6OZrXlovLB//vOgR4a+aTqNprbWNbx+lU7nDXASRg==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/api-fetch": "^5.2.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
                 "@wordpress/data": "^6.1.4",
@@ -5559 +5561 @@
         },
         "@wordpress/widgets": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.11.tgz",
-            "integrity": "sha512-XIY/W7WnEXbWSeycFtxaShHYxtJOlTgX9L4DCo/hh2IHkG3HHsZ8qIx0lMtsMq2BKZ2mbL3GCp/cjgBNQygUhg==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.12.tgz",
+            "integrity": "sha512-XhECJrxmRHT4sFAQCoYWDMADKzN8M5RNfvpZeDJlAa+clk1JN15ljsUsvQR8MkIN4o+W261wVkbCZX2Jej+i0w==",
             "requires": {
                 "@babel/runtime": "^7.16.0",
                 "@wordpress/api-fetch": "^5.2.6",
-                "@wordpress/block-editor": "^8.0.5",
+                "@wordpress/block-editor": "^8.0.6",
                 "@wordpress/blocks": "^11.1.4",
-                "@wordpress/components": "^19.0.5",
+                "@wordpress/components": "^19.1.0",
                 "@wordpress/compose": "^5.0.6",
-                "@wordpress/core-data": "^4.0.7",
+                "@wordpress/core-data": "^4.0.8",
                 "@wordpress/data": "^6.1.4",
                 "@wordpress/element": "^4.0.4",
@@ -18302 +18304 @@
         },
         "micromodal": {
-            "version": "0.4.6",
-            "resolved": "https://registry.npmjs.org/micromodal/-/micromodal-0.4.6.tgz",
-            "integrity": "sha512-2VDso2a22jWPpqwuWT/4RomVpoU3Bl9qF9D01xzwlNp5UVsImeA0gY4nSpF44vqcQtQOtkiMUV9EZkAJSRxBsg=="
+            "version": "0.4.10",
+            "resolved": "https://registry.npmjs.org/micromodal/-/micromodal-0.4.10.tgz",
+            "integrity": "sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ=="
         },
         "miller-rabin": {

trunk/package.json

@@ -83 +83 @@
         "@wordpress/autop": "3.2.3",
         "@wordpress/blob": "3.2.2",
-        "@wordpress/block-directory": "3.0.11",
-        "@wordpress/block-editor": "8.0.5",
-        "@wordpress/block-library": "6.0.9",
+        "@wordpress/block-directory": "3.0.12",
+        "@wordpress/block-editor": "8.0.6",
+        "@wordpress/block-library": "6.0.10",
         "@wordpress/block-serialization-default-parser": "4.2.3",
         "@wordpress/blocks": "11.1.4",
-        "@wordpress/components": "19.0.5",
+        "@wordpress/components": "19.1.0",
         "@wordpress/compose": "5.0.6",
-        "@wordpress/core-data": "4.0.7",
-        "@wordpress/customize-widgets": "2.0.11",
+        "@wordpress/core-data": "4.0.8",
+        "@wordpress/customize-widgets": "2.0.12",
         "@wordpress/data": "6.1.4",
         "@wordpress/data-controls": "2.2.7",
@@ -98 +98 @@
         "@wordpress/dom": "3.2.7",
         "@wordpress/dom-ready": "3.2.3",
-        "@wordpress/edit-post": "5.0.11",
-        "@wordpress/edit-site": "3.0.11",
-        "@wordpress/edit-widgets": "3.1.6",
-        "@wordpress/editor": "12.0.8",
+        "@wordpress/edit-post": "5.0.12",
+        "@wordpress/edit-site": "3.0.12",
+        "@wordpress/edit-widgets": "3.1.7",
+        "@wordpress/editor": "12.0.9",
         "@wordpress/element": "4.0.4",
         "@wordpress/escape-html": "2.2.3",
-        "@wordpress/format-library": "3.0.11",
+        "@wordpress/format-library": "3.0.12",
         "@wordpress/hooks": "3.2.2",
         "@wordpress/html-entities": "3.2.3",
         "@wordpress/i18n": "4.2.4",
         "@wordpress/icons": "6.1.1",
-        "@wordpress/interface": "4.1.7",
+        "@wordpress/interface": "4.1.8",
         "@wordpress/is-shallow-equal": "4.2.1",
         "@wordpress/keyboard-shortcuts": "3.0.6",
         "@wordpress/keycodes": "3.2.4",
-        "@wordpress/list-reusable-blocks": "3.0.9",
+        "@wordpress/list-reusable-blocks": "3.0.10",
         "@wordpress/media-utils": "3.0.5",
         "@wordpress/notices": "3.2.7",
-        "@wordpress/nux": "5.0.9",
+        "@wordpress/nux": "5.0.10",
         "@wordpress/plugins": "4.0.6",
         "@wordpress/primitives": "3.0.4",
         "@wordpress/priority-queue": "2.2.3",
         "@wordpress/redux-routine": "4.2.2",
-        "@wordpress/reusable-blocks": "3.0.11",
+        "@wordpress/reusable-blocks": "3.0.12",
         "@wordpress/rich-text": "5.0.6",
-        "@wordpress/server-side-render": "3.0.9",
+        "@wordpress/server-side-render": "3.0.10",
         "@wordpress/shortcode": "3.2.3",
         "@wordpress/token-list": "2.2.2",
@@ -129 +129 @@
         "@wordpress/viewport": "4.0.6",
         "@wordpress/warning": "2.2.2",
-        "@wordpress/widgets": "2.0.11",
+        "@wordpress/widgets": "2.0.12",
         "@wordpress/wordcount": "3.2.3",
         "backbone": "1.4.0",

trunk/src/wp-admin/site-editor.php

@@ -24 +24 @@
 }
 
-// Used in the HTML title tag.
-$title       = __( 'Editor (beta)' );
 $parent_file = 'themes.php';
 
@@ -60 +58 @@
     }
 
+    // Used in the HTML title tag.
+    $title = $post_type->labels->name;
+
     $preload_paths = array(
         '/',
@@ -81 +82 @@
 
 } else {
+
+    // Used in the HTML title tag.
+    $title = __( 'Editor (beta)' );
 
     $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();

trunk/src/wp-includes/assets/script-loader-packages.php

@@ -1 @@
-<?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-core-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-viewport', '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' => '7ad174e925c73007ee5b17358242e7d9'), '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('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '22329f7ff9d35759e1a4ed63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '314e138f1050b863fc65347b91b547d5'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' => 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' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('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'));
+<?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-core-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' => 'f32e4a6767256ef0a5e91fe3788fe9de'), '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' => '868f97e65c74e6f8bf8e7ae2fb8b4261'), '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' => '740d7b9c8beb2b47d15ce1f3c590dee5'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '9dac23239e3ee771f867989188a2e766'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-viewport', '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' => '7ad174e925c73007ee5b17358242e7d9'), 'edit-post.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '78dd73ace08da4436266d54e551f1801'), 'edit-site.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport'), 'version' => '2f5a0019e6e13496c0c6466f930380c3'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '22329f7ff9d35759e1a4ed63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '314e138f1050b863fc65347b91b547d5'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' => 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' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('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'));

trunk/src/wp-includes/block-editor.php

@@ -339 +339 @@
     if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {
         $colors_by_origin          = $editor_settings['__experimentalFeatures']['color']['palette'];
-        $editor_settings['colors'] = isset( $colors_by_origin['user'] ) ?
-            $colors_by_origin['user'] : (
+        $editor_settings['colors'] = isset( $colors_by_origin['custom'] ) ?
+            $colors_by_origin['custom'] : (
                 isset( $colors_by_origin['theme'] ) ?
                     $colors_by_origin['theme'] :
@@ -348 +348 @@
     if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
         $gradients_by_origin          = $editor_settings['__experimentalFeatures']['color']['gradients'];
-        $editor_settings['gradients'] = isset( $gradients_by_origin['user'] ) ?
-            $gradients_by_origin['user'] : (
+        $editor_settings['gradients'] = isset( $gradients_by_origin['custom'] ) ?
+            $gradients_by_origin['custom'] : (
                 isset( $gradients_by_origin['theme'] ) ?
                     $gradients_by_origin['theme'] :
@@ -357 +357 @@
     if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
         $font_sizes_by_origin         = $editor_settings['__experimentalFeatures']['typography']['fontSizes'];
-        $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ?
-            $font_sizes_by_origin['user'] : (
+        $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['custom'] ) ?
+            $font_sizes_by_origin['custom'] : (
                 isset( $font_sizes_by_origin['theme'] ) ?
                     $font_sizes_by_origin['theme'] :

trunk/src/wp-includes/block-template-utils.php

@@ -526 +526 @@
         null !== _get_block_template_file( $post->post_type, $post->post_name );
 
+    $origin = get_post_meta( $post->ID, 'origin', true );
+
     $template                 = new WP_Block_Template();
     $template->wp_id          = $post->ID;
@@ -533 +535 @@
     $template->slug           = $post->post_name;
     $template->source         = 'custom';
+    $template->origin         = ! empty( $origin ) ? $origin : null;
     $template->type           = $post->post_type;
     $template->description    = $post->post_excerpt;
@@ -539 +542 @@
     $template->has_theme_file = $has_theme_file;
     $template->is_custom      = true;
+    $template->author         = $post->post_author;
 
     if ( 'wp_template' === $post->post_type && isset( $default_template_types[ $template->slug ] ) ) {

trunk/src/wp-includes/blocks/calendar.php

@@ -86 +86 @@
 
     // On single sites we try our own cached option first.
-    $has_published_posts = get_option( 'gutenberg_calendar_block_has_published_posts', null );
+    $has_published_posts = get_option( 'wp_calendar_block_has_published_posts', null );
     if ( null !== $has_published_posts ) {
         return (bool) $has_published_posts;
@@ -104 +104 @@
     global $wpdb;
     $has_published_posts = (bool) $wpdb->get_var( "SELECT 1 as test FROM {$wpdb->posts} WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1" );
-    update_option( 'gutenberg_calendar_block_has_published_posts', $has_published_posts );
+    update_option( 'wp_calendar_block_has_published_posts', $has_published_posts );
     return $has_published_posts;
 }

trunk/src/wp-includes/blocks/navigation.php

@@ -10 +10 @@
  * which will be applied to the navigation markup in the front-end.
  *
- * @param  array $attributes Navigation block attributes.
+ * @param array $attributes Navigation block attributes.
+ *
  * @return array Colors CSS classes and inline styles.
  */
@@ -100 +101 @@
  * which will be applied to the navigation markup in the front-end.
  *
- * @param  array $attributes Navigation block attributes.
+ * @param array $attributes Navigation block attributes.
+ *
  * @return array Font size CSS classes and inline styles.
  */
@@ -133 +135 @@
 }
 
+
+/**
+ * Finds the first non-empty `wp_navigation` Post.
+ *
+ * @return WP_Post|null the first non-empty Navigation or null.
+ */
+function block_core_navigation_get_first_non_empty_navigation() {
+    // Order and orderby args set to mirror those in `wp_get_nav_menus`
+    // see:
+    // - https://github.com/WordPress/wordpress-develop/blob/ba943e113d3b31b121f77a2d30aebe14b047c69d/src/wp-includes/nav-menu.php#L613-L619.
+    // - https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters.
+    $navigation_posts = get_posts(
+        array(
+            'post_type'      => 'wp_navigation',
+            'order'          => 'ASC',
+            'orderby'        => 'name',
+            'posts_per_page' => 1, // only the first post.
+            's'              => '<!-- wp:', // look for block indicators to ensure we only include non-empty Navigations.
+        )
+    );
+    return count( $navigation_posts ) ? $navigation_posts[0] : null;
+
+}
+
+/**
+ * Filter out empty "null" blocks from the block list.
+ * 'parse_blocks' includes a null block with '\n\n' as the content when
+ * it encounters whitespace. This is not a bug but rather how the parser
+ * is designed.
+ *
+ * @param array $parsed_blocks the parsed blocks to be normalized.
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_filter_out_empty_blocks( $parsed_blocks ) {
+    $filtered = array_filter(
+        $parsed_blocks,
+        function( $block ) {
+            return isset( $block['blockName'] );
+        }
+    );
+
+    // Reset keys.
+    return array_values( $filtered );
+}
+
+/**
+ * Retrieves the appropriate fallback to be used on the front of the
+ * site when there is no menu assigned to the Nav block.
+ *
+ * This aims to mirror how the fallback mechanic for wp_nav_menu works.
+ * See https://developer.wordpress.org/reference/functions/wp_nav_menu/#more-information.
+ *
+ * @return array the array of blocks to be used as a fallback.
+ */
+function block_core_navigation_get_fallback_blocks() {
+    $page_list_fallback = array(
+        array(
+            'blockName' => 'core/page-list',
+            'attrs'     => array(
+                '__unstableMaxPages' => 4,
+            ),
+        ),
+    );
+
+    $registry = WP_Block_Type_Registry::get_instance();
+
+    // If `core/page-list` is not registered then return empty blocks.
+    $fallback_blocks = $registry->is_registered( 'core/page-list' ) ? $page_list_fallback : array();
+
+    // Default to a list of Pages.
+
+    $navigation_post = block_core_navigation_get_first_non_empty_navigation();
+
+    // Prefer using the first non-empty Navigation as fallback if available.
+    if ( $navigation_post ) {
+        $maybe_fallback = block_core_navigation_filter_out_empty_blocks( parse_blocks( $navigation_post->post_content ) );
+
+        // Normalizing blocks may result in an empty array of blocks if they were all `null` blocks.
+        // In this case default to the (Page List) fallback.
+        $fallback_blocks = ! empty( $maybe_fallback ) ? $maybe_fallback : $fallback_blocks;
+    }
+
+    /**
+     * Filters the fallback experience for the Navigation block.
+     *
+     * Returning a falsey value will opt out of the fallback and cause the block not to render.
+     * To customise the blocks provided return an array of blocks - these should be valid
+     * children of the `core/navigation` block.
+     *
+     * @param array[] default fallback blocks provided by the default block mechanic.
+     */
+    return apply_filters( 'block_core_navigation_render_fallback', $fallback_blocks );
+}
+
 /**
  * Renders the `core/navigation` block on server.
@@ -143 +239 @@
  */
 function render_block_core_navigation( $attributes, $content, $block ) {
+
+    // Flag used to indicate whether the rendered output is considered to be
+    // a fallback (i.e. the block has no menu associated with it).
+    $is_fallback = false;
+
     /**
      * Deprecated:
@@ -188 +289 @@
         $mapping = get_option( 'wp_navigation_areas', array() );
         if ( ! empty( $mapping[ $area ] ) ) {
-            $attributes['navigationMenuId'] = $mapping[ $area ];
-        }
-    }
-
+            $attributes['ref'] = $mapping[ $area ];
+        }
+    }
+
+    // Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
+    if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
+        $attributes['ref'] = $attributes['navigationMenuId'];
+    }
     // Load inner blocks from the navigation post.
-    if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
-        $navigation_post = get_post( $attributes['navigationMenuId'] );
+    if ( array_key_exists( 'ref', $attributes ) ) {
+        $navigation_post = get_post( $attributes['ref'] );
         if ( ! isset( $navigation_post ) ) {
             return '';
@@ -203 +308 @@
         // 'parse_blocks' includes a null block with '\n\n' as the content when
         // it encounters whitespace. This code strips it.
-        $compacted_blocks = array_filter(
-            $parsed_blocks,
-            function( $block ) {
-                return isset( $block['blockName'] );
-            }
-        );
+        $compacted_blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
 
         // TODO - this uses the full navigation block attributes for the
@@ -215 +315 @@
     }
 
+    // If there are no inner blocks then fallback to rendering an appropriate fallback.
     if ( empty( $inner_blocks ) ) {
-        return '';
+        $is_fallback = true; // indicate we are rendering the fallback.
+
+        $fallback_blocks = block_core_navigation_get_fallback_blocks();
+
+        // Fallback my have been filtered so do basic test for validity.
+        if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
+            return '';
+        }
+
+        $inner_blocks = new WP_Block_List( $fallback_blocks, $attributes );
+
     }
 
@@ -235 +346 @@
         $font_sizes['css_classes'],
         $is_responsive_menu ? array( 'is-responsive' ) : array(),
-        $layout_class ? array( $layout_class ) : array()
+        $layout_class ? array( $layout_class ) : array(),
+        $is_fallback ? array( 'is-fallback' ) : array()
     );
 
@@ -324 +436 @@
  * Register the navigation block.
  *
+ * @throws WP_Error An WP_Error exception parsing the block definition.
  * @uses render_block_core_navigation()
- * @throws WP_Error An WP_Error exception parsing the block definition.
  */
 function register_block_core_navigation() {
@@ -342 +454 @@
  *
  * @param array $parsed_block The block being rendered.
+ *
  * @return array The block being rendered without typographic presets.
  */
@@ -365 +478 @@
         }
     }
+
     return $parsed_block;
 }

trunk/src/wp-includes/blocks/navigation/block.json

@@ -12 +12 @@
     "textdomain": "default",
     "attributes": {
-        "navigationMenuId": {
+        "ref": {
             "type": "number"
         },

trunk/src/wp-includes/blocks/navigation/view.asset.php

@@ -1 @@
-<?php return array('dependencies' => array(), 'version' => '8591fc81d18e61a0f33b213b1fe35e52');
+<?php return array('dependencies' => array(), 'version' => '133b84f32422a9ad94c4533f85fa4e87');

trunk/src/wp-includes/blocks/navigation/view.min.asset.php

@@ -1 @@
-<?php return array('dependencies' => array(), 'version' => '4942262e50480536aae4cd504a13f19c');
+<?php return array('dependencies' => array(), 'version' => 'f3cbbfbf9b9c434c39d6f77037d5267c');

trunk/src/wp-includes/blocks/page-list.php

@@ -294 +294 @@
     $nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
 
+    // Limit the number of items to be visually displayed.
+    if ( ! empty( $attributes['__unstableMaxPages'] ) ) {
+        $nested_pages = array_slice( $nested_pages, 0, $attributes['__unstableMaxPages'] );
+    }
+
     $is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context );
 

trunk/src/wp-includes/blocks/pattern/block.json

@@ -3 +3 @@
     "name": "core/pattern",
     "title": "Pattern",
-    "category": "design",
+    "category": "theme",
     "description": "Show a block pattern.",
     "supports": {

trunk/src/wp-includes/blocks/post-terms/block.json

@@ -3 +3 @@
     "name": "core/post-terms",
     "title": "Post Terms",
-    "category": "design",
+    "category": "theme",
     "description": "Post terms.",
     "textdomain": "default",

trunk/src/wp-includes/blocks/query-title/block.json

@@ -3 +3 @@
     "name": "core/query-title",
     "title": "Query Title",
-    "category": "design",
+    "category": "theme",
     "description": "Display the query title.",
     "textdomain": "default",

trunk/src/wp-includes/blocks/site-logo/block.json

@@ -3 +3 @@
     "name": "core/site-logo",
     "title": "Site Logo",
-    "category": "layout",
+    "category": "theme",
     "description": "Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.",
     "textdomain": "default",

trunk/src/wp-includes/blocks/site-logo/editor-rtl.css

@@ -155 +155 @@
   right: 0;
   border: 1px dashed currentColor;
-  opacity: 0.3;
+  opacity: 0.4;
   pointer-events: none;
   border-radius: inherit;
@@ -195 +195 @@
   stroke: currentColor;
   stroke-dasharray: 3;
-  opacity: 0.3;
+  opacity: 0.4;
 }
 .wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button {

trunk/src/wp-includes/blocks/site-logo/editor-rtl.min.css

@@ -1 @@
-.wp-block[data-align=center]>.wp-block-site-logo{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;left:0;bottom:0;right:0;border:1px dashed;opacity:.3;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.3}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
+.wp-block[data-align=center]>.wp-block-site-logo{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;left:0;bottom:0;right:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}

trunk/src/wp-includes/blocks/site-logo/editor.css

@@ -155 +155 @@
   left: 0;
   border: 1px dashed currentColor;
-  opacity: 0.3;
+  opacity: 0.4;
   pointer-events: none;
   border-radius: inherit;
@@ -195 +195 @@
   stroke: currentColor;
   stroke-dasharray: 3;
-  opacity: 0.3;
+  opacity: 0.4;
 }
 .wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button {

trunk/src/wp-includes/blocks/site-logo/editor.min.css

@@ -1 @@
-.wp-block[data-align=center]>.wp-block-site-logo{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;border:1px dashed;opacity:.3;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;right:0;bottom:0;left:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.3}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
+.wp-block[data-align=center]>.wp-block-site-logo{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;right:0;bottom:0;left:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}

trunk/src/wp-includes/blocks/site-tagline/block.json

@@ -3 +3 @@
     "name": "core/site-tagline",
     "title": "Site Tagline",
-    "category": "design",
+    "category": "theme",
     "description": "Describe in a few words what the website is about. The tagline can be used in search results or when sharing on social networks even if it's not displayed in the theme design.",
     "keywords": [ "description" ],

trunk/src/wp-includes/blocks/site-title/block.json

@@ -3 +3 @@
     "name": "core/site-title",
     "title": "Site Title",
-    "category": "design",
+    "category": "theme",
     "description": "Displays the name of this site. Update the block, and the changes apply everywhere it’s used. This will also appear in the browser title bar and in search results.",
     "textdomain": "default",

trunk/src/wp-includes/blocks/template-part.php

@@ -54 +54 @@
             // Else, if the template part was provided by the active theme,
             // render the corresponding file content.
-            $template_part_file_path = get_theme_file_path( '/block-template-parts/' . $attributes['slug'] . '.html' );
+            $theme_folders           = get_block_theme_folders();
+            $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
             if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
                 $content = file_get_contents( $template_part_file_path );

trunk/src/wp-includes/blocks/template-part/block.json

@@ -30 +30 @@
             "padding": true
         },
-        "__experimentalLayout": true
+        "__experimentalLayout": true,
+        "reusable": false
     },
     "editorStyle": "wp-block-template-part-editor"

trunk/src/wp-includes/class-wp-block-template.php

@@ -79 +79 @@
 
     /**
+     * Origin of the content when the content has been customized.
+     * When customized, origin takes on the value of source and source becomes
+     * 'custom'.
+     *
+     * @since 5.9.0
+     * @var string
+     */
+    public $origin;
+
+    /**
      * Post Id.
      *
@@ -110 +120 @@
      */
     public $is_custom = true;
+
+    /**
+     * Author.
+     *
+     * A value of 0 means no author.
+     *
+     * @since 5.9.0
+     * @var int
+     */
+    public $author;
 }

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -223 +223 @@
      * @since 5.9.0
      *
-     * @param bool  $should_create_cpt  Optional. Whether a new custom post type should be created if none are found.
-     *                                  False by default.
-     * @param array $post_status_filter Filter Optional. custom post type by post status.
-     *                                   ['publish'] by default, so it only fetches published posts.
-     *
+     * @param WP_Theme $theme              The theme object.  If empty, it
+     *                                     defaults to the current theme.
+     * @param bool     $should_create_cpt  Optional. Whether a new custom post
+     *                                     type should be created if none are
+     *                                     found.  False by default.
+     * @param array    $post_status_filter Filter Optional. custom post type by
+     *                                     post status.  ['publish'] by default,
+     *                                     so it only fetches published posts.
      * @return array Custom Post Type for the user's origin config.
      */
-    private static function get_user_data_from_custom_post_type( $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
+    public static function get_user_data_from_custom_post_type( $theme, $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
+        if ( ! $theme instanceof WP_Theme ) {
+            $theme = wp_get_theme();
+        }
         $user_cpt         = array();
         $post_type_filter = 'wp_global_styles';
-        $query            = new WP_Query(
-            array(
-                'posts_per_page' => 1,
-                'orderby'        => 'date',
-                'order'          => 'desc',
-                'post_type'      => $post_type_filter,
-                'post_status'    => $post_status_filter,
-                'tax_query'      => array(
-                    array(
-                        'taxonomy' => 'wp_theme',
-                        'field'    => 'name',
-                        'terms'    => wp_get_theme()->get_stylesheet(),
-                    ),
+        $args             = array(
+            'numberposts' => 1,
+            'orderby'     => 'date',
+            'order'       => 'desc',
+            'post_type'   => $post_type_filter,
+            'post_status' => $post_status_filter,
+            'tax_query'   => array(
+                array(
+                    'taxonomy' => 'wp_theme',
+                    'field'    => 'name',
+                    'terms'    => $theme->get_stylesheet(),
                 ),
-            )
+            ),
         );
 
-        if ( is_array( $query->posts ) && ( 1 === $query->post_count ) ) {
-            $user_cpt = $query->posts[0]->to_array();
+        $cache_key = sprintf( 'wp_global_styles_%s', md5( serialize( $args ) ) );
+        $post_id   = wp_cache_get( $cache_key );
+
+        if ( (int) $post_id > 0 ) {
+            return get_post( $post_id, ARRAY_A );
+        }
+
+        // Special case: '-1' is a results not found.
+        if ( -1 === $post_id && ! $should_create_cpt ) {
+            return $user_cpt;
+        }
+
+        $recent_posts = wp_get_recent_posts( $args );
+        if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) {
+            $user_cpt = $recent_posts[0];
         } elseif ( $should_create_cpt ) {
             $cpt_post_id = wp_insert_post(
@@ -266 +283 @@
                 true
             );
-
-            if ( is_wp_error( $cpt_post_id ) ) {
-                $user_cpt = array();
-            } else {
-                $user_cpt = get_post( $cpt_post_id, ARRAY_A );
-            }
-        }
+            $user_cpt    = get_post( $cpt_post_id, ARRAY_A );
+        }
+        $cache_expiration = $user_cpt ? DAY_IN_SECONDS : HOUR_IN_SECONDS;
+        wp_cache_set( $cache_key, $user_cpt ? $user_cpt['ID'] : -1, '', $cache_expiration );
 
         return $user_cpt;
@@ -290 +304 @@
 
         $config   = array();
-        $user_cpt = self::get_user_data_from_custom_post_type();
+        $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme() );
 
         if ( array_key_exists( 'post_content', $user_cpt ) ) {
@@ -298 +312 @@
             if ( JSON_ERROR_NONE !== $json_decoding_error ) {
                 trigger_error( 'Error when decoding a theme.json schema for user data. ' . json_last_error_msg() );
-                return new WP_Theme_JSON( $config, 'user' );
+                return new WP_Theme_JSON( $config, 'custom' );
             }
 
@@ -312 +326 @@
             }
         }
-        self::$user = new WP_Theme_JSON( $config, 'user' );
+        self::$user = new WP_Theme_JSON( $config, 'custom' );
 
         return self::$user;
@@ -319 +333 @@
     /**
      * There are three sources of data (origins) for a site:
-     * default, theme, and user. The user's has higher priority
-     * than the theme's, and the theme's higher than core's.
+     * default, theme, and custom. The custom's has higher priority
+     * than the theme's, and the theme's higher than default's.
      *
      * Unlike the getters {@link get_core_data},
@@ -337 +351 @@
      *
      * @param string $origin Optional. To what level should we merge data.
-     *                       Valid values are 'theme' or 'user'.
-     *                       Default is 'user'.
+     *                       Valid values are 'theme' or 'custom'.
+     *                       Default is 'custom'.
      * @return WP_Theme_JSON
      */
-    public static function get_merged_data( $origin = 'user' ) {
+    public static function get_merged_data( $origin = 'custom' ) {
         if ( is_array( $origin ) ) {
             _deprecated_argument( __FUNCTION__, '5.9' );
@@ -350 +364 @@
         $result->merge( self::get_theme_data() );
 
-        if ( 'user' === $origin ) {
+        if ( 'custom' === $origin ) {
             $result->merge( self::get_user_data() );
         }
@@ -370 +384 @@
         }
 
-        $user_cpt = self::get_user_data_from_custom_post_type( true );
+        $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme(), true );
 
         if ( array_key_exists( 'ID', $user_cpt ) ) {

trunk/src/wp-includes/class-wp-theme-json.php

@@ -54 +54 @@
         'default',
         'theme',
-        'user',
+        'custom',
     );
 
@@ -76 +76 @@
      *
      * - path       => where to find the preset within the settings section
+     * - override   => whether a theme preset with the same slug as a default preset
+     *                 can override it
      * - value_key  => the key that represents the value
-     * - value_func => the callback to render the value (either value_key or value_func should be present)
+     * - value_func => optionally, instead of value_key, a function to generate
+     *                 the value that takes a preset as an argument
+     *                 (either value_key or value_func should be present)
      * - css_vars   => template string to use in generating the CSS Custom Property.
      *                 Example output: "--wp--preset--duotone--blue: <value>" will generate as many CSS Custom Properties as presets defined
      *                 substituting the $slug for the slug's value for each preset value.
-     * - classes    => array containing a structure with the classes to generate for the presets.
-     *                 Each key is a template string to resolve similarly to the css_vars and each value is the CSS property to use for that class.
-     *                 Example output: ".has-blue-color { color: <value> }"
-     * - properties  => a list of CSS properties to be used by kses to check the preset value is safe.
+     * - classes    => array containing a structure with the classes to
+     *                 generate for the presets, where for each array item
+     *                 the key is the class name and the value the property name.
+     *                 The "$slug" substring will be replaced by the slug of each preset.
+     *                 For example:
+     *                 'classes' => array(
+     *                   '.has-$slug-color'            => 'color',
+     *                   '.has-$slug-background-color' => 'background-color',
+     *                   '.has-$slug-border-color'     => 'border-color',
+     *                 )
+     * - properties => array of CSS properties to be used by kses to
+     *                 validate the content of each preset
+     *                 by means of the remove_insecure_properties method.
      *
      * @since 5.8.0
@@ -93 +106 @@
         array(
             'path'       => array( 'color', 'palette' ),
+            'override'   => false,
             'value_key'  => 'color',
             'css_vars'   => '--wp--preset--color--$slug',
@@ -104 +118 @@
         array(
             'path'       => array( 'color', 'gradients' ),
+            'override'   => false,
             'value_key'  => 'gradient',
             'css_vars'   => '--wp--preset--gradient--$slug',
@@ -111 +126 @@
         array(
             'path'       => array( 'color', 'duotone' ),
+            'override'   => true,
             'value_func' => 'wp_render_duotone_filter_preset',
             'css_vars'   => '--wp--preset--duotone--$slug',
@@ -118 +134 @@
         array(
             'path'       => array( 'typography', 'fontSizes' ),
+            'override'   => true,
             'value_key'  => 'size',
             'css_vars'   => '--wp--preset--font-size--$slug',
@@ -125 +142 @@
         array(
             'path'       => array( 'typography', 'fontFamilies' ),
+            'override'   => true,
             'value_key'  => 'fontFamily',
             'css_vars'   => '--wp--preset--font-family--$slug',
@@ -214 +232 @@
      */
     const VALID_SETTINGS = array(
-        'border'     => array(
+        'appearanceTools' => null,
+        'border'          => array(
             'color'  => null,
             'radius' => null,
@@ -220 +239 @@
             'width'  => null,
         ),
-        'color'      => array(
+        'color'           => array(
             'background'       => null,
             'custom'           => null,
@@ -233 +252 @@
             'text'             => null,
         ),
-        'custom'     => null,
-        'layout'     => array(
+        'custom'          => null,
+        'layout'          => array(
             'contentSize' => null,
             'wideSize'    => null,
         ),
-        'spacing'    => array(
+        'spacing'         => array(
             'blockGap' => null,
             'margin'   => null,
@@ -244 +263 @@
             'units'    => null,
         ),
-        'typography' => array(
+        'typography'      => array(
             'customFontSize' => null,
             'dropCap'        => null,
@@ -298 +317 @@
 
     /**
+     * The valid elements that can be found under styles.
+     *
      * @since 5.8.0
      * @var string[]
@@ -327 +348 @@
      * @param array $theme_json A structure that follows the theme.json schema.
      * @param string $origin    Optional. What source of data this object represents.
-     *                          One of 'default', 'theme', or 'user'. Default 'theme'.
+     *                          One of 'default', 'theme', or 'custom'. Default 'theme'.
      */
     public function __construct( $theme_json = array(), $origin = 'theme' ) {
@@ -337 +358 @@
         $valid_block_names   = array_keys( self::get_blocks_metadata() );
         $valid_element_names = array_keys( self::ELEMENTS );
-        $this->theme_json    = self::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
+        $theme_json          = self::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
+        $this->theme_json    = self::maybe_opt_in_into_settings( $theme_json );
 
         // Internally, presets are keyed by origin.
@@ -346 +368 @@
                 $preset = _wp_array_get( $this->theme_json, $path, null );
                 if ( null !== $preset ) {
-                    if ( 'user' !== $origin || isset( $preset[0] ) ) {
+                    // If the preset is not already keyed by origin.
+                    if ( isset( $preset[0] ) || empty( $preset ) ) {
                         _wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
                     }
@@ -352 +375 @@
             }
         }
+    }
+
+    /**
+     * Enables some opt-in settings if theme declared support.
+     *
+     * @since 5.9.0
+     *
+     * @param array $theme_json A theme.json structure to modify.
+     * @return array The modified theme.json structure.
+     */
+    private static function maybe_opt_in_into_settings( $theme_json ) {
+        $new_theme_json = $theme_json;
+
+        if ( isset( $new_theme_json['settings']['appearanceTools'] ) ) {
+            self::do_opt_in_into_settings( $new_theme_json['settings'] );
+        }
+
+        if ( isset( $new_theme_json['settings']['blocks'] ) && is_array( $new_theme_json['settings']['blocks'] ) ) {
+            foreach ( $new_theme_json['settings']['blocks'] as &$block ) {
+                if ( isset( $block['appearanceTools'] ) ) {
+                    self::do_opt_in_into_settings( $block );
+                }
+            }
+        }
+
+        return $new_theme_json;
+    }
+
+    /**
+     * Enables some settings.
+     *
+     * @since 5.9.0
+     *
+     * @param array $context The context to which the settings belong.
+     */
+    private static function do_opt_in_into_settings( &$context ) {
+        $to_opt_in = array(
+            array( 'border', 'color' ),
+            array( 'border', 'radius' ),
+            array( 'border', 'style' ),
+            array( 'border', 'width' ),
+            array( 'color', 'link' ),
+            array( 'spacing', 'blockGap' ),
+            array( 'spacing', 'margin' ),
+            array( 'spacing', 'padding' ),
+            array( 'typography', 'lineHeight' ),
+        );
+
+        foreach ( $to_opt_in as $path ) {
+            if ( null === _wp_array_get( $context, $path, null ) ) {
+                _wp_array_set( $context, $path, true );
+            }
+        }
+
+        unset( $context['appearanceTools'] );
     }
 
@@ -415 +493 @@
         return $output;
     }
+
     /**
      * Returns the metadata for each block.
@@ -1379 +1458 @@
 
         /*
-         * The array_replace_recursive algorithm merges at the leaf level.
-         * For leaf values that are arrays it will use the numeric indexes for replacement.
-         * In those cases, we want to replace the existing with the incoming value, if it exists.
+         * The array_replace_recursive algorithm merges at the leaf level,
+         * but we don't want leaf arrays to be merged, so we overwrite it.
+         *
+         * For leaf values that are sequential arrays it will use the numeric indexes for replacement.
+         * We rather replace the existing with the incoming value, if it exists.
+         * This is the case of spacing.units.
+         *
+         * For leaf values that are associative arrays it will merge them as expected.
+         * This is also not the behavior we want for the current associative arrays (presets).
+         * We rather replace the existing with the incoming value, if it exists.
+         * This happens, for example, when we merge data from theme.json upon existing
+         * theme supports or when we merge anything coming from the same source twice.
+         * This is the case of color.palette, color.gradients, color.duotone,
+         * typography.fontSizes, or typography.fontFamilies.
+         *
+         * Additionally, for some preset types, we also want to make sure the
+         * values they introduce don't conflict with default values. We do so
+         * by checking the incoming slugs for theme presets and compare them
+         * with the equivalent dfefault presets: if a slug is present as a default
+         * we remove it from the theme presets.
          */
-        $to_replace   = array();
-        $to_replace[] = array( 'spacing', 'units' );
-        foreach ( self::VALID_ORIGINS as $origin ) {
-            $to_replace[] = array( 'color', 'duotone', $origin );
-            $to_replace[] = array( 'color', 'palette', $origin );
-            $to_replace[] = array( 'color', 'gradients', $origin );
-            $to_replace[] = array( 'typography', 'fontSizes', $origin );
-            $to_replace[] = array( 'typography', 'fontFamilies', $origin );
-        }
-
-        $nodes = self::get_setting_nodes( $this->theme_json );
-        foreach ( $nodes as $metadata ) {
-            foreach ( $to_replace as $property_path ) {
-                $path = array_merge( $metadata['path'], $property_path );
-                $node = _wp_array_get( $incoming_data, $path, null );
-                if ( isset( $node ) ) {
-                    _wp_array_set( $this->theme_json, $path, $node );
+        $nodes        = self::get_setting_nodes( $incoming_data );
+        $slugs_global = self::get_slugs_not_to_override( $this->theme_json );
+        foreach ( $nodes as $node ) {
+            $slugs_node = self::get_slugs_not_to_override( $this->theme_json, $node['path'] );
+            $slugs      = array_merge_recursive( $slugs_global, $slugs_node );
+
+            // Replace the spacing.units.
+            $path    = array_merge( $node['path'], array( 'spacing', 'units' ) );
+            $content = _wp_array_get( $incoming_data, $path, null );
+            if ( isset( $content ) ) {
+                _wp_array_set( $this->theme_json, $path, $content );
+            }
+
+            // Replace the presets.
+            foreach ( self::PRESETS_METADATA as $preset ) {
+                foreach ( self::VALID_ORIGINS as $origin ) {
+                    $path    = array_merge( $node['path'], $preset['path'], array( $origin ) );
+                    $content = _wp_array_get( $incoming_data, $path, null );
+                    if ( ! isset( $content ) ) {
+                        continue;
+                    }
+
+                    if (
+                        ( 'theme' !== $origin ) ||
+                        ( 'theme' === $origin && $preset['override'] )
+                    ) {
+                        _wp_array_set( $this->theme_json, $path, $content );
+                    }
+
+                    if ( 'theme' === $origin && ! $preset['override'] ) {
+                        $content = self::filter_slugs( $content, $preset['path'], $slugs );
+                        _wp_array_set( $this->theme_json, $path, $content );
+                    }
                 }
             }
         }
-
+    }
+
+    /**
+     * Returns the slugs for all the presets that cannot be overriden
+     * in the given path. It returns an associative array
+     * whose keys are the preset paths and the leafs is the list of slugs.
+     *
+     * For example:
+     *
+     * array(
+     *   'color' => array(
+     *     'palette'   => array( 'slug-1', 'slug-2' ),
+     *     'gradients' => array( 'slug-3', 'slug-4' ),
+     *   ),
+     * )
+     *
+     * @since 5.9.0
+     *
+     * @param array $data A theme.json like structure to inspect.
+     * @param array $node_path The path to inspect. It's 'settings' by default.
+     *
+     * @return array An associative array containing the slugs for the given path.
+     */
+    private static function get_slugs_not_to_override( $data, $node_path = array( 'settings' ) ) {
+        $slugs = array();
+        foreach ( self::PRESETS_METADATA as $metadata ) {
+            if ( $metadata['override'] ) {
+                continue;
+            }
+
+            $slugs_for_preset = array();
+            $path             = array_merge( $node_path, $metadata['path'], array( 'default' ) );
+            $preset           = _wp_array_get( $data, $path, null );
+            if ( ! isset( $preset ) ) {
+                continue;
+            }
+
+            $slugs_for_preset = array_map(
+                function( $value ) {
+                    return isset( $value['slug'] ) ? $value['slug'] : null;
+                },
+                $preset
+            );
+            _wp_array_set( $slugs, $metadata['path'], $slugs_for_preset );
+        }
+
+        return $slugs;
+    }
+
+    /**
+     * Removes the preset values whose slug is equal to any of given slugs.
+     *
+     * @since 5.9.0
+     *
+     * @param array $node The node with the presets to validate.
+     * @param array $path The path to the preset type to inspect.
+     * @param array $slugs The slugs that should not be overriden.
+     *
+     * @return array The new node
+     */
+    private static function filter_slugs( $node, $path, $slugs ) {
+        $slugs_for_preset = _wp_array_get( $slugs, $path, array() );
+        if ( empty( $slugs_for_preset ) ) {
+            return $node;
+        }
+
+        $new_node = array();
+        foreach ( $node as $value ) {
+            if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs_for_preset, true ) ) {
+                $new_node[] = $value;
+            }
+        }
+
+        return $new_node;
     }
 

trunk/src/wp-includes/global-styles-and-settings.php

@@ -11 +11 @@
  * @since 5.9.0
  *
- * @param array  $path              Path to the specific setting to retrieve. Optional.
- *                                  If empty, will return all settings.
- * @param string $block_name        Which block to retrieve the settings from. Optional
- *                                  If empty, it'll return the settings for the global context.
- * @param string $origin            Which origin to take data from. Optional.
- *                                  It can be 'all' (core, theme, and user) or 'base' (core and theme).
- *                                  If empty or unknown, 'all' is used.
+ * @param array $path    Path to the specific setting to retrieve. Optional.
+ *                       If empty, will return all settings.
+ * @param array $context {
+ *     Metadata to know where to retrieve the $path from. Optional.
+ *
+ *     @type string $block_name Which block to retrieve the settings from.
+ *                              If empty, it'll return the settings for the global context.
+ *     @type string $origin     Which origin to take data from.
+ *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
+ *                              If empty or unknown, 'all' is used.
+ * }
  *
  * @return array The settings to retrieve.
  */
-function wp_get_global_settings( $path = array(), $block_name = '', $origin = 'all' ) {
-    if ( '' !== $block_name ) {
-        $path = array_merge( array( 'blocks', $block_name ), $path );
+function wp_get_global_settings( $path = array(), $context = array() ) {
+    if ( ! empty( $context['block_name'] ) ) {
+        $path = array_merge( array( 'blocks', $context['block_name'] ), $path );
     }
 
-    if ( 'base' === $origin ) {
+    $origin = 'custom';
+    if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
         $origin = 'theme';
-    } else {
-        $origin = 'user';
     }
 
@@ -42 +45 @@
  * @since 5.9.0
  *
- * @param array  $path              Path to the specific style to retrieve. Optional.
- *                                  If empty, will return all styles.
- * @param string $block_name        Which block to retrieve the styles from. Optional.
- *                                  If empty, it'll return the styles for the global context.
- * @param string $origin            Which origin to take data from. Optional.
- *                                  It can be 'all' (core, theme, and user) or 'base' (core and theme).
- *                                  If empty or unknown, 'all' is used.
+ * @param array $path    Path to the specific style to retrieve. Optional.
+ *                       If empty, will return all styles.
+ * @param array $context {
+ *     Metadata to know where to retrieve the $path from. Optional.
+ *
+ *     @type string $block_name Which block to retrieve the styles from.
+ *                              If empty, it'll return the styles for the global context.
+ *     @type string $origin     Which origin to take data from.
+ *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
+ *                              If empty or unknown, 'all' is used.
+ * }
  *
  * @return array The styles to retrieve.
  */
-function wp_get_global_styles( $path = array(), $block_name = '', $origin = 'all' ) {
-    if ( '' !== $block_name ) {
-        $path = array_merge( array( 'blocks', $block_name ), $path );
+function wp_get_global_styles( $path = array(), $context = array() ) {
+    if ( ! empty( $context['block_name'] ) ) {
+        $path = array_merge( array( 'blocks', $context['block_name'] ), $path );
     }
 
-    if ( 'base' === $origin ) {
+    $origin = 'custom';
+    if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
         $origin = 'theme';
-    } else {
-        $origin = 'user';
     }
 
@@ -106 +112 @@
     }
 
-    $origins = array( 'default', 'theme', 'user' );
+    $origins = array( 'default', 'theme', 'custom' );
     if ( ! $supports_theme_json && ! $supports_link_color ) {
         // In this case we only enqueue the core presets (CSS Custom Properties + the classes).

trunk/src/wp-includes/post.php

@@ -385 +385 @@
                 'editor',
                 'revisions',
+                'author',
             ),
         )
@@ -443 +444 @@
                 'editor',
                 'revisions',
+                'author',
             ),
         )

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -233 +233 @@
      */
     public function prepare_item_for_response( $post, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-        $config                           = json_decode( $post->post_content, true );
-        $is_global_styles_user_theme_json = isset( $config['isGlobalStylesUserThemeJSON'] ) && true === $config['isGlobalStylesUserThemeJSON'];
-        $fields                           = $this->get_fields_for_response( $request );
+        $raw_config                       = json_decode( $post->post_content, true );
+        $is_global_styles_user_theme_json = isset( $raw_config['isGlobalStylesUserThemeJSON'] ) && true === $raw_config['isGlobalStylesUserThemeJSON'];
+        $config                           = array();
+        if ( $is_global_styles_user_theme_json ) {
+            $config = ( new WP_Theme_JSON( $raw_config, 'custom' ) )->get_raw_data();
+        }
 
         // Base fields for every post.
-        $data = array();
+        $data   = array();
+        $fields = $this->get_fields_for_response( $request );
 
         if ( rest_is_field_included( 'id', $fields ) ) {

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php

@@ -73 +73 @@
                 'args'   => array(
                     'id' => array(
-                        'description' => __( 'The id of a template' ),
-                        'type'        => 'string',
+                        'description'       => __( 'The id of a template' ),
+                        'type'              => 'string',
+                        'sanitize_callback' => array( $this, '_sanitize_template_id' ),
                     ),
                 ),
@@ -133 +134 @@
 
     /**
+     * Requesting this endpoint for a template like 'twentytwentytwo//home'
+     * requires using a path like /wp/v2/templates/twentytwentytwo//home. There
+     * are special cases when WordPress routing corrects the name to contain
+     * only a single slash like 'twentytwentytwo/home'.
+     *
+     * This method doubles the last slash if it's not already doubled. It relies
+     * on the template ID format {theme_name}//{template_slug} and the fact that
+     * slugs cannot contain slashes.
+     *
+     * @since 5.9.0
+     * @see https://core.trac.wordpress.org/ticket/54507
+     *
+     * @param string $id Template ID.
+     * @return string Sanitized template ID.
+     */
+    public function _sanitize_template_id( $id ) {
+        $last_slash_pos = strrpos( $id, '/' );
+        if ( false === $last_slash_pos ) {
+            return $id;
+        }
+
+        $is_double_slashed = substr( $id, $last_slash_pos - 1, 1 ) === '/';
+        if ( $is_double_slashed ) {
+            return $id;
+        }
+        return (
+            substr( $id, 0, $last_slash_pos )
+            . '/'
+            . substr( $id, $last_slash_pos )
+        );
+    }
+
+    /**
      * Checks if a given request has access to read templates.
      *
@@ -244 +278 @@
 
         $changes = $this->prepare_item_for_database( $request );
+
+        if ( is_wp_error( $changes ) ) {
+            return $changes;
+        }
 
         if ( 'custom' === $template->source ) {
@@ -299 +337 @@
     public function create_item( $request ) {
         $prepared_post            = $this->prepare_item_for_database( $request );
+
+        if ( is_wp_error( $prepared_post ) ) {
+            return $prepared_post;
+        }
+
         $prepared_post->post_name = $request['slug'];
         $post_id                  = wp_insert_post( wp_slash( (array) $prepared_post ), true );
@@ -431 +474 @@
                 'wp_theme' => $template->theme,
             );
+            $changes->meta_input  = array(
+                'origin' => $template->source,
+            );
         } else {
             $changes->post_name   = $template->slug;
@@ -470 +516 @@
         }
 
+        if ( ! empty( $request['author'] ) ) {
+            $post_author = (int) $request['author'];
+
+            if ( get_current_user_id() !== $post_author ) {
+                $user_obj = get_userdata( $post_author );
+
+                if ( ! $user_obj ) {
+                    return new WP_Error(
+                        'rest_invalid_author',
+                        __( 'Invalid author ID.' ),
+                        array( 'status' => 400 )
+                    );
+                }
+            }
+
+            $changes->post_author = $post_author;
+        }
+
         return $changes;
     }
@@ -517 +581 @@
         if ( rest_is_field_included( 'source', $fields ) ) {
             $data['source'] = $template->source;
+        }
+
+        if ( rest_is_field_included( 'origin', $fields ) ) {
+            $data['origin'] = $template->origin;
         }
 
@@ -554 +622 @@
         if ( rest_is_field_included( 'has_theme_file', $fields ) ) {
             $data['has_theme_file'] = (bool) $template->has_theme_file;
+        }
+
+        if ( rest_is_field_included( 'is_custom', $fields ) && 'wp_template' === $template->type ) {
+            $data['is_custom'] = $template->is_custom;
+        }
+
+        if ( rest_is_field_included( 'author', $fields ) ) {
+            $data['author'] = (int) $template->author;
         }
 
@@ -704 +780 @@
                     'readonly'    => true,
                 ),
+                'origin'         => array(
+                    'description' => __( 'Source of a customized template' ),
+                    'type'        => 'string',
+                    'context'     => array( 'embed', 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
                 'content'        => array(
                     'description' => __( 'Content of template.' ),
@@ -767 +849 @@
                     'readonly'    => true,
                 ),
+                'author' => array(
+                    'description' => __( 'The ID for the author of the template.' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
             ),
         );
+
+        if ( 'wp_template' === $this->post_type ) {
+            $schema['properties']['is_custom'] = array(
+                'description' => __( 'Whether a template is a custom template.' ),
+                'type'        => 'bool',
+                'context'     => array( 'embed', 'view', 'edit' ),
+                'readonly'    => true,
+            );
+        }
 
         if ( 'wp_template_part' === $this->post_type ) {

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

@@ -321 +321 @@
             $id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
         } else {
-            $wp_query_args       = array(
-                'post_status'    => 'publish',
-                'post_type'      => 'wp_global_styles',
-                'posts_per_page' => 1,
-                'no_found_rows'  => true,
-                'fields'         => 'ids',
-                'tax_query'      => array(
-                    array(
-                        'taxonomy' => 'wp_theme',
-                        'field'    => 'name',
-                        'terms'    => $theme->get_stylesheet(),
-                    ),
-                ),
-            );
-            $global_styles_query = new WP_Query( $wp_query_args );
-            $id                  = ! empty( $global_styles_query->posts ) ? array_shift( $global_styles_query->posts ) : null;
+            $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type( $theme );
+            $id       = isset( $user_cpt['ID'] ) ? $user_cpt['ID'] : null;
         }
 

trunk/src/wp-includes/theme.json

@@ -2 +2 @@
     "version": 2,
     "settings": {
+        "appearanceTools": false,
         "border": {
             "color": false,
@@ -9 +10 @@
         },
         "color": {
+            "background": true,
             "custom": true,
             "customDuotone": true,
             "customGradient": true,
-            "link": false,
-            "background": true,
-            "text": true,
+            "defaultGradients": true,
+            "defaultPalette": true,
             "duotone": [
                 {
@@ -119 +120 @@
                 }
             ],
+            "link": false,
             "palette": [
                 {
@@ -180 +182 @@
                     "color": "#9b51e0"
                 }
-            ]
+            ],
+            "text": true
         },
         "spacing": {
@@ -191 +194 @@
             "customFontSize": true,
             "dropCap": true,
+            "fontSizes": [
+                {
+                    "name": "Small",
+                    "slug": "small",
+                    "size": "13px"
+                },
+                {
+                    "name": "Normal",
+                    "slug": "normal",
+                    "size": "16px"
+                },
+                {
+                    "name": "Medium",
+                    "slug": "medium",
+                    "size": "20px"
+                },
+                {
+                    "name": "Large",
+                    "slug": "large",
+                    "size": "36px"
+                },
+                {
+                    "name": "Huge",
+                    "slug": "huge",
+                    "size": "42px"
+                }
+            ],
             "fontStyle": true,
             "fontWeight": true,
@@ -196 +226 @@
             "lineHeight": false,
             "textDecoration": true,
-            "textTransform": true,
-            "fontSizes": [
-                {
-                    "name": "Small",
-                    "slug": "small",
-                    "size": "13px"
-                },
-                {
-                    "name": "Normal",
-                    "slug": "normal",
-                    "size": "16px"
-                },
-                {
-                    "name": "Medium",
-                    "slug": "medium",
-                    "size": "20px"
-                },
-                {
-                    "name": "Large",
-                    "slug": "large",
-                    "size": "36px"
-                },
-                {
-                    "name": "Huge",
-                    "slug": "huge",
-                    "size": "42px"
-                }
-            ]
+            "textTransform": true
         },
         "blocks": {

trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php

@@ -54 +54 @@
     }
 
-
     public function test_register_routes() {
         $routes = rest_get_server()->get_routes();
@@ -94 +93 @@
                 'slug'           => 'my_template',
                 'source'         => 'custom',
+                'origin'         => null,
                 'type'           => 'wp_template',
                 'description'    => 'Description of my template.',
@@ -103 +103 @@
                 'wp_id'          => self::$post->ID,
                 'has_theme_file' => false,
+                'is_custom'      => true,
+                'author'         => 0,
             ),
             $this->find_and_normalize_template_by_id( $data, 'default//my_template' )
@@ -135 +137 @@
                 'slug'           => 'my_template',
                 'source'         => 'custom',
+                'origin'         => null,
                 'type'           => 'wp_template',
                 'description'    => 'Description of my template.',
@@ -144 +147 @@
                 'wp_id'          => self::$post->ID,
                 'has_theme_file' => false,
+                'is_custom'      => true,
+                'author'         => 0,
             ),
             $data
+        );
+    }
+
+    /**
+     * @ticket 54507
+     * @dataProvider get_template_endpoint_urls
+     */
+    public function test_get_item_works_with_a_single_slash( $endpoint_url ) {
+        wp_set_current_user( self::$admin_id );
+        $request  = new WP_REST_Request( 'GET', $endpoint_url );
+        $response = rest_get_server()->dispatch( $request );
+
+        $data = $response->get_data();
+        unset( $data['content'] );
+        unset( $data['_links'] );
+
+        $this->assertSame(
+            array(
+                'id'             => 'default//my_template',
+                'theme'          => 'default',
+                'slug'           => 'my_template',
+                'source'         => 'custom',
+                'origin'         => null,
+                'type'           => 'wp_template',
+                'description'    => 'Description of my template.',
+                'title'          => array(
+                    'raw'      => 'My Template',
+                    'rendered' => 'My Template',
+                ),
+                'status'         => 'publish',
+                'wp_id'          => self::$post->ID,
+                'has_theme_file' => false,
+                'is_custom'      => true,
+                'author'         => 0,
+            ),
+            $data
+        );
+    }
+
+    public function get_template_endpoint_urls() {
+        return array(
+            array( '/wp/v2/templates/default/my_template' ),
+            array( '/wp/v2/templates/default//my_template' ),
+        );
+    }
+
+    /**
+     * @ticket 54507
+     * @dataProvider get_template_ids_to_sanitize
+     */
+    public function test_sanitize_template_id( $input_id, $sanitized_id ) {
+        $endpoint = new WP_REST_Templates_Controller( 'wp_template' );
+        $this->assertEquals(
+            $sanitized_id,
+            $endpoint->_sanitize_template_id( $input_id )
+        );
+    }
+
+    public function get_template_ids_to_sanitize() {
+        return array(
+            array( 'tt1-blocks/index', 'tt1-blocks//index' ),
+            array( 'tt1-blocks//index', 'tt1-blocks//index' ),
+
+            array( 'theme-experiments/tt1-blocks/index', 'theme-experiments/tt1-blocks//index' ),
+            array( 'theme-experiments/tt1-blocks//index', 'theme-experiments/tt1-blocks//index' ),
         );
     }
@@ -162 +232 @@
                 'title'       => 'My Template',
                 'content'     => 'Content',
+                'author'      => self::$admin_id,
             )
         );
@@ -178 +249 @@
                 'slug'           => 'my_custom_template',
                 'source'         => 'custom',
+                'origin'         => null,
                 'type'           => 'wp_template',
                 'description'    => 'Just a description',
@@ -186 +258 @@
                 'status'         => 'publish',
                 'has_theme_file' => false,
+                'is_custom'      => true,
+                'author'         => self::$admin_id,
             ),
             $data
@@ -208 +282 @@
                     'raw' => 'Content',
                 ),
+                'author'      => self::$admin_id,
             )
         );
@@ -224 +299 @@
                 'slug'           => 'my_custom_template_raw',
                 'source'         => 'custom',
+                'origin'         => null,
                 'type'           => 'wp_template',
                 'description'    => 'Just a description',
@@ -232 +308 @@
                 'status'         => 'publish',
                 'has_theme_file' => false,
+                'is_custom'      => true,
+                'author'         => self::$admin_id,
             ),
             $data
         );
+    }
+
+    public function test_create_item_invalid_author() {
+        wp_set_current_user( self::$admin_id );
+        $request = new WP_REST_Request( 'POST', '/wp/v2/templates' );
+        $request->set_body_params(
+            array(
+                'slug'        => 'my_custom_template_invalid_author',
+                'description' => 'Just a description',
+                'title'       => 'My Template',
+                'content'     => 'Content',
+                'author'      => -1,
+            )
+        );
+        $response = rest_get_server()->dispatch( $request );
+        $this->assertErrorResponse( 'rest_invalid_author', $response, 400 );
     }
 
@@ -371 +465 @@
         $data       = $response->get_data();
         $properties = $data['schema']['properties'];
-        $this->assertCount( 11, $properties );
+        $this->assertCount( 14, $properties );
         $this->assertArrayHasKey( 'id', $properties );
         $this->assertArrayHasKey( 'description', $properties );
@@ -378 +472 @@
         $this->assertArrayHasKey( 'type', $properties );
         $this->assertArrayHasKey( 'source', $properties );
+        $this->assertArrayHasKey( 'origin', $properties );
         $this->assertArrayHasKey( 'content', $properties );
         $this->assertArrayHasKey( 'title', $properties );
@@ -384 +479 @@
         $this->assertArrayHasKey( 'wp_id', $properties );
         $this->assertArrayHasKey( 'has_theme_file', $properties );
+        $this->assertArrayHasKey( 'is_custom', $properties );
+        $this->assertArrayHasKey( 'author', $properties );
     }
 

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -201 +201 @@
     }
 
+    function test_get_settings_using_opt_in_key() {
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'appearanceTools' => true,
+                    'blocks'          => array(
+                        'core/paragraph' => array(
+                            'typography' => array(
+                                'lineHeight' => false,
+                            ),
+                        ),
+                        'core/group'     => array(
+                            'appearanceTools' => true,
+                            'typography'      => array(
+                                'lineHeight' => false, // This should override appearanceTools.
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $actual   = $theme_json->get_settings();
+        $expected = array(
+            'border'     => array(
+                'width'  => true,
+                'style'  => true,
+                'radius' => true,
+                'color'  => true,
+            ),
+            'color'      => array(
+                'link' => true,
+            ),
+            'spacing'    => array(
+                'blockGap' => true,
+                'margin'   => true,
+                'padding'  => true,
+            ),
+            'typography' => array(
+                'lineHeight' => true,
+            ),
+            'blocks'     => array(
+                'core/paragraph' => array(
+                    'typography' => array(
+                        'lineHeight' => false,
+                    ),
+                ),
+                'core/group'     => array(
+                    'border'     => array(
+                        'width'  => true,
+                        'style'  => true,
+                        'radius' => true,
+                        'color'  => true,
+                    ),
+                    'color'      => array(
+                        'link' => true,
+                    ),
+                    'spacing'    => array(
+                        'blockGap' => true,
+                        'margin'   => true,
+                        'padding'  => true,
+                    ),
+                    'typography' => array(
+                        'lineHeight' => false,
+                    ),
+                ),
+            ),
+        );
+
+        $this->assertEqualSetsWithIndex( $expected, $actual );
+    }
+
     /**
      * @ticket 54336
@@ -1061 +1134 @@
     }
 
+    public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_default_presets() {
+        $defaults = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'color'  => array(
+                        'palette' => array(
+                            array(
+                                'slug'  => 'red',
+                                'color' => 'red',
+                                'name'  => 'Red',
+                            ),
+                            array(
+                                'slug'  => 'green',
+                                'color' => 'green',
+                                'name'  => 'Green',
+                            ),
+                        ),
+                    ),
+                    'blocks' => array(
+                        'core/paragraph' => array(
+                            'color' => array(
+                                'palette' => array(
+                                    array(
+                                        'slug'  => 'blue',
+                                        'color' => 'blue',
+                                        'name'  => 'Blue',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            'default'
+        );
+        $theme    = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'color'  => array(
+                        'palette' => array(
+                            array(
+                                'slug'  => 'pink',
+                                'color' => 'pink',
+                                'name'  => 'Pink',
+                            ),
+                            array(
+                                'slug'  => 'green',
+                                'color' => 'green',
+                                'name'  => 'Greenish',
+                            ),
+                        ),
+                    ),
+                    'blocks' => array(
+                        'core/paragraph' => array(
+                            'color' => array(
+                                'palette' => array(
+                                    array(
+                                        'slug'  => 'blue',
+                                        'color' => 'blue',
+                                        'name'  => 'Bluish',
+                                    ),
+                                    array(
+                                        'slug'  => 'yellow',
+                                        'color' => 'yellow',
+                                        'name'  => 'Yellow',
+                                    ),
+                                    array(
+                                        'slug'  => 'green',
+                                        'color' => 'green',
+                                        'name'  => 'Block Green',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $expected = array(
+            'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+            'settings' => array(
+                'color'  => array(
+                    'palette' => array(
+                        'default' => array(
+                            array(
+                                'slug'  => 'red',
+                                'color' => 'red',
+                                'name'  => 'Red',
+                            ),
+                            array(
+                                'slug'  => 'green',
+                                'color' => 'green',
+                                'name'  => 'Green',
+                            ),
+                        ),
+                        'theme'   => array(
+                            array(
+                                'slug'  => 'pink',
+                                'color' => 'pink',
+                                'name'  => 'Pink',
+                            ),
+                        ),
+                    ),
+                ),
+                'blocks' => array(
+                    'core/paragraph' => array(
+                        'color' => array(
+                            'palette' => array(
+                                'default' => array(
+                                    array(
+                                        'slug'  => 'blue',
+                                        'color' => 'blue',
+                                        'name'  => 'Blue',
+                                    ),
+                                ),
+                                'theme'   => array(
+                                    array(
+                                        'slug'  => 'yellow',
+                                        'color' => 'yellow',
+                                        'name'  => 'Yellow',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+
+        $defaults->merge( $theme );
+        $actual = $defaults->get_raw_data();
+
+        $this->assertEqualSetsWithIndex( $expected, $actual );
+    }
+
     /**
      * @ticket 54336
@@ -1299 +1510 @@
                         'custom'  => true,
                         'palette' => array(
-                            'user' => array(
+                            'custom' => array(
                                 array(
                                     'name'  => 'Red',
@@ -1326 +1537 @@
                                 'custom'  => true,
                                 'palette' => array(
-                                    'user' => array(
+                                    'custom' => array(
                                         array(
                                             'name'  => 'Yellow',
@@ -1359 +1570 @@
                 'color'  => array(
                     'palette' => array(
-                        'user' => array(
+                        'custom' => array(
                             array(
                                 'name'  => 'Red',
@@ -1382 +1593 @@
                         'color' => array(
                             'palette' => array(
-                                'user' => array(
+                                'custom' => array(
                                     array(
                                         'name'  => 'Yellow',
@@ -1418 +1629 @@
                     'color'      => array(
                         'palette' => array(
-                            'user' => array(
+                            'custom' => array(
                                 array(
                                     'name'  => 'Red/><b>ok</ok>',
@@ -1444 +1655 @@
                     'typography' => array(
                         'fontFamilies' => array(
-                            'user' => array(
+                            'custom' => array(
                                 array(
                                     'name'       => 'Helvetica Arial/><b>test</b>',
@@ -1472 +1683 @@
                             'color' => array(
                                 'palette' => array(
-                                    'user' => array(
+                                    'custom' => array(
                                         array(
                                             'name'  => 'Red/><b>ok</ok>',
@@ -1507 +1718 @@
                 'color'      => array(
                     'palette' => array(
-                        'user' => array(
+                        'custom' => array(
                             array(
                                 'name'  => 'Pink',
@@ -1518 +1729 @@
                 'typography' => array(
                     'fontFamilies' => array(
-                        'user' => array(
+                        'custom' => array(
                             array(
                                 'name'       => 'Cambria',
@@ -1531 +1742 @@
                         'color' => array(
                             'palette' => array(
-                                'user' => array(
+                                'custom' => array(
                                     array(
                                         'name'  => 'Pink',

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -25 +25 @@
         add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
         add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+        $this->queries = array();
         // Clear caches.
         wp_clean_themes_cache();
@@ -43 +44 @@
     public function filter_set_locale_to_polish() {
         return 'pl_PL';
+    }
+
+    function filter_db_query( $query ) {
+        if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) {
+            $this->queries[] = $query;
+        }
+        return $query;
     }
 
@@ -313 +321 @@
         );
     }
+
+    function test_get_user_data_from_custom_post_type_does_not_use_uncached_queries() {
+        add_filter( 'query', array( $this, 'filter_db_query' ) );
+        $query_count = count( $this->queries );
+        for ( $i = 0; $i < 3; $i++ ) {
+            WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type( wp_get_theme() );
+            WP_Theme_JSON_Resolver::clean_cached_data();
+        }
+        $query_count = count( $this->queries ) - $query_count;
+        $this->assertEquals( 1, $query_count, 'Only one SQL query should be peformed for multiple invocations of WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type()' );
+
+        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type( wp_get_theme() );
+        $this->assertEmpty( $user_cpt );
+
+        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type( wp_get_theme(), true );
+        $this->assertNotEmpty( $user_cpt );
+
+        $query_count = count( $this->queries );
+        for ( $i = 0; $i < 3; $i++ ) {
+            WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type( wp_get_theme() );
+            WP_Theme_JSON_Resolver::clean_cached_data();
+        }
+        $query_count = count( $this->queries ) - $query_count;
+        $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
+        remove_filter( 'query', array( $this, 'filter_db_query' ) );
+    }
 }

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -5118 +5118 @@
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
@@ -5263 +5268 @@
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
@@ -5572 +5582 @@
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
@@ -5751 +5766 @@
                             "required": false
                         },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
+                        },
                         "area": {
                             "description": "Where the template part is intended for use (header, footer, etc.)",
@@ -5901 +5921 @@
                             "required": false
                         },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
+                        },
                         "area": {
                             "description": "Where the template part is intended for use (header, footer, etc.)",
@@ -6213 +6238 @@
                                 "private"
                             ],
+                            "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
                             "required": false
                         },