Merge pull request #974 from bluehost/release/3.9.1

Release/3.9.1
bluehost · Mar 6, 2024 · 80ad6dc · 80ad6dc
2 parents d01332a + 87e4618
commit 80ad6dc
Show file tree

Hide file tree

Showing 9 changed files with 294 additions and 281 deletions.
diff --git a/assets/styles/coming-soon.css b/assets/styles/coming-soon.css
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.9.0
+ * Version:           3.9.1
  * Requires at least: 6.0
  * Requires PHP:      7.1
  * Tested up to:      6.4.3
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.9.0' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.9.1' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

diff --git a/composer.json b/composer.json
@@ -66,7 +66,7 @@
     "wp-phpunit/wp-phpunit": "^6.4.2"
   },
   "require": {
-    "newfold-labs/wp-module-coming-soon": "^1.2.2",
+    "newfold-labs/wp-module-coming-soon": "^1.2.3",
     "newfold-labs/wp-module-context": "^1.0.0",
     "newfold-labs/wp-module-data": "^2.4.18",
     "newfold-labs/wp-module-deactivation": "^1.0.5",
@@ -76,7 +76,7 @@
     "newfold-labs/wp-module-loader": "^1.0.10",
     "newfold-labs/wp-module-marketplace": "^2.2.4",
     "newfold-labs/wp-module-notifications": "^1.2.5",
-    "newfold-labs/wp-module-onboarding": "^2.1.4",
+    "newfold-labs/wp-module-onboarding": "^2.1.6",
     "newfold-labs/wp-module-patterns": "^0.1.14",
     "newfold-labs/wp-module-performance": "^1.4.0",
     "newfold-labs/wp-module-runtime": "^1.0.9",

diff --git a/composer.lock b/composer.lock
diff --git a/cypress.config.js b/cypress.config.js
@@ -71,7 +71,6 @@ module.exports = defineConfig( {
 		testIsolation: false,
 		excludeSpecPattern: [
 			'vendor/newfold-labs/**/tests/cypress/integration/wp-module-support/*.cy.js', // skip any module's wp-module-support files
-			'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/*.cy.js', // skip onboarding sitegen tests for now
 		],
 		experimentalRunAllSpecs: true,
 	},

diff --git a/inc/Admin.php b/inc/Admin.php
@@ -25,7 +25,10 @@ public function __construct() {
 		/* Load i18 files */
 		\add_action( 'init', array( __CLASS__, 'load_text_domain' ), 100 );
 		/* Add Links to WordPress Plugins list item. */
-		\add_filter( 'plugin_action_links_wp-plugin-bluehost/wp-plugin-bluehost.php', array( __CLASS__, 'actions' ) );
+		$plugin_basename = defined( 'BLUEHOST_PLUGIN_FILE' )
+			? plugin_basename( constant( 'BLUEHOST_PLUGIN_FILE' ) )
+			: 'bluehost-wordpress-plugin/bluehost-wordpress-plugin.php';
+		\add_filter( "plugin_action_links_{$plugin_basename}", array( __CLASS__, 'actions' ) );
 		/* Add inline style to hide subnav link */
 		\add_action( 'admin_head', array( __CLASS__, 'admin_nav_style' ) );
 

diff --git a/package.json b/package.json
@@ -1,16 +1,25 @@
 {
+    "name": "bluehost-wordpress-plugin",
+    "version": "3.9.1",
     "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
+    "author": {
+        "name": "Bluehost",
+        "homepage": "https://bluehost.com"
+    },
     "license": "GPL-2.0-or-later",
-    "version": "3.9.0",
     "private": true,
+    "keywords": [
+        "wordpress",
+        "plugin"
+    ],
+    "homepage": "https://github.com/bluehost/bluehost-wordpress-plugin#readme",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/bluehost/bluehost-wordpress-plugin.git"
     },
     "bugs": {
         "url": "https://github.com/bluehost/bluehost-wordpress-plugin/issues"
     },
-    "homepage": "https://github.com/bluehost/bluehost-wordpress-plugin#readme",
     "contributors": [
         "Abdulrahman Al Ani (https://alani.dev/)",
         "Evan Mullins (https://evanmullins.com)",

diff --git a/src/app/components/app-nav/index.js b/src/app/components/app-nav/index.js
@@ -21,19 +21,20 @@ export const SideNavMenu = () => {
 	const primaryMenu = () => {
 		return (
 			<ul className="nfd-flex nfd-flex-col nfd-gap-1.5">
-				{ topRoutes.map( ( page ) => (
-					true === page.condition && (
-						<SideNavMenuItem
-							key={ page.name }
-							label={ page.title }
-							name={ page.name }
-							icon={ page.Icon }
-							path={ page.name }
-							action={ page.action }
-							subItems={ page.subRoutes }
-						/>
-					)
-				) ) }
+				{ topRoutes.map(
+					( page ) =>
+						true === page.condition && (
+							<SideNavMenuItem
+								key={ page.name }
+								label={ page.title }
+								name={ page.name }
+								icon={ page.Icon }
+								path={ page.name }
+								action={ page.action }
+								subItems={ page.subRoutes }
+							/>
+						)
+				) }
 			</ul>
 		);
 	};