Skip to content

Commit 7d97865

Browse files
ellatrixellatrix
committed
Editor: sync latest packages to trunk
1 parent 6bea530 commit 7d97865

File tree

13 files changed

+1654
-1015
lines changed

13 files changed

+1654
-1015
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 79 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"@lodder/grunt-postcss": "^3.1.1",
2828
"@playwright/test": "1.56.1",
2929
"@pmmmwh/react-refresh-webpack-plugin": "0.6.1",
30-
"@wordpress/babel-preset-default": "8.33.1",
31-
"@wordpress/dependency-extraction-webpack-plugin": "6.33.1",
32-
"@wordpress/e2e-test-utils-playwright": "1.33.2",
33-
"@wordpress/prettier-config": "4.33.1",
34-
"@wordpress/scripts": "30.26.2",
30+
"@wordpress/babel-preset-default": "8.35.0",
31+
"@wordpress/dependency-extraction-webpack-plugin": "6.35.0",
32+
"@wordpress/e2e-test-utils-playwright": "1.35.0",
33+
"@wordpress/prettier-config": "4.35.0",
34+
"@wordpress/scripts": "31.0.0",
3535
"autoprefixer": "10.4.22",
3636
"chalk": "5.6.2",
3737
"check-node-version": "4.2.1",
@@ -75,78 +75,80 @@
7575
"webpack-livereload-plugin": "3.0.2"
7676
},
7777
"dependencies": {
78-
"@wordpress/a11y": "4.33.1",
79-
"@wordpress/admin-ui": "1.1.4",
80-
"@wordpress/annotations": "3.33.2",
81-
"@wordpress/api-fetch": "7.33.1",
82-
"@wordpress/autop": "4.33.1",
83-
"@wordpress/base-styles": "6.9.1",
84-
"@wordpress/blob": "4.33.1",
85-
"@wordpress/block-directory": "5.33.9",
86-
"@wordpress/block-editor": "15.6.7",
87-
"@wordpress/block-library": "9.33.8",
88-
"@wordpress/block-serialization-default-parser": "5.33.1",
89-
"@wordpress/blocks": "15.6.2",
90-
"@wordpress/commands": "1.33.4",
91-
"@wordpress/components": "30.6.4",
92-
"@wordpress/compose": "7.33.1",
93-
"@wordpress/core-commands": "1.33.7",
94-
"@wordpress/core-data": "7.33.7",
95-
"@wordpress/customize-widgets": "5.33.8",
96-
"@wordpress/data": "10.33.1",
97-
"@wordpress/data-controls": "4.33.1",
98-
"@wordpress/dataviews": "10.1.6",
99-
"@wordpress/date": "5.33.1",
100-
"@wordpress/deprecated": "4.33.1",
101-
"@wordpress/dom": "4.33.1",
102-
"@wordpress/dom-ready": "4.33.1",
103-
"@wordpress/edit-post": "8.33.9",
104-
"@wordpress/edit-site": "6.33.9",
105-
"@wordpress/edit-widgets": "6.33.8",
106-
"@wordpress/editor": "14.33.9",
107-
"@wordpress/element": "6.33.1",
108-
"@wordpress/escape-html": "3.33.1",
109-
"@wordpress/fields": "0.25.9",
110-
"@wordpress/format-library": "5.33.7",
111-
"@wordpress/hooks": "4.33.1",
112-
"@wordpress/html-entities": "4.33.1",
113-
"@wordpress/i18n": "6.6.1",
114-
"@wordpress/icons": "11.0.1",
115-
"@wordpress/interactivity": "6.33.1",
116-
"@wordpress/interactivity-router": "2.33.1",
117-
"@wordpress/interface": "9.18.4",
118-
"@wordpress/is-shallow-equal": "5.33.1",
119-
"@wordpress/keyboard-shortcuts": "5.33.1",
120-
"@wordpress/keycodes": "4.33.1",
121-
"@wordpress/latex-to-mathml": "1.1.2",
122-
"@wordpress/list-reusable-blocks": "5.33.4",
123-
"@wordpress/media-utils": "5.33.1",
124-
"@wordpress/notices": "5.33.1",
125-
"@wordpress/nux": "9.33.4",
126-
"@wordpress/patterns": "2.33.7",
127-
"@wordpress/plugins": "7.33.4",
128-
"@wordpress/preferences": "4.33.4",
129-
"@wordpress/preferences-persistence": "2.33.1",
130-
"@wordpress/primitives": "4.33.1",
131-
"@wordpress/priority-queue": "3.33.1",
132-
"@wordpress/private-apis": "1.33.1",
133-
"@wordpress/redux-routine": "5.33.1",
134-
"@wordpress/reusable-blocks": "5.33.7",
135-
"@wordpress/rich-text": "7.33.2",
136-
"@wordpress/router": "1.33.1",
137-
"@wordpress/server-side-render": "6.9.4",
138-
"@wordpress/shortcode": "4.33.1",
139-
"@wordpress/style-engine": "2.33.1",
140-
"@wordpress/sync": "1.33.1",
141-
"@wordpress/token-list": "3.33.1",
142-
"@wordpress/undo-manager": "1.33.1",
143-
"@wordpress/upload-media": "0.18.4",
144-
"@wordpress/url": "4.33.1",
145-
"@wordpress/viewport": "6.33.1",
146-
"@wordpress/views": "1.0.7",
147-
"@wordpress/warning": "3.33.1",
148-
"@wordpress/widgets": "4.33.7",
149-
"@wordpress/wordcount": "4.33.1",
78+
"@wordpress/a11y": "4.35.0",
79+
"@wordpress/admin-ui": "1.3.0",
80+
"@wordpress/annotations": "3.35.0",
81+
"@wordpress/api-fetch": "7.35.0",
82+
"@wordpress/autop": "4.35.0",
83+
"@wordpress/base-styles": "6.11.0",
84+
"@wordpress/blob": "4.35.0",
85+
"@wordpress/block-directory": "5.35.0",
86+
"@wordpress/block-editor": "15.8.0",
87+
"@wordpress/block-library": "9.35.0",
88+
"@wordpress/block-serialization-default-parser": "5.35.0",
89+
"@wordpress/blocks": "15.8.0",
90+
"@wordpress/commands": "1.35.0",
91+
"@wordpress/components": "30.8.0",
92+
"@wordpress/compose": "7.35.0",
93+
"@wordpress/core-commands": "1.35.0",
94+
"@wordpress/core-data": "7.35.0",
95+
"@wordpress/customize-widgets": "5.35.0",
96+
"@wordpress/data": "10.35.0",
97+
"@wordpress/data-controls": "4.35.0",
98+
"@wordpress/dataviews": "10.3.0",
99+
"@wordpress/date": "5.35.0",
100+
"@wordpress/deprecated": "4.35.0",
101+
"@wordpress/dom": "4.35.0",
102+
"@wordpress/dom-ready": "4.35.0",
103+
"@wordpress/edit-post": "8.35.0",
104+
"@wordpress/edit-site": "6.35.0",
105+
"@wordpress/edit-widgets": "6.35.0",
106+
"@wordpress/editor": "14.35.0",
107+
"@wordpress/element": "6.35.0",
108+
"@wordpress/escape-html": "3.35.0",
109+
"@wordpress/fields": "0.27.0",
110+
"@wordpress/format-library": "5.35.0",
111+
"@wordpress/global-styles-engine": "1.2.0",
112+
"@wordpress/global-styles-ui": "1.2.0",
113+
"@wordpress/hooks": "4.35.0",
114+
"@wordpress/html-entities": "4.35.0",
115+
"@wordpress/i18n": "6.8.0",
116+
"@wordpress/icons": "11.2.0",
117+
"@wordpress/interactivity": "6.35.0",
118+
"@wordpress/interactivity-router": "2.35.0",
119+
"@wordpress/interface": "9.20.0",
120+
"@wordpress/is-shallow-equal": "5.35.0",
121+
"@wordpress/keyboard-shortcuts": "5.35.0",
122+
"@wordpress/keycodes": "4.35.0",
123+
"@wordpress/latex-to-mathml": "1.3.0",
124+
"@wordpress/list-reusable-blocks": "5.35.0",
125+
"@wordpress/media-utils": "5.35.0",
126+
"@wordpress/notices": "5.35.0",
127+
"@wordpress/nux": "9.35.0",
128+
"@wordpress/patterns": "2.35.0",
129+
"@wordpress/plugins": "7.35.0",
130+
"@wordpress/preferences": "4.35.0",
131+
"@wordpress/preferences-persistence": "2.35.0",
132+
"@wordpress/primitives": "4.35.0",
133+
"@wordpress/priority-queue": "3.35.0",
134+
"@wordpress/private-apis": "1.35.0",
135+
"@wordpress/redux-routine": "5.35.0",
136+
"@wordpress/reusable-blocks": "5.35.0",
137+
"@wordpress/rich-text": "7.35.0",
138+
"@wordpress/router": "1.35.0",
139+
"@wordpress/server-side-render": "6.11.0",
140+
"@wordpress/shortcode": "4.35.0",
141+
"@wordpress/style-engine": "2.35.0",
142+
"@wordpress/sync": "1.35.0",
143+
"@wordpress/token-list": "3.35.0",
144+
"@wordpress/undo-manager": "1.35.0",
145+
"@wordpress/upload-media": "0.20.0",
146+
"@wordpress/url": "4.35.0",
147+
"@wordpress/viewport": "6.35.0",
148+
"@wordpress/views": "1.2.0",
149+
"@wordpress/warning": "3.35.0",
150+
"@wordpress/widgets": "4.35.0",
151+
"@wordpress/wordcount": "4.35.0",
150152
"backbone": "1.6.0",
151153
"clipboard": "2.0.11",
152154
"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/assets/script-modules-packages.min.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('interactivity/index.min.js' => array('dependencies' => array(), 'version' => '90f16bd7fc9472806570', 'type' => 'module'), 'interactivity/debug.min.js' => array('dependencies' => array(), 'version' => 'dea7da43ce140b662d0f', 'type' => 'module'), 'interactivity-router/index.min.js' => array('dependencies' => array('@wordpress/interactivity', array('id' => '@wordpress/a11y', 'import' => 'dynamic')), 'version' => '765a6ee8162122b48e6c', 'type' => 'module'), 'a11y/index.min.js' => array('dependencies' => array(), 'version' => 'b7d06936b8bc23cff2ad', 'type' => 'module'), 'block-library/accordion/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '3a414634555a20667d6c', 'type' => 'module'), 'block-library/file/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'f9665632b48682075277', 'type' => 'module'), 'block-library/form/view.min.js' => array('dependencies' => array(), 'version' => 'baaf25398238b4f2a821', 'type' => 'module'), 'block-library/image/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '292ec2cc397d10d98f6a', 'type' => 'module'), 'block-library/navigation/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'b0f909c3ec791c383210', 'type' => 'module'), 'block-library/query/view.min.js' => array('dependencies' => array('@wordpress/interactivity', array('id' => '@wordpress/interactivity-router', 'import' => 'dynamic')), 'version' => 'f55e93a1ad4806e91785', 'type' => 'module'), 'block-library/search/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '94fc611a7464b5de290a', 'type' => 'module'), 'block-editor/utils/fit-text-frontend.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'd6b553b57c3908edc8f8', 'type' => 'module'));
1+
<?php return array('interactivity/index.min.js' => array('dependencies' => array(), 'version' => 'b1bbc770535c02aded73', 'type' => 'module'), 'interactivity-router/index.min.js' => array('dependencies' => array('@wordpress/interactivity', array('id' => '@wordpress/a11y', 'import' => 'dynamic')), 'version' => '91fbdea2a88aa15e6b6c', 'type' => 'module'), 'a11y/index.min.js' => array('dependencies' => array(), 'version' => '8431c61d0eb692b58c8b', 'type' => 'module'), 'block-library/accordion/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '3a414634555a20667d6c', 'type' => 'module'), 'block-library/file/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '8db371ec6644fed0ef99', 'type' => 'module'), 'block-library/form/view.min.js' => array('dependencies' => array(), 'version' => '23f518963e4cf5ee4da0', 'type' => 'module'), 'block-library/image/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'fceb3429c1087f0b9764', 'type' => 'module'), 'block-library/navigation/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'b490617b67c1ea6b2e00', 'type' => 'module'), 'block-library/query/view.min.js' => array('dependencies' => array('@wordpress/interactivity', array('id' => '@wordpress/interactivity-router', 'import' => 'dynamic')), 'version' => '18a35bd7a52c21861bc9', 'type' => 'module'), 'block-library/search/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '43d196dd8266c19edaab', 'type' => 'module'), 'block-library/tabs/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'f9b9982040ce000c5cf0', 'type' => 'module'), 'block-editor/utils/fit-text-frontend.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'e232324bfec8ae2dc657', 'type' => 'module'));

‎src/wp-includes/blocks/accordion-item/block.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"shadow": true,
3434
"layout": {
3535
"allowEditing": false
36-
},
36+
},
3737
"typography": {
3838
"fontSize": true,
3939
"lineHeight": true,

‎src/wp-includes/blocks/blocks-json.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,9 +3179,14 @@
31793179
'type' => 'boolean',
31803180
'default' => true
31813181
),
3182-
'displayExcerpt' => array(
3183-
'type' => 'boolean',
3184-
'default' => true
3182+
'displayContent' => array(
3183+
'type' => 'string',
3184+
'default' => 'excerpt',
3185+
'enum' => array(
3186+
'none',
3187+
'excerpt',
3188+
'full'
3189+
)
31853190
)
31863191
),
31873192
'supports' => array(
@@ -4404,9 +4409,6 @@
44044409
),
44054410
'textdomain' => 'default',
44064411
'attributes' => array(
4407-
'align' => array(
4408-
'type' => 'string'
4409-
),
44104412
'content' => array(
44114413
'type' => 'rich-text',
44124414
'source' => 'rich-text',
@@ -4457,6 +4459,7 @@
44574459
'typography' => array(
44584460
'fontSize' => true,
44594461
'lineHeight' => true,
4462+
'textAlign' => true,
44604463
'__experimentalFontFamily' => true,
44614464
'__experimentalTextDecoration' => true,
44624465
'__experimentalFontStyle' => true,
@@ -7771,6 +7774,9 @@
77717774
'isLink' => array(
77727775
'type' => 'boolean',
77737776
'default' => false
7777+
),
7778+
'levelOptions' => array(
7779+
'type' => 'array'
77747780
)
77757781
),
77767782
'supports' => array(

‎src/wp-includes/blocks/categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function render_block_core_categories( $attributes, $content, $block ) {
7979
}
8080
}
8181

82-
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type}" ) );
82+
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type} wp-block-categories-taxonomy-{$attributes['taxonomy']}" ) );
8383

8484
return sprintf(
8585
$wrapper_markup,

‎src/wp-includes/blocks/image.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ function block_core_image_render_lightbox( $block_content, $block ) {
202202
if ( isset( $block['attrs']['id'] ) ) {
203203
$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
204204
$img_metadata = wp_get_attachment_metadata( $block['attrs']['id'] );
205+
$img_srcset = wp_get_attachment_image_srcset( $block['attrs']['id'] );
205206
$img_width = $img_metadata['width'] ?? 'none';
206207
$img_height = $img_metadata['height'] ?? 'none';
207208
}
@@ -220,6 +221,7 @@ function block_core_image_render_lightbox( $block_content, $block ) {
220221
'metadata' => array(
221222
$unique_image_id => array(
222223
'uploadedSrc' => $img_uploaded_src,
224+
'lightboxSrcset' => $img_srcset,
223225
'figureClassNames' => $figure_class_names,
224226
'figureStyles' => $figure_styles,
225227
'imgClassNames' => $img_class_names,
@@ -252,6 +254,14 @@ function block_core_image_render_lightbox( $block_content, $block ) {
252254
$processor->set_attribute( 'data-wp-init', 'callbacks.setButtonStyles' );
253255
$processor->set_attribute( 'data-wp-on--load', 'callbacks.setButtonStyles' );
254256
$processor->set_attribute( 'data-wp-on-window--resize', 'callbacks.setButtonStyles' );
257+
258+
// Set an event to preload the image on pointerenter and pointerdown(mobile).
259+
// Pointerleave is used to cancel the preload if the user hovers away from the image
260+
// before the predefined delay.
261+
$processor->set_attribute( 'data-wp-on--pointerenter', 'actions.preloadImageWithDelay' );
262+
$processor->set_attribute( 'data-wp-on--pointerdown', 'actions.preloadImage' );
263+
$processor->set_attribute( 'data-wp-on--pointerleave', 'actions.cancelPreload' );
264+
255265
// Sets an event callback on the `img` because the `figure` element can also
256266
// contain a caption, and we don't want to trigger the lightbox when the
257267
// caption is clicked.
@@ -343,7 +353,14 @@ class="wp-lightbox-overlay zoom"
343353
</div>
344354
<div class="lightbox-image-container">
345355
<figure data-wp-bind--class="state.currentImage.figureClassNames" data-wp-bind--style="state.figureStyles">
346-
<img data-wp-bind--alt="state.currentImage.alt" data-wp-bind--class="state.currentImage.imgClassNames" data-wp-bind--style="state.imgStyles" data-wp-bind--src="state.enlargedSrc">
356+
<img
357+
data-wp-bind--alt="state.currentImage.alt"
358+
data-wp-bind--class="state.currentImage.imgClassNames"
359+
data-wp-bind--style="state.imgStyles"
360+
data-wp-bind--src="state.enlargedSrc"
361+
data-wp-bind--srcset="state.enlargedSrcset"
362+
sizes="100vw"
363+
>
347364
</figure>
348365
</div>
349366
<div class="scrim" style="background-color: $background_color" aria-hidden="true"></div>

‎src/wp-includes/blocks/latest-comments.php‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) {
4343
* @return string Returns the post content with latest comments added.
4444
*/
4545
function render_block_core_latest_comments( $attributes ) {
46+
// Handle backward compatibility: check for old displayExcerpt attribute
47+
if ( isset( $attributes['displayExcerpt'] ) ) {
48+
$display_content = $attributes['displayExcerpt'] ? 'excerpt' : 'none';
49+
} else {
50+
$display_content = isset( $attributes['displayContent'] ) ? $attributes['displayContent'] : 'excerpt';
51+
}
52+
4653
$comments = get_comments(
4754
/** This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php */
4855
apply_filters(
@@ -112,7 +119,9 @@ function render_block_core_latest_comments( $attributes ) {
112119
);
113120
}
114121
$list_items_markup .= '</footer>';
115-
if ( $attributes['displayExcerpt'] ) {
122+
if ( 'full' === $display_content ) {
123+
$list_items_markup .= '<div class="wp-block-latest-comments__comment-excerpt">' . wpautop( get_comment_text( $comment ) ) . '</div>';
124+
} elseif ( 'excerpt' === $display_content ) {
116125
$list_items_markup .= '<div class="wp-block-latest-comments__comment-excerpt">' . wpautop( get_comment_excerpt( $comment ) ) . '</div>';
117126
}
118127
$list_items_markup .= '</article></li>';
@@ -126,7 +135,7 @@ function render_block_core_latest_comments( $attributes ) {
126135
if ( $attributes['displayDate'] ) {
127136
$classnames[] = 'has-dates';
128137
}
129-
if ( $attributes['displayExcerpt'] ) {
138+
if ( 'none' !== $display_content ) {
130139
$classnames[] = 'has-excerpts';
131140
}
132141
if ( empty( $comments ) ) {

‎src/wp-includes/blocks/latest-comments/block.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
"type": "boolean",
2323
"default": true
2424
},
25-
"displayExcerpt": {
26-
"type": "boolean",
27-
"default": true
25+
"displayContent": {
26+
"type": "string",
27+
"default": "excerpt",
28+
"enum": [ "none", "excerpt", "full" ]
2829
}
2930
},
3031
"supports": {

0 commit comments

Comments
 (0)