From 4b8a142a241d96b420caf62f774fe1fee923454e Mon Sep 17 00:00:00 2001
From: Saad Tarhi <saad.trh@gmail.com>
Date: Mon, 7 Nov 2022 17:36:33 +0100
Subject: [PATCH 1/3] Fix CartCrossSellsBlock inspector's translation

---
 .../inner-blocks/cart-cross-sells-block/block.json |  1 +
 .../inner-blocks/cart-cross-sells-block/index.tsx  |  3 +--
 src/BlockTypes/Cart.php                            |  1 +
 src/BlockTypes/CartCrossSellsBlock.php             | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 src/BlockTypes/CartCrossSellsBlock.php

diff --git a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/block.json b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/block.json
index 4fd84e1420e..8ddaae21761 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/block.json
+++ b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/block.json
@@ -13,5 +13,6 @@
 	},
 	"parent": [ "woocommerce/cart-items-block" ],
 	"textdomain": "woo-gutenberg-products-block",
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2
 }
diff --git a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/index.tsx b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/index.tsx
index 60630fb161a..8551d3d897b 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/index.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/index.tsx
@@ -8,9 +8,8 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+registerBlockType( 'woocommerce/cart-cross-sells-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/src/BlockTypes/Cart.php b/src/BlockTypes/Cart.php
index 7ba966669a4..510d1017888 100644
--- a/src/BlockTypes/Cart.php
+++ b/src/BlockTypes/Cart.php
@@ -278,6 +278,7 @@ public static function get_cart_block_types() {
 			'CartOrderSummaryFeeBlock',
 			'CartOrderSummaryHeadingBlock',
 			'CartOrderSummaryShippingBlock',
+			'CartCrossSellsBlock',
 		];
 	}
 }
diff --git a/src/BlockTypes/CartCrossSellsBlock.php b/src/BlockTypes/CartCrossSellsBlock.php
new file mode 100644
index 00000000000..0b8da0aa788
--- /dev/null
+++ b/src/BlockTypes/CartCrossSellsBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * CartCrossSellsBlock class.
+ */
+class CartCrossSellsBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'cart-cross-sells-block';
+}

From d8aaffda2c4b5a9e9d4520a2f6a1efab8a4c36c2 Mon Sep 17 00:00:00 2001
From: Saad Tarhi <saad.trh@gmail.com>
Date: Mon, 7 Nov 2022 17:41:35 +0100
Subject: [PATCH 2/3] Fix CartCrossSellsProductsBlock inspector's translation

---
 .../cart-cross-sells-products/block.json           |  1 +
 .../cart-cross-sells-products/index.tsx            |  3 +--
 src/BlockTypes/Cart.php                            |  1 +
 src/BlockTypes/CartCrossSellsProductsBlock.php     | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 src/BlockTypes/CartCrossSellsProductsBlock.php

diff --git a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/block.json b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/block.json
index f12c4b3abf0..a2dce15c648 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/block.json
+++ b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/block.json
@@ -27,5 +27,6 @@
 	},
 	"parent": [ "woocommerce/cart-cross-sells-block" ],
 	"textdomain": "woo-gutenberg-products-block",
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2
 }
diff --git a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/index.tsx b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/index.tsx
index 60630fb161a..552ad127e34 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/index.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/index.tsx
@@ -8,9 +8,8 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+registerBlockType( 'woocommerce/cart-cross-sells-products-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/src/BlockTypes/Cart.php b/src/BlockTypes/Cart.php
index 510d1017888..c5a7a85d9a7 100644
--- a/src/BlockTypes/Cart.php
+++ b/src/BlockTypes/Cart.php
@@ -279,6 +279,7 @@ public static function get_cart_block_types() {
 			'CartOrderSummaryHeadingBlock',
 			'CartOrderSummaryShippingBlock',
 			'CartCrossSellsBlock',
+			'CartCrossSellsProductsBlock',
 		];
 	}
 }
diff --git a/src/BlockTypes/CartCrossSellsProductsBlock.php b/src/BlockTypes/CartCrossSellsProductsBlock.php
new file mode 100644
index 00000000000..eb4ca5cce21
--- /dev/null
+++ b/src/BlockTypes/CartCrossSellsProductsBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * CartCrossSellsProductsBlock class.
+ */
+class CartCrossSellsProductsBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'cart-cross-sells-products-block';
+}

From a2db1caa6a6a231ecaab0de0aac59b336c721bdf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 17:17:48 +0000
Subject: [PATCH 3/3] bot: update checkstyle.xml

---
 checkstyle.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 97f819fa1c6..c22f3f5b5ed 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -2381,26 +2381,25 @@
       Type &apos;{ icon: { src: Element; }; edit: ({ attributes, }: { attributes: { className: string; }; }) =&gt; Element; save: () =&gt; Element; }&apos; is missing the following properties from type &apos;Pick&lt;Block&lt;{ className: string; }&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;: title, category, attributes" source="TS2769" />
 </file>
 <file name="assets/js/blocks/cart/inner-blocks/cart-cross-sells-block/index.tsx">
-<error line="13" column="20" severity="error" message="No overload matches this call.
+<error line="12" column="1" severity="error" message="No overload matches this call.
   Overload 1 of 2, &apos;(metadata: BlockConfiguration&lt;{}&gt;, settings?: Partial&lt;BlockConfiguration&lt;{}&gt;&gt; | undefined): Block&lt;{}&gt; | undefined&apos;, gave the following error.
-    Argument of type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{}&gt;&apos;.
-      Property &apos;attributes&apos; is missing in type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; but required in type &apos;Pick&lt;Block&lt;{}&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;.
+    Argument of type &apos;string&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{}&gt;&apos;.
+      Type &apos;string&apos; is not assignable to type &apos;Pick&lt;Block&lt;{}&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;.
   Overload 2 of 2, &apos;(name: string, settings: BlockConfiguration&lt;{}&gt;): Block&lt;{}&gt; | undefined&apos;, gave the following error.
-    Argument of type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; is not assignable to parameter of type &apos;string&apos;." source="TS2769" />
+    Argument of type &apos;{ icon: { src: JSX.Element; }; edit: () =&gt; JSX.Element; save: () =&gt; JSX.Element; }&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{}&gt;&apos;.
+      Type &apos;{ icon: { src: Element; }; edit: () =&gt; Element; save: () =&gt; Element; }&apos; is missing the following properties from type &apos;Pick&lt;Block&lt;{}&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;: title, category, attributes" source="TS2769" />
 </file>
 <file name="assets/js/blocks/cart/cart-cross-sells-product-list/cart-cross-sells-product.tsx">
 <error line="51" column="8" severity="error" message="Type &apos;{}&apos; is missing the following properties from type &apos;BlockAttributes&apos;: productId, align" source="TS2739" />
 </file>
 <file name="assets/js/blocks/cart/inner-blocks/cart-cross-sells-products/index.tsx">
-<error line="13" column="20" severity="error" message="No overload matches this call.
+<error line="12" column="1" severity="error" message="No overload matches this call.
   Overload 1 of 2, &apos;(metadata: BlockConfiguration&lt;{ className?: string; columns: number; }&gt;, settings?: Partial&lt;BlockConfiguration&lt;{ className?: string; columns: number; }&gt;&gt; | undefined): Block&lt;...&gt; | undefined&apos;, gave the following error.
-    Argument of type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; lock: boolean; }; attributes: { ...; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{ className?: string; columns: number; }&gt;&apos;.
-      Type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; lock: boolean; }; attributes: { ...; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; is not assignable to type &apos;Partial&lt;Omit&lt;Block&lt;{ className?: string; columns: number; }&gt;, &quot;icon&quot;&gt;&gt;&apos;.
-        The types of &apos;attributes.columns&apos; are incompatible between these types.
-          Type &apos;{ type: string; default: number; }&apos; is not assignable to type &apos;BlockAttribute&lt;number&gt;&apos;.
-            Type &apos;{ type: string; default: number; }&apos; is missing the following properties from type &apos;Query&lt;number&gt;&apos;: source, selector, query
+    Argument of type &apos;string&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{ className?: string; columns: number; }&gt;&apos;.
+      Type &apos;string&apos; is not assignable to type &apos;Pick&lt;Block&lt;{ className?: string; columns: number; }&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;.
   Overload 2 of 2, &apos;(name: string, settings: BlockConfiguration&lt;{ className?: string; columns: number; }&gt;): Block&lt;{ className?: string; columns: number; }&gt; | undefined&apos;, gave the following error.
-    Argument of type &apos;{ name: string; version: string; title: string; description: string; category: string; supports: { align: boolean; html: boolean; multiple: boolean; reusable: boolean; inserter: boolean; lock: boolean; }; attributes: { ...; }; parent: string[]; textdomain: string; apiVersion: number; }&apos; is not assignable to parameter of type &apos;string&apos;." source="TS2769" />
+    Argument of type &apos;{ icon: { src: JSX.Element; }; edit: ({ attributes, setAttributes }: Props) =&gt; JSX.Element; save: () =&gt; JSX.Element; }&apos; is not assignable to parameter of type &apos;BlockConfiguration&lt;{ className?: string; columns: number; }&gt;&apos;.
+      Type &apos;{ icon: { src: Element; }; edit: ({ attributes, setAttributes }: Props) =&gt; Element; save: () =&gt; Element; }&apos; is missing the following properties from type &apos;Pick&lt;Block&lt;{ className?: string; columns: number; }&gt;, &quot;title&quot; | &quot;category&quot; | &quot;attributes&quot;&gt;&apos;: title, category, attributes" source="TS2769" />
 </file>
 <file name="assets/js/blocks/cart/inner-blocks/cart-totals-block/index.tsx">
 <error line="12" column="1" severity="error" message="No overload matches this call.