Release: 8.7.4

assets/js/blocks/cart-checkout-shared/use-forced-layout.ts

@@ -6,7 +6,6 @@ import {
 	useRef,
 	useCallback,
 	useMemo,
-	useState,
 } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
@@ -42,8 +41,6 @@ export const useForcedLayout = ( {
 } ): void => {
 	const currentRegisteredBlocks = useRef( registeredBlocks );
 	const currentDefaultTemplate = useRef( defaultTemplate );
-	const [ forcedBlocksInserted, setForcedBlocksInserted ] =
-		useState< number >( 0 );
 
 	const { insertBlock, replaceInnerBlocks } =
 		useDispatch( 'core/block-editor' );
@@ -58,18 +55,17 @@ export const useForcedLayout = ( {
 				),
 			};
 		},
-		[ clientId, currentRegisteredBlocks.current, forcedBlocksInserted ]
+		[ clientId, currentRegisteredBlocks.current ]
 	);
 
 	const appendBlock = useCallback(
 		( block, position ) => {
 			const newBlock = createBlock( block.name );
 			insertBlock( newBlock, position, clientId, false );
-			setForcedBlocksInserted( forcedBlocksInserted + 1 );
 		},
 		// We need to skip insertBlock here due to a cache issue in wordpress.com that causes an inifinite loop, see https://github.com/Automattic/wp-calypso/issues/66092 for an expanded doc.
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[ clientId, forcedBlocksInserted ]
+		[ clientId ]
 	);
 
 	const lockedBlockTypes = useMemo(

docs/internal-developers/testing/releases/874.md

@@ -0,0 +1,13 @@
+# Testing notes and ZIP for release 8.7.4
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/9840267/woocommerce-gutenberg-products-block.zip)
+
+## Feature plugin and package inclusion in WooCommerce
+
+### Compatibility fix for Cart and Checkout inner blocks for WordPress 6.1. ([7447](https://github.com/woocommerce/woocommerce-blocks/pull/7447))
+
+#### User Facing Testing
+
+1. Install latest Gutenberg plugin or WordPress 6.1.
+2. Install WooCommerce Gift Cards, or grab this plugin: [extension-for-testing.zip](https://github.com/woocommerce/woocommerce-blocks/files/9839394/extension-for-testing.1.zip)
+3. Add a new page. Add the Checkout block. Ensure the `Contact information` section loads, and ensure you do not see any errors where blocks should appear, both on the editor and the published checkout page.

docs/internal-developers/testing/releases/README.md

@@ -95,6 +95,7 @@ Every release includes specific testing instructions for new features and bug fi
     -   [8.7.1](./871.md)
     -   [8.7.2](./872.md)
     -   [8.7.3](./873.md)
+    -   [8.7.4](./874.md)
 
 <!-- FEEDBACK -->
 

readme.txt

@@ -80,10 +80,15 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 8.7.4 - 2022-10-21 =
+
+#### Bug fixes
+- Compatibility fix for Cart and Checkout inner blocks for WordPress 6.1. ([7447](https://github.com/woocommerce/woocommerce-blocks/pull/7447))
+
 = 8.7.3 - 2022-10-20 =
 
 #### Bug fixes
-- Fixed an issue where the argument passed to `canMakePayment` contained the incorrect keys. Also fixed the current user's customer data appearing in the editor when editing the Checkout block.
+- Fixed an issue where the argument passed to `canMakePayment` contained the incorrect keys. Also fixed the current user's customer data appearing in the editor when editing the Checkout block. ([7434](https://github.com/woocommerce/woocommerce-blocks/pull/7434))
 
 = 8.7.2 - 2022-10-13 =