diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-query/variations/product-query.tsx b/plugins/woocommerce-blocks/assets/js/blocks/product-query/variations/product-query.tsx index 74925585892..c993c6903ed 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/product-query/variations/product-query.tsx +++ b/plugins/woocommerce-blocks/assets/js/blocks/product-query/variations/product-query.tsx @@ -1,7 +1,6 @@ /** * External dependencies */ -import { isFeaturePluginBuild } from '@woocommerce/block-settings'; import { registerBlockVariation } from '@wordpress/blocks'; import { Icon } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; @@ -19,33 +18,31 @@ import { const VARIATION_NAME = 'woocommerce/product-query'; -if ( isFeaturePluginBuild() ) { - registerBlockVariation( QUERY_LOOP_ID, { - description: __( - 'A block that displays a selection of products in your store.', - 'woo-gutenberg-products-block' - ), - name: VARIATION_NAME, - /* translators: “Products“ is the name of the block. */ - title: __( 'Products (Beta)', 'woo-gutenberg-products-block' ), - isActive: ( blockAttributes ) => - blockAttributes.namespace === VARIATION_NAME, - icon: ( - - ), - attributes: { - ...QUERY_DEFAULT_ATTRIBUTES, - namespace: VARIATION_NAME, - }, - // Gutenberg doesn't support this type yet, discussion here: - // https://github.com/WordPress/gutenberg/pull/43632 - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - allowedControls: DEFAULT_ALLOWED_CONTROLS, - innerBlocks: INNER_BLOCKS_TEMPLATE, - scope: [ 'inserter' ], - } ); -} +registerBlockVariation( QUERY_LOOP_ID, { + description: __( + 'A block that displays a selection of products in your store.', + 'woo-gutenberg-products-block' + ), + name: VARIATION_NAME, + /* translators: “Products“ is the name of the block. */ + title: __( 'Products (Beta)', 'woo-gutenberg-products-block' ), + isActive: ( blockAttributes ) => + blockAttributes.namespace === VARIATION_NAME, + icon: ( + + ), + attributes: { + ...QUERY_DEFAULT_ATTRIBUTES, + namespace: VARIATION_NAME, + }, + // Gutenberg doesn't support this type yet, discussion here: + // https://github.com/WordPress/gutenberg/pull/43632 + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + allowedControls: DEFAULT_ALLOWED_CONTROLS, + innerBlocks: INNER_BLOCKS_TEMPLATE, + scope: [ 'inserter' ], +} ); diff --git a/plugins/woocommerce-blocks/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md b/plugins/woocommerce-blocks/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md index 24a8daf6f30..d1672c5c664 100644 --- a/plugins/woocommerce-blocks/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md +++ b/plugins/woocommerce-blocks/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md @@ -33,7 +33,6 @@ The majority of our feature flagging is blocks, this is a list of them: ### Feature plugin flag -- Products (Beta) block ([JS flag](https://github.com/woocommerce/woocommerce-blocks/blob/b1aa635572b9639ac357bde1ff134b7ca15c00d6/assets/js/blocks/product-query/variations/product-query.tsx#L28)). - ⚛️ Product SKU ([JS flag](https://github.com/woocommerce/woocommerce-blocks/blob/4c18b1ff8511ede063e2082316a68eddc8231b51/assets/js/atomic/blocks/product-elements/sku/index.ts#L34)). - ⚛️ Product stock indicator ([JS flag](https://github.com/woocommerce/woocommerce-blocks/blob/4c18b1ff8511ede063e2082316a68eddc8231b51/assets/js/atomic/blocks/product-elements/stock-indicator/index.ts#L38)). diff --git a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/912.md b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/912.md new file mode 100644 index 00000000000..32e39e5e0d0 --- /dev/null +++ b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/912.md @@ -0,0 +1,9 @@ +# Testing notes and ZIP for release 9.1.2 + +Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/10278457/woocommerce-gutenberg-products-block.zip) + +## Feature plugin and package inclusion in WooCommerce + +### Remove feature flag from Products block ([8001](https://github.com/woocommerce/woocommerce-blocks/pull/8001)) + +1. Create a post or page and verify the Products (Beta) block is available form the inserter. diff --git a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md index 4e1f07ae01e..e9f23aae706 100644 --- a/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md +++ b/plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md @@ -107,7 +107,9 @@ Every release includes specific testing instructions for new features and bug fi - [8.9.2](./892.md) - [9.0.0](./900.md) - [9.1.0](./910.md) -- [9.1.1](./911.md) + - [9.1.1](./911.md) + - [9.1.2](./912.md) + diff --git a/plugins/woocommerce-blocks/package.json b/plugins/woocommerce-blocks/package.json index 18dea51a568..0e4b9922a8c 100644 --- a/plugins/woocommerce-blocks/package.json +++ b/plugins/woocommerce-blocks/package.json @@ -2,7 +2,7 @@ "name": "@woocommerce/block-library", "title": "WooCommerce Blocks", "author": "Automattic", - "version": "9.1.1", + "version": "9.1.2", "description": "WooCommerce blocks for the Gutenberg editor.", "homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/", "keywords": [ diff --git a/plugins/woocommerce-blocks/readme.txt b/plugins/woocommerce-blocks/readme.txt index cab24466ac3..7b75f65ff1f 100644 --- a/plugins/woocommerce-blocks/readme.txt +++ b/plugins/woocommerce-blocks/readme.txt @@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks Requires at least: 6.1.1 Tested up to: 6.1.1 Requires PHP: 7.0 -Stable tag: 9.1.1 +Stable tag: 9.1.2 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -79,6 +79,12 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/ == Changelog == += 9.1.2 - 2022-12-21 = + +#### Enhancements + +- Enable Products block into WC core. ([8001](https://github.com/woocommerce/woocommerce-blocks/pull/8001)) + = 9.1.1 - 2022-12-14 = #### Enhancements diff --git a/plugins/woocommerce-blocks/src/Package.php b/plugins/woocommerce-blocks/src/Package.php index 9c06b10d053..e100c642725 100644 --- a/plugins/woocommerce-blocks/src/Package.php +++ b/plugins/woocommerce-blocks/src/Package.php @@ -109,7 +109,7 @@ class Package { NewPackage::class, function ( $container ) { // leave for automated version bumping. - $version = '9.1.1'; + $version = '9.1.2'; return new NewPackage( $version, dirname( __DIR__ ), diff --git a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php b/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php index 88289c7c829..9cc22448020 100644 --- a/plugins/woocommerce-blocks/woocommerce-gutenberg-products-block.php +++ b/plugins/woocommerce-blocks/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: 9.1.1 + * Version: 9.1.2 * Author: Automattic * Author URI: https://woocommerce.com * Text Domain: woo-gutenberg-products-block