Merge branch 'develop' into feature/solutions

* develop: update i18n pot file bump wp-module-data from 2.6.3 to 2.6.4 bump plugin files to the new version Composer(deps): Bump newfold-labs/wp-module-notifications Composer(deps): Bump newfold-labs/wp-module-activation Composer(deps): Bump newfold-labs/wp-module-help-center fix code standards Update burst safety mode to enqueue CSS rather than just echoing it # Conflicts: # bluehost-wordpress-plugin.php # composer.json # composer.lock # package.json
bluehost · Oct 17, 2024 · 25b5e55 · 25b5e55
2 parents 6929e63 + 9dfc90b
commit 25b5e55
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 83 deletions.
diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
@@ -12,7 +12,7 @@
  * Plugin URI:        https://bluehost.com
  * Update URI:        https://github.com/bluehost/bluehost-wordpress-plugin
  * Description:       WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
- * Version:           3.14.13-beta
+ * Version:           3.14.14-beta
  * Requires at least: 6.4
  * Requires PHP:      7.3
  * Tested up to:      6.6.2
@@ -32,10 +32,12 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.14.13-beta' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.14.14-beta' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'BLUEHOST_BUILD_DIR', BLUEHOST_PLUGIN_DIR . 'build/' . BLUEHOST_PLUGIN_VERSION );
+define( 'BLUEHOST_BUILD_URL', BLUEHOST_PLUGIN_URL . 'build/' . BLUEHOST_PLUGIN_VERSION );
 if ( ! defined( 'NFD_HIIVE_URL' ) ) {
 	define( 'NFD_HIIVE_URL', 'https://hiive.cloud/api' );
 }
@@ -49,9 +51,6 @@
 	return;
 }
 
-define( 'BLUEHOST_BUILD_DIR', BLUEHOST_PLUGIN_DIR . 'build/' . BLUEHOST_PLUGIN_VERSION );
-define( 'BLUEHOST_BUILD_URL', BLUEHOST_PLUGIN_URL . 'build/' . BLUEHOST_PLUGIN_VERSION );
-
 global $pagenow;
 if ( 'plugins.php' === $pagenow ) {
 

diff --git a/composer.json b/composer.json
@@ -76,14 +76,13 @@
     "newfold-labs/wp-module-atomic": "^1.3.0",
     "newfold-labs/wp-module-coming-soon": "^1.2.6",
     "newfold-labs/wp-module-context": "^1.0.1",
-    "newfold-labs/wp-module-data": "^2.6.3",
+    "newfold-labs/wp-module-data": "^2.6.4",
     "newfold-labs/wp-module-deactivation": "^1.2.3",
     "newfold-labs/wp-module-ecommerce": "^1.4.0-beta.5",
     "newfold-labs/wp-module-facebook": "^1.0.9",
     "newfold-labs/wp-module-features": "^1.4.2",
     "newfold-labs/wp-module-global-ctb": "^1.0.13",
     "newfold-labs/wp-module-help-center": "^2.1.1",
-    "newfold-labs/wp-module-installer": "^1.2.0-beta.3",
     "newfold-labs/wp-module-loader": "^1.0.10",
     "newfold-labs/wp-module-marketplace": "^2.4.0",
     "newfold-labs/wp-module-migration": "^1.0.12",

diff --git a/composer.lock b/composer.lock
diff --git a/inc/alt-experience/init.php b/inc/alt-experience/init.php
@@ -8,10 +8,21 @@ function () {
 			'manage_options',
 			'bluehost',
 			function () {
-				echo '<style>';
-				echo file_get_contents( BLUEHOST_PLUGIN_DIR . 'build/' . BLUEHOST_PLUGIN_VERSION . '/index.css' );
-				echo '</style>';
-				echo file_get_contents( __DIR__ . '/index.html' );
+				$version = BLUEHOST_PLUGIN_VERSION;
+				$asset_file = BLUEHOST_BUILD_DIR . '/index.asset.php';
+				if ( is_readable( $asset_file ) ) {
+					$asset = include_once $asset_file;
+					$version = $asset['version'];
+				}
+
+				wp_enqueue_style(
+					'bluehost-style',
+					BLUEHOST_BUILD_URL . '/index.css',
+					array( 'wp-components' ),
+					$version
+				);
+
+				echo file_get_contents( __DIR__ . '/index.html' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
 			},
 			'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHZpZXdCb3g9IjAgMCA0MCA0MCI+CiAgICA8cGF0aCBmaWxsPSIjYTdhYWFkIiBkPSJNNCA0aDguOTMzdjguOTIzSDRWNFptMTEuNTMgMGg4Ljk0djguOTIzaC04Ljk0VjRabTExLjUzMSAwSDM2djguOTIzaC04LjkzOVY0Wk00IDE1LjUzOGg4LjkzM3Y4LjkyNEg0di04LjkyNFptMTEuNTMgMGg4Ljk0djguOTI0aC04Ljk0di04LjkyNFptMTEuNTMxIDBIMzZ2OC45MjRoLTguOTM5di04LjkyNFpNNCAyNy4wNzdoOC45MzNWMzZINHYtOC45MjNabTExLjUzIDBoOC45NFYzNmgtOC45NHYtOC45MjNabTExLjUzMSAwSDM2VjM2aC04LjkzOXYtOC45MjNaIi8+Cjwvc3ZnPg==',
 			1