Merge branch 'trunk' into fix/issue-64071

Author: hbhalodia

Gruntfile.js

@@ -1564,36 +1564,6 @@ module.exports = function(grunt) {
 		'qunit:compiled'
 	] );
 
-	grunt.registerTask( 'sync-gutenberg-packages', function() {
-		if ( grunt.option( 'update-browserlist' ) ) {
-			/*
-			 * Updating the browserlist database is opt-in and up to the release lead.
-			 *
-			 * Browserlist database should be updated:
-			 * - In each release cycle up until RC1
-			 * - If Webpack throws a warning about an outdated database
-			 *
-			 * It should not be updated:
-			 * - After the RC1
-			 * - When backporting fixes to older WordPress releases.
-			 *
-			 * For more context, see:
-			 * https://github.com/WordPress/wordpress-develop/pull/2621#discussion_r859840515
-			 * https://core.trac.wordpress.org/ticket/55559
-			 */
-			grunt.task.run( 'browserslist:update' );
-		}
-
-		// Install the latest version of the packages already listed in package.json.
-		grunt.task.run( 'wp-packages:update' );
-
-		/*
-		 * Install any new @wordpress packages that are now required.
-		 * Update any non-@wordpress deps to the same version as required in the @wordpress packages (e.g. react 16 -> 17).
-		 */
-		grunt.task.run( 'wp-packages:refresh-deps' );
-	} );
-
 	// Gutenberg integration tasks.
 	grunt.registerTask( 'gutenberg:verify', 'Verifies the installed Gutenberg version matches the expected SHA.', function() {
 		const done = this.async();
@@ -2093,9 +2063,19 @@ module.exports = function(grunt) {
 	] );
 
 	grunt.registerTask( 'build', function() {
+		var done = this.async();
+
+		grunt.util.spawn( {
+			grunt: true,
+			args: [ 'clean', '--dev' ],
+			opts: { stdio: 'inherit' }
+		}, function( buildError ) {
+			done( ! buildError );
+		} );
+
 		if ( grunt.option( 'dev' ) ) {
 			grunt.task.run( [
-				'gutenberg:verify',
+				'gutenberg:download',
 				'build:js',
 				'build:css',
 				'build:codemirror',
@@ -2105,7 +2085,7 @@ module.exports = function(grunt) {
 			] );
 		} else {
 			grunt.task.run( [
-				'gutenberg:verify',
+				'gutenberg:download',
 				'build:certificates',
 				'build:files',
 				'build:js',
@@ -2227,21 +2207,6 @@ module.exports = function(grunt) {
 		} );
 	} );
 
-	grunt.registerTask( 'wp-packages:refresh-deps', 'Update version of dependencies in package.json to match the ones listed in the latest WordPress packages', function() {
-		const distTag = grunt.option('dist-tag') || 'latest';
-		grunt.log.writeln( `Updating versions of dependencies listed in package.json (--dist-tag=${distTag})` );
-		spawn( 'node', [ 'tools/release/sync-gutenberg-packages.js', `--dist-tag=${distTag}` ], {
-			cwd: __dirname,
-			stdio: 'inherit',
-		} );
-	} );
-
-	grunt.registerTask( 'wp-packages:sync-stable-blocks', 'Refresh the PHP files referring to stable @wordpress/block-library blocks.', function() {
-		grunt.log.writeln( `Syncing stable blocks from @wordpress/block-library to src/` );
-		const { main } = require( './tools/release/sync-stable-blocks' );
-		main();
-	} );
-
 	// Patch task.
 	grunt.renameTask('patch_wordpress', 'patch');
 

package-lock.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "8c78d87453509661a9f28f978ba2c242d515563b",
+		"sha": "487a096a9782ba6110a7686d7b4b2d0c55ed1b06",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {
@@ -65,6 +65,7 @@
 		"grunt-sass": "~4.1.0",
 		"grunt-webpack": "7.0.1",
 		"install-changed": "1.1.0",
+		"json2php": "0.0.12",
 		"postcss": "8.5.8",
 		"prettier": "npm:wp-prettier@3.0.3",
 		"qunit": "~2.25.0",
@@ -96,7 +97,6 @@
 		"jquery-color": "3.0.0",
 		"jquery-form": "4.3.0",
 		"jquery-hoverintent": "1.10.2",
-		"json2php": "0.0.12",
 		"jsonlint": "1.6.3",
 		"lodash": "4.17.23",
 		"masonry-layout": "4.2.2",
@@ -107,7 +107,7 @@
 		"react-dom": "18.3.1",
 		"react-is": "18.3.1",
 		"regenerator-runtime": "0.14.1",
-		"underscore": "1.13.7",
+		"underscore": "1.13.8",
 		"whatwg-fetch": "3.6.20",
 		"wicg-inert": "3.1.3"
 	},
@@ -142,8 +142,6 @@
 		"gutenberg:copy": "node tools/gutenberg/copy.js",
 		"gutenberg:verify": "node tools/gutenberg/utils.js",
 		"gutenberg:download": "node tools/gutenberg/download.js && grunt build:gutenberg --dev",
-		"vendor:copy": "node tools/vendors/copy-vendors.js",
-		"sync-gutenberg-packages": "grunt sync-gutenberg-packages",
-		"postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"
+		"vendor:copy": "node tools/vendors/copy-vendors.js"
 	}
 }

package.json

@@ -9,6 +9,30 @@
 
 use WordPress\AiClient\AiClient;
 
+/**
+ * Returns whether AI features are supported in the current environment.
+ *
+ * @since 7.0.0
+ *
+ * @return bool Whether AI features are supported.
+ */
+function wp_supports_ai(): bool {
+	$is_enabled = defined( 'WP_AI_SUPPORT' ) ? WP_AI_SUPPORT : true;
+
+	/**
+	 * Filters whether the current request should use AI.
+	 *
+	 * This allows plugins and 3rd-party code to disable AI features on a per-request basis, or to even override explicit
+	 * preferences defined by the site owner.
+	 *
+	 * @since 7.0.0
+	 *
+	 * @param bool $is_enabled Whether the current request should use AI. Default to WP_AI_SUPPORT constant, or true if
+	 *                         the constant is not defined.
+	 */
+	return (bool) apply_filters( 'wp_supports_ai', $is_enabled );
+}
+
 /**
  * Creates a new AI prompt builder using the default provider registry.
  *

src/wp-includes/ai-client.php

@@ -46,6 +46,8 @@
  *
  * @since 7.0.0
  *
+ * @phpstan-import-type Prompt from PromptBuilder
+ *
  * @method self with_text(string $text) Adds text to the current message.
  * @method self with_file($file, ?string $mimeType = null) Adds a file to the current message.
  * @method self with_function_response(FunctionResponse $functionResponse) Adds a function response to the current message.
@@ -170,14 +172,14 @@ class WP_AI_Client_Prompt_Builder {
 	 *
 	 * @since 7.0.0
 	 *
-	 * @param ProviderRegistry                                                                 $registry The provider registry for finding suitable models.
-	 * @param string|MessagePart|Message|array|list<string|MessagePart|array>|list<Message>|null $prompt   Optional. Initial prompt content.
-	 *                                                                                                    A string for simple text prompts,
-	 *                                                                                                    a MessagePart or Message object for
-	 *                                                                                                    structured content, an array for a
-	 *                                                                                                    message array shape, or a list of
-	 *                                                                                                    parts or messages for multi-turn
-	 *                                                                                                    conversations. Default null.
+	 * @param ProviderRegistry $registry The provider registry for finding suitable models.
+	 * @param Prompt           $prompt   Optional. Initial prompt content.
+	 *                                   A string for simple text prompts,
+	 *                                   a MessagePart or Message object for
+	 *                                   structured content, an array for a
+	 *                                   message array shape, or a list of
+	 *                                   parts or messages for multi-turn
+	 *                                   conversations. Default null.
 	 */
 	public function __construct( ProviderRegistry $registry, $prompt = null ) {
 		try {
@@ -289,26 +291,35 @@ public function __call( string $name, array $arguments ) {
 
 		// Check if the prompt should be prevented for is_supported* and generate_*/convert_text_to_speech* methods.
 		if ( self::is_support_check_method( $name ) || self::is_generating_method( $name ) ) {
-			/**
-			 * Filters whether to prevent the prompt from being executed.
-			 *
-			 * @since 7.0.0
-			 *
-			 * @param bool                        $prevent Whether to prevent the prompt. Default false.
-			 * @param WP_AI_Client_Prompt_Builder $builder A clone of the prompt builder instance (read-only).
-			 */
-			$prevent = (bool) apply_filters( 'wp_ai_client_prevent_prompt', false, clone $this );
+			// If AI is not supported, then there's no need to apply the filter as the prompt will be prevented anyway.
+			$is_ai_disabled = ! wp_supports_ai();
+			$prevent        = $is_ai_disabled;
+			if ( ! $prevent ) {
+				/**
+				 * Filters whether to prevent the prompt from being executed.
+				 *
+				 * @since 7.0.0
+				 *
+				 * @param bool                        $prevent Whether to prevent the prompt. Default false.
+				 * @param WP_AI_Client_Prompt_Builder $builder A clone of the prompt builder instance (read-only).
+				 */
+				$prevent = (bool) apply_filters( 'wp_ai_client_prevent_prompt', false, clone $this );
+			}
 
 			if ( $prevent ) {
 				// For is_supported* methods, return false.
 				if ( self::is_support_check_method( $name ) ) {
 					return false;
 				}
 
+				$error_message = $is_ai_disabled
+					? __( 'AI features are not supported in this environment.' )
+					: __( 'Prompt execution was prevented by a filter.' );
+
 				// For generate_* and convert_text_to_speech* methods, create a WP_Error.
 				$this->error = new WP_Error(
 					'prompt_prevented',
-					__( 'Prompt execution was prevented by a filter.' ),
+					$error_message,
 					array(
 						'status' => 503,
 					)
@@ -423,7 +434,8 @@ private static function is_generating_method( string $name ): bool {
 	protected function get_builder_callable( string $name ): callable {
 		$camel_case_name = $this->snake_to_camel_case( $name );
 
-		if ( ! is_callable( array( $this->builder, $camel_case_name ) ) ) {
+		$method = array( $this->builder, $camel_case_name );
+		if ( ! is_callable( $method ) ) {
 			throw new BadMethodCallException(
 				sprintf(
 					/* translators: 1: Method name. 2: Class name. */
@@ -434,7 +446,7 @@ protected function get_builder_callable( string $name ): callable {
 			);
 		}
 
-		return array( $this->builder, $camel_case_name );
+		return $method;
 	}
 
 	/**

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

@@ -976,7 +976,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 
 		$tags_data[] = array(
 			'id'              => $tag_id,
-			'url'             => ( '#' !== $tag->link ) ? $tag->link : '#',
+			'url'             => $tag->link,
 			'role'            => ( '#' !== $tag->link ) ? '' : ' role="button"',
 			'name'            => $tag->name,
 			'formatted_count' => $formatted_count,

src/wp-includes/category-template.php

@@ -179,30 +179,50 @@ function get_block_wrapper_attributes( $extra_attributes = array() ) {
 		return '';
 	}
 
-	// This is hardcoded on purpose.
-	// We only support a fixed list of attributes.
-	$attributes_to_merge = array( 'style', 'class', 'id', 'aria-label' );
-	$attributes          = array();
-	foreach ( $attributes_to_merge as $attribute_name ) {
-		if ( empty( $new_attributes[ $attribute_name ] ) && empty( $extra_attributes[ $attribute_name ] ) ) {
-			continue;
-		}
-
-		if ( empty( $new_attributes[ $attribute_name ] ) ) {
-			$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ];
-			continue;
-		}
-
-		if ( empty( $extra_attributes[ $attribute_name ] ) ) {
-			$attributes[ $attribute_name ] = $new_attributes[ $attribute_name ];
+	// Attribute values are concatenated or overridden depending on the attribute type.
+	// This is hardcoded on purpose, as we only support a fixed list of attributes.
+	$attribute_merge_callbacks = array(
+		'style'      => static function ( $new_attribute, $extra_attribute ) {
+			$styles = array_filter(
+				array(
+					rtrim( trim( $new_attribute ), ';' ),
+					rtrim( trim( $extra_attribute ), ';' ),
+				)
+			);
+			return safecss_filter_attr( implode( ';', array_filter( $styles ) ) );
+		},
+		'class'      => static function ( $new_attribute, $extra_attribute ) {
+			$classes = array_merge(
+				(array) preg_split( '/\s+/', $extra_attribute, -1, PREG_SPLIT_NO_EMPTY ),
+				(array) preg_split( '/\s+/', $new_attribute, -1, PREG_SPLIT_NO_EMPTY )
+			);
+			$classes = array_unique( array_filter( $classes ) );
+			return implode( ' ', $classes );
+		},
+		'id'         => static function ( $new_attribute, $extra_attribute ) {
+			return '' !== $extra_attribute ? $extra_attribute : $new_attribute;
+		},
+		'aria-label' => static function ( $new_attribute, $extra_attribute ) {
+			return '' !== $extra_attribute ? $extra_attribute : $new_attribute;
+		},
+	);
+
+	$attributes = array();
+	foreach ( $attribute_merge_callbacks as $attribute_name => $merge_callback ) {
+		$new_attribute   = $new_attributes[ $attribute_name ] ?? '';
+		$extra_attribute = $extra_attributes[ $attribute_name ] ?? '';
+		$new_attribute   = is_string( $new_attribute ) ? $new_attribute : '';
+		$extra_attribute = is_string( $extra_attribute ) ? $extra_attribute : '';
+
+		if ( '' === $new_attribute && '' === $extra_attribute ) {
 			continue;
 		}
 
-		$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ];
+		$attributes[ $attribute_name ] = $merge_callback( $new_attribute, $extra_attribute );
 	}
 
 	foreach ( $extra_attributes as $attribute_name => $value ) {
-		if ( ! in_array( $attribute_name, $attributes_to_merge, true ) ) {
+		if ( ! isset( $attribute_merge_callbacks[ $attribute_name ] ) ) {
 			$attributes[ $attribute_name ] = $value;
 		}
 	}

src/wp-includes/class-wp-block-supports.php

@@ -170,6 +170,11 @@ public function register( string $id, array $args ): ?array {
 			return null;
 		}
 
+		if ( 'ai_provider' === $args['type'] && ! wp_supports_ai() ) {
+			// No need for a `doing_it_wrong` as AI support is disabled intentionally.
+			return null;
+		}
+
 		$connector = array(
 			'name'           => $args['name'],
 			'description'    => isset( $args['description'] ) && is_string( $args['description'] ) ? $args['description'] : '',