Merge branch 'main' into develop

* main: remove teams message from release workflow redundant since there is a satis notice already Bump to WordPress 6.5.4 dowangrade facebok changes fix package file whitespace clean up module order in composer bump facebook module to 1.0.8 validate composer module udpates atomic, coming soon, data to latest tweak layout of features section bump plugin version to 3.11.0 # Conflicts: # composer.lock
bluehost · Jun 10, 2024 · 94b6fe5 · 94b6fe5
2 parents a3cb2e2 + 43b1536
commit 94b6fe5
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml
@@ -127,8 +127,3 @@ jobs:
                -H "Content-Type: application/json" \
                --data '{"files":["https://hiive.cloud/workers/release-api/plugins/bluehost/bluehost-wordpress-plugin"]}'
 
-      - name: Send message to ms teams
-        uses: dhollerbach/actions.send-message-to-ms-teams@v3
-        with:
-          webhook: '${{ secrets.TEAMS_WEBHOOK_URL }}'
-          message: "Bluehost plugin version ${{ env.VERSION }} has been released!"
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.5.3",
+  "core": "WordPress/WordPress#tags/6.5.4",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

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.10.2
+ * Version:           3.11.0
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.5.3
+ * Tested up to:      6.5.4
  * Author:            Bluehost
  * Author URI:        https://bluehost.com
  * Text Domain:       wp-plugin-bluehost
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.10.2' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.11.0' );
 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
@@ -77,12 +77,12 @@
     "newfold-labs/wp-module-atomic": "^1.3.0",
     "newfold-labs/wp-module-coming-soon": "^1.2.4",
     "newfold-labs/wp-module-context": "^1.0.1",
-    "newfold-labs/wp-module-data": "^2.5.0",
+    "newfold-labs/wp-module-data": "^2.5.2",
     "newfold-labs/wp-module-deactivation": "^1.1.2",
     "newfold-labs/wp-module-ecommerce": "^1.3.31",
+    "newfold-labs/wp-module-facebook": "1.0.7",
     "newfold-labs/wp-module-features": "^1.4.1",
     "newfold-labs/wp-module-global-ctb": "^1.0.12",
-    "newfold-labs/wp-module-facebook": "^1.0.7",
     "newfold-labs/wp-module-help-center": "^2.0.0",
     "newfold-labs/wp-module-loader": "^1.0.10",
     "newfold-labs/wp-module-marketplace": "^2.2.4",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluehost-wordpress-plugin",
-    "version": "3.10.2",
+    "version": "3.11.0",
     "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
     "author": {
         "name": "Bluehost",
@@ -34,8 +34,8 @@
     "dependencies": {
         "@heroicons/react": "^2.1.1",
         "@newfold-labs/wp-module-ecommerce": "^1.3.31",
+        "@newfold-labs/wp-module-facebook": "1.0.7",
         "@newfold-labs/wp-module-runtime": "^1.0.10",
-        "@newfold-labs/wp-module-facebook":"^1.0.6",
         "@newfold/ui-component-library": "^1.1.0",
         "@reduxjs/toolkit": "^2.2.5",
         "@wordpress/compose": "^6.35.0",
@@ -69,6 +69,7 @@
         "build": "NODE_ENV=production wp-scripts build",
         "check-engines": "wp-scripts check-engines",
         "check-licenses": "wp-scripts check-licenses --production",
+        "create:dev": "rm -rf ./bluehost-wordpress-plugin ./bluehost-wordpress-plugin.zip && npm run create:dist && npm run create:zip",
         "create:dist": "rsync -r --include-from=.distinclude --exclude-from=.distignore . ./bluehost-wordpress-plugin",
         "create:zip": "cd ./bluehost-wordpress-plugin && zip -r -9 ../bluehost-wordpress-plugin.zip . && ls -lh ../bluehost-wordpress-plugin.zip",
         "cypress": "npm cypress open",

diff --git a/src/app/pages/settings/index.js b/src/app/pages/settings/index.js
@@ -47,10 +47,15 @@ const Settings = () => {
 				>
 					<Container.SettingsField
 						title={ __( 'Features', 'wp-plugin-bluehost' ) }
-					></Container.SettingsField>
-					<WonderBlocksSettings />
-					<br />
-					<HelpCenterSettings />
+						description={ __(
+							'Customize the available features as you manage your website.',
+							'wp-plugin-bluehost'
+						) }
+					>
+						<WonderBlocksSettings />
+						<br />
+						<HelpCenterSettings />
+					</Container.SettingsField>
 				</Container.Block>
 
 				<Container.Block