Release: 10.2.1 (#9599)

* Empty commit for release pull request * Add 10.2.1 changelog * Update versions to 10.2.1 * Fix Mini-Cart block conflict with Page Optimize and Product Bundles (II) (#9586) * Add 10.2.1 testing steps --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: Albert Juhé Lluveras <[email protected]>
woocommerce · May 25, 2023 · 1f69a31 · 1f69a31
1 parent 18d7d35
commit 1f69a31
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 8 deletions.
diff --git 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.2.0",
+	"version": "10.2.1",
 	"keywords": [
 		"gutenberg",
 		"woocommerce",

diff --git a/docs/internal-developers/testing/releases/1021.md b/docs/internal-developers/testing/releases/1021.md
@@ -0,0 +1,18 @@
+# Testing notes and ZIP for release 10.2.1
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/11563088/woocommerce-gutenberg-products-block.zip)
+
+## WooCommerce Core
+
+### Fix Mini-Cart block conflict with Page Optimize and Product Bundles. [(9586)](https://github.com/woocommerce/woocommerce-blocks/pull/9586)
+
+1. Make sure you have WC core 7.7.
+2. Enable a block theme.
+3. Add the Mini-Cart block to the header of your store.
+4. Install the Page Optimize and Product Bundles plugins (no need to change anything in their configuration).
+5. Go to a page in the frontend that doesn't have any blocks besides the Mini-Cart you added to the header.
+6. Open the Mini-Cart and verify there is no JS error:
+
+Before | After
+--- | ---
+![image](https://github.com/woocommerce/woocommerce-blocks/assets/3616980/307b07c5-0c59-4d04-9599-8cc38691ead9) | ![image](https://github.com/woocommerce/woocommerce-blocks/assets/3616980/108f21c1-a658-4441-9bad-910ec701bb36)
diff --git a/docs/internal-developers/testing/releases/README.md b/docs/internal-developers/testing/releases/README.md
@@ -144,6 +144,7 @@ Every release includes specific testing instructions for new features and bug fi
     -   [10.0.4](./1004.md)
 -   [10.1.0](./1010.md)
 -   [10.2.0](./1020.md)
+    -   [10.2.1](./1021.md)
 
 
 <!-- FEEDBACK -->

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "10.2.0",
+	"version": "10.2.1",
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
 	"keywords": [

diff --git 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.2.0
+Stable tag: 10.2.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -81,6 +81,12 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 10.2.1 - 2023-05-25 =
+
+#### Bug Fixes
+
+- Fix a conflict between the Mini-Cart block and the Page Optimize and Product Bundles extensions. ([9586](https://github.com/woocommerce/woocommerce-blocks/pull/9586))
+
 = 10.2.0 - 2023-05-08 =
 
 #### Enhancements

diff --git a/src/BlockTypes/MiniCart.php b/src/BlockTypes/MiniCart.php
@@ -330,7 +330,7 @@ protected function append_script_and_deps_src( $script ) {
 		$wp_scripts = wp_scripts();
 
 		// This script and its dependencies have already been appended.
-		if ( ! $script || array_key_exists( $script->handle, $this->scripts_to_lazy_load ) || wp_script_is( $script->handle, 'done' ) ) {
+		if ( ! $script || array_key_exists( $script->handle, $this->scripts_to_lazy_load ) || wp_script_is( $script->handle, 'enqueued' ) ) {
 			return;
 		}
 

diff --git 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.2.0';
+					$version = '10.2.1';
 					return new NewPackage(
 						$version,
 						dirname( __DIR__ ),

diff --git 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.2.0
+ * Version: 10.2.1
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block