diff --git a/.wp-env.json b/.wp-env.json index ff4c8b305..864f152fe 100644 --- a/.wp-env.json +++ b/.wp-env.json @@ -1,5 +1,5 @@ { - "core": "WordPress/WordPress#tags/6.5.4", + "core": "WordPress/WordPress#tags/6.5.5", "config": { "WP_DEBUG": true, "WP_DEBUG_LOG": true, diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index e3fd0d125..40e2e05ec 100644 --- 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.12.1 + * Version: 3.12.2 * Requires at least: 6.0 * Requires PHP: 7.1 - * Tested up to: 6.5.4 + * Tested up to: 6.5.5 * Author: Bluehost * Author URI: https://bluehost.com * Text Domain: wp-plugin-bluehost @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.12.1' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.12.2' ); 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 index 3a78d56a5..412bfff91 100644 --- a/composer.json +++ b/composer.json @@ -79,10 +79,10 @@ "newfold-labs/wp-module-context": "^1.0.1", "newfold-labs/wp-module-data": "^2.5.3", "newfold-labs/wp-module-deactivation": "^1.2.1", - "newfold-labs/wp-module-ecommerce": "^1.3.33", + "newfold-labs/wp-module-ecommerce": "1.3.31", "newfold-labs/wp-module-facebook": "^1.0.9", "newfold-labs/wp-module-features": "^1.4.2", - "newfold-labs/wp-module-global-ctb": "^1.0.12", + "newfold-labs/wp-module-global-ctb": "^1.0.13", "newfold-labs/wp-module-help-center": "^2.0.0", "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.3.0", diff --git a/composer.lock b/composer.lock index 540934ad0..f18d73f60 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e180979b303913510ec0c2cfbd9642a3", + "content-hash": "c4b2d74d9782dad84e8fb74a72279620", "packages": [ { "name": "doctrine/inflector", @@ -652,16 +652,16 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v1.3.33", + "version": "v1.3.31", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "9b848fee173f5688e4424dd010cad18914975678" + "reference": "24ef99c9b697f2c30172a95c5f6fa0470b9b2604" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/9b848fee173f5688e4424dd010cad18914975678", - "reference": "9b848fee173f5688e4424dd010cad18914975678", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/24ef99c9b697f2c30172a95c5f6fa0470b9b2604", + "reference": "24ef99c9b697f2c30172a95c5f6fa0470b9b2604", "shasum": "" }, "require": { @@ -704,10 +704,10 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.33", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.31", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2024-06-18T08:53:05+00:00" + "time": "2024-05-20T12:40:55+00:00" }, { "name": "newfold-labs/wp-module-facebook", @@ -810,16 +810,16 @@ }, { "name": "newfold-labs/wp-module-global-ctb", - "version": "1.0.12", + "version": "1.0.13", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-global-ctb.git", - "reference": "cdc28498a0a31f889bac58639735110fd285bcbb" + "reference": "f27fc58ca74df9d6ef0aca4d5e3603f48fd17f05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-global-ctb/zipball/cdc28498a0a31f889bac58639735110fd285bcbb", - "reference": "cdc28498a0a31f889bac58639735110fd285bcbb", + "url": "https://api.github.com/repos/newfold-labs/wp-module-global-ctb/zipball/f27fc58ca74df9d6ef0aca4d5e3603f48fd17f05", + "reference": "f27fc58ca74df9d6ef0aca4d5e3603f48fd17f05", "shasum": "" }, "require-dev": { @@ -853,10 +853,10 @@ ], "description": "Newfold module for 'Click to Buy' functionality in brand plugins", "support": { - "source": "https://github.com/newfold-labs/wp-module-global-ctb/tree/1.0.12", + "source": "https://github.com/newfold-labs/wp-module-global-ctb/tree/1.0.13", "issues": "https://github.com/newfold-labs/wp-module-global-ctb/issues" }, - "time": "2024-05-30T16:00:35+00:00" + "time": "2024-06-25T00:12:44+00:00" }, { "name": "newfold-labs/wp-module-help-center", diff --git a/package-lock.json b/package-lock.json index 8fd9dce22..83eacf23b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.12.1", + "version": "3.12.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.12.1", + "version": "3.12.2", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.1", - "@newfold-labs/wp-module-ecommerce": "^1.3.33", + "@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/ui-component-library": "^1.1.0", @@ -3197,9 +3197,9 @@ } }, "node_modules/@newfold-labs/wp-module-ecommerce": { - "version": "1.3.33", - "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.33/5b3282eb4b7afb48ff4dd45c358dd66b049bca9d", - "integrity": "sha512-XRiXm7bG4TW8cGaoTPcMSWSQ0o9t7YBiZZTTsKMBAnbIQwc5qkQGdrrSvb2bMzyuEXUYIbtxA+mJpCuO6defJw==", + "version": "1.3.31", + "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.31/355c4a15cc4d8cc4820a8db6de508e511d938c42", + "integrity": "sha512-3T9MPz9v/dtyUuO0TAlJONhunZ2SNGbHCOuYKx7ffge6esO6wYFYB2m9B7FoP1wC8Rl/zvfwxQfKTooS6LHLHA==", "license": "GPL-2.0-or-later", "dependencies": { "@faizaanceg/pandora": "^1.1.1", diff --git a/package.json b/package.json index 5840acde1..534d67903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.12.1", + "version": "3.12.2", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", @@ -33,7 +33,7 @@ }, "dependencies": { "@heroicons/react": "^2.1.1", - "@newfold-labs/wp-module-ecommerce": "^1.3.33", + "@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/ui-component-library": "^1.1.0", diff --git a/src/app/components/webinars-banner/index.js b/src/app/components/webinars-banner/index.js index c6868a70e..c7104a91b 100644 --- a/src/app/components/webinars-banner/index.js +++ b/src/app/components/webinars-banner/index.js @@ -114,7 +114,7 @@ const WebinarsBanner = () => {
- FREE Monthly Webinar: { upcomingWebinar.title } + { upcomingWebinar.title } { ( upcomingWebinar.hasDescription || diff --git a/src/app/pages/ecommerce/page.js b/src/app/pages/ecommerce/page.js index d9122eaa2..6033ad282 100644 --- a/src/app/pages/ecommerce/page.js +++ b/src/app/pages/ecommerce/page.js @@ -7,6 +7,7 @@ import '@newfold-labs/wp-module-ecommerce/bluehost.css'; import AppStore from 'App/data/store'; import { bluehostSettingsApiFetch } from 'App/util/helpers'; import { useNotification } from 'App/components/notifications'; +import { comingSoonAdminbarToggle } from '../../util/helpers'; const ECommerce = () => { const { store, setStore } = useContext( AppStore ); @@ -33,6 +34,7 @@ const ECommerce = () => { ...store, comingSoon: ! store.comingSoon, } ); + comingSoonAdminbarToggle( ! store.comingSoon ); } ), }; diff --git a/src/app/pages/home/welcomeSection.js b/src/app/pages/home/welcomeSection.js index ad0e1ef74..32d1bc4bc 100644 --- a/src/app/pages/home/welcomeSection.js +++ b/src/app/pages/home/welcomeSection.js @@ -1,8 +1,10 @@ import { useContext } from '@wordpress/element'; +import { useUpdateEffect } from 'react-use'; import { OnboardingScreen } from '@newfold-labs/wp-module-ecommerce'; import AppStore from 'App/data/store'; import { bluehostSettingsApiFetch } from 'App/util/helpers'; import { useNotification } from 'App/components/notifications'; +import { comingSoonAdminbarToggle } from '../../util/helpers'; const WelcomeSection = ( {} ) => { const { store, setStore } = useContext( AppStore ); @@ -16,6 +18,10 @@ const WelcomeSection = ( {} ) => { () => setStore( { ...store, comingSoon: ! store.comingSoon } ) ); + useUpdateEffect( () => { + comingSoonAdminbarToggle( store.comingSoon ); + }, [ store.comingSoon ] ); + return ( { cy.get( '.wppbh-app-site-info' ) - .contains( 'h3', NewfoldRuntime.site.title ) + .contains( 'h3', NewfoldRuntime.siteTitle ) .scrollIntoView() .should( 'be.visible' ); } ); @@ -62,10 +62,7 @@ describe( 'Home Page', function () { ); cy.reload(); cy.get( '.wppbh-webinars-banner-section' ) - .contains( - 'h2', - 'FREE Monthly Webinar: Build your brand with WordPress' - ) + .contains( 'h2', 'Build your brand with WordPress' ) .scrollIntoView() .should( 'be.visible' ); } ); @@ -73,10 +70,7 @@ describe( 'Home Page', function () { it( 'Webinars Section Renders Correctly', () => { // Title cy.get( '.wppbh-webinars-banner-section' ) - .contains( - 'h2', - 'FREE Monthly Webinar: Build your brand with WordPress' - ) + .contains( 'h2', 'Build your brand with WordPress' ) .scrollIntoView() .should( 'be.visible' );