From 05d00b871e16911732fc5f1d675744a2273c0374 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 16:22:16 +1100
Subject: [PATCH 01/32] Update @wordpress packages

---
 package-lock.json                             | 268 +++++++++---------
 package.json                                  |  34 +--
 .../assets/script-loader-packages.php         |   2 +-
 src/wp-includes/blocks/calendar.php           |   4 +-
 src/wp-includes/blocks/navigation.php         | 142 +++++++++-
 src/wp-includes/blocks/navigation/block.json  |   2 +-
 .../blocks/navigation/view.asset.php          |   2 +-
 .../blocks/navigation/view.min.asset.php      |   2 +-
 src/wp-includes/blocks/page-list.php          |   5 +
 src/wp-includes/blocks/pattern/block.json     |   2 +-
 src/wp-includes/blocks/post-terms/block.json  |   2 +-
 src/wp-includes/blocks/query-title/block.json |   2 +-
 src/wp-includes/blocks/site-logo/block.json   |   2 +-
 .../blocks/site-logo/editor-rtl.css           |   4 +-
 .../blocks/site-logo/editor-rtl.min.css       |   2 +-
 src/wp-includes/blocks/site-logo/editor.css   |   4 +-
 .../blocks/site-logo/editor.min.css           |   2 +-
 .../blocks/site-tagline/block.json            |   2 +-
 src/wp-includes/blocks/site-title/block.json  |   2 +-
 src/wp-includes/blocks/template-part.php      |   3 +-
 .../blocks/template-part/block.json           |   3 +-
 21 files changed, 307 insertions(+), 184 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 25c2a9e25e10..2ed04bc573d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1452,9 +1452,9 @@
 			"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
 		},
 		"@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",
 				"@emotion/cache": "^11.6.0",
@@ -2258,23 +2258,23 @@
 			"dev": true
 		},
 		"@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",
 				"@react-spring/types": "~9.3.0"
 			}
 		},
 		"@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",
 				"@react-spring/shared": "~9.3.0",
@@ -2282,28 +2282,28 @@
 			}
 		},
 		"@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",
 				"@react-spring/types": "~9.3.0"
 			}
 		},
 		"@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",
 				"@react-spring/core": "~9.3.0",
@@ -3529,21 +3529,21 @@
 			}
 		},
 		"@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",
 				"@wordpress/html-entities": "^3.2.3",
@@ -3556,9 +3556,9 @@
 			}
 		},
 		"@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",
 				"@react-spring/web": "^9.2.4",
@@ -3567,7 +3567,7 @@
 				"@wordpress/blob": "^3.2.2",
 				"@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",
 				"@wordpress/deprecated": "^3.2.3",
@@ -3603,20 +3603,20 @@
 			}
 		},
 		"@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",
 				"@wordpress/a11y": "^3.2.4",
 				"@wordpress/api-fetch": "^5.2.6",
 				"@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",
 				"@wordpress/deprecated": "^3.2.3",
@@ -3627,14 +3627,14 @@
 				"@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/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",
 				"classnames": "^2.3.1",
@@ -3689,9 +3689,9 @@
 			"dev": true
 		},
 		"@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",
 				"@emotion/cache": "^11.4.0",
@@ -3755,9 +3755,9 @@
 			}
 		},
 		"@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",
 				"@wordpress/api-fetch": "^5.2.6",
@@ -3785,30 +3785,30 @@
 			}
 		},
 		"@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",
 				"@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/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"
 			}
@@ -3937,27 +3937,27 @@
 			}
 		},
 		"@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",
 				"@wordpress/media-utils": "^3.0.5",
@@ -3982,35 +3982,37 @@
 			}
 		},
 		"@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",
 				"@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/keyboard-shortcuts": "^3.0.6",
 				"@wordpress/keycodes": "^3.2.4",
 				"@wordpress/media-utils": "^3.0.5",
 				"@wordpress/notices": "^3.2.7",
 				"@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",
 				"file-saver": "^2.0.2",
@@ -4020,35 +4022,35 @@
 			}
 		},
 		"@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",
 				"@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",
 				"@wordpress/media-utils": "^3.0.5",
 				"@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",
 				"rememo": "^3.0.0",
@@ -4056,20 +4058,20 @@
 			}
 		},
 		"@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",
 				"@wordpress/a11y": "^3.2.4",
 				"@wordpress/api-fetch": "^5.2.6",
 				"@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",
 				"@wordpress/date": "^4.2.3",
@@ -4084,9 +4086,9 @@
 				"@wordpress/keycodes": "^3.2.4",
 				"@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",
 				"classnames": "^2.3.1",
@@ -4173,14 +4175,14 @@
 			}
 		},
 		"@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",
 				"@wordpress/dom": "^3.2.7",
@@ -4235,13 +4237,13 @@
 			}
 		},
 		"@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",
 				"@wordpress/deprecated": "^3.2.3",
@@ -4339,13 +4341,13 @@
 			}
 		},
 		"@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",
 				"@wordpress/i18n": "^4.2.4",
@@ -4383,12 +4385,12 @@
 			"dev": true
 		},
 		"@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",
 				"@wordpress/deprecated": "^3.2.3",
@@ -4513,15 +4515,15 @@
 			}
 		},
 		"@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==",
+			"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.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",
 				"@wordpress/i18n": "^4.2.4",
@@ -5485,14 +5487,14 @@
 			}
 		},
 		"@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",
 				"@wordpress/deprecated": "^3.2.3",
@@ -5558,17 +5560,17 @@
 			"integrity": "sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA=="
 		},
 		"@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",
 				"@wordpress/i18n": "^4.2.4",
@@ -18301,9 +18303,9 @@
 			}
 		},
 		"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": {
 			"version": "4.0.1",
diff --git a/package.json b/package.json
index 25363b1af3fd..cd8e86ae79c8 100644
--- a/package.json
+++ b/package.json
@@ -82,53 +82,53 @@
 		"@wordpress/api-fetch": "5.2.6",
 		"@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",
 		"@wordpress/date": "4.2.3",
 		"@wordpress/deprecated": "3.2.3",
 		"@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",
 		"@wordpress/url": "3.3.1",
 		"@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",
 		"clipboard": "2.0.8",
diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php
index 6b69e9db2000..02808b547ccc 100644
--- a/src/wp-includes/assets/script-loader-packages.php
+++ b/src/wp-includes/assets/script-loader-packages.php
@@ -1 +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'));
\ No newline at end of file
+<?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'));
\ No newline at end of file
diff --git a/src/wp-includes/blocks/calendar.php b/src/wp-includes/blocks/calendar.php
index c6ba095a926d..3e0e48c65b28 100644
--- a/src/wp-includes/blocks/calendar.php
+++ b/src/wp-includes/blocks/calendar.php
@@ -85,7 +85,7 @@ function block_core_calendar_has_published_posts() {
 	}
 
 	// 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;
 	}
@@ -103,7 +103,7 @@ function block_core_calendar_has_published_posts() {
 function block_core_calendar_update_has_published_posts() {
 	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;
 }
 
diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php
index e3848190c6e7..bfd63c3f2c0b 100644
--- a/src/wp-includes/blocks/navigation.php
+++ b/src/wp-includes/blocks/navigation.php
@@ -9,7 +9,8 @@
  * Build an array with CSS classes and inline styles defining the colors
  * 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.
  */
 function block_core_navigation_build_css_colors( $attributes ) {
@@ -99,7 +100,8 @@ function block_core_navigation_build_css_colors( $attributes ) {
  * Build an array with CSS classes and inline styles defining the font sizes
  * 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.
  */
 function block_core_navigation_build_css_font_sizes( $attributes ) {
@@ -132,6 +134,100 @@ function block_core_navigation_render_submenu_icon() {
 	return '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
 }
 
+
+/**
+ * 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.
  *
@@ -142,6 +238,11 @@ function block_core_navigation_render_submenu_icon() {
  * @return string Returns the post content with the legacy widget added.
  */
 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:
 	 * The rgbTextColor and rgbBackgroundColor attributes
@@ -187,13 +288,17 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		$area    = $block->context['navigationArea'];
 		$mapping = get_option( 'wp_navigation_areas', array() );
 		if ( ! empty( $mapping[ $area ] ) ) {
-			$attributes['navigationMenuId'] = $mapping[ $area ];
+			$attributes['ref'] = $mapping[ $area ];
 		}
 	}
 
-	// Load inner blocks from the navigation post.
+	// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
 	if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
-		$navigation_post = get_post( $attributes['navigationMenuId'] );
+		$attributes['ref'] = $attributes['navigationMenuId'];
+	}
+	// Load inner blocks from the navigation post.
+	if ( array_key_exists( 'ref', $attributes ) ) {
+		$navigation_post = get_post( $attributes['ref'] );
 		if ( ! isset( $navigation_post ) ) {
 			return '';
 		}
@@ -202,20 +307,26 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 
 		// '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
 		// context which could be refined.
 		$inner_blocks = new WP_Block_List( $compacted_blocks, $attributes );
 	}
 
+	// 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 );
+
 	}
 
 	// Restore legacy classnames for submenu positioning.
@@ -234,7 +345,8 @@ function( $block ) {
 		$colors['css_classes'],
 		$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()
 	);
 
 	$inner_blocks_html = '';
@@ -323,8 +435,8 @@ function( $block ) {
 /**
  * Register the navigation block.
  *
- * @uses render_block_core_navigation()
  * @throws WP_Error An WP_Error exception parsing the block definition.
+ * @uses render_block_core_navigation()
  */
 function register_block_core_navigation() {
 	register_block_type_from_metadata(
@@ -341,6 +453,7 @@ function register_block_core_navigation() {
  * Filter that changes the parsed attribute values of navigation blocks contain typographic presets to contain the values directly.
  *
  * @param array $parsed_block The block being rendered.
+ *
  * @return array The block being rendered without typographic presets.
  */
 function block_core_navigation_typographic_presets_backcompatibility( $parsed_block ) {
@@ -364,6 +477,7 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
 			}
 		}
 	}
+
 	return $parsed_block;
 }
 
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index f4a574b2f924..6b7dd32a05e8 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -11,7 +11,7 @@
 	],
 	"textdomain": "default",
 	"attributes": {
-		"navigationMenuId": {
+		"ref": {
 			"type": "number"
 		},
 		"textColor": {
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index 5e1b5bbc918f..5f73c8a9b82e 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '8591fc81d18e61a0f33b213b1fe35e52');
\ No newline at end of file
+<?php return array('dependencies' => array(), 'version' => '133b84f32422a9ad94c4533f85fa4e87');
\ No newline at end of file
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index c34bdccb16b7..ff2c40bc122d 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '4942262e50480536aae4cd504a13f19c');
\ No newline at end of file
+<?php return array('dependencies' => array(), 'version' => 'f3cbbfbf9b9c434c39d6f77037d5267c');
\ No newline at end of file
diff --git a/src/wp-includes/blocks/page-list.php b/src/wp-includes/blocks/page-list.php
index 53dec1f1957e..8336135e1afe 100644
--- a/src/wp-includes/blocks/page-list.php
+++ b/src/wp-includes/blocks/page-list.php
@@ -293,6 +293,11 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 
 	$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 );
 
 	$open_submenus_on_click = array_key_exists( 'openSubmenusOnClick', $block->context ) ? $block->context['openSubmenusOnClick'] : false;
diff --git a/src/wp-includes/blocks/pattern/block.json b/src/wp-includes/blocks/pattern/block.json
index 78423e8d4912..c0c27cd8212d 100644
--- a/src/wp-includes/blocks/pattern/block.json
+++ b/src/wp-includes/blocks/pattern/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"name": "core/pattern",
 	"title": "Pattern",
-	"category": "design",
+	"category": "theme",
 	"description": "Show a block pattern.",
 	"supports": {
 		"html": false,
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 08820d0c5526..04a46942f481 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"name": "core/post-terms",
 	"title": "Post Terms",
-	"category": "design",
+	"category": "theme",
 	"description": "Post terms.",
 	"textdomain": "default",
 	"attributes": {
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 04190056c787..5f737d57497d 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"name": "core/query-title",
 	"title": "Query Title",
-	"category": "design",
+	"category": "theme",
 	"description": "Display the query title.",
 	"textdomain": "default",
 	"attributes": {
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index 2bbe4dd29ccb..e603c6149a41 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"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",
 	"attributes": {
diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.css b/src/wp-includes/blocks/site-logo/editor-rtl.css
index d1961a328b53..28c93091baf3 100644
--- a/src/wp-includes/blocks/site-logo/editor-rtl.css
+++ b/src/wp-includes/blocks/site-logo/editor-rtl.css
@@ -154,7 +154,7 @@
   bottom: 0;
   right: 0;
   border: 1px dashed currentColor;
-  opacity: 0.3;
+  opacity: 0.4;
   pointer-events: none;
   border-radius: inherit;
 }
@@ -194,7 +194,7 @@
   height: 100%;
   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 {
   background: var(--wp-admin-theme-color);
diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.min.css b/src/wp-includes/blocks/site-logo/editor-rtl.min.css
index 2e18b2b6d411..533e9320cc82 100644
--- a/src/wp-includes/blocks/site-logo/editor-rtl.min.css
+++ b/src/wp-includes/blocks/site-logo/editor-rtl.min.css
@@ -1 +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}
\ No newline at end of file
+.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}
\ No newline at end of file
diff --git a/src/wp-includes/blocks/site-logo/editor.css b/src/wp-includes/blocks/site-logo/editor.css
index cc26076aa356..95aae48ae32a 100644
--- a/src/wp-includes/blocks/site-logo/editor.css
+++ b/src/wp-includes/blocks/site-logo/editor.css
@@ -154,7 +154,7 @@
   bottom: 0;
   left: 0;
   border: 1px dashed currentColor;
-  opacity: 0.3;
+  opacity: 0.4;
   pointer-events: none;
   border-radius: inherit;
 }
@@ -194,7 +194,7 @@
   height: 100%;
   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 {
   background: var(--wp-admin-theme-color);
diff --git a/src/wp-includes/blocks/site-logo/editor.min.css b/src/wp-includes/blocks/site-logo/editor.min.css
index 80a820e5ef51..faf1d1f84f5c 100644
--- a/src/wp-includes/blocks/site-logo/editor.min.css
+++ b/src/wp-includes/blocks/site-logo/editor.min.css
@@ -1 +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}
\ No newline at end of file
+.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}
\ No newline at end of file
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
index b048b873ef14..61428975ed87 100644
--- a/src/wp-includes/blocks/site-tagline/block.json
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"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" ],
 	"textdomain": "default",
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
index a16d1c9f3b64..7030ed68cf6e 100644
--- a/src/wp-includes/blocks/site-title/block.json
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -2,7 +2,7 @@
 	"apiVersion": 2,
 	"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",
 	"attributes": {
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index 9f28002b3257..fe16679a1f31 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -53,7 +53,8 @@ function render_block_core_template_part( $attributes ) {
 		} else {
 			// 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 );
 				$content = is_string( $content ) && '' !== $content
diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json
index 7e85b0f6aa8b..647dcdd6f14f 100644
--- a/src/wp-includes/blocks/template-part/block.json
+++ b/src/wp-includes/blocks/template-part/block.json
@@ -29,7 +29,8 @@
 		"spacing": {
 			"padding": true
 		},
-		"__experimentalLayout": true
+		"__experimentalLayout": true,
+		"reusable": false
 	},
 	"editorStyle": "wp-block-template-part-editor"
 }

From 937bbc647a70c815df7808a87b4c527b9fe7abed Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:02:37 +1100
Subject: [PATCH 02/32] Changes from lib/class-wp-theme-json-gutenberg.php

---
 src/wp-includes/class-wp-theme-json.php | 227 +++++++++++++++++++++---
 1 file changed, 199 insertions(+), 28 deletions(-)

diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index 455eca675c6b..a1f2b874d97a 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -53,7 +53,7 @@ class WP_Theme_JSON {
 	const VALID_ORIGINS = array(
 		'default',
 		'theme',
-		'user',
+		'custom',
 	);
 
 	/**
@@ -75,6 +75,8 @@ class WP_Theme_JSON {
 	 * This contains the necessary metadata to process them:
 	 *
 	 * - 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)
 	 * - css_vars   => template string to use in generating the CSS Custom Property.
@@ -92,6 +94,7 @@ class WP_Theme_JSON {
 	const PRESETS_METADATA = array(
 		array(
 			'path'       => array( 'color', 'palette' ),
+			'override'   => false,
 			'value_key'  => 'color',
 			'css_vars'   => '--wp--preset--color--$slug',
 			'classes'    => array(
@@ -103,6 +106,7 @@ class WP_Theme_JSON {
 		),
 		array(
 			'path'       => array( 'color', 'gradients' ),
+			'override'   => false,
 			'value_key'  => 'gradient',
 			'css_vars'   => '--wp--preset--gradient--$slug',
 			'classes'    => array( '.has-$slug-gradient-background' => 'background' ),
@@ -110,6 +114,7 @@ class WP_Theme_JSON {
 		),
 		array(
 			'path'       => array( 'color', 'duotone' ),
+			'override'   => true,
 			'value_func' => 'wp_render_duotone_filter_preset',
 			'css_vars'   => '--wp--preset--duotone--$slug',
 			'classes'    => array(),
@@ -117,6 +122,7 @@ class WP_Theme_JSON {
 		),
 		array(
 			'path'       => array( 'typography', 'fontSizes' ),
+			'override'   => true,
 			'value_key'  => 'size',
 			'css_vars'   => '--wp--preset--font-size--$slug',
 			'classes'    => array( '.has-$slug-font-size' => 'font-size' ),
@@ -124,6 +130,7 @@ class WP_Theme_JSON {
 		),
 		array(
 			'path'       => array( 'typography', 'fontFamilies' ),
+			'override'   => true,
 			'value_key'  => 'fontFamily',
 			'css_vars'   => '--wp--preset--font-family--$slug',
 			'classes'    => array( '.has-$slug-font-family' => 'font-family' ),
@@ -213,13 +220,14 @@ class WP_Theme_JSON {
 	 * @var array
 	 */
 	const VALID_SETTINGS = array(
-		'border'     => array(
+		'appearanceTools' => null,
+		'border'          => array(
 			'color'  => null,
 			'radius' => null,
 			'style'  => null,
 			'width'  => null,
 		),
-		'color'      => array(
+		'color'           => array(
 			'background'       => null,
 			'custom'           => null,
 			'customDuotone'    => null,
@@ -232,18 +240,18 @@ class WP_Theme_JSON {
 			'palette'          => null,
 			'text'             => null,
 		),
-		'custom'     => null,
-		'layout'     => array(
+		'custom'          => null,
+		'layout'          => array(
 			'contentSize' => null,
 			'wideSize'    => null,
 		),
-		'spacing'    => array(
+		'spacing'         => array(
 			'blockGap' => null,
 			'margin'   => null,
 			'padding'  => null,
 			'units'    => null,
 		),
-		'typography' => array(
+		'typography'      => array(
 			'customFontSize' => null,
 			'dropCap'        => null,
 			'fontFamilies'   => null,
@@ -326,7 +334,7 @@ class WP_Theme_JSON {
 	 *
 	 * @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' ) {
 		if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
@@ -345,7 +353,8 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
 				$path   = array_merge( $node['path'], $preset_metadata['path'] );
 				$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 ) );
 					}
 				}
@@ -353,6 +362,61 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
 		}
 	}
 
+	/**
+	 * 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'] );
+	}
+
 	/**
 	 * Sanitizes the input according to the schemas.
 	 *
@@ -1378,31 +1442,137 @@ public function merge( $incoming ) {
 		$this->theme_json = array_replace_recursive( $this->theme_json, $incoming_data );
 
 		/*
-		 * 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( $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 );
+			}
 
-		$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 );
+			// 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;
 	}
 
 	/**
@@ -1421,6 +1591,7 @@ public static function remove_insecure_properties( $theme_json ) {
 		$valid_block_names   = array_keys( self::get_blocks_metadata() );
 		$valid_element_names = array_keys( self::ELEMENTS );
 		$theme_json          = self::sanitize( $theme_json, $valid_block_names, $valid_element_names );
+		$this->theme_json    = self::maybe_opt_in_into_settings( $theme_json );
 
 		$blocks_metadata = self::get_blocks_metadata();
 		$style_nodes     = self::get_style_nodes( $theme_json, $blocks_metadata );

From ccbbb957bb98db8c6b4e1b39ad466ed12f195794 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:11:14 +1100
Subject: [PATCH 03/32] Changes from
 lib/class-wp-theme-json-resolver-gutenberg.php

---
 .../class-wp-theme-json-resolver.php          | 85 +++++++++++--------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index 2319aef90186..6a7e6a5bf924 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -222,35 +222,53 @@ public static function get_theme_data( $deprecated = array() ) {
 	 *
 	 * @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(
 				array(
@@ -265,13 +283,10 @@ private static function get_user_data_from_custom_post_type( $should_create_cpt
 				),
 				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;
 	}
@@ -289,7 +304,7 @@ public static function get_user_data() {
 		}
 
 		$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 ) ) {
 			$decoded_data = json_decode( $user_cpt['post_content'], true );
@@ -297,7 +312,7 @@ public static function get_user_data() {
 			$json_decoding_error = json_last_error();
 			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' );
 			}
 
 			// Very important to verify if the flag isGlobalStylesUserThemeJSON is true.
@@ -311,7 +326,7 @@ public static function get_user_data() {
 				$config = $decoded_data;
 			}
 		}
-		self::$user = new WP_Theme_JSON( $config, 'user' );
+		self::$user = new WP_Theme_JSON( $config, 'custom' );
 
 		return self::$user;
 	}
@@ -336,11 +351,11 @@ public static function get_user_data() {
 	 * @since 5.9.0 Add user data and change the arguments.
 	 *
 	 * @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' );
 		}
@@ -349,7 +364,7 @@ public static function get_merged_data( $origin = 'user' ) {
 		$result->merge( self::get_core_data() );
 		$result->merge( self::get_theme_data() );
 
-		if ( 'user' === $origin ) {
+		if ( 'custom' === $origin ) {
 			$result->merge( self::get_user_data() );
 		}
 
@@ -369,7 +384,7 @@ public static function get_user_custom_post_type_id() {
 			return self::$user_custom_post_type_id;
 		}
 
-		$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 ) ) {
 			self::$user_custom_post_type_id = $user_cpt['ID'];

From af9864f6f09f07c6faaa846e3efdb4fd3d142371 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:18:18 +1100
Subject: [PATCH 04/32] Changes from
 lib/class-gutenberg-rest-global-styles-controller.php

---
 .../class-wp-rest-global-styles-controller.php       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index 7e5f93f52066..f5746ef7e6d8 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -232,12 +232,16 @@ protected function prepare_item_for_database( $request ) {
 	 * @return WP_REST_Response $data
 	 */
 	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_Gutenberg( $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 ) ) {
 			$data['id'] = $post->ID;

From 73f04fc1defa449c13ce88a503572454821783a0 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:25:25 +1100
Subject: [PATCH 05/32] Changes from
 lib/compat/wordpress-5.9/class-gutenberg-rest-templates-controller.php

---
 .../class-wp-rest-templates-controller.php    | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 16bf3c7d7367..e9ce6aa93d01 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -72,8 +72,9 @@ public function register_routes() {
 			array(
 				'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' ),
 					),
 				),
 				array(
@@ -131,6 +132,39 @@ protected function permissions_check( $request ) {
 		return true;
 	}
 
+	/**
+	 * 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.
 	 *
@@ -555,6 +589,10 @@ public function prepare_item_for_response( $item, $request ) { // phpcs:ignore V
 			$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( 'area', $fields ) && 'wp_template_part' === $template->type ) {
 			$data['area'] = $template->area;
 		}
@@ -769,6 +807,15 @@ public function get_item_schema() {
 			),
 		);
 
+		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 ) {
 			$schema['properties']['area'] = array(
 				'description' => __( 'Where the template part is intended for use (header, footer, etc.)' ),

From b6a128ec7e0442ff083642615fd8cb7133f5e047 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:52:45 +1100
Subject: [PATCH 06/32] Changes from
 lib/compat/wordpress-5.9/get-global-styles-and-settings.php

---
 .../global-styles-and-settings.php            | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php
index 303f004bf68a..9db95a3e9512 100644
--- a/src/wp-includes/global-styles-and-settings.php
+++ b/src/wp-includes/global-styles-and-settings.php
@@ -10,25 +10,28 @@
  *
  * @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';
 	}
 
 	$settings = WP_Theme_JSON_Resolver::get_merged_data( $origin )->get_settings();
@@ -41,25 +44,28 @@ function wp_get_global_settings( $path = array(), $block_name = '', $origin = 'a
  *
  * @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';
 	}
 
 	$styles = WP_Theme_JSON_Resolver::get_merged_data( $origin )->get_raw_data()['styles'];
@@ -105,7 +111,7 @@ function wp_get_global_stylesheet( $types = array() ) {
 		$types = array( 'variables', 'styles', 'presets' );
 	}
 
-	$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).
 		$origins = array( 'default' );

From 454edadc0e4fba8c1bda7463f10101648bb82f69 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 14:57:39 +1100
Subject: [PATCH 07/32] Changes from
 lib/compat/wordpress-5.9/rest-active-global-styles.php

---
 .../class-wp-rest-themes-controller.php        | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
index b49810d1e39d..76f963209f82 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
@@ -320,22 +320,8 @@ public function prepare_item_for_response( $item, $request ) {
 			// This creates a record for the current theme if not existent.
 			$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;
 		}
 
 		if ( $id ) {

From bd750cdb1f7dbac892a3406094058c99ef196ea2 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 15:01:49 +1100
Subject: [PATCH 08/32] Changes from lib/full-site-editing/edit-site-page.php

---
 src/wp-admin/site-editor.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/site-editor.php b/src/wp-admin/site-editor.php
index 14eec7c6c148..91c559a2c248 100644
--- a/src/wp-admin/site-editor.php
+++ b/src/wp-admin/site-editor.php
@@ -23,8 +23,6 @@
 	wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
 }
 
-// Used in the HTML title tag.
-$title       = __( 'Editor (beta)' );
 $parent_file = 'themes.php';
 
 // Flag that we're loading the block editor.
@@ -59,6 +57,9 @@ static function( $classes ) {
 		wp_die( __( 'Invalid post type.' ) );
 	}
 
+	// Used in the HTML title tag.
+	$title = $post_type->labels->name;
+
 	$preload_paths = array(
 		'/',
 		'/wp/v2/types/' . $post_type->name . '?context=edit',
@@ -81,6 +82,9 @@ static function( $classes ) {
 
 } else {
 
+	// Used in the HTML title tag.
+	$title = __( 'Editor (beta)' );
+
 	$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
 	$active_theme            = wp_get_theme()->get_stylesheet();
 	$preload_paths           = array(

From df3fa80a71f2931994f92eec085ce57913c4c8d1 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 15:04:13 +1100
Subject: [PATCH 09/32] Changes from lib/global-styles.php

---
 src/wp-includes/block-editor.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php
index 641a1970cc74..aaa249cb7ba8 100644
--- a/src/wp-includes/block-editor.php
+++ b/src/wp-includes/block-editor.php
@@ -338,8 +338,8 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 	// These settings may need to be updated based on data coming from theme.json sources.
 	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'] :
 					$colors_by_origin['default']
@@ -347,8 +347,8 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 	}
 	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'] :
 					$gradients_by_origin['default']
@@ -356,8 +356,8 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 	}
 	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'] :
 					$font_sizes_by_origin['default']

From a5d4653f7888ea96c9513907f045ca9460a47526 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 15:09:26 +1100
Subject: [PATCH 10/32] Changes from
 phpunit/class-gutenberg-rest-template-controller-test.php

---
 .../rest-api/wpRestTemplatesController.php    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 3d1699e16f4f..19225b7a0df6 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -102,6 +102,7 @@ public function test_get_items() {
 				'status'         => 'publish',
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
+				'is_custom'      => false,
 			),
 			$this->find_and_normalize_template_by_id( $data, 'default//my_template' )
 		);
@@ -143,11 +144,75 @@ public function test_get_item() {
 				'status'         => 'publish',
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
+				'is_custom'      => false,
 			),
 			$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->assertEquals(
+			array(
+				'id'             => 'tt1-blocks//index',
+				'theme'          => 'tt1-blocks',
+				'slug'           => 'index',
+				'title'          => array(
+					'raw'      => 'Index',
+					'rendered' => 'Index',
+				),
+				'description'    => 'The default template used when no other template is available. This is a required template in WordPress.',
+				'status'         => 'publish',
+				'source'         => 'theme',
+				'type'           => 'wp_template',
+				'wp_id'          => null,
+				'has_theme_file' => true,
+				'is_custom'      => false,
+			),
+			$data
+		);
+	}
+
+	public function get_template_endpoint_urls() {
+		return array(
+			array( '/wp/v2/templates/tt1-blocks/index' ),
+			array( '/wp/v2/templates/tt1-blocks//index' ),
+		);
+	}
+
+	/**
+	 * @ticket 54507
+	 * @dataProvider get_template_ids_to_sanitize
+	 */
+	public function test_sanitize_template_id( $input_id, $sanitized_id ) {
+		$endpoint = new Gutenberg_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' ),
+		);
+	}
+
 	/**
 	 * @ticket 54422
 	 * @covers WP_REST_Templates_Controller::create_item
@@ -185,6 +250,7 @@ public function test_create_item() {
 				),
 				'status'         => 'publish',
 				'has_theme_file' => false,
+				'is_custom'      => true,
 			),
 			$data
 		);

From df895044d62c5c21afeadb519dd72bd5b791ac36 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 15:12:23 +1100
Subject: [PATCH 11/32] Changes from
 phpunit/class-wp-theme-json-resolver-test.php

---
 .../tests/theme/wpThemeJsonResolver.php       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index 7a9f326ee105..b2c7d8c09be0 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -24,6 +24,7 @@ public function set_up() {
 		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
 		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();
 		unset( $GLOBALS['wp_themes'] );
@@ -44,6 +45,13 @@ 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;
+	}
+
 	/**
 	 * @ticket 52991
 	 * @ticket 54336
@@ -312,4 +320,30 @@ function test_merges_child_theme_json_into_parent_theme_json() {
 			)
 		);
 	}
+
+	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' ) );
+	}
 }

From 036de733a86e5af7d4b61e2eea1354cfd30b6fde Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 15:15:38 +1100
Subject: [PATCH 12/32] Changes from phpunit/class-wp-theme-json-test.php

---
 tests/phpunit/tests/theme/wpThemeJson.php | 231 +++++++++++++++++++++-
 1 file changed, 221 insertions(+), 10 deletions(-)

diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 85b5cd3d44c9..23f2505140b8 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -200,6 +200,79 @@ public function test_get_settings_presets_are_keyed_by_origin() {
 		$this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
 	}
 
+	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
 	 */
@@ -1060,6 +1133,144 @@ public function test_merge_incoming_data_null_presets() {
 		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
+	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
 	 */
@@ -1298,7 +1509,7 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
 					'color'   => array(
 						'custom'  => true,
 						'palette' => array(
-							'user' => array(
+							'custom' => array(
 								array(
 									'name'  => 'Red',
 									'slug'  => 'red',
@@ -1325,7 +1536,7 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
 							'color'   => array(
 								'custom'  => true,
 								'palette' => array(
-									'user' => array(
+									'custom' => array(
 										array(
 											'name'  => 'Yellow',
 											'slug'  => 'yellow',
@@ -1358,7 +1569,7 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
 			'settings' => array(
 				'color'  => array(
 					'palette' => array(
-						'user' => array(
+						'custom' => array(
 							array(
 								'name'  => 'Red',
 								'slug'  => 'red',
@@ -1381,7 +1592,7 @@ public function test_remove_insecure_properties_removes_non_preset_settings() {
 					'core/group' => array(
 						'color' => array(
 							'palette' => array(
-								'user' => array(
+								'custom' => array(
 									array(
 										'name'  => 'Yellow',
 										'slug'  => 'yellow',
@@ -1417,7 +1628,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 				'settings' => array(
 					'color'      => array(
 						'palette' => array(
-							'user' => array(
+							'custom' => array(
 								array(
 									'name'  => 'Red/><b>ok</ok>',
 									'slug'  => 'red',
@@ -1443,7 +1654,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 					),
 					'typography' => array(
 						'fontFamilies' => array(
-							'user' => array(
+							'custom' => array(
 								array(
 									'name'       => 'Helvetica Arial/><b>test</b>',
 									'slug'       => 'helvetica-arial',
@@ -1471,7 +1682,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 						'core/group' => array(
 							'color' => array(
 								'palette' => array(
-									'user' => array(
+									'custom' => array(
 										array(
 											'name'  => 'Red/><b>ok</ok>',
 											'slug'  => 'red',
@@ -1506,7 +1717,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 			'settings' => array(
 				'color'      => array(
 					'palette' => array(
-						'user' => array(
+						'custom' => array(
 							array(
 								'name'  => 'Pink',
 								'slug'  => 'pink',
@@ -1517,7 +1728,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 				),
 				'typography' => array(
 					'fontFamilies' => array(
-						'user' => array(
+						'custom' => array(
 							array(
 								'name'       => 'Cambria',
 								'slug'       => 'cambria',
@@ -1530,7 +1741,7 @@ public function test_remove_insecure_properties_removes_unsafe_preset_settings()
 					'core/group' => array(
 						'color' => array(
 							'palette' => array(
-								'user' => array(
+								'custom' => array(
 									array(
 										'name'  => 'Pink',
 										'slug'  => 'pink',

From 636cd6ec84e76c8267350af1f71be62872ad464d Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Nov 2021 15:37:51 +0800
Subject: [PATCH 13/32] Add support to post types

---
 src/wp-includes/post.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index a51d616416e0..f7fe8d74516e 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -384,6 +384,7 @@ function create_initial_post_types() {
 				'excerpt',
 				'editor',
 				'revisions',
+				'author',
 			),
 		)
 	);
@@ -442,6 +443,7 @@ function create_initial_post_types() {
 				'excerpt',
 				'editor',
 				'revisions',
+				'author',
 			),
 		)
 	);

From 260f341e26c4e73fced7bb821c902b55c93d7ed3 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Nov 2021 16:09:03 +0800
Subject: [PATCH 14/32] Add author support to templates REST API controller

---
 src/wp-includes/block-template-utils.php      |  1 +
 src/wp-includes/class-wp-block-template.php   |  9 +++++++
 .../class-wp-rest-templates-controller.php    | 27 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php
index 6475ac36f284..10837c5384ae 100644
--- a/src/wp-includes/block-template-utils.php
+++ b/src/wp-includes/block-template-utils.php
@@ -538,6 +538,7 @@ function _build_block_template_result_from_post( $post ) {
 	$template->status         = $post->post_status;
 	$template->has_theme_file = $has_theme_file;
 	$template->is_custom      = true;
+	$template->post_author    = $post->post_author;
 
 	if ( 'wp_template' === $post->post_type && isset( $default_template_types[ $template->slug ] ) ) {
 		$template->is_custom = false;
diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index 3ea090830f51..9a54b4d97d59 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -69,6 +69,7 @@ class WP_Block_Template {
 	 */
 	public $description = '';
 
+
 	/**
 	 * Source of the content. `theme` and `custom` is used for now.
 	 *
@@ -109,4 +110,12 @@ class WP_Block_Template {
 	 * @var bool
 	 */
 	public $is_custom = true;
+
+	/**
+	 * Author.
+	 *
+	 * @since 5.9.0
+	 * @var int
+	 */
+	public $post_author = 0;
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index e9ce6aa93d01..d1814bbccad8 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -503,6 +503,24 @@ protected function prepare_item_for_database( $request ) {
 			}
 		}
 
+		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;
 	}
 
@@ -593,6 +611,10 @@ public function prepare_item_for_response( $item, $request ) { // phpcs:ignore V
 			$data['is_custom'] = $template->is_custom;
 		}
 
+		if ( rest_is_field_included( 'author', $fields ) ) {
+			$data['author'] = (int) $template->post_author;
+		}
+
 		if ( rest_is_field_included( 'area', $fields ) && 'wp_template_part' === $template->type ) {
 			$data['area'] = $template->area;
 		}
@@ -804,6 +826,11 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
+				'author' => array (
+					'description' => __( 'The ID for the author of the template.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
 			),
 		);
 

From 882906f28a36ea80d1f102e0fc963a33a663198d Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Nov 2021 17:11:39 +0800
Subject: [PATCH 15/32] Update unit tests

---
 .../rest-api/wpRestTemplatesController.php    | 25 +++++++++++++++-
 tests/qunit/fixtures/wp-api-generated.js      | 30 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 19225b7a0df6..9c37f2388e80 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -103,6 +103,7 @@ public function test_get_items() {
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
 				'is_custom'      => false,
+				'author'         => 0,
 			),
 			$this->find_and_normalize_template_by_id( $data, 'default//my_template' )
 		);
@@ -145,6 +146,7 @@ public function test_get_item() {
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
 				'is_custom'      => false,
+				'author'         => 0,
 			),
 			$data
 		);
@@ -226,6 +228,7 @@ public function test_create_item() {
 				'description' => 'Just a description',
 				'title'       => 'My Template',
 				'content'     => 'Content',
+				'author'      => self::$admin_id,
 			)
 		);
 		$response = rest_get_server()->dispatch( $request );
@@ -251,6 +254,7 @@ public function test_create_item() {
 				'status'         => 'publish',
 				'has_theme_file' => false,
 				'is_custom'      => true,
+				'author'         => self::$admin_id,
 			),
 			$data
 		);
@@ -273,6 +277,7 @@ public function test_create_item_raw() {
 				'content'     => array(
 					'raw' => 'Content',
 				),
+				'author'      => self::$admin_id,
 			)
 		);
 		$response = rest_get_server()->dispatch( $request );
@@ -297,11 +302,28 @@ public function test_create_item_raw() {
 				),
 				'status'         => 'publish',
 				'has_theme_file' => false,
+				'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'      => -999,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_invalid_author', $response, 400 );
+	}
+
 	/**
 	 * @covers WP_REST_Templates_Controller::update_item
 	 */
@@ -436,7 +458,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 11, $properties );
+		$this->assertCount( 12, $properties );
 		$this->assertArrayHasKey( 'id', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
@@ -449,6 +471,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'status', $properties );
 		$this->assertArrayHasKey( 'wp_id', $properties );
 		$this->assertArrayHasKey( 'has_theme_file', $properties );
+		$this->assertArrayHasKey( 'author', $properties );
 	}
 
 	protected function find_and_normalize_template_by_id( $templates, $id ) {
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 9265197ebdc8..346645b7c568 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -5117,6 +5117,11 @@ mockedApiResponse.Schema = {
                                 "private"
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
                 }
@@ -5262,6 +5267,11 @@ mockedApiResponse.Schema = {
                                 "private"
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
                 },
@@ -5571,6 +5581,11 @@ mockedApiResponse.Schema = {
                                 "private"
                             ],
                             "required": false
+                        },
+                        "author": {
+                            "description": "The ID for the author of the template.",
+                            "type": "integer",
+                            "required": false
                         }
                     }
                 }
@@ -5750,6 +5765,11 @@ mockedApiResponse.Schema = {
                             ],
                             "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.)",
                             "type": "string",
@@ -5900,6 +5920,11 @@ mockedApiResponse.Schema = {
                             ],
                             "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.)",
                             "type": "string",
@@ -6214,6 +6239,11 @@ mockedApiResponse.Schema = {
                             ],
                             "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.)",
                             "type": "string",

From d3291817f1930e13f261ff6474a4e7656eedc22e Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 10:57:46 +0800
Subject: [PATCH 16/32] Fix linting issue

---
 .../rest-api/endpoints/class-wp-rest-templates-controller.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index d1814bbccad8..d494ab782a16 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -826,7 +826,7 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'author' => array (
+				'author' => array(
 					'description' => __( 'The ID for the author of the template.' ),
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),

From b52d98624c82ff1c2ce79eea095589db132e2028 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 16:02:00 +0800
Subject: [PATCH 17/32] Add origin field to templates

---
 src/wp-includes/block-template-utils.php            |  4 ++++
 src/wp-includes/class-wp-block-template.php         | 11 +++++++++++
 .../class-wp-rest-templates-controller.php          | 13 +++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php
index 10837c5384ae..6afcdaffd1d9 100644
--- a/src/wp-includes/block-template-utils.php
+++ b/src/wp-includes/block-template-utils.php
@@ -525,6 +525,9 @@ function _build_block_template_result_from_post( $post ) {
 	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
 		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;
 	$template->id             = $theme . '//' . $post->post_name;
@@ -532,6 +535,7 @@ function _build_block_template_result_from_post( $post ) {
 	$template->content        = $post->post_content;
 	$template->slug           = $post->post_name;
 	$template->source         = 'custom';
+	$template->origin         = ! empty( $origin ) ? $origin : null;
 	$template->type           = $post->post_type;
 	$template->description    = $post->post_excerpt;
 	$template->title          = $post->post_title;
diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index 9a54b4d97d59..d2f3c331aec9 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -78,6 +78,17 @@ class WP_Block_Template {
 	 */
 	public $source = 'theme';
 
+
+	/**
+	 * 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.
 	 *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index d494ab782a16..8d8ef71d82b1 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -464,6 +464,9 @@ protected function prepare_item_for_database( $request ) {
 			$changes->tax_input   = array(
 				'wp_theme' => $template->theme,
 			);
+			$changes->meta_input  = array(
+				'origin' => $template->source
+			);
 		} else {
 			$changes->post_name   = $template->slug;
 			$changes->ID          = $template->wp_id;
@@ -570,6 +573,10 @@ public function prepare_item_for_response( $item, $request ) { // phpcs:ignore V
 			$data['source'] = $template->source;
 		}
 
+		if ( rest_is_field_included( 'origin', $fields ) ) {
+			$data['origin'] = $template->origin;
+		}
+
 		if ( rest_is_field_included( 'type', $fields ) ) {
 			$data['type'] = $template->type;
 		}
@@ -763,6 +770,12 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'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.' ),
 					'type'        => array( 'object', 'string' ),

From bc2b99dc6898813530b2cd7bcf5562cef5f459ba Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 16:46:33 +0800
Subject: [PATCH 18/32] Handle errors from `prepare_item_for_database` in REST
 templates controller

---
 .../endpoints/class-wp-rest-templates-controller.php     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 8d8ef71d82b1..2ed0aaa8f3d0 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -278,6 +278,10 @@ public function update_item( $request ) {
 
 		$changes = $this->prepare_item_for_database( $request );
 
+		if ( is_wp_error( $changes ) ) {
+			return $changes;
+		}
+
 		if ( 'custom' === $template->source ) {
 			$result = wp_update_post( wp_slash( (array) $changes ), true );
 		} else {
@@ -332,6 +336,11 @@ public function create_item_permissions_check( $request ) {
 	 */
 	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 );
 		if ( is_wp_error( $post_id ) ) {

From 5f21d38da43d44bfa4f5b1ce275baae38c2819eb Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 16:46:52 +0800
Subject: [PATCH 19/32] Update tests to support origin

---
 .../tests/rest-api/wpRestTemplatesController.php       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 9c37f2388e80..f81260194852 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -53,7 +53,6 @@ public static function wpTearDownAfterClass() {
 		wp_delete_post( self::$post->ID );
 	}
 
-
 	public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
 		$this->assertArrayHasKey( '/wp/v2/templates', $routes );
@@ -93,6 +92,7 @@ public function test_get_items() {
 				'theme'          => 'default',
 				'slug'           => 'my_template',
 				'source'         => 'custom',
+				'origin'         => null,
 				'type'           => 'wp_template',
 				'description'    => 'Description of my template.',
 				'title'          => array(
@@ -136,6 +136,7 @@ public function test_get_item() {
 				'theme'          => 'default',
 				'slug'           => 'my_template',
 				'source'         => 'custom',
+				'origin'         => null,
 				'type'           => 'wp_template',
 				'description'    => 'Description of my template.',
 				'title'          => array(
@@ -245,6 +246,7 @@ public function test_create_item() {
 				),
 				'slug'           => 'my_custom_template',
 				'source'         => 'custom',
+				'origin'         => null,
 				'type'           => 'wp_template',
 				'description'    => 'Just a description',
 				'title'          => array(
@@ -294,6 +296,7 @@ public function test_create_item_raw() {
 				),
 				'slug'           => 'my_custom_template_raw',
 				'source'         => 'custom',
+				'origin'         => null,
 				'type'           => 'wp_template',
 				'description'    => 'Just a description',
 				'title'          => array(
@@ -317,7 +320,7 @@ public function test_create_item_invalid_author() {
 				'description' => 'Just a description',
 				'title'       => 'My Template',
 				'content'     => 'Content',
-				'author'      => -999,
+				'author'      => 99999,
 			)
 		);
 		$response = rest_get_server()->dispatch( $request );
@@ -458,13 +461,14 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 12, $properties );
+		$this->assertCount( 13, $properties );
 		$this->assertArrayHasKey( 'id', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
 		$this->assertArrayHasKey( 'theme', $properties );
 		$this->assertArrayHasKey( 'type', $properties );
 		$this->assertArrayHasKey( 'source', $properties );
+		$this->assertArrayHasKey( 'origin', $properties );
 		$this->assertArrayHasKey( 'content', $properties );
 		$this->assertArrayHasKey( 'title', $properties );
 		$this->assertArrayHasKey( 'description', $properties );

From 4e295cbe8549ba465e32e0da8d274af403fbf428 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 17:28:55 +0800
Subject: [PATCH 20/32] Address review feedback

---
 src/wp-includes/block-template-utils.php                      | 3 +--
 src/wp-includes/class-wp-block-template.php                   | 4 +++-
 .../rest-api/endpoints/class-wp-rest-templates-controller.php | 2 +-
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php
index 6afcdaffd1d9..2c2fd66d7c33 100644
--- a/src/wp-includes/block-template-utils.php
+++ b/src/wp-includes/block-template-utils.php
@@ -525,7 +525,6 @@ function _build_block_template_result_from_post( $post ) {
 	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
 		null !== _get_block_template_file( $post->post_type, $post->post_name );
 
-
 	$origin = get_post_meta( $post->ID, 'origin', true );
 
 	$template                 = new WP_Block_Template();
@@ -542,7 +541,7 @@ function _build_block_template_result_from_post( $post ) {
 	$template->status         = $post->post_status;
 	$template->has_theme_file = $has_theme_file;
 	$template->is_custom      = true;
-	$template->post_author    = $post->post_author;
+	$template->author         = $post->post_author;
 
 	if ( 'wp_template' === $post->post_type && isset( $default_template_types[ $template->slug ] ) ) {
 		$template->is_custom = false;
diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index d2f3c331aec9..fab386b04419 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -125,8 +125,10 @@ class WP_Block_Template {
 	/**
 	 * Author.
 	 *
+	 * A value of 0 means no author.
+	 *
 	 * @since 5.9.0
 	 * @var int
 	 */
-	public $post_author = 0;
+	public $author;
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 2ed0aaa8f3d0..585c474dd136 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -628,7 +628,7 @@ public function prepare_item_for_response( $item, $request ) { // phpcs:ignore V
 		}
 
 		if ( rest_is_field_included( 'author', $fields ) ) {
-			$data['author'] = (int) $template->post_author;
+			$data['author'] = (int) $template->author;
 		}
 
 		if ( rest_is_field_included( 'area', $fields ) && 'wp_template_part' === $template->type ) {
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index f81260194852..8c6be621376e 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -320,7 +320,7 @@ public function test_create_item_invalid_author() {
 				'description' => 'Just a description',
 				'title'       => 'My Template',
 				'content'     => 'Content',
-				'author'      => 99999,
+				'author'      => -1,
 			)
 		);
 		$response = rest_get_server()->dispatch( $request );

From 206a49b01656a0b0d573dee7f1142f95cafa452b Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 25 Nov 2021 18:53:03 +0800
Subject: [PATCH 21/32] Linting fix

---
 .../rest-api/endpoints/class-wp-rest-templates-controller.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 585c474dd136..0c149bab9323 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -474,7 +474,7 @@ protected function prepare_item_for_database( $request ) {
 				'wp_theme' => $template->theme,
 			);
 			$changes->meta_input  = array(
-				'origin' => $template->source
+				'origin' => $template->source,
 			);
 		} else {
 			$changes->post_name   = $template->slug;

From 51084789af3a8f290470f6b2db0e97d85394ee4f Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Mon, 29 Nov 2021 09:26:42 +0800
Subject: [PATCH 22/32] Remove empty lines

---
 src/wp-includes/class-wp-block-template.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index fab386b04419..1d73d281fe76 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -69,7 +69,6 @@ class WP_Block_Template {
 	 */
 	public $description = '';
 
-
 	/**
 	 * Source of the content. `theme` and `custom` is used for now.
 	 *
@@ -78,7 +77,6 @@ class WP_Block_Template {
 	 */
 	public $source = 'theme';
 
-
 	/**
 	 * Origin of the content when the content has been customized.
 	 * When customized, origin takes on the value of source and source becomes

From 1334b857a8eb995a5feb55b33241363c8bfb48d8 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 17:39:10 +1100
Subject: [PATCH 23/32] Move call to maybe_opt_in_into_settings() to right
 place

---
 src/wp-includes/class-wp-theme-json.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index a1f2b874d97a..4cdb44e45750 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -344,7 +344,8 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
 		$this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json );
 		$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.
 		$nodes = self::get_setting_nodes( $this->theme_json );
@@ -1591,7 +1592,6 @@ public static function remove_insecure_properties( $theme_json ) {
 		$valid_block_names   = array_keys( self::get_blocks_metadata() );
 		$valid_element_names = array_keys( self::ELEMENTS );
 		$theme_json          = self::sanitize( $theme_json, $valid_block_names, $valid_element_names );
-		$this->theme_json    = self::maybe_opt_in_into_settings( $theme_json );
 
 		$blocks_metadata = self::get_blocks_metadata();
 		$style_nodes     = self::get_style_nodes( $theme_json, $blocks_metadata );

From e55e5d2048916239da5c9d800afd58037b0d1487 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 17:51:06 +1100
Subject: [PATCH 24/32] Use WP class names

---
 .../endpoints/class-wp-rest-global-styles-controller.php        | 2 +-
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index f5746ef7e6d8..0bbc54169ebc 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -236,7 +236,7 @@ public function prepare_item_for_response( $post, $request ) { // phpcs:ignore V
 		$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_Gutenberg( $raw_config, 'custom' ) )->get_raw_data();
+			$config = ( new WP_Theme_JSON( $raw_config, 'custom' ) )->get_raw_data();
 		}
 
 		// Base fields for every post.
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 8c6be621376e..0ca61ec29f1e 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -199,7 +199,7 @@ public function get_template_endpoint_urls() {
 	 * @dataProvider get_template_ids_to_sanitize
 	 */
 	public function test_sanitize_template_id( $input_id, $sanitized_id ) {
-		$endpoint = new Gutenberg_REST_Templates_Controller( 'wp_template' );
+		$endpoint = new WP_REST_Templates_Controller( 'wp_template' );
 		$this->assertEquals(
 			$sanitized_id,
 			$endpoint->_sanitize_template_id( $input_id )

From 2de4a1b0337b28733d537a6d3fcc6d714ef1c33d Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 29 Nov 2021 11:49:32 +0400
Subject: [PATCH 25/32] Fix 'is_custom' assertions in PHPUnit tests

---
 .../phpunit/tests/rest-api/wpRestTemplatesController.php  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 0ca61ec29f1e..c7720b608280 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -102,7 +102,7 @@ public function test_get_items() {
 				'status'         => 'publish',
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
-				'is_custom'      => false,
+				'is_custom'      => true,
 				'author'         => 0,
 			),
 			$this->find_and_normalize_template_by_id( $data, 'default//my_template' )
@@ -146,7 +146,7 @@ public function test_get_item() {
 				'status'         => 'publish',
 				'wp_id'          => self::$post->ID,
 				'has_theme_file' => false,
-				'is_custom'      => false,
+				'is_custom'      => true,
 				'author'         => 0,
 			),
 			$data
@@ -305,6 +305,7 @@ public function test_create_item_raw() {
 				),
 				'status'         => 'publish',
 				'has_theme_file' => false,
+				'is_custom'      => true,
 				'author'         => self::$admin_id,
 			),
 			$data
@@ -461,7 +462,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 13, $properties );
+		$this->assertCount( 14, $properties );
 		$this->assertArrayHasKey( 'id', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
@@ -475,6 +476,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'status', $properties );
 		$this->assertArrayHasKey( 'wp_id', $properties );
 		$this->assertArrayHasKey( 'has_theme_file', $properties );
+		$this->assertArrayHasKey( 'is_custom', $properties );
 		$this->assertArrayHasKey( 'author', $properties );
 	}
 

From 70b1faa7d56ba659103bfefbb733e6b4d905a8f8 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 21:52:33 +1100
Subject: [PATCH 26/32] Update
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php

Co-authored-by: Adam Zielinski <adam@adamziel.com>
---
 .../rest-api/wpRestTemplatesController.php    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index c7720b608280..659094394523 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -153,7 +153,6 @@ public function test_get_item() {
 		);
 	}
 
-	/**
 	 * @ticket 54507
 	 * @dataProvider get_template_endpoint_urls
 	 */
@@ -166,22 +165,24 @@ public function test_get_item_works_with_a_single_slash( $endpoint_url ) {
 		unset( $data['content'] );
 		unset( $data['_links'] );
 
-		$this->assertEquals(
+		$this->assertSame(
 			array(
-				'id'             => 'tt1-blocks//index',
-				'theme'          => 'tt1-blocks',
-				'slug'           => 'index',
+				'id'             => 'default//my_template',
+				'theme'          => 'default',
+				'slug'           => 'my_template',
+				'source'         => 'custom',
+				'origin'         => null,
+				'type'           => 'wp_template',
+				'description'    => 'Description of my template.',
 				'title'          => array(
-					'raw'      => 'Index',
-					'rendered' => 'Index',
+					'raw'      => 'My Template',
+					'rendered' => 'My Template',
 				),
-				'description'    => 'The default template used when no other template is available. This is a required template in WordPress.',
 				'status'         => 'publish',
-				'source'         => 'theme',
-				'type'           => 'wp_template',
-				'wp_id'          => null,
-				'has_theme_file' => true,
-				'is_custom'      => false,
+				'wp_id'          => self::$post->ID,
+				'has_theme_file' => false,
+				'is_custom'      => true,
+				'author'         => 0,
 			),
 			$data
 		);
@@ -189,10 +190,10 @@ public function test_get_item_works_with_a_single_slash( $endpoint_url ) {
 
 	public function get_template_endpoint_urls() {
 		return array(
-			array( '/wp/v2/templates/tt1-blocks/index' ),
-			array( '/wp/v2/templates/tt1-blocks//index' ),
+			array( '/wp/v2/templates/default/my_template' ),
+			array( '/wp/v2/templates/default//my_template' ),
 		);
-	}
+	} ```
 
 	/**
 	 * @ticket 54507

From 00f0d4ed1e035895827e447fd64a59bcd25853fa Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 22:02:01 +1100
Subject: [PATCH 27/32] Update
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php

Co-authored-by: Adam Zielinski <adam@adamziel.com>
---
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 659094394523..ed42820b224a 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -153,6 +153,7 @@ public function test_get_item() {
 		);
 	}
 
+	/**
 	 * @ticket 54507
 	 * @dataProvider get_template_endpoint_urls
 	 */

From bd31bb42343f56b6f61f1c29710e6130bb5059ca Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 29 Nov 2021 22:02:24 +1100
Subject: [PATCH 28/32] Update
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php

Co-authored-by: Adam Zielinski <adam@adamziel.com>
---
 tests/phpunit/tests/rest-api/wpRestTemplatesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index ed42820b224a..36f59374d6de 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -194,7 +194,7 @@ public function get_template_endpoint_urls() {
 			array( '/wp/v2/templates/default/my_template' ),
 			array( '/wp/v2/templates/default//my_template' ),
 		);
-	} ```
+	}
 
 	/**
 	 * @ticket 54507

From 91403464a53ca1bf4e0010acf0ba8774e782a792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Mon, 29 Nov 2021 18:48:45 +0100
Subject: [PATCH 29/32] Sort keys alphabetically so it is easier to compare

---
 src/wp-includes/theme.json | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index f2c71be11a40..9d4dcb014603 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -8,12 +8,12 @@
 			"width": false
 		},
 		"color": {
+			"background": true,
 			"custom": true,
 			"customDuotone": true,
  			"customGradient": true,
- 			"link": false,
-			"background": true,
-			"text": true,
+			"defaultGradients": true,
+			"defaultPalette": true,
 			"duotone": [
 				{
 					"name":  "Dark grayscale" ,
@@ -118,6 +118,7 @@
 					"slug": "midnight"
 				}
 			],
+			"link": false,
 			"palette": [
 				{
 					"name": "Black",
@@ -179,7 +180,8 @@
 					"slug": "vivid-purple",
 					"color": "#9b51e0"
 				}
-			]
+			],
+			"text": true
 		},
 		"spacing": {
 			"blockGap": null,
@@ -190,12 +192,6 @@
 		"typography": {
 			"customFontSize": true,
 			"dropCap": true,
-			"fontStyle": true,
-			"fontWeight": true,
-			"letterSpacing": true,
-			"lineHeight": false,
-			"textDecoration": true,
-			"textTransform": true,
 			"fontSizes": [
 				{
 					"name": "Small",
@@ -222,7 +218,13 @@
 					"slug": "huge",
 					"size": "42px"
 				}
-			]
+			],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"lineHeight": false,
+			"textDecoration": true,
+			"textTransform": true
 		},
 		"blocks": {
 			"core/button": {

From 8e9e04d4bbb8aebb4861ba91064126291144f815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Mon, 29 Nov 2021 18:49:05 +0100
Subject: [PATCH 30/32] Add missing appearanceTools flag

---
 src/wp-includes/theme.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index 9d4dcb014603..f072d0afc790 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -1,6 +1,7 @@
 {
 	"version": 2,
 	"settings": {
+		"appearanceTools": false,
 		"border": {
 			"color": false,
 			"radius": false,

From b3f4e8f7d87602f153427929e26a5d292f7fadc4 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Tue, 30 Nov 2021 10:46:46 +1100
Subject: [PATCH 31/32] Apply class-theme-json.php patch

---
 src/wp-includes/class-wp-theme-json.php | 28 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index 4cdb44e45750..635f670cff7a 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -75,17 +75,28 @@ class WP_Theme_JSON {
 	 * This contains the necessary metadata to process them:
 	 *
 	 * - 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
+	 * - 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
 	 * @since 5.9.0 Added new presets and simplified the metadata structure.
@@ -305,6 +316,8 @@ class WP_Theme_JSON {
 	);
 
 	/**
+	 * The valid elements that can be found under styles.
+	 *
 	 * @since 5.8.0
 	 * @var string[]
 	 */
@@ -479,6 +492,7 @@ private static function sanitize( $input, $valid_block_names, $valid_element_nam
 
 		return $output;
 	}
+
 	/**
 	 * Returns the metadata for each block.
 	 *

From 2da12cb5cb2043da8a4e7103ec4eeb5665051c99 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Tue, 30 Nov 2021 10:49:14 +1100
Subject: [PATCH 32/32] Apply class-wp-theme-json-resolver.php patch

---
 src/wp-includes/class-wp-theme-json-resolver.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index 6a7e6a5bf924..cfa1c6cd5238 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -230,7 +230,6 @@ public static function get_theme_data( $deprecated = array() ) {
 	 * @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.
 	 */
 	public static function get_user_data_from_custom_post_type( $theme, $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
@@ -333,8 +332,8 @@ public static function get_user_data() {
 
 	/**
 	 * 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},
 	 * {@link get_theme_data}, and {@link get_user_data},