mirror of
git://develop.git.wordpress.org/
synced 2025-03-15 09:29:48 +01:00
Editor: Update WordPress packages for 6.0 Beta 2
Included cherry-picked commits from the Gutenberg plugin that fix bugs discovered after WordPress 6.0 Beta 1. Props zieladam, ndiego. See #55567. git-svn-id: https://develop.svn.wordpress.org/trunk@53219 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
32f1bdeec6
commit
5d3a78bbd8
1838
package-lock.json
generated
1838
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
116
package.json
116
package.json
@ -25,10 +25,10 @@
|
||||
],
|
||||
"devDependencies": {
|
||||
"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
|
||||
"@wordpress/babel-preset-default": "6.8.0",
|
||||
"@wordpress/dependency-extraction-webpack-plugin": "3.4.1",
|
||||
"@wordpress/e2e-test-utils": "7.2.0",
|
||||
"@wordpress/scripts": "22.4.0",
|
||||
"@wordpress/babel-preset-default": "6.8.1",
|
||||
"@wordpress/dependency-extraction-webpack-plugin": "3.4.2",
|
||||
"@wordpress/e2e-test-utils": "7.2.1",
|
||||
"@wordpress/scripts": "22.4.1",
|
||||
"autoprefixer": "^9.8.8",
|
||||
"chalk": "4.1.2",
|
||||
"check-node-version": "4.2.1",
|
||||
@ -76,60 +76,60 @@
|
||||
"webpack-livereload-plugin": "3.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@wordpress/a11y": "3.6.0",
|
||||
"@wordpress/annotations": "2.6.0",
|
||||
"@wordpress/api-fetch": "6.3.0",
|
||||
"@wordpress/autop": "3.6.0",
|
||||
"@wordpress/blob": "3.6.0",
|
||||
"@wordpress/block-directory": "3.4.1",
|
||||
"@wordpress/block-editor": "8.5.1",
|
||||
"@wordpress/block-library": "7.3.1",
|
||||
"@wordpress/block-serialization-default-parser": "4.6.0",
|
||||
"@wordpress/blocks": "11.5.1",
|
||||
"@wordpress/components": "19.8.0",
|
||||
"@wordpress/compose": "5.4.0",
|
||||
"@wordpress/core-data": "4.4.1",
|
||||
"@wordpress/customize-widgets": "3.3.1",
|
||||
"@wordpress/data": "6.6.0",
|
||||
"@wordpress/data-controls": "2.6.0",
|
||||
"@wordpress/date": "4.6.0",
|
||||
"@wordpress/deprecated": "3.6.0",
|
||||
"@wordpress/dom": "3.6.0",
|
||||
"@wordpress/dom-ready": "3.6.0",
|
||||
"@wordpress/edit-post": "6.3.1",
|
||||
"@wordpress/edit-site": "4.3.1",
|
||||
"@wordpress/edit-widgets": "4.3.1",
|
||||
"@wordpress/editor": "12.5.1",
|
||||
"@wordpress/element": "4.4.0",
|
||||
"@wordpress/escape-html": "2.6.0",
|
||||
"@wordpress/format-library": "3.4.1",
|
||||
"@wordpress/hooks": "3.6.0",
|
||||
"@wordpress/html-entities": "3.6.0",
|
||||
"@wordpress/i18n": "4.6.0",
|
||||
"@wordpress/icons": "8.2.0",
|
||||
"@wordpress/interface": "4.5.0",
|
||||
"@wordpress/is-shallow-equal": "4.6.0",
|
||||
"@wordpress/keyboard-shortcuts": "3.4.0",
|
||||
"@wordpress/keycodes": "3.6.0",
|
||||
"@wordpress/list-reusable-blocks": "3.4.0",
|
||||
"@wordpress/media-utils": "3.4.0",
|
||||
"@wordpress/notices": "3.6.0",
|
||||
"@wordpress/nux": "5.4.0",
|
||||
"@wordpress/plugins": "4.4.0",
|
||||
"@wordpress/preferences": "1.2.0",
|
||||
"@wordpress/primitives": "3.4.0",
|
||||
"@wordpress/priority-queue": "2.6.0",
|
||||
"@wordpress/redux-routine": "4.6.0",
|
||||
"@wordpress/reusable-blocks": "3.4.1",
|
||||
"@wordpress/rich-text": "5.4.0",
|
||||
"@wordpress/server-side-render": "3.4.1",
|
||||
"@wordpress/shortcode": "3.6.0",
|
||||
"@wordpress/token-list": "2.6.0",
|
||||
"@wordpress/url": "3.7.0",
|
||||
"@wordpress/viewport": "4.4.0",
|
||||
"@wordpress/warning": "2.6.0",
|
||||
"@wordpress/widgets": "2.4.1",
|
||||
"@wordpress/wordcount": "3.6.0",
|
||||
"@wordpress/a11y": "3.6.1",
|
||||
"@wordpress/annotations": "2.6.1",
|
||||
"@wordpress/api-fetch": "6.3.1",
|
||||
"@wordpress/autop": "3.6.1",
|
||||
"@wordpress/blob": "3.6.1",
|
||||
"@wordpress/block-directory": "3.4.2",
|
||||
"@wordpress/block-editor": "8.5.2",
|
||||
"@wordpress/block-library": "7.3.2",
|
||||
"@wordpress/block-serialization-default-parser": "4.6.1",
|
||||
"@wordpress/blocks": "11.5.2",
|
||||
"@wordpress/components": "19.8.1",
|
||||
"@wordpress/compose": "5.4.1",
|
||||
"@wordpress/core-data": "4.4.2",
|
||||
"@wordpress/customize-widgets": "3.3.2",
|
||||
"@wordpress/data": "6.6.1",
|
||||
"@wordpress/data-controls": "2.6.1",
|
||||
"@wordpress/date": "4.6.1",
|
||||
"@wordpress/deprecated": "3.6.1",
|
||||
"@wordpress/dom": "3.6.1",
|
||||
"@wordpress/dom-ready": "3.6.1",
|
||||
"@wordpress/edit-post": "6.3.2",
|
||||
"@wordpress/edit-site": "4.3.2",
|
||||
"@wordpress/edit-widgets": "4.3.2",
|
||||
"@wordpress/editor": "12.5.2",
|
||||
"@wordpress/element": "4.4.1",
|
||||
"@wordpress/escape-html": "2.6.1",
|
||||
"@wordpress/format-library": "3.4.2",
|
||||
"@wordpress/hooks": "3.6.1",
|
||||
"@wordpress/html-entities": "3.6.1",
|
||||
"@wordpress/i18n": "4.6.1",
|
||||
"@wordpress/icons": "8.2.1",
|
||||
"@wordpress/interface": "4.5.1",
|
||||
"@wordpress/is-shallow-equal": "4.6.1",
|
||||
"@wordpress/keyboard-shortcuts": "3.4.1",
|
||||
"@wordpress/keycodes": "3.6.1",
|
||||
"@wordpress/list-reusable-blocks": "3.4.1",
|
||||
"@wordpress/media-utils": "3.4.1",
|
||||
"@wordpress/notices": "3.6.1",
|
||||
"@wordpress/nux": "5.4.1",
|
||||
"@wordpress/plugins": "4.4.1",
|
||||
"@wordpress/preferences": "1.2.1",
|
||||
"@wordpress/primitives": "3.4.1",
|
||||
"@wordpress/priority-queue": "2.6.1",
|
||||
"@wordpress/redux-routine": "4.6.1",
|
||||
"@wordpress/reusable-blocks": "3.4.2",
|
||||
"@wordpress/rich-text": "5.4.1",
|
||||
"@wordpress/server-side-render": "3.4.2",
|
||||
"@wordpress/shortcode": "3.6.1",
|
||||
"@wordpress/token-list": "2.6.1",
|
||||
"@wordpress/url": "3.7.1",
|
||||
"@wordpress/viewport": "4.4.1",
|
||||
"@wordpress/warning": "2.6.1",
|
||||
"@wordpress/widgets": "2.4.2",
|
||||
"@wordpress/wordcount": "3.6.1",
|
||||
"backbone": "1.4.1",
|
||||
"clipboard": "2.0.10",
|
||||
"core-js-url-browser": "3.6.4",
|
||||
|
File diff suppressed because one or more lines are too long
@ -8,11 +8,17 @@
|
||||
/**
|
||||
* Function that recursively renders a list of nested comments.
|
||||
*
|
||||
* @param WP_Comment[] $comments The array of comments.
|
||||
* @param WP_Comment[] $comments The array of comments.
|
||||
* @param WP_Block $block Block instance.
|
||||
* @return string
|
||||
*/
|
||||
function block_core_comment_template_render_comments( $comments, $block ) {
|
||||
global $comment_depth;
|
||||
|
||||
if ( empty( $comment_depth ) ) {
|
||||
$comment_depth = 1;
|
||||
}
|
||||
|
||||
$content = '';
|
||||
foreach ( $comments as $comment ) {
|
||||
|
||||
@ -28,14 +34,20 @@ function block_core_comment_template_render_comments( $comments, $block ) {
|
||||
// If the comment has children, recurse to create the HTML for the nested
|
||||
// comments.
|
||||
if ( ! empty( $children ) ) {
|
||||
$comment_depth += 1;
|
||||
$inner_content = block_core_comment_template_render_comments(
|
||||
$children,
|
||||
$block
|
||||
);
|
||||
$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
|
||||
$comment_depth -= 1;
|
||||
}
|
||||
|
||||
$content .= '<li>' . $block_content . '</li>';
|
||||
// The `false` parameter at the end means that we do NOT want the function to `echo` the output but to return a string.
|
||||
// See https://developer.wordpress.org/reference/functions/comment_class/#parameters.
|
||||
$comment_classes = comment_class( '', $comment->comment_ID, $comment->comment_post_ID, false );
|
||||
|
||||
$content .= sprintf( '<li id="comment-%1$s" %2$s>%3$s</li>', $comment->comment_ID, $comment_classes, $block_content );
|
||||
}
|
||||
|
||||
return $content;
|
||||
|
@ -1,26 +0,0 @@
|
||||
{
|
||||
"$schema": "https://schemas.wp.org/trunk/block.json",
|
||||
"apiVersion": 2,
|
||||
"name": "core/list-item",
|
||||
"title": "List item",
|
||||
"category": "text",
|
||||
"parent": [ "core/list" ],
|
||||
"description": "Create a list item.",
|
||||
"textdomain": "default",
|
||||
"attributes": {
|
||||
"placeholder": {
|
||||
"type": "string"
|
||||
},
|
||||
"content": {
|
||||
"type": "string",
|
||||
"source": "html",
|
||||
"selector": "li",
|
||||
"default": "",
|
||||
"__experimentalRole": "content"
|
||||
}
|
||||
},
|
||||
"supports": {
|
||||
"className": false,
|
||||
"__experimentalSelector": "li"
|
||||
}
|
||||
}
|
@ -94,7 +94,6 @@ module.exports = function( env = { environment: 'production', watch: false, buil
|
||||
'heading',
|
||||
'html',
|
||||
'list',
|
||||
'list-item',
|
||||
'media-text',
|
||||
'missing',
|
||||
'more',
|
||||
|
Loading…
x
Reference in New Issue
Block a user