Release: 7.4.1 (#6262)

* Call plugin_dir_url() in Package::get_url() instead of from its constructor. (#6260) * Empty commit for release pull request * add readme * Bumping version strings to new version. * add testing steps Co-authored-by: Shendy <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: Nadir Seghir <[email protected]>
woocommerce · Apr 14, 2022 · 14bfb87 · 14bfb87
1 parent ac1eb1a
commit 14bfb87
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/docs/testing/releases/741.md b/docs/testing/releases/741.md
@@ -0,0 +1,12 @@
+## Testing notes and ZIP for release 7.4.1
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-gutenberg-products-block/files/8482828/woocommerce-gutenberg-products-block.zip)
+
+## Feature plugin and package inclusion in WooCommerce
+
+### WC-Admin doesn't crash when WC Subscriptions is installed. ([6260](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/6260))
+
+1. Go to an atomic website (or locally with symlinked WooCommrece).
+2. Install WC Subscriptions.
+Try to open wp-admin > WooCommerce > Home (/wp-admin/admin.php?page=wc-admin).
+3. Page should load normally.
diff --git a/docs/testing/releases/README.md b/docs/testing/releases/README.md
@@ -65,6 +65,7 @@ Every release includes specific testing instructions for new features and bug fi
 -   [7.2.0](./720.md)
 -   [7.3.0](./730.md)
 -   [7.4.0](./740.md)
+    -   [7.4.1](./741.md)
 
 <!-- FEEDBACK -->
 ---

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "7.4.0",
+	"version": "7.4.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: 5.9
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 7.4.0
+Stable tag: 7.4.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 ==
 
+= 7.4.1 - 2022-04-14 =
+
+#### Bug Fixes
+
+- Fix page load problem due to incorrect URL to certain assets. ([6260](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/6260))
+
 = 7.4.0 - 2022-04-11 =
 
 #### Enhancements

diff --git a/src/Domain/Package.php b/src/Domain/Package.php
@@ -52,9 +52,6 @@ public function __construct( $version, $plugin_path, FeatureGating $feature_gati
 		$this->version        = $version;
 		$this->path           = $plugin_path;
 		$this->feature_gating = $feature_gating;
-
-		// Append index.php so WP does not return the parent directory.
-		$this->plugin_dir_url = plugin_dir_url( $this->path . '/index.php' );
 	}
 
 	/**
@@ -87,6 +84,11 @@ public function get_path( $relative_path = '' ) {
 	 * @return string
 	 */
 	public function get_url( $relative_url = '' ) {
+		if ( ! $this->plugin_dir_url ) {
+			// Append index.php so WP does not return the parent directory.
+			$this->plugin_dir_url = plugin_dir_url( $this->path . '/index.php' );
+		}
+
 		return $this->plugin_dir_url . $relative_url;
 	}
 

diff --git a/src/Package.php b/src/Package.php
@@ -106,7 +106,7 @@ public static function container( $reset = false ) {
 				NewPackage::class,
 				function ( $container ) {
 					// leave for automated version bumping.
-					$version = '7.4.0';
+					$version = '7.4.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: 7.4.0
+ * Version: 7.4.1
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block