Merge pull request #927 from bluehost/release/3.8.4

Release/3.8.4
bluehost · Feb 2, 2024 · ddbfcef · ddbfcef
2 parents 7bf44e0 + f3e0b6d
commit ddbfcef
Show file tree

Hide file tree

Showing 34 changed files with 701 additions and 658 deletions.
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -56,18 +56,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/cypress-tests-beta.yml b/.github/workflows/cypress-tests-beta.yml
@@ -36,18 +36,18 @@ jobs:
           mkdir dist
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -48,18 +48,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -50,18 +50,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -42,7 +42,7 @@ jobs:
         if: "!! env.GIT_DIFF"
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml
@@ -57,18 +57,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml
@@ -53,18 +53,18 @@ jobs:
           echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
           echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: 'npm'
 
       - name: Get Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+v20
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.4.2",
+  "core": "WordPress/WordPress#tags/6.4.3",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

diff --git a/assets/styles/coming-soon.css b/assets/styles/coming-soon.css
@@ -301,4 +301,14 @@ footer p a:hover {
     .btn {
         margin-top: 40px;
     }
+}
+
+.comingsoon_links {
+    font-size:13px;
+   }
+
+.comingsoon_links a {
+    text-decoration: none;
+    line-height: 18px;
+    color: #1555b3;
 }
diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
@@ -12,10 +12,10 @@
  * 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.8.3
+ * Version:           3.8.4
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.4.2
+ * Tested up to:      6.4.3
  * Author:            Bluehost
  * Author URI:        https://bluehost.com
  * Text Domain:       wp-plugin-bluehost
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.8.3' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.8.4' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

diff --git a/bootstrap.php b/bootstrap.php
@@ -59,14 +59,27 @@ function () {
 // properly get branding links depending on market
 $wordpress_hosting_page = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://www.bluehost.in?utm_source=coming-soon-template&amp;utm_medium=bluehost_plugin' : 'https://bluehost.com?utm_source=coming-soon-template&amp;utm_medium=bluehost_plugin';
 $my_panel               = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://my.bluehost.in/web-hosting/cplogin' : 'https://my.bluehost.com/web-hosting/cplogin';
+$website_guide_link     = 'https://www.bluehost.com/blog/how-to-create-a-website-guide/';
+$migrate_link           = 'https://www.bluehost.com/blog/how-to-migrate-a-wordpress-website-to-a-new-server/';
+$hosting_link           = 'https://www.bluehost.com/hosting/shared';
+
 // Set coming soon values
 $bluehost_module_container->set(
 	'comingsoon',
 	array(
-		'admin_app_url'       => admin_url( 'admin.php?page=bluehost#/home' ),
-		'template_h1'         => __( 'Coming Soon!', 'wp-plugin-bluehost' ),
-		'template_h2'         => __( 'A New WordPress Site', 'wp-plugin-bluehost' ),
-		'template_footer_t'   => sprintf(
+		'admin_app_url'              => admin_url( 'admin.php?page=bluehost#/home' ),
+		'template_h1'                => __( 'Coming Soon!', 'wp-plugin-bluehost' ),
+		'template_h2'                => __( 'A New WordPress Site', 'wp-plugin-bluehost' ),
+		'template_coming_soon_links' => sprintf(
+			esc_html__( ' %1$sHow to Build a Website: A Practical Guide to WordPress on Bluehost%2$s   %3$sHow to Migrate a Website to Bluehost?%4$s  %5$sWhy choose Bluehost for WordPress?%6$s', 'wp-plugin-bluehost' ) . '&nbsp;',
+			'<a href="' . esc_url( $website_guide_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
+			'</a><span class="dashicons dashicons-wordpress"></span><br/>',
+			'<a href="' . esc_url( $migrate_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
+			'</a><br/>',
+			'<a href="' . esc_url( $hosting_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
+			'</a><br/> '
+		),
+		'template_footer_t'          => sprintf(
 			/* translators: %1$s is replaced with opening link tag taking you to bluehost.com/wordpress, %2$s is replaced with closing link tag, %3$s is replaced with opening link tag taking you to login page, %4$s is replaced with closing link tag, %5$s is replaced with opening link tag taking you to my.bluehost.com, %6$s is replaced with closing link tag */
 			esc_html__( 'A %1$sBluehost%2$s powered website. Is this your website? Log in to %3$sWordPress%4$s or %5$sBluehost%6$s.', 'wp-plugin-bluehost' ) . '&nbsp;',
 			'<a href="' . esc_url( $wordpress_hosting_page ) . '" target="_blank" rel="noopener noreferrer nofollow">',
@@ -76,21 +89,21 @@ function () {
 			'<a href="' . esc_url( $my_panel ) . '" target="_blank" rel="noopener noreferrer nofollow">',
 			'</a>'
 		),
-		'template_page_title' => sprintf(
+		'template_page_title'        => sprintf(
 			/* translators: %s: Blog name */
 			__( '%s &mdash; Coming Soon', 'wp-plugin-bluehost' ),
 			esc_html( get_option( 'blogname' ) )
 		),
-		'admin_bar_text'      => '<div style="background-color: #FEC101; color: #000; padding: 0 1rem;">' . __( 'Coming Soon Active', 'wp-plugin-bluehost' ) . '</div>',
-		'admin_notice_text'   => sprintf(
+		'admin_bar_text'             => '<div style="background-color: #FEC101; color: #000; padding: 0 1rem;">' . __( 'Coming Soon Active', 'wp-plugin-bluehost' ) . '</div>',
+		'admin_notice_text'          => sprintf(
 			/* translators: %1$s is replaced with the opening link tag to preview the page, and %2$s is replaced with the closing link tag, %3$s is the opening link tag, %4$s is the closing link tag. */
 			__( 'Your site is currently displaying a %1$scoming soon page%2$s. Once you are ready, %3$slaunch your site%4$s.', 'wp-plugin-bluehost' ),
 			'<a href="' . get_home_url() . '?preview=coming_soon" title="' . __( 'Preview the coming soon landing page', 'wp-plugin-bluehost' ) . '">',
 			'</a>',
 			'<a href="' . esc_url( admin_url( 'admin.php?page=bluehost&nfd-target=coming-soon-section#/settings' ) ) . '">',
 			'</a>'
 		),
-		'template_styles'     => esc_url( BLUEHOST_PLUGIN_URL . 'assets/styles/coming-soon.css' ),
+		'template_styles'            => esc_url( BLUEHOST_PLUGIN_URL . 'assets/styles/coming-soon.css' ),
 	)
 );
 setContainer( $bluehost_module_container );
@@ -109,16 +122,16 @@ function () {
 	)
 );
 $pluginUpdater->setDataOverrides(
-	[
-		'banners' => [
+	array(
+		'banners' => array(
 			'2x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-banner.svg',
 			'1x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-banner.svg',
-		],
-		'icons'   => [
+		),
+		'icons'   => array(
 			'2x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-icon.svg',
 			'1x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-icon.svg',
-		],
-	]
+		),
+	)
 );
 
 // Handle any upgrade routines (only in the admin)

diff --git a/composer.json b/composer.json
@@ -67,22 +67,22 @@
   },
   "require": {
     "newfold-labs/wp-module-business-reviews": "^1.1.1",
-    "newfold-labs/wp-module-coming-soon": "^1.1.18",
-    "newfold-labs/wp-module-ctb": "^1.1.2",
+    "newfold-labs/wp-module-coming-soon": "^1.2.0",
+    "newfold-labs/wp-module-ctb": "^1.1.3",
     "newfold-labs/wp-module-customer-bluehost": "^1.6.0",
     "newfold-labs/wp-module-data": "^2.4.18",
     "newfold-labs/wp-module-deactivation": "^1.0.4",
-    "newfold-labs/wp-module-ecommerce": "1.3.18",
-    "newfold-labs/wp-module-global-ctb": "^1.0.9",
+    "newfold-labs/wp-module-ecommerce": "^1.3.21",
+    "newfold-labs/wp-module-global-ctb": "^1.0.10",
     "newfold-labs/wp-module-help-center": "^1.0.23",
     "newfold-labs/wp-module-loader": "^1.0.10",
-    "newfold-labs/wp-module-marketplace": "^2.2.0",
-    "newfold-labs/wp-module-notifications": "^1.2.2",
-    "newfold-labs/wp-module-onboarding": "^1.12.0",
+    "newfold-labs/wp-module-marketplace": "^2.2.1",
+    "newfold-labs/wp-module-notifications": "^1.2.3",
+    "newfold-labs/wp-module-onboarding": "^1.12.1",
     "newfold-labs/wp-module-patterns": "^0.1.13",
     "newfold-labs/wp-module-performance": "^1.3.0",
-    "newfold-labs/wp-module-runtime": "^1.0.7",
-    "newfold-labs/wp-module-secure-passwords": "^1.1",
+    "newfold-labs/wp-module-runtime": "^1.0.9",
+    "newfold-labs/wp-module-secure-passwords": "^1.1.1",
     "newfold-labs/wp-module-sso": "^1.0.4",
     "newfold-labs/wp-module-staging": "^1.2.3",
     "wp-forge/wp-update-handler": "^1.0",