Merge branch 'main' into feature/code-standards

* main: (157 commits) update to latest coming soon module to fix tests update coming soon module to 1.2.1 fix lock file remove call to legacy method that was removed for `site_id` Remove modules: Busines Reviews, Customer Bluehost data, Legacy CTB Update composer.lock Update composer.lock Update composer.lock Update composer.lock Update Cypress to 13.6.4 Update composer dependencies Bump PHP version in Composer to ensure proper compatibility Update composer.lock Update cypress.config.js Update Onboarding to 2.1.4 exclude for wp less than 6.3 and php 7.4 Skip siteCapabilities tests ifor PHP version less than 7.4, wc installation is not supported. update config to skip sitegen tests for now update performance and staging modules for coordinated context updates make sure container exists to fix CLI command issue ... # Conflicts: # composer.json # composer.lock # package-lock.json # package.json
bluehost · Feb 29, 2024 · 39a440d · 39a440d
2 parents 7b05999 + d01332a
commit 39a440d
Show file tree

Hide file tree

Showing 69 changed files with 8,273 additions and 7,645 deletions.
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -22,13 +22,12 @@ jobs:
       fail-fast: false
       matrix:
         phpVersion:
-          - '7.1'
-          - '7.2'
           - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
         wpVersion:
           - '6.2'
           - '6.3'
@@ -56,18 +55,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') }}
@@ -124,7 +123,7 @@ jobs:
 
       - name: Store screenshots of test failures
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

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') }}
@@ -99,16 +99,12 @@ jobs:
         run: npx wp-env start --debug
 
       - name: Run Cypress Tests
-        if: ${{ github.repository != 'bluehost/bluehost-wordpress-plugin' || github.actor == 'dependabot[bot]' }}
+        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' }}
         run: npm run test:e2e -- --browser chrome
 
-      - name: Run Cypress Tests
-        if: ${{ github.repository == 'bluehost/bluehost-wordpress-plugin' && github.actor != 'dependabot[bot]' }}
-        run: npm run test:e2e -- --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --tag "bluehost, wp-beta"
-
       - name: Store screenshots of test failures
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

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') }}
@@ -111,7 +111,7 @@ jobs:
 
       - name: Store screenshots of test failures
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: ./tests/cypress/screenshots

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/satis-webhook.yml b/.github/workflows/satis-webhook.yml
@@ -22,7 +22,7 @@ jobs:
         run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
 
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.SATIS_WEBHOOK_TOKEN }}
           repository: bluehost/satis

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') }}
@@ -105,7 +105,7 @@ jobs:
         working-directory: ${{ steps.workflow.outputs.DIST }}
         run: find .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.workflow.outputs.PACKAGE }}
           path: ${{ steps.workflow.outputs.DIST }}
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.1",
+  "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.6.0
+ * Version:           3.9.0
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.4.0
+ * 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.6.0' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.9.0' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
@@ -78,9 +78,10 @@
 	'The Web.com Plugin'       => 'wp-plugin-web/wp-plugin-web.php',
 	'The Crazy Domains Plugin' => 'wp-plugin-web/wp-plugin-crazy-domains.php',
 );
+// Check plugin requirements
 $pass_nfd_check = $nfd_plugins_check->check_plugin_requirements();
 
 // Check PHP version before initializing to prevent errors if plugin is incompatible.
-if ( $pass_nfd_check && version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-	require dirname( __FILE__ ) . '/bootstrap.php';
+if ( $pass_nfd_check && version_compare( PHP_VERSION, '7.1', '>=' ) ) {
+	require __DIR__ . '/bootstrap.php';
 }