Skip to content
This repository has been archived by the owner on Jan 30, 2025. It is now read-only.

Commit

Permalink
Merge branch 'main' into add/features-module
Browse files Browse the repository at this point in the history
* main:
  Updated tested up to wp version
  Bump deactivation module 1.1.2
  update wordpress versions in cypress matrix
  Skip ecomm tests when the env is less than wp 6.4
  Bump npm package version
  Resolve conflicts
  Fix tests
  Fix tests
  update lock file
  Update Onboarding to 2.3.0
  update ecommerce version bump and lock files updated
  Bump ecommerce npm package
  Bump version
  bump ecommerce, onboarding and patterns modules

# Conflicts:
#	composer.json
#	composer.lock
  • Loading branch information
circlecube committed May 8, 2024
2 parents 549c8f2 + 845bdfd commit f911eb5
Show file tree
Hide file tree
Showing 8 changed files with 331 additions and 141 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
- '8.2'
- '8.3'
wpVersion:
- '6.2'
- '6.3'
- '6.4'
- '6.5'

steps:

Expand Down
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.2",
"core": "WordPress/WordPress#tags/6.5.3",
"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.9.4
* Version: 3.10.0
* Requires at least: 6.0
* Requires PHP: 7.1
* Tested up to: 6.5.2
* Tested up to: 6.5.3
* 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.9.4' );
define( 'BLUEHOST_PLUGIN_VERSION', '3.10.0' );
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Expand Down
19 changes: 13 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
"only": [
"newfold-labs/*"
]
},
"instawp": {
"type": "vcs",
"url": "[email protected]:InstaWP/connect-helpers.git",
"only": [
"instawp/*"
]
}
},
"scripts": {
Expand Down Expand Up @@ -70,22 +77,22 @@
"newfold-labs/wp-module-coming-soon": "^1.2.3",
"newfold-labs/wp-module-context": "^1.0.0",
"newfold-labs/wp-module-data": "^2.4.24",
"newfold-labs/wp-module-deactivation": "^1.1.1",
"newfold-labs/wp-module-ecommerce": "^1.3.28",
"newfold-labs/wp-module-deactivation": "^1.1.2",
"newfold-labs/wp-module-ecommerce": "^1.3.30",
"newfold-labs/wp-module-features": "dev-main",
"newfold-labs/wp-module-global-ctb": "^1.0.11",
"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.3.0",
"newfold-labs/wp-module-onboarding": "^2.1.9",
"newfold-labs/wp-module-patterns": "^0.1.18",
"newfold-labs/wp-module-onboarding": "^2.3.0",
"newfold-labs/wp-module-patterns": "^1.0.0",
"newfold-labs/wp-module-performance": "^1.4.1",
"newfold-labs/wp-module-runtime": "^1.0.10",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.5",
"newfold-labs/wp-module-staging": "dev-develop",
"newfold-labs/wp-module-staging": "dev-add/staging-feature",
"wp-forge/wp-update-handler": "^1.0.2",
"wp-forge/wp-upgrade-handler": "^1.0"
}
}
}
Loading

0 comments on commit f911eb5

Please sign in to comment.