Merge commit '56b98dbc7e612ce62de127a7fcc21faf8b57d1a6' into add/1267…

…-free-trial-inbox-whitelist # Conflicts: # includes/class-wc-calypso-bridge-setup.php
Automattic · Oct 24, 2023 · 39c3f05 · 39c3f05
2 parents e89fade + 56b98db
commit 39c3f05
Show file tree

Hide file tree

Showing 70 changed files with 6,278 additions and 2,338 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint:php:staged
diff --git a/assets/css/ecommerce.css b/assets/css/ecommerce.css
@@ -31,12 +31,19 @@ body.woocommerce_page_wc-bridge-landing-page #screen-meta-links {
 	display: none;
 }
 
+body.woocommerce_page_wc-bridge-landing-page .woocommerce-layout .woocommerce-layout__main {
+	padding-right: 0;
+}
+body.woocommerce_page_wc-bridge-landing-page .woocommerce-layout__primary {
+	margin: 0;
+}
+
 .wc-bridge-landing-page {
 	background: white;
 	color: #2F2F2F; /* gray-80 */
 }
 
-.wc-bridge-landing-page__title {
+.woocommerce.wc-bridge-landing-page .wc-bridge-landing-page__title {
 	font-size: 32px;
 	line-height: 40px;
 	font-weight: 400;
@@ -84,6 +91,7 @@ body.woocommerce_page_wc-bridge-landing-page #screen-meta-links {
 .wc-bridge-landing-page__hero-image-container img {
 	width: 80%;
 	margin-top: -60px;
+	max-width: 791px;
 }
 
 .wc-bridge-landing-page__sub-title {
@@ -104,14 +112,17 @@ body.woocommerce_page_wc-bridge-landing-page #screen-meta-links {
 	text-align: center;
 }
 
+body.woocommerce_page_wc-bridge-landing-page.woocommerce_page_wc-admin #wpbody-content {
+	padding-bottom: 64px;
+}
+
 .wc-bridge-landing-page__features-grid__item {
 	width: 33%;
 	padding: 0 35px;
 }
 
 .wc-bridge-landing-page__features-grid__item__icon {
-	text-align: center;
-	background: var( --color-accent-5 );
+	background: rgba(var(--wp-admin-theme-color--rgb), 0.1);
 	width: 64px;
 	height: 64px;
 	border-radius: 50%;
@@ -133,6 +144,7 @@ body.woocommerce_page_wc-bridge-landing-page #screen-meta-links {
 	line-height: 24px;
 	font-weight: 400;
 	margin: 0;
+	box-sizing: initial;
 }
 .wc-bridge-landing-page__features-grid__item a {
 	font-size: 13px;
@@ -145,6 +157,15 @@ body.woocommerce_page_wc-bridge-landing-page #screen-meta-links {
 	color: var( --wp-admin-theme-color );
 	text-decoration: underline;
 }
+.wc-bridge-landing-page__features-grid.wc-bridge-landing-page__features-grid--align-left {
+	text-align: left;
+}
+.wc-bridge-landing-page__features-grid.wc-bridge-landing-page__features-grid--align-left .wc-bridge-landing-page__features-grid__item__icon {
+	margin: 0;
+}
+.wc-bridge-landing-page__features-grid.wc-bridge-landing-page__features-grid--align-left .wc-bridge-landing-page__features-grid__item a {
+	padding-left: 0;
+}
 
 body.woocommerce_page_wc-bridge .wc-bridge-wrap .storefront {
 	display: none;
@@ -154,6 +175,10 @@ body.woocommerce_page_wc-bridge .wc-bridge-wrap .storefront {
 	.wc-bridge-landing-page__features-grid__item {
 		padding: 0 10px;
 	}
+
+	.woocommerce.wc-bridge-landing-page h1.wc-bridge-landing-page__title {
+		padding: 0 2em;
+	}
 }
 @media screen and (max-width: 600px) {
 
@@ -189,7 +214,7 @@ body.woocommerce_page_wc-bridge .wc-bridge-wrap .storefront {
 	}
 	.wc-bridge-landing-page__features-grid {
 		flex-wrap: wrap;
-		margin: 32px auto 0;
+		margin: 64px auto 0;
 	}
 	.wc-bridge-landing-page__features-grid__item {
 		width: 100%;

diff --git a/assets/images/plugins-landing-page-hero-desktop.png b/assets/images/plugins-landing-page-hero-desktop.png
diff --git a/bin/lint-php-staged.sh b/bin/lint-php-staged.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+CHANGED_STAGED_PHP_FILES=$(git diff --staged --name-only --diff-filter=d | grep '\.php$' | xargs)
+if [ -z "$CHANGED_STAGED_PHP_FILES" ]; then
+	echo "No modified PHP files are staged. Exiting."
+	exit 0
+fi
+vendor/bin/phpcs-changed --warning-severity=0 --extensions=php --git --git-staged $CHANGED_STAGED_PHP_FILES
diff --git a/class-wc-calypso-bridge.php b/class-wc-calypso-bridge.php
@@ -4,7 +4,7 @@
  *
  * @package WC_Calypso_Bridge/Classes
  * @since   1.0.0
- * @version 2.2.2
+ * @version 2.2.15
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -107,6 +107,7 @@ public function includes() {
 		 */
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-helper-functions.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/class-wc-calypso-bridge-shared.php';
+		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-fse.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-setup.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-jetpack.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-setup-tasks.php';
@@ -131,6 +132,7 @@ public function includes() {
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-free-trial-store-details-task.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-product-import-fix.php';
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-skip-obw.php';
+		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/class-wc-calypso-bridge-footer-credits.php';
 
 		// Experiments.
 		require_once WC_CALYPSO_BRIDGE_PLUGIN_PATH . '/includes/experiments/class-wc-calypso-bridge-task-list-reminderbar-experiment.php';

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "automattic/wc-calypso-bridge",
-  "version": "v2.2.8",
+  "version": "v2.2.17",
   "autoload": {
     "files": [
       "wc-calypso-bridge.php"
@@ -31,7 +31,8 @@
     "wimg/php-compatibility": "9.0.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
     "yoast/phpunit-polyfills": "^1.0",
-    "wp-cli/wp-cli-bundle": "^2.8.1"
+    "wp-cli/wp-cli-bundle": "^2.8.1",
+    "sirbrillig/phpcs-changed": "^2.11"
   },
   "scripts": {
     "test": [

diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-wc-calypso-bridge-addons.php b/includes/class-wc-calypso-bridge-addons.php
@@ -5,7 +5,7 @@
  *
  * @package WC_Calypso_Bridge/Classes
  * @since   1.0.6
- * @version 2.0.0
+ * @version 2.2.17
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -54,9 +54,11 @@ private function __construct() {
 	 * Initialize.
 	 */
 	public function init() {
+
+		// Hide the default marketplace.
 		add_filter( 'woocommerce_show_addons_page', '__return_false' );
+		// Handle the addons legacy page.
 		add_action( 'admin_menu', array( $this, 'addons_menu' ), 70 );
-		add_action( 'woocommerce_loaded', array( $this, 'load_modified_addons_menu' ) );
 
 		// Add admin body class for the free trial landing page.
 		if ( wc_calypso_bridge_is_ecommerce_trial_plan() ) {
@@ -72,11 +74,8 @@ public function init() {
 		}
 	}
 
-	/**
-	 * Load the class for the modified Addons menu.
-	 */
-	public function load_modified_addons_menu() {
-		require 'class-wc-modified-admin-addons.php';
+	public function get_menu_slug() {
+		return class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) && \Automattic\WooCommerce\Utilities\FeaturesUtil::feature_is_enabled( 'marketplace' ) && ! wc_calypso_bridge_is_ecommerce_trial_plan() ? 'wc-admin&path=/extensions' : 'wc-addons';
 	}
 
 	/**