Merge 8.3.1 patch release

plugins/woocommerce-blocks/docs/internal-developers/testing/releases/831.md

@@ -0,0 +1,27 @@
+# Testing notes and ZIP for release 8.3.1
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/9358719/woocommerce-gutenberg-products-block.zip)
+
+## Feature plugin and package inclusion in WooCommerce
+
+### Prevent unnecessarily showing the item names in a shipping package if it's the only package. ([6899](https://github.com/woocommerce/woocommerce-blocks/pull/6899))
+
+1. Set up shipping zones so you have multiple methods for your country (flat rate and free is fine) and a single method for a different country.
+2. Install the ["Multiple Packages for WooCommerce" plugin](https://wordpress.org/plugins/multiple-packages-for-woocommerce/)
+3. Navigate to WooCommerce -> Settings -> Multiple Packages
+4. Adjust the settings to work based on "Per Product"
+5. Add two items that require shipping to your cart.
+6. Go to the Cart block. Ensure you see the item name listed under each package.
+7. Remove one of the items, ensure the list of shipping options updates and does not include the item name.
+8. Change your address to one that only has a single shipping method. Repeat steps 5-7.
+9. Repeat 5-7 on the Checkout block too.
+
+<!-- FEEDBACK -->
+
+---
+
+[We're hiring!](https://woocommerce.com/careers/) Come work with us!
+
+🐞 Found a mistake, or have a suggestion? [Leave feedback about this document here.](https://github.com/woocommerce/woocommerce-blocks/issues/new?assignees=&labels=type%3A+documentation&template=--doc-feedback.md&title=Feedback%20on%20./docs/internal-developers/testing/releases/810.md)
+
+<!-- /FEEDBACK -->

plugins/woocommerce-blocks/docs/internal-developers/testing/releases/README.md

@@ -86,6 +86,7 @@ Every release includes specific testing instructions for new features and bug fi
 -   [8.2.0](./820.md)
 -   [8.2.1](./821.md)
 -   [8.3.0](./830.md)
+-   [8.3.1](./831.md)
 
 <!-- FEEDBACK -->
 

plugins/woocommerce-blocks/package.json

@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "8.4.0-dev",
+	"version": "8.3.1",
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
 	"keywords": [

plugins/woocommerce-blocks/readme.txt

@@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
 Requires at least: 6.0
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 8.4.0-dev
+Stable tag: 8.3.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -86,6 +86,12 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 8.3.1 - 2022-08-17 =
+#### Bug Fixes
+
+
+- Prevent unnecessarily showing the item names in a shipping package if it's the only package. ([6899](https://github.com/woocommerce/woocommerce-blocks/pull/6899))
+
 = 8.3.0 - 2022-08-15 =
 
 #### Enhancements

plugins/woocommerce-blocks/src/Package.php

@@ -113,7 +113,7 @@ class Package {
 				NewPackage::class,
 				function ( $container ) {
 					// leave for automated version bumping.
-					$version = '8.4.0-dev';
+					$version = '8.3.1';
 					return new NewPackage(
 						$version,
 						dirname( __DIR__ ),

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: 8.4.0-dev
+ * Version: 8.3.1
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block