Update the repo with the last changes done in WooCommerce Blocks plugin

.github/compare-assets/index.js

@@ -51,7 +51,45 @@ const runner = async () => {
 				.filter( Boolean )
 		);
 
+		let reportCommentId;
+
+		{
+			const currentComments = await octokit.rest.issues.listComments( {
+				owner,
+				repo,
+				issue_number: payload.pull_request.number,
+			} );
+
+			if (
+				Array.isArray( currentComments.data ) &&
+				currentComments.data.length > 0
+			) {
+				const comment = currentComments.data.find(
+					( comment ) =>
+						comment.body.includes( 'Script Dependencies Report' ) &&
+						comment.user.login === 'github-actions[bot]'
+				);
+
+				if ( comment ) {
+					reportCommentId = comment.id;
+				}
+			}
+		}
+
 		if ( Object.keys( changes ).length === 0 ) {
+			if ( reportCommentId ) {
+				await octokit.rest.issues.updateComment( {
+					owner,
+					repo,
+					comment_id: reportCommentId,
+					body:
+						'# Script Dependencies Report' +
+						'\n\n' +
+						'There is no changed script dependency between this branch and trunk.' +
+						'\n\n' +
+						'__This comment was automatically generated by the `./github/compare-assets` action.__',
+				} );
+			}
 			return;
 		}
 
@@ -82,24 +120,35 @@ const runner = async () => {
 			}
 		);
 
-		await octokit.rest.issues.createComment( {
-			owner,
-			repo,
-			issue_number: payload.pull_request.number,
-			body:
-				'# Script Dependencies Report' +
-				'\n\n' +
-				'The `compare-assets` action has detected some changed script dependencies between this branch and ' +
-				'trunk. Please review and confirm the following are correct before merging.' +
-				'\n\n' +
-				'| Script Handle | Added | Removed |    |' +
-				'\n' +
-				'| ------------- | ------| ------- | -- |' +
-				'\n' +
-				reportContent +
-				'\n\n' +
-				'__This comment was automatically generated by the `./github/compare-assets` action.__',
-		} );
+		const commentBody =
+			'# Script Dependencies Report' +
+			'\n\n' +
+			'The `compare-assets` action has detected some changed script dependencies between this branch and ' +
+			'trunk. Please review and confirm the following are correct before merging.' +
+			'\n\n' +
+			'| Script Handle | Added | Removed |    |' +
+			'\n' +
+			'| ------------- | ------| ------- | -- |' +
+			'\n' +
+			reportContent +
+			'\n\n' +
+			'__This comment was automatically generated by the `./github/compare-assets` action.__';
+
+		if ( reportCommentId ) {
+			await octokit.rest.issues.updateComment( {
+				owner,
+				repo,
+				comment_id: reportCommentId,
+				body: commentBody,
+			} );
+		} else {
+			await octokit.rest.issues.createComment( {
+				owner,
+				repo,
+				issue_number: payload.pull_request.number,
+				body: commentBody,
+			} );
+		}
 	} catch ( error ) {
 		setFailed( error.message );
 	}

.github/dependabot.yml

@@ -7,17 +7,29 @@ updates:
       schedule:
           interval: 'monthly'
       open-pull-requests-limit: 10
+      labels:
+        - "skip-changelog"
+        - "type: dependencies"
+        - "github_actions"
 
       # Maintain dependencies for npm
     - package-ecosystem: 'npm'
       directory: '/'
       schedule:
           interval: 'weekly'
       open-pull-requests-limit: 10
+      labels:
+        - "skip-changelog"
+        - "type: dependencies"
+        - "javascript"
 
       # Maintain dependencies for Composer
     - package-ecosystem: 'composer'
       directory: '/'
       schedule:
           interval: 'weekly'
       open-pull-requests-limit: 10
+      labels:
+        - "skip-changelog"
+        - "type: dependencies"
+        - "php"

.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/automate-team-review-assignment-config.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
     add-reviews:
-        if: github.event.pull_request.draft == false
+        if: github.event.pull_request.draft == false && github.actor != 'dependabot[bot]' 
         runs-on: ubuntu-latest
         steps:
             - name: Check config and assign reviews

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
             # Initializes the CodeQL tools for scanning.
             - name: Initialize CodeQL
-              uses: github/codeql-action/init@v1
+              uses: github/codeql-action/init@v2
               with:
                   languages: ${{ matrix.language }}
                   # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
             # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
             # If this step fails, then you should remove it and run the build manually (see below)
             - name: Autobuild
-              uses: github/codeql-action/autobuild@v1
+              uses: github/codeql-action/autobuild@v2
 
             # ℹ️ Command-line programs to run using the OS shell.
             # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
             #   make release
 
             - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v1
+              uses: github/codeql-action/analyze@v2

.github/workflows/generate-zip.yml

@@ -38,7 +38,7 @@ jobs:
         run: mv woocommerce-gutenberg-products-block.zip wc-blocks-pr-release__temp/woocommerce-gutenberg-products-block-${{ github.event.pull_request.number }}.zip
 
       - name: Transfer ZIP file via SFTP
-        uses: AbleLincoln/push-to-sftp@v1.0
+        uses: AbleLincoln/push-to-sftp@v1.2
         with:
           host: ${{ secrets.FTP_HOST }}
           port: 22

.github/workflows/js-css-md-linting.yml

@@ -4,6 +4,10 @@ on:
     pull_request:
     push:
         branches: [trunk]
+permissions:
+  actions: write
+  checks: write
+  pull-requests: read
 
 jobs:
     # cache node and modules

.github/workflows/project-management-automations.yml

@@ -5,6 +5,9 @@ on:
     issues:
         types: [edited]
 name: Project management automations
+permissions:
+  pull-requests: write
+  actions: write
 jobs:
     project-management-automation:
         runs-on: ubuntu-latest

assets/js/atomic/blocks/product-elements/button/block.js

@@ -8,6 +8,12 @@ import {
 	useStoreEvents,
 	useStoreAddToCart,
 } from '@woocommerce/base-context/hooks';
+import {
+	useBorderProps,
+	useColorProps,
+	useTypographyProps,
+	useSpacingProps,
+} from '@woocommerce/base-hooks';
 import { decodeEntities } from '@wordpress/html-entities';
 import { CART_URL } from '@woocommerce/block-settings';
 import { getSetting } from '@woocommerce/settings';
@@ -21,12 +27,6 @@ import { withProductDataContext } from '@woocommerce/shared-hocs';
  * Internal dependencies
  */
 import './style.scss';
-import {
-	useBorderProps,
-	useColorProps,
-	useTypographyProps,
-	useSpacingProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Button Block Component.

assets/js/atomic/blocks/product-elements/category-list/block.tsx

@@ -7,6 +7,7 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import { useColorProps, useTypographyProps } from '@woocommerce/base-hooks';
 import { isEmpty } from 'lodash';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 import { HTMLAttributes } from 'react';
@@ -16,10 +17,6 @@ import { HTMLAttributes } from 'react';
  */
 import './style.scss';
 import { Attributes } from './types';
-import {
-	useColorProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 type Props = Attributes & HTMLAttributes< HTMLDivElement >;
 

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

@@ -10,6 +10,11 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import {
+	useBorderProps,
+	useSpacingProps,
+	useTypographyProps,
+} from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 import { useStoreEvents } from '@woocommerce/base-context/hooks';
 
@@ -18,11 +23,6 @@ import { useStoreEvents } from '@woocommerce/base-context/hooks';
  */
 import ProductSaleBadge from './../sale-badge/block';
 import './style.scss';
-import {
-	useBorderProps,
-	useSpacingProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Image Block Component.

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

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

assets/js/atomic/blocks/product-elements/price/block.js

@@ -9,15 +9,12 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import { useColorProps, useTypographyProps } from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 
 /**
  * Internal dependencies
  */
-import {
-	useColorProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Price Block Component.

assets/js/atomic/blocks/product-elements/rating/block.js

@@ -8,17 +8,17 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import {
+	useColorProps,
+	useSpacingProps,
+	useTypographyProps,
+} from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-import {
-	useColorProps,
-	useSpacingProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Rating Block Component.

assets/js/atomic/blocks/product-elements/sale-badge/block.js

@@ -9,18 +9,18 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import {
+	useBorderProps,
+	useColorProps,
+	useSpacingProps,
+	useTypographyProps,
+} from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-import {
-	useBorderProps,
-	useColorProps,
-	useSpacingProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Sale Badge Block Component.

assets/js/atomic/blocks/product-elements/stock-indicator/block.js

@@ -8,16 +8,13 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import { useColorProps, useTypographyProps } from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-import {
-	useColorProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Stock Indicator Block Component.

assets/js/atomic/blocks/product-elements/summary/block.js

@@ -10,16 +10,13 @@ import {
 	useInnerBlockLayoutContext,
 	useProductDataContext,
 } from '@woocommerce/shared-context';
+import { useColorProps, useTypographyProps } from '@woocommerce/base-hooks';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-import {
-	useColorProps,
-	useTypographyProps,
-} from '../../../../hooks/style-attributes';
 
 /**
  * Product Summary Block Component.