MU WPCOM: don't enqueue block scripts in the canvas iframe! (#41055)

* MU WPCOM: don't enqueue block scripts in the canvas iframe * changelog
Automattic · Jan 19, 2025 · 8368291 · 8368291
1 parent ecf570b
commit 8368291
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-block-asset-enqueueing b/projects/packages/jetpack-mu-wpcom/changelog/fix-block-asset-enqueueing
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Performance fix
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/index.php b/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/index.php
@@ -86,7 +86,7 @@ function () {
 	);
 
 	add_action(
-		is_admin() ? 'enqueue_block_assets' : 'enqueue_block_editor_assets',
+		'enqueue_block_editor_assets',
 		function () {
 			$handle = \jetpack_mu_wpcom_enqueue_assets( 'newspack-blocks-blog-posts-editor', array( 'js', 'css' ) );
 			enqueue_newspack_blocks_data( $handle );
@@ -112,7 +112,7 @@ function () {
 	);
 
 	add_action(
-		is_admin() ? 'enqueue_block_assets' : 'enqueue_block_editor_assets',
+		'enqueue_block_editor_assets',
 		function () {
 			$handle = \jetpack_mu_wpcom_enqueue_assets( 'newspack-blocks-carousel-editor', array( 'js', 'css' ) );
 			enqueue_newspack_blocks_data( $handle );

diff --git a/...s/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/event-countdown/event-countdown.php b/...s/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/event-countdown/event-countdown.php
@@ -47,8 +47,4 @@ function load_assets( $attr, $content ) {
 function enqueue_block_editor_assets() {
 	\jetpack_mu_wpcom_enqueue_assets( 'wpcom-blocks-event-countdown-editor', array( 'js', 'css' ) );
 }
-if ( is_admin() ) {
-	add_action( 'enqueue_block_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
-} else {
-	add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
-}
+add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/timeline/timeline.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/timeline/timeline.php
@@ -47,8 +47,4 @@ function load_assets( $attr, $content ) {
 function enqueue_block_editor_assets() {
 	\jetpack_mu_wpcom_enqueue_assets( 'wpcom-blocks-timeline-editor', array( 'js', 'css' ) );
 }
-if ( is_admin() ) {
-	add_action( 'enqueue_block_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
-} else {
-	add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
-}
+add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\enqueue_block_editor_assets' );
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-block-asset-enqueueing b/projects/plugins/mu-wpcom-plugin/changelog/fix-block-asset-enqueueing
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Performance fix
+
+
diff --git a/projects/plugins/wpcomsh/changelog/fix-block-asset-enqueueing b/projects/plugins/wpcomsh/changelog/fix-block-asset-enqueueing
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Performance fix
+
+