Commit 6245378393c for woocommerce

commit 6245378393c8ef140122c930864c0b6ca6cd4b7a
Author: Vladimir Reznichenko <kalessil@gmail.com>
Date:   Mon Nov 16 14:29:17 2026 +0100

    [Performance] Introduce lazy block registration for order confirmation blocks (#70779)

diff --git a/plugins/woocommerce/changelog/performance-optimize-blocks-registration-p2 b/plugins/woocommerce/changelog/performance-optimize-blocks-registration-p2
new file mode 100644
index 00000000000..d39a882baec
--- /dev/null
+++ b/plugins/woocommerce/changelog/performance-optimize-blocks-registration-p2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: performance
+
+Introduced lazy block registration for order confirmation blocks.
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields-wrapper/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields-wrapper/block.json
index 2f56d3b02ee..3b466105cca 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields-wrapper/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields-wrapper/block.json
@@ -27,6 +27,10 @@
 			}
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-additional-fields-wrapper.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields/block.json
index fde25a20b9e..9cc71dad2dc 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-fields/block.json
@@ -42,6 +42,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-additional-fields.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-information/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-information/block.json
index 423d050b02f..8adc11fa99e 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-information/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/additional-information/block.json
@@ -42,6 +42,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-additional-information.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-address/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-address/block.json
index 9c1a8f5d558..791d2f7191b 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-address/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-address/block.json
@@ -60,6 +60,10 @@
 			"default": "wide"
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-billing-address.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-wrapper/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-wrapper/block.json
index 3379ffefd6c..b8b740f1584 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-wrapper/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/billing-wrapper/block.json
@@ -27,6 +27,7 @@
 			}
 		}
 	},
+	"style": "wc-blocks-style",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads-wrapper/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads-wrapper/block.json
index 9b4463edffb..95d6bfc64a2 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads-wrapper/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads-wrapper/block.json
@@ -27,6 +27,7 @@
 			}
 		}
 	},
+	"style": "wc-blocks-style",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads/block.json
index 0a184159943..aedcac10c76 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/downloads/block.json
@@ -61,6 +61,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-downloads.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-address/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-address/block.json
index b15e8aeb91e..b8aa509f202 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-address/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-address/block.json
@@ -60,6 +60,10 @@
 			"default": "wide"
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-shipping-address.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-wrapper/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-wrapper/block.json
index 5baaacc7aca..72d6e067a96 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-wrapper/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/shipping-wrapper/block.json
@@ -28,6 +28,7 @@
 			}
 		}
 	},
+	"style": "wc-blocks-style",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/status/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/status/block.json
index 16fb445ecad..d3a822a4f75 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/status/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/status/block.json
@@ -54,6 +54,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-status.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/summary/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/summary/block.json
index 70bb1bcd406..7a0e0742c49 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/summary/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/summary/block.json
@@ -63,6 +63,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-summary.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals-wrapper/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals-wrapper/block.json
index 4980f906859..ec0aa573cc4 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals-wrapper/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals-wrapper/block.json
@@ -27,6 +27,7 @@
 			}
 		}
 	},
+	"style": "wc-blocks-style",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals/block.json
index d253717fe7b..8b6237c7d53 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/order-confirmation/totals/block.json
@@ -61,6 +61,10 @@
 			"default": ""
 		}
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../order-confirmation-totals.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFields.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFields.php
index 7749fdd5f5e..43cdbedefd9 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFields.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFields.php
@@ -2,6 +2,7 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;

@@ -9,6 +10,7 @@ use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;
  * AdditionalFields class.
  */
 class AdditionalFields extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFieldsWrapper.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFieldsWrapper.php
index d02346cb410..89ef22233ed 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFieldsWrapper.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalFieldsWrapper.php
@@ -2,6 +2,7 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;

@@ -9,6 +10,7 @@ use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;
  * AdditionalFieldsWrapper class.
  */
 class AdditionalFieldsWrapper extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalInformation.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalInformation.php
index 6ab76808916..72e9e081e79 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalInformation.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/AdditionalInformation.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * AdditionalInformation class.
  */
 class AdditionalInformation extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingAddress.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingAddress.php
index 154b31816af..86c64ad3db7 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingAddress.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingAddress.php
@@ -2,6 +2,7 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;

@@ -9,6 +10,7 @@ use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;
  * BillingAddress class.
  */
 class BillingAddress extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingWrapper.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingWrapper.php
index 358c0b410ea..c13a9950664 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingWrapper.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/BillingWrapper.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * BillingWrapper class.
  */
 class BillingWrapper extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -28,13 +31,4 @@ class BillingWrapper extends AbstractOrderConfirmationBlock {
 		}
 		return $content;
 	}
-
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Downloads.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Downloads.php
index d3bc53baf88..34e91bf8e4f 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Downloads.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Downloads.php
@@ -2,12 +2,14 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;

 /**
  * Downloads class.
  */
 class Downloads extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/DownloadsWrapper.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/DownloadsWrapper.php
index 97d53e26ca0..f55d6090417 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/DownloadsWrapper.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/DownloadsWrapper.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * DownloadsWrapper class.
  */
 class DownloadsWrapper extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -80,13 +83,4 @@ class DownloadsWrapper extends AbstractOrderConfirmationBlock {

 		return $content;
 	}
-
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingAddress.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingAddress.php
index d589befe5a7..e46696358c9 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingAddress.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingAddress.php
@@ -2,6 +2,7 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;

@@ -9,6 +10,7 @@ use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;
  * ShippingAddress class.
  */
 class ShippingAddress extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingWrapper.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingWrapper.php
index 3f46b147eb8..a539e1d41d2 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingWrapper.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/ShippingWrapper.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * ShippingWrapper class.
  */
 class ShippingWrapper extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -28,13 +31,4 @@ class ShippingWrapper extends AbstractOrderConfirmationBlock {
 		}
 		return $content;
 	}
-
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Status.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Status.php
index 3ffd795822a..036bdfd5f1f 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Status.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Status.php
@@ -2,12 +2,14 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;

 /**
  * Status class.
  */
 class Status extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Summary.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Summary.php
index b978d083989..79b9fedc482 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Summary.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Summary.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * Summary class.
  */
 class Summary extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Totals.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Totals.php
index 514ac6b2736..60dd7103324 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Totals.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/Totals.php
@@ -2,6 +2,7 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
 use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
 use Automattic\WooCommerce\Enums\OrderItemType;

@@ -9,6 +10,7 @@ use Automattic\WooCommerce\Enums\OrderItemType;
  * Totals class.
  */
 class Totals extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/TotalsWrapper.php b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/TotalsWrapper.php
index a53882c39fd..dd3d66b6d1c 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/TotalsWrapper.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/OrderConfirmation/TotalsWrapper.php
@@ -2,10 +2,13 @@

 namespace Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation;

+use Automattic\WooCommerce\Blocks\BlockTypes\EnableBlockJsonAssetsTrait;
+
 /**
  * TotalsWrapper class.
  */
 class TotalsWrapper extends AbstractOrderConfirmationBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -28,13 +31,4 @@ class TotalsWrapper extends AbstractOrderConfirmationBlock {
 		}
 		return $content;
 	}
-
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php b/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
index 24018a2de37..03393d44330 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
@@ -83,6 +83,49 @@ final class BlockTypesLazyController {
 			}
 		}

+		$is_admin     = is_admin();
+		$block_groups = array(
+			$this->get_order_confirmation_blocks(),
+		);
+		foreach ( $block_groups as $blocks_group ) {
+			foreach ( $blocks_group as $block_name => $block_class ) {
+				if ( isset( $whitelisted[ $block_class ] ) ) {
+					// Backward compatibility: use original handles for the editor scripts and blocks styles.
+					if ( ! $unified_editor_assets && $is_admin ) {
+						$this->asset_api->register_script( 'wc-' . $block_name . '-block', $this->asset_api->get_block_asset_build_path( $block_name ), array( 'wc-blocks' ) );
+					}
+					$asset_api          = $this->asset_api;
+					$use_custom_handles = static function ( $metadata ) use ( $block_name, $asset_api ) {
+						foreach ( (array) ( $metadata['style'] ?? array() ) as $index => $specifier ) {
+							if ( 'file:../' . $block_name . '.css' === $specifier ) {
+								$custom_handle               = 'wc-blocks-style-' . $block_name;
+								$metadata['style'][ $index ] = $custom_handle;
+								$asset_api->register_style( $custom_handle, $asset_api->get_block_asset_build_path( $block_name, 'css' ), array(), 'all', true );
+								break;
+							}
+						}
+						return $metadata;
+					};
+
+					add_filter( 'block_type_metadata', $use_custom_handles );
+					$registered_block_type = register_block_type_from_metadata(
+						$this->asset_api->generate_block_metadata_path( $block_name ),
+						array(
+							// Please, don't extend this list further! We expect everyone to lean onto block.json.
+							'render_callback' => $this->create_lazy_render_callback( $block_class ),
+							'editor_style'    => $unified_editor_assets ? 'wc-block-library-style' : 'wc-blocks-editor-style',
+							'editor_script'   => $unified_editor_assets ? 'wc-block-library' : 'wc-' . $block_name . '-block',
+						)
+					);
+					remove_filter( 'block_type_metadata', $use_custom_handles );
+
+					if ( $registered_block_type instanceof \WP_Block_Type ) {
+						$this->registered_blocks[ $block_class ] = $registered_block_type->name;
+					}
+				}
+			}
+		}
+
 		return array_keys( $this->registered_blocks );
 	}

@@ -109,8 +152,7 @@ final class BlockTypesLazyController {
 	 * @return array<string,string>
 	 */
 	private function get_cart_inner_blocks(): array {
-		// ProceedToCheckoutBlock: excluded — overrides enqueue_data() with editor-visible checkout page URL.
-		return array(
+		$list = array(
 			'cart-accepted-payment-methods-block'  => \Automattic\WooCommerce\Blocks\BlockTypes\CartAcceptedPaymentMethodsBlock::class,
 			'cart-cross-sells-block'               => \Automattic\WooCommerce\Blocks\BlockTypes\CartCrossSellsBlock::class,
 			'cart-cross-sells-products-block'      => \Automattic\WooCommerce\Blocks\BlockTypes\CartCrossSellsProductsBlock::class,
@@ -130,6 +172,12 @@ final class BlockTypesLazyController {
 			'empty-cart-block'                     => \Automattic\WooCommerce\Blocks\BlockTypes\EmptyCartBlock::class,
 			'filled-cart-block'                    => \Automattic\WooCommerce\Blocks\BlockTypes\FilledCartBlock::class,
 		);
+		if ( ! is_admin() ) {
+			// These blocks override enqueue_data() with editor-visible data, hence load eagerly in admin.
+			$list['proceed-to-checkout-block'] = \Automattic\WooCommerce\Blocks\BlockTypes\ProceedToCheckoutBlock::class;
+		}
+
+		return $list;
 	}

 	/**
@@ -171,8 +219,7 @@ final class BlockTypesLazyController {
 	 * @return array<string,string>
 	 */
 	private function get_mini_cart_inner_blocks(): array {
-		// MiniCartFooterBlock: excluded — overrides enqueue_data() with editor-visible footer description.
-		return array(
+		$list = array(
 			'empty-mini-cart-contents-block'      => \Automattic\WooCommerce\Blocks\BlockTypes\EmptyMiniCartContentsBlock::class,
 			'filled-mini-cart-contents-block'     => \Automattic\WooCommerce\Blocks\BlockTypes\FilledMiniCartContentsBlock::class,
 			'mini-cart-cart-button-block'         => \Automattic\WooCommerce\Blocks\BlockTypes\MiniCartCartButtonBlock::class,
@@ -184,5 +231,40 @@ final class BlockTypesLazyController {
 			'mini-cart-title-items-counter-block' => \Automattic\WooCommerce\Blocks\BlockTypes\MiniCartTitleItemsCounterBlock::class,
 			'mini-cart-title-label-block'         => \Automattic\WooCommerce\Blocks\BlockTypes\MiniCartTitleLabelBlock::class,
 		);
+		if ( ! is_admin() ) {
+			// These blocks override enqueue_data() with editor-visible data, hence load eagerly in admin.
+			$list['mini-cart-footer-block'] = \Automattic\WooCommerce\Blocks\BlockTypes\MiniCartFooterBlock::class;
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Side effect free and stateless order confirmation blocks.
+	 *
+	 * @return array<string,string>
+	 */
+	private function get_order_confirmation_blocks(): array {
+		// CreateAccount: excluded — overrides initialize() with hooked_block_types (Block Hooks API).
+		$list = array(
+			'order-confirmation-status'                 => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\Status::class,
+			'order-confirmation-summary'                => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\Summary::class,
+			'order-confirmation-totals'                 => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\Totals::class,
+			'order-confirmation-totals-wrapper'         => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\TotalsWrapper::class,
+			'order-confirmation-downloads'              => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\Downloads::class,
+			'order-confirmation-billing-wrapper'        => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\BillingWrapper::class,
+			'order-confirmation-shipping-wrapper'       => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\ShippingWrapper::class,
+			'order-confirmation-additional-information' => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\AdditionalInformation::class,
+			'order-confirmation-additional-fields'      => \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\AdditionalFields::class,
+		);
+		if ( ! is_admin() ) {
+			// These blocks override enqueue_data() with editor-visible data, hence load eagerly in admin.
+			$list['order-confirmation-billing-address']           = \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\BillingAddress::class;
+			$list['order-confirmation-shipping-address']          = \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\ShippingAddress::class;
+			$list['order-confirmation-downloads-wrapper']         = \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\DownloadsWrapper::class;
+			$list['order-confirmation-additional-fields-wrapper'] = \Automattic\WooCommerce\Blocks\BlockTypes\OrderConfirmation\AdditionalFieldsWrapper::class;
+		}
+
+		return $list;
 	}
 }