Merge branch 'trunk' into fix/use-forced-layout

.github/pull_request_template.md

@@ -18,8 +18,8 @@ Fixes #
 
 #### Other Checks
 
-- [ ] This PR adds/removes a feature flag & I've updated [this doc](../docs/blocks/feature-flags-and-experimental-interfaces.md) .
-- [ ] This PR adds/removes an experimental interfaces and I've updated [this doc](../docs/blocks/feature-flags-and-experimental-interfaces.md)
+- [ ] This PR adds/removes a feature flag & I've updated [this doc](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md).
+- [ ] This PR adds/removes an experimental interfaces and I've updated [this doc](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/docs/internal-developers/blocks/feature-flags-and-experimental-interfaces.md).
 - [ ] I tagged two reviewers because this PR makes queries to the database or I think it might have some security impact.
 
 ### Screenshots

.github/workflows/generate-zip.yml

@@ -57,7 +57,7 @@ jobs:
             ```
             https://wcblocks.wpcomstaging.com/wp-content/uploads/woocommerce-gutenberg-products-block-${{ github.event.pull_request.number }}.zip
             ```
-          allow-repeats: true
+          allow-repeats: false
 
       - name: Delete ZIP file
         run: rm -rf wc-blocks-pr-release__temp

assets/js/atomic/blocks/product-elements/image/test/block.test.js

@@ -9,11 +9,6 @@ import { ProductDataContextProvider } from '@woocommerce/shared-context';
  */
 import { Block } from '../block';
 
-jest.mock( '@woocommerce/block-settings', () => ( {
-	__esModule: true,
-	PLACEHOLDER_IMG_SRC: 'placeholder.jpg',
-} ) );
-
 jest.mock( '../../../../../hooks/style-attributes', () => ( {
 	__esModule: true,
 	useBorderProps: jest.fn( () => ( {