Merge branch 'WordPress:trunk' into trunk

backport-changelog/6.8/7069.md

@@ -3,3 +3,4 @@ https://github.com/WordPress/wordpress-develop/pull/7069
 * https://github.com/WordPress/gutenberg/pull/63401
 * https://github.com/WordPress/gutenberg/pull/66918
 * https://github.com/WordPress/gutenberg/pull/67018
+* https://github.com/WordPress/gutenberg/pull/67552

docs/contributors/code/e2e/README.md

@@ -75,7 +75,7 @@ To encourage better practices for querying elements, selectors are [strict](http
 
 ### Favor Page Object Model over utils
 
-As mentioned above, [Page Object Model](https://playwright.dev/docs/test-pom) is the preferred way to create reusable utility functions on a certain page.
+As mentioned above, [Page Object Model](https://playwright.dev/docs/pom) is the preferred way to create reusable utility functions on a certain page.
 
 The rationale behind using a POM is to group utils under namespaces to be easier to discover and use. In fact, `PageUtils` in the `e2e-test-utils-playwright` package is also a POM, which avoids the need for global variables, and utils can reference each other with `this`.
 

lib/compat/wordpress-6.8/blocks.php

@@ -71,6 +71,10 @@ function gutenberg_stabilize_experimental_block_supports( $args ) {
 		}
 
 		$stabilize_config = function ( $unstable_config, $stable_support_key ) use ( $experimental_support_properties, $common_experimental_properties ) {
+			if ( ! is_array( $unstable_config ) ) {
+				return $unstable_config;
+			}
+
 			$stable_config = array();
 			foreach ( $unstable_config as $key => $value ) {
 				// Get stable key from support-specific map, common properties map, or keep original.
@@ -116,18 +120,19 @@ function gutenberg_stabilize_experimental_block_supports( $args ) {
 				( $key_positions[ $support ] ?? PHP_INT_MAX ) <
 				( $key_positions[ $stable_support_key ] ?? PHP_INT_MAX );
 
-			if ( is_array( $args['supports'][ $stable_support_key ] ) ) {
-				/*
-				 * To merge the alternative support config effectively, it also needs to be
-				 * stabilized before merging to keep stabilized and experimental flags in
-				 * sync.
-				 */
-				$args['supports'][ $stable_support_key ] = $stabilize_config( $args['supports'][ $stable_support_key ], $stable_support_key );
-				$stable_config                           = $experimental_first
+			/*
+			 * To merge the alternative support config effectively, it also needs to be
+			 * stabilized before merging to keep stabilized and experimental flags in
+			 * sync.
+			 */
+			$args['supports'][ $stable_support_key ] = $stabilize_config( $args['supports'][ $stable_support_key ], $stable_support_key );
+			// Prevents reprocessing this support as it was stabilized above.
+			$done[ $stable_support_key ] = true;
+
+			if ( is_array( $stable_config ) && is_array( $args['supports'][ $stable_support_key ] ) ) {
+				$stable_config = $experimental_first
 					? array_merge( $stable_config, $args['supports'][ $stable_support_key ] )
 					: array_merge( $args['supports'][ $stable_support_key ], $stable_config );
-				// Prevents reprocessing this support as it was merged above.
-				$done[ $stable_support_key ] = true;
 			} else {
 				$stable_config = $experimental_first
 					? $args['supports'][ $stable_support_key ]

lib/experimental/blocks.php

@@ -117,3 +117,22 @@ function gutenberg_register_block_style( $block_name, $style_properties ) {
 
 	return $result;
 }
+
+/**
+ * Additional data to expose to the view script module in the Form block.
+ */
+function gutenberg_block_core_form_view_script_module( $data ) {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return $data;
+	}
+
+	$data['nonce']   = wp_create_nonce( 'wp-block-form' );
+	$data['ajaxUrl'] = admin_url( 'admin-ajax.php' );
+	$data['action']  = 'wp_block_form_email_submit';
+
+	return $data;
+}
+add_filter(
+	'script_module_data_@wordpress/block-library/form/view',
+	'gutenberg_block_core_form_view_script_module'
+);