Merge branch 'trunk' into 64564-get-block-wrapper-attributes

Author: t-hamano

Gruntfile.js

@@ -612,6 +612,17 @@ module.exports = function(grunt) {
 					dest: WORKING_DIR + 'wp-includes/build/',
 				} ],
 			},
+			'gutenberg-js': {
+				files: [ {
+					expand: true,
+					cwd: 'gutenberg/build',
+					src: [
+						'pages/**/*.js',
+						'routes/**/*.js',
+					],
+					dest: WORKING_DIR + 'wp-includes/build/',
+				} ],
+			},
 			'gutenberg-modules': {
 				files: [ {
 					expand: true,
@@ -2041,6 +2052,7 @@ module.exports = function(grunt) {
 
 	grunt.registerTask( 'build:gutenberg', [
 		'copy:gutenberg-php',
+		'copy:gutenberg-js',
 		'gutenberg:copy',
 		'copy:gutenberg-modules',
 		'copy:gutenberg-styles',

src/wp-admin/css/colors/_admin.scss

@@ -88,27 +88,12 @@ input[type="checkbox"]:checked {
 	border-color: var(--wp-admin-theme-color);
 }
 
-input[type=checkbox]:checked::before {
-	content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour(variables.$form-checked)}%27%2F%3E%3C%2Fsvg%3E");
-	content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour(variables.$form-checked)}%27%2F%3E%3C%2Fsvg%3E") / '';
-}
-
-// Checkbox checkmark - white for visibility on theme color background
-input[type="checkbox"]:checked::before {
-	content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%23ffffff%27%2F%3E%3C%2Fsvg%3E") / '';
-}
-
 // Radio checked state - uses theme color
 input[type="radio"]:checked {
 	background: var(--wp-admin-theme-color);
 	border-color: var(--wp-admin-theme-color);
 }
 
-// Radio dot - white for visibility on theme color background
-input[type="radio"]:checked::before {
-	background: tokens.$white;
-}
-
 .wp-core-ui input[type="reset"]:hover,
 .wp-core-ui input[type="reset"]:active {
 	color: variables.$link-focus;

src/wp-admin/css/common.css

@@ -1380,6 +1380,12 @@ th.action-links {
 	}
 }
 
+@media only screen and (max-width: 1250px) {
+	.wp-filter:has(.plugin-install-search) .search-form {
+		margin: 11px 0;
+	}
+}
+
 @media only screen and (max-width: 1120px) {
 	.filter-drawer {
 		border-bottom: 1px solid #f0f0f1;

src/wp-admin/includes/file.php

@@ -1958,7 +1958,7 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 		}
 	}
 
-	/** This filter is documented in src/wp-admin/includes/file.php */
+	/** This filter is documented in wp-admin/includes/file.php */
 	$pre = apply_filters( 'pre_unzip_file', null, $file, $to, $needed_dirs, $required_space );
 
 	if ( null !== $pre ) {
@@ -1985,7 +1985,7 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 		}
 	}
 
-	/** This action is documented in src/wp-admin/includes/file.php */
+	/** This filter is documented in wp-admin/includes/file.php */
 	$result = apply_filters( 'unzip_file', true, $file, $to, $needed_dirs, $required_space );
 
 	unset( $needed_dirs );

src/wp-includes/admin-bar.php

@@ -945,7 +945,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
  * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_command_palette_menu( WP_Admin_Bar $wp_admin_bar ): void {
-	if ( ! is_admin() ) {
+	if ( ! is_admin() || ! wp_script_is( 'wp-core-commands', 'enqueued' ) ) {
 		return;
 	}
 
@@ -954,7 +954,7 @@ function wp_admin_bar_command_palette_menu( WP_Admin_Bar $wp_admin_bar ): void {
 		? _x( '⌘K', 'keyboard shortcut to open the command palette' )
 		: _x( 'Ctrl+K', 'keyboard shortcut to open the command palette' );
 	$title          = sprintf(
-		'<span class="ab-label"><kbd>%s</kbd><span class="screen-reader-text"> %s</span></span>',
+		'<span class="ab-icon" aria-hidden="true"></span><span class="ab-label"><kbd>%s</kbd><span class="screen-reader-text"> %s</span></span>',
 		$shortcut_label,
 		/* translators: Hidden accessibility text. */
 		__( 'Open command palette' ),

src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php

@@ -10,6 +10,7 @@
 use WordPress\AiClient\Builders\PromptBuilder;
 use WordPress\AiClient\Files\DTO\File;
 use WordPress\AiClient\Files\Enums\FileTypeEnum;
+use WordPress\AiClient\Files\Enums\MediaOrientationEnum;
 use WordPress\AiClient\Messages\DTO\Message;
 use WordPress\AiClient\Messages\DTO\MessagePart;
 use WordPress\AiClient\Messages\Enums\ModalityEnum;
@@ -66,6 +67,9 @@
  * @method self as_output_schema(array<string, mixed> $schema) Sets the output schema.
  * @method self as_output_modalities(ModalityEnum ...$modalities) Sets the output modalities.
  * @method self as_output_file_type(FileTypeEnum $fileType) Sets the output file type.
+ * @method self as_output_media_orientation(MediaOrientationEnum $orientation) Sets the output media orientation.
+ * @method self as_output_media_aspect_ratio(string $aspectRatio) Sets the output media aspect ratio.
+ * @method self as_output_speech_voice(string $voice) Sets the output speech voice.
  * @method self as_json_response(?array<string, mixed> $schema = null) Configures the prompt for JSON response output.
  * @method bool|WP_Error is_supported(?CapabilityEnum $capability = null) Checks if the prompt is supported for the given capability.
  * @method bool is_supported_for_text_generation() Checks if the prompt is supported for text generation.
@@ -80,6 +84,7 @@
  * @method GenerativeAiResult|WP_Error generate_image_result() Generates an image result from the prompt.
  * @method GenerativeAiResult|WP_Error generate_speech_result() Generates a speech result from the prompt.
  * @method GenerativeAiResult|WP_Error convert_text_to_speech_result() Converts text to speech and returns the result.
+ * @method GenerativeAiResult|WP_Error generate_video_result() Generates a video result from the prompt.
  * @method string|WP_Error generate_text() Generates text from the prompt.
  * @method list<string>|WP_Error generate_texts(?int $candidateCount = null) Generates multiple text candidates from the prompt.
  * @method File|WP_Error generate_image() Generates an image from the prompt.
@@ -88,6 +93,8 @@
  * @method list<File>|WP_Error convert_text_to_speeches(?int $candidateCount = null) Converts text to multiple speech outputs.
  * @method File|WP_Error generate_speech() Generates speech from the prompt.
  * @method list<File>|WP_Error generate_speeches(?int $candidateCount = null) Generates multiple speech outputs from the prompt.
+ * @method File|WP_Error generate_video() Generates a video from the prompt.
+ * @method list<File>|WP_Error generate_videos(?int $candidateCount = null) Generates multiple videos from the prompt.
  */
 class WP_AI_Client_Prompt_Builder {
 
@@ -121,6 +128,7 @@ class WP_AI_Client_Prompt_Builder {
 		'generate_image_result'         => true,
 		'generate_speech_result'        => true,
 		'convert_text_to_speech_result' => true,
+		'generate_video_result'         => true,
 		'generate_text'                 => true,
 		'generate_texts'                => true,
 		'generate_image'                => true,
@@ -129,6 +137,8 @@ class WP_AI_Client_Prompt_Builder {
 		'convert_text_to_speeches'      => true,
 		'generate_speech'               => true,
 		'generate_speeches'             => true,
+		'generate_video'                => true,
+		'generate_videos'               => true,
 	);
 
 	/**