Replace baked-in hot reload with enqueue_block_editor_assets

Author: apetkov225

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "2crt/uup-assets-loader",
-    "version": "v1.0.4",
+    "version": "v1.0.5",
     "license": "MIT",
     "autoload": {
         "psr-4": {

src/ViteAssetsLoader.php

@@ -45,6 +45,11 @@ class ViteAssetsLoader {
 	 */
 	private $enqueued_editor_styles = [];
 
+	/**
+	 * The enqueued editor scripts: [ 'script-handle' => 'resources/js/editor.js', ... ]
+	 */
+	private $enqueued_editor_scripts = [];
+
 	/**
 	 * Initialize the asset loader
 	 *
@@ -66,7 +71,7 @@ public function __construct( string $manifest_path, string $manifest_url ) {
 		// All <script> tags enqueued through this class should have
 		// type="module" attribute, even in production.
 		add_filter( 'script_loader_tag', function ( $tag, $handle ) {
-			if ( isset( $this->enqueued_scripts[ $handle ] ) ) {
+			if ( isset( $this->enqueued_scripts[ $handle ] ) || isset( $this->enqueued_editor_scripts[ $handle ] ) ) {
 				return preg_replace( '/^<script /i', '<script type="module" ', $tag );
 			}
 			return $tag;
@@ -112,8 +117,6 @@ protected function apply_hot_file_configuration( $manifest_path ) {
 		add_action( 'wp_head', [ $this, 'load_vite_client_scripts' ] );
 		add_action( 'admin_head', [ $this, 'load_vite_client_scripts' ] );
 
-		add_action( 'admin_print_scripts', [ $this, 'load_customizer_auto_reload_script' ] );
-
 		return true;
 	}
 
@@ -191,6 +194,23 @@ public function push_assets_to_wp_queue() {
 	 * @return void
 	 */
 	public function push_assets_to_wp_editor_queue() {
+		foreach ( $this->enqueued_editor_scripts as $handle => $path ) {
+			$url = $this->make_asset_url( $path );
+			if ( is_null( $url ) ) {
+				$this->add_admin_bar_message( "Missing script: $handle" );
+				continue;
+			}
+			wp_enqueue_script(
+				$handle,
+				$url,
+				[],
+				// This null is intentional: it prevents `?ver=X.X.X`
+				// arguments in the URL. This would cause problems
+				// with the Vite dev server
+				null,
+				[ 'in_footer' => true ]
+			);
+		}
 		foreach ( $this->enqueued_editor_styles as $handle => $path ) {
 			$url = $this->make_asset_url( $path );
 			if ( is_null( $url ) ) {
@@ -384,4 +404,16 @@ public function enqueue_style( $handle, $path ) {
 	public function enqueue_editor_style( $handle, $path ) {
 		$this->enqueued_editor_styles[ $handle ] = $path;
 	}
+
+	/**
+	 * Enqueue a javascript-ish editor file built with the vite dev process.
+	 *
+	 * @param string $handle The wp_enqueue_script handle
+	 * @param string $path   Path to the file in the resources directory
+	 *
+	 * @return void
+	 */
+	public function enqueue_editor_script( $handle, $path ) {
+		$this->enqueued_editor_scripts[ $handle ] = $path;
+	}
 }