Merge pull request #389 from bluehost/release/2.13.1

Release/2.13.1

.github/workflows/cypress-matrix.yml

@@ -26,10 +26,11 @@ jobs:
           - '7.4'
           - '8.0'
           - '8.1'
+          - '8.2'
         wpVersion:
-          - '5.9'
           - '6.0'
           - '6.1'
+          - '6.2'
 
     steps:
 
@@ -122,7 +123,7 @@ jobs:
         if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && env.RECORD_REPLAY_API_KEY != '' }}
         with:
           api-key: ${{ secrets.RECORD_REPLAY_API_KEY }}
-          browser: 'Replay Chromium'
+          browser: 'replay-chromium'
           command: npm run test:e2e -- --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag php-${{ matrix.phpVersion }},wp-${{ matrix.wpVersion }}
           upload-all: false
 

.github/workflows/cypress.yml

@@ -111,7 +111,7 @@ jobs:
         if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && env.RECORD_REPLAY_API_KEY != '' }}
         with:
           api-key: ${{ secrets.RECORD_REPLAY_API_KEY }}
-          browser: 'Replay Chromium'
+          browser: 'replay-chromium'
           command: npm run test:e2e -- --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
           upload-all: false
 

.wp-env.json

@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.1.1",
+  "core": "WordPress/WordPress#tags/6.2",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

bluehost-wordpress-plugin.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: The Bluehost Plugin
  * Description: This plugin integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.
- * Version: 2.13.0
+ * Version: 2.13.1
  * Tested up to: 6.2
  * Requires at least: 5.9
  * Requires PHP: 7.0
@@ -33,7 +33,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '2.13.0' );
+define( 'BLUEHOST_PLUGIN_VERSION', '2.13.1' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
@@ -77,6 +77,7 @@ function () {
 					'id'           => 'bluehost',
 					'file'         => BLUEHOST_PLUGIN_FILE,
 					'brand'        => get_option( 'mm_brand', 'bluehost' ),
+					'platform'     => get_option( 'bh_platform', 'legacy' ),
 					'install_date' => get_option( 'bh_plugin_install_date' ),
 				)
 			);

bootstrap.php

@@ -3,7 +3,6 @@
 use Bluehost\AdminBar;
 use Bluehost\BuildAssets;
 use Bluehost\LoginRedirect;
-use Bluehost\Themes;
 use WP_Forge\WPUpdateHandler\PluginUpdater;
 use WP_Forge\UpgradeHandler\UpgradeHandler;
 
@@ -68,6 +67,32 @@ function () {
 	2
 );
 
+// Check if Bluehost platform Legacy or Jarvis
+if ( ! get_transient( 'bh_platform' ) ) {
+	$bh_platform  = 'legacy';
+	$bh_host_file = null;
+
+	// Check for Jarvis .host-info file
+	if ( file_exists( ABSPATH . '/.host-info' ) ) {
+		$bh_host_file = file_get_contents( ABSPATH . '/.host-info' );
+	} elseif ( file_exists( ABSPATH . '../.host-info' ) ) {
+		$bh_host_file = file_get_contents( ABSPATH . '../.host-info' );
+	}
+
+	// Check for Jarvis platform
+	if ( null !== $bh_host_file && false !== strpos( $bh_host_file, 'platform=jarvis' ) ) {
+		$bh_platform = 'jarvis';
+	}
+
+	if ( ! get_option( 'bh_platform' ) ) {
+		add_option( 'bh_platform', $bh_platform );
+	} else {
+		update_option( 'bh_platform', $bh_platform );
+	}
+
+	set_transient( 'bh_platform', '1', DAY_IN_SECONDS );
+}
+
 // Require files
 require __DIR__ . '/inc/admin.php';
 require __DIR__ . '/inc/admin-page-notifications-blocker.php';

composer.json

@@ -19,10 +19,6 @@
         "issues": "https://github.com/bluehost/bluehost-wordpress-plugin/issues"
     },
     "repositories": {
-        "newfold-labs/wp-module-ecommerce": {
-            "type": "vcs",
-            "url": "https://github.com/newfold-labs/wp-module-ecommerce"
-        },
         "newfold": {
             "type": "composer",
             "url": "https://newfold-labs.github.io/satis/",
@@ -41,14 +37,14 @@
         "ext-iconv": "*",
         "doctrine/inflector": "1.2.0 as 1.3.1",
         "newfold-labs/wp-module-business-reviews": "^1.1",
-        "newfold-labs/wp-module-coming-soon": "^1.0",
+        "newfold-labs/wp-module-coming-soon": "^1.1.1",
         "newfold-labs/wp-module-customer-bluehost": "^1.5.3",
         "newfold-labs/wp-module-data": "^2.3.0",
-        "newfold-labs/wp-module-ecommerce": "0.7.6",
+        "newfold-labs/wp-module-ecommerce": "0.8.2",
         "newfold-labs/wp-module-loader": "^1.0.10",
         "newfold-labs/wp-module-marketplace": "^1.5.0",
         "newfold-labs/wp-module-notifications": "^1.1.2",
-        "newfold-labs/wp-module-onboarding": "1.2.2",
+        "newfold-labs/wp-module-onboarding": "1.3.0",
         "newfold-labs/wp-module-secure-passwords": "^1.1",
         "newfold-labs/wp-module-sso": "^1.0.3",
         "wp-forge/collection": "^1.0.2",