Merge branch 'trunk' into add/enable-blockified-templates-as-default

woocommerce · May 22, 2023 · 07ecc19 · 07ecc19
2 parents ba3fec1 + 4c78c89
commit 07ecc19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/assets/js/blocks/classic-template/archive-product.ts b/assets/js/blocks/classic-template/archive-product.ts
@@ -7,7 +7,6 @@ import {
 	type BlockInstance,
 } from '@wordpress/blocks';
 import { isWpVersion } from '@woocommerce/settings';
-import { isExperimentalBuild } from '@woocommerce/block-settings';
 import { __, sprintf } from '@wordpress/i18n';
 
 /**
@@ -64,7 +63,7 @@ const getBlockifiedTemplateWithTermDescription = (
 const isConversionPossible = () => {
 	// Blockification is possible for the WP version 6.1 and above,
 	// which are the versions the Products block supports.
-	return isExperimentalBuild() && isWpVersion( '6.1', '>=' );
+	return isWpVersion( '6.1', '>=' );
 };
 
 const getDescriptionAllowingConversion = ( templateTitle: string ) =>

diff --git a/assets/js/blocks/classic-template/product-search-results.ts b/assets/js/blocks/classic-template/product-search-results.ts
@@ -8,7 +8,6 @@ import {
 	type InnerBlockTemplate,
 } from '@wordpress/blocks';
 import { isWpVersion } from '@woocommerce/settings';
-import { isExperimentalBuild } from '@woocommerce/block-settings';
 import { __, sprintf } from '@wordpress/i18n';
 
 /**
@@ -111,7 +110,7 @@ const getBlockifiedTemplate = ( inheritedAttributes: InheritedAttributes ) =>
 const isConversionPossible = () => {
 	// Blockification is possible for the WP version 6.1 and above,
 	// which are the versions the Products block supports.
-	return isExperimentalBuild() && isWpVersion( '6.1', '>=' );
+	return isWpVersion( '6.1', '>=' );
 };
 
 const getDescriptionAllowingConversion = ( templateTitle: string ) =>