@wordpress/e2e-tests 7.24.0 → 7.26.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 7.26.0 (2024-04-03)
+
+## 7.25.0 (2024-03-21)
+
 ## 7.24.0 (2024-03-06)
 
 ## 7.23.0 (2024-02-21)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.24.0",
+	"version": "7.26.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -23,13 +23,13 @@
 		"node": ">=14"
 	},
 	"dependencies": {
-		"@wordpress/e2e-test-utils": "^10.24.0",
-		"@wordpress/interactivity": "^5.2.0",
-		"@wordpress/interactivity-router": "^1.3.0",
-		"@wordpress/jest-console": "^7.24.0",
-		"@wordpress/jest-puppeteer-axe": "^6.24.0",
-		"@wordpress/scripts": "^27.4.0",
-		"@wordpress/url": "^3.54.0",
+		"@wordpress/e2e-test-utils": "^10.26.0",
+		"@wordpress/interactivity": "^5.4.0",
+		"@wordpress/interactivity-router": "^1.5.0",
+		"@wordpress/jest-console": "^7.26.0",
+		"@wordpress/jest-puppeteer-axe": "^6.26.0",
+		"@wordpress/scripts": "^27.6.0",
+		"@wordpress/url": "^3.56.0",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
@@ -46,5 +46,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "ac3c3e465a083081a86a4da6ee6fb817b41e5130"
+	"gitHead": "ac2b13783c28f959770cf029a797a712f59e1958"
 }

package/plugins/delete-installed-fonts.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Delete Installed Fonts
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-delete-installed-fonts
+ */
+
+/**
+ * Saves a randomly generated temporary font directory to use for e2e tests.
+ */
+function gutenberg_e2e_set_temp_font_dir() {
+	update_option( 'gutenberg_e2e_font_dir', '/e2e_fonts_' . wp_generate_uuid4() );
+}
+register_activation_hook( __FILE__, 'gutenberg_e2e_set_temp_font_dir' );
+
+/**
+ * Uses the randomly generated font directory for the duration of the font tests.
+ */
+function gutenberg_filter_e2e_font_dir( $font_dir ) {
+	$subdir = get_option( 'gutenberg_e2e_font_dir' );
+
+	$font_dir['path']    .= $subdir;
+	$font_dir['url']     .= $subdir;
+	$font_dir['basedir'] .= $subdir;
+	$font_dir['baseurl'] .= $subdir;
+
+	return $font_dir;
+}
+add_filter( 'font_dir', 'gutenberg_filter_e2e_font_dir' );
+
+/**
+ * Deletes all user installed fonts, associated font files, the fonts directory, and user global styles typography
+ * setings for the current theme so that we can test uploading/installing fonts in a clean environment.
+ */
+function gutenberg_delete_installed_fonts() {
+	$font_family_ids = new WP_Query(
+		array(
+			'post_type'      => 'wp_font_family',
+			'posts_per_page' => -1,
+			'fields'         => 'ids',
+		)
+	);
+
+	// Delete all font families, their child font faces, and associated font files.
+	foreach ( $font_family_ids->posts as $font_family_id ) {
+		wp_delete_post( $font_family_id, true );
+	}
+
+	// Delete the font directory, which should now be empty.
+	$font_path = wp_get_font_dir()['path'];
+
+	if ( is_dir( $font_path ) ) {
+		rmdir( $font_path );
+	}
+
+	// Delete any installed fonts from global styles.
+	$global_styles_post_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
+	$request               = new WP_REST_Request( 'POST', '/wp/v2/global-styles/' . $global_styles_post_id );
+	$request->set_body_params( array( 'settings' => array( 'typography' => array( 'fontFamilies' => array() ) ) ) );
+
+	rest_do_request( $request );
+}
+
+// Clean up fonts on plugin activation and deactivation.
+register_activation_hook( __FILE__, 'gutenberg_delete_installed_fonts' );
+register_deactivation_hook( __FILE__, 'gutenberg_delete_installed_fonts' );

package/plugins/interactive-blocks/deferred-store/block.json

@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/deferred-store",
+	"title": "E2E Interactivity tests - deferred store",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}

package/plugins/interactive-blocks/deferred-store/render.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * HTML for testing scope restoration with generators.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div
+	data-wp-interactive="test/deferred-store"
+	<?php echo wp_interactivity_data_wp_context( array( 'text' => '!dlrow ,olleH' ) ); ?>
+>
+	<span data-wp-text="state.reversedText" data-testid="result"></span>
+	<span data-wp-text="state.reversedTextGetter" data-testid="result-getter"></span>
+</div>

package/plugins/interactive-blocks/deferred-store/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/deferred-store/view.js

@@ -0,0 +1,20 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext } from '@wordpress/interactivity';
+
+document.addEventListener( 'DOMContentLoaded', () => {
+	setTimeout( () => {
+		store( 'test/deferred-store', {
+			state: {
+				reversedText() {
+					return [ ...getContext().text ].reverse().join( '' );
+				},
+
+				get reversedTextGetter() {
+					return [ ...getContext().text ].reverse().join( '' );
+				},
+			},
+		} );
+	}, 50 );
+} );

package/plugins/interactive-blocks/directive-bind/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-bind-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-bind/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-bind-view' );
 ?>
 
 <div data-wp-interactive="directive-bind">

package/plugins/interactive-blocks/directive-bind/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-class/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-class-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-class/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-class-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-class"}'>

package/plugins/interactive-blocks/directive-class/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-context/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-context-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-context/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-context-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-context"}'>

package/plugins/interactive-blocks/directive-context/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/directive-each/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-each-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-each/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-each-view' );
 ?>
 
 <div data-wp-interactive="directive-each">

package/plugins/interactive-blocks/directive-each/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/directive-init/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-init-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-init/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-init-view' );
 ?>
 
 <div data-wp-interactive="directive-init">

package/plugins/interactive-blocks/directive-init/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-key/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-key-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-key/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-key-view' );
 ?>
 
 <div

package/plugins/interactive-blocks/directive-key/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/directive-on/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-on-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-on/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-on-view' );
 ?>
 
 <div data-wp-interactive="directive-on">

package/plugins/interactive-blocks/directive-on/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-on-document/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-on-document-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-on-document/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-on-document-view' );
 ?>
 
 <div data-wp-interactive="directive-on-document">

package/plugins/interactive-blocks/directive-on-document/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-on-window/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-on-window-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-on-window/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-on-window-view' );
 ?>
 
 <div data-wp-interactive="directive-on-window">

package/plugins/interactive-blocks/directive-on-window/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-priorities/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-priorities-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-priorities/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-priorities-view' );
 ?>
 
 <div data-wp-interactive="directive-priorities">

package/plugins/interactive-blocks/directive-priorities/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-run/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-run-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-run/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-run-view' );
 ?>
 
 <div

package/plugins/interactive-blocks/directive-run/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/directive-style/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-style-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-style/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-style-view' );
 ?>
 
 <div data-wp-interactive="directive-style">

package/plugins/interactive-blocks/directive-style/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-text/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-text-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-text/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-text-view' );
 ?>
 
 <div data-wp-interactive="directive-context">

package/plugins/interactive-blocks/directive-text/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/directive-watch/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-watch-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/directive-watch/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'directive-watch-view' );
 ?>
 
 <div data-wp-interactive="directive-watch">

package/plugins/interactive-blocks/directive-watch/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/generator-scope/block.json

@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/generator-scope",
+	"title": "E2E Interactivity tests - generator scope",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}

package/plugins/interactive-blocks/generator-scope/render.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * HTML for testing scope restoration with generators.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div
+	data-wp-interactive="test/generator-scope"
+	<?php echo wp_interactivity_data_wp_context( array( 'result' => '' ) ); ?>
+>
+	<input readonly data-wp-bind--value="context.result" data-testid="result" />
+	<button type="button" data-wp-on--click="callbacks.resolve" data-testid="resolve">Async resolve</button>
+	<button type="button" data-wp-on--click="callbacks.reject" data-testid="reject">Async reject</button>
+</div>

package/plugins/interactive-blocks/generator-scope/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/generator-scope/view.js

@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext } from '@wordpress/interactivity';
+
+store( 'test/generator-scope', {
+	callbacks: {
+		*resolve() {
+			try {
+				getContext().result = yield Promise.resolve( 'ok' );
+			} catch ( err ) {
+				getContext().result = err.toString();
+			}
+		},
+		*reject() {
+			try {
+				getContext().result = yield Promise.reject( new Error( '😘' ) );
+			} catch ( err ) {
+				getContext().result = err.toString();
+			}
+		},
+	},
+} );

package/plugins/interactive-blocks/negation-operator/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "negation-operator-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/negation-operator/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'negation-operator-view' );
 ?>
 
 <div data-wp-interactive="negation-operator">

package/plugins/interactive-blocks/negation-operator/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/router-navigate/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "router-navigate-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

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

@@ -7,8 +7,6 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-wp_enqueue_script_module( 'router-navigate-view' );
-
 if ( $attributes['disableNavigation'] ) {
 	wp_interactivity_config(
 		'core/router',

package/plugins/interactive-blocks/router-navigate/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/router-regions/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "router-regions-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

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

@@ -6,8 +6,6 @@
  *
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
-
-wp_enqueue_script_module( 'router-regions-view' );
 ?>
 
 <section>

package/plugins/interactive-blocks/router-regions/view.asset.php

@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);

package/plugins/interactive-blocks/store/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "store-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/store/render.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * HTML for testing the directive `data-wp-bind`.
+ * HTML for testing the `store` function.
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'store-view' );
 ?>
 
 <div data-wp-interactive="test/store">
+	<div data-wp-text="state.0" data-testid="state-0"></div>
 	<div
 		data-testid="non-plain object"
 		data-wp-text="state.isNotProxified"

package/plugins/interactive-blocks/store/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/store/view.js

@@ -3,18 +3,21 @@
  */
 import { store, getElement } from '@wordpress/interactivity';
 
+// A non-object state should never be allowed.
+store( 'test/store', { state: [ 'wrong' ] } );
 
 const { state } = store( 'test/store', {
 	state: {
+		0: 'right',
 		get isNotProxified() {
 			const { ref } = getElement();
 			return state.elementRef === ref;
-		}
+		},
 	},
 	callbacks: {
 		init() {
 			const { ref } = getElement();
 			state.elementRef = ref; // HTMLElement
-		}
-	}
-} )
+		},
+	},
+} );

package/plugins/interactive-blocks/store-tag/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "store-tag-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/store-tag/render.php

@@ -7,8 +7,6 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-wp_enqueue_script_module( 'store-tag-view' );
-
 // These variables simulates SSR.
 $test_store_tag_counter = 'ok' === $attributes['condition'] ? 3 : 0;
 $test_store_tag_double  = $test_store_tag_counter * 2;

package/plugins/interactive-blocks/store-tag/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/tovdom/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "tovdom-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/tovdom/render.php

@@ -8,8 +8,6 @@
 $plugin_url   = plugin_dir_url( __DIR__ );
 $src_proc_ins = $plugin_url . 'tovdom/processing-instructions.js';
 $src_cdata    = $plugin_url . 'tovdom/cdata.js';
-
-wp_enqueue_script_module( 'tovdom-view' );
 ?>
 
 <div data-wp-interactive="tovdom">

package/plugins/interactive-blocks/tovdom/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/tovdom-islands/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "tovdom-islands-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/tovdom-islands/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'tovdom-islands-view' );
 ?>
 
 <div>

package/plugins/interactive-blocks/tovdom-islands/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks/with-scope/block.json

@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "with-scope-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }

package/plugins/interactive-blocks/with-scope/render.php

@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-wp_enqueue_script_module( 'with-scope-view' );
 ?>
 
 <div data-wp-interactive="with-scope" data-wp-context='{"asyncCounter": 0, "syncCounter": 0}' data-wp-init--a='callbacks.asyncInit' data-wp-init--b='callbacks.syncInit'>

package/plugins/interactive-blocks/with-scope/view.asset.php

@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );

package/plugins/interactive-blocks.php

@@ -15,26 +15,8 @@ add_action(
 			$block_json_files = glob( __DIR__ . '/interactive-blocks/**/block.json' );
 
 			// Auto register all blocks that were found.
-			foreach ( $block_json_files as $filename ) {
-				$block_folder = dirname( $filename );
-				$name         = basename( $block_folder );
-
-				$view_file = plugin_dir_url( $block_folder ) . $name . '/' . 'view.js';
-
-				wp_register_script_module(
-					$name . '-view',
-					$view_file,
-					array(
-						'@wordpress/interactivity',
-						array(
-							'id'     => '@wordpress/interactivity-router',
-							'import' => 'dynamic',
-						),
-					),
-					filemtime( $view_file )
-				);
-
-				register_block_type_from_metadata( $block_folder );
+			foreach ( $block_json_files as $block_json_file ) {
+				register_block_type( $block_json_file );
 			}
 		}
 
@@ -49,7 +31,8 @@ add_action(
 			// But remove the server directive processing.
 			remove_filter(
 				'render_block_data',
-				'wp_interactivity_process_directives_of_interactive_blocks'
+				'wp_interactivity_process_directives_of_interactive_blocks',
+				100
 			);
 		}
 	}