Skip to content

Commit 7cf81d3

Browse files
committed
Editor: Update npm packages for WP 6.6 Beta 2.
See #6773. Fixes #61410. Props vcanales. git-svn-id: https://develop.svn.wordpress.org/trunk@58387 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 0b988ac commit 7cf81d3

File tree

11 files changed

+1702
-1618
lines changed

11 files changed

+1702
-1618
lines changed

package-lock.json

Lines changed: 1535 additions & 1532 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"@lodder/grunt-postcss": "^3.1.1",
2828
"@playwright/test": "1.32.0",
2929
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
30-
"@wordpress/babel-preset-default": "8.0.0",
31-
"@wordpress/dependency-extraction-webpack-plugin": "6.0.0",
32-
"@wordpress/e2e-test-utils": "11.0.0",
33-
"@wordpress/e2e-test-utils-playwright": "1.0.0",
34-
"@wordpress/prettier-config": "4.0.0",
35-
"@wordpress/scripts": "28.0.0",
30+
"@wordpress/babel-preset-default": "8.0.1",
31+
"@wordpress/dependency-extraction-webpack-plugin": "6.0.1",
32+
"@wordpress/e2e-test-utils": "11.0.1",
33+
"@wordpress/e2e-test-utils-playwright": "1.0.1",
34+
"@wordpress/prettier-config": "4.0.1",
35+
"@wordpress/scripts": "28.0.1",
3636
"autoprefixer": "10.4.17",
3737
"chalk": "5.3.0",
3838
"check-node-version": "4.2.1",
@@ -78,72 +78,72 @@
7878
"webpack-livereload-plugin": "3.0.2"
7979
},
8080
"dependencies": {
81-
"@wordpress/a11y": "4.0.0",
82-
"@wordpress/annotations": "3.0.0",
83-
"@wordpress/api-fetch": "7.0.0",
84-
"@wordpress/autop": "4.0.0",
85-
"@wordpress/blob": "4.0.0",
86-
"@wordpress/block-directory": "5.0.0",
87-
"@wordpress/block-editor": "13.0.0",
88-
"@wordpress/block-library": "9.0.0",
89-
"@wordpress/block-serialization-default-parser": "5.0.0",
90-
"@wordpress/blocks": "13.0.0",
91-
"@wordpress/commands": "1.0.0",
92-
"@wordpress/components": "28.0.0",
93-
"@wordpress/compose": "7.0.0",
94-
"@wordpress/core-commands": "1.0.0",
95-
"@wordpress/core-data": "7.0.0",
96-
"@wordpress/customize-widgets": "5.0.0",
97-
"@wordpress/data": "10.0.0",
98-
"@wordpress/data-controls": "4.0.0",
99-
"@wordpress/dataviews": "2.0.0",
100-
"@wordpress/date": "5.0.0",
101-
"@wordpress/deprecated": "4.0.0",
102-
"@wordpress/dom": "4.0.0",
103-
"@wordpress/dom-ready": "4.0.0",
104-
"@wordpress/edit-post": "8.0.0",
105-
"@wordpress/edit-site": "6.0.0",
106-
"@wordpress/edit-widgets": "6.0.0",
107-
"@wordpress/editor": "14.0.0",
108-
"@wordpress/element": "6.0.0",
109-
"@wordpress/escape-html": "3.0.0",
110-
"@wordpress/format-library": "5.0.0",
111-
"@wordpress/hooks": "4.0.0",
112-
"@wordpress/html-entities": "4.0.0",
113-
"@wordpress/i18n": "5.0.0",
114-
"@wordpress/icons": "10.0.0",
115-
"@wordpress/interactivity": "6.0.0",
116-
"@wordpress/interactivity-router": "2.0.0",
117-
"@wordpress/interface": "6.0.0",
118-
"@wordpress/is-shallow-equal": "5.0.0",
119-
"@wordpress/keyboard-shortcuts": "5.0.0",
120-
"@wordpress/keycodes": "4.0.0",
121-
"@wordpress/list-reusable-blocks": "5.0.0",
122-
"@wordpress/media-utils": "5.0.0",
123-
"@wordpress/notices": "5.0.0",
124-
"@wordpress/nux": "9.0.0",
125-
"@wordpress/patterns": "2.0.0",
126-
"@wordpress/plugins": "7.0.0",
127-
"@wordpress/preferences": "4.0.0",
128-
"@wordpress/preferences-persistence": "2.0.0",
129-
"@wordpress/primitives": "4.0.0",
130-
"@wordpress/priority-queue": "3.0.0",
131-
"@wordpress/private-apis": "1.0.0",
132-
"@wordpress/redux-routine": "5.0.0",
133-
"@wordpress/reusable-blocks": "5.0.0",
134-
"@wordpress/rich-text": "7.0.0",
135-
"@wordpress/router": "1.0.0",
136-
"@wordpress/server-side-render": "5.0.0",
137-
"@wordpress/shortcode": "4.0.0",
138-
"@wordpress/style-engine": "2.0.0",
139-
"@wordpress/sync": "1.0.0",
140-
"@wordpress/token-list": "3.0.0",
141-
"@wordpress/undo-manager": "1.0.0",
142-
"@wordpress/url": "4.0.0",
143-
"@wordpress/viewport": "6.0.0",
144-
"@wordpress/warning": "3.0.0",
145-
"@wordpress/widgets": "4.0.0",
146-
"@wordpress/wordcount": "4.0.0",
81+
"@wordpress/a11y": "4.0.1",
82+
"@wordpress/annotations": "3.0.1",
83+
"@wordpress/api-fetch": "7.0.1",
84+
"@wordpress/autop": "4.0.1",
85+
"@wordpress/blob": "4.0.1",
86+
"@wordpress/block-directory": "5.0.1",
87+
"@wordpress/block-editor": "13.0.1",
88+
"@wordpress/block-library": "9.0.1",
89+
"@wordpress/block-serialization-default-parser": "5.0.1",
90+
"@wordpress/blocks": "13.0.1",
91+
"@wordpress/commands": "1.0.1",
92+
"@wordpress/components": "28.0.1",
93+
"@wordpress/compose": "7.0.1",
94+
"@wordpress/core-commands": "1.0.1",
95+
"@wordpress/core-data": "7.0.1",
96+
"@wordpress/customize-widgets": "5.0.1",
97+
"@wordpress/data": "10.0.1",
98+
"@wordpress/data-controls": "4.0.1",
99+
"@wordpress/dataviews": "2.0.1",
100+
"@wordpress/date": "5.0.1",
101+
"@wordpress/deprecated": "4.0.1",
102+
"@wordpress/dom": "4.0.1",
103+
"@wordpress/dom-ready": "4.0.1",
104+
"@wordpress/edit-post": "8.0.1",
105+
"@wordpress/edit-site": "6.0.1",
106+
"@wordpress/edit-widgets": "6.0.1",
107+
"@wordpress/editor": "14.0.1",
108+
"@wordpress/element": "6.0.1",
109+
"@wordpress/escape-html": "3.0.1",
110+
"@wordpress/format-library": "5.0.1",
111+
"@wordpress/hooks": "4.0.1",
112+
"@wordpress/html-entities": "4.0.1",
113+
"@wordpress/i18n": "5.0.1",
114+
"@wordpress/icons": "10.0.1",
115+
"@wordpress/interactivity": "6.0.1",
116+
"@wordpress/interactivity-router": "2.0.1",
117+
"@wordpress/interface": "6.0.1",
118+
"@wordpress/is-shallow-equal": "5.0.1",
119+
"@wordpress/keyboard-shortcuts": "5.0.1",
120+
"@wordpress/keycodes": "4.0.1",
121+
"@wordpress/list-reusable-blocks": "5.0.1",
122+
"@wordpress/media-utils": "5.0.1",
123+
"@wordpress/notices": "5.0.1",
124+
"@wordpress/nux": "9.0.1",
125+
"@wordpress/patterns": "2.0.1",
126+
"@wordpress/plugins": "7.0.1",
127+
"@wordpress/preferences": "4.0.1",
128+
"@wordpress/preferences-persistence": "2.0.1",
129+
"@wordpress/primitives": "4.0.1",
130+
"@wordpress/priority-queue": "3.0.1",
131+
"@wordpress/private-apis": "1.0.1",
132+
"@wordpress/redux-routine": "5.0.1",
133+
"@wordpress/reusable-blocks": "5.0.1",
134+
"@wordpress/rich-text": "7.0.1",
135+
"@wordpress/router": "1.0.1",
136+
"@wordpress/server-side-render": "5.0.1",
137+
"@wordpress/shortcode": "4.0.1",
138+
"@wordpress/style-engine": "2.0.1",
139+
"@wordpress/sync": "1.0.1",
140+
"@wordpress/token-list": "3.0.1",
141+
"@wordpress/undo-manager": "1.0.1",
142+
"@wordpress/url": "4.0.1",
143+
"@wordpress/viewport": "6.0.1",
144+
"@wordpress/warning": "3.0.1",
145+
"@wordpress/widgets": "4.0.1",
146+
"@wordpress/wordcount": "4.0.1",
147147
"backbone": "1.5.0",
148148
"clipboard": "2.0.11",
149149
"core-js-url-browser": "3.6.4",

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/wp-includes/blocks/button.php

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?php
2+
/**
3+
* Server-side rendering of the `core/button` block.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
/**
9+
* Renders the `core/button` block on the server,
10+
*
11+
* @since 6.6.0
12+
*
13+
* @param array $attributes The block attributes.
14+
* @param string $content The block content.
15+
* @param WP_Block $block The block object.
16+
*
17+
* @return string The block content.
18+
*/
19+
function render_block_core_button( $attributes, $content ) {
20+
$p = new WP_HTML_Tag_Processor( $content );
21+
22+
/*
23+
* The button block can render an `<a>` or `<button>` and also has a
24+
* `<div>` wrapper. Find the a or button tag.
25+
*/
26+
$tag = null;
27+
while ( $p->next_tag() ) {
28+
$tag = $p->get_tag();
29+
if ( 'A' === $tag || 'BUTTON' === $tag ) {
30+
break;
31+
}
32+
}
33+
34+
/*
35+
* If this happens, the likelihood is there's no block content,
36+
* or the block has been modified by a plugin.
37+
*/
38+
if ( null === $tag ) {
39+
return $content;
40+
}
41+
42+
// If the next token is the closing tag, the button is empty.
43+
$is_empty = true;
44+
while ( $p->next_token() && $tag !== $p->get_token_name() && $is_empty ) {
45+
if ( '#comment' !== $p->get_token_type() ) {
46+
/**
47+
* Anything else implies this is not empty.
48+
* This might include any text content (including a space),
49+
* inline images or other HTML.
50+
*/
51+
$is_empty = false;
52+
}
53+
}
54+
55+
/*
56+
* When there's no text, render nothing for the block.
57+
* See https://github.com/WordPress/gutenberg/issues/17221 for the
58+
* reasoning behind this.
59+
*/
60+
if ( $is_empty ) {
61+
return '';
62+
}
63+
64+
return $content;
65+
}
66+
67+
/**
68+
* Registers the `core/button` block on server.
69+
*
70+
* @since 6.6.0
71+
*/
72+
function register_block_core_button() {
73+
register_block_type_from_metadata(
74+
__DIR__ . '/button',
75+
array(
76+
'render_callback' => 'render_block_core_button',
77+
)
78+
);
79+
}
80+
add_action( 'init', 'register_block_core_button' );

src/wp-includes/blocks/navigation.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -495,15 +495,15 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
495495
$close_button_directives = '';
496496
if ( $is_interactive ) {
497497
$open_button_directives = '
498-
data-wp-on--click="actions.openMenuOnClick"
498+
data-wp-on-async--click="actions.openMenuOnClick"
499499
data-wp-on--keydown="actions.handleMenuKeydown"
500500
';
501501
$responsive_container_directives = '
502502
data-wp-class--has-modal-open="state.isMenuOpen"
503503
data-wp-class--is-menu-open="state.isMenuOpen"
504504
data-wp-watch="callbacks.initMenu"
505505
data-wp-on--keydown="actions.handleMenuKeydown"
506-
data-wp-on--focusout="actions.handleMenuFocusout"
506+
data-wp-on-async--focusout="actions.handleMenuFocusout"
507507
tabindex="-1"
508508
';
509509
$responsive_dialog_directives = '
@@ -512,7 +512,7 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
512512
data-wp-bind--role="state.roleAttribute"
513513
';
514514
$close_button_directives = '
515-
data-wp-on--click="actions.closeMenuOnClick"
515+
data-wp-on-async--click="actions.closeMenuOnClick"
516516
';
517517
$responsive_container_content_directives = '
518518
data-wp-watch="callbacks.focusFirstElement"
@@ -826,7 +826,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
826826
$tags->set_attribute( 'data-wp-interactive', 'core/navigation' );
827827
$tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": { "click": false, "hover": false, "focus": false }, "type": "submenu" }' );
828828
$tags->set_attribute( 'data-wp-watch', 'callbacks.initMenu' );
829-
$tags->set_attribute( 'data-wp-on--focusout', 'actions.handleMenuFocusout' );
829+
$tags->set_attribute( 'data-wp-on-async--focusout', 'actions.handleMenuFocusout' );
830830
$tags->set_attribute( 'data-wp-on--keydown', 'actions.handleMenuKeydown' );
831831

832832
// This is a fix for Safari. Without it, Safari doesn't change the active
@@ -836,8 +836,8 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
836836
$tags->set_attribute( 'tabindex', '-1' );
837837

838838
if ( ! isset( $block_attributes['openSubmenusOnClick'] ) || false === $block_attributes['openSubmenusOnClick'] ) {
839-
$tags->set_attribute( 'data-wp-on--mouseenter', 'actions.openMenuOnHover' );
840-
$tags->set_attribute( 'data-wp-on--mouseleave', 'actions.closeMenuOnHover' );
839+
$tags->set_attribute( 'data-wp-on-async--mouseenter', 'actions.openMenuOnHover' );
840+
$tags->set_attribute( 'data-wp-on-async--mouseleave', 'actions.closeMenuOnHover' );
841841
}
842842

843843
// Add directives to the toggle submenu button.
@@ -847,7 +847,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
847847
'class_name' => 'wp-block-navigation-submenu__toggle',
848848
)
849849
) ) {
850-
$tags->set_attribute( 'data-wp-on--click', 'actions.toggleMenuOnClick' );
850+
$tags->set_attribute( 'data-wp-on-async--click', 'actions.toggleMenuOnClick' );
851851
$tags->set_attribute( 'data-wp-bind--aria-expanded', 'state.isMenuOpen' );
852852
// The `aria-expanded` attribute for SSR is already added in the submenu block.
853853
}
@@ -858,7 +858,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
858858
'class_name' => 'wp-block-navigation__submenu-container',
859859
)
860860
) ) {
861-
$tags->set_attribute( 'data-wp-on--focus', 'actions.openMenuOnFocus' );
861+
$tags->set_attribute( 'data-wp-on-async--focus', 'actions.openMenuOnFocus' );
862862
}
863863

864864
// Iterate through subitems if exist.

src/wp-includes/blocks/query-pagination-next.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
7777
) ) {
7878
$p->set_attribute( 'data-wp-key', 'query-pagination-next' );
7979
$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
80-
$p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
80+
$p->set_attribute( 'data-wp-on-async--mouseenter', 'core/query::actions.prefetch' );
8181
$p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
8282
$content = $p->get_updated_html();
8383
}

src/wp-includes/blocks/query-pagination-previous.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
6363
) ) {
6464
$p->set_attribute( 'data-wp-key', 'query-pagination-previous' );
6565
$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
66-
$p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
66+
$p->set_attribute( 'data-wp-on-async--mouseenter', 'core/query::actions.prefetch' );
6767
$p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
6868
$content = $p->get_updated_html();
6969
}

src/wp-includes/blocks/require-dynamic-blocks.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
require_once ABSPATH . WPINC . '/blocks/archives.php';
66
require_once ABSPATH . WPINC . '/blocks/avatar.php';
77
require_once ABSPATH . WPINC . '/blocks/block.php';
8+
require_once ABSPATH . WPINC . '/blocks/button.php';
89
require_once ABSPATH . WPINC . '/blocks/calendar.php';
910
require_once ABSPATH . WPINC . '/blocks/categories.php';
1011
require_once ABSPATH . WPINC . '/blocks/comment-author-name.php';

src/wp-includes/blocks/require-static-blocks.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// Returns folder names for static blocks necessary for core blocks registration.
55
return array(
66
'audio',
7-
'button',
87
'buttons',
98
'code',
109
'column',

src/wp-includes/blocks/search.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ function render_block_core_search( $attributes ) {
191191
data-wp-interactive="core/search"'
192192
. $form_context .
193193
'data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
194-
data-wp-on--keydown="actions.handleSearchKeydown"
195-
data-wp-on--focusout="actions.handleSearchFocusout"
194+
data-wp-on-async--keydown="actions.handleSearchKeydown"
195+
data-wp-on-async--focusout="actions.handleSearchFocusout"
196196
';
197197
}
198198

0 commit comments

Comments
 (0)