Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://develop.svn.wordpress.org/trunk"
},
"gutenberg": {
"sha": "585cf86bb6f408b1dc61175f75db016aa4760653",
"sha": "d5ac60e6118060529737127d44a6fdc8abf57eb9",
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
},
"engines": {
Expand Down
37 changes: 19 additions & 18 deletions src/wp-includes/assets/script-loader-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'wp-i18n',
'wp-rich-text'
),
'version' => 'a97786de6f13be9c6637'
'version' => 'd4fe1eeb787c2fd5ee89'
),
'api-fetch.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -65,7 +65,7 @@
'wp-theme',
'wp-url'
),
'version' => '110a088de3bda59ac5de'
'version' => '43a9d7ab2fbaa04615a1'
),
'block-editor.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -103,7 +103,7 @@
'wp-url',
'wp-warning'
),
'version' => '9041ae4f01562bcb4d33'
'version' => '5a398d1da02bf80f3f98'
),
'block-library.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -136,6 +136,7 @@
'wp-private-apis',
'wp-rich-text',
'wp-server-side-render',
'wp-shortcode',
'wp-theme',
'wp-upload-media',
'wp-url',
Expand All @@ -147,7 +148,7 @@
'import' => 'dynamic'
)
),
'version' => '52817755f853f6ab7153'
'version' => '9c1171e882b2ba2f7411'
),
'block-serialization-default-parser.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -180,7 +181,7 @@
'wp-shortcode',
'wp-warning'
),
'version' => '9aea2a60e4a82baa898c'
'version' => 'ece1f172d5b708916ebc'
),
'commands.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -220,7 +221,7 @@
'wp-rich-text',
'wp-warning'
),
'version' => 'c74d7795ae739efd8470'
'version' => '83936472a0d07a3a4c92'
),
'compose.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -272,7 +273,7 @@
'wp-url',
'wp-warning'
),
'version' => '84dfcb788b38527ce29d'
'version' => '21fd0114d22869dbe459'
),
'customize-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -301,7 +302,7 @@
'wp-theme',
'wp-widgets'
),
'version' => '206784568d822411270a'
'version' => '4da0091c281df82bd222'
),
'data.js' => array(
'dependencies' => array(
Expand All @@ -314,7 +315,7 @@
'wp-private-apis',
'wp-redux-routine'
),
'version' => '148d59ef2548b2513db8'
'version' => 'ee4e907a070c9780da2b'
),
'data-controls.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -391,7 +392,7 @@
'import' => 'static'
)
),
'version' => 'c43a4fa8b00c3ba4431f'
'version' => 'e5a1146f8586938ade23'
),
'edit-site.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -440,7 +441,7 @@
'import' => 'static'
)
),
'version' => 'aa6e9b6786aea68585db'
'version' => '25ce07d8e96c49452e7a'
),
'edit-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -481,7 +482,7 @@
'import' => 'static'
)
),
'version' => '073d2e7bb4648840803a'
'version' => '3382b8166d24bc8ebc42'
),
'editor.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -531,7 +532,7 @@
'import' => 'static'
)
),
'version' => '9496d99a5f41ee4b8d8c'
'version' => '3e365e98ba94f24ff5cf'
),
'element.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -572,7 +573,7 @@
'import' => 'dynamic'
)
),
'version' => '6f640c16ab0835901167'
'version' => 'b38d376fe79b3eac1578'
),
'hooks.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -650,7 +651,7 @@
'wp-url',
'wp-warning'
),
'version' => '1ef9847260fd7de4188f'
'version' => '597bd2b6e79b271e52c7'
),
'notices.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -744,7 +745,7 @@
'dependencies' => array(

),
'version' => '7378f2cb5ba25f7aa9e5'
'version' => 'ebe55c7ec838043537c7'
),
'react-i18n.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -841,7 +842,7 @@
'wp-element',
'wp-private-apis'
),
'version' => '798ec32c86815d7e8a14'
'version' => '3b1949512f2ec0c938bd'
),
'token-list.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -872,7 +873,7 @@
'import' => 'dynamic'
)
),
'version' => '688c688a0ccf0f0d020b'
'version' => '1399274c1ad48fc29498'
),
'url.js' => array(
'dependencies' => array(
Expand Down
65 changes: 38 additions & 27 deletions src/wp-includes/assets/script-modules-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
'import' => 'static'
)
),
'version' => '1ea95bd3abfe75ec1bbc'
'version' => '5e02fdb03b9e05e7ba82'
),
'connectors/index.js' => array(
'dependencies' => array(
Expand All @@ -179,6 +179,41 @@
),
'version' => 'dce5e2b0fc240815717b'
),
'content-types/index.js' => array(
'dependencies' => array(
'react',
'react-dom',
'react-jsx-runtime',
'wp-components',
'wp-compose',
'wp-core-data',
'wp-data',
'wp-date',
'wp-deprecated',
'wp-element',
'wp-i18n',
'wp-is-shallow-equal',
'wp-keycodes',
'wp-notices',
'wp-preferences',
'wp-primitives',
'wp-private-apis',
'wp-theme',
'wp-url',
'wp-warning'
),
'module_dependencies' => array(
array(
'id' => '@wordpress/a11y',
'import' => 'static'
),
array(
'id' => '@wordpress/route',
'import' => 'static'
)
),
'version' => '9a35d0da8badd6a33cf8'
),
'core-abilities/index.js' => array(
'dependencies' => array(
'wp-api-fetch',
Expand Down Expand Up @@ -211,7 +246,7 @@
'dependencies' => array(

),
'version' => '4d2a3a72c7410d548881'
'version' => 'efaa5193bbad9c60ffd1'
),
'interactivity-router/full-page.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -273,7 +308,7 @@
'wp-private-apis',
'wp-style-engine'
),
'version' => '4dbbb677aac222671901'
'version' => '8bd91519756b243fc835'
),
'route/index.js' => array(
'dependencies' => array(
Expand All @@ -284,30 +319,6 @@
),
'version' => '48a77bfa70722b4254e4'
),
'user-taxonomies/index.js' => array(
'dependencies' => array(
'react',
'react-dom',
'react-jsx-runtime',
'wp-components',
'wp-compose',
'wp-core-data',
'wp-data',
'wp-element',
'wp-i18n',
'wp-notices',
'wp-primitives',
'wp-private-apis',
'wp-theme'
),
'module_dependencies' => array(
array(
'id' => '@wordpress/a11y',
'import' => 'static'
)
),
'version' => '339ee65736f7a738a4ad'
),
'vips/loader.js' => array(
'dependencies' => array(

Expand Down
12 changes: 11 additions & 1 deletion src/wp-includes/blocks/navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,11 @@ private static function get_overlay_blocks_from_template_part( $overlay_template
$full_template_part_id = $theme . '//' . $slug;
$block_template = get_block_file_template( $full_template_part_id, 'wp_template_part' );
if ( isset( $block_template->content ) ) {
$parsed_blocks = parse_blocks( $block_template->content );
// Expand shortcodes before parsing blocks, matching the order in
// `render_block_core_template_part()`.
$content = shortcode_unautop( $block_template->content );
$content = do_shortcode( $content );
$parsed_blocks = parse_blocks( $content );
$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
// Disable overlay menu for any navigation blocks within the overlay to prevent nested overlays.
$blocks = static::disable_overlay_menu_for_nested_navigation_blocks( $blocks );
Expand All @@ -449,6 +453,12 @@ private static function get_overlay_blocks_from_template_part( $overlay_template
// Re-serialize, and run Block Hooks algorithm to inject hooked blocks.
$markup = serialize_blocks( $blocks );
$markup = apply_block_hooks_to_content_from_post_object( $markup, $template_part_post );

// Expand shortcodes before parsing blocks, matching the order in
// `render_block_core_template_part()`.
$markup = shortcode_unautop( $markup );
$markup = do_shortcode( $markup );

$blocks = parse_blocks( $markup );

// Disable overlay menu for any navigation blocks within the overlay to prevent nested overlays.
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/build/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
*/

return array(
'version' => '23.1.0',
'version' => '23.2.0',
'build_url' => includes_url( 'build/' ),
);
32 changes: 20 additions & 12 deletions src/wp-includes/build/pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,23 @@
* @package wp
*/

require_once __DIR__ . '/pages/font-library/page.php';
require_once __DIR__ . '/pages/font-library/page-wp-admin.php';
require_once __DIR__ . '/pages/options-connectors/page.php';
require_once __DIR__ . '/pages/options-connectors/page-wp-admin.php';
require_once __DIR__ . '/pages/guidelines/page.php';
require_once __DIR__ . '/pages/guidelines/page-wp-admin.php';
require_once __DIR__ . '/pages/experiments/page.php';
require_once __DIR__ . '/pages/experiments/page-wp-admin.php';
require_once __DIR__ . '/pages/taxonomies/page.php';
require_once __DIR__ . '/pages/taxonomies/page-wp-admin.php';
require_once __DIR__ . '/pages/dashboard/page.php';
require_once __DIR__ . '/pages/dashboard/page-wp-admin.php';
foreach ( [
__DIR__ . '/pages/media-editor/page.php',
__DIR__ . '/pages/media-editor/page-wp-admin.php',
__DIR__ . '/pages/font-library/page.php',
__DIR__ . '/pages/font-library/page-wp-admin.php',
__DIR__ . '/pages/options-connectors/page.php',
__DIR__ . '/pages/options-connectors/page-wp-admin.php',
__DIR__ . '/pages/guidelines/page.php',
__DIR__ . '/pages/guidelines/page-wp-admin.php',
__DIR__ . '/pages/experiments/page.php',
__DIR__ . '/pages/experiments/page-wp-admin.php',
__DIR__ . '/pages/content-types/page.php',
__DIR__ . '/pages/content-types/page-wp-admin.php',
__DIR__ . '/pages/dashboard/page.php',
__DIR__ . '/pages/dashboard/page-wp-admin.php',
] as $file ) {
if ( file_exists( $file ) ) {
require_once $file;
}
}
15 changes: 15 additions & 0 deletions src/wp-includes/build/pages/font-library/page-wp-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,21 @@ function ( $handle ) {
}
}

/**
* Filters the boot script-module dependencies for the
* font-library-wp-admin page.
*
* Surfaces extending this page can append entries to the boot
* dependency list. Each entry is an array with 'import' (string
* 'static' or 'dynamic') and 'id' (script-module handle) keys.
*
* @param array $boot_dependencies Boot dependencies for the page.
*/
$boot_dependencies = apply_filters(
'font-library-wp-admin_boot_dependencies',
$boot_dependencies
);

// Dummy script module to ensure dependencies are loaded
wp_register_script_module(
'font-library-wp-admin',
Expand Down
15 changes: 15 additions & 0 deletions src/wp-includes/build/pages/font-library/page.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,21 @@ function ( $handle ) {
}
}

/**
* Filters the boot script-module dependencies for the
* font-library page.
*
* Surfaces extending this page can append entries to the boot
* dependency list. Each entry is an array with 'import' (string
* 'static' or 'dynamic') and 'id' (script-module handle) keys.
*
* @param array $boot_dependencies Boot dependencies for the page.
*/
$boot_dependencies = apply_filters(
'font-library_boot_dependencies',
$boot_dependencies
);

// Dummy script module to ensure dependencies are loaded
wp_register_script_module(
'font-library',
Expand Down
Loading
Loading