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.9.0 #960

Merged
merged 60 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
cc2575b
add context module and required updates due to wp-forge/helper update
circlecube Feb 16, 2024
501fa3b
add context module
circlecube Feb 20, 2024
ccf8c4c
add some comments and cleanup
circlecube Feb 20, 2024
d14bdfd
Update composer dependencies
wpscholar Feb 21, 2024
e8d4ae4
Update NPM dependencies
wpscholar Feb 21, 2024
24f2b99
update to latest context module
circlecube Feb 21, 2024
628be30
remove supported cache types if atomic
circlecube Feb 21, 2024
889bce5
update context module to 1.0.0
circlecube Feb 22, 2024
b6df838
update marketplace brand from context provided platform
circlecube Feb 22, 2024
5e592d7
set context adjusted after context is set
circlecube Feb 22, 2024
1bd9ea3
set priority to 11 so it always happens after the default 10
circlecube Feb 22, 2024
2e30304
remove atomic id constant and atomic constant
circlecube Feb 23, 2024
5777d4a
lint fix-up
circlecube Feb 23, 2024
c8b74f6
lint fix-up
circlecube Feb 23, 2024
48f1acb
Update ecomm and onboarding modules
wpscholar Feb 23, 2024
a79d0c4
Merge branch 'release/3.8.5' into add/context-module
circlecube Feb 23, 2024
f8e0eae
composer validate
circlecube Feb 23, 2024
0f3d51e
Update JS for ecomm
wpscholar Feb 23, 2024
c216e74
Merge branch 'main' into release/3.8.5
wpscholar Feb 23, 2024
5195ee9
Merge branch 'main' into add/context-module
circlecube Feb 24, 2024
bec4a4a
Merge branch 'release/3.8.5' into add/context-module
circlecube Feb 24, 2024
8645758
module updates
circlecube Feb 26, 2024
7d0e885
module updates
circlecube Feb 26, 2024
9da3737
bump plugin version to 3.9.0
circlecube Feb 26, 2024
49a1e51
minor react and wp package updates
circlecube Feb 26, 2024
c71286c
Merge branch 'release/3.9.0' into add/context-module
circlecube Feb 26, 2024
326f2ee
validate composer
circlecube Feb 26, 2024
08c5de9
remove commented test code and required file that should work with na…
circlecube Feb 26, 2024
e8353ce
test without permalink command
circlecube Feb 26, 2024
49ab8e0
update onboarding module to 2.1.3
circlecube Feb 26, 2024
ee82dab
update marketplace module to 2.2.4
circlecube Feb 27, 2024
a90dd46
update matrix to run on 8.3 and not on 7.2 and 7.1
circlecube Feb 27, 2024
b94014f
Merge branch 'release/3.9.0' into add/context-module
circlecube Feb 27, 2024
3f68422
make sure container exists to fix CLI command issue
circlecube Feb 27, 2024
b50d34f
update performance and staging modules for coordinated context updates
circlecube Feb 27, 2024
236b072
update config to skip sitegen tests for now
circlecube Feb 27, 2024
a1a0637
Merge branch 'release/3.9.0' into add/context-module
circlecube Feb 27, 2024
bcbbe12
Merge pull request #952 from bluehost/add/context-module
circlecube Feb 27, 2024
c12e12f
Skip siteCapabilities tests ifor PHP version less than 7.4, wc instal…
sangeetha-nayak Feb 28, 2024
3e5e5b0
exclude for wp less than 6.3 and php 7.4
sangeetha-nayak Feb 28, 2024
1c25cfd
Update Onboarding to 2.1.4
officiallygod Feb 28, 2024
edea240
Update cypress.config.js
officiallygod Feb 28, 2024
6769791
Update composer.lock
officiallygod Feb 28, 2024
c6ea20e
Bump PHP version in Composer to ensure proper compatibility
wpscholar Feb 28, 2024
eb3f018
Update composer dependencies
wpscholar Feb 28, 2024
53d3491
Merge pull request #961 from sangeetha-nayak/siteCapabilities_tests_skip
wpscholar Feb 28, 2024
8470c58
Merge branch 'release/3.9.0' of github.com:bluehost/bluehost-wordpres…
wpscholar Feb 28, 2024
717b390
Update Cypress to 13.6.4
wpscholar Feb 28, 2024
e9dd236
Update composer.lock
officiallygod Feb 28, 2024
1559f2d
Update composer.lock
officiallygod Feb 28, 2024
72959e9
Update composer.lock
officiallygod Feb 28, 2024
2ed86e8
Merge branch 'release/3.9.0' into update/onboarding-2.1.4
officiallygod Feb 28, 2024
2082c00
Update composer.lock
officiallygod Feb 28, 2024
050ef21
Remove modules: Busines Reviews, Customer Bluehost data, Legacy CTB
wpscholar Feb 28, 2024
672913e
remove call to legacy method that was removed for `site_id`
circlecube Feb 28, 2024
5a691a4
Merge branch 'release/3.9.0' into update/onboarding-2.1.4
circlecube Feb 28, 2024
e4e5e6e
fix lock file
circlecube Feb 28, 2024
0624fab
Merge pull request #962 from bluehost/update/onboarding-2.1.4
circlecube Feb 28, 2024
ab56622
update coming soon module to 1.2.1
circlecube Feb 28, 2024
7158728
update to latest coming soon module to fix tests
circlecube Feb 28, 2024
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
3 changes: 1 addition & 2 deletions .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* 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.8.4
* Version: 3.9.0
* Requires at least: 6.0
* Requires PHP: 7.1
* Tested up to: 6.4.3
Expand All @@ -32,7 +32,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.8.4' );
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__ ) );
Expand Down
48 changes: 38 additions & 10 deletions bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
use WP_Forge\UpgradeHandler\UpgradeHandler;
use NewfoldLabs\WP\ModuleLoader\Container;
use NewfoldLabs\WP\ModuleLoader\Plugin;
use NewfoldLabs\WP\Context\Context;
use function NewfoldLabs\WP\ModuleLoader\container as setContainer;
use function NewfoldLabs\WP\Context\setContext;
use function NewfoldLabs\WP\Context\getContext;

// Composer autoloader
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
Expand All @@ -25,12 +28,17 @@
}

/*
* Initialize coming soon module via container
* Initialize module settings via container
*/
$bluehost_module_container = new Container(
array(
'cache_types' => array( 'browser', 'skip404' ),
)
$bluehost_module_container = new Container();

// Context setup
add_action(
'newfold/context/set',
function () {
// set brand
setContext( 'brand.name', 'bluehost' );
}
);

// Set plugin to container
Expand All @@ -44,19 +52,38 @@ function () {
'file' => BLUEHOST_PLUGIN_FILE,
'brand' => get_option( 'mm_brand', 'bluehost' ),
'install_date' => get_option( 'bluehost_plugin_install_date' ),
'site_id' => \NewfoldLabs\WP\Module\CustomerBluehost\SiteMeta::get_id(),
)
);
}
)
);

$bluehost_module_container->set(
'marketplace_brand',
'bluehost'
// Assign container values based on context
add_action(
'plugins_loaded',
function () {
global $bluehost_module_container;

// Performance default settings
$cache_types = array( 'browser', 'skip404' );
// Marketplace default settings
$marketplace_brand = 'bluehost';

// Platform overrides
if ( 'atomic' === getContext( 'platform' ) ) {
$cache_types = array();
$marketplace_brand = 'bluehost-cloud';
}

if ( $bluehost_module_container ) {
$bluehost_module_container->set( 'cache_types', $cache_types );
$bluehost_module_container->set( 'marketplace_brand', $marketplace_brand );
}
},
11
);

// properly get branding links depending on market
// Properly get branding links depending on market
$wordpress_hosting_page = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://www.bluehost.in?utm_source=coming-soon-template&utm_medium=bluehost_plugin' : 'https://bluehost.com?utm_source=coming-soon-template&utm_medium=bluehost_plugin';
$my_panel = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://my.bluehost.in/web-hosting/cplogin' : 'https://my.bluehost.com/web-hosting/cplogin';
$website_guide_link = 'https://www.bluehost.com/blog/how-to-create-a-website-guide/';
Expand Down Expand Up @@ -106,6 +133,7 @@ function () {
'template_styles' => esc_url( BLUEHOST_PLUGIN_URL . 'assets/styles/coming-soon.css' ),
)
);

setContainer( $bluehost_module_container );

// Set up the updater endpoint and map values
Expand Down
24 changes: 11 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "7.1.0"
"php": "7.3.0"
},
"platform-check": false,
"allow-plugins": {
Expand Down Expand Up @@ -66,26 +66,24 @@
"wp-phpunit/wp-phpunit": "^6.4.2"
},
"require": {
"newfold-labs/wp-module-business-reviews": "^1.1.1",
"newfold-labs/wp-module-coming-soon": "^1.2.0",
"newfold-labs/wp-module-ctb": "^1.1.3",
"newfold-labs/wp-module-customer-bluehost": "^1.6.0",
"newfold-labs/wp-module-coming-soon": "^1.2.2",
"newfold-labs/wp-module-context": "^1.0.0",
"newfold-labs/wp-module-data": "^2.4.18",
"newfold-labs/wp-module-deactivation": "^1.0.5",
"newfold-labs/wp-module-ecommerce": "^1.3.21",
"newfold-labs/wp-module-ecommerce": "^1.3.23",
"newfold-labs/wp-module-global-ctb": "^1.0.11",
"newfold-labs/wp-module-help-center": "^1.0.23",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.2.1",
"newfold-labs/wp-module-notifications": "^1.2.4",
"newfold-labs/wp-module-onboarding": "^1.12.1",
"newfold-labs/wp-module-patterns": "^0.1.13",
"newfold-labs/wp-module-performance": "^1.3.0",
"newfold-labs/wp-module-marketplace": "^2.2.4",
"newfold-labs/wp-module-notifications": "^1.2.5",
"newfold-labs/wp-module-onboarding": "^2.1.4",
"newfold-labs/wp-module-patterns": "^0.1.14",
"newfold-labs/wp-module-performance": "^1.4.0",
"newfold-labs/wp-module-runtime": "^1.0.9",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.4",
"newfold-labs/wp-module-staging": "^1.2.3",
"wp-forge/wp-update-handler": "^1.0",
"newfold-labs/wp-module-staging": "^1.3.0",
"wp-forge/wp-update-handler": "^1.0.2",
"wp-forge/wp-upgrade-handler": "^1.0"
}
}
Loading
Loading