Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

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

See #54487.


git-svn-id: https://develop.svn.wordpress.org/trunk@52232 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Robert Anderson 2021-11-23 05:38:45 +00:00
parent 4dea8f5945
commit a86125d5c1
18 changed files with 679 additions and 516 deletions

501
package-lock.json generated
View File

@ -2685,9 +2685,9 @@
"integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="
},
"@types/eslint": {
"version": "7.29.0",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz",
"integrity": "sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==",
"dev": true,
"requires": {
"@types/estree": "*",
@ -2894,9 +2894,9 @@
"dev": true
},
"@types/webpack": {
"version": "4.41.31",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
"integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
"version": "4.41.32",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
"integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
"dev": true,
"requires": {
"@types/node": "*",
@ -3515,9 +3515,9 @@
}
},
"@wordpress/base-styles": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.0.3.tgz",
"integrity": "sha512-dL6xsQUeCNY7oqNDbbO9k65bOXq4zKwFfdJQITXUIuH3PBVoZaonsndeV8BsRs7I5YXiJCqT1ts6gjibJr914g==",
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.0.4.tgz",
"integrity": "sha512-qXiIhWLdTHWxBWawcqigJUUMeb2jkn9ElUEUC/Cn3DK2i62jiUWXOLp6tFIaf5eQMNXsYqtp5r7n2F/OllngQA==",
"dev": true
},
"@wordpress/blob": {
@ -3529,21 +3529,21 @@
}
},
"@wordpress/block-directory": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.9.tgz",
"integrity": "sha512-ckosX2RJa6x+fvqaQ06pBVexaQLNDISi6BxOjm2SRPRlrVs0mPLQUc1agXOMci0i75FQ7F7SMDemXlO9v1I5kg==",
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.11.tgz",
"integrity": "sha512-zSFsm+yUcrgZSWQVXWPd8jp+K1Lf/S5JITUp1cKReae9hhHgvmEpQydmWNGgjIadeALpcka5j0JIe2AJAqGeBA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
"@wordpress/edit-post": "^5.0.9",
"@wordpress/editor": "^12.0.6",
"@wordpress/edit-post": "^5.0.11",
"@wordpress/editor": "^12.0.8",
"@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.3",
"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.3.tgz",
"integrity": "sha512-7/FeCK0KFUnWGmUEDoZqdGCOeIaIpD4qyI88WZQnwgaQ3Nsu02L6/kRGD5HXUatFjqGUcz4OGy2dOxrmBNH/6A==",
"version": "8.0.5",
"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.5.tgz",
"integrity": "sha512-s5kmYFizQlf2K2JXaI5Iw3Zo8mYa6sCw0BMDt9Z+67NNyAvsbf9jPA6Uw80yRsCVcjz+cYcgHv3+Tcz9a6VrUw==",
"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.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/data": "^6.1.4",
"@wordpress/deprecated": "^3.2.3",
@ -3603,18 +3603,18 @@
}
},
"@wordpress/block-library": {
"version": "6.0.7",
"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.7.tgz",
"integrity": "sha512-WpCnFi1j47MB6RFr1M4nlfPnwsYmsh+qwaXH1wfrckT1DM+/G2uRKJKwFAm/gm+OnqjsYOcRYOftaLmgRTAwCg==",
"version": "6.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.9.tgz",
"integrity": "sha512-5etkM+WKn7jUlZsSiuA6jVBFlBvxn5szu5Shr6GbLnuUwh2pEhj/BY/aqXcyjNXcoUT2WmURcCPBjclgm2CvBA==",
"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.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -3627,14 +3627,14 @@
"@wordpress/html-entities": "^3.2.3",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/interface": "^4.1.5",
"@wordpress/interface": "^4.1.7",
"@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.9",
"@wordpress/reusable-blocks": "^3.0.11",
"@wordpress/rich-text": "^5.0.6",
"@wordpress/server-side-render": "^3.0.7",
"@wordpress/server-side-render": "^3.0.9",
"@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.3",
"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.0.3.tgz",
"integrity": "sha512-A8Y1rIpqBXEpc53IZ0TztEkdAaboMyaLY6PxYXniiI1KUSUrybQIBqcPe6uuCZIBCQNNh2uG3uvHisnuC1HWFQ==",
"version": "19.0.5",
"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.0.5.tgz",
"integrity": "sha512-xtXTpPvmByVPjIWWo/v8ZzVsEtx9dq6bsdOOkDTnFFUXTcgxJb12RmgbsDR+E/L+z9IwuGxLwt08EGrWWvKF6w==",
"requires": {
"@babel/runtime": "^7.16.0",
"@emotion/cache": "^11.4.0",
@ -3785,16 +3785,16 @@
}
},
"@wordpress/customize-widgets": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.9.tgz",
"integrity": "sha512-/BoE7Wr6UOiIUpjngrLeI13JCk8SGdRYhpM17S88YlaaDkhxV4OnEFwizhIjGKbX+M4ftTJjna9BS59oGOTwIQ==",
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.11.tgz",
"integrity": "sha512-3HSHChnMtT7JCXaITzDgM0zwbDopL3CNofhCJf/lQR//msiLiFK2MzjZrgJdQXTzVcPN7fXgIsf5cFJeHsuADg==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-library": "^6.0.7",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/block-library": "^6.0.9",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -3803,12 +3803,12 @@
"@wordpress/hooks": "^3.2.2",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/interface": "^4.1.5",
"@wordpress/interface": "^4.1.7",
"@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.9",
"@wordpress/widgets": "^2.0.11",
"classnames": "^2.3.1",
"lodash": "^4.17.21"
}
@ -3937,27 +3937,27 @@
}
},
"@wordpress/edit-post": {
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.9.tgz",
"integrity": "sha512-qvL4/kuFg9/M7occ3dH4RlZB6PvtZoip4Pr9nzDM/T+OS+xw4btUSzfaOhhaWXYiAYo3vOg8ViB/y1JkMrnuFQ==",
"version": "5.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.11.tgz",
"integrity": "sha512-UVFve7ETYdJjDm2TgAJKOxiRmoTYNu75fkbvTluxnKbvWKDXzY0QCpw47JY4g+JmYBRda6ZGV51eY5P5G5BZ6Q==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-library": "^6.0.7",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/block-library": "^6.0.9",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
"@wordpress/data-controls": "^2.2.7",
"@wordpress/editor": "^12.0.6",
"@wordpress/editor": "^12.0.8",
"@wordpress/element": "^4.0.4",
"@wordpress/hooks": "^3.2.2",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/interface": "^4.1.5",
"@wordpress/interface": "^4.1.7",
"@wordpress/keyboard-shortcuts": "^3.0.6",
"@wordpress/keycodes": "^3.2.4",
"@wordpress/media-utils": "^3.0.5",
@ -3982,28 +3982,28 @@
}
},
"@wordpress/edit-site": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.9.tgz",
"integrity": "sha512-UhSy7HG22e4TKGz7mb10LFxUSqhVCXW41blDejUaBsAaFAP+85QIvMwpzhP5wlo+6PIqFZAb8YD8ha/eXj/GsQ==",
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.11.tgz",
"integrity": "sha512-jwCXMVDg6ucNOur1lpQBDlXNuUv6RzpOK/I2rfhw9Cqv0DyFfWSL6NIxMZFuqfyhCeqnUaz/GT/CVgghx5Ssvw==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-library": "^6.0.7",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/block-library": "^6.0.9",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
"@wordpress/data-controls": "^2.2.7",
"@wordpress/editor": "^12.0.6",
"@wordpress/editor": "^12.0.8",
"@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.5",
"@wordpress/interface": "^4.1.7",
"@wordpress/keyboard-shortcuts": "^3.0.6",
"@wordpress/keycodes": "^3.2.4",
"@wordpress/media-utils": "^3.0.5",
@ -4020,17 +4020,17 @@
}
},
"@wordpress/edit-widgets": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.4.tgz",
"integrity": "sha512-NGLflTSGaAY3BGL4YmnEY/dK8asKvsKpG+tx/6CHMqfxIsei/xnTmnZtdc8Fxof4ciiWuNYueCcbmAhyoTiyuA==",
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.6.tgz",
"integrity": "sha512-NuVehrAajzThQLh313FiyhjfIFpCwolyPjndj+urUp+iCKpLTMKTKSrZpC6tQsfycrmpPrnL/RiWsNeAV1zGMg==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-library": "^6.0.7",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/block-library": "^6.0.9",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -4039,16 +4039,16 @@
"@wordpress/hooks": "^3.2.2",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/interface": "^4.1.5",
"@wordpress/interface": "^4.1.7",
"@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.9",
"@wordpress/server-side-render": "^3.0.7",
"@wordpress/reusable-blocks": "^3.0.11",
"@wordpress/server-side-render": "^3.0.9",
"@wordpress/url": "^3.3.1",
"@wordpress/widgets": "^2.0.9",
"@wordpress/widgets": "^2.0.11",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
"rememo": "^3.0.0",
@ -4056,18 +4056,18 @@
}
},
"@wordpress/editor": {
"version": "12.0.6",
"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.6.tgz",
"integrity": "sha512-OP1naxqn0T1/7gIMNIzNj+JIsSWIJta5TcZzdueMimJ3mhSPe1ggQGvEkxd4Xg5mZ1kAboQ1TpzyIqA4Ck1v3w==",
"version": "12.0.8",
"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.8.tgz",
"integrity": "sha512-vEEHEH2Pkg/FzfgZqTZI6RhTcGrRwwgdnSrrJJMXQjKg3ieLpSuKZ2LaZEhfqY2ICTuZ/49A9pxOm6FzkQW8Xg==",
"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.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -4084,9 +4084,9 @@
"@wordpress/keycodes": "^3.2.4",
"@wordpress/media-utils": "^3.0.5",
"@wordpress/notices": "^3.2.7",
"@wordpress/reusable-blocks": "^3.0.9",
"@wordpress/reusable-blocks": "^3.0.11",
"@wordpress/rich-text": "^5.0.6",
"@wordpress/server-side-render": "^3.0.7",
"@wordpress/server-side-render": "^3.0.9",
"@wordpress/url": "^3.3.1",
"@wordpress/wordcount": "^3.2.3",
"classnames": "^2.3.1",
@ -4173,14 +4173,14 @@
}
},
"@wordpress/format-library": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.9.tgz",
"integrity": "sha512-yzEOzUZ2J/13ENV83x4P+hBFQXNO8QHgYJlaGsnTWYVJTVQtG16ggIcv2JfZ5myHIhl32DRMOvM2SdtnmU8eyw==",
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.11.tgz",
"integrity": "sha512-RhEQtTDUjXJMNkSCL8v+l2/N8T8kizfSoaD84bbJbSU1sahUF7Cdxtlp06z374iTZDzIqZxtEftWRljJs/AqVA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/components": "^19.0.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/data": "^6.1.4",
"@wordpress/dom": "^3.2.7",
@ -4235,13 +4235,13 @@
}
},
"@wordpress/interface": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.5.tgz",
"integrity": "sha512-IH/v8sFVT6luFCtnAZ0U82SsXzGJ1qs1m+1UUlSyYpk+jVxy1RQSbFXvdy6NxlO4bOsZYm+ltZN82BuC32Co9A==",
"version": "4.1.7",
"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.7.tgz",
"integrity": "sha512-mXsTvVKfDctZ1Kkhto2NLCs8xi3cHFD7QU8OIuofgO8rKlQ4ro7+QTuu1N/SfGRnmTQTX0d1gUMzi4JwWp3nsA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/data": "^6.1.4",
"@wordpress/deprecated": "^3.2.3",
@ -4339,13 +4339,13 @@
}
},
"@wordpress/list-reusable-blocks": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.7.tgz",
"integrity": "sha512-UAv+kXfIuOWO42nSqotQ2sq4pfTa4YDar5NOXMUxsGjYXgOH5CHTeDUGDxhWtHVqNLdubPbmExuVs086D2RCoQ==",
"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==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/element": "^4.0.4",
"@wordpress/i18n": "^4.2.4",
@ -4383,12 +4383,12 @@
"dev": true
},
"@wordpress/nux": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.7.tgz",
"integrity": "sha512-bVFqkS0+FtceCMj1jTl9PlYHsX61keHlFB7NcfGJmMlUE1d8WhPT5qnH/+/KIMV5mnS0PINT7ZNozaRWYHtUEg==",
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.9.tgz",
"integrity": "sha512-HGQVQm/8YAyNCIDQRzwAQSikT4tkJ/Gf/4NU2LbQf45gk0vuPLlbXmlF/cA/AQdA8l8hKfE51SfETRRPIE63IA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/data": "^6.1.4",
"@wordpress/deprecated": "^3.2.3",
@ -4414,12 +4414,12 @@
}
},
"@wordpress/postcss-plugins-preset": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.4.tgz",
"integrity": "sha512-YFoV+rtBgoWYnW82iQCL5BwYzDPEE0aVNs33IkKV5X+eu7w730q+nyN7th+N4DOYdgApCgi9At2LLMAqTDtwwQ==",
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.5.tgz",
"integrity": "sha512-R+UKnjSJivvVEZ8rhGrXxsj/BlVeNO2FRXq3IxEOPv5ZRfAS0g8k8EO3xsCIV1RfnozvAApkKEYRClDYXIt+vA==",
"dev": true,
"requires": {
"@wordpress/base-styles": "^4.0.3",
"@wordpress/base-styles": "^4.0.4",
"autoprefixer": "^10.2.5"
},
"dependencies": {
@ -4438,9 +4438,9 @@
}
},
"browserslist": {
"version": "4.18.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz",
"integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==",
"version": "4.18.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
"integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001280",
@ -4451,15 +4451,15 @@
}
},
"caniuse-lite": {
"version": "1.0.30001280",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz",
"integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
"version": "1.0.30001282",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz",
"integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==",
"dev": true
},
"electron-to-chromium": {
"version": "1.3.896",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz",
"integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==",
"version": "1.3.904",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
"integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
"dev": true
},
"node-releases": {
@ -4513,13 +4513,13 @@
}
},
"@wordpress/reusable-blocks": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.9.tgz",
"integrity": "sha512-ARd5mZwtcomk0T5uSI8PXT1/tvrgFAYHgqAUqLLspKU0iBAy8s2n6kkosBxhD8laZiiz5gylw2B3uKM3TJRBGQ==",
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.11.tgz",
"integrity": "sha512-5EQ+qrRDscEmILir+atYyZMgPOoHwZEYlxesRj1pEBO/dQX2tpZKt1W8SfkWSukRQYyqUby8z9sZ04ga+/Khlg==",
"requires": {
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -4553,9 +4553,9 @@
}
},
"@wordpress/scripts": {
"version": "19.2.1",
"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.1.tgz",
"integrity": "sha512-BIdCeCwPGQDlkfOR4THcxdiGMK7l27qbv1/n8OkqUcdDi9GICm3TnWeqzRgpw45j6GK0OCEvSjSjQi65kV1/Dw==",
"version": "19.2.2",
"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.2.tgz",
"integrity": "sha512-cH1NVhBKScNHIHXc3Af7FBOdsZBrA72IJVcZwUx79/BJVEhPVG3B9Kn4xkXP9RtYCkWETQ+s/KodzolL9RuHmQ==",
"dev": true,
"requires": {
"@svgr/webpack": "^5.5.0",
@ -4565,7 +4565,7 @@
"@wordpress/eslint-plugin": "^9.3.0",
"@wordpress/jest-preset-default": "^7.1.3",
"@wordpress/npm-package-json-lint-config": "^4.1.0",
"@wordpress/postcss-plugins-preset": "^3.2.4",
"@wordpress/postcss-plugins-preset": "^3.2.5",
"@wordpress/prettier-config": "^1.1.1",
"@wordpress/stylelint-config": "^19.1.0",
"babel-jest": "^26.6.3",
@ -4747,15 +4747,15 @@
}
},
"acorn": {
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
"integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
"integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
"dev": true
},
"browserslist": {
"version": "4.18.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz",
"integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==",
"version": "4.18.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
"integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001280",
@ -4766,9 +4766,9 @@
}
},
"caniuse-lite": {
"version": "1.0.30001280",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz",
"integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
"version": "1.0.30001282",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz",
"integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==",
"dev": true
},
"commander": {
@ -4777,12 +4777,6 @@
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true
},
"css-color-names": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz",
"integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==",
"dev": true
},
"css-declaration-sorter": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz",
@ -4822,21 +4816,21 @@
"dev": true
},
"cssnano": {
"version": "5.0.10",
"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.10.tgz",
"integrity": "sha512-YfNhVJJ04imffOpbPbXP2zjIoByf0m8E2c/s/HnvSvjXgzXMfgopVjAEGvxYOjkOpWuRQDg/OZFjO7WW94Ri8w==",
"version": "5.0.11",
"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.11.tgz",
"integrity": "sha512-5SHM31NAAe29jvy0MJqK40zZ/8dGlnlzcfHKw00bWMVFp8LWqtuyPSFwbaoIoxvt71KWJOfg8HMRGrBR3PExCg==",
"dev": true,
"requires": {
"cssnano-preset-default": "^5.1.6",
"cssnano-preset-default": "^5.1.7",
"is-resolvable": "^1.1.0",
"lilconfig": "^2.0.3",
"yaml": "^1.10.2"
}
},
"cssnano-preset-default": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.6.tgz",
"integrity": "sha512-X2nDeNGBXc0486oHjT2vSj+TdeyVsxRvJUxaOH50hOM6vSDLkKd0+59YXpSZRInJ4sNtBOykS4KsPfhdrU/35w==",
"version": "5.1.7",
"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.7.tgz",
"integrity": "sha512-bWDjtTY+BOqrqBtsSQIbN0RLGD2Yr2CnecpP0ydHNafh9ZUEre8c8VYTaH9FEbyOt0eIfEUAYYk5zj92ioO8LA==",
"dev": true,
"requires": {
"css-declaration-sorter": "^6.0.3",
@ -4848,11 +4842,11 @@
"postcss-discard-duplicates": "^5.0.1",
"postcss-discard-empty": "^5.0.1",
"postcss-discard-overridden": "^5.0.1",
"postcss-merge-longhand": "^5.0.3",
"postcss-merge-rules": "^5.0.2",
"postcss-merge-longhand": "^5.0.4",
"postcss-merge-rules": "^5.0.3",
"postcss-minify-font-values": "^5.0.1",
"postcss-minify-gradients": "^5.0.3",
"postcss-minify-params": "^5.0.1",
"postcss-minify-params": "^5.0.2",
"postcss-minify-selectors": "^5.1.0",
"postcss-normalize-charset": "^5.0.1",
"postcss-normalize-display-values": "^5.0.1",
@ -4861,13 +4855,13 @@
"postcss-normalize-string": "^5.0.1",
"postcss-normalize-timing-functions": "^5.0.1",
"postcss-normalize-unicode": "^5.0.1",
"postcss-normalize-url": "^5.0.2",
"postcss-normalize-url": "^5.0.3",
"postcss-normalize-whitespace": "^5.0.1",
"postcss-ordered-values": "^5.0.2",
"postcss-reduce-initial": "^5.0.1",
"postcss-reduce-transforms": "^5.0.1",
"postcss-svgo": "^5.0.3",
"postcss-unique-selectors": "^5.0.1"
"postcss-unique-selectors": "^5.0.2"
}
},
"dom-serializer": {
@ -4899,9 +4893,9 @@
}
},
"electron-to-chromium": {
"version": "1.3.896",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz",
"integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==",
"version": "1.3.904",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
"integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
"dev": true
},
"enhanced-resolve": {
@ -5058,27 +5052,25 @@
"dev": true
},
"postcss-merge-longhand": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz",
"integrity": "sha512-kmB+1TjMTj/bPw6MCDUiqSA5e/x4fvLffiAdthra3a0m2/IjTrWsTmD3FdSskzUjEwkj5ZHBDEbv5dOcqD7CMQ==",
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz",
"integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==",
"dev": true,
"requires": {
"css-color-names": "^1.0.1",
"postcss-value-parser": "^4.1.0",
"stylehacks": "^5.0.1"
}
},
"postcss-merge-rules": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz",
"integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==",
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz",
"integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==",
"dev": true,
"requires": {
"browserslist": "^4.16.6",
"caniuse-api": "^3.0.0",
"cssnano-utils": "^2.0.1",
"postcss-selector-parser": "^6.0.5",
"vendors": "^1.0.3"
"postcss-selector-parser": "^6.0.5"
},
"dependencies": {
"postcss-selector-parser": {
@ -5114,16 +5106,15 @@
}
},
"postcss-minify-params": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
"integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz",
"integrity": "sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==",
"dev": true,
"requires": {
"alphanum-sort": "^1.0.2",
"browserslist": "^4.16.0",
"browserslist": "^4.16.6",
"cssnano-utils": "^2.0.1",
"postcss-value-parser": "^4.1.0",
"uniqs": "^2.0.0"
"postcss-value-parser": "^4.1.0"
}
},
"postcss-minify-selectors": {
@ -5213,9 +5204,9 @@
}
},
"postcss-normalize-url": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz",
"integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==",
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz",
"integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==",
"dev": true,
"requires": {
"is-absolute-url": "^3.0.3",
@ -5273,14 +5264,13 @@
}
},
"postcss-unique-selectors": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz",
"integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz",
"integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==",
"dev": true,
"requires": {
"alphanum-sort": "^1.0.2",
"postcss-selector-parser": "^6.0.5",
"uniqs": "^2.0.0"
"postcss-selector-parser": "^6.0.5"
},
"dependencies": {
"postcss-selector-parser": {
@ -5345,9 +5335,9 @@
}
},
"source-map-support": {
"version": "0.5.20",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
"integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
"version": "0.5.21",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
@ -5395,9 +5385,9 @@
"dev": true
},
"terser": {
"version": "5.9.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
"integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
"version": "5.10.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
"integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
"dev": true,
"requires": {
"commander": "^2.20.0",
@ -5443,9 +5433,9 @@
}
},
"webpack": {
"version": "5.64.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz",
"integrity": "sha512-UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg==",
"version": "5.64.2",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.2.tgz",
"integrity": "sha512-4KGc0+Ozi0aS3EaLNRvEppfZUer+CaORKqL6OBjDLZOPf9YfN8leagFzwe6/PoBdHFxc/utKArl8LMC0Ivtmdg==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@ -5471,7 +5461,7 @@
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
"watchpack": "^2.2.0",
"webpack-sources": "^3.2.0"
"webpack-sources": "^3.2.2"
}
},
"webpack-livereload-plugin": {
@ -5487,22 +5477,22 @@
}
},
"webpack-sources": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
"integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==",
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
"integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
"dev": true
}
}
},
"@wordpress/server-side-render": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.7.tgz",
"integrity": "sha512-rEvcKVrhgXKVwzt6A1goneIpkhcIrBqeYtRYMDkv+6SSWMMzkXRCqEGnPwPJ+/P1KEc1mLWdvJiIG70CrUIlVA==",
"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==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/data": "^6.1.4",
"@wordpress/deprecated": "^3.2.3",
@ -5568,15 +5558,15 @@
"integrity": "sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA=="
},
"@wordpress/widgets": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.9.tgz",
"integrity": "sha512-008hF4jJkeVdncIGvkxd40Wb3A89Eu1TVC7J2K15pb1NWtJH0rYUB+9vrD7fglWk0xo8iaMMClMv04vAPybw8g==",
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.11.tgz",
"integrity": "sha512-XIY/W7WnEXbWSeycFtxaShHYxtJOlTgX9L4DCo/hh2IHkG3HHsZ8qIx0lMtsMq2BKZ2mbL3GCp/cjgBNQygUhg==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/block-editor": "^8.0.3",
"@wordpress/block-editor": "^8.0.5",
"@wordpress/blocks": "^11.1.4",
"@wordpress/components": "^19.0.3",
"@wordpress/components": "^19.0.5",
"@wordpress/compose": "^5.0.6",
"@wordpress/core-data": "^4.0.7",
"@wordpress/data": "^6.1.4",
@ -5726,6 +5716,35 @@
"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
"dev": true
},
"ajv-formats": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
"dev": true,
"requires": {
"ajv": "^8.0.0"
},
"dependencies": {
"ajv": {
"version": "8.8.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
"integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
"require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
}
},
"json-schema-traverse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
}
}
},
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@ -11187,9 +11206,9 @@
}
},
"eslint-plugin-react": {
"version": "7.27.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz",
"integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==",
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz",
"integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==",
"dev": true,
"requires": {
"array-includes": "^3.1.4",
@ -12295,9 +12314,9 @@
}
},
"find-process": {
"version": "1.4.5",
"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.5.tgz",
"integrity": "sha512-v11rJYYISUWn+s8qZzgGnBvlzRKf3bOtlGFM8H0kw56lGQtOmLuLCzuclA5kehA2j7S5sioOWdI4woT3jDavAw==",
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
"integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
@ -15296,9 +15315,9 @@
},
"dependencies": {
"@babel/parser": {
"version": "7.16.3",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz",
"integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==",
"version": "7.16.4",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
"integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
"dev": true
},
"semver": {
@ -16768,9 +16787,9 @@
},
"dependencies": {
"acorn": {
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
"integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
"integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
"dev": true
},
"agent-base": {
@ -17474,9 +17493,9 @@
}
},
"lines-and-columns": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
},
"linkify-it": {
"version": "2.2.0",
@ -18342,12 +18361,12 @@
"dev": true
},
"mini-css-extract-plugin": {
"version": "2.4.4",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz",
"integrity": "sha512-UJ+aNuFQaQaECu7AamlWOBLj2cJ6XSGU4zNiqXeZ7lZLe5VD0DoSPWFbWArXueo+6FZVbgHzpX9lUIaBIDLuYg==",
"version": "2.4.5",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
"integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
"dev": true,
"requires": {
"schema-utils": "^3.1.0"
"schema-utils": "^4.0.0"
},
"dependencies": {
"@types/json-schema": {
@ -18356,15 +18375,43 @@
"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
"dev": true
},
"schema-utils": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
"ajv": {
"version": "8.8.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
"integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.8",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
"require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
}
},
"ajv-keywords": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.3"
}
},
"json-schema-traverse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
"schema-utils": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
"ajv": "^8.8.0",
"ajv-formats": "^2.1.1",
"ajv-keywords": "^5.0.0"
}
}
}
@ -21569,9 +21616,9 @@
}
},
"react-colorful": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.0.tgz",
"integrity": "sha512-BuzrlrM0ylg7coPkXOrRqlf2BgHLw5L44sybbr9Lg4xy7w9e5N7fGYbojOO0s8J0nvrM3PERN2rVFkvSa24lnQ=="
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz",
"integrity": "sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg=="
},
"react-dates": {
"version": "17.2.0",
@ -21938,9 +21985,9 @@
}
},
"reakit": {
"version": "1.3.10",
"resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.10.tgz",
"integrity": "sha512-HxHtnegMDwidGU4Ik/fKTZ3coihf4nKeycs0QSIFWcau77qL5wL6xnqZrAxcjjDDPOIANct3LxTiAlf+qGLOlw==",
"version": "1.3.11",
"resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz",
"integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==",
"requires": {
"@popperjs/core": "^2.5.4",
"body-scroll-lock": "^3.1.5",
@ -24929,9 +24976,9 @@
},
"dependencies": {
"ajv": {
"version": "8.8.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.0.tgz",
"integrity": "sha512-L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg==",
"version": "8.8.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
"integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@ -25363,9 +25410,9 @@
"dev": true
},
"tsconfig-paths": {
"version": "3.11.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
"integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
"integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
"dev": true,
"requires": {
"@types/json5": "^0.0.29",
@ -26338,9 +26385,9 @@
},
"dependencies": {
"acorn": {
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
"integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
"integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
"dev": true
},
"acorn-walk": {

View File

@ -29,7 +29,7 @@
"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
"@wordpress/e2e-test-utils": "5.4.8",
"@wordpress/library-export-default-webpack-plugin": "2.2.0",
"@wordpress/scripts": "19.2.1",
"@wordpress/scripts": "19.2.2",
"autoprefixer": "^9.8.8",
"chalk": "4.1.2",
"check-node-version": "4.1.0",
@ -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.9",
"@wordpress/block-editor": "8.0.3",
"@wordpress/block-library": "6.0.7",
"@wordpress/block-directory": "3.0.11",
"@wordpress/block-editor": "8.0.5",
"@wordpress/block-library": "6.0.9",
"@wordpress/block-serialization-default-parser": "4.2.3",
"@wordpress/blocks": "11.1.4",
"@wordpress/components": "19.0.3",
"@wordpress/components": "19.0.5",
"@wordpress/compose": "5.0.6",
"@wordpress/core-data": "4.0.7",
"@wordpress/customize-widgets": "2.0.9",
"@wordpress/customize-widgets": "2.0.11",
"@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.9",
"@wordpress/edit-site": "3.0.9",
"@wordpress/edit-widgets": "3.1.4",
"@wordpress/editor": "12.0.6",
"@wordpress/edit-post": "5.0.11",
"@wordpress/edit-site": "3.0.11",
"@wordpress/edit-widgets": "3.1.6",
"@wordpress/editor": "12.0.8",
"@wordpress/element": "4.0.4",
"@wordpress/escape-html": "2.2.3",
"@wordpress/format-library": "3.0.9",
"@wordpress/format-library": "3.0.11",
"@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.5",
"@wordpress/interface": "4.1.7",
"@wordpress/is-shallow-equal": "4.2.1",
"@wordpress/keyboard-shortcuts": "3.0.6",
"@wordpress/keycodes": "3.2.4",
"@wordpress/list-reusable-blocks": "3.0.7",
"@wordpress/list-reusable-blocks": "3.0.9",
"@wordpress/media-utils": "3.0.5",
"@wordpress/notices": "3.2.7",
"@wordpress/nux": "5.0.7",
"@wordpress/nux": "5.0.9",
"@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.9",
"@wordpress/reusable-blocks": "3.0.11",
"@wordpress/rich-text": "5.0.6",
"@wordpress/server-side-render": "3.0.7",
"@wordpress/server-side-render": "3.0.9",
"@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.9",
"@wordpress/widgets": "2.0.11",
"@wordpress/wordcount": "3.2.3",
"backbone": "1.4.0",
"clipboard": "2.0.8",

View File

@ -212,19 +212,13 @@ if ( wp_is_block_template_theme() ) {
'edit_theme_options',
'site-editor.php',
);
$submenu['themes.php'][7] = array(
__( 'Styles' ),
'edit_theme_options',
'site-editor.php?styles=open',
);
}
// Hide Customize link on block themes unless a plugin or theme is using
// customize_register to add a setting.
if ( ! wp_is_block_template_theme() || has_action( 'customize_register' ) ) {
$customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
$position = wp_is_block_template_theme() ? 8 : 6;
$position = wp_is_block_template_theme() ? 7 : 6;
$submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
}
@ -249,17 +243,24 @@ unset( $appearance_cap );
// Add 'Theme Editor' to the bottom of the Appearance menu.
if ( ! is_multisite() ) {
// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook.
add_action( 'admin_menu', '_add_themes_utility_last', 101 );
}
/**
* Adds the 'Theme Editor' link to the bottom of the Appearance menu.
* Adds the 'Theme Editor' link to the bottom of the Appearance or Tools menu.
*
* @access private
* @since 3.0.0
* @since 5.9.0 'Theme Editor' link has moved to the Tools menu when a block theme is active.
*/
function _add_themes_utility_last() {
// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook.
add_submenu_page( 'themes.php', __( 'Theme Editor' ), __( 'Theme Editor' ), 'edit_themes', 'theme-editor.php' );
add_submenu_page(
wp_is_block_template_theme() ? 'tools.php' : 'themes.php',
__( 'Theme Editor' ),
__( 'Theme Editor' ),
'edit_themes',
'theme-editor.php'
);
}
$count = '';

View File

@ -40,61 +40,90 @@ add_filter(
);
$block_editor_context = new WP_Block_Editor_Context();
$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
$active_theme = wp_get_theme()->get_stylesheet();
$preload_paths = array(
array( '/wp/v2/media', 'OPTIONS' ),
'/',
'/wp/v2/types?context=edit',
'/wp/v2/taxonomies?context=edit',
'/wp/v2/pages?context=edit',
'/wp/v2/categories?context=edit',
'/wp/v2/posts?context=edit',
'/wp/v2/tags?context=edit',
'/wp/v2/templates?context=edit',
'/wp/v2/template-parts?context=edit',
'/wp/v2/settings',
'/wp/v2/themes?context=edit&status=active',
'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
'/wp/v2/global-styles/' . $active_global_styles_id,
'/wp/v2/themes/' . $active_theme . '/global-styles',
'/wp/v2/block-navigation-areas?context=edit',
$custom_settings = array(
'siteUrl' => site_url(),
'postsPerPage' => get_option( 'posts_per_page' ),
'styles' => get_block_editor_theme_styles(),
'defaultTemplateTypes' => get_default_block_template_types(),
'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
'__experimentalBlockPatterns' => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
'__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
);
$editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context );
$areas = get_option( 'wp_navigation_areas', array() );
$active_areas = array_intersect_key( $areas, get_navigation_areas() );
foreach ( $active_areas as $post_id ) {
if ( $post_id ) {
$preload_paths[] = add_query_arg( 'context', 'edit', rest_get_route_for_post( $post_id ) );
if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) {
$post_type = get_post_type_object( $_GET['postType'] );
if ( ! $post_type ) {
wp_die( __( 'Invalid post type.' ) );
}
$preload_paths = array(
'/',
'/wp/v2/types/' . $post_type->name . '?context=edit',
'/wp/v2/types?context=edit',
'/wp/v2/' . $post_type->rest_base . '?context=edit',
);
block_editor_rest_api_preload( $preload_paths, $block_editor_context );
wp_add_inline_script(
'wp-edit-site',
sprintf(
'wp.domReady( function() {
wp.editSite.initializeList( "site-editor", "%s", %s );
} );',
$post_type->name,
wp_json_encode( $editor_settings )
)
);
} else {
$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
$active_theme = wp_get_theme()->get_stylesheet();
$preload_paths = array(
array( '/wp/v2/media', 'OPTIONS' ),
'/',
'/wp/v2/types?context=edit',
'/wp/v2/taxonomies?context=edit',
'/wp/v2/pages?context=edit',
'/wp/v2/categories?context=edit',
'/wp/v2/posts?context=edit',
'/wp/v2/tags?context=edit',
'/wp/v2/templates?context=edit',
'/wp/v2/template-parts?context=edit',
'/wp/v2/settings',
'/wp/v2/themes?context=edit&status=active',
'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
'/wp/v2/global-styles/' . $active_global_styles_id,
'/wp/v2/themes/' . $active_theme . '/global-styles',
'/wp/v2/block-navigation-areas?context=edit',
);
$areas = get_option( 'wp_navigation_areas', array() );
$active_areas = array_intersect_key( $areas, get_navigation_areas() );
foreach ( $active_areas as $post_id ) {
if ( $post_id ) {
$preload_paths[] = add_query_arg( 'context', 'edit', rest_get_route_for_post( $post_id ) );
}
}
block_editor_rest_api_preload( $preload_paths, $block_editor_context );
wp_add_inline_script(
'wp-edit-site',
sprintf(
'wp.domReady( function() {
wp.editSite.initializeEditor( "site-editor", %s );
} );',
wp_json_encode( $editor_settings )
)
);
}
block_editor_rest_api_preload( $preload_paths, $block_editor_context );
$editor_settings = get_block_editor_settings(
array(
'siteUrl' => site_url(),
'postsPerPage' => get_option( 'posts_per_page' ),
'styles' => get_block_editor_theme_styles(),
'defaultTemplateTypes' => get_default_block_template_types(),
'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
'__experimentalBlockPatterns' => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
'__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),
),
$block_editor_context
);
wp_add_inline_script(
'wp-edit-site',
sprintf(
'wp.domReady( function() {
wp.editSite.initialize( "site-editor", %s );
} );',
wp_json_encode( $editor_settings )
)
);
// Preload server-registered block schemas.
wp_add_inline_script(
'wp-blocks',

File diff suppressed because one or more lines are too long

View File

@ -342,7 +342,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
$colors_by_origin['user'] : (
isset( $colors_by_origin['theme'] ) ?
$colors_by_origin['theme'] :
$colors_by_origin['core']
$colors_by_origin['default']
);
}
if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
@ -351,7 +351,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
$gradients_by_origin['user'] : (
isset( $gradients_by_origin['theme'] ) ?
$gradients_by_origin['theme'] :
$gradients_by_origin['core']
$gradients_by_origin['default']
);
}
if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
@ -360,7 +360,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
$font_sizes_by_origin['user'] : (
isset( $font_sizes_by_origin['theme'] ) ?
$font_sizes_by_origin['theme'] :
$font_sizes_by_origin['core']
$font_sizes_by_origin['default']
);
}
if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) {

View File

@ -19,7 +19,7 @@ function render_block_core_calendar( $attributes ) {
// when there are no published posts on the site.
if ( ! block_core_calendar_has_published_posts() ) {
if ( is_user_logged_in() ) {
return '<div>' . __( 'The calendar block is hidden because there are no published posts.', 'gutenberg' ) . '</div>';
return '<div>' . __( 'The calendar block is hidden because there are no published posts.' ) . '</div>';
}
return '';
}

View File

@ -2,7 +2,8 @@
/**
* Server-side rendering of the `core/navigation-area` block.
*
* @package gutenberg
* @deprecated 5.9.0 See https://github.com/WordPress/gutenberg/issues/36524
* @package WordPress
*/
/**

View File

@ -2,7 +2,7 @@
/**
* Server-side rendering of the `core/navigation-link` block.
*
* @package gutenberg
* @package WordPress
*/
/**

View File

@ -2,7 +2,7 @@
/**
* Server-side rendering of the `core/navigation-submenu` block.
*
* @package gutenberg
* @package WordPress
*/
/**
@ -19,7 +19,7 @@ function block_core_navigation_submenu_build_css_colors( $context, $attributes )
'inline_styles' => '',
);
$is_sub_menu = isset( $attributes['isTopLevelLink'] ) ? ( ! $attributes['isTopLevelLink'] ) : false;
$is_sub_menu = isset( $attributes['isTopLevelItem'] ) ? ( ! $attributes['isTopLevelItem'] ) : false;
// Text color.
$named_text_color = null;
@ -150,12 +150,6 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
$has_submenu = count( $block->inner_blocks ) > 0;
$is_active = ! empty( $attributes['id'] ) && ( get_the_ID() === $attributes['id'] );
$class_name = ! empty( $attributes['className'] ) ? implode( ' ', (array) $attributes['className'] ) : false;
if ( false !== $class_name ) {
$css_classes .= ' ' . $class_name;
}
$show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'];
$open_on_click = isset( $block->context['openSubmenusOnClick'] ) && $block->context['openSubmenusOnClick'];
$open_on_hover_and_click = isset( $block->context['openSubmenusOnClick'] ) && ! $block->context['openSubmenusOnClick'] &&

View File

@ -2,7 +2,7 @@
/**
* Server-side rendering of the `core/navigation` block.
*
* @package gutenberg
* @package WordPress
*/
/**
@ -14,8 +14,10 @@
*/
function block_core_navigation_build_css_colors( $attributes ) {
$colors = array(
'css_classes' => array(),
'inline_styles' => '',
'css_classes' => array(),
'inline_styles' => '',
'overlay_css_classes' => array(),
'overlay_inline_styles' => '',
);
// Text color.
@ -54,6 +56,42 @@ function block_core_navigation_build_css_colors( $attributes ) {
$colors['inline_styles'] .= sprintf( 'background-color: %s;', $attributes['customBackgroundColor'] );
}
// Overlay text color.
$has_named_overlay_text_color = array_key_exists( 'overlayTextColor', $attributes );
$has_custom_overlay_text_color = array_key_exists( 'customOverlayTextColor', $attributes );
// If has overlay text color.
if ( $has_custom_overlay_text_color || $has_named_overlay_text_color ) {
// Add has-text-color class.
$colors['overlay_css_classes'][] = 'has-text-color';
}
if ( $has_named_overlay_text_color ) {
// Add the overlay color class.
$colors['overlay_css_classes'][] = sprintf( 'has-%s-color', $attributes['overlayTextColor'] );
} elseif ( $has_custom_overlay_text_color ) {
// Add the custom overlay color inline style.
$colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $attributes['customOverlayTextColor'] );
}
// Overlay background color.
$has_named_overlay_background_color = array_key_exists( 'overlayBackgroundColor', $attributes );
$has_custom_overlay_background_color = array_key_exists( 'customOverlayBackgroundColor', $attributes );
// If has overlay background color.
if ( $has_custom_overlay_background_color || $has_named_overlay_background_color ) {
// Add has-background class.
$colors['overlay_css_classes'][] = 'has-background';
}
if ( $has_named_overlay_background_color ) {
// Add the overlay background-color class.
$colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', $attributes['overlayBackgroundColor'] );
} elseif ( $has_custom_overlay_background_color ) {
// Add the custom overlay background-color inline style.
$colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $attributes['customOverlayBackgroundColor'] );
}
return $colors;
}
@ -247,6 +285,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
$responsive_container_classes = array(
'wp-block-navigation__responsive-container',
$is_hidden_by_default ? 'hidden-by-default' : '',
implode( ' ', $colors['overlay_css_classes'] ),
);
$open_button_classes = array(
'wp-block-navigation__responsive-container-open',
@ -255,7 +294,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
$responsive_container_markup = sprintf(
'<button aria-expanded="false" aria-haspopup="true" aria-label="%3$s" class="%6$s" data-micromodal-trigger="modal-%1$s"><svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg></button>
<div class="%5$s" id="modal-%1$s">
<div class="%5$s" style="%7$s" id="modal-%1$s">
<div class="wp-block-navigation__responsive-close" tabindex="-1" data-micromodal-close>
<div class="wp-block-navigation__responsive-dialog" role="dialog" aria-modal="true" aria-labelledby="modal-%1$s-title" >
<button aria-label="%4$s" data-micromodal-close class="wp-block-navigation__responsive-container-close"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button>
@ -270,7 +309,8 @@ function render_block_core_navigation( $attributes, $content, $block ) {
__( 'Open menu' ), // Open button label.
__( 'Close menu' ), // Close button label.
implode( ' ', $responsive_container_classes ),
implode( ' ', $open_button_classes )
implode( ' ', $open_button_classes ),
$colors['overlay_inline_styles']
);
return sprintf(

View File

@ -34,7 +34,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
if ( $has_named_text_color ) {
// Add the color class.
$colors['css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['textColor'] ) );
$colors['css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['textColor'] ) );
} elseif ( $has_picked_text_color ) {
$colors['inline_styles'] .= sprintf( 'color: %s;', $context['customTextColor'] );
} elseif ( $has_custom_text_color ) {
@ -55,7 +55,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
if ( $has_named_background_color ) {
// Add the background-color class.
$colors['css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['backgroundColor'] ) );
$colors['css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['backgroundColor'] ) );
} elseif ( $has_picked_background_color ) {
$colors['inline_styles'] .= sprintf( 'background-color: %s;', $context['customBackgroundColor'] );
} elseif ( $has_custom_background_color ) {
@ -74,7 +74,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
// Give overlay colors priority, fall back to Navigation block colors, then global styles.
if ( $has_named_overlay_text_color ) {
$colors['overlay_css_classes'][] = sprintf( 'has-%s-color', gutenberg_experimental_to_kebab_case( $context['overlayTextColor'] ) );
$colors['overlay_css_classes'][] = sprintf( 'has-%s-color', _wp_to_kebab_case( $context['overlayTextColor'] ) );
} elseif ( $has_picked_overlay_text_color ) {
$colors['overlay_inline_styles'] .= sprintf( 'color: %s;', $context['customOverlayTextColor'] );
}
@ -89,7 +89,7 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
}
if ( $has_named_overlay_background_color ) {
$colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', gutenberg_experimental_to_kebab_case( $context['overlayBackgroundColor'] ) );
$colors['overlay_css_classes'][] = sprintf( 'has-%s-background-color', _wp_to_kebab_case( $context['overlayBackgroundColor'] ) );
} elseif ( $has_picked_overlay_background_color ) {
$colors['overlay_inline_styles'] .= sprintf( 'background-color: %s;', $context['customOverlayBackgroundColor'] );
}
@ -182,7 +182,7 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
) . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
'</button>';
} else {
$markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . ' "href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . wp_kses(
$markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . wp_kses(
$page['title'],
wp_kses_allowed_html( 'post' )
) . '</a>';

View File

@ -136,7 +136,7 @@ class WP_Theme_JSON_Resolver {
$config = self::read_json_file( __DIR__ . '/theme.json' );
$config = self::translate( $config );
self::$core = new WP_Theme_JSON( $config, 'core' );
self::$core = new WP_Theme_JSON( $config, 'default' );
return self::$core;
}
@ -182,7 +182,32 @@ class WP_Theme_JSON_Resolver {
* So we take theme supports, transform it to theme.json shape
* and merge the self::$theme upon that.
*/
$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
if ( ! self::theme_has_support() ) {
if ( ! isset( $theme_support_data['settings']['color'] ) ) {
$theme_support_data['settings']['color'] = array();
}
$default_palette = false;
if ( current_theme_supports( 'default-color-palette' ) ) {
$default_palette = true;
}
if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
// If the theme does not have any palette, we still want to show the core one.
$default_palette = true;
}
$theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
$default_gradients = false;
if ( current_theme_supports( 'default-gradient-presets' ) ) {
$default_gradients = true;
}
if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
// If the theme does not have any gradients, we still want to show the core ones.
$default_gradients = true;
}
$theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
}
$with_theme_supports = new WP_Theme_JSON( $theme_support_data );
$with_theme_supports->merge( self::$theme );
@ -293,7 +318,7 @@ class WP_Theme_JSON_Resolver {
/**
* There are three sources of data (origins) for a site:
* core, theme, and user. The user's has higher priority
* default, theme, and user. The user's has higher priority
* than the theme's, and the theme's higher than core's.
*
* Unlike the getters {@link get_core_data},

View File

@ -51,7 +51,7 @@ class WP_Theme_JSON {
* @var string[]
*/
const VALID_ORIGINS = array(
'core',
'default',
'theme',
'user',
);
@ -220,15 +220,17 @@ class WP_Theme_JSON {
'width' => null,
),
'color' => array(
'background' => null,
'custom' => null,
'customDuotone' => null,
'customGradient' => null,
'duotone' => null,
'gradients' => null,
'link' => null,
'palette' => null,
'text' => null,
'background' => null,
'custom' => null,
'customDuotone' => null,
'customGradient' => null,
'defaultGradients' => null,
'defaultPalette' => null,
'duotone' => null,
'gradients' => null,
'link' => null,
'palette' => null,
'text' => null,
),
'custom' => null,
'layout' => array(
@ -324,7 +326,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 'core', 'theme', or 'user'. Default 'theme'.
* One of 'default', 'theme', or 'user'. Default 'theme'.
*/
public function __construct( $theme_json = array(), $origin = 'theme' ) {
if ( ! in_array( $origin, self::VALID_ORIGINS, true ) ) {
@ -343,7 +345,9 @@ class WP_Theme_JSON {
$path = array_merge( $node['path'], $preset_metadata['path'] );
$preset = _wp_array_get( $this->theme_json, $path, null );
if ( null !== $preset ) {
_wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
if ( 'user' !== $origin || isset( $preset[0] ) ) {
_wp_array_set( $this->theme_json, $path, array( $origin => $preset ) );
}
}
}
}
@ -1472,46 +1476,48 @@ class WP_Theme_JSON {
private static function remove_insecure_settings( $input ) {
$output = array();
foreach ( self::PRESETS_METADATA as $preset_metadata ) {
$presets = _wp_array_get( $input, $preset_metadata['path'], null );
if ( null === $presets ) {
continue;
}
foreach ( self::VALID_ORIGINS as $origin ) {
$path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) );
$presets = _wp_array_get( $input, $path_with_origin, null );
if ( null === $presets ) {
continue;
}
$escaped_preset = array();
foreach ( $presets as $preset ) {
if (
esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
sanitize_html_class( $preset['slug'] ) === $preset['slug']
) {
$value = null;
if ( isset( $preset_metadata['value_key'] ) ) {
$value = $preset[ $preset_metadata['value_key'] ];
} elseif (
isset( $preset_metadata['value_func'] ) &&
is_callable( $preset_metadata['value_func'] )
$escaped_preset = array();
foreach ( $presets as $preset ) {
if (
esc_attr( esc_html( $preset['name'] ) ) === $preset['name'] &&
sanitize_html_class( $preset['slug'] ) === $preset['slug']
) {
$value = call_user_func( $preset_metadata['value_func'], $preset );
}
$value = null;
if ( isset( $preset_metadata['value_key'] ) ) {
$value = $preset[ $preset_metadata['value_key'] ];
} elseif (
isset( $preset_metadata['value_func'] ) &&
is_callable( $preset_metadata['value_func'] )
) {
$value = call_user_func( $preset_metadata['value_func'], $preset );
}
$preset_is_valid = true;
foreach ( $preset_metadata['properties'] as $property ) {
if ( ! self::is_safe_css_declaration( $property, $value ) ) {
$preset_is_valid = false;
break;
$preset_is_valid = true;
foreach ( $preset_metadata['properties'] as $property ) {
if ( ! self::is_safe_css_declaration( $property, $value ) ) {
$preset_is_valid = false;
break;
}
}
if ( $preset_is_valid ) {
$escaped_preset[] = $preset;
}
}
}
if ( $preset_is_valid ) {
$escaped_preset[] = $preset;
}
if ( ! empty( $escaped_preset ) ) {
_wp_array_set( $output, $path_with_origin, $escaped_preset );
}
}
if ( ! empty( $escaped_preset ) ) {
_wp_array_set( $output, $preset_metadata['path'], $escaped_preset );
}
}
return $output;
}

View File

@ -105,14 +105,14 @@ function wp_get_global_stylesheet( $types = array() ) {
$types = array( 'variables', 'styles', 'presets' );
}
$origins = array( 'core', 'theme', 'user' );
$origins = array( 'default', 'theme', 'user' );
if ( ! $supports_theme_json && ! $supports_link_color ) {
// In this case we only enqueue the core presets (CSS Custom Properties + the classes).
$origins = array( 'core' );
$origins = array( 'default' );
} elseif ( ! $supports_theme_json && $supports_link_color ) {
// For the legacy link color feature to work, the CSS Custom Properties
// should be in scope (either the core or the theme ones).
$origins = array( 'core', 'theme' );
$origins = array( 'default', 'theme' );
}
$tree = WP_Theme_JSON_Resolver::get_merged_data();

View File

@ -357,7 +357,7 @@ function create_initial_post_types() {
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
'has_archive' => false,
'show_ui' => wp_is_block_template_theme(),
'show_in_menu' => 'themes.php',
'show_in_menu' => false,
'show_in_rest' => true,
'rewrite' => false,
'rest_base' => 'templates',
@ -416,7 +416,7 @@ function create_initial_post_types() {
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
'has_archive' => false,
'show_ui' => wp_is_block_template_theme(),
'show_in_menu' => 'themes.php',
'show_in_menu' => false,
'show_in_rest' => true,
'rewrite' => false,
'rest_base' => 'template-parts',

View File

@ -76,7 +76,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
* @ticket 53397
*/
public function test_get_settings_presets_are_keyed_by_origin() {
$core_origin = new WP_Theme_JSON(
$default_origin = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
@ -103,9 +103,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
),
),
),
'core'
'default'
);
$no_origin = new WP_Theme_JSON(
$no_origin = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
@ -134,15 +134,15 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
$actual_core = $core_origin->get_raw_data();
$actual_default = $default_origin->get_raw_data();
$actual_no_origin = $no_origin->get_raw_data();
$expected_core = array(
$expected_default = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'palette' => array(
'core' => array(
'default' => array(
array(
'slug' => 'white',
'color' => 'white',
@ -154,7 +154,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'core/group' => array(
'color' => array(
'palette' => array(
'core' => array(
'default' => array(
array(
'slug' => 'white',
'color' => 'white',
@ -196,7 +196,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
),
);
$this->assertEqualSetsWithIndex( $expected_core, $actual_core );
$this->assertEqualSetsWithIndex( $expected_default, $actual_default );
$this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
}
@ -593,7 +593,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
),
),
),
'core'
'default'
);
$this->assertEquals(
@ -1298,20 +1298,22 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'color' => array(
'custom' => true,
'palette' => array(
array(
'name' => 'Red',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'green',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => '#0000ff',
'user' => array(
array(
'name' => 'Red',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'green',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => '#0000ff',
),
),
),
),
@ -1323,20 +1325,22 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'color' => array(
'custom' => true,
'palette' => array(
array(
'name' => 'Yellow',
'slug' => 'yellow',
'color' => '#ff0000',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#00ff00',
),
array(
'name' => 'Orange',
'slug' => 'orange',
'color' => '#0000ff',
'user' => array(
array(
'name' => 'Yellow',
'slug' => 'yellow',
'color' => '#ff0000',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#00ff00',
),
array(
'name' => 'Orange',
'slug' => 'orange',
'color' => '#0000ff',
),
),
),
),
@ -1354,20 +1358,22 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'settings' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Red',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'green',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => '#0000ff',
'user' => array(
array(
'name' => 'Red',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'green',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => '#0000ff',
),
),
),
),
@ -1375,20 +1381,22 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'core/group' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Yellow',
'slug' => 'yellow',
'color' => '#ff0000',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#00ff00',
),
array(
'name' => 'Orange',
'slug' => 'orange',
'color' => '#0000ff',
'user' => array(
array(
'name' => 'Yellow',
'slug' => 'yellow',
'color' => '#ff0000',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#00ff00',
),
array(
'name' => 'Orange',
'slug' => 'orange',
'color' => '#0000ff',
),
),
),
),
@ -1409,49 +1417,53 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'settings' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Red/><b>ok</ok>',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'a" attr',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => 'var(--color, var(--unsafe-fallback))',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
'user' => array(
array(
'name' => 'Red/><b>ok</ok>',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'a" attr',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => 'var(--color, var(--unsafe-fallback))',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
),
),
),
),
'typography' => array(
'fontFamilies' => array(
array(
'name' => 'Helvetica Arial/><b>test</b>',
'slug' => 'helvetica-arial',
'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
),
array(
'name' => 'Geneva',
'slug' => 'geneva#asa',
'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
),
array(
'name' => 'Cambria',
'slug' => 'cambria',
'fontFamily' => 'Cambria, Georgia, serif',
),
array(
'name' => 'Helvetica Arial',
'slug' => 'helvetica-arial',
'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
'user' => array(
array(
'name' => 'Helvetica Arial/><b>test</b>',
'slug' => 'helvetica-arial',
'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
),
array(
'name' => 'Geneva',
'slug' => 'geneva#asa',
'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
),
array(
'name' => 'Cambria',
'slug' => 'cambria',
'fontFamily' => 'Cambria, Georgia, serif',
),
array(
'name' => 'Helvetica Arial',
'slug' => 'helvetica-arial',
'fontFamily' => 'var(--fontFamily, var(--unsafe-fallback))',
),
),
),
),
@ -1459,25 +1471,27 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'core/group' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Red/><b>ok</ok>',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'a" attr',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => 'var(--color, var(--unsafe--fallback))',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
'user' => array(
array(
'name' => 'Red/><b>ok</ok>',
'slug' => 'red',
'color' => '#ff0000',
),
array(
'name' => 'Green',
'slug' => 'a" attr',
'color' => '#00ff00',
),
array(
'name' => 'Blue',
'slug' => 'blue',
'color' => 'var(--color, var(--unsafe--fallback))',
),
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
),
),
),
),
@ -1492,19 +1506,23 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'settings' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
'user' => array(
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
),
),
),
),
'typography' => array(
'fontFamilies' => array(
array(
'name' => 'Cambria',
'slug' => 'cambria',
'fontFamily' => 'Cambria, Georgia, serif',
'user' => array(
array(
'name' => 'Cambria',
'slug' => 'cambria',
'fontFamily' => 'Cambria, Georgia, serif',
),
),
),
),
@ -1512,10 +1530,12 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
'core/group' => array(
'color' => array(
'palette' => array(
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
'user' => array(
array(
'name' => 'Pink',
'slug' => 'pink',
'color' => '#FFC0CB',
),
),
),
),

View File

@ -147,8 +147,8 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
* @ticket 52991
*/
public function test_switching_themes_recalculates_data() {
// By default, the theme for unit tests is "default",
// which doesn't have theme.json support.
// The "default" theme doesn't have theme.json support.
switch_theme( 'default' );
$default = WP_Theme_JSON_Resolver::theme_has_support();
// Switch to a theme that does have support.