Merge pull request bluehost#632 from bluehost/release/3.1.0

Release/3.1.0
officiallygod · Aug 30, 2023 · 6b9dc3d · 6b9dc3d
2 parents e8e5489 + 58ee18d
commit 6b9dc3d
Show file tree

Hide file tree

Showing 40 changed files with 1,013 additions and 2,241 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-  "core": "WordPress/WordPress#tags/6.3",
+  "core": "WordPress/WordPress#tags/6.3.1",
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_LOG": true,

diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
@@ -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.0.11
+ * Version:           3.1.0
  * Requires at least: 6.0
  * Requires PHP:      7.1
  * Tested up to:      6.3
@@ -31,7 +31,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.0.11' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.1.0' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

diff --git a/composer.json b/composer.json
@@ -49,30 +49,29 @@
     "i18n": "Generate a .pot file for translation."
   },
   "require-dev": {
-    "roave/security-advisories": "dev-latest"
-    ,
+    "roave/security-advisories": "dev-latest",
     "newfold-labs/wp-php-standards": "^1.2",
     "wp-cli/i18n-command": "^2.4.3",
     "wp-phpunit/wp-phpunit": "^6.2"
   },
   "require": {
     "newfold-labs/wp-module-business-reviews": "^1.1.1",
-    "newfold-labs/wp-module-coming-soon": "^1.1.7",
-    "newfold-labs/wp-module-ctb": "^1.0.1",
+    "newfold-labs/wp-module-coming-soon": "^1.1.8",
+    "newfold-labs/wp-module-ctb": "^1.0.2",
     "newfold-labs/wp-module-customer-bluehost": "^1.6.0",
     "newfold-labs/wp-module-data": "^2.4.3",
-    "newfold-labs/wp-module-ecommerce": "^1.1.2",
-    "newfold-labs/wp-module-help-center": "^1.0.15",
+    "newfold-labs/wp-module-ecommerce": "^1.2.0",
+    "newfold-labs/wp-module-help-center": "^1.0.16",
     "newfold-labs/wp-module-loader": "^1.0.10",
-    "newfold-labs/wp-module-marketplace": "^1.5.2",
-    "newfold-labs/wp-module-notifications": "^1.1.3",
-    "newfold-labs/wp-module-onboarding": "^1.10.1",
-    "newfold-labs/wp-module-patterns": "^0.1.3",
+    "newfold-labs/wp-module-marketplace": "^2.0.1",
+    "newfold-labs/wp-module-notifications": "^1.1.4",
+    "newfold-labs/wp-module-onboarding": "^1.10.2",
+    "newfold-labs/wp-module-patterns": "^0.1.4",
     "newfold-labs/wp-module-performance": "^1.1.1",
     "newfold-labs/wp-module-runtime": "^1.0.2",
     "newfold-labs/wp-module-secure-passwords": "^1.1",
     "newfold-labs/wp-module-sso": "^1.0.4",
-    "newfold-labs/wp-module-staging": "^1.0.3",
+    "newfold-labs/wp-module-staging": "^1.1.0",
     "wp-forge/wp-update-handler": "^1.0",
     "wp-forge/wp-upgrade-handler": "^1.0"
   }

diff --git a/composer.lock b/composer.lock
diff --git a/cypress.config.js b/cypress.config.js
@@ -21,12 +21,12 @@ module.exports = defineConfig({
   videoUploadOnPasses: false,
   chromeWebSecurity: false,
   viewportWidth: 1024,
-	viewportHeight: 768,
-	blockHosts: [
-		'*doubleclick.net',
-		'*jnn-pa.googleapis.com',
-		'*youtube.com',
-	],
+  viewportHeight: 768,
+  blockHosts: [
+    '*doubleclick.net',
+    '*jnn-pa.googleapis.com',
+    '*youtube.com',
+  ],
   e2e: {
 		setupNodeEvents(on, config) {
 			const semver = require('semver');

diff --git a/inc/alt-experience/index.html b/inc/alt-experience/index.html
diff --git a/inc/partners.php b/inc/partners.php
@@ -32,3 +32,22 @@ function aioseo_upgrade_affiliate_link( $url ) {
 }
 
 add_filter( 'aioseo_upgrade_link', __NAMESPACE__ . '\\aioseo_upgrade_affiliate_link' );
+
+/**
+ * Enable Sharing with WooCommerce
+ * 
+ * @param string $plugin the plugin
+ * @param boolean $network_activation flag is network activated
+ * 
+ * @return void
+ */
+function plugin_activated( $plugin, $network_activation ) {
+	switch( $plugin ) {
+		case 'woocommerce/woocommerce.php':
+			// Enable the usage tracking option by default https://woocommerce.com/usage-tracking/
+			update_option( 'woocommerce_allow_tracking', 'yes' );
+			break;
+	}
+}
+
+add_action( 'activated_plugin', __NAMESPACE__ . '\\plugin_activated', 10, 2 );