Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

.github/workflows/failed-workflow.yml

@@ -42,4 +42,5 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               run_id: ${{ inputs.run_id }},
+              enable_debug_logging: true
             });

.github/workflows/test-npm.yml

@@ -55,6 +55,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+    continue-on-error: ${{ matrix.os == 'windows-latest' }}
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -55,6 +55,7 @@ wp-tests-config.php
 !/src/wp-content/themes/twentytwenty
 !/src/wp-content/themes/twentytwentyone
 !/src/wp-content/themes/twentytwentytwo
+!/src/wp-content/themes/twentytwentythree
 /src/wp-content/upgrade
 /src/wp-content/uploads
 /src/wp-content/advanced-cache.php

Gruntfile.js

@@ -3,6 +3,7 @@
 /* globals Set */
 var webpackConfig = require( './webpack.config' );
 var installChanged = require( 'install-changed' );
+var json2php = require( 'json2php' );
 
 module.exports = function(grunt) {
 	var path = require('path'),
@@ -1403,6 +1404,19 @@ module.exports = function(grunt) {
 		}
 	} );
 
+	grunt.registerTask( 'copy:block-json', 'Copies block.json file contents to block-json.php.', function() {
+		var blocks = {};
+		grunt.file.recurse( SOURCE_DIR + 'wp-includes/blocks', function( abspath, rootdir, subdir, filename ) {
+			if ( /^block\.json$/.test( filename ) ) {
+				blocks[ subdir ] = grunt.file.readJSON( abspath );
+			}
+		} );
+		grunt.file.write(
+			SOURCE_DIR + 'wp-includes/blocks/blocks-json.php',
+			'<?php return ' + json2php( blocks ) + ';'
+		);
+	} );
+
 	grunt.registerTask( 'copy:js', [
 		'copy:npm-packages',
 		'copy:vendor-js',
@@ -1451,6 +1465,7 @@ module.exports = function(grunt) {
 	grunt.registerTask( 'build:files', [
 		'clean:files',
 		'copy:files',
+		'copy:block-json',
 		'copy:version',
 	] );
 

package-lock.json

@@ -25,10 +25,10 @@
 	],
 	"devDependencies": {
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
-		"@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.2",
+		"@wordpress/babel-preset-default": "7.1.1",
+		"@wordpress/dependency-extraction-webpack-plugin": "4.0.2",
+		"@wordpress/e2e-test-utils": "8.1.1",
+		"@wordpress/scripts": "24.1.2",
 		"autoprefixer": "^9.8.8",
 		"chalk": "5.0.1",
 		"check-node-version": "4.2.1",
@@ -76,73 +76,74 @@
 		"webpack-livereload-plugin": "3.0.2"
 	},
 	"dependencies": {
-		"@wordpress/a11y": "3.6.1",
-		"@wordpress/annotations": "2.6.2",
-		"@wordpress/api-fetch": "6.3.1",
-		"@wordpress/autop": "3.6.1",
-		"@wordpress/blob": "3.6.1",
-		"@wordpress/block-directory": "3.4.14",
-		"@wordpress/block-editor": "8.5.10",
-		"@wordpress/block-library": "7.3.14",
-		"@wordpress/block-serialization-default-parser": "4.6.1",
-		"@wordpress/blocks": "11.5.3",
-		"@wordpress/components": "19.8.5",
-		"@wordpress/compose": "5.4.1",
-		"@wordpress/core-data": "4.4.5",
-		"@wordpress/customize-widgets": "3.3.14",
-		"@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.14",
-		"@wordpress/edit-site": "4.3.14",
-		"@wordpress/edit-widgets": "4.3.14",
-		"@wordpress/editor": "12.5.10",
-		"@wordpress/element": "4.4.1",
-		"@wordpress/escape-html": "2.6.1",
-		"@wordpress/format-library": "3.4.10",
-		"@wordpress/hooks": "3.6.1",
-		"@wordpress/html-entities": "3.6.1",
-		"@wordpress/i18n": "4.6.1",
-		"@wordpress/icons": "8.2.3",
-		"@wordpress/interface": "4.5.6",
-		"@wordpress/is-shallow-equal": "4.6.1",
-		"@wordpress/keyboard-shortcuts": "3.4.1",
-		"@wordpress/keycodes": "3.6.1",
-		"@wordpress/list-reusable-blocks": "3.4.5",
-		"@wordpress/media-utils": "3.4.1",
-		"@wordpress/notices": "3.6.1",
-		"@wordpress/nux": "5.4.5",
-		"@wordpress/plugins": "4.4.3",
-		"@wordpress/preferences": "2.8.0",
-		"@wordpress/preferences-persistence": "1.8.0",
-		"@wordpress/primitives": "3.4.1",
-		"@wordpress/priority-queue": "2.6.1",
-		"@wordpress/redux-routine": "4.6.1",
-		"@wordpress/reusable-blocks": "3.4.10",
-		"@wordpress/rich-text": "5.4.2",
-		"@wordpress/server-side-render": "3.4.6",
-		"@wordpress/shortcode": "3.6.1",
-		"@wordpress/style-engine": "0.5.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.10",
-		"@wordpress/wordcount": "3.6.1",
+		"@wordpress/a11y": "3.17.1",
+		"@wordpress/annotations": "2.17.2",
+		"@wordpress/api-fetch": "6.14.1",
+		"@wordpress/autop": "3.17.1",
+		"@wordpress/blob": "3.17.1",
+		"@wordpress/block-directory": "3.15.2",
+		"@wordpress/block-editor": "10.0.2",
+		"@wordpress/block-library": "7.14.2",
+		"@wordpress/block-serialization-default-parser": "4.17.1",
+		"@wordpress/blocks": "11.16.2",
+		"@wordpress/components": "21.0.2",
+		"@wordpress/compose": "5.15.2",
+		"@wordpress/core-data": "5.0.2",
+		"@wordpress/customize-widgets": "3.14.2",
+		"@wordpress/data": "7.1.2",
+		"@wordpress/data-controls": "2.17.2",
+		"@wordpress/date": "4.17.1",
+		"@wordpress/deprecated": "3.17.1",
+		"@wordpress/dom": "3.17.2",
+		"@wordpress/dom-ready": "3.17.1",
+		"@wordpress/edit-post": "6.14.2",
+		"@wordpress/edit-site": "4.14.2",
+		"@wordpress/edit-widgets": "4.14.2",
+		"@wordpress/editor": "12.16.2",
+		"@wordpress/element": "4.15.1",
+		"@wordpress/escape-html": "2.17.1",
+		"@wordpress/format-library": "3.15.2",
+		"@wordpress/hooks": "3.17.1",
+		"@wordpress/html-entities": "3.17.1",
+		"@wordpress/i18n": "4.17.1",
+		"@wordpress/icons": "9.8.1",
+		"@wordpress/interface": "4.16.2",
+		"@wordpress/is-shallow-equal": "4.17.1",
+		"@wordpress/keyboard-shortcuts": "3.15.2",
+		"@wordpress/keycodes": "3.17.1",
+		"@wordpress/list-reusable-blocks": "3.15.2",
+		"@wordpress/media-utils": "4.8.1",
+		"@wordpress/notices": "3.17.2",
+		"@wordpress/nux": "5.15.2",
+		"@wordpress/plugins": "4.15.2",
+		"@wordpress/preferences": "2.9.2",
+		"@wordpress/preferences-persistence": "1.9.1",
+		"@wordpress/primitives": "3.15.1",
+		"@wordpress/priority-queue": "2.17.2",
+		"@wordpress/redux-routine": "4.17.1",
+		"@wordpress/reusable-blocks": "3.15.2",
+		"@wordpress/rich-text": "5.15.2",
+		"@wordpress/server-side-render": "3.15.2",
+		"@wordpress/shortcode": "3.17.1",
+		"@wordpress/style-engine": "1.0.1",
+		"@wordpress/token-list": "2.17.1",
+		"@wordpress/url": "3.18.1",
+		"@wordpress/viewport": "4.15.2",
+		"@wordpress/warning": "2.17.1",
+		"@wordpress/widgets": "2.15.2",
+		"@wordpress/wordcount": "3.17.1",
 		"backbone": "1.4.1",
 		"clipboard": "2.0.10",
 		"core-js-url-browser": "3.6.4",
 		"element-closest": "^2.0.2",
 		"formdata-polyfill": "4.0.10",
 		"hoverintent": "2.2.1",
 		"imagesloaded": "4.1.4",
-		"jquery": "3.6.0",
+		"jquery": "3.6.1",
 		"jquery-color": "2.2.0",
 		"jquery-form": "4.3.0",
 		"jquery-hoverintent": "1.10.2",
+		"json2php": "^0.0.5",
 		"lodash": "4.17.21",
 		"masonry-layout": "4.2.2",
 		"moment": "2.29.4",

package.json

@@ -237,6 +237,7 @@
 
 				<!-- Test case parent classes outside of the "includes" folder. -->
 				<element value="Tests_Query_Conditionals"/>
+				<element value="WP_Block_Templates_UnitTestCase"/>
 				<element value="WP_Filesystem_UnitTestCase"/>
 				<element value="WP_HTTP_UnitTestCase"/>
 				<element value="WP_Image_UnitTestCase"/>

phpcs.xml.dist

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Accordion 1.13.1
+ * jQuery UI Accordion 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -37,7 +37,7 @@
 "use strict";
 
 return $.widget( "ui.accordion", {
-	version: "1.13.1",
+	version: "1.13.2",
 	options: {
 		active: 0,
 		animate: {},
@@ -204,24 +204,24 @@ return $.widget( "ui.accordion", {
 			toFocus = false;
 
 		switch ( event.keyCode ) {
-			case keyCode.RIGHT:
-			case keyCode.DOWN:
-				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-				break;
-			case keyCode.LEFT:
-			case keyCode.UP:
-				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-				break;
-			case keyCode.SPACE:
-			case keyCode.ENTER:
-				this._eventHandler( event );
-				break;
-			case keyCode.HOME:
-				toFocus = this.headers[ 0 ];
-				break;
-			case keyCode.END:
-				toFocus = this.headers[ length - 1 ];
-				break;
+		case keyCode.RIGHT:
+		case keyCode.DOWN:
+			toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+			break;
+		case keyCode.LEFT:
+		case keyCode.UP:
+			toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+			break;
+		case keyCode.SPACE:
+		case keyCode.ENTER:
+			this._eventHandler( event );
+			break;
+		case keyCode.HOME:
+			toFocus = this.headers[ 0 ];
+			break;
+		case keyCode.END:
+			toFocus = this.headers[ length - 1 ];
+			break;
 		}
 
 		if ( toFocus ) {
@@ -244,28 +244,28 @@ return $.widget( "ui.accordion", {
 
 		// Was collapsed or no panel
 		if ( ( options.active === false && options.collapsible === true ) ||
-			!this.headers.length ) {
+				!this.headers.length ) {
 			options.active = false;
 			this.active = $();
 
-			// active false only when collapsible is true
+		// active false only when collapsible is true
 		} else if ( options.active === false ) {
 			this._activate( 0 );
 
-			// was active, but active panel is gone
+		// was active, but active panel is gone
 		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
 
 			// all remaining panel are disabled
 			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
 				options.active = false;
 				this.active = $();
 
-				// activate previous panel
+			// activate previous panel
 			} else {
 				this._activate( Math.max( 0, options.active - 1 ) );
 			}
 
-			// was active, active panel still exists
+		// was active, active panel still exists
 		} else {
 
 			// make sure active index is correct
@@ -322,20 +322,20 @@ return $.widget( "ui.accordion", {
 				panel.attr( "aria-labelledby", headerId );
 			} )
 			.next()
-			.attr( "role", "tabpanel" );
+				.attr( "role", "tabpanel" );
 
 		this.headers
 			.not( this.active )
-			.attr( {
-				"aria-selected": "false",
-				"aria-expanded": "false",
-				tabIndex: -1
-			} )
-			.next()
-			.attr( {
-				"aria-hidden": "true"
-			} )
-			.hide();
+				.attr( {
+					"aria-selected": "false",
+					"aria-expanded": "false",
+					tabIndex: -1
+				} )
+				.next()
+					.attr( {
+						"aria-hidden": "true"
+					} )
+					.hide();
 
 		// Make sure at least one header is in the tab order
 		if ( !this.active.length ) {
@@ -347,9 +347,9 @@ return $.widget( "ui.accordion", {
 				tabIndex: 0
 			} )
 				.next()
-				.attr( {
-					"aria-hidden": "false"
-				} );
+					.attr( {
+						"aria-hidden": "false"
+					} );
 		}
 
 		this._createIcons();
@@ -454,11 +454,11 @@ return $.widget( "ui.accordion", {
 
 		if (
 
-			// click on active header, but not collapsible
-			( clickedIsActive && !options.collapsible ) ||
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
 
-			// allow canceling activation
-			( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
 			return;
 		}
 
@@ -534,11 +534,11 @@ return $.widget( "ui.accordion", {
 		toShow
 			.attr( "aria-hidden", "false" )
 			.prev()
-			.attr( {
-				"aria-selected": "true",
-				"aria-expanded": "true",
-				tabIndex: 0
-			} );
+				.attr( {
+					"aria-selected": "true",
+					"aria-expanded": "true",
+					tabIndex: 0
+				} );
 	},
 
 	_animate: function( toShow, toHide, data ) {