Merge branch 'trunk' into release/9.9.0

Author: Tarun Vijwani

assets/js/blocks/cart-checkout-shared/editor-utils.ts

@@ -2,18 +2,45 @@
  * External dependencies
  */
 import { getBlockTypes } from '@wordpress/blocks';
+import { applyCheckoutFilter } from '@woocommerce/blocks-checkout';
+import { CART_STORE_KEY } from '@woocommerce/block-data';
+import { select } from '@wordpress/data';
 
 // List of core block types to allow in inner block areas.
 const coreBlockTypes = [ 'core/paragraph', 'core/image', 'core/separator' ];
 
 /**
  * Gets a list of allowed blocks types under a specific parent block type.
  */
-export const getAllowedBlocks = ( block: string ): string[] => [
-	...getBlockTypes()
-		.filter( ( blockType ) =>
-			( blockType?.parent || [] ).includes( block )
-		)
-		.map( ( { name } ) => name ),
-	...coreBlockTypes,
-];
+export const getAllowedBlocks = ( block: string ): string[] => {
+	const additionalCartCheckoutInnerBlockTypes = applyCheckoutFilter( {
+		filterName: 'additionalCartCheckoutInnerBlockTypes',
+		defaultValue: [],
+		extensions: select( CART_STORE_KEY ).getCartData().extensions,
+		arg: { block },
+		validation: ( value ) => {
+			if (
+				Array.isArray( value ) &&
+				value.every( ( item ) => typeof item === 'string' )
+			) {
+				return true;
+			}
+			throw new Error(
+				'allowedBlockTypes filters must return an array of strings.'
+			);
+		},
+	} );
+
+	// Convert to set here so that we remove duplicated block types.
+	return Array.from(
+		new Set( [
+			...getBlockTypes()
+				.filter( ( blockType ) =>
+					( blockType?.parent || [] ).includes( block )
+				)
+				.map( ( { name } ) => name ),
+			...coreBlockTypes,
+			...additionalCartCheckoutInnerBlockTypes,
+		] )
+	);
+};

assets/js/blocks/checkout/block.json

@@ -38,5 +38,6 @@
 		}
 	},
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/block.json

@@ -23,5 +23,6 @@
 	},
 	"parent": [ "woocommerce/mini-cart-contents" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/block.json

@@ -23,5 +23,6 @@
 	},
 	"parent": [ "woocommerce/mini-cart-contents" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-cart-button-block/block.json

@@ -37,5 +37,6 @@
 	],
 	"parent": [ "woocommerce/mini-cart-footer-block" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-checkout-button-block/block.json

@@ -39,5 +39,6 @@
 		"woocommerce/mini-cart-footer-block"
 	],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/block.json

@@ -23,5 +23,6 @@
 	},
 	"parent": [ "woocommerce/filled-mini-cart-contents-block" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-items-block/block.json

@@ -23,5 +23,6 @@
 	},
 	"parent": [ "woocommerce/filled-mini-cart-contents-block" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-products-table-block/block.json

@@ -23,5 +23,6 @@
 	},
 	"parent": [ "woocommerce/mini-cart-items-block" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-shopping-button-block/block.json

@@ -37,5 +37,6 @@
 	],
 	"parent": [ "woocommerce/empty-mini-cart-contents-block" ],
 	"textdomain": "woo-gutenberg-products-block",
-	"apiVersion": 2
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
 }