@wordpress/e2e-tests 8.33.0 → 8.33.1

package/mu-plugins/server-timing.php

@@ -1,5 +1,17 @@
 <?php
 
+/*
+ * Note: As of WordPress 6.9, there is a template enhancement output buffer which can be used instead of the following
+ * template_include code which opens its own buffer. It is enabled by default in classic themes, but it can be enabled
+ * by default even for block themes via:
+ *
+ *     add_filter( 'wp_should_output_buffer_template_for_enhancement', '__return_true' );
+ *
+ * Alternatively, instead of using the template_include filter to start output buffering, this can be done via the
+ * wp_before_include_template action which fires after the template_include filter and immediately before the template
+ * is loaded.
+ */
+
 add_filter(
 	'template_include',
 	static function ( $template ) {
@@ -11,13 +23,8 @@ add_filter(
 
 		$server_timing_values['wpBeforeTemplate'] = $template_start - $timestart;
 
-		ob_start();
-
-		add_action(
-			'shutdown',
-			static function () use ( $server_timing_values, $template_start, $wpdb ) {
-				$output = ob_get_clean();
-
+		ob_start(
+			static function ( $output ) use ( $server_timing_values, $template_start, $wpdb ) {
 				$server_timing_values['wpTemplate'] = microtime( true ) - $template_start;
 
 				$server_timing_values['wpTotal'] = $server_timing_values['wpBeforeTemplate'] + $server_timing_values['wpTemplate'];
@@ -39,9 +46,8 @@ add_filter(
 				}
 				header( 'Server-Timing: ' . implode( ', ', $header_values ) );
 
-				echo $output;
-			},
-			PHP_INT_MIN
+				return $output;
+			}
 		);
 
 		return $template;
@@ -54,13 +60,8 @@ add_action(
 	static function () {
 		global $timestart, $wpdb;
 
-		ob_start();
-
-		add_action(
-			'shutdown',
-			static function () use ( $wpdb, $timestart ) {
-				$output = ob_get_clean();
-
+		ob_start(
+			static function ( $output ) use ( $wpdb, $timestart ) {
 				$server_timing_values = array();
 
 				$server_timing_values['wpTotal'] = microtime( true ) - $timestart;
@@ -82,9 +83,8 @@ add_action(
 				}
 				header( 'Server-Timing: ' . implode( ', ', $header_values ) );
 
-				echo $output;
-			},
-			PHP_INT_MIN
+				return $output;
+			}
 		);
 	},
 	PHP_INT_MAX

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "8.33.0",
+	"version": "8.33.1",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -24,13 +24,13 @@
 		"npm": ">=8.19.2"
 	},
 	"dependencies": {
-		"@wordpress/e2e-test-utils": "^11.33.0",
-		"@wordpress/interactivity": "^6.33.0",
-		"@wordpress/interactivity-router": "^2.33.0",
-		"@wordpress/jest-console": "^8.33.0",
-		"@wordpress/jest-puppeteer-axe": "^7.33.0",
-		"@wordpress/scripts": "^30.26.0",
-		"@wordpress/url": "^4.33.0",
+		"@wordpress/e2e-test-utils": "^11.33.1",
+		"@wordpress/interactivity": "^6.33.1",
+		"@wordpress/interactivity-router": "^2.33.1",
+		"@wordpress/jest-console": "^8.33.1",
+		"@wordpress/jest-puppeteer-axe": "^7.33.1",
+		"@wordpress/scripts": "^30.26.1",
+		"@wordpress/url": "^4.33.1",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
@@ -47,5 +47,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2bbe0d34ab65458468758c48826296d7a753428b"
+	"gitHead": "5f84bafdec1bed05247c1080c12f6a237951b862"
 }

package/plugins/block-bindings/index.js

@@ -34,89 +34,12 @@ registerBlockBindingsSource( {
 	getValues,
 	setValues,
 	canUserEditValue: () => true,
-	editorUI() {
-		return {
-			mode: 'dropdown',
-			data: Object.entries( fieldsList || {} ).map(
-				( [ key, field ] ) => ( {
-					label: field?.label || key,
-					type: field?.type || 'string',
-					args: {
-						key,
-					},
-				} )
-			),
-		};
-	},
-} );
-
-const ModalButton = ( { fieldKey, fieldLabel, attribute, closeModal } ) => {
-	const { updateBlockBindings } = wp.blockEditor.useBlockBindingsUtils();
-
-	return el(
-		'button',
-		{
-			onClick: () => {
-				updateBlockBindings( {
-					[ attribute ]: {
-						source: 'testing/modal-source',
-						args: { key: fieldKey },
-					},
-				} );
-				closeModal();
-			},
-			style: {
-				display: 'block',
-				margin: '5px 0',
-				padding: '10px',
-				width: '100%',
-			},
-		},
-		fieldLabel
-	);
-};
-
-registerBlockBindingsSource( {
-	name: 'testing/modal-source',
-	label: 'Modal Source',
-	getValues,
-	setValues,
-	canUserEditValue: () => true,
-	editorUI() {
-		return {
-			mode: 'modal',
-			data: Object.entries( fieldsList || {} ).map(
-				( [ key, field ] ) => ( {
-					label: field?.label || key,
-					type: field?.type || 'string',
-					args: {
-						key,
-					},
-				} )
-			),
-			renderModalContent( { attribute, closeModal } ) {
-				return el(
-					'div',
-					{ style: { padding: '20px' } },
-					el( 'h3', null, 'Select a field from the modal' ),
-					el(
-						'p',
-						null,
-						'This is a modal interface for selecting fields.'
-					),
-					Object.entries( fieldsList || {} ).map(
-						( [ key, field ] ) =>
-							el( ModalButton, {
-								key,
-								fieldKey: key,
-								fieldLabel: field?.label || key,
-								attribute,
-								closeModal,
-							} )
-					)
-				);
-			},
-		};
+	getFieldsList() {
+		return Object.entries( fieldsList || {} ).map( ( [ key, field ] ) => ( {
+			label: field.label || key,
+			type: field.type || 'string',
+			args: field.args || { key },
+		} ) );
 	},
 } );
 

package/plugins/interactive-blocks/router-navigate/render.php

@@ -7,7 +7,7 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-if ( $attributes['disableNavigation'] ) {
+if ( isset( $attributes['disableNavigation'] ) && $attributes['disableNavigation'] ) {
 	wp_interactivity_config(
 		'core/router',
 		array( 'clientNavigationDisabled' => true )
@@ -20,6 +20,31 @@ if ( isset( $attributes['data'] ) ) {
 		array( 'data' => $attributes['data'] )
 	);
 }
+
+if ( isset( $attributes['derivedStateClosure'] ) && $attributes['derivedStateClosure'] ) {
+	wp_interactivity_state(
+		'router/derived-state',
+		array(
+			'derivedStateClosure' => function () {
+				$context = wp_interactivity_get_context();
+				return $context['value'] . 'FromClosure';
+			},
+		)
+	);
+
+	add_filter(
+		'script_module_data_@wordpress/interactivity',
+		function ( $data ) {
+			if ( ! isset( $data ) ) {
+				$data = array();
+			}
+			$data['derivedStateClosures'] = array(
+				'router/derived-state' => array( 'state.derivedStateClosure' ),
+			);
+			return $data;
+		}
+	);
+}
 ?>
 
 <div
@@ -75,3 +100,7 @@ HTML;
 	<div data-testid="prop2" data-wp-text="state.data.prop2"></div>
 	<div data-testid="prop3" data-wp-text="state.data.prop3"></div>
 </div>
+
+<div data-wp-interactive="router/derived-state" data-wp-context='{"value": "hello"}'>
+	<div data-testid="derivedStateClosure" data-wp-text="state.derivedStateClosure">helloFromClosure</div>
+</div>

package/plugins/interactive-blocks/router-navigate/view.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, withSyncEvent } from '@wordpress/interactivity';
+import { store, withSyncEvent, getContext } from '@wordpress/interactivity';
 
 const { state } = store( 'router', {
 	state: {
@@ -31,11 +31,16 @@ const { state } = store( 'router', {
 			const { actions } = yield import(
 				'@wordpress/interactivity-router'
 			);
-			yield actions.navigate( e.target.href, { force, timeout } );
+
+			try {
+				yield actions.navigate( e.target.href, { force, timeout } );
+			} catch ( error ) {
+				state.status = 'fail';
+			}
 
 			state.navigations.pending -= 1;
 
-			if ( state.navigations.pending === 0 ) {
+			if ( state.navigations.pending === 0 && state.status === 'busy' ) {
 				state.status = 'idle';
 			}
 		} ),
@@ -44,3 +49,12 @@ const { state } = store( 'router', {
 		},
 	},
 } );
+
+store( 'router/derived-state', {
+	state: {
+		get derivedStateClosure() {
+			const { value } = getContext();
+			return `${ value }FromGetter`;
+		},
+	},
+} );

package/plugins/interactive-blocks/router-script-modules-wrapper/render.php

@@ -31,7 +31,7 @@ $wrapper_attributes = get_block_wrapper_attributes();
 				<a
 					data-testid="link <?php echo $label; ?>"
 					data-wp-on--click="actions.navigate"
-					data-wp-on-async--mouseenter="actions.prefetch"
+					data-wp-on--mouseenter="actions.prefetch"
 					href="<?php echo $link; ?>"
 				>
 					<?php echo $label; ?>

package/plugins/interactive-blocks/router-styles-wrapper/render.php

@@ -68,7 +68,7 @@ $wrapper_attributes = get_block_wrapper_attributes();
 			<a
 				data-testid="link <?php echo $label; ?>"
 				data-wp-on--click="actions.navigate"
-				data-wp-on-async--mouseenter="actions.prefetch"
+				data-wp-on--mouseenter="actions.prefetch"
 				href="<?php echo $link; ?>"
 			>
 				<?php echo $label; ?>
@@ -111,10 +111,10 @@ $wrapper_attributes = get_block_wrapper_attributes();
 
 	<!-- Text hidden when media=print applies. -->
 	<div class="hide-on-print" data-testid="hide-on-print">This should be visible when media is not "print".</div>
-	
+
 	<!-- Element for testing noscript styles being ignored -->
 	<div data-testid="noscript-style-test" class="noscript-style-test">This should not be affected by styles in noscript tags</div>
-	
+
 	<!-- Noscript styles that should be ignored -->
 	<noscript>
 		<style>