From 4f9c8077fd9f9896ae25cc1eba33515955e3e356 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com> Date: Tue, 8 Sep 2026 10:18:33 -0400 Subject: [PATCH] Sync changes from Gutenberg 23.9.0. --- package.json | 2 +- .../assets/script-loader-packages.php | 54 +- .../assets/script-modules-packages.php | 25 +- .../blocks/accordion-heading/block.json | 1 + src/wp-includes/blocks/block/block.json | 3 +- src/wp-includes/blocks/blocks-json.php | 60 +- src/wp-includes/blocks/group/block.json | 2 +- src/wp-includes/blocks/list/block.json | 1 + src/wp-includes/blocks/more/block.json | 2 +- src/wp-includes/blocks/navigation.php | 10 +- .../blocks/playlist-track/block.json | 24 +- src/wp-includes/blocks/playlist/block.json | 1 - .../blocks/query-no-results/block.json | 17 +- src/wp-includes/blocks/query/block.json | 3 + src/wp-includes/blocks/social-link.php | 19 +- src/wp-includes/blocks/tab-panel.php | 19 +- src/wp-includes/blocks/tabs.php | 10 +- src/wp-includes/blocks/term-description.php | 2 +- src/wp-includes/build/constants.php | 2 +- .../pages/font-library/page-wp-admin.php | 10 +- .../build/pages/font-library/page.php | 6 +- .../options-connectors/page-wp-admin.php | 10 +- .../build/pages/options-connectors/page.php | 6 +- .../build/routes/connectors-home/content.js | 3501 +++++++------ .../connectors-home/content.min.asset.php | 2 +- .../routes/connectors-home/content.min.js | 2 +- .../build/routes/font-list/content.js | 4351 ++++++++++------- .../routes/font-list/content.min.asset.php | 2 +- .../build/routes/font-list/content.min.js | 12 +- 29 files changed, 4553 insertions(+), 3606 deletions(-) diff --git a/package.json b/package.json index 6aa7168051189..8158bc2ee96f6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://develop.svn.wordpress.org/trunk" }, "gutenberg": { - "sha": "ae8b34d78e1abc6d1c866fdc00080a1452de82ad", + "sha": "658c8cbe89db5d90279051d3bb816ca210fe4646", "ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build" }, "engines": { diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php index cd47508816ff0..84e2e5c25f3b2 100644 --- a/src/wp-includes/assets/script-loader-packages.php +++ b/src/wp-includes/assets/script-loader-packages.php @@ -27,7 +27,7 @@ 'dependencies' => array( ), - 'version' => '4e10a18cb6f21a043fc0' + 'version' => '79bd31ed7de4b0a8ebad' ), 'base-styles.js' => array( 'dependencies' => array( @@ -64,9 +64,10 @@ 'wp-primitives', 'wp-private-apis', 'wp-theme', - 'wp-url' + 'wp-url', + 'wp-warning' ), - 'version' => 'c9a0f5d70a59ec99cefc' + 'version' => '251bed20addbd4898951' ), 'block-editor.js' => array( 'dependencies' => array( @@ -104,7 +105,7 @@ 'wp-url', 'wp-warning' ), - 'version' => 'ed191cc0bfd9746d5116' + 'version' => '03664008984afcc5acd9' ), 'block-library.js' => array( 'dependencies' => array( @@ -129,7 +130,6 @@ 'wp-hooks', 'wp-html-entities', 'wp-i18n', - 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-patterns', @@ -142,6 +142,7 @@ 'wp-theme', 'wp-upload-media', 'wp-url', + 'wp-warning', 'wp-wordcount' ), 'module_dependencies' => array( @@ -150,7 +151,7 @@ 'import' => 'dynamic' ) ), - 'version' => '1c788cf80467c71204a1' + 'version' => '98b1e389bb9bedd78731' ), 'block-serialization-default-parser.js' => array( 'dependencies' => array( @@ -183,7 +184,7 @@ 'wp-shortcode', 'wp-warning' ), - 'version' => 'c4bf7adf97b196989131' + 'version' => '4f4d0c2b0372d76cb1cf' ), 'commands.js' => array( 'dependencies' => array( @@ -200,7 +201,7 @@ 'wp-primitives', 'wp-private-apis' ), - 'version' => '52e952c975af0681b758' + 'version' => '709b81f6965aa3f3fad1' ), 'components.js' => array( 'dependencies' => array( @@ -225,7 +226,7 @@ 'wp-theme', 'wp-warning' ), - 'version' => '13d6ffd4c67d14c7ac9b' + 'version' => '7d125f63c887366dc3c5' ), 'compose.js' => array( 'dependencies' => array( @@ -257,7 +258,7 @@ 'wp-router', 'wp-url' ), - 'version' => '954969209e3d395719ca' + 'version' => '70d32365916bcb25ffb7' ), 'core-data.js' => array( 'dependencies' => array( @@ -282,7 +283,7 @@ 'wp-url', 'wp-warning' ), - 'version' => '27f57f36c12ca4fa7e5f' + 'version' => '09960f621ea22390d652' ), 'customize-widgets.js' => array( 'dependencies' => array( @@ -309,6 +310,7 @@ 'wp-primitives', 'wp-private-apis', 'wp-theme', + 'wp-warning', 'wp-widgets' ), 'module_dependencies' => array( @@ -317,7 +319,7 @@ 'import' => 'static' ) ), - 'version' => '4e14e32fab1c214bc0b2' + 'version' => 'b63345eff7801e61c8d8' ), 'data.js' => array( 'dependencies' => array( @@ -357,7 +359,7 @@ 'dependencies' => array( 'wp-deprecated' ), - 'version' => 'c95f94cbbc1ac3fde84f' + 'version' => '5f9975e536ff35b62489' ), 'dom-ready.js' => array( 'dependencies' => array( @@ -399,6 +401,7 @@ 'wp-style-engine', 'wp-theme', 'wp-url', + 'wp-warning', 'wp-widgets' ), 'module_dependencies' => array( @@ -407,7 +410,7 @@ 'import' => 'static' ) ), - 'version' => '1098129b2d1346b0fe9b' + 'version' => '1879e16de755e7c0c695' ), 'edit-site.js' => array( 'dependencies' => array( @@ -456,7 +459,7 @@ 'import' => 'static' ) ), - 'version' => '969af289eb8057df4124' + 'version' => '251e0a5d7d1c24545199' ), 'edit-widgets.js' => array( 'dependencies' => array( @@ -489,6 +492,7 @@ 'wp-theme', 'wp-url', 'wp-viewport', + 'wp-warning', 'wp-widgets' ), 'module_dependencies' => array( @@ -497,7 +501,7 @@ 'import' => 'static' ) ), - 'version' => '849d5b33869fb6cf968e' + 'version' => 'aa6a14fc303abfc52e8c' ), 'editor.js' => array( 'dependencies' => array( @@ -548,7 +552,7 @@ 'import' => 'static' ) ), - 'version' => '2b1b8fc54eb8080834c3' + 'version' => 'b3fca63dd478300ba9a3' ), 'element.js' => array( 'dependencies' => array( @@ -556,7 +560,7 @@ 'react-dom', 'wp-escape-html' ), - 'version' => '61e4db947466ff01ac06' + 'version' => '4822427ad9c627826631' ), 'escape-html.js' => array( 'dependencies' => array( @@ -581,7 +585,8 @@ 'wp-private-apis', 'wp-rich-text', 'wp-theme', - 'wp-url' + 'wp-url', + 'wp-warning' ), 'module_dependencies' => array( array( @@ -589,7 +594,7 @@ 'import' => 'dynamic' ) ), - 'version' => '14e60dbda3a346e3b089' + 'version' => '7bb348819bb9bb6642b1' ), 'hooks.js' => array( 'dependencies' => array( @@ -667,7 +672,7 @@ 'wp-url', 'wp-warning' ), - 'version' => '43301077caa3b4ebc2e0' + 'version' => '957851f36fe387c2272e' ), 'notices.js' => array( 'dependencies' => array( @@ -703,7 +708,8 @@ 'wp-primitives', 'wp-private-apis', 'wp-theme', - 'wp-url' + 'wp-url', + 'wp-warning' ), 'version' => '74662e7976508e52fa17' ), @@ -858,7 +864,7 @@ 'wp-element', 'wp-private-apis' ), - 'version' => '700f328ef9b3b8a561d4' + 'version' => '763f42e590ad17dfa74c' ), 'token-list.js' => array( 'dependencies' => array( @@ -899,7 +905,7 @@ 'dependencies' => array( ), - 'version' => '7b0de086d4ae11d55704' + 'version' => '65e1ab123ef3bf825dea' ), 'viewport.js' => array( 'dependencies' => array( diff --git a/src/wp-includes/assets/script-modules-packages.php b/src/wp-includes/assets/script-modules-packages.php index b0159e8dcb21e..b13e153a0fad4 100644 --- a/src/wp-includes/assets/script-modules-packages.php +++ b/src/wp-includes/assets/script-modules-packages.php @@ -10,7 +10,7 @@ 'wp-data', 'wp-i18n' ), - 'version' => '104b6117f4f3d5b94cc3' + 'version' => 'ec0b0ee989ace28703d7' ), 'block-editor/utils/fit-text-frontend.js' => array( 'dependencies' => array( @@ -34,7 +34,7 @@ 'import' => 'static' ) ), - 'version' => '2bfb90e7aee6b5300a7c' + 'version' => '6d4bb8df9c7539843ad3' ), 'block-library/file/view.js' => array( 'dependencies' => array( @@ -88,7 +88,7 @@ 'import' => 'static' ) ), - 'version' => 'e921883a3f8a7b1ead70' + 'version' => '67a35440c2e33a42d17e' ), 'block-library/query/view.js' => array( 'dependencies' => array( @@ -128,7 +128,7 @@ 'import' => 'static' ) ), - 'version' => 'cc1a34b1bee3c2e17bc4' + 'version' => '92c832aff6e4039db1ce' ), 'boot/index.js' => array( 'dependencies' => array( @@ -139,6 +139,7 @@ 'wp-compose', 'wp-core-data', 'wp-data', + 'wp-dom', 'wp-editor', 'wp-element', 'wp-html-entities', @@ -146,9 +147,12 @@ 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', + 'wp-plugins', 'wp-primitives', 'wp-private-apis', - 'wp-theme' + 'wp-theme', + 'wp-url', + 'wp-warning' ), 'module_dependencies' => array( array( @@ -164,7 +168,7 @@ 'import' => 'static' ) ), - 'version' => 'f721280cfc5d6a8eb73b' + 'version' => '8cc5f2c749590d7b592a' ), 'connectors/index.js' => array( 'dependencies' => array( @@ -212,6 +216,7 @@ 'react-jsx-runtime', 'wp-data', 'wp-element', + 'wp-preferences', 'wp-primitives' ), 'module_dependencies' => array( @@ -220,7 +225,7 @@ 'import' => 'static' ) ), - 'version' => 'e2f82d3d1c3179d25626' + 'version' => 'f6fe09cfa8a820e494b9' ), 'interactivity/index.js' => array( 'dependencies' => array( @@ -254,7 +259,7 @@ 'import' => 'static' ) ), - 'version' => 'a6e90b8896f83fb1b5dd' + 'version' => '711aa380e66c57009b7a' ), 'latex-to-mathml/index.js' => array( 'dependencies' => array( @@ -288,7 +293,7 @@ 'wp-private-apis', 'wp-style-engine' ), - 'version' => '91b49bcd65d03f0c27d7' + 'version' => '26702529626be08dab3c' ), 'route/index.js' => array( 'dependencies' => array( @@ -340,7 +345,7 @@ 'react-jsx-runtime', 'wp-element' ), - 'version' => 'dfdedb1556f8335ccd5d' + 'version' => '55c447d6c4f9173d3807' ), 'workflow/index.js' => array( 'dependencies' => array( diff --git a/src/wp-includes/blocks/accordion-heading/block.json b/src/wp-includes/blocks/accordion-heading/block.json index e1ccf83dd3c1b..8f51644120d41 100644 --- a/src/wp-includes/blocks/accordion-heading/block.json +++ b/src/wp-includes/blocks/accordion-heading/block.json @@ -61,6 +61,7 @@ "lock": false }, "selectors": { + "spacing": ".wp-block-accordion-heading .wp-block-accordion-heading__toggle", "typography": { "letterSpacing": ".wp-block-accordion-heading .wp-block-accordion-heading__toggle-title", "textDecoration": ".wp-block-accordion-heading .wp-block-accordion-heading__toggle-title" diff --git a/src/wp-includes/blocks/block/block.json b/src/wp-includes/blocks/block/block.json index 8d2b8f6f3b1bc..ef5c31ae1e957 100644 --- a/src/wp-includes/blocks/block/block.json +++ b/src/wp-includes/blocks/block/block.json @@ -27,6 +27,7 @@ "interactivity": { "clientNavigation": true }, - "customCSS": false + "customCSS": false, + "visibility": false } } diff --git a/src/wp-includes/blocks/blocks-json.php b/src/wp-includes/blocks/blocks-json.php index ca3c645b962ac..208e13036dd6c 100644 --- a/src/wp-includes/blocks/blocks-json.php +++ b/src/wp-includes/blocks/blocks-json.php @@ -165,6 +165,7 @@ 'lock' => false ), 'selectors' => array( + 'spacing' => '.wp-block-accordion-heading .wp-block-accordion-heading__toggle', 'typography' => array( 'letterSpacing' => '.wp-block-accordion-heading .wp-block-accordion-heading__toggle-title', 'textDecoration' => '.wp-block-accordion-heading .wp-block-accordion-heading__toggle-title' @@ -602,7 +603,8 @@ 'interactivity' => array( 'clientNavigation' => true ), - 'customCSS' => false + 'customCSS' => false, + 'visibility' => false ) ), 'breadcrumbs' => array( @@ -2917,7 +2919,10 @@ 'bottom' ), 'padding' => true, - 'blockGap' => true, + 'blockGap' => array( + 'horizontal', + 'vertical' + ), '__experimentalDefaultControls' => array( 'padding' => true, 'blockGap' => true @@ -3691,6 +3696,10 @@ ), 'supports' => array( 'anchor' => true, + 'align' => array( + 'wide', + 'full' + ), 'html' => false, '__experimentalBorder' => array( 'color' => true, @@ -4138,7 +4147,7 @@ 'name' => 'core/more', 'title' => 'More', 'category' => 'design', - 'description' => 'Content before this block will be shown in the excerpt on your archives page.', + 'description' => 'Content before this block is shown in the excerpt on blog and archive pages. Where a theme shows the full content instead, visitors get a “Read more” link to the rest of the post.', 'keywords' => array( 'read more' ), @@ -4976,7 +4985,6 @@ 'supports' => array( 'anchor' => true, 'align' => true, - '__experimentalExposeControlsToChildren' => true, 'color' => array( 'gradients' => true, 'link' => true, @@ -5035,32 +5043,40 @@ 'role' => 'local' ), 'id' => array( - 'type' => 'number' + 'type' => 'number', + 'role' => 'content' ), 'src' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'type' => array( 'type' => 'string', 'default' => 'audio' ), 'album' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'artist' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'image' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'imageAlt' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'length' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ), 'title' => array( - 'type' => 'string' + 'type' => 'string', + 'role' => 'content' ) ), 'supports' => array( @@ -6477,6 +6493,9 @@ ), 'html' => false, 'layout' => true, + 'spacing' => array( + 'blockGap' => true + ), 'interactivity' => true ), 'editorStyle' => 'wp-block-query-editor' @@ -6505,6 +6524,14 @@ 'gradients' => true, 'link' => true ), + 'spacing' => array( + 'padding' => true, + 'margin' => true, + '__experimentalDefaultControls' => array( + 'margin' => false, + 'padding' => false + ) + ), 'typography' => array( 'fontSize' => true, 'lineHeight' => true, @@ -6520,8 +6547,15 @@ ), 'interactivity' => array( 'clientNavigation' => true + ), + '__experimentalBorder' => array( + 'radius' => true, + 'color' => true, + 'width' => true, + 'style' => true ) - ) + ), + 'style' => 'wp-block-query-no-results' ), 'query-pagination' => array( '$schema' => 'https://schemas.wp.org/trunk/block.json', diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json index 37c63cfac8ac3..b848a0f7c1e91 100644 --- a/src/wp-includes/blocks/group/block.json +++ b/src/wp-includes/blocks/group/block.json @@ -47,7 +47,7 @@ "spacing": { "margin": [ "top", "bottom" ], "padding": true, - "blockGap": true, + "blockGap": [ "horizontal", "vertical" ], "__experimentalDefaultControls": { "padding": true, "blockGap": true diff --git a/src/wp-includes/blocks/list/block.json b/src/wp-includes/blocks/list/block.json index e91ebf76817e0..c0bdef4eabcd8 100644 --- a/src/wp-includes/blocks/list/block.json +++ b/src/wp-includes/blocks/list/block.json @@ -37,6 +37,7 @@ }, "supports": { "anchor": true, + "align": [ "wide", "full" ], "html": false, "__experimentalBorder": { "color": true, diff --git a/src/wp-includes/blocks/more/block.json b/src/wp-includes/blocks/more/block.json index b33beeab922a6..81ad94ba3e455 100644 --- a/src/wp-includes/blocks/more/block.json +++ b/src/wp-includes/blocks/more/block.json @@ -4,7 +4,7 @@ "name": "core/more", "title": "More", "category": "design", - "description": "Content before this block will be shown in the excerpt on your archives page.", + "description": "Content before this block is shown in the excerpt on blog and archive pages. Where a theme shows the full content instead, visitors get a “Read more” link to the rest of the post.", "keywords": [ "read more" ], "textdomain": "default", "attributes": { diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php index e6f0dc1622e55..48af8ba468626 100644 --- a/src/wp-includes/blocks/navigation.php +++ b/src/wp-includes/blocks/navigation.php @@ -279,8 +279,14 @@ private static function get_inner_blocks_html( $attributes, $inner_blocks ) { foreach ( $inner_blocks as $inner_block ) { $inner_block_markup = static::get_markup_for_inner_block( $inner_block ); - $p = new WP_HTML_Tag_Processor( $inner_block_markup ); - $is_list_item = $p->next_tag( 'LI' ); + // Skip hidden blocks (e.g. hidden via block visibility) that render + // as an empty string. Without this check, empty markup is mistaken + // for a non-list-item and incorrectly closes the open