Skip to content

Commit

Permalink
Merge pull request #725 from bluehost/release/3.4
Browse files Browse the repository at this point in the history
Release/3.4
  • Loading branch information
circlecube authored Oct 12, 2023
2 parents 2414ddd + dc64d41 commit bb99e14
Show file tree
Hide file tree
Showing 16 changed files with 1,709 additions and 1,478 deletions.
42 changes: 25 additions & 17 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
/bin
node_modules
/src
tests
/tests

# Files
.*
/.*
cypress.config.js
set-latest-wp-version.js
webpack.config.js

# File Types
*.json
*.lock
*.log
*.md
*.sql
*.tar.gz
*.xml
*.yml
*.zip
*.scss
/*.json
/*.lock
/*.log
/*.md
/*.sql
/*.tar.gz
/*.xml
/*.yml
/*.zip
/*.scss

# Newfold src files
vendor/newfold-labs/wp-module-ecommerce/src
vendor/newfold-labs/wp-module-help-center/src
vendor/newfold-labs/wp-module-onboarding/src
vendor/newfold-labs/wp-module-patterns/src
# BEGIN NEWFOLD LABS RULES
vendor/newfold-labs/*/src
vendor/newfold-labs/*/source
vendor/newfold-labs/*/tests
vendor/newfold-labs/*/.*
vendor/newfold-labs/*/*.xml
vendor/newfold-labs/*/*.json
vendor/newfold-labs/*/*.lock
vendor/newfold-labs/*/*.scss
vendor/newfold-labs/*/*.md
vendor/newfold-labs/*/*.config.js
vendor/newfold-labs/*/LICENSE
4 changes: 1 addition & 3 deletions .distinclude
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Directories

# Files
/vendor/newfold-labs/wp-module-data/src/Data/Static/*.json
/vendor/newfold-labs/wp-module-patterns/build/*/blocks/block.json
/vendor/newfold-labs/wp-module-staging/lib/.staging
/LICENSE.md

# File Types
4 changes: 2 additions & 2 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Plugin Name: The Bluehost Plugin
* Plugin URI: https://bluehost.com
* Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
* Version: 3.3.2
* Version: 3.4.0
* Requires at least: 6.0
* Requires PHP: 7.1
* Tested up to: 6.3
Expand All @@ -31,7 +31,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.3.2' );
define( 'BLUEHOST_PLUGIN_VERSION', '3.4.0' );
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Expand Down
11 changes: 6 additions & 5 deletions bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
if ( 'local' === wp_get_environment_type() ) {
wp_die( esc_html( __( 'Please install the Bluehost Plugin dependencies.', 'wp-plugin-bluehost' ) ) );
}

return;
}

Expand Down Expand Up @@ -72,15 +73,15 @@ function bluehost_is_jarvis() {
*/
$bluehost_module_container = new Container(
array(
'cache_types' => array( 'browser', 'file', 'skip404' ),
'cache_types' => array( 'browser', 'skip404' ),
)
);

// Set plugin to container
$bluehost_module_container->set(
'plugin',
$bluehost_module_container->service(
function() {
function () {
return new Plugin(
array(
'id' => 'bluehost',
Expand Down Expand Up @@ -166,7 +167,7 @@ function () {
'2x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-banner.svg',
'1x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-banner.svg',
],
'icons' => [
'icons' => [
'2x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-icon.svg',
'1x' => 'https://cdn.hiive.space/marketplace/vendors-assets/bluehost-icon.svg',
],
Expand All @@ -178,9 +179,9 @@ function () {

// Handle plugin upgrades
$upgrade_handler = new UpgradeHandler(
BLUEHOST_PLUGIN_DIR . '/inc/upgrades', // Directory where upgrade routines live
BLUEHOST_PLUGIN_DIR . '/inc/upgrades', // Directory where upgrade routines live
get_option( 'bluehost_plugin_version', '0.1.0' ), // Old plugin version (from database)
BLUEHOST_PLUGIN_VERSION // New plugin version (from code)
BLUEHOST_PLUGIN_VERSION // New plugin version (from code)
);

// Returns true if the old version doesn't match the new version
Expand Down
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,21 @@
},
"require": {
"newfold-labs/wp-module-business-reviews": "^1.1.1",
"newfold-labs/wp-module-coming-soon": "^1.1.9",
"newfold-labs/wp-module-coming-soon": "^1.1.10",
"newfold-labs/wp-module-ctb": "^1.1.2",
"newfold-labs/wp-module-customer-bluehost": "^1.6.0",
"newfold-labs/wp-module-data": "^2.4.6",
"newfold-labs/wp-module-ecommerce": "^1.2.4",
"newfold-labs/wp-module-data": "^2.4.8",
"newfold-labs/wp-module-deactivation": "^1.0",
"newfold-labs/wp-module-ecommerce": "^1.3.0",
"newfold-labs/wp-module-global-ctb": "^1.0.4",
"newfold-labs/wp-module-help-center": "1.0.17",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.0.2",
"newfold-labs/wp-module-notifications": "^1.1.5",
"newfold-labs/wp-module-onboarding": "1.10.4",
"newfold-labs/wp-module-patterns": "^0.1.4",
"newfold-labs/wp-module-onboarding": "^1.11.3",
"newfold-labs/wp-module-patterns": "^0.1.5",
"newfold-labs/wp-module-performance": "^1.2.1",
"newfold-labs/wp-module-runtime": "^1.0.5",
"newfold-labs/wp-module-runtime": "^1.0.7",
"newfold-labs/wp-module-secure-passwords": "^1.1",
"newfold-labs/wp-module-sso": "^1.0.4",
"newfold-labs/wp-module-staging": "^1.1.1",
Expand Down
Loading

0 comments on commit bb99e14

Please sign in to comment.