diff --git a/.github/workflows/automate-team-review-assignment-config.yml b/.github/workflows/automate-team-review-assignment-config.yml
index 51f457b347c..76c242d7ea6 100644
--- a/.github/workflows/automate-team-review-assignment-config.yml
+++ b/.github/workflows/automate-team-review-assignment-config.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
     add-reviews:
-        if: github.event.pull_request.draft == false && github.actor !== 'dependabot[bot]'
+        if: github.event.pull_request.draft == false && github.actor != 'dependabot[bot]' 
         runs-on: ubuntu-latest
         steps:
             - name: Check config and assign reviews
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c7fa303101e..3a28bd571c9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.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
diff --git a/.github/workflows/generate-zip.yml b/.github/workflows/generate-zip.yml
index a9add0f59bc..7105ef1e15a 100644
--- a/.github/workflows/generate-zip.yml
+++ b/.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
diff --git a/assets/js/base/components/product-list/product-list.tsx b/assets/js/base/components/product-list/product-list.tsx
index c2d0ca4b2e0..00133d8ede1 100644
--- a/assets/js/base/components/product-list/product-list.tsx
+++ b/assets/js/base/components/product-list/product-list.tsx
@@ -238,7 +238,11 @@ const ProductList = ( {
 			) }
 			{ ! hasProducts && ! hasFilters && <NoProducts /> }
 			{ hasProducts && (
-				<ul className={ `${ parentClassName }__products` }>
+				<ul
+					className={ classnames( `${ parentClassName }__products`, {
+						'is-loading-products': productsLoading,
+					} ) }
+				>
 					{ listProducts.map( ( product = {}, i: number ) => (
 						<ProductListItem
 							key={ product.id || i }
diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/saved-payment-method-options.js b/assets/js/blocks/cart-checkout-shared/payment-methods/saved-payment-method-options.js
index e2abed1cc32..3db78c57a04 100644
--- a/assets/js/blocks/cart-checkout-shared/payment-methods/saved-payment-method-options.js
+++ b/assets/js/blocks/cart-checkout-shared/payment-methods/saved-payment-method-options.js
@@ -136,6 +136,7 @@ const SavedPaymentMethodOptions = () => {
 				id={ 'wc-payment-method-saved-tokens' }
 				selected={ activeSavedToken }
 				options={ options }
+				onChange={ () => void 0 }
 			/>
 			{ savedPaymentMethodHandler }
 		</>
diff --git a/composer.json b/composer.json
index 0f8839383d5..56a423a8ab5 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"wp-phpunit/wp-phpunit": "^6.0",
 		"woocommerce/woocommerce-sniffs": "0.1.0",
 		"yoast/phpunit-polyfills": "^1.0",
-		"johnbillion/wp-hooks-generator": "^0.7.0",
+		"johnbillion/wp-hooks-generator": "^0.9.0",
 		"mockery/mockery": "^1.4"
 	},
 	"autoload": {
diff --git a/composer.lock b/composer.lock
index 1c032fc5fd0..1a0acfea8f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "850407a57ac7e6ccbae75e7a37a6b3a6",
+    "content-hash": "938acec166de3572a0884e7e81a9ba52",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -282,29 +282,30 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -331,7 +332,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
             },
             "funding": [
                 {
@@ -347,7 +348,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -452,20 +453,21 @@
         },
         {
             "name": "johnbillion/wp-hooks-generator",
-            "version": "0.7.0",
+            "version": "0.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/johnbillion/wp-hooks-generator.git",
-                "reference": "26027e46d5396afbeb5ed18b0cd6a75deb2f2996"
+                "url": "https://github.com/wp-hooks/generator.git",
+                "reference": "6c7f173d85452db52a59a3a6bb943cbe7d845cde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnbillion/wp-hooks-generator/zipball/26027e46d5396afbeb5ed18b0cd6a75deb2f2996",
-                "reference": "26027e46d5396afbeb5ed18b0cd6a75deb2f2996",
+                "url": "https://api.github.com/repos/wp-hooks/generator/zipball/6c7f173d85452db52a59a3a6bb943cbe7d845cde",
+                "reference": "6c7f173d85452db52a59a3a6bb943cbe7d845cde",
                 "shasum": ""
             },
             "require": {
-                "johnbillion/wp-parser-lib": "^1",
+                "ext-libxml": "*",
+                "johnbillion/wp-parser-lib": "^1.3.0",
                 "php": ">=7"
             },
             "require-dev": {
@@ -488,29 +490,30 @@
             ],
             "description": "Generates a JSON representation of the WordPress actions and filters in your code",
             "support": {
-                "issues": "https://github.com/johnbillion/wp-hooks-generator/issues",
-                "source": "https://github.com/johnbillion/wp-hooks-generator/tree/0.7.0"
+                "issues": "https://github.com/wp-hooks/generator/issues",
+                "source": "https://github.com/wp-hooks/generator/tree/0.9.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/johnbillion",
+                    "url": "https://github.com/sponsors/johnbillion",
                     "type": "github"
                 }
             ],
-            "time": "2021-11-10T17:22:21+00:00"
+            "abandoned": "wp-hooks/generator",
+            "time": "2022-07-03T12:35:07+00:00"
         },
         {
             "name": "johnbillion/wp-parser-lib",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnbillion/wp-parser-lib.git",
-                "reference": "4fd13bebd7fc7ac6e3ab9a1abc95afb6d6447647"
+                "reference": "46ed07365f8bd22f1edc828f9cfeed0c0f2c7d07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnbillion/wp-parser-lib/zipball/4fd13bebd7fc7ac6e3ab9a1abc95afb6d6447647",
-                "reference": "4fd13bebd7fc7ac6e3ab9a1abc95afb6d6447647",
+                "url": "https://api.github.com/repos/johnbillion/wp-parser-lib/zipball/46ed07365f8bd22f1edc828f9cfeed0c0f2c7d07",
+                "reference": "46ed07365f8bd22f1edc828f9cfeed0c0f2c7d07",
                 "shasum": ""
             },
             "require": {
@@ -521,11 +524,11 @@
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "lib"
-                ],
                 "files": [
                     "lib/runner.php"
+                ],
+                "classmap": [
+                    "lib"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -550,9 +553,9 @@
             ],
             "support": {
                 "issues": "https://github.com/johnbillion/wp-parser-lib/issues",
-                "source": "https://github.com/johnbillion/wp-parser-lib/tree/1.1.0"
+                "source": "https://github.com/johnbillion/wp-parser-lib/tree/1.3.0"
             },
-            "time": "2021-01-06T22:49:12+00:00"
+            "time": "2022-01-27T13:57:08+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -628,37 +631,38 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -674,7 +678,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -682,7 +686,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1269,16 +1273,16 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -1317,7 +1321,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -1325,7 +1329,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -1629,11 +1633,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1973,16 +1977,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -2024,7 +2028,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -2032,20 +2036,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -2094,14 +2098,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2109,7 +2113,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -2759,16 +2763,16 @@
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "1a582ab1d91e86aa450340c4d35631a85314ff9f"
+                "reference": "5ea3536428944955f969bc764bbe09738e151ada"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/1a582ab1d91e86aa450340c4d35631a85314ff9f",
-                "reference": "1a582ab1d91e86aa450340c4d35631a85314ff9f",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada",
+                "reference": "5ea3536428944955f969bc764bbe09738e151ada",
                 "shasum": ""
             },
             "require": {
@@ -2816,7 +2820,7 @@
                 "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2021-10-03T08:40:26+00:00"
+            "time": "2021-11-23T01:37:03+00:00"
         }
     ],
     "aliases": [],
diff --git a/package-lock.json b/package-lock.json
index 25458607ab6..6a47bfb6850 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
 	"packages": {
 		"": {
 			"name": "@woocommerce/block-library",
-			"version": "8.2.0-dev",
+			"version": "8.3.0-dev",
 			"hasInstallScript": true,
 			"license": "GPL-3.0+",
 			"dependencies": {
@@ -19,7 +19,7 @@
 				"@wordpress/primitives": "3.0.4",
 				"@wordpress/server-side-render": "3.10.0",
 				"@wordpress/url": "3.13.0",
-				"@wordpress/wordcount": "3.12.0",
+				"@wordpress/wordcount": "3.13.0",
 				"classnames": "2.3.1",
 				"compare-versions": "4.1.3",
 				"config": "3.3.7",
@@ -72,12 +72,12 @@
 				"@types/wordpress__data": "4.6.11",
 				"@types/wordpress__data-controls": "2.2.0",
 				"@typescript-eslint/eslint-plugin": "5.30.5",
-				"@typescript-eslint/parser": "5.30.5",
+				"@typescript-eslint/parser": "5.31.0",
 				"@woocommerce/api": "0.2.0",
 				"@woocommerce/e2e-utils": "0.2.0",
 				"@woocommerce/eslint-plugin": "2.0.0",
 				"@woocommerce/woocommerce-rest-api": "1.0.1",
-				"@wordpress/api-fetch": "6.9.0",
+				"@wordpress/api-fetch": "6.11.0",
 				"@wordpress/babel-preset-default": "6.14.0",
 				"@wordpress/base-styles": "4.0.4",
 				"@wordpress/block-editor": "8.2.0",
@@ -92,8 +92,8 @@
 				"@wordpress/element": "4.0.4",
 				"@wordpress/env": "4.9.0",
 				"@wordpress/html-entities": "3.12.0",
-				"@wordpress/i18n": "4.12.0",
-				"@wordpress/is-shallow-equal": "4.12.0",
+				"@wordpress/i18n": "4.14.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/prettier-config": "1.4.0",
 				"@wordpress/scripts": "22.3.0",
 				"autoprefixer": "10.4.7",
@@ -136,7 +136,7 @@
 				"lodash": "4.17.21",
 				"markdown-it": "13.0.1",
 				"merge-config": "2.0.0",
-				"mini-css-extract-plugin": "1.3.6",
+				"mini-css-extract-plugin": "1.6.2",
 				"patch-package": "6.4.7",
 				"postcss": "8.4.14",
 				"postcss-loader": "4.2.0",
@@ -10616,14 +10616,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "5.30.5",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.5.tgz",
-			"integrity": "sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==",
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz",
+			"integrity": "sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==",
 			"dev": true,
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "5.30.5",
-				"@typescript-eslint/types": "5.30.5",
-				"@typescript-eslint/typescript-estree": "5.30.5",
+				"@typescript-eslint/scope-manager": "5.31.0",
+				"@typescript-eslint/types": "5.31.0",
+				"@typescript-eslint/typescript-estree": "5.31.0",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -10642,6 +10642,95 @@
 				}
 			}
 		},
+		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz",
+			"integrity": "sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.31.0",
+				"@typescript-eslint/visitor-keys": "5.31.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz",
+			"integrity": "sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz",
+			"integrity": "sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.31.0",
+				"@typescript-eslint/visitor-keys": "5.31.0",
+				"debug": "^4.3.4",
+				"globby": "^11.1.0",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.7",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz",
+			"integrity": "sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.31.0",
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/parser/node_modules/semver": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/@typescript-eslint/scope-manager": {
 			"version": "5.30.5",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.5.tgz",
@@ -11253,34 +11342,26 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/a11y/node_modules/@wordpress/i18n": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-			"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
+		"node_modules/@wordpress/api-fetch": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.11.0.tgz",
+			"integrity": "sha512-C1HTWdJQ7ikhJ4mT+rONTODquJ/Xq5HteKak/VN+vf1VmLVfRX18wJ84kCAAZ83UNOIsE8EgjJrjJy//R+HWzg==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.13.0",
-				"gettext-parser": "^1.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			},
-			"bin": {
-				"pot-to-php": "tools/pot-to-php.js"
+				"@wordpress/i18n": "^4.14.0",
+				"@wordpress/url": "^3.15.0"
 			},
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/api-fetch": {
-			"version": "6.9.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.9.0.tgz",
-			"integrity": "sha512-H0IvLlisBcfKFa4tlMgtqFy7s7Iz3SSe6cEzqAAesK1fg+j3NewDP4fcQz5Ooo6pL+Y2A8oUM5dawjJctmsnAA==",
+		"node_modules/@wordpress/api-fetch/node_modules/@wordpress/url": {
+			"version": "3.15.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.15.0.tgz",
+			"integrity": "sha512-LLlgCMbherqqnxAuK6kb997MKkzfnvkyQQ5RazBQKBn//RBXrW/w6BMVglm4QjV7L65N/IfqFd36QLZDMuiYDA==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "^4.12.0",
-				"@wordpress/url": "^3.13.0"
+				"remove-accents": "^0.4.2"
 			},
 			"engines": {
 				"node": ">=12"
@@ -11802,7 +11883,7 @@
 				"@wordpress/compose": "^5.11.0",
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"@wordpress/redux-routine": "^4.13.0",
 				"equivalent-key-map": "^0.2.2",
@@ -11859,7 +11940,7 @@
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/dom": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/keycodes": "^3.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"clipboard": "^2.0.8",
@@ -11916,17 +11997,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/data/node_modules/@wordpress/is-shallow-equal": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/date": {
 			"version": "4.13.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.13.0.tgz",
@@ -13965,9 +14035,9 @@
 			}
 		},
 		"node_modules/@wordpress/hooks": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.13.0.tgz",
-			"integrity": "sha512-N+82Dt3jsREtN0dCypehaWuwCjPOM3ljxyzVWULMDrIK9TaIvkunkHViIyoCkxWk3lolRRqh8XmD+ox/mF+n1A==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.14.0.tgz",
+			"integrity": "sha512-bcQXql4A1VI6gnTdNzMjdHLGTpnf8oWOQ1r8B8fcvtOF3dKictxJPobarWxFbtVTQoegizZT/lPCMoLsnVJpug==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
 			},
@@ -13988,12 +14058,12 @@
 			}
 		},
 		"node_modules/@wordpress/i18n": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.12.0.tgz",
-			"integrity": "sha512-UTccrAOZ03nszzlG74G+ZkMR/kK0PoS1fqFa8NRFAhHneYadJOnsgCCd5YgDAsN+tAKA6QM7RPmpQMwujvIbzA==",
+			"version": "4.14.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.14.0.tgz",
+			"integrity": "sha512-46ryvPbh139RkLXQt8oey4aCcWo6HRKb1NLVHU4a4kJ4HRD/HLhAeTHKAMiZFWTg+QC1HZC32vGdEikqrpnlzQ==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.12.0",
+				"@wordpress/hooks": "^3.14.0",
 				"gettext-parser": "^1.3.1",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0",
@@ -14021,9 +14091,9 @@
 			}
 		},
 		"node_modules/@wordpress/is-shallow-equal": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.12.0.tgz",
-			"integrity": "sha512-jlpHXPLJw0mG13bcbZIJwOd1DQozJ5+fbkkKA2JeTO5d5PXs44Rw6EYdGMLUU97B44UxIwVbaui7tJGOvzF8Dw==",
+			"version": "4.13.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
+			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
 			},
@@ -14157,26 +14227,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/keycodes/node_modules/@wordpress/i18n": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-			"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.13.0",
-				"gettext-parser": "^1.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			},
-			"bin": {
-				"pot-to-php": "tools/pot-to-php.js"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/notices": {
 			"version": "3.12.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.12.0.tgz",
@@ -14235,7 +14285,7 @@
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/dom": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/keycodes": "^3.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"clipboard": "^2.0.8",
@@ -14305,17 +14355,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/plugins/node_modules/@wordpress/is-shallow-equal": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/plugins/node_modules/@wordpress/primitives": {
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.11.0.tgz",
@@ -14439,7 +14478,7 @@
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/dom": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/keycodes": "^3.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"clipboard": "^2.0.8",
@@ -14496,37 +14535,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/rich-text/node_modules/@wordpress/i18n": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-			"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.13.0",
-				"gettext-parser": "^1.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			},
-			"bin": {
-				"pot-to-php": "tools/pot-to-php.js"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@wordpress/rich-text/node_modules/@wordpress/is-shallow-equal": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/rich-text/node_modules/rememo": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/rememo/-/rememo-4.0.1.tgz",
@@ -16157,7 +16165,7 @@
 				"@wordpress/hooks": "^3.13.0",
 				"@wordpress/html-entities": "^3.13.0",
 				"@wordpress/i18n": "^4.13.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/shortcode": "^3.13.0",
 				"colord": "^2.7.0",
 				"hpq": "^1.3.0",
@@ -16199,7 +16207,7 @@
 				"@wordpress/hooks": "^3.13.0",
 				"@wordpress/i18n": "^4.13.0",
 				"@wordpress/icons": "^9.4.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/keycodes": "^3.13.0",
 				"@wordpress/primitives": "^3.11.0",
 				"@wordpress/rich-text": "^5.11.0",
@@ -16240,7 +16248,7 @@
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/dom": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/keycodes": "^3.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"clipboard": "^2.0.8",
@@ -16308,26 +16316,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/server-side-render/node_modules/@wordpress/i18n": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-			"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.13.0",
-				"gettext-parser": "^1.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			},
-			"bin": {
-				"pot-to-php": "tools/pot-to-php.js"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/server-side-render/node_modules/@wordpress/icons": {
 			"version": "9.4.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-9.4.0.tgz",
@@ -16341,17 +16329,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@wordpress/server-side-render/node_modules/@wordpress/is-shallow-equal": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@wordpress/server-side-render/node_modules/@wordpress/primitives": {
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.11.0.tgz",
@@ -16672,9 +16649,9 @@
 			}
 		},
 		"node_modules/@wordpress/wordcount": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.12.0.tgz",
-			"integrity": "sha512-noYFwkpzq7uCG85mYFSZueKF+eMXx9vGc6pgY6NX5tKiSsVrcea/SWWuwJcAA3XOtXcDxElf0kzYm7vPOGo1bg==",
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.13.0.tgz",
+			"integrity": "sha512-P0HJZ70BIqAXW5kUccHfSAD6xH/geTOwp5RhZdtyUAqnlj9UR3FPY71XG7EEc1CkCD82+0Bc+iw0wm+oV6PKIQ==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
 			},
@@ -37551,9 +37528,9 @@
 			}
 		},
 		"node_modules/mini-css-extract-plugin": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.6.tgz",
-			"integrity": "sha512-t86rLnySRQgN2+58gAIARTEtnClLNZoC99shNrvQ960V/wB9n50AUKJyqly76/s4fT0zwaLFIDFZAW7aK25pvg==",
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+			"integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
 			"dev": true,
 			"dependencies": {
 				"loader-utils": "^2.0.0",
@@ -59684,15 +59661,67 @@
 			}
 		},
 		"@typescript-eslint/parser": {
-			"version": "5.30.5",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.5.tgz",
-			"integrity": "sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==",
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz",
+			"integrity": "sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/scope-manager": "5.30.5",
-				"@typescript-eslint/types": "5.30.5",
-				"@typescript-eslint/typescript-estree": "5.30.5",
+				"@typescript-eslint/scope-manager": "5.31.0",
+				"@typescript-eslint/types": "5.31.0",
+				"@typescript-eslint/typescript-estree": "5.31.0",
 				"debug": "^4.3.4"
+			},
+			"dependencies": {
+				"@typescript-eslint/scope-manager": {
+					"version": "5.31.0",
+					"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz",
+					"integrity": "sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==",
+					"dev": true,
+					"requires": {
+						"@typescript-eslint/types": "5.31.0",
+						"@typescript-eslint/visitor-keys": "5.31.0"
+					}
+				},
+				"@typescript-eslint/types": {
+					"version": "5.31.0",
+					"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz",
+					"integrity": "sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==",
+					"dev": true
+				},
+				"@typescript-eslint/typescript-estree": {
+					"version": "5.31.0",
+					"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz",
+					"integrity": "sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==",
+					"dev": true,
+					"requires": {
+						"@typescript-eslint/types": "5.31.0",
+						"@typescript-eslint/visitor-keys": "5.31.0",
+						"debug": "^4.3.4",
+						"globby": "^11.1.0",
+						"is-glob": "^4.0.3",
+						"semver": "^7.3.7",
+						"tsutils": "^3.21.0"
+					}
+				},
+				"@typescript-eslint/visitor-keys": {
+					"version": "5.31.0",
+					"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz",
+					"integrity": "sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==",
+					"dev": true,
+					"requires": {
+						"@typescript-eslint/types": "5.31.0",
+						"eslint-visitor-keys": "^3.3.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				}
 			}
 		},
 		"@typescript-eslint/scope-manager": {
@@ -60209,34 +60238,29 @@
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/dom-ready": "^3.13.0",
 				"@wordpress/i18n": "^4.13.0"
+			}
+		},
+		"@wordpress/api-fetch": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.11.0.tgz",
+			"integrity": "sha512-C1HTWdJQ7ikhJ4mT+rONTODquJ/Xq5HteKak/VN+vf1VmLVfRX18wJ84kCAAZ83UNOIsE8EgjJrjJy//R+HWzg==",
+			"requires": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/i18n": "^4.14.0",
+				"@wordpress/url": "^3.15.0"
 			},
 			"dependencies": {
-				"@wordpress/i18n": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-					"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
+				"@wordpress/url": {
+					"version": "3.15.0",
+					"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.15.0.tgz",
+					"integrity": "sha512-LLlgCMbherqqnxAuK6kb997MKkzfnvkyQQ5RazBQKBn//RBXrW/w6BMVglm4QjV7L65N/IfqFd36QLZDMuiYDA==",
 					"requires": {
 						"@babel/runtime": "^7.16.0",
-						"@wordpress/hooks": "^3.13.0",
-						"gettext-parser": "^1.3.1",
-						"lodash": "^4.17.21",
-						"memize": "^1.1.0",
-						"sprintf-js": "^1.1.1",
-						"tannin": "^1.2.0"
+						"remove-accents": "^0.4.2"
 					}
 				}
 			}
 		},
-		"@wordpress/api-fetch": {
-			"version": "6.9.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.9.0.tgz",
-			"integrity": "sha512-H0IvLlisBcfKFa4tlMgtqFy7s7Iz3SSe6cEzqAAesK1fg+j3NewDP4fcQz5Ooo6pL+Y2A8oUM5dawjJctmsnAA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "^4.12.0",
-				"@wordpress/url": "^3.13.0"
-			}
-		},
 		"@wordpress/autop": {
 			"version": "3.12.0",
 			"resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.12.0.tgz",
@@ -60676,7 +60700,7 @@
 				"@wordpress/compose": "^5.11.0",
 				"@wordpress/deprecated": "^3.13.0",
 				"@wordpress/element": "^4.11.0",
-				"@wordpress/is-shallow-equal": "^4.13.0",
+				"@wordpress/is-shallow-equal": "4.13.0",
 				"@wordpress/priority-queue": "^2.13.0",
 				"@wordpress/redux-routine": "^4.13.0",
 				"equivalent-key-map": "^0.2.2",
@@ -60698,7 +60722,7 @@
 						"@wordpress/deprecated": "^3.13.0",
 						"@wordpress/dom": "^3.13.0",
 						"@wordpress/element": "^4.11.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/keycodes": "^3.13.0",
 						"@wordpress/priority-queue": "^2.13.0",
 						"clipboard": "^2.0.8",
@@ -60739,14 +60763,6 @@
 						"react": "^17.0.2",
 						"react-dom": "^17.0.2"
 					}
-				},
-				"@wordpress/is-shallow-equal": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-					"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-					"requires": {
-						"@babel/runtime": "^7.16.0"
-					}
 				}
 			}
 		},
@@ -62265,9 +62281,9 @@
 			}
 		},
 		"@wordpress/hooks": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.13.0.tgz",
-			"integrity": "sha512-N+82Dt3jsREtN0dCypehaWuwCjPOM3ljxyzVWULMDrIK9TaIvkunkHViIyoCkxWk3lolRRqh8XmD+ox/mF+n1A==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.14.0.tgz",
+			"integrity": "sha512-bcQXql4A1VI6gnTdNzMjdHLGTpnf8oWOQ1r8B8fcvtOF3dKictxJPobarWxFbtVTQoegizZT/lPCMoLsnVJpug==",
 			"requires": {
 				"@babel/runtime": "^7.16.0"
 			}
@@ -62282,12 +62298,12 @@
 			}
 		},
 		"@wordpress/i18n": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.12.0.tgz",
-			"integrity": "sha512-UTccrAOZ03nszzlG74G+ZkMR/kK0PoS1fqFa8NRFAhHneYadJOnsgCCd5YgDAsN+tAKA6QM7RPmpQMwujvIbzA==",
+			"version": "4.14.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.14.0.tgz",
+			"integrity": "sha512-46ryvPbh139RkLXQt8oey4aCcWo6HRKb1NLVHU4a4kJ4HRD/HLhAeTHKAMiZFWTg+QC1HZC32vGdEikqrpnlzQ==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.12.0",
+				"@wordpress/hooks": "^3.14.0",
 				"gettext-parser": "^1.3.1",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0",
@@ -62306,9 +62322,9 @@
 			}
 		},
 		"@wordpress/is-shallow-equal": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.12.0.tgz",
-			"integrity": "sha512-jlpHXPLJw0mG13bcbZIJwOd1DQozJ5+fbkkKA2JeTO5d5PXs44Rw6EYdGMLUU97B44UxIwVbaui7tJGOvzF8Dw==",
+			"version": "4.13.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
+			"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
 			"requires": {
 				"@babel/runtime": "^7.16.0"
 			}
@@ -62396,22 +62412,6 @@
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/i18n": "^4.13.0",
 				"lodash": "^4.17.21"
-			},
-			"dependencies": {
-				"@wordpress/i18n": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-					"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-					"requires": {
-						"@babel/runtime": "^7.16.0",
-						"@wordpress/hooks": "^3.13.0",
-						"gettext-parser": "^1.3.1",
-						"lodash": "^4.17.21",
-						"memize": "^1.1.0",
-						"sprintf-js": "^1.1.1",
-						"tannin": "^1.2.0"
-					}
-				}
 			}
 		},
 		"@wordpress/notices": {
@@ -62455,7 +62455,7 @@
 						"@wordpress/deprecated": "^3.13.0",
 						"@wordpress/dom": "^3.13.0",
 						"@wordpress/element": "^4.11.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/keycodes": "^3.13.0",
 						"@wordpress/priority-queue": "^2.13.0",
 						"clipboard": "^2.0.8",
@@ -62507,14 +62507,6 @@
 						"@wordpress/primitives": "^3.11.0"
 					}
 				},
-				"@wordpress/is-shallow-equal": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-					"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-					"requires": {
-						"@babel/runtime": "^7.16.0"
-					}
-				},
 				"@wordpress/primitives": {
 					"version": "3.11.0",
 					"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.11.0.tgz",
@@ -62610,7 +62602,7 @@
 						"@wordpress/deprecated": "^3.13.0",
 						"@wordpress/dom": "^3.13.0",
 						"@wordpress/element": "^4.11.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/keycodes": "^3.13.0",
 						"@wordpress/priority-queue": "^2.13.0",
 						"clipboard": "^2.0.8",
@@ -62652,28 +62644,6 @@
 						"react-dom": "^17.0.2"
 					}
 				},
-				"@wordpress/i18n": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-					"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-					"requires": {
-						"@babel/runtime": "^7.16.0",
-						"@wordpress/hooks": "^3.13.0",
-						"gettext-parser": "^1.3.1",
-						"lodash": "^4.17.21",
-						"memize": "^1.1.0",
-						"sprintf-js": "^1.1.1",
-						"tannin": "^1.2.0"
-					}
-				},
-				"@wordpress/is-shallow-equal": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-					"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-					"requires": {
-						"@babel/runtime": "^7.16.0"
-					}
-				},
 				"rememo": {
 					"version": "4.0.1",
 					"resolved": "https://registry.npmjs.org/rememo/-/rememo-4.0.1.tgz",
@@ -63877,7 +63847,7 @@
 						"@wordpress/hooks": "^3.13.0",
 						"@wordpress/html-entities": "^3.13.0",
 						"@wordpress/i18n": "^4.13.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/shortcode": "^3.13.0",
 						"colord": "^2.7.0",
 						"hpq": "^1.3.0",
@@ -63913,7 +63883,7 @@
 						"@wordpress/hooks": "^3.13.0",
 						"@wordpress/i18n": "^4.13.0",
 						"@wordpress/icons": "^9.4.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/keycodes": "^3.13.0",
 						"@wordpress/primitives": "^3.11.0",
 						"@wordpress/rich-text": "^5.11.0",
@@ -63947,7 +63917,7 @@
 						"@wordpress/deprecated": "^3.13.0",
 						"@wordpress/dom": "^3.13.0",
 						"@wordpress/element": "^4.11.0",
-						"@wordpress/is-shallow-equal": "^4.13.0",
+						"@wordpress/is-shallow-equal": "4.13.0",
 						"@wordpress/keycodes": "^3.13.0",
 						"@wordpress/priority-queue": "^2.13.0",
 						"clipboard": "^2.0.8",
@@ -63997,20 +63967,6 @@
 						"@babel/runtime": "^7.16.0"
 					}
 				},
-				"@wordpress/i18n": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.13.0.tgz",
-					"integrity": "sha512-25x0ylQzXxbaw3oM8afoahiPzzZfzikBNzkzlEJ4MuI9u61zmFedbkIrsmhXtYNlcZ/52RxeUcswHdVs4Hln9Q==",
-					"requires": {
-						"@babel/runtime": "^7.16.0",
-						"@wordpress/hooks": "^3.13.0",
-						"gettext-parser": "^1.3.1",
-						"lodash": "^4.17.21",
-						"memize": "^1.1.0",
-						"sprintf-js": "^1.1.1",
-						"tannin": "^1.2.0"
-					}
-				},
 				"@wordpress/icons": {
 					"version": "9.4.0",
 					"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-9.4.0.tgz",
@@ -64021,14 +63977,6 @@
 						"@wordpress/primitives": "^3.11.0"
 					}
 				},
-				"@wordpress/is-shallow-equal": {
-					"version": "4.13.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.13.0.tgz",
-					"integrity": "sha512-oUoMbEZwnbd4nfEo6uxkvrNCc/LnqC9MIY6kK3iWtMhcykQNpbK3XY/i/NvJb+QpRf7U6XhXyw4//HcQv39iOA==",
-					"requires": {
-						"@babel/runtime": "^7.16.0"
-					}
-				},
 				"@wordpress/primitives": {
 					"version": "3.11.0",
 					"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.11.0.tgz",
@@ -64283,9 +64231,9 @@
 			"integrity": "sha512-4648iMotdeNMe3vLKWTx5C/X1+4hey00GrxAClTiAufGMR3slCjE8nQhnWtFfyqYZi0bSpuF+kYd6ofsKrtcQg=="
 		},
 		"@wordpress/wordcount": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.12.0.tgz",
-			"integrity": "sha512-noYFwkpzq7uCG85mYFSZueKF+eMXx9vGc6pgY6NX5tKiSsVrcea/SWWuwJcAA3XOtXcDxElf0kzYm7vPOGo1bg==",
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.13.0.tgz",
+			"integrity": "sha512-P0HJZ70BIqAXW5kUccHfSAD6xH/geTOwp5RhZdtyUAqnlj9UR3FPY71XG7EEc1CkCD82+0Bc+iw0wm+oV6PKIQ==",
 			"requires": {
 				"@babel/runtime": "^7.16.0"
 			}
@@ -80686,9 +80634,9 @@
 			"dev": true
 		},
 		"mini-css-extract-plugin": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.6.tgz",
-			"integrity": "sha512-t86rLnySRQgN2+58gAIARTEtnClLNZoC99shNrvQ960V/wB9n50AUKJyqly76/s4fT0zwaLFIDFZAW7aK25pvg==",
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+			"integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
 			"dev": true,
 			"requires": {
 				"loader-utils": "^2.0.0",
diff --git a/package.json b/package.json
index 4cdfb47518d..4575574b745 100644
--- a/package.json
+++ b/package.json
@@ -118,12 +118,12 @@
 		"@types/wordpress__data": "4.6.11",
 		"@types/wordpress__data-controls": "2.2.0",
 		"@typescript-eslint/eslint-plugin": "5.30.5",
-		"@typescript-eslint/parser": "5.30.5",
+		"@typescript-eslint/parser": "5.31.0",
 		"@woocommerce/api": "0.2.0",
 		"@woocommerce/e2e-utils": "0.2.0",
 		"@woocommerce/eslint-plugin": "2.0.0",
 		"@woocommerce/woocommerce-rest-api": "1.0.1",
-		"@wordpress/api-fetch": "6.9.0",
+		"@wordpress/api-fetch": "6.11.0",
 		"@wordpress/babel-preset-default": "6.14.0",
 		"@wordpress/base-styles": "4.0.4",
 		"@wordpress/block-editor": "8.2.0",
@@ -138,8 +138,8 @@
 		"@wordpress/element": "4.0.4",
 		"@wordpress/env": "4.9.0",
 		"@wordpress/html-entities": "3.12.0",
-		"@wordpress/i18n": "4.12.0",
-		"@wordpress/is-shallow-equal": "4.12.0",
+		"@wordpress/i18n": "4.14.0",
+		"@wordpress/is-shallow-equal": "4.13.0",
 		"@wordpress/prettier-config": "1.4.0",
 		"@wordpress/scripts": "22.3.0",
 		"autoprefixer": "10.4.7",
@@ -182,7 +182,7 @@
 		"lodash": "4.17.21",
 		"markdown-it": "13.0.1",
 		"merge-config": "2.0.0",
-		"mini-css-extract-plugin": "1.3.6",
+		"mini-css-extract-plugin": "1.6.2",
 		"patch-package": "6.4.7",
 		"postcss": "8.4.14",
 		"postcss-loader": "4.2.0",
@@ -220,7 +220,7 @@
 		"@wordpress/primitives": "3.0.4",
 		"@wordpress/server-side-render": "3.10.0",
 		"@wordpress/url": "3.13.0",
-		"@wordpress/wordcount": "3.12.0",
+		"@wordpress/wordcount": "3.13.0",
 		"classnames": "2.3.1",
 		"compare-versions": "4.1.3",
 		"config": "3.3.7",
diff --git a/tests/e2e/specs/backend/mini-cart.test.js b/tests/e2e/specs/backend/mini-cart.test.js
index 1e496e2f202..24e910e8a50 100644
--- a/tests/e2e/specs/backend/mini-cart.test.js
+++ b/tests/e2e/specs/backend/mini-cart.test.js
@@ -72,10 +72,7 @@ describe( `${ block.name } Block`, () => {
 		useTheme( 'emptytheme' );
 
 		beforeEach( async () => {
-			// TODO: Update to always use site-editor.php once WordPress 6.0 is released and fix is verified.
-			await goToSiteEditor(
-				process.env.GUTENBERG_EDITOR_CONTEXT || 'core'
-			);
+			await goToSiteEditor();
 			await waitForCanvas();
 		} );
 
diff --git a/tests/e2e/specs/shopper/filter-products-by-price.test.ts b/tests/e2e/specs/shopper/filter-products-by-price.test.ts
index 9d81d783fdf..ef9e6092cfb 100644
--- a/tests/e2e/specs/shopper/filter-products-by-price.test.ts
+++ b/tests/e2e/specs/shopper/filter-products-by-price.test.ts
@@ -71,6 +71,7 @@ describe( `${ block.name } Block`, () => {
 
 			await insertBlock( block.name );
 			await insertBlock( 'All Products' );
+			await insertBlock( 'Active Product Filters' );
 			await publishPost();
 
 			const link = await page.evaluate( () =>
@@ -90,12 +91,18 @@ describe( `${ block.name } Block`, () => {
 			const isRefreshed = jest.fn( () => void 0 );
 			page.on( 'load', isRefreshed );
 			await setMaxPrice();
+			await expect( page ).toMatchElement(
+				'.wc-block-active-filters__title',
+				{
+					text: 'Active filters',
+				}
+			);
 			await waitForAllProductsBlockLoaded();
 
-			await page.waitForSelector( selectors.frontend.productsList );
 			const products = await page.$$( selectors.frontend.productsList );
 
 			expect( isRefreshed ).not.toBeCalled();
+
 			expect( products ).toHaveLength( 1 );
 
 			await expect( page ).toMatch( block.foundProduct );
diff --git a/tests/e2e/utils.js b/tests/e2e/utils.js
index 0bf42c14dc5..3a4f127c19f 100644
--- a/tests/e2e/utils.js
+++ b/tests/e2e/utils.js
@@ -64,7 +64,7 @@ const SELECTORS = {
 		savePrompt: '.entities-saved-states__text-prompt',
 	},
 	allProductsBlock: {
-		productsList: '.wc-block-grid__products > li > div:not(.is-loading)',
+		productsList: '.wc-block-grid__products:not(.is-loading-products)',
 	},
 };
 
@@ -157,46 +157,29 @@ export const isBlockInsertedInWidgetsArea = async ( blockName ) => {
 /**
  * Visits site editor dependening on used WordPress version and how Gutenberg is installed.
  *
- * 1. `themes.php?page=gutenberg-edit-site` this is a legacy editor access used for WP <=5.8.
- * 2. `site-editor.php` is the new way of accessing the editor in WP >=5.9+.
- *
- * @param {'core' | 'gutenberg'}               [editorContext='core']          Whether to go to the Gutenberg URL or the Core one.
  * @param {Object}                             params                          Query parameters to add to the URL.
  * @param {string}                             [params.postId]                 ID of the template if we want to access template editor.
  * @param {'wp_template' | 'wp_template_part'} [params.postType='wp_template'] Type of template.
  */
-export async function goToSiteEditor( editorContext = 'core', params ) {
-	// There is a bug in Gutenberg/WPCore now that makes it impossible to rely on site-editor.php on setups
-	// with locally installed Gutenberg. Details in https://github.com/WordPress/gutenberg/issues/39639.
-	// TODO: Update to always use site-editor.php once WordPress 6.0 is released and fix is verified.
-	// 		 Remove usage of goToSiteEditor and GUTENBERG_EDITOR_CONTEXT from from here and from workflows.
-	let editorPath;
-	const queryParams = { ...params };
-
-	if ( editorContext === 'gutenberg' ) {
-		editorPath = 'themes.php';
-		queryParams.page = 'gutenberg-edit-site';
-	} else {
-		editorPath = 'site-editor.php';
-	}
-
-	return await visitAdminPage( editorPath, addQueryArgs( '', queryParams ) );
+export async function goToSiteEditor( params = {} ) {
+	return await visitAdminPage(
+		'site-editor.php',
+		addQueryArgs( '', params )
+	);
 }
 
 /**
  * Visits the Site Editor template edit view.
  *
  * @param {Object}                             params
- * @param {string}                             params.postId                   ID of the template if we want to access template editor.
- * @param {'core' | 'gutenberg'}               [params.editorContext='core']   Whether to go to the Gutenberg URL or the Core one.
+ * @param {string}                             [params.postId]                 ID of the template if we want to access template editor.
  * @param {'wp_template' | 'wp_template_part'} [params.postType='wp_template'] Type of template.
  */
 export async function goToTemplateEditor( {
 	postId,
 	postType = 'wp_template',
-	editorContext = GUTENBERG_EDITOR_CONTEXT,
 } = {} ) {
-	await goToSiteEditor( editorContext, {
+	await goToSiteEditor( {
 		postType,
 		postId,
 	} );
@@ -209,16 +192,14 @@ export async function goToTemplateEditor( {
  * Visits the Site Editor templates list view.
  *
  * @param {Object}                             params
- * @param {'core' | 'gutenberg'}               [params.editorContext='core']   Whether to go to the Gutenberg URL or the Core one.
  * @param {'wp_template' | 'wp_template_part'} [params.postType='wp_template'] Type of template.
  * @param {'list' | 'actions'}                 [params.waitFor='false']        Wait for list or for actions to be present - tempalte actions can take a moment to load, we can wait for them to be present if needed.
  */
 export async function goToTemplatesList( {
 	postType = 'wp_template',
-	editorContext = GUTENBERG_EDITOR_CONTEXT,
 	waitFor = 'list',
 } = {} ) {
-	await goToSiteEditor( editorContext, { postType } );
+	await goToSiteEditor( { postType } );
 
 	if ( waitFor === 'actions' ) {
 		await page.waitForSelector(
@@ -456,5 +437,4 @@ export const openBlockEditorSettings = async ( { isFSEEditor = false } ) => {
  */
 export const waitForAllProductsBlockLoaded = async () => {
 	await page.waitForSelector( SELECTORS.allProductsBlock.productsList );
-	await page.waitForTimeout( 5000 );
 };