Merge branch 'develop' into add/facebook-module

bluehost · Apr 18, 2024 · 869068e · 869068e
2 parents 11f247a + 4432dd6
commit 869068e
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 81 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.5",
+  "core": "WordPress/WordPress#tags/6.5.2",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ Steps to follow when releasing a new version of the plugin:
 - Ensure `release` branch has properly bumped the version.
   - The [plugin header version](bluehost-wordpress-plugin.php#L5).
   - The [plugin constant version](bluehost-wordpress-plugin.php#L35).
-  - The [plugin package veresion](package.json#L5).
+  - The [plugin package version](package.json#L5).
 - Ensure the `release` branch has passing tests.
 - Ensure the `release` branch passes linting.
 - Tag an initial release candidate version of the plugin (e.g. `X.Y.Z-rc.1`) and be sure to mark it as a pre-release.

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.9.2
+ * Version:           3.9.3
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.4.3
+ * Tested up to:      6.5.2
  * Author:            Bluehost
  * Author URI:        https://bluehost.com
  * Text Domain:       wp-plugin-bluehost
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.9.2' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.9.3' );
 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
@@ -71,17 +71,17 @@
     "newfold-labs/wp-module-context": "^1.0.0",
     "newfold-labs/wp-module-data": "^2.4.20",
     "newfold-labs/wp-module-deactivation": "^1.1.1",
-    "newfold-labs/wp-module-ecommerce": "^1.3.25",
+    "newfold-labs/wp-module-ecommerce": "^1.3.27",
     "newfold-labs/wp-module-global-ctb": "^1.0.11",
     "newfold-labs/wp-module-facebook": "^1.0.6",
     "newfold-labs/wp-module-help-center": "^1.0.24",
     "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.8",
+    "newfold-labs/wp-module-onboarding": "^2.1.9",
     "newfold-labs/wp-module-patterns": "^0.1.15",
     "newfold-labs/wp-module-performance": "^1.4.0",
-    "newfold-labs/wp-module-runtime": "^1.0.9",
+    "newfold-labs/wp-module-runtime": "^1.0.10",
     "newfold-labs/wp-module-secure-passwords": "^1.1.1",
     "newfold-labs/wp-module-sso": "^1.0.4",
     "newfold-labs/wp-module-staging": "^1.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/cypress.config.js b/cypress.config.js
@@ -57,7 +57,8 @@ module.exports = defineConfig( {
 			if ( semver.satisfies( config.env.wpSemverVersion, '<6.3.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
 				config.excludeSpecPattern = config.excludeSpecPattern.concat( [
 					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
-					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js'
+					'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
+					'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/*.cy.js' // Works but failing on cypress
 				] );
 			}
 

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.9.2",
+    "version": "3.9.3",
     "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.",
     "author": {
         "name": "Bluehost",
@@ -33,8 +33,8 @@
     },
     "dependencies": {
         "@heroicons/react": "^2.1.1",
-        "@newfold-labs/wp-module-ecommerce": "^1.3.25",
-        "@newfold-labs/wp-module-runtime": "^1.0.9",
+        "@newfold-labs/wp-module-ecommerce": "^1.3.27",
+        "@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.1.0",