Use wp_add_inline_script for WPCOM sidebar notice (#40465)

* Use wp_add_inline_script * Fix syntax * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12191014160 Upstream-Ref: Automattic/jetpack@d0318ed
Automattic · Dec 6, 2024 · a5de230 · a5de230
1 parent bbf9cb1
commit a5de230
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 95 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 This is an alpha version! The changes listed here are not final.
 
+### Changed
+- Use wp_add_inline_script
+
 ### Fixed
 - Load WPCOM sidebar notice async
 

diff --git a/...automattic/jetpack-mu-wpcom/src/build/wpcom-sidebar-notice/wpcom-sidebar-notice.asset.php b/...automattic/jetpack-mu-wpcom/src/build/wpcom-sidebar-notice/wpcom-sidebar-notice.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '58e5ab90569a6b59ac8e');
+<?php return array('dependencies' => array(), 'version' => '8f30753970be611fb884');
diff --git a/vendor/automattic/jetpack-mu-wpcom/src/build/wpcom-sidebar-notice/wpcom-sidebar-notice.js b/vendor/automattic/jetpack-mu-wpcom/src/build/wpcom-sidebar-notice/wpcom-sidebar-notice.js
diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-sidebar-notice/wpcom-sidebar-notice.js b/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-sidebar-notice/wpcom-sidebar-notice.js
@@ -88,7 +88,7 @@ const wpcomFetchSidebarNotice = async () => {
 			`${ wpcomSidebarNoticeConfig.ajaxUrl }?action=wpcom_fetch_sidebar_notice&nonce=${ wpcomSidebarNoticeConfig.nonce }`
 		);
 
-		if ( ! response.status === 200 ) {
+		if ( response.status !== 200 ) {
 			return;
 		}
 

diff --git a/...or/automattic/jetpack-mu-wpcom/src/features/wpcom-sidebar-notice/wpcom-sidebar-notice.php b/...or/automattic/jetpack-mu-wpcom/src/features/wpcom-sidebar-notice/wpcom-sidebar-notice.php
@@ -38,14 +38,12 @@ function wpcom_enqueue_sidebar_notice_assets() {
 		$asset_file['version'] ?? filemtime( Jetpack_Mu_Wpcom::BASE_DIR . 'build/wpcom-sidebar-notice/wpcom-sidebar-notice.css' )
 	);
 
-	wp_localize_script(
-		'wpcom-sidebar-notice',
-		'wpcomSidebarNoticeConfig',
-		array(
-			'ajaxUrl' => admin_url( 'admin-ajax.php' ),
-			'nonce'   => wp_create_nonce( 'wpcom_fetch_sidebar_notice' ),
-		)
+	$data          = array(
+		'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+		'nonce'   => wp_create_nonce( 'wpcom_fetch_sidebar_notice' ),
 	);
+	$inline_script = 'const wpcomSidebarNoticeConfig = ' . wp_json_encode( $data ) . ';';
+	wp_add_inline_script( 'wpcom-sidebar-notice', $inline_script, 'before' );
 }
 add_action( 'admin_enqueue_scripts', 'wpcom_enqueue_sidebar_notice_assets' );
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array(), 'version' => '58e5ab90569a6b59ac8e');
		<?php return array('dependencies' => array(), 'version' => '8f30753970be611fb884');
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ const wpcomFetchSidebarNotice = async () => { @@
     			`${ wpcomSidebarNoticeConfig.ajaxUrl }?action=wpcom_fetch_sidebar_notice&nonce=${ wpcomSidebarNoticeConfig.nonce }`
     		);
-    		if ( ! response.status === 200 ) {
+    		if ( response.status !== 200 ) {
     			return;
     		}
@@ Expand Down @@