Skip to content

Commit

Permalink
Merge branch 'develop' into update/cypress-test-isolation
Browse files Browse the repository at this point in the history
* develop: (45 commits)
  Rollback ecommerce nodule npm package
  Bump plugin version
  Modify composer deps
  linting fixes
  fixes in store page
  linting fixes
  linting issues
  calling comingSoonAdminbarToggle on update of comingsoon
  update tests to reflect change
  remove 'FREE Monthly Webinar: ' line from webinar component
  update migration module to 1.0.7
  update features module to 1.4.2
  update plugin version to 3.12.1
  Replace references to old values in `NewfoldRuntime`
  require migration update 1.0.6 in plugin
  Bump coming soon module to 1.2.5
  Bump version
  Bump module version
  Bump module version
  Fix merge conflict
  ...
  • Loading branch information
circlecube committed Jun 26, 2024
2 parents 191acb4 + d0b9056 commit 492405e
Show file tree
Hide file tree
Showing 11 changed files with 580 additions and 268 deletions.
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.11.0
* 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.11.0' );
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
21 changes: 11 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,25 @@
"roave/security-advisories": "dev-latest",
"newfold-labs/wp-php-standards": "^1.2.3",
"wp-cli/i18n-command": "^2.6.1",
"wp-phpunit/wp-phpunit": "^6.5.3"
"wp-phpunit/wp-phpunit": "^6.5.4"
},
"require": {
"newfold-labs/wp-module-activation": "^1.0.2",
"newfold-labs/wp-module-atomic": "^1.3.0",
"newfold-labs/wp-module-coming-soon": "^1.2.4",
"newfold-labs/wp-module-coming-soon": "^1.2.5",
"newfold-labs/wp-module-context": "^1.0.1",
"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-data": "^2.5.3",
"newfold-labs/wp-module-deactivation": "^1.2.1",
"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.13",
"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",
"newfold-labs/wp-module-marketplace": "^2.3.0",
"newfold-labs/wp-module-migration": "^1.0.7",
"newfold-labs/wp-module-notifications": "^1.3.0",
"newfold-labs/wp-module-onboarding": "^2.3.2",
"newfold-labs/wp-module-onboarding": "^2.3.4",
"newfold-labs/wp-module-patterns": "2.0.0 as 1.9.9",
"newfold-labs/wp-module-performance": "2.0.0 as 1.9.9",
"newfold-labs/wp-module-runtime": "^1.0.11",
Expand Down
Loading

0 comments on commit 492405e

Please sign in to comment.