@automattic/newspack-blocks 4.5.0-alpha.1 → 4.5.0-alpha.2

package/CHANGELOG.md

@@ -1,19 +1,9 @@
-# [4.5.0-alpha.1](https://github.com/Automattic/newspack-blocks/compare/v4.4.0...v4.5.0-alpha.1) (2024-11-29)
+# [4.5.0-alpha.2](https://github.com/Automattic/newspack-blocks/compare/v4.5.0-alpha.1...v4.5.0-alpha.2) (2024-12-04)
 
 
 ### Bug Fixes
 
-* also search for coauthor posts by term slug ([#1954](https://github.com/Automattic/newspack-blocks/issues/1954)) ([49357ff](https://github.com/Automattic/newspack-blocks/commit/49357ffa12bd2197d08379db0cd084f1cc5deb2a))
-* **ras-acc:** correct spacing issue around saved credit cards ([#1980](https://github.com/Automattic/newspack-blocks/issues/1980)) ([52a5c57](https://github.com/Automattic/newspack-blocks/commit/52a5c57ffe037b3de9471c9a4587a2c62c917712))
-* **ras-acc:** fix display issues with Additional Fields ([#1979](https://github.com/Automattic/newspack-blocks/issues/1979)) ([b9390ef](https://github.com/Automattic/newspack-blocks/commit/b9390effc8096fc9faea48b49e90efdeabbe1513))
-* **ras-acc:** remove space caused by empty divs ([#1978](https://github.com/Automattic/newspack-blocks/issues/1978)) ([8cb6ead](https://github.com/Automattic/newspack-blocks/commit/8cb6ead13aaa86743bb83ba9afb859277394d1df))
-
-
-### Features
-
-* add Bluesky support to the Author Profile, List blocks ([#1969](https://github.com/Automattic/newspack-blocks/issues/1969)) ([d26a7e4](https://github.com/Automattic/newspack-blocks/commit/d26a7e4001e0645cba031143e2fbb18d4749def6))
-* add support for Newspack Guest Contributor in HPP blocks ([#1934](https://github.com/Automattic/newspack-blocks/issues/1934)) ([c16849e](https://github.com/Automattic/newspack-blocks/commit/c16849e2cf62236b55a99fe63c72f68d727b3437))
-* merge RAS-ACC work into trunk ([#1977](https://github.com/Automattic/newspack-blocks/issues/1977)) ([2eeaa89](https://github.com/Automattic/newspack-blocks/commit/2eeaa8933cd4ac877389362aa0815e36d50bc729))
+* remove reCaptcha for WooCommere code from modal checkout ([#1984](https://github.com/Automattic/newspack-blocks/issues/1984)) ([8e250eb](https://github.com/Automattic/newspack-blocks/commit/8e250eb8ef95ca960509beba9dcd6e7526aa9dc6))
 
 # [4.4.0](https://github.com/Automattic/newspack-blocks/compare/v4.3.7...v4.4.0) (2024-11-25)
 

package/composer.lock

@@ -2469,16 +2469,16 @@
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
-            "version": "v2.11.19",
+            "version": "v2.11.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git",
-                "reference": "bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1"
+                "reference": "eb2b351927098c24860daa7484e290d3eed693be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1",
-                "reference": "bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1",
+                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/eb2b351927098c24860daa7484e290d3eed693be",
+                "reference": "eb2b351927098c24860daa7484e290d3eed693be",
                 "shasum": ""
             },
             "require": {
@@ -2489,9 +2489,9 @@
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
                 "phpcsstandards/phpcsdevcs": "^1.1",
                 "phpstan/phpstan": "^1.7",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0 || ^10.5.32 || ^11.3.3",
                 "sirbrillig/phpcs-import-detection": "^1.1",
-                "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0@beta"
+                "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -2523,20 +2523,20 @@
                 "source": "https://github.com/sirbrillig/phpcs-variable-analysis",
                 "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki"
             },
-            "time": "2024-06-26T20:08:34+00:00"
+            "time": "2024-12-02T16:37:49+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.1",
+            "version": "3.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
                 "shasum": ""
             },
             "require": {
@@ -2603,7 +2603,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-22T21:24:41+00:00"
+            "time": "2024-11-16T12:02:36+00:00"
         },
         {
             "name": "symfony/console",

package/includes/class-modal-checkout.php

@@ -132,6 +132,9 @@ final class Modal_Checkout {
 		}
 		add_filter( 'woocommerce_subscriptions_product_limited_for_user', [ __CLASS__, 'subscriptions_product_limited_for_user' ], 10, 3 );
 		add_filter( 'woocommerce_get_privacy_policy_text', [ __CLASS__, 'woocommerce_get_privacy_policy_text' ], 10, 2 );
+
+		// Remove any hooks that aren't supported by the modal checkout.
+		add_action( 'plugins_loaded', [ __CLASS__, 'remove_hooks' ] );
 	}
 
 	/**
@@ -731,6 +734,7 @@ final class Modal_Checkout {
 			'newspack-ui',
 			'newspack-style',
 			'newspack-recaptcha',
+			'newspack-woocommerce-style',
 			// Woo.
 			'woocommerce',
 			'WCPAY',
@@ -740,6 +744,7 @@ final class Modal_Checkout {
 			'wcs-',
 			'stripe',
 			'select2',
+			'selectWoo',
 			// Metorik.
 			'metorik',
 		];
@@ -756,7 +761,7 @@ final class Modal_Checkout {
 		foreach ( $wp_scripts->queue as $handle ) {
 			$allowed = false;
 			foreach ( $allowed_assets as $allowed_asset ) {
-				if ( false !== strpos( $handle, $allowed_asset ) ) {
+				if ( 0 === strpos( $handle, $allowed_asset ) ) {
 					$allowed = true;
 					break;
 				}
@@ -768,7 +773,7 @@ final class Modal_Checkout {
 		foreach ( $wp_styles->queue as $handle ) {
 			$allowed = false;
 			foreach ( $allowed_assets as $allowed_asset ) {
-				if ( false !== strpos( $handle, $allowed_asset ) ) {
+				if ( 0 === strpos( $handle, $allowed_asset ) ) {
 					$allowed = true;
 					break;
 				}
@@ -779,6 +784,64 @@ final class Modal_Checkout {
 		}
 	}
 
+	/**
+	 * Remove any hooks that may not work nicely with the modal checkout.
+	 */
+	public static function remove_hooks() {
+		if ( ! self::is_modal_checkout() ) {
+			return;
+		}
+
+		$remove_list = [];
+
+		// reCaptcha for WooCommerce.
+		if ( class_exists( 'I13_Woo_Recpatcha' ) ) {
+			global $i13_woo_recpatcha;
+			array_push(
+				$remove_list,
+				[
+					'hook'     => 'woocommerce_review_order_before_payment',
+					'callback' => array( $i13_woo_recpatcha, 'i13woo_extra_checkout_fields' ),
+				],
+				[
+					'hook'     => 'woocommerce_after_checkout_validation',
+					'callback' => array( $i13_woo_recpatcha, 'i13_woocomm_validate_checkout_captcha' ),
+				],
+				[
+					'hook'     => 'woocommerce_pay_order_before_submit',
+					'callback' => array( $i13_woo_recpatcha, 'i13woo_extra_checkout_fields' ),
+				],
+				[
+					'hook'     => 'woocommerce_review_order_before_submit',
+					'callback' => array( $i13_woo_recpatcha, 'i13woo_extra_checkout_fields' ),
+				],
+				[
+					'hook'     => 'woocommerce_pay_order_before_submit',
+					'callback' => array( $i13_woo_recpatcha, 'i13woo_extra_checkout_fields_pay_order' ),
+				],
+				[
+					'hook'     => 'woocommerce_proceed_to_checkout',
+					'callback' => array( $i13_woo_recpatcha, 'i13_woocommerce_payment_request_btn_captcha' ),
+				],
+				[
+					'hook'     => 'wp_head',
+					'callback' => array( $i13_woo_recpatcha, 'i13_add_header_metadata' ),
+				]
+			);
+		}
+		/**
+		 * Filters the hooks to remove from the modal checkout.
+		 *
+		 * @param string[] $remove_list Array of hooks to remove.
+		 */
+		$remove_list = apply_filters( 'newspack_blocks_modal_checkout_remove_hooks', $remove_list );
+
+		foreach ( $remove_list as $remove ) {
+			$priority = has_action( $remove['hook'], $remove['callback'] );
+			remove_action( $remove['hook'], $remove['callback'], $priority );
+		}
+	}
+
 	/**
 	 * Enqueue script for triggering modal checkout.
 	 *

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.5.0-alpha.1
+ * Version:         4.5.0-alpha.2
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.5.0-alpha.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.5.0-alpha.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.5.0-alpha.1",
+	"version": "4.5.0-alpha.2",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",
 		"@testing-library/dom": "^10.4.0",
 		"@testing-library/user-event": "^14.5.2",
 		"@types/lodash": "^4.17.13",
-		"@wordpress/browserslist-config": "^6.12.0",
+		"@wordpress/browserslist-config": "^6.13.0",
 		"eslint": "^8.57.0",
 		"fetch-mock-jest": "^1.5.1",
 		"html-entities": "^2.5.2",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf94ddc2ae56c5564144708d848ad7102::getLoader();
+return ComposerAutoloaderInit9cf72cc5e9f4758dc4883197b4537854::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitf94ddc2ae56c5564144708d848ad7102
+class ComposerAutoloaderInit9cf72cc5e9f4758dc4883197b4537854
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitf94ddc2ae56c5564144708d848ad7102
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf94ddc2ae56c5564144708d848ad7102', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9cf72cc5e9f4758dc4883197b4537854', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitf94ddc2ae56c5564144708d848ad7102', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9cf72cc5e9f4758dc4883197b4537854', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitf94ddc2ae56c5564144708d848ad7102::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit9cf72cc5e9f4758dc4883197b4537854::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitf94ddc2ae56c5564144708d848ad7102
+class ComposerStaticInit9cf72cc5e9f4758dc4883197b4537854
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitf94ddc2ae56c5564144708d848ad7102
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitf94ddc2ae56c5564144708d848ad7102::$classMap;
+            $loader->classMap = ComposerStaticInit9cf72cc5e9f4758dc4883197b4537854::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '450e4e39144615404442794868b5c1f314a9daa7',
+        'reference' => '80e5b3c53b60702a44395bd1d3326267a250caae',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '450e4e39144615404442794868b5c1f314a9daa7',
+            'reference' => '80e5b3c53b60702a44395bd1d3326267a250caae',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),