From 59ff006eb726908bbc25fac1eae7249c3b424fc2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:14:57 +0200
Subject: [PATCH] Release: 10.6.2 (#10407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: WooCommerce Blocks causing malfunction of the navigation block on WordPress 6.3 (#10388)

* Make sure the revert button is registered and enqueued for usage exclusively in the site editor.

* Register and enqueue the styles for the revert button.

* Rename the files.

* Revert "Rename the file renames."

This reverts commit c0330ce70fec20bea1f957eddcf458881e16242c.

* Add plugin-proposal-optional-chaining to the WebPack plugins config.

* Rename the files.

* Remove unnecessary dependencies as those are already provided via : more specifically, get_script_data.

* Address CR.

* Cart and Checkout Page Migration: Inherit Page template and fix rendering (#10375)

* Change shortcode block render callback

* Inherit template from original "page" template

* Check if WordPress version is higher than 6.2.2 to make Products block compatible with Gutenberg 16+ (#10360)

* Check if WordPress version is higher than 6.2.2 to make Products block compatible with Gutenberg 16+

* Extract the logic of checking the post template support for grid view toi separate function

* Change the versions comparison and improve description of custom version compare function

* Render Checkout/Cart containing pages without template overriding (#10359)

* Render Checkout/Cart containing pages without template overriding

* Fix checkout typo

---------

Co-authored-by: Mike Jolley <mike.jolley@me.com>

* Add to cart form: Fix fatal error when missing `product` param in add_to_cart_redirect_filter (#10316)

* Transform product param optional in add_to_cart_redirect_filter method

* Remove unnecessary argument from add_to_cart_redirect_filter

* Remove mocked filter call

* Remove unnecessary argument from function docs

* Remove opinionated styles from Product Hero pattern (#10255)

* Mini Cart: Remove deprecated print_inline_script() (#10165)

* Mini Cart: Replace the deprecated print_inline_script() with supported get_inline_script_data(). Fixes #10004

* Mini Cart: Add version check for the new get_inline_script_data() function

* Update the variable names and fix a typo

* Mini Cart: Add regex to check for the WP version

* Abstract the WP version comparison regex to a separate Utils class

* Call wc_setup_product_data if the global product variable is not an instance of WC_Product. (#10128)

* Empty commit for release pull request

* add testing instructions

* Per block stylesheets (#9831)

* Clean up blank lines

* Update Webpack config

* Update PHP logic to load block styles

* Style fixes

* Style fixes (II)

* Style fixes (III)

* Style fixes (IV)

* Fix missing stylesheets in the Site Editor

* Fix wrong return values in some PHP method docs

* Fix missing ProductPrice stylesheet causing 404 in tests

* Fix missing ProductGallery stylesheet causing 404 in tests

* update testing instructions

* add zip link

* update version

* update zip link

* remove screenshot

* remove testing instructions

* Register Legacy block for all taxonomy-product_ template (#10382)

* WIP

* improve logic

* improve unit test

* $post validation on Cart and Checkout template (#10410)

Co-authored-by: Luigi Teschio <gigitux@gmail.com>

* Update zip

---------

Co-authored-by: Patricia Hillebrandt <patriciahillebrandt@gmail.com>
Co-authored-by: Mike Jolley <mike.jolley@me.com>
Co-authored-by: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Co-authored-by: Paulo Arromba <17236129+wavvves@users.noreply.github.com>
Co-authored-by: Alexandre Lara <allexandrelara@gmail.com>
Co-authored-by: Albert Juhé Lluveras <contact@albertjuhe.com>
Co-authored-by: Daniel Dudzic <daniel.dudzic@automattic.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Luigi <gigitux@gmail.com>
---
 assets/css/style.scss                         |   1 -
 .../blocks/product-elements/price/block.tsx   |   1 -
 .../blocks/product-elements/price/style.scss  |  11 --
 .../product-details/block.tsx                 |   4 -
 .../product-details/index.tsx                 |   1 +
 .../product-reviews/block.tsx                 |   4 -
 .../product-reviews/index.tsx                 |   1 +
 .../blocks/product-elements/rating/block.tsx  |   5 -
 .../base/components/country-input/style.scss  |   4 +
 .../components/form-token-field/vendor.scss   |   1 +
 .../base/components/product-price/style.scss  |  12 ++
 .../base/components/product-rating/index.tsx  |   1 +
 .../components/product-rating}/style.scss     |   0
 assets/js/blocks/breadcrumbs/index.tsx        |   1 +
 .../payment-methods/payment-methods.js        |   1 +
 .../cart-cross-sells-products/index.tsx       |   1 +
 .../inner-blocks/cart-totals-block/edit.tsx   |   1 -
 .../inner-blocks/cart-totals-block/index.tsx  |   1 +
 .../inner-blocks/empty-cart-block/edit.tsx    |   1 -
 .../inner-blocks/empty-cart-block/index.tsx   |   1 +
 .../proceed-to-checkout-block/block.tsx       |   1 -
 .../proceed-to-checkout-block/index.tsx       |   1 +
 .../proceed-to-checkout-block/style.scss      |   1 -
 assets/js/blocks/catalog-sorting/index.tsx    |   1 +
 .../checkout-actions-block/block.tsx          |   2 +-
 .../checkout-actions-block/index.tsx          |   1 +
 .../checkout-fields-block/frontend.tsx        |   5 -
 .../checkout-fields-block/index.tsx           |   1 +
 .../checkout-order-note-block/index.tsx       |   1 +
 .../checkout-order-note-block}/style.scss     |   2 +-
 .../checkout-payment-block/block.tsx          |   4 -
 .../checkout-pickup-options-block/block.tsx   |   1 -
 .../checkout-pickup-options-block/index.tsx   |   1 +
 .../checkout-shipping-method-block/block.tsx  |   1 -
 .../checkout-shipping-method-block/index.tsx  |   1 +
 .../checkout-shipping-methods-block/block.tsx |   5 -
 .../checkout-shipping-methods-block/index.tsx |   1 +
 .../checkout-terms-block/frontend.tsx         |   1 -
 .../checkout-terms-block/index.tsx            |   2 +
 .../checkout-totals-block/frontend.tsx        |   5 -
 .../checkout-totals-block/index.tsx           |   1 +
 .../js/blocks/checkout/order-notes/index.tsx  |   5 -
 .../js/blocks/classic-template/constants.ts   |   9 +
 .../js/blocks/classic-template/test/utils.ts  |  38 ++--
 assets/js/blocks/customer-account/index.tsx   |   1 +
 .../js/blocks/product-results-count/index.tsx |   1 +
 assets/js/blocks/product-tag/index.tsx        |   2 +-
 assets/js/blocks/product-template/index.tsx   |   1 +
 .../search-list-control.tsx                   |   1 +
 assets/js/index.js                            |   1 -
 bin/webpack-configs.js                        | 165 +++++++++++++-----
 bin/webpack-entries.js                        |  42 ++---
 composer.json                                 |   2 +-
 .../testing/releases/1062.md                  |  60 +++++++
 .../testing/releases/README.md                |   1 +
 package-lock.json                             |   4 +-
 package.json                                  |   5 +-
 .../components/checkbox-control/style.scss    |   2 +-
 patterns/product-hero.php                     |  22 +--
 readme.txt                                    |  18 +-
 src/Assets/Api.php                            |  17 +-
 src/AssetsController.php                      |  25 ++-
 src/BlockTemplatesController.php              |  89 ++++++++--
 src/BlockTypes/AbstractBlock.php              |   7 +-
 src/BlockTypes/AbstractInnerBlock.php         |   8 +
 src/BlockTypes/AbstractProductGrid.php        |  10 ++
 src/BlockTypes/AddToCartForm.php              |  14 +-
 src/BlockTypes/AttributeFilter.php            |   9 +
 src/BlockTypes/Cart.php                       |   9 +
 src/BlockTypes/Checkout.php                   |   9 +
 src/BlockTypes/ClassicTemplate.php            |   8 +
 src/BlockTypes/FilterWrapper.php              |   9 +
 src/BlockTypes/MiniCart.php                   |  22 ++-
 src/BlockTypes/MiniCartContents.php           |   9 +
 src/BlockTypes/ProceedToCheckoutBlock.php     |   1 -
 src/BlockTypes/ProductCollection.php          |   9 +
 src/BlockTypes/ProductGallery.php             |   9 +
 src/BlockTypes/ProductPrice.php               |   9 +
 src/BlockTypes/ProductQuery.php               |  38 ++--
 src/BlockTypes/ProductRating.php              |   9 +
 src/BlockTypes/RatingFilter.php               |   9 +
 src/BlockTypes/RelatedProducts.php            |  11 +-
 src/BlockTypes/StockFilter.php                |   9 +
 src/BlockTypes/StoreNotices.php               |   9 +
 src/Package.php                               |   2 +-
 src/Templates/CartTemplate.php                |   3 +-
 src/Templates/CheckoutTemplate.php            |   3 +-
 src/Utils/Utils.php                           |  27 +++
 webpack.config.js                             |  10 ++
 woocommerce-gutenberg-products-block.php      |   3 +-
 90 files changed, 664 insertions(+), 214 deletions(-)
 delete mode 100644 assets/js/atomic/blocks/product-elements/price/style.scss
 rename assets/js/{atomic/blocks/product-elements/rating => base/components/product-rating}/style.scss (100%)
 rename assets/js/blocks/checkout/{order-notes => inner-blocks/checkout-order-note-block}/style.scss (79%)
 create mode 100644 docs/internal-developers/testing/releases/1062.md
 create mode 100644 src/Utils/Utils.php

diff --git a/assets/css/style.scss b/assets/css/style.scss
index 68c0cd14e91..756c24984ec 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -337,7 +337,6 @@
 	@include visually-hidden-focus-reveal();
 }
 
-
 .wp-block-group.woocommerce.product .up-sells.upsells.products {
 	max-width: var(--wp--style--global--wide-size);
 }
diff --git a/assets/js/atomic/blocks/product-elements/price/block.tsx b/assets/js/atomic/blocks/product-elements/price/block.tsx
index 8561b00c3d6..3f66056631b 100644
--- a/assets/js/atomic/blocks/product-elements/price/block.tsx
+++ b/assets/js/atomic/blocks/product-elements/price/block.tsx
@@ -17,7 +17,6 @@ import type { HTMLAttributes } from 'react';
  * Internal dependencies
  */
 import type { BlockAttributes } from './types';
-import './style.scss';
 
 type Props = BlockAttributes & HTMLAttributes< HTMLDivElement >;
 
diff --git a/assets/js/atomic/blocks/product-elements/price/style.scss b/assets/js/atomic/blocks/product-elements/price/style.scss
deleted file mode 100644
index 5ff42437d25..00000000000
--- a/assets/js/atomic/blocks/product-elements/price/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.wc-block-components-product-price {
-	display: block;
-
-	.wc-block-all-products & {
-		margin-bottom: $gap-small;
-	}
-
-	ins {
-		text-decoration: none;
-	}
-}
diff --git a/assets/js/atomic/blocks/product-elements/product-details/block.tsx b/assets/js/atomic/blocks/product-elements/product-details/block.tsx
index 74c46267b3a..2d2f95bfd03 100644
--- a/assets/js/atomic/blocks/product-elements/product-details/block.tsx
+++ b/assets/js/atomic/blocks/product-elements/product-details/block.tsx
@@ -5,10 +5,6 @@ import classnames from 'classnames';
 import { __ } from '@wordpress/i18n';
 import { useBlockProps } from '@wordpress/block-editor';
 
-/**
- * Internal dependencies
- */
-
 interface SingleProductTab {
 	id: string;
 	title: string;
diff --git a/assets/js/atomic/blocks/product-elements/product-details/index.tsx b/assets/js/atomic/blocks/product-elements/product-details/index.tsx
index 0c3e05a1747..4a71b9963ae 100644
--- a/assets/js/atomic/blocks/product-elements/product-details/index.tsx
+++ b/assets/js/atomic/blocks/product-elements/product-details/index.tsx
@@ -10,6 +10,7 @@ import { productDetails } from '@woocommerce/icons';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 registerBlockSingleProductTemplate( {
 	blockName: metadata.name,
diff --git a/assets/js/atomic/blocks/product-elements/product-reviews/block.tsx b/assets/js/atomic/blocks/product-elements/product-reviews/block.tsx
index 965cd18f8a0..da8d08aee9a 100644
--- a/assets/js/atomic/blocks/product-elements/product-reviews/block.tsx
+++ b/assets/js/atomic/blocks/product-elements/product-reviews/block.tsx
@@ -9,10 +9,6 @@ import { __ } from '@wordpress/i18n';
 import { useBlockProps } from '@wordpress/block-editor';
 import { Notice } from '@wordpress/components';
 
-/**
- * Internal dependencies
- */
-
 export const ProductReviews = () => {
 	const blockProps = useBlockProps();
 
diff --git a/assets/js/atomic/blocks/product-elements/product-reviews/index.tsx b/assets/js/atomic/blocks/product-elements/product-reviews/index.tsx
index 20cbbe7ecd1..3dd9446baee 100644
--- a/assets/js/atomic/blocks/product-elements/product-reviews/index.tsx
+++ b/assets/js/atomic/blocks/product-elements/product-reviews/index.tsx
@@ -8,6 +8,7 @@ import { registerBlockSingleProductTemplate } from '@woocommerce/atomic-utils';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 registerBlockSingleProductTemplate( {
 	blockName: metadata.name,
diff --git a/assets/js/atomic/blocks/product-elements/rating/block.tsx b/assets/js/atomic/blocks/product-elements/rating/block.tsx
index cd1dded900b..a113e573f79 100644
--- a/assets/js/atomic/blocks/product-elements/rating/block.tsx
+++ b/assets/js/atomic/blocks/product-elements/rating/block.tsx
@@ -11,11 +11,6 @@ import { useStyleProps } from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 import { isNumber, ProductResponseItem } from '@woocommerce/types';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 type RatingProps = {
 	reviews: number;
 	rating: number;
diff --git a/assets/js/base/components/country-input/style.scss b/assets/js/base/components/country-input/style.scss
index 576951e4ba6..003c302203e 100644
--- a/assets/js/base/components/country-input/style.scss
+++ b/assets/js/base/components/country-input/style.scss
@@ -1,3 +1,7 @@
+@import "node_modules/@wordpress/base-styles/breakpoints";
+@import "node_modules/@wordpress/base-styles/mixins";
+@import "node_modules/wordpress-components/src/combobox-control/style";
+
 .wc-block-components-country-input {
 	margin-top: em($gap-large);
 }
diff --git a/assets/js/base/components/form-token-field/vendor.scss b/assets/js/base/components/form-token-field/vendor.scss
index 1da6718e9c3..273d47af58c 100644
--- a/assets/js/base/components/form-token-field/vendor.scss
+++ b/assets/js/base/components/form-token-field/vendor.scss
@@ -8,5 +8,6 @@
 	@import "node_modules/@wordpress/base-styles/mixins";
 	@import "node_modules/wordpress-components/src/popover/style";
 	@import "node_modules/wordpress-components/src/tooltip/style";
+	@import "node_modules/wordpress-components/src/form-token-field/style";
 	/* stylelint-enable no-invalid-position-at-import-rule */
 }
diff --git a/assets/js/base/components/product-price/style.scss b/assets/js/base/components/product-price/style.scss
index e3b7db30178..8e72d6413e8 100644
--- a/assets/js/base/components/product-price/style.scss
+++ b/assets/js/base/components/product-price/style.scss
@@ -13,6 +13,18 @@
 }
 /*rtl:end:ignore*/
 
+.wc-block-components-product-price {
+	display: block;
+
+	.wc-block-all-products .wc-block-components-product-price {
+		margin-bottom: $gap-small;
+	}
+
+	ins {
+		text-decoration: none;
+	}
+}
+
 .wc-block-components-product-price__value {
 	&.is-discounted {
 		margin-left: 0.5em;
diff --git a/assets/js/base/components/product-rating/index.tsx b/assets/js/base/components/product-rating/index.tsx
index bc391b3fe70..5b9bd6a91e1 100644
--- a/assets/js/base/components/product-rating/index.tsx
+++ b/assets/js/base/components/product-rating/index.tsx
@@ -7,6 +7,7 @@ import { __, sprintf } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
+import './style.scss';
 
 const Rating = ( {
 	className,
diff --git a/assets/js/atomic/blocks/product-elements/rating/style.scss b/assets/js/base/components/product-rating/style.scss
similarity index 100%
rename from assets/js/atomic/blocks/product-elements/rating/style.scss
rename to assets/js/base/components/product-rating/style.scss
diff --git a/assets/js/blocks/breadcrumbs/index.tsx b/assets/js/blocks/breadcrumbs/index.tsx
index 194aa54e9ad..ee6d49066b5 100644
--- a/assets/js/blocks/breadcrumbs/index.tsx
+++ b/assets/js/blocks/breadcrumbs/index.tsx
@@ -10,6 +10,7 @@ import { Icon, queryPagination } from '@wordpress/icons';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 const featurePluginSupport = {
 	...metadata.supports,
diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-methods.js b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-methods.js
index a35312dc3f6..b4b207cfc8b 100644
--- a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-methods.js
+++ b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-methods.js
@@ -12,6 +12,7 @@ import { PAYMENT_STORE_KEY } from '@woocommerce/block-data';
 import NoPaymentMethods from './no-payment-methods';
 import PaymentMethodOptions from './payment-method-options';
 import SavedPaymentMethodOptions from './saved-payment-method-options';
+import './style.scss';
 
 /**
  * PaymentMethods component.
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 552ad127e34..1b303359d4a 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,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/cart-cross-sells-products-block', {
 	icon: {
diff --git a/assets/js/blocks/cart/inner-blocks/cart-totals-block/edit.tsx b/assets/js/blocks/cart/inner-blocks/cart-totals-block/edit.tsx
index 6707e86914f..f78a07ee392 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-totals-block/edit.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-totals-block/edit.tsx
@@ -9,7 +9,6 @@ import type { TemplateArray } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import './style.scss';
 import {
 	useForcedLayout,
 	getAllowedBlocks,
diff --git a/assets/js/blocks/cart/inner-blocks/cart-totals-block/index.tsx b/assets/js/blocks/cart/inner-blocks/cart-totals-block/index.tsx
index 0cb78ff525f..d5f041722d3 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-totals-block/index.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-totals-block/index.tsx
@@ -8,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/cart-totals-block', {
 	icon: {
diff --git a/assets/js/blocks/cart/inner-blocks/empty-cart-block/edit.tsx b/assets/js/blocks/cart/inner-blocks/empty-cart-block/edit.tsx
index d55c95784ea..2eecb03f2c1 100644
--- a/assets/js/blocks/cart/inner-blocks/empty-cart-block/edit.tsx
+++ b/assets/js/blocks/cart/inner-blocks/empty-cart-block/edit.tsx
@@ -15,7 +15,6 @@ import {
 	useForcedLayout,
 	getAllowedBlocks,
 } from '../../../cart-checkout-shared';
-import './style.scss';
 
 const browseStoreTemplate = SHOP_URL
 	? [
diff --git a/assets/js/blocks/cart/inner-blocks/empty-cart-block/index.tsx b/assets/js/blocks/cart/inner-blocks/empty-cart-block/index.tsx
index 2902049d61e..dc1c28cdb9d 100644
--- a/assets/js/blocks/cart/inner-blocks/empty-cart-block/index.tsx
+++ b/assets/js/blocks/cart/inner-blocks/empty-cart-block/index.tsx
@@ -9,6 +9,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/empty-cart-block', {
 	icon: {
diff --git a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/block.tsx b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/block.tsx
index 6dc2e34644a..760138f9c10 100644
--- a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/block.tsx
+++ b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/block.tsx
@@ -16,7 +16,6 @@ import { useCartEventsContext } from '@woocommerce/base-context/providers';
 /**
  * Internal dependencies
  */
-import './style.scss';
 import { defaultButtonLabel } from './constants';
 
 /**
diff --git a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/index.tsx b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/index.tsx
index ba3058f0776..8ccfdcb9c75 100644
--- a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/index.tsx
+++ b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/index.tsx
@@ -9,6 +9,7 @@ import { registerBlockType } from '@wordpress/blocks';
  */
 import attributes from './attributes';
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/proceed-to-checkout-block', {
 	icon: {
diff --git a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/style.scss b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/style.scss
index 06ef7f37a35..ec97ee8c1d8 100644
--- a/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/style.scss
+++ b/assets/js/blocks/cart/inner-blocks/proceed-to-checkout-block/style.scss
@@ -44,4 +44,3 @@
 		}
 	}
 }
-
diff --git a/assets/js/blocks/catalog-sorting/index.tsx b/assets/js/blocks/catalog-sorting/index.tsx
index b83b17bf6af..0fd0be1eb50 100644
--- a/assets/js/blocks/catalog-sorting/index.tsx
+++ b/assets/js/blocks/catalog-sorting/index.tsx
@@ -10,6 +10,7 @@ import { totals } from '@woocommerce/icons';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 registerBlockType( metadata, {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx
index 6e1302e6816..5896878c053 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx
@@ -17,8 +17,8 @@ import {
 /**
  * Internal dependencies
  */
-import './style.scss';
 import { defaultPlaceOrderButtonLabel } from './constants';
+import './style.scss';
 
 const Block = ( {
 	cartPageId,
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/index.tsx
index 8fe72c17446..8f5712b1b04 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/index.tsx
@@ -10,6 +10,7 @@ import type { BlockConfiguration } from '@wordpress/blocks';
  */
 import attributes from './attributes';
 import { Edit, Save } from './edit';
+import './style.scss';
 
 const blockConfig: BlockConfiguration = {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/frontend.tsx
index 27cbaa28746..ad682af396e 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/frontend.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/frontend.tsx
@@ -4,11 +4,6 @@
 import classnames from 'classnames';
 import { Main } from '@woocommerce/base-components/sidebar-layout';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 const FrontendBlock = ( {
 	children,
 	className,
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/index.tsx
index d78238e3729..b31c89ffad3 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-fields-block/index.tsx
@@ -8,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-fields-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/index.tsx
index 71a1ebfdd70..2696f82b730 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/index.tsx
@@ -8,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-order-note-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/order-notes/style.scss b/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/style.scss
similarity index 79%
rename from assets/js/blocks/checkout/order-notes/style.scss
rename to assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/style.scss
index 02b0c71dc48..5920676ae91 100644
--- a/assets/js/blocks/checkout/order-notes/style.scss
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-order-note-block/style.scss
@@ -17,6 +17,6 @@
 	margin-top: $gap;
 }
 
-.wc-block-checkout__order-notes.wc-block-components-checkout-step {
+.wc-block-components-form .wc-block-checkout__order-notes.wc-block-components-checkout-step {
 	padding-left: 0;
 }
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/block.tsx
index de7f2979e4f..c204a044262 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/block.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/block.tsx
@@ -1,7 +1,3 @@
-/**
- * External dependencies
- */
-
 /**
  * Internal dependencies
  */
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx
index c5fe3756deb..91771f5109e 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx
@@ -26,7 +26,6 @@ import { LocalPickupSelect } from '@woocommerce/base-components/cart-checkout/lo
 /**
  * Internal dependencies
  */
-import './style.scss';
 import ShippingRatesControlPackage from '../../../../base/components/cart-checkout/shipping-rates-control-package';
 
 const getPickupLocation = (
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/index.tsx
index 89a01ceffc5..f173f14e506 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/index.tsx
@@ -9,6 +9,7 @@ import { registerBlockType } from '@wordpress/blocks';
  */
 import { Edit, Save } from './edit';
 import attributes from './attributes';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-pickup-options-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/block.tsx
index b090729fb6f..190cb4fa3f2 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/block.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/block.tsx
@@ -17,7 +17,6 @@ import { isPackageRateCollectable } from '@woocommerce/base-utils';
 /**
  * Internal dependencies
  */
-import './style.scss';
 import { RatePrice, getLocalPickupPrices, getShippingPrices } from './shared';
 import type { minMaxPrices } from './shared';
 import { defaultLocalPickupText, defaultShippingText } from './constants';
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/index.tsx
index 1a0e1859673..6df154b730c 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/index.tsx
@@ -9,6 +9,7 @@ import { registerBlockType } from '@wordpress/blocks';
  */
 import { Edit, Save } from './edit';
 import attributes from './attributes';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-shipping-method-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx
index 68be42ddde5..e0ad9bc0c72 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx
@@ -25,11 +25,6 @@ import type {
 import NoticeBanner from '@woocommerce/base-components/notice-banner';
 import type { ReactElement } from 'react';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 /**
  * Renders a shipping rate control option.
  *
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/index.tsx
index 972723db9e8..cb898b4663a 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/index.tsx
@@ -9,6 +9,7 @@ import { registerBlockType } from '@wordpress/blocks';
  */
 import { Edit, Save } from './edit';
 import attributes from './attributes';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-shipping-methods-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
index b3de54291b9..46ffce5c4cc 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
@@ -14,7 +14,6 @@ import { VALIDATION_STORE_KEY } from '@woocommerce/block-data';
  * Internal dependencies
  */
 import { termsConsentDefaultText, termsCheckboxDefaultText } from './constants';
-import './style.scss';
 
 const FrontendBlock = ( {
 	text,
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/index.tsx
index 60ff1e045de..11d01e0a451 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/index.tsx
@@ -3,10 +3,12 @@
  */
 import { Icon, customPostType } from '@wordpress/icons';
 import { registerBlockType } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-terms-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx
index 504483205a5..43f65fab2ac 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx
@@ -5,11 +5,6 @@ import classnames from 'classnames';
 import { Sidebar } from '@woocommerce/base-components/sidebar-layout';
 import { StoreNoticesContainer } from '@woocommerce/blocks-checkout';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 const FrontendBlock = ( {
 	children,
 	className,
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/index.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/index.tsx
index aa3581bbf9d..95f48f855fc 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/index.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/index.tsx
@@ -8,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
+import './style.scss';
 
 registerBlockType( 'woocommerce/checkout-totals-block', {
 	icon: {
diff --git a/assets/js/blocks/checkout/order-notes/index.tsx b/assets/js/blocks/checkout/order-notes/index.tsx
index e68d616c953..e4345e3c340 100644
--- a/assets/js/blocks/checkout/order-notes/index.tsx
+++ b/assets/js/blocks/checkout/order-notes/index.tsx
@@ -6,11 +6,6 @@ import { useState } from '@wordpress/element';
 import { CheckboxControl } from '@woocommerce/blocks-checkout';
 import { Textarea } from '@woocommerce/base-components/textarea';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 interface CheckoutOrderNotesProps {
 	disabled: boolean;
 	onChange: ( orderNotes: string ) => void;
diff --git a/assets/js/blocks/classic-template/constants.ts b/assets/js/blocks/classic-template/constants.ts
index 92601253e4e..75a49d55da2 100644
--- a/assets/js/blocks/classic-template/constants.ts
+++ b/assets/js/blocks/classic-template/constants.ts
@@ -67,6 +67,15 @@ export const TEMPLATES: TemplateDetails = {
 		),
 		placeholder: PLACEHOLDERS.archiveProduct,
 	},
+	// Since that it is a fallback value, it has to be the last one.
+	'taxonomy-product': {
+		type: TYPES.productTaxonomy,
+		title: __(
+			"WooCommerce Product's Custom Taxonomy Block",
+			'woo-gutenberg-products-block'
+		),
+		placeholder: PLACEHOLDERS.archiveProduct,
+	},
 	'product-search-results': {
 		type: TYPES.productSearchResults,
 		title: __(
diff --git a/assets/js/blocks/classic-template/test/utils.ts b/assets/js/blocks/classic-template/test/utils.ts
index da50d63dd09..6e1da20ffab 100644
--- a/assets/js/blocks/classic-template/test/utils.ts
+++ b/assets/js/blocks/classic-template/test/utils.ts
@@ -1,27 +1,9 @@
 /**
  * Internal dependencies
  */
+import { TEMPLATES } from '../constants';
 import { getTemplateDetailsBySlug } from '../utils';
 
-const TEMPLATES = {
-	'single-product': {
-		title: 'Single Product Title',
-		placeholder: 'Single Product Placeholder',
-	},
-	'archive-product': {
-		title: 'Product Archive Title',
-		placeholder: 'Product Archive Placeholder',
-	},
-	'taxonomy-product_cat': {
-		title: 'Product Taxonomy Title',
-		placeholder: 'Product Taxonomy Placeholder',
-	},
-	'taxonomy-product_attribute': {
-		title: 'Product Attribute Title',
-		placeholder: 'Product Attribute Placeholder',
-	},
-};
-
 describe( 'getTemplateDetailsBySlug', function () {
 	it( 'should return single-product object when given an exact match', () => {
 		expect(
@@ -41,6 +23,24 @@ describe( 'getTemplateDetailsBySlug', function () {
 		).toStrictEqual( TEMPLATES[ 'single-product' ] );
 	} );
 
+	it( 'should return taxonomy-product object when given a partial match', () => {
+		expect(
+			getTemplateDetailsBySlug( 'taxonomy-product_tag', TEMPLATES )
+		).toBeTruthy();
+		expect(
+			getTemplateDetailsBySlug( 'taxonomy-product_tag', TEMPLATES )
+		).toStrictEqual( TEMPLATES[ 'taxonomy-product_tag' ] );
+	} );
+
+	it( 'should return taxonomy-product object when given an exact match', () => {
+		expect(
+			getTemplateDetailsBySlug( 'taxonomy-product_brands', TEMPLATES )
+		).toBeTruthy();
+		expect(
+			getTemplateDetailsBySlug( 'taxonomy-product_brands', TEMPLATES )
+		).toStrictEqual( TEMPLATES[ 'taxonomy-product' ] );
+	} );
+
 	it( 'should return null object when given an incorrect match', () => {
 		expect( getTemplateDetailsBySlug( 'void', TEMPLATES ) ).toBeNull();
 	} );
diff --git a/assets/js/blocks/customer-account/index.tsx b/assets/js/blocks/customer-account/index.tsx
index b1fc7e85f72..3f849b2c0f9 100644
--- a/assets/js/blocks/customer-account/index.tsx
+++ b/assets/js/blocks/customer-account/index.tsx
@@ -11,6 +11,7 @@ import { __ } from '@wordpress/i18n';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 registerBlockType( metadata, {
 	icon: {
diff --git a/assets/js/blocks/product-results-count/index.tsx b/assets/js/blocks/product-results-count/index.tsx
index b83b17bf6af..0fd0be1eb50 100644
--- a/assets/js/blocks/product-results-count/index.tsx
+++ b/assets/js/blocks/product-results-count/index.tsx
@@ -10,6 +10,7 @@ import { totals } from '@woocommerce/icons';
  */
 import metadata from './block.json';
 import edit from './edit';
+import './style.scss';
 
 registerBlockType( metadata, {
 	icon: {
diff --git a/assets/js/blocks/product-tag/index.tsx b/assets/js/blocks/product-tag/index.tsx
index fae42bf2c6c..3e0f742b704 100644
--- a/assets/js/blocks/product-tag/index.tsx
+++ b/assets/js/blocks/product-tag/index.tsx
@@ -8,9 +8,9 @@ import { Icon, tag } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import './editor.scss';
 import metadata from './block.json';
 import { Edit } from './edit';
+import './editor.scss';
 
 /**
  * Register and run the "Products by Tag" block.
diff --git a/assets/js/blocks/product-template/index.tsx b/assets/js/blocks/product-template/index.tsx
index 1686814d123..6fc7771cc96 100644
--- a/assets/js/blocks/product-template/index.tsx
+++ b/assets/js/blocks/product-template/index.tsx
@@ -11,6 +11,7 @@ import metadata from './block.json';
 import edit from './edit';
 import save from './save';
 import icon from './icon';
+import './style.scss';
 
 const blockConfig: BlockConfiguration = {
 	...metadata,
diff --git a/assets/js/editor-components/search-list-control/search-list-control.tsx b/assets/js/editor-components/search-list-control/search-list-control.tsx
index 225e7e6d204..27b057742c1 100644
--- a/assets/js/editor-components/search-list-control/search-list-control.tsx
+++ b/assets/js/editor-components/search-list-control/search-list-control.tsx
@@ -34,6 +34,7 @@ import type {
 	ListItemsProps,
 	SearchListItemsContainerProps,
 } from './types';
+import './style.scss';
 
 const defaultRenderListItem = ( args: renderItemArgs ): JSX.Element => {
 	return <SearchListItem { ...args } />;
diff --git a/assets/js/index.js b/assets/js/index.js
index 3324889f387..cdb1e57a0be 100644
--- a/assets/js/index.js
+++ b/assets/js/index.js
@@ -5,7 +5,6 @@ import { getCategories, setCategories } from '@wordpress/blocks';
 import { __ } from '@wordpress/i18n';
 import { woo } from '@woocommerce/icons';
 import { Icon } from '@wordpress/icons';
-import '@woocommerce/templates/revert-button';
 
 /**
  * Internal dependencies
diff --git a/bin/webpack-configs.js b/bin/webpack-configs.js
index b5fb6f3f82d..5448a8f26bc 100644
--- a/bin/webpack-configs.js
+++ b/bin/webpack-configs.js
@@ -612,6 +612,109 @@ const getExtensionsConfig = ( options = {} ) => {
 	};
 };
 
+/**
+ * Build config for scripts to be used exclusively within the Site Editor context.
+ *
+ * @param {Object} options Build options.
+ */
+const getSiteEditorConfig = ( options = {} ) => {
+	const { alias, resolvePlugins = [] } = options;
+	const resolve = alias
+		? {
+				alias,
+				plugins: resolvePlugins,
+		  }
+		: {
+				plugins: resolvePlugins,
+		  };
+	return {
+		entry: getEntryConfig( 'editor', options.exclude || [] ),
+		output: {
+			devtoolNamespace: 'wc',
+			path: path.resolve( __dirname, '../build/' ),
+			filename: `[name].js`,
+			jsonpFunction: 'webpackWcBlocksExtensionsMethodExtensionJsonp',
+		},
+		module: {
+			rules: [
+				{
+					test: /\.(j|t)sx?$/,
+					exclude: /node_modules/,
+					use: {
+						loader: 'babel-loader?cacheDirectory',
+						options: {
+							presets: [
+								[
+									'@wordpress/babel-preset-default',
+									{
+										modules: false,
+										targets: {
+											browsers: [
+												'extends @wordpress/browserslist-config',
+											],
+										},
+									},
+								],
+							],
+							plugins: [
+								isProduction
+									? require.resolve(
+											'babel-plugin-transform-react-remove-prop-types'
+									  )
+									: false,
+								'@babel/plugin-proposal-optional-chaining',
+							].filter( Boolean ),
+						},
+					},
+				},
+				{
+					test: /\.s[c|a]ss$/,
+					use: {
+						loader: 'ignore-loader',
+					},
+				},
+			],
+		},
+		optimization: {
+			concatenateModules:
+				isProduction && ! process.env.WP_BUNDLE_ANALYZER,
+			splitChunks: {
+				automaticNameDelimiter: '--',
+			},
+			minimizer: [
+				new TerserPlugin( {
+					cache: true,
+					parallel: true,
+					terserOptions: {
+						output: {
+							comments: /translators:/i,
+						},
+						compress: {
+							passes: 2,
+						},
+						mangle: {
+							reserved: [ '__', '_n', '_nx', '_x' ],
+						},
+					},
+					extractComments: false,
+				} ),
+			],
+		},
+		plugins: [
+			...getSharedPlugins( {
+				bundleAnalyzerReportTitle: 'Site Editor',
+			} ),
+			new ProgressBarPlugin(
+				getProgressBarPluginConfig( 'Site Editor' )
+			),
+		],
+		resolve: {
+			...resolve,
+			extensions: [ '.js', '.ts', '.tsx' ],
+		},
+	};
+};
+
 /**
  * Build config for CSS Styles.
  *
@@ -660,62 +763,32 @@ const getStylingConfig = ( options = {} ) => {
 						chunks: 'all',
 						priority: 10,
 					},
-					vendorsStyle: {
-						test: /[\/\\]node_modules[\/\\].*?style\.s?css$/,
-						name: 'wc-blocks-vendors-style',
-						chunks: 'all',
-						priority: 7,
-					},
-					blocksStyle: {
-						// Capture all stylesheets with name `style` or name that starts with underscore (abstracts).
-						test: /(style|_.*)\.scss$/,
-						name: 'wc-blocks-style',
-						chunks: 'all',
-						priority: 5,
-					},
 				},
 			},
 		},
 		module: {
 			rules: [
 				{
-					test: /[\/\\]node_modules[\/\\].*?style\.s?css$/,
-					use: [
-						MiniCssExtractPlugin.loader,
-						{ loader: 'css-loader', options: { importLoaders: 1 } },
-						'postcss-loader',
-						{
-							loader: 'sass-loader',
-							options: {
-								sassOptions: {
-									includePaths: [ 'node_modules' ],
-								},
-								additionalData: ( content ) => {
-									const styleImports = [
-										'colors',
-										'breakpoints',
-										'variables',
-										'mixins',
-										'animations',
-										'z-index',
-									]
-										.map(
-											( imported ) =>
-												`@import "~@wordpress/base-styles/${ imported }";`
-										)
-										.join( ' ' );
-									return styleImports + content;
-								},
-							},
+					test: /\.(j|t)sx?$/,
+					use: {
+						loader: 'babel-loader?cacheDirectory',
+						options: {
+							presets: [ '@wordpress/babel-preset-default' ],
+							plugins: [
+								isProduction
+									? require.resolve(
+											'babel-plugin-transform-react-remove-prop-types'
+									  )
+									: false,
+							].filter( Boolean ),
 						},
-					],
+					},
 				},
 				{
 					test: /\.s?css$/,
-					exclude: /node_modules/,
 					use: [
 						MiniCssExtractPlugin.loader,
-						{ loader: 'css-loader', options: { importLoaders: 1 } },
+						'css-loader',
 						'postcss-loader',
 						{
 							loader: 'sass-loader',
@@ -761,6 +834,7 @@ const getStylingConfig = ( options = {} ) => {
 			],
 		},
 		plugins: [
+			...getSharedPlugins( { bundleAnalyzerReportTitle: 'Styles' } ),
 			new ProgressBarPlugin( getProgressBarPluginConfig( 'Styles' ) ),
 			new WebpackRTLPlugin( {
 				filename: `[name]${ fileSuffix }-rtl.css`,
@@ -776,7 +850,7 @@ const getStylingConfig = ( options = {} ) => {
 		],
 		resolve: {
 			...resolve,
-			extensions: [ '.js', '.ts', '.tsx' ],
+			extensions: [ '.js', '.jsx', '.ts', '.tsx' ],
 		},
 	};
 };
@@ -851,6 +925,7 @@ module.exports = {
 	getMainConfig,
 	getPaymentsConfig,
 	getExtensionsConfig,
+	getSiteEditorConfig,
 	getStylingConfig,
 	getInteractivityAPIConfig,
 };
diff --git a/bin/webpack-entries.js b/bin/webpack-entries.js
index 0d61c431eb4..9e089bec793 100644
--- a/bin/webpack-entries.js
+++ b/bin/webpack-entries.js
@@ -110,27 +110,23 @@ const getBlockEntries = ( relativePath ) => {
 
 const entries = {
 	styling: {
-		// @wordpress/components styles
-		'custom-select-control-style':
-			'./node_modules/wordpress-components/src/custom-select-control/style.scss',
-		'snackbar-notice-style':
-			'./node_modules/wordpress-components/src/snackbar/style.scss',
-		'combobox-control-style':
-			'./node_modules/wordpress-components/src/combobox-control/style.scss',
-		'form-token-field-style':
-			'./node_modules/wordpress-components/src/form-token-field/style.scss',
-
-		'general-style': glob.sync( './assets/**/*.scss', {
-			ignore: [
-				// Block styles are added below.
-				'./assets/js/blocks/*/*.scss',
-			],
-		} ),
-
-		'packages-style': glob.sync( './packages/**/*.scss' ),
-
-		'reviews-style': './assets/js/blocks/reviews/editor.scss',
-		...getBlockEntries( '**/*.scss' ),
+		// Packages styles
+		'packages-style': glob.sync( './packages/**/index.js' ),
+		// Shared blocks code
+		'wc-blocks': './assets/js/index.js',
+		// Blocks
+		'product-image-gallery':
+			'./assets/js/atomic/blocks/product-elements/product-image-gallery/index.ts',
+		'product-reviews':
+			'./assets/js/atomic/blocks/product-elements/product-reviews/index.tsx',
+		'product-details':
+			'./assets/js/atomic/blocks/product-elements/product-details/index.tsx',
+		'add-to-cart-form':
+			'./assets/js/atomic/blocks/product-elements/add-to-cart-form/index.tsx',
+		...getBlockEntries( '{index,block,frontend}.{t,j}s{,x}' ),
+		// Templates
+		'wc-blocks-classic-template-revert-button-style':
+			'./assets/js/templates/revert-button/index.tsx',
 	},
 	core: {
 		wcBlocksRegistry: './assets/js/blocks-registry/index.js',
@@ -171,6 +167,10 @@ const entries = {
 		'wc-shipping-method-pickup-location':
 			'./assets/js/extensions/shipping-methods/pickup-location/index.js',
 	},
+	editor: {
+		'wc-blocks-classic-template-revert-button':
+			'./assets/js/templates/revert-button/index.tsx',
+	},
 };
 
 const getEntryConfig = ( type = 'main', exclude = [] ) => {
diff --git a/composer.json b/composer.json
index 350ae0eb539..bbe346276cd 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://woocommerce.com/",
 	"type": "wordpress-plugin",
-	"version": "10.6.1",
+	"version": "10.6.2",
 	"keywords": [
 		"gutenberg",
 		"woocommerce",
diff --git a/docs/internal-developers/testing/releases/1062.md b/docs/internal-developers/testing/releases/1062.md
new file mode 100644
index 00000000000..4fad5c319a5
--- /dev/null
+++ b/docs/internal-developers/testing/releases/1062.md
@@ -0,0 +1,60 @@
+# Testing notes and ZIP for release 10.6.2
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/12214223/woocommerce-gutenberg-products-block.zip)
+
+## WooCommerce Core
+
+### Fix: WooCommerce Blocks causing malfunction of the navigation block on WordPress 6.3. [#10388](https://github.com/woocommerce/woocommerce-blocks/pull/10388)
+
+1. Ensure you have a local install up and running with the release candidate version of WordPress 6.3. You can do so by downloading it via WP-CLI: `wp core update --version=6.3-RC1 --force` followed by `wp core update-db`. Alternatively, you can also download the zip for the release [over here](https://wordpress.org/wordpress-6.3-RC1.zip).
+2. Ensure you have a block theme enabled such as Twenty-Twenty Three
+3. Create a new post
+4. Insert the navigation block
+5. Make sure you can correctly preview it without any problems, as demonstrated in the screenshot in the description of this PR.
+6. Now head over to Appearence > Editor > Templates > Product Catalog and edit it.
+7. If you are seeing the "WooCommerce Product Grid Block", click on "Transform into blocks":
+
+<img width="1218" alt="Screenshot 2023-07-27 at 18 56 37" src="https://github.com/woocommerce/woocommerce-blocks/assets/15730971/fb5621ae-af06-47f5-95d5-3bba7f7d648c">
+
+8. Now, on the sidebar, click on Template and ensure the "Revert to classic template" button is visible (as demonstrated on the screenshot in the description of this PR).
+9. Click on "Revert to classic template" button and make sure everything works as expected: the product blocks should be replaced with the "WooCommerce Product Grid Block".
+
+### Check if WordPress version is higher than 6.2.2 to make Products block compatible with Gutenberg 16+. [#10360](https://github.com/woocommerce/woocommerce-blocks/pull/10360)
+
+| Before - no layout option is chosen, which defaults to list | After  - grid option is chosen by default|
+| ------ | ----- |
+|   <img width="688" alt="image" src="https://github.com/woocommerce/woocommerce-blocks/assets/20098064/4859c40f-fea7-4fbf-83b8-e2deadf2709b">     |   <img width="688" alt="image" src="https://github.com/woocommerce/woocommerce-blocks/assets/20098064/7c139c5c-1977-460a-afce-cf7489cb9a37">    |
+
+Check below steps in following configurations:
+
+- WordPress 6.2:
+    - [ ] Gutenberg 16 enabled
+    - [ ] Gutenberg 16 disabled
+- WordPress 6.3:
+    - [ ] Gutenberg 16 enabled
+    - [ ] Gutenberg 16 disabled
+
+1. Create new post
+2. Add Products (Beta) block
+3. **Expected**: It has grid layout applied by default
+
+### Render Checkout/Cart containing pages without template overriding. [#10359](https://github.com/woocommerce/woocommerce-blocks/pull/10359)
+
+1. Create a page/post with cart or checkout shortcodes, and save it with a different slug from the ones in WooCommerce > Advanced screen.
+2. Add extra test content.
+3. On the store, accessing the page/post will render it properly. Accessing the cart/checkout endpoints presented on WooCommerce > Advanced screen
+
+### Remove opinionated styles from Product Hero pattern. [#10255](https://github.com/woocommerce/woocommerce-blocks/pull/10255)
+
+1. In the post editor or the site editor, add the Product Hero pattern.
+2. Verify it looks like the _After_ patterns in screenshot below (styles adapt to the theme) and it matches the design (see <https://github.com/woocommerce/woocommerce-blocks/issues/10216>).
+
+Desktop | Mobile
+--- | ---
+![imatge](https://github.com/woocommerce/woocommerce-blocks/assets/3616980/8c320dea-bd0c-4a6c-af10-12121b3784f4) | ![imatge](https://github.com/woocommerce/woocommerce-blocks/assets/3616980/ee00385b-4752-4f5f-b44c-5549f8b2b604)
+
+### Per block stylesheets. [#9831](https://github.com/woocommerce/woocommerce-blocks/pull/9831)
+
+1. Create a post or page and add the All Products block. Verify styles are loaded correctly.
+2. Visit the page in the frontend and verify styles are loaded correctly in the frontend as well.
+3. Repeat steps 1 and 2 with all blocks listed on [this page](https://wordpress.org/plugins/woo-gutenberg-products-block/). Make sure to test each block individually. So, when possible, try with only one block on the page (in some cases, that's not possible, ie: filter blocks, in that case, try with as few blocks as possible on the page). The reason is that we want to make sure each block includes the style dependencies that it needs, so they need to be tested in isolation, otherwise styles from other blocks might leak into other blocks and "help fix issues".
diff --git a/docs/internal-developers/testing/releases/README.md b/docs/internal-developers/testing/releases/README.md
index be8dae9f598..9be54002a78 100644
--- a/docs/internal-developers/testing/releases/README.md
+++ b/docs/internal-developers/testing/releases/README.md
@@ -159,6 +159,7 @@ Every release includes specific testing instructions for new features and bug fi
 -   [10.5.0](./1050.md)
 -   [10.6.0](./1060.md)
     -   [10.6.1](./1061.md)
+    -   [10.6.2](./1062.md)
 
 
 <!-- FEEDBACK -->
diff --git a/package-lock.json b/package-lock.json
index 793b2c0a47f..0d2b59aef55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@woocommerce/block-library",
-	"version": "10.6.1",
+	"version": "10.6.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@woocommerce/block-library",
-			"version": "10.6.1",
+			"version": "10.6.2",
 			"hasInstallScript": true,
 			"license": "GPL-3.0+",
 			"dependencies": {
diff --git a/package.json b/package.json
index 53c85444c42..a77f3130afc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "10.6.1",
+	"version": "10.6.2",
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
 	"keywords": [
@@ -27,8 +27,7 @@
 		"./assets/js/blocks/filter-wrapper/register-components.ts",
 		"./assets/js/blocks/product-query/variations/**.tsx",
 		"./assets/js/blocks/product-query/index.tsx",
-		"./assets/js/blocks/product-query/inspector-controls.tsx",
-		"./assets/js/templates/revert-button/index.tsx"
+		"./assets/js/blocks/product-query/inspector-controls.tsx"
 	],
 	"repository": {
 		"type": "git",
diff --git a/packages/checkout/components/checkbox-control/style.scss b/packages/checkout/components/checkbox-control/style.scss
index 71173748314..47843f0c52c 100644
--- a/packages/checkout/components/checkbox-control/style.scss
+++ b/packages/checkout/components/checkbox-control/style.scss
@@ -1,7 +1,7 @@
 .wc-block-components-checkbox {
 	@include reset-color();
 	@include reset-typography();
-	margin-top: em($gap-large);
+	margin-top: em($gap);
 
 	label {
 		align-items: flex-start;
diff --git a/patterns/product-hero.php b/patterns/product-hero.php
index 9fc61b06dd6..648b75ab61d 100644
--- a/patterns/product-hero.php
+++ b/patterns/product-hero.php
@@ -19,25 +19,25 @@
 
 <!-- wp:woocommerce/single-product {"productId":<?php echo esc_attr( $product_id ); ?>,"align":"wide"} -->
 <div class="wp-block-woocommerce-single-product alignwide">
-	<!-- wp:columns {"style":{"color":{"background":"#6b7ba8"},"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"padding":{"left":"20px"}}},"textColor":"base"} -->
-	<div class="wp-block-columns has-base-color has-text-color has-background has-link-color" style="background-color:#6b7ba8;padding-left:20px">
-		<!-- wp:column {"width":"40%","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
-		<div class="wp-block-column" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;flex-basis:40%">
+	<!-- wp:columns -->
+	<div class="wp-block-columns">
+		<!-- wp:column {"width":"40%","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"verticalAlignment":"center"} -->
+		<div class="wp-block-column is-vertically-aligned-center" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;flex-basis:40%">
 			<!-- wp:woocommerce/product-image {"showSaleBadge":false,"isDescendentOfSingleProductBlock":true,"height":"300px"} /-->
 		</div>
 		<!-- /wp:column -->
 
-		<!-- wp:column {"style":{"spacing":{"padding":{"top":"1.5em","bottom":"1.5em"}}}} -->
-		<div class="wp-block-column" style="padding-top:1.5em;padding-bottom:1.5em">
-			<!-- wp:post-title {"textAlign":"","isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"fontSize":"large","__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
+		<!-- wp:column {"verticalAlignment":"center"} -->
+		<div class="wp-block-column is-vertically-aligned-center">
+			<!-- wp:post-title {"textAlign":"","isLink":true,"style":{"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
 
-			<!-- wp:woocommerce/product-price {"isDescendentOfSingleProductBlock":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"700","fontSize":"16px","lineHeight":"0.1"}}} /-->
+			<!-- wp:woocommerce/product-price {"isDescendentOfSingleProductBlock":true} /-->
 
-			<!-- wp:woocommerce/product-button {"style":{"color":{"background":"#000001","text":"#fffff1"},"spacing":{"padding":{"left":"30px","right":"30px"},"margin":{"top":"15px"}},"typography":{"fontSize":"15px"}}} -->
-			<div class="wp-block-woocommerce-product-button is-loading" style="font-size:15px"></div>
+			<!-- wp:woocommerce/product-button -->
+			<div class="wp-block-woocommerce-product-button is-loading"></div>
 			<!-- /wp:woocommerce/product-button -->
 
-			<!-- wp:post-excerpt {"style":{"typography":{"fontSize":"14px"}},"__woocommerceNamespace":"woocommerce/product-query/product-summary"} /-->
+			<!-- wp:post-excerpt {"__woocommerceNamespace":"woocommerce/product-query/product-summary"} /-->
 		</div>
 		<!-- /wp:column -->
 	</div>
diff --git a/readme.txt b/readme.txt
index 0356038ba0d..0c2f67f101b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
 Requires at least: 6.2
 Tested up to: 6.2
 Requires PHP: 7.3
-Stable tag: 10.6.1
+Stable tag: 10.6.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -81,6 +81,22 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 10.6.2 - 2021-07-31 =
+
+#### Enhancements
+
+- Updated Product Hero pattern to have no opinionated styles. ([10255](https://github.com/woocommerce/woocommerce-blocks/pull/10255))
+- Only load styles required by the blocks rendered on the page. ([9831](https://github.com/woocommerce/woocommerce-blocks/pull/9831))
+
+#### Bug Fixes
+
+- Fix: Resolve the conflict preventing the navigation block from being correctly previewed in the editor while having WooCommerce enabled. ([10388](https://github.com/woocommerce/woocommerce-blocks/pull/10388))
+- Products: Fix the incorrect layout with WordPress 6.3+ without Gutenberg. ([10360](https://github.com/woocommerce/woocommerce-blocks/pull/10360))
+- Fixed a rendering bug on content containing Cart and Checkout blocks/shortcode. ([10359](https://github.com/woocommerce/woocommerce-blocks/pull/10359))
+- Fix an error occurring due to missing parameters in the `woocommerce_add_to_cart_redirect` filter. ([10316](https://github.com/woocommerce/woocommerce-blocks/pull/10316))
+- Single Product Template > Ensure extensions can't trigger fatal errors on customized single product templates without any post content blocks. ([10128](https://github.com/woocommerce/woocommerce-blocks/pull/10128))
+- Cart and Checkout Page Migration: Inherit Page template and fix rendering. ([10375](https://github.com/woocommerce/woocommerce-blocks/pull/10375))
+
 = 10.6.1 - 2021-07-17 =
 
 #### Bug Fixes
diff --git a/src/Assets/Api.php b/src/Assets/Api.php
index 7f950752248..9550be10897 100644
--- a/src/Assets/Api.php
+++ b/src/Assets/Api.php
@@ -233,17 +233,22 @@ function() use ( $handle ) {
 	 * @since 2.5.0
 	 * @since 2.6.0 Change src to be relative source.
 	 *
-	 * @param string $handle       Name of the stylesheet. Should be unique.
-	 * @param string $relative_src Relative source of the stylesheet to the plugin path.
-	 * @param array  $deps         Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
-	 * @param string $media        Optional. The media for which this stylesheet has been defined. Default 'all'. Accepts media types like
-	 *                             'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
+	 * @param string  $handle       Name of the stylesheet. Should be unique.
+	 * @param string  $relative_src Relative source of the stylesheet to the plugin path.
+	 * @param array   $deps         Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
+	 * @param string  $media        Optional. The media for which this stylesheet has been defined. Default 'all'. Accepts media types like
+	 *                              'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
+	 * @param boolean $rtl   Optional. Whether or not to register RTL styles.
 	 */
-	public function register_style( $handle, $relative_src, $deps = [], $media = 'all' ) {
+	public function register_style( $handle, $relative_src, $deps = [], $media = 'all', $rtl = false ) {
 		$filename = str_replace( plugins_url( '/', __DIR__ ), '', $relative_src );
 		$src      = $this->get_asset_url( $relative_src );
 		$ver      = $this->get_file_version( $filename );
 		wp_register_style( $handle, $src, $deps, $ver, $media );
+
+		if ( $rtl ) {
+			wp_style_add_data( $handle, 'rtl', 'replace' );
+		}
 	}
 
 	/**
diff --git a/src/AssetsController.php b/src/AssetsController.php
index 6691c1ff586..4b62c9e59cd 100644
--- a/src/AssetsController.php
+++ b/src/AssetsController.php
@@ -1,9 +1,7 @@
 <?php
 namespace Automattic\WooCommerce\Blocks;
 
-use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Assets\Api as AssetApi;
-use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry as AssetDataRegistry;
 
 /**
  * AssetsController class.
@@ -35,6 +33,7 @@ public function __construct( AssetApi $asset_api ) {
 	 */
 	protected function init() {
 		add_action( 'init', array( $this, 'register_assets' ) );
+		add_action( 'enqueue_block_editor_assets', array( $this, 'register_and_enqueue_site_editor_assets' ) );
 		add_filter( 'wp_resource_hints', array( $this, 'add_resource_hints' ), 10, 2 );
 		add_action( 'body_class', array( $this, 'add_theme_body_class' ), 1 );
 		add_action( 'admin_body_class', array( $this, 'add_theme_body_class' ), 1 );
@@ -47,16 +46,16 @@ protected function init() {
 	 * Register block scripts & styles.
 	 */
 	public function register_assets() {
-		$this->register_style( 'wc-blocks-vendors-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-vendors-style', 'css' ), __DIR__ ) );
+		$this->register_style( 'wc-blocks-packages-style', plugins_url( $this->api->get_block_asset_build_path( 'packages-style', 'css' ), __DIR__ ), [], 'all', true );
+		$this->register_style( 'wc-blocks-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks', 'css' ), __DIR__ ), [], 'all', true );
 		$this->register_style( 'wc-blocks-editor-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-editor-style', 'css' ), __DIR__ ), [ 'wp-edit-blocks' ], 'all', true );
-		$this->register_style( 'wc-blocks-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-style', 'css' ), __DIR__ ), [ 'wc-blocks-vendors-style' ], 'all', true );
 
 		$this->api->register_script( 'wc-blocks-middleware', 'build/wc-blocks-middleware.js', [], false );
 		$this->api->register_script( 'wc-blocks-data-store', 'build/wc-blocks-data.js', [ 'wc-blocks-middleware' ] );
 		$this->api->register_script( 'wc-blocks-vendors', $this->api->get_block_asset_build_path( 'wc-blocks-vendors' ), [], false );
 		$this->api->register_script( 'wc-blocks-registry', 'build/wc-blocks-registry.js', [], false );
 		$this->api->register_script( 'wc-blocks', $this->api->get_block_asset_build_path( 'wc-blocks' ), [ 'wc-blocks-vendors' ], false );
-		$this->api->register_script( 'wc-blocks-shared-context', 'build/wc-blocks-shared-context.js', [] );
+		$this->api->register_script( 'wc-blocks-shared-context', 'build/wc-blocks-shared-context.js' );
 		$this->api->register_script( 'wc-blocks-shared-hocs', 'build/wc-blocks-shared-hocs.js', [], false );
 
 		// The price package is shared externally so has no blocks prefix.
@@ -76,6 +75,20 @@ public function register_assets() {
 		);
 	}
 
+	/**
+	 * Register and enqueue assets for exclusive usage within the Site Editor.
+	 */
+	public function register_and_enqueue_site_editor_assets() {
+		$this->api->register_script( 'wc-blocks-classic-template-revert-button', 'build/wc-blocks-classic-template-revert-button.js' );
+		$this->api->register_style( 'wc-blocks-classic-template-revert-button-style', 'build/wc-blocks-classic-template-revert-button-style.css' );
+
+		$current_screen = get_current_screen();
+		if ( $current_screen instanceof \WP_Screen && 'site-editor' === $current_screen->base ) {
+			wp_enqueue_script( 'wc-blocks-classic-template-revert-button' );
+			wp_enqueue_style( 'wc-blocks-classic-template-revert-button-style' );
+		}
+	}
+
 	/**
 	 * Defines resource hints to help speed up the loading of some critical blocks.
 	 *
@@ -93,7 +106,7 @@ public function add_resource_hints( $urls, $relation_type ) {
 		// We only need to prefetch when the cart has contents.
 		$cart = wc()->cart;
 
-		if ( ! $cart || ! $cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count() ) {
+		if ( ! $cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count() ) {
 			return $urls;
 		}
 
diff --git a/src/BlockTemplatesController.php b/src/BlockTemplatesController.php
index 786df7bfaaf..76e1d909508 100644
--- a/src/BlockTemplatesController.php
+++ b/src/BlockTemplatesController.php
@@ -100,6 +100,34 @@ function( $settings, $metadata ) {
 				10,
 				2
 			);
+
+			// Prevents shortcodes in templates having their HTML content broken by wpautop.
+			// @see https://core.trac.wordpress.org/ticket/58366 for more info.
+			add_filter(
+				'block_type_metadata_settings',
+				function( $settings, $metadata ) {
+					if (
+						isset( $metadata['name'], $settings['render_callback'] ) &&
+						'core/shortcode' === $metadata['name']
+					) {
+						$settings['original_render_callback'] = $settings['render_callback'];
+						$settings['render_callback']          = function( $attributes, $content ) use ( $settings ) {
+							// The shortcode has already been rendered, so look for the cart/checkout HTML.
+							if ( strstr( $content, 'woocommerce-cart-form' ) || strstr( $content, 'woocommerce-checkout-form' ) ) {
+								// Return early before wpautop runs again.
+								return $content;
+							}
+
+							$render_callback = $settings['original_render_callback'];
+
+							return $render_callback( $attributes, $content );
+						};
+					}
+					return $settings;
+				},
+				10,
+				2
+			);
 		}
 	}
 
@@ -373,6 +401,15 @@ function( $classes ) {
 							}
 						);
 
+						global $product;
+
+						if ( ! $product instanceof \WC_Product ) {
+							$product_id = get_the_ID();
+							if ( $product_id ) {
+								wc_setup_product_data( $product_id );
+							}
+						}
+
 						$new_content       = SingleProductTemplateCompatibility::add_compatibility_layer( $template->content );
 						$template->content = $new_content;
 					}
@@ -723,6 +760,29 @@ protected function has_migrated_page( $page_id ) {
 		return (bool) get_option( 'has_migrated_' . $page_id, false );
 	}
 
+	/**
+	 * Prepare default page template.
+	 *
+	 * @param \WP_Post $page Page object.
+	 * @return string
+	 */
+	protected function get_default_migrate_page_template( $page ) {
+		$default_template_content  = $this->get_block_template_part( 'header' );
+		$default_template_content .= '
+			<!-- wp:group {"layout":{"inherit":true}} -->
+			<div class="wp-block-group">
+				<!-- wp:heading {"level":1} -->
+				<h1 class="wp-block-heading">' . wp_kses_post( $page->post_title ) . '</h1>
+				<!-- /wp:heading -->
+				' . wp_kses_post( $page->post_content ) . '
+			</div>
+			<!-- /wp:group -->
+		';
+		$default_template_content .= $this->get_block_template_part( 'footer' );
+
+		return $default_template_content;
+	}
+
 	/**
 	 * Migrates a page to a template if needed.
 	 *
@@ -735,20 +795,27 @@ protected function migrate_page( $page_id, $page ) {
 			return;
 		}
 
+		// Use the page template if it exists, which we'll use over our default template if found.
+		$existing_page_template = BlockTemplateUtils::get_block_template( get_stylesheet() . '//page', 'wp_template' );
+
+		if ( $existing_page_template && ! empty( $existing_page_template->content ) ) {
+			// Massage the original content into something we can use. Replace post content with a group block.
+			$pattern          = '/(<!--\s*)wp:post-content(.*?)(\/-->)/';
+			$replacement      = '
+				<!-- wp:group $2 -->
+				<div class="wp-block-group">' . wp_kses_post( $page->post_content ) . '</div>
+				<!-- /wp:group -->
+			';
+			$template_content = preg_replace( $pattern, $replacement, $existing_page_template->content );
+		} else {
+			$template_content = $this->get_default_migrate_page_template( $page );
+		}
+
 		$request = new \WP_REST_Request( 'POST', '/wp/v2/templates/woocommerce/woocommerce//' . $page_id );
 		$request->set_body_params(
 			[
 				'id'      => 'woocommerce/woocommerce//' . $page_id,
-				'content' => $this->get_block_template_part( 'header' ) .
-					'<!-- wp:group {"layout":{"inherit":true}} -->
-					<div class="wp-block-group">
-						<!-- wp:heading {"level":1} -->
-						<h1 class="wp-block-heading">' . wp_kses_post( $page->post_title ) . '</h1>
-						<!-- /wp:heading -->
-						' . wp_kses_post( $page->post_content ) . '
-					</div>
-					<!-- /wp:group -->' .
-					$this->get_block_template_part( 'footer' ),
+				'content' => $template_content,
 			]
 		);
 		rest_get_server()->dispatch( $request );
@@ -763,7 +830,7 @@ protected function migrate_page( $page_id, $page ) {
 	 * @return string
 	 */
 	protected function get_block_template_part( $part ) {
-		$template_part = get_block_template( get_stylesheet() . '//' . $part, 'wp_template_part' );
+		$template_part = BlockTemplateUtils::get_block_template( get_stylesheet() . '//' . $part, 'wp_template_part' );
 		if ( ! $template_part || empty( $template_part->content ) ) {
 			return '';
 		}
diff --git a/src/BlockTypes/AbstractBlock.php b/src/BlockTypes/AbstractBlock.php
index 75ff4f0e6d8..ba0c35a249b 100644
--- a/src/BlockTypes/AbstractBlock.php
+++ b/src/BlockTypes/AbstractBlock.php
@@ -300,11 +300,12 @@ protected function get_block_type_script( $key = null ) {
 	/**
 	 * Get the frontend style handle for this block type.
 	 *
-	 * @see $this->register_block_type()
-	 * @return string|null
+	 * @return string[]|null
 	 */
 	protected function get_block_type_style() {
-		return 'wc-blocks-style';
+		$this->asset_api->register_style( 'wc-blocks-style-' . $this->block_name, $this->asset_api->get_block_asset_build_path( $this->block_name, 'css' ), [], 'all', true );
+
+		return [ 'wc-blocks-style', 'wc-blocks-style-' . $this->block_name ];
 	}
 
 	/**
diff --git a/src/BlockTypes/AbstractInnerBlock.php b/src/BlockTypes/AbstractInnerBlock.php
index 07d75d591a9..6cf4aa3902a 100644
--- a/src/BlockTypes/AbstractInnerBlock.php
+++ b/src/BlockTypes/AbstractInnerBlock.php
@@ -54,4 +54,12 @@ protected function get_block_type_script( $key = null ) {
 		return parent::get_block_type_script( $key );
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
 }
diff --git a/src/BlockTypes/AbstractProductGrid.php b/src/BlockTypes/AbstractProductGrid.php
index 8fe0641ac0b..3348a506cbc 100644
--- a/src/BlockTypes/AbstractProductGrid.php
+++ b/src/BlockTypes/AbstractProductGrid.php
@@ -686,4 +686,14 @@ protected function enqueue_data( array $attributes = [] ) {
 		$this->asset_data_registry->add( 'default_rows', wc_get_theme_support( 'product_blocks::default_rows', 3 ), true );
 		$this->asset_data_registry->add( 'stock_status_options', wc_get_product_stock_status_options(), true );
 	}
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		// Currently these blocks rely on the styles from the All Products block.
+		return [ 'wc-blocks-style', 'wc-blocks-style-all-products' ];
+	}
 }
diff --git a/src/BlockTypes/AddToCartForm.php b/src/BlockTypes/AddToCartForm.php
index 2bb0c3de4de..c035aca9172 100644
--- a/src/BlockTypes/AddToCartForm.php
+++ b/src/BlockTypes/AddToCartForm.php
@@ -29,7 +29,7 @@ class AddToCartForm extends AbstractBlock {
 	protected function initialize() {
 		parent::initialize();
 		add_filter( 'wc_add_to_cart_message_html', array( $this, 'add_to_cart_message_html_filter' ), 10, 2 );
-		add_filter( 'woocommerce_add_to_cart_redirect', array( $this, 'add_to_cart_redirect_filter' ), 10, 2 );
+		add_filter( 'woocommerce_add_to_cart_redirect', array( $this, 'add_to_cart_redirect_filter' ), 10, 1 );
 	}
 
 	/**
@@ -155,10 +155,9 @@ public function add_to_cart_message_html_filter( $message ) {
 	 * is clicked.
 	 *
 	 * @param string $url The URL to redirect to after the product is added to the cart.
-	 * @param object $product The product being added to the cart.
 	 * @return string The filtered redirect URL.
 	 */
-	public function add_to_cart_redirect_filter( $url, $product ) {
+	public function add_to_cart_redirect_filter( $url ) {
 		// phpcs:ignore
 		if ( isset( $_POST['is-descendent-of-single-product-block'] ) && 'true' == $_POST['is-descendent-of-single-product-block'] ) {
 			return wp_validate_redirect( wp_get_referer(), $url );
@@ -176,6 +175,15 @@ protected function get_block_type_script( $key = null ) {
 		return null;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
+
 	/**
 	 * It isn't necessary register block assets because it is a server side block.
 	 */
diff --git a/src/BlockTypes/AttributeFilter.php b/src/BlockTypes/AttributeFilter.php
index 0979f6d2353..82be8c7eb9a 100644
--- a/src/BlockTypes/AttributeFilter.php
+++ b/src/BlockTypes/AttributeFilter.php
@@ -25,4 +25,13 @@ protected function enqueue_data( array $attributes = [] ) {
 		parent::enqueue_data( $attributes );
 		$this->asset_data_registry->add( 'attributes', array_values( wc_get_attribute_taxonomies() ), true );
 	}
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
 }
diff --git a/src/BlockTypes/Cart.php b/src/BlockTypes/Cart.php
index 227351a0047..79068f52071 100644
--- a/src/BlockTypes/Cart.php
+++ b/src/BlockTypes/Cart.php
@@ -100,6 +100,15 @@ protected function get_block_type_script( $key = null ) {
 		return $key ? $script[ $key ] : $script;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
+
 	/**
 	 * Enqueue frontend assets for this block, just in time for rendering.
 	 *
diff --git a/src/BlockTypes/Checkout.php b/src/BlockTypes/Checkout.php
index 758725cff81..c2019574b69 100644
--- a/src/BlockTypes/Checkout.php
+++ b/src/BlockTypes/Checkout.php
@@ -55,6 +55,15 @@ protected function get_block_type_script( $key = null ) {
 		return $key ? $script[ $key ] : $script;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
+
 	/**
 	 * Enqueue frontend assets for this block, just in time for rendering.
 	 *
diff --git a/src/BlockTypes/ClassicTemplate.php b/src/BlockTypes/ClassicTemplate.php
index 1ac9fcb49c5..bc24b6c34ed 100644
--- a/src/BlockTypes/ClassicTemplate.php
+++ b/src/BlockTypes/ClassicTemplate.php
@@ -390,4 +390,12 @@ function( $value ) use ( $stock_status ) {
 		return $meta_query;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
 }
diff --git a/src/BlockTypes/FilterWrapper.php b/src/BlockTypes/FilterWrapper.php
index 58d027234bd..3bd42018298 100644
--- a/src/BlockTypes/FilterWrapper.php
+++ b/src/BlockTypes/FilterWrapper.php
@@ -11,4 +11,13 @@ class FilterWrapper extends AbstractBlock {
 	 * @var string
 	 */
 	protected $block_name = 'filter-wrapper';
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
 }
diff --git a/src/BlockTypes/MiniCart.php b/src/BlockTypes/MiniCart.php
index 84fb4096d7f..cde76f98b49 100644
--- a/src/BlockTypes/MiniCart.php
+++ b/src/BlockTypes/MiniCart.php
@@ -8,6 +8,7 @@
 use Automattic\WooCommerce\Blocks\Integrations\IntegrationRegistry;
 use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
 use Automattic\WooCommerce\Blocks\Utils\BlockTemplateUtils;
+use Automattic\WooCommerce\Blocks\Utils\Utils;
 
 /**
  * Mini-Cart class.
@@ -108,6 +109,15 @@ protected function get_block_type_script( $key = null ) {
 		return $key ? $script[ $key ] : $script;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
+
 	/**
 	 * Extra data passed through from server to client for block.
 	 *
@@ -313,11 +323,19 @@ protected function append_script_and_deps_src( $script ) {
 
 		$site_url = site_url() ?? wp_guess_url();
 
+		if ( Utils::wp_version_compare( '6.3', '>=' ) ) {
+			$script_before = $wp_scripts->get_inline_script_data( $script->handle, 'before' );
+			$script_after  = $wp_scripts->get_inline_script_data( $script->handle, 'after' );
+		} else {
+			$script_before = $wp_scripts->print_inline_script( $script->handle, 'before', false );
+			$script_after  = $wp_scripts->print_inline_script( $script->handle, 'after', false );
+		}
+
 		$this->scripts_to_lazy_load[ $script->handle ] = array(
 			'src'          => preg_match( '|^(https?:)?//|', $script->src ) ? $script->src : $site_url . $script->src,
 			'version'      => $script->ver,
-			'before'       => $wp_scripts->print_inline_script( $script->handle, 'before', false ),
-			'after'        => $wp_scripts->print_inline_script( $script->handle, 'after', false ),
+			'before'       => $script_before,
+			'after'        => $script_after,
 			'translations' => $wp_scripts->print_translations( $script->handle, false ),
 		);
 	}
diff --git a/src/BlockTypes/MiniCartContents.php b/src/BlockTypes/MiniCartContents.php
index 37ee9ee31ec..ee9f1fa16f4 100644
--- a/src/BlockTypes/MiniCartContents.php
+++ b/src/BlockTypes/MiniCartContents.php
@@ -45,6 +45,15 @@ protected function get_block_type_script( $key = null ) {
 		return null;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
+
 	/**
 	 * Render the markup for the Mini-Cart Contents block.
 	 *
diff --git a/src/BlockTypes/ProceedToCheckoutBlock.php b/src/BlockTypes/ProceedToCheckoutBlock.php
index e2a883eeca3..5a7b19177aa 100644
--- a/src/BlockTypes/ProceedToCheckoutBlock.php
+++ b/src/BlockTypes/ProceedToCheckoutBlock.php
@@ -12,7 +12,6 @@ class ProceedToCheckoutBlock extends AbstractInnerBlock {
 	 */
 	protected $block_name = 'proceed-to-checkout-block';
 
-
 	/**
 	 * Extra data passed through from server to client for block.
 	 *
diff --git a/src/BlockTypes/ProductCollection.php b/src/BlockTypes/ProductCollection.php
index 0f0bc42c9ee..35d4ad82d33 100644
--- a/src/BlockTypes/ProductCollection.php
+++ b/src/BlockTypes/ProductCollection.php
@@ -46,6 +46,15 @@ protected function get_block_type_script( $key = null ) {
 		return null;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
+
 	/**
 	 * Initialize this block type.
 	 *
diff --git a/src/BlockTypes/ProductGallery.php b/src/BlockTypes/ProductGallery.php
index 9f1d6d60c3a..ecb9b2470ce 100644
--- a/src/BlockTypes/ProductGallery.php
+++ b/src/BlockTypes/ProductGallery.php
@@ -11,4 +11,13 @@ class ProductGallery extends AbstractBlock {
 	 * @var string
 	 */
 	protected $block_name = 'product-gallery';
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
 }
diff --git a/src/BlockTypes/ProductPrice.php b/src/BlockTypes/ProductPrice.php
index 038bd4be373..2b2235d08ff 100644
--- a/src/BlockTypes/ProductPrice.php
+++ b/src/BlockTypes/ProductPrice.php
@@ -46,6 +46,15 @@ protected function get_block_type_supports() {
 		);
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
+
 	/**
 	 * Overwrite parent method to prevent script registration.
 	 *
diff --git a/src/BlockTypes/ProductQuery.php b/src/BlockTypes/ProductQuery.php
index fe5f858a531..e4aed418ac3 100644
--- a/src/BlockTypes/ProductQuery.php
+++ b/src/BlockTypes/ProductQuery.php
@@ -2,6 +2,7 @@
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
 use WP_Query;
+use Automattic\WooCommerce\Blocks\Utils\Utils;
 
 // phpcs:disable WordPress.DB.SlowDBQuery.slow_db_query_tax_query
 // phpcs:disable WordPress.DB.SlowDBQuery.slow_db_query_meta_query
@@ -76,18 +77,19 @@ protected function initialize() {
 	}
 
 	/**
-	 * Extra data passed through from server to client for block.
-	 *
-	 * @param array $attributes  Any attributes that currently are available from the block.
-	 *                           Note, this will be empty in the editor context when the block is
-	 *                           not in the post content on editor load.
+	 * Post Template support for grid view was introduced in Gutenberg 16 / WordPress 6.3
+	 * Fixed in:
+	 * - https://github.com/woocommerce/woocommerce-blocks/pull/9916
+	 * - https://github.com/woocommerce/woocommerce-blocks/pull/10360
 	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
-
-		$gutenberg_version = '';
+	private function check_if_post_template_has_support_for_grid_view() {
+		if ( Utils::wp_version_compare( '6.3', '>=' ) ) {
+			return true;
+		}
 
 		if ( is_plugin_active( 'gutenberg/gutenberg.php' ) ) {
+			$gutenberg_version = '';
+
 			if ( defined( 'GUTENBERG_VERSION' ) ) {
 				$gutenberg_version = GUTENBERG_VERSION;
 			}
@@ -99,11 +101,27 @@ protected function enqueue_data( array $attributes = [] ) {
 				);
 				$gutenberg_version = $gutenberg_data['Version'];
 			}
+			return version_compare( $gutenberg_version, '16.0', '>=' );
 		}
 
+		return false;
+	}
+
+	/**
+	 * Extra data passed through from server to client for block.
+	 *
+	 * @param array $attributes  Any attributes that currently are available from the block.
+	 *                           Note, this will be empty in the editor context when the block is
+	 *                           not in the post content on editor load.
+	 */
+	protected function enqueue_data( array $attributes = [] ) {
+		parent::enqueue_data( $attributes );
+
+		$post_template_has_support_for_grid_view = $this->check_if_post_template_has_support_for_grid_view();
+
 		$this->asset_data_registry->add(
 			'post_template_has_support_for_grid_view',
-			version_compare( $gutenberg_version, '16.0', '>=' )
+			$post_template_has_support_for_grid_view
 		);
 	}
 
diff --git a/src/BlockTypes/ProductRating.php b/src/BlockTypes/ProductRating.php
index ab7369a1cf9..2af740432f3 100644
--- a/src/BlockTypes/ProductRating.php
+++ b/src/BlockTypes/ProductRating.php
@@ -80,6 +80,15 @@ protected function register_block_type_assets() {
 		return null;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
+
 	/**
 	 * Register the context.
 	 */
diff --git a/src/BlockTypes/RatingFilter.php b/src/BlockTypes/RatingFilter.php
index 5968c6aac62..2e44896319d 100644
--- a/src/BlockTypes/RatingFilter.php
+++ b/src/BlockTypes/RatingFilter.php
@@ -22,4 +22,13 @@ class RatingFilter extends AbstractBlock {
 	protected function get_block_type_script( $key = null ) {
 		return null;
 	}
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
 }
diff --git a/src/BlockTypes/RelatedProducts.php b/src/BlockTypes/RelatedProducts.php
index e89e22a57d2..f27f2bfb9c3 100644
--- a/src/BlockTypes/RelatedProducts.php
+++ b/src/BlockTypes/RelatedProducts.php
@@ -51,6 +51,15 @@ protected function register_block_type_assets() {
 		return null;
 	}
 
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
+
 	/**
 	 * Update the query for the product query block.
 	 *
@@ -122,8 +131,6 @@ public function render_block( string $content, array $block ) {
 		return $content;
 	}
 
-
-
 	/**
 	 * Determines whether the block is a related products block.
 	 *
diff --git a/src/BlockTypes/StockFilter.php b/src/BlockTypes/StockFilter.php
index 3f0784d80e3..82fe9b696ee 100644
--- a/src/BlockTypes/StockFilter.php
+++ b/src/BlockTypes/StockFilter.php
@@ -33,4 +33,13 @@ protected function enqueue_data( array $stock_statuses = [] ) {
 	public static function get_stock_status_query_var_values() {
 		return array_keys( wc_get_product_stock_status_options() );
 	}
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return string[]
+	 */
+	protected function get_block_type_style() {
+		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+	}
 }
diff --git a/src/BlockTypes/StoreNotices.php b/src/BlockTypes/StoreNotices.php
index f20ca6ee478..d346d31d05e 100644
--- a/src/BlockTypes/StoreNotices.php
+++ b/src/BlockTypes/StoreNotices.php
@@ -57,4 +57,13 @@ protected function render( $attributes, $content, $block ) {
 	protected function get_block_type_script( $key = null ) {
 		return null;
 	}
+
+	/**
+	 * Get the frontend style handle for this block type.
+	 *
+	 * @return null
+	 */
+	protected function get_block_type_style() {
+		return null;
+	}
 }
diff --git a/src/Package.php b/src/Package.php
index 5707af2e7b9..566afb625cd 100644
--- a/src/Package.php
+++ b/src/Package.php
@@ -109,7 +109,7 @@ public static function container( $reset = false ) {
 				NewPackage::class,
 				function ( $container ) {
 					// leave for automated version bumping.
-					$version = '10.6.1';
+					$version = '10.6.2';
 					return new NewPackage(
 						$version,
 						dirname( __DIR__ ),
diff --git a/src/Templates/CartTemplate.php b/src/Templates/CartTemplate.php
index 06e340bef01..af804d10113 100644
--- a/src/Templates/CartTemplate.php
+++ b/src/Templates/CartTemplate.php
@@ -32,7 +32,8 @@ public static function get_placeholder_page() {
 	 * @return boolean
 	 */
 	protected function is_active_template() {
-		return is_cart();
+		global $post;
+		return $post instanceof \WP_Post && get_option( 'woocommerce_cart_page_endpoint' ) === $post->post_name;
 	}
 
 	/**
diff --git a/src/Templates/CheckoutTemplate.php b/src/Templates/CheckoutTemplate.php
index 982163e97d0..c69df17f9c4 100644
--- a/src/Templates/CheckoutTemplate.php
+++ b/src/Templates/CheckoutTemplate.php
@@ -41,6 +41,7 @@ public static function get_template_title() {
 	 * @return boolean
 	 */
 	public function is_active_template() {
-		return is_checkout();
+		global $post;
+		return $post instanceof \WP_Post && get_option( 'woocommerce_checkout_page_endpoint' ) === $post->post_name;
 	}
 }
diff --git a/src/Utils/Utils.php b/src/Utils/Utils.php
new file mode 100644
index 00000000000..25af8c9e828
--- /dev/null
+++ b/src/Utils/Utils.php
@@ -0,0 +1,27 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\Utils;
+
+/**
+ * Utils class
+ */
+class Utils {
+
+	/**
+	 * Compare the current WordPress version with a given version. It's a wrapper around `version-compare`
+	 * that additionally takes into account the suffix (like `-RC1`).
+	 * For example: version 6.3 is considered lower than 6.3-RC2, so you can do
+	 * wp_version_compare( '6.3', '>=' ) and that will return true for 6.3-RC2.
+	 *
+	 * @param string      $version The version to compare against.
+	 * @param string|null $operator Optional. The comparison operator. Defaults to null.
+	 * @return bool|int Returns true if the current WordPress version satisfies the comparison, false otherwise.
+	 */
+	public static function wp_version_compare( $version, $operator = null ) {
+		$current_wp_version = get_bloginfo( 'version' );
+		if ( preg_match( '/^([0-9]+\.[0-9]+)/', $current_wp_version, $matches ) ) {
+			$current_wp_version = (float) $matches[1];
+		}
+
+		return version_compare( $current_wp_version, $version, $operator );
+	}
+}
diff --git a/webpack.config.js b/webpack.config.js
index de1edb08bad..ddb7942d125 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,6 +8,7 @@ const {
 	getFrontConfig,
 	getPaymentsConfig,
 	getExtensionsConfig,
+	getSiteEditorConfig,
 	getStylingConfig,
 	getInteractivityAPIConfig,
 } = require( './bin/webpack-configs.js' );
@@ -85,12 +86,21 @@ const InteractivityConfig = {
 	...getInteractivityAPIConfig( { alias: getAlias() } ),
 };
 
+/**
+ * Config to generate the site editor scripts.
+ */
+const SiteEditorConfig = {
+	...sharedConfig,
+	...getSiteEditorConfig( { alias: getAlias() } ),
+};
+
 module.exports = [
 	CoreConfig,
 	MainConfig,
 	FrontendConfig,
 	ExtensionsConfig,
 	PaymentsConfig,
+	SiteEditorConfig,
 	StylingConfig,
 	InteractivityConfig,
 ];
diff --git a/woocommerce-gutenberg-products-block.php b/woocommerce-gutenberg-products-block.php
index 5b69a165e1b..6d76c970ef6 100644
--- a/woocommerce-gutenberg-products-block.php
+++ b/woocommerce-gutenberg-products-block.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Blocks
  * Plugin URI: https://github.com/woocommerce/woocommerce-gutenberg-products-block
  * Description: WooCommerce blocks for the Gutenberg editor.
- * Version: 10.6.1
+ * Version: 10.6.2
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block
@@ -112,7 +112,6 @@ function () {
 	);
 }
 
-
 /**
  * Autoload packages.
  *