Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.12.2 #1149

Merged
merged 14 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__ ) );
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 13 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/webinars-banner/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const WebinarsBanner = () => {

<div className="nfd-flex nfd-flex-col nfd-gap-4 nfd-w-full">
<Title as="h2" className="nfd-text-base">
FREE Monthly Webinar: { upcomingWebinar.title }
{ upcomingWebinar.title }
</Title>

{ ( upcomingWebinar.hasDescription ||
Expand Down
2 changes: 2 additions & 0 deletions src/app/pages/ecommerce/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -33,6 +34,7 @@ const ECommerce = () => {
...store,
comingSoon: ! store.comingSoon,
} );
comingSoonAdminbarToggle( ! store.comingSoon );
}
),
};
Expand Down
6 changes: 6 additions & 0 deletions src/app/pages/home/welcomeSection.js
Original file line number Diff line number Diff line change
@@ -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 );
Expand All @@ -16,6 +18,10 @@ const WelcomeSection = ( {} ) => {
() => setStore( { ...store, comingSoon: ! store.comingSoon } )
);

useUpdateEffect( () => {
comingSoonAdminbarToggle( store.comingSoon );
}, [ store.comingSoon ] );

return (
<OnboardingScreen
comingSoon={ store.comingSoon }
Expand Down
12 changes: 3 additions & 9 deletions tests/cypress/integration/home.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe( 'Home Page', function () {

it( 'Site Info Exists', () => {
cy.get( '.wppbh-app-site-info' )
.contains( 'h3', NewfoldRuntime.site.title )
.contains( 'h3', NewfoldRuntime.siteTitle )
.scrollIntoView()
.should( 'be.visible' );
} );
Expand Down Expand Up @@ -62,21 +62,15 @@ 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' );
} );

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' );

Expand Down
Loading